Skip to content

[Fluent V2] Fixes for Fluent Native Controls #789

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

Merged
merged 8 commits into from
Jun 28, 2025
Merged

[Fluent V2] Fixes for Fluent Native Controls #789

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b22584
Fixed Show Snackbar Button Not Visibile on Large Text
Dhruv-Mishra Jun 18, 2025
5823b58
Used Flow Row for Scaffold
Dhruv-Mishra Jun 18, 2025
b0a9951
Fixed Menu Demo Text being cropped
Dhruv-Mishra Jun 18, 2025
32650c0
Added Talkback Announcement For Bottomsheet Items
Dhruv-Mishra Jun 19, 2025
5d337ce
Update fluentui_listitem/src/main/java/com/microsoft/fluentui/tokeniz…
Dhruv-Mishra Jun 19, 2025
81db094
Update FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/V…
Dhruv-Mishra Jun 19, 2025
aa12183
Added constant
Dhruv-Mishra Jun 19, 2025
d091fc7
Minor changes
Dhruv-Mishra Jun 23, 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
13 changes: 9 additions & 4 deletions FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/V2MenuActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,36 +63,41 @@ fun CreateMenuActivityUI(context: Context) {
val repeatContentTextCountState = rememberSaveable { mutableStateOf("4") }
val contentTextState =
rememberSaveable { mutableStateOf(context.getString(R.string.menu_content_text_input)) }
val textFieldWidthFraction = 0.35f
Column {
Column {
ListItem.Header(title = context.getString(R.string.menu_xOffset),
titleMaxLines = 2,
trailingAccessoryContent = {
BasicTextField(value = xOffsetState.value,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
onValueChange = { xOffsetState.value = it.trim() },
modifier = Modifier.background(Color.White))
modifier = Modifier.background(Color.White).fillMaxWidth(fraction = textFieldWidthFraction))
}
)
ListItem.Header(title = context.getString(R.string.menu_yOffset),
titleMaxLines = 2,
trailingAccessoryContent = {
BasicTextField(value = yOffsetState.value,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
onValueChange = { yOffsetState.value = it.trim() },
modifier = Modifier.background(Color.White))
modifier = Modifier.background(Color.White).fillMaxWidth(fraction = textFieldWidthFraction))
})
ListItem.Header(title = context.getString(R.string.menu_content_text),
titleMaxLines = 2,
trailingAccessoryContent = {
BasicTextField(
value = contentTextState.value,
onValueChange = { contentTextState.value = it },
modifier = Modifier.background(Color.White))
modifier = Modifier.background(Color.White).fillMaxWidth(fraction = textFieldWidthFraction))
})
ListItem.Header(title = context.getString(R.string.menu_repeat_content_text),
titleMaxLines = 2,
trailingAccessoryContent = {
BasicTextField(value = repeatContentTextCountState.value,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
onValueChange = { repeatContentTextCountState.value = it.trim() },
modifier = Modifier.background(Color.White))
modifier = Modifier.background(Color.White).fillMaxWidth(fraction = textFieldWidthFraction))
})
ListItem.SectionDescription(description = context.getString(R.string.menu_description))
}
Expand Down
3 changes: 2 additions & 1 deletion FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/V2ScaffoldActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class V2ScaffoldActivity : V2DemoActivity() {
}
}

@OptIn(ExperimentalLayoutApi::class)
@Composable
private fun GetContent(context: Context, snackbarState: SnackbarState? = null) {
val size = remember { mutableStateOf(5) }
Expand All @@ -171,7 +172,7 @@ class V2ScaffoldActivity : V2DemoActivity() {
drawerState = drawerState,
drawerContent = { CreateList(size = 20, context = context) }
)
Row(
FlowRow(
modifier = Modifier.padding(8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Expand Down
20 changes: 14 additions & 6 deletions ...titem/src/main/java/com/microsoft/fluentui/tokenized/contentBuilder/ListContentBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import androidx.compose.ui.focus.onFocusEvent
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.microsoft.fluentui.theme.FluentTheme
Expand Down Expand Up @@ -100,7 +102,7 @@ class ListContentBuilder {
header: String? = null,
maxItemInRow: Int = 4,
equidistant: Boolean = false,
tabItemTokens: TabItemTokens? = null
tabItemTokens: TabItemTokens? = TabItemTokens()
): ListContentBuilder {
add(VerticalGridContentData(itemDataList, header, maxItemInRow, equidistant, tabItemTokens))
return this
Expand Down Expand Up @@ -157,7 +159,7 @@ class ListContentBuilder {
header: String?,
maxItemsInRow: Int,
equidistant: Boolean,
tabItemTokens: TabItemTokens? = null
tabItemTokens: TabItemTokens? = TabItemTokens()
): LazyListScope.() -> Unit {
return {
if (header != null) {
Expand Down Expand Up @@ -189,13 +191,16 @@ class ListContentBuilder {
else
1.0f / min(itemsInRow, (size - (row * itemsInRow)))
while (col < itemsInRow && (row * itemsInRow + col) < size) {
val titleString = itemDataList[row * itemsInRow + col].title
TabItem(
title = itemDataList[row * itemsInRow + col].title,
title = titleString,
enabled = itemDataList[row * itemsInRow + col].enabled,
onClick = itemDataList[row * itemsInRow + col].onClick,
accessory = itemDataList[row * itemsInRow + col].accessory,
icon = itemDataList[row * itemsInRow + col].icon,
modifier = Modifier.fillMaxWidth(widthRatio),
modifier = Modifier.semantics {
contentDescription = titleString
}.fillMaxWidth(widthRatio),
tabItemTokens = tabItemTokens
)
col++
Expand Down Expand Up @@ -233,7 +238,7 @@ class ListContentBuilder {
itemDataList: List<ItemData>,
header: String?,
fixedWidth: Boolean = false,
tabItemTokens: TabItemTokens? = null
tabItemTokens: TabItemTokens? = TabItemTokens()
): LazyListScope.() -> Unit {
return {
if (header != null) {
Expand Down Expand Up @@ -277,6 +282,9 @@ class ListContentBuilder {
)
}
}
}
.semantics {
contentDescription = item.title
},
tabItemTokens = tabItemTokens
)
Expand All @@ -289,7 +297,7 @@ class ListContentBuilder {
private fun createVerticalList(
itemDataList: List<ItemData>,
header: String?,
listItemTokens: ListItemTokens? = null
listItemTokens: ListItemTokens? = ListItemTokens()
): LazyListScope.() -> Unit {
return {
if (header != null) {
Expand Down