Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App bar requirements #771

Merged
merged 6 commits into from
Apr 6, 2025
Merged

App bar requirements #771

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aee06e2
app bar requirements
joyeeta26 Apr 1, 2025
0c50835
adding jsdoc
joyeeta26 Apr 2, 2025
dc3be8a
resolving comments
joyeeta26 Apr 2, 2025
553a80e
update jsdoc
joyeeta26 Apr 2, 2025
0b65533
update jsdoc
joyeeta26 Apr 3, 2025
183f35e
Merge branch 'master' of https://github.com/microsoft/fluentui-androi…
joyeeta26 Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 58 additions & 43 deletions fluentui_topappbars/src/main/java/com/microsoft/fluentui/tokenized/AppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import com.microsoft.fluentui.theme.token.controlTokens.AppBarTokens
* @param centerAlignAppBar boolean indicating if the app bar should be center aligned. Default: [false]
* @param navigationIcon Navigate Back Icon to be placed at extreme left. Default: [null]
* @param appBarTokens Optional Tokens for App Bar to customize it. Default: [null]
* @param secondaryPostTitleIcon Secondary icon to be placed after title. Default: Empty [FluentIcon]
*/

// TAGS FOR TESTING
Expand Down Expand Up @@ -94,6 +95,7 @@ fun AppBar(
centerAlignAppBar: Boolean = false,
navigationIcon: FluentIcon? = null,
appBarTokens: AppBarTokens? = null,
secondaryPostTitleIcon: FluentIcon = FluentIcon(),
) {
val themeID =
FluentTheme.themeID //Adding This only for recomposition in case of Token Updates. Unused otherwise.
Expand Down Expand Up @@ -168,21 +170,22 @@ fun AppBar(
val titleAlignment: Alignment.Horizontal =
if (centerAlignAppBar) Alignment.CenterHorizontally else Alignment.Start

if (appBarSize != AppBarSize.Large && !subTitle.isNullOrBlank()) {
if (appBarSize != AppBarSize.Large) {
Column(
modifier = Modifier
.weight(1F)
.padding(token.textPadding(appBarInfo))
.testTag(APP_BAR_SUBTITLE),
horizontalAlignment = titleAlignment
) {
// title
Row(
modifier = Modifier
.then(
if (postTitleIcon.onClick != null && appBarSize == AppBarSize.Small)
Modifier.clickable(onClick = postTitleIcon.onClick!!)
else
Modifier
postTitleIcon.onClick?.takeIf { appBarSize == AppBarSize.Small }
?.let {
Modifier.clickable(onClick = it)
} ?: Modifier
), verticalAlignment = Alignment.CenterVertically
) {
BasicText(
Expand All @@ -203,51 +206,63 @@ fun AppBar(
.size(token.titleIconSize(appBarInfo)),
tint = token.titleIconColor(appBarInfo),
)
}
Row(
modifier = Modifier
.then(
if (postSubtitleIcon.onClick != null)
Modifier.clickable(onClick = postSubtitleIcon.onClick!!)
else
Modifier
), verticalAlignment = Alignment.CenterVertically
) {
if (preSubtitleIcon.isIconAvailable())

if (secondaryPostTitleIcon.isIconAvailable() && appBarSize == AppBarSize.Small)
Icon(
preSubtitleIcon,
secondaryPostTitleIcon.value(),
secondaryPostTitleIcon.contentDescription,
modifier = Modifier
.size(
token.subtitleIconSize(
appBarInfo
)
),
tint = token.subtitleIconColor(appBarInfo)
.size(token.titleIconSize(appBarInfo)),
tint = token.titleIconColor(appBarInfo),
)
BasicText(
subTitle,
style = subtitleTextStyle.merge(
TextStyle(
color = token.subtitleTextColor(
appBarInfo
)
}
// subtitle
if (!subTitle.isNullOrBlank()) {
Row(
modifier = Modifier
.then(
postSubtitleIcon.onClick?.takeIf { appBarSize == AppBarSize.Small }
?.let {
Modifier.clickable(onClick = it)
} ?: Modifier
), verticalAlignment = Alignment.CenterVertically
) {
if (preSubtitleIcon.isIconAvailable())
Icon(
preSubtitleIcon,
modifier = Modifier
.size(
token.subtitleIconSize(
appBarInfo
)
),
tint = token.subtitleIconColor(appBarInfo)
)
),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
if (postSubtitleIcon.isIconAvailable())
Icon(
postSubtitleIcon.value(),
contentDescription = postSubtitleIcon.contentDescription,
modifier = Modifier
.size(
token.subtitleIconSize(
BasicText(
subTitle,
style = subtitleTextStyle.merge(
TextStyle(
color = token.subtitleTextColor(
appBarInfo
)
),
tint = token.subtitleIconColor(appBarInfo)
)
),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
if (postSubtitleIcon.isIconAvailable())
Icon(
postSubtitleIcon.value(),
contentDescription = postSubtitleIcon.contentDescription,
modifier = Modifier
.size(
token.subtitleIconSize(
appBarInfo
)
),
tint = token.subtitleIconColor(appBarInfo)
)
}
}
}
} else {
Expand Down