-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pulled common compose structure into separate common component. Added…
… a little more padding for bottom of screen contents.
- Loading branch information
1 parent
c2b9fb6
commit 8aa25ab
Showing
4 changed files
with
134 additions
and
189 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
app/src/main/java/be/scri/ui/common/components/ComposeScaffoldContainer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package be.scri.ui.common.components | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.WindowInsets | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.windowInsetsBottomHeight | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.Card | ||
| import androidx.compose.material3.CardDefaults | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import be.scri.ui.theme.ScribeTypography | ||
|
|
||
| @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") | ||
| @Composable | ||
| fun MainActivityComposeScreen( | ||
| bottomSpacerHeight: Int, | ||
| title: Int, | ||
| modifier: Modifier = Modifier, | ||
| content: @Composable () -> Unit, | ||
| ) { | ||
| Scaffold(modifier = modifier.fillMaxSize()) { | ||
| Column( | ||
| modifier = | ||
| Modifier | ||
| .fillMaxSize() | ||
| .padding(horizontal = 16.dp) | ||
| .verticalScroll(rememberScrollState()), | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = title), | ||
| modifier = Modifier.padding(top = 16.dp, bottom = 4.dp), | ||
| fontSize = ScribeTypography.headlineMedium.fontSize, | ||
| style = | ||
| TextStyle.Default.copy( | ||
| fontStyle = ScribeTypography.headlineMedium.fontStyle, | ||
| fontWeight = FontWeight.Bold, | ||
| ), | ||
| ) | ||
| Card( | ||
| colors = | ||
| CardDefaults.cardColors( | ||
| containerColor = MaterialTheme.colorScheme.surface, | ||
| ), | ||
| ) { | ||
| content() | ||
| } | ||
| Spacer( | ||
| Modifier.windowInsetsBottomHeight( | ||
| WindowInsets(bottom = bottomSpacerHeight + 16), | ||
| ), | ||
| ) | ||
| } | ||
| } | ||
| } |
66 changes: 14 additions & 52 deletions
66
app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,34 @@ | ||
| package be.scri.ui.screens | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.WindowInsets | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.safeDrawing | ||
| import androidx.compose.foundation.layout.windowInsetsBottomHeight | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.Card | ||
| import androidx.compose.material3.CardDefaults | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import be.scri.R | ||
| import be.scri.ui.common.components.MainActivityComposeScreen | ||
| import be.scri.ui.theme.ScribeTypography | ||
|
|
||
| @Composable | ||
| fun PrivacyPolicyScreen( | ||
| bottomSpacerHeight: Int, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Scaffold(modifier = modifier.fillMaxSize(), contentWindowInsets = WindowInsets.safeDrawing) { padding -> | ||
| Column( | ||
| modifier = | ||
| Modifier | ||
| .padding(horizontal = 16.dp) | ||
| .padding(padding) | ||
| .verticalScroll(rememberScrollState()), | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = R.string.app_about_legal_privacy_policy_caption), | ||
| modifier = Modifier.padding(top = 16.dp, bottom = 4.dp), | ||
| fontSize = ScribeTypography.headlineMedium.fontSize, | ||
| style = | ||
| TextStyle.Default.copy( | ||
| fontStyle = ScribeTypography.headlineMedium.fontStyle, | ||
| fontWeight = FontWeight.Bold, | ||
| ), | ||
| ) | ||
| Card( | ||
| colors = | ||
| CardDefaults.cardColors( | ||
| containerColor = MaterialTheme.colorScheme.surface, | ||
| ), | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = R.string.app_about_legal_privacy_policy_text), | ||
| fontSize = ScribeTypography.bodyMedium.fontSize, | ||
| style = | ||
| TextStyle.Default.copy( | ||
| fontStyle = ScribeTypography.bodyMedium.fontStyle, | ||
| ), | ||
| modifier = Modifier.padding(16.dp), | ||
| ) | ||
| } | ||
| Spacer( | ||
| Modifier.windowInsetsBottomHeight( | ||
| WindowInsets(bottom = bottomSpacerHeight), | ||
| MainActivityComposeScreen( | ||
| bottomSpacerHeight, | ||
| R.string.app_about_legal_privacy_policy_caption, | ||
| modifier, | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = R.string.app_about_legal_privacy_policy_text), | ||
| fontSize = ScribeTypography.bodyMedium.fontSize, | ||
| style = | ||
| TextStyle.Default.copy( | ||
| fontStyle = ScribeTypography.bodyMedium.fontStyle, | ||
| ), | ||
| ) | ||
| } | ||
| modifier = Modifier.padding(16.dp), | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.