From c2fa3d4da4e4753cf49a091600e5b454398b684e Mon Sep 17 00:00:00 2001 From: MABD Date: Wed, 19 Nov 2025 13:19:25 +0200 Subject: [PATCH] removed content padding added in previous commit --- app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt | 1 - .../org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt | 7 ------- .../pomodoro/ui/settingsScreen/screens/AlarmSettings.kt | 3 --- .../ui/settingsScreen/screens/AppearanceSettings.kt | 3 --- .../pomodoro/ui/settingsScreen/screens/TimerSettings.kt | 3 --- 5 files changed, 17 deletions(-) diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt index 7fa44b9..a998da7 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt @@ -196,7 +196,6 @@ fun AppScreen( entry { SettingsScreenRoot( setShowPaywall = { showPaywall = it }, - contentPadding = contentPadding, modifier = modifier.padding( start = contentPadding.calculateStartPadding(layoutDirection), end = contentPadding.calculateEndPadding(layoutDirection), diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt index 3e3e567..56d8028 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt @@ -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 { @@ -296,7 +291,6 @@ private fun SettingsScreen( onAction = onAction, setShowPaywall = setShowPaywall, onBack = backStack::removeLastOrNull, - contentPadding = contentPadding, ) } entry { @@ -311,7 +305,6 @@ private fun SettingsScreen( onAction = onAction, setShowPaywall = setShowPaywall, onBack = backStack::removeLastOrNull, - contentPadding = contentPadding, ) } } diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt index 4dd6828..8781021 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AlarmSettings.kt @@ -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() ) } diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt index 30036f8..80b3e4a 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/AppearanceSettings.kt @@ -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() ) } } diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt index 2d0c000..5dc306c 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/screens/TimerSettings.kt @@ -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() ) } \ No newline at end of file