Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new navigation and pane support.

Browse Source
This commit is contained in:
Alex Hart
2025-09-18 16:22:06 -03:00
committed by Jeffrey Starke
parent 146a5f5701
commit fd999be41a
28 changed files with 1272 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt
View File

@@ -42,8 +42,8 @@ object Scaffolds {
fun Settings(
title: String,
onNavigationClick: () -> Unit,
navigationIcon: ImageVector,
modifier: Modifier = Modifier,
navigationIcon: ImageVector? = null,
navigationContentDescription: String? = null,
titleContent: @Composable (Float, String) -> Unit = { _, title ->
Text(text = title, style = MaterialTheme.typography.titleLarge)
@@ -80,7 +80,7 @@ object Scaffolds {
title: String,
titleContent: @Composable (Float, String) -> Unit,
onNavigationClick: () -> Unit,
navigationIcon: ImageVector,
navigationIcon: ImageVector?,
navigationContentDescription: String? = null,
actions: @Composable RowScope.() -> Unit = {},
scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -90,14 +90,16 @@ object Scaffolds {
titleContent(scrollBehavior.state.contentOffset, title)
},
navigationIcon = {
IconButton(
onClick = onNavigationClick,
Modifier.padding(end = 16.dp)
) {
Icon(
imageVector = navigationIcon,
contentDescription = navigationContentDescription
)
if (navigationIcon != null) {
IconButton(
onClick = onNavigationClick,
Modifier.padding(end = 16.dp)
) {
Icon(
imageVector = navigationIcon,
contentDescription = navigationContentDescription
)
}
}
},
scrollBehavior = scrollBehavior,
@@ -134,3 +136,28 @@ private fun SettingsScaffoldPreview() {
}
}
}
@Preview
@Composable
private fun SettingsScaffoldNoNavIconPreview() {
SignalTheme(isDarkMode = false) {
Scaffolds.Settings(
"Settings Scaffold",
onNavigationClick = {},
actions = {
IconButton(onClick = {}) {
Icon(Icons.Default.Settings, contentDescription = null)
}
}
) { paddingValues ->
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.padding(paddingValues)
.fillMaxSize()
) {
Text("Content")
}
}
}
}