removed content padding added in previous commit
This commit is contained in:
@@ -196,7 +196,6 @@ fun AppScreen(
|
||||
entry<Screen.Settings.Main> {
|
||||
SettingsScreenRoot(
|
||||
setShowPaywall = { showPaywall = it },
|
||||
contentPadding = contentPadding,
|
||||
modifier = modifier.padding(
|
||||
start = contentPadding.calculateStartPadding(layoutDirection),
|
||||
end = contentPadding.calculateEndPadding(layoutDirection),
|
||||
|
||||
@@ -87,7 +87,6 @@ import org.nsh07.pomodoro.ui.theme.CustomColors.topBarColors
|
||||
@Composable
|
||||
fun SettingsScreenRoot(
|
||||
setShowPaywall: (Boolean) -> Unit,
|
||||
contentPadding: PaddingValues,
|
||||
modifier: Modifier = Modifier,
|
||||
viewModel: SettingsViewModel = viewModel(factory = SettingsViewModel.Factory)
|
||||
) {
|
||||
@@ -127,7 +126,6 @@ fun SettingsScreenRoot(
|
||||
sessionsSliderState = sessionsSliderState,
|
||||
onAction = viewModel::onAction,
|
||||
setShowPaywall = setShowPaywall,
|
||||
contentPadding = contentPadding,
|
||||
modifier = modifier
|
||||
)
|
||||
}
|
||||
@@ -146,7 +144,6 @@ private fun SettingsScreen(
|
||||
sessionsSliderState: SliderState,
|
||||
onAction: (SettingsAction) -> Unit,
|
||||
setShowPaywall: (Boolean) -> Unit,
|
||||
contentPadding: PaddingValues,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
@@ -205,7 +202,6 @@ private fun SettingsScreen(
|
||||
|
||||
LazyColumn(
|
||||
verticalArrangement = Arrangement.spacedBy(2.dp),
|
||||
contentPadding = contentPadding,
|
||||
modifier = Modifier
|
||||
.background(topBarColors.containerColor)
|
||||
.fillMaxSize()
|
||||
@@ -286,7 +282,6 @@ private fun SettingsScreen(
|
||||
settingsState = settingsState,
|
||||
onAction = onAction,
|
||||
onBack = backStack::removeLastOrNull,
|
||||
contentPadding = contentPadding,
|
||||
)
|
||||
}
|
||||
entry<Screen.Settings.Appearance> {
|
||||
@@ -296,7 +291,6 @@ private fun SettingsScreen(
|
||||
onAction = onAction,
|
||||
setShowPaywall = setShowPaywall,
|
||||
onBack = backStack::removeLastOrNull,
|
||||
contentPadding = contentPadding,
|
||||
)
|
||||
}
|
||||
entry<Screen.Settings.Timer> {
|
||||
@@ -311,7 +305,6 @@ private fun SettingsScreen(
|
||||
onAction = onAction,
|
||||
setShowPaywall = setShowPaywall,
|
||||
onBack = backStack::removeLastOrNull,
|
||||
contentPadding = contentPadding,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,6 @@ fun AlarmSettings(
|
||||
settingsState: SettingsState,
|
||||
onAction: (SettingsAction) -> Unit,
|
||||
onBack: () -> Unit,
|
||||
contentPadding: PaddingValues,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
|
||||
@@ -176,7 +175,6 @@ fun AlarmSettings(
|
||||
|
||||
LazyColumn(
|
||||
verticalArrangement = Arrangement.spacedBy(2.dp),
|
||||
contentPadding = contentPadding,
|
||||
modifier = Modifier
|
||||
.background(topBarColors.containerColor)
|
||||
.fillMaxSize()
|
||||
@@ -253,6 +251,5 @@ fun AlarmSettingsPreview() {
|
||||
settingsState = settingsState,
|
||||
onAction = {},
|
||||
onBack = {},
|
||||
contentPadding = PaddingValues()
|
||||
)
|
||||
}
|
||||
|
||||
@@ -69,7 +69,6 @@ fun AppearanceSettings(
|
||||
onAction: (SettingsAction) -> Unit,
|
||||
setShowPaywall: (Boolean) -> Unit,
|
||||
onBack: () -> Unit,
|
||||
contentPadding: PaddingValues,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
|
||||
@@ -100,7 +99,6 @@ fun AppearanceSettings(
|
||||
|
||||
LazyColumn(
|
||||
verticalArrangement = Arrangement.spacedBy(2.dp),
|
||||
contentPadding = contentPadding,
|
||||
modifier = Modifier
|
||||
.background(topBarColors.containerColor)
|
||||
.fillMaxSize()
|
||||
@@ -189,7 +187,6 @@ fun AppearanceSettingsPreview() {
|
||||
onAction = {},
|
||||
setShowPaywall = {},
|
||||
onBack = {},
|
||||
contentPadding = PaddingValues()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,7 +106,6 @@ fun TimerSettings(
|
||||
onAction: (SettingsAction) -> Unit,
|
||||
setShowPaywall: (Boolean) -> Unit,
|
||||
onBack: () -> Unit,
|
||||
contentPadding: PaddingValues,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
|
||||
@@ -169,7 +168,6 @@ fun TimerSettings(
|
||||
|
||||
LazyColumn(
|
||||
verticalArrangement = Arrangement.spacedBy(2.dp),
|
||||
contentPadding = contentPadding,
|
||||
modifier = Modifier
|
||||
.background(topBarColors.containerColor)
|
||||
.fillMaxSize()
|
||||
@@ -438,6 +436,5 @@ private fun TimerSettingsPreview() {
|
||||
onAction = {},
|
||||
setShowPaywall = {},
|
||||
onBack = {},
|
||||
contentPadding = PaddingValues()
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user