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

Add scaffold preview.

Browse Source
This commit is contained in:
Alex Hart
2023-03-02 12:13:14 -04:00
committed by Greyson Parrelli
parent 5634e9834d
commit 8ca8e5d8f9
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsFragment.kt
View File

@@ -39,7 +39,7 @@ class PhoneNumberPrivacySettingsFragment : ComposeFragment() {
Scaffolds.Settings( Scaffolds.Settings(
title = stringResource(id = R.string.preferences_app_protection__phone_number), title = stringResource(id = R.string.preferences_app_protection__phone_number),
onNavigationClick = onNavigationClick, onNavigationClick = onNavigationClick,
painter = painterResource(id = R.drawable.ic_arrow_left_24), navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close) navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
) { contentPadding -> ) { contentPadding ->
Box(modifier = Modifier.padding(contentPadding)) { Box(modifier = Modifier.padding(contentPadding)) {

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

@@ -1,6 +1,8 @@
package org.signal.core.ui package org.signal.core.ui
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -10,9 +12,14 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.painter.ColorPainter
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import org.signal.core.ui.theme.SignalTheme
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
object Scaffolds { object Scaffolds {
@@ -20,7 +27,7 @@ object Scaffolds {
fun Settings( fun Settings(
title: String, title: String,
onNavigationClick: () -> Unit, onNavigationClick: () -> Unit,
painter: Painter, navigationIconPainter: Painter,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
navigationContentDescription: String? = null, navigationContentDescription: String? = null,
content: @Composable (PaddingValues) -> Unit content: @Composable (PaddingValues) -> Unit
@@ -40,7 +47,7 @@ object Scaffolds {
Modifier.padding(end = 16.dp) Modifier.padding(end = 16.dp)
) { ) {
Icon( Icon(
painter = painter, painter = navigationIconPainter,
contentDescription = navigationContentDescription contentDescription = navigationContentDescription
) )
} }
@@ -52,3 +59,22 @@ object Scaffolds {
) )
} }
} }
@Preview
@Composable
fun SettingsScaffoldPreview() {
SignalTheme(isDarkMode = false) {
Scaffolds.Settings(
"Settings Scaffold",
onNavigationClick = {},
navigationIconPainter = ColorPainter(Color.Black)
) { paddingValues ->
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.padding(paddingValues).fillMaxSize()
) {
Text("Content")
}
}
}
}