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