From fc11f9e4f035bb577cd1945342f575ebf5125bf9 Mon Sep 17 00:00:00 2001
From: FunkyMuse <kikoski@protonmail.com>
Date: Tue, 11 Jul 2023 11:35:13 +0200
Subject: [PATCH] fix spacing

---
 .../calculator/compose/screens/SettingsScreen.kt     | 12 +++---------
 .../compose/settings/SettingsCheckBoxComponent.kt    |  2 +-
 .../compose/settings/SettingsPreferenceComponent.kt  |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
index a1819463..6db63dcf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
@@ -1,6 +1,5 @@
 package com.simplemobiletools.calculator.compose.screens
 
-import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -12,14 +11,10 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.lerp
-import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
@@ -30,7 +25,6 @@ import com.simplemobiletools.calculator.compose.settings.SettingsPreferenceCompo
 import com.simplemobiletools.calculator.compose.settings.SettingsTitleTextComponent
 import com.simplemobiletools.calculator.compose.theme.*
 import com.simplemobiletools.commons.R
-import com.simplemobiletools.commons.extensions.getCustomizeColorsString
 import com.simplemobiletools.commons.helpers.isTiramisuPlus
 import java.util.Locale
 
@@ -41,7 +35,7 @@ fun SettingsScreen(
     customizeWidgetColors: () -> Unit,
     topBarsScrolledContainerColor: Color = MaterialTheme.colorScheme.primary,
     nonScrolledTextColor: Color = if (isSurfaceLitWell()) Color.Black else Color.White,
-    scrolledTextColor: Color = Color.White,
+    scrolledTextColor: Color = if (topBarsScrolledContainerColor.isLitWell()) Color.Black else Color.White,
     preventPhoneFromSleeping: Boolean,
     onPreventPhoneFromSleeping: (Boolean) -> Unit,
     vibrateOnButtonPressFlow: Boolean,
@@ -98,8 +92,7 @@ fun SettingsScreen(
                 colors = TopAppBarDefaults.largeTopAppBarColors(
                     scrolledContainerColor = topBarsScrolledContainerColor
                 ),
-
-                )
+            )
         }
     ) { paddingValues ->
         Box(
@@ -117,6 +110,7 @@ fun SettingsScreen(
                     SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
                 }) {
                     SettingsPreferenceComponent(
+                        modifier = Modifier.padding(bottom = 12.dp),
                         preferenceTitle = stringResource(id = R.string.customize_colors),
                         doOnPreferenceClick = customizeColors,
                         isPreferenceEnabled = isOrWasThankYouInstalled,
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsCheckBoxComponent.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsCheckBoxComponent.kt
index f2de9863..695acd7d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsCheckBoxComponent.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsCheckBoxComponent.kt
@@ -41,7 +41,7 @@ fun SettingsCheckBoxComponent(
         modifier = modifier
             .fillMaxWidth()
             .clickable(onClick = { onChange?.invoke(!initialValue) }, interactionSource = interactionSource, indication = indication)
-            .padding(horizontal = 16.dp, vertical = 8.dp),
+            .padding(horizontal = 16.dp, vertical = 6.dp),
     ) {
         Column(
             modifier = Modifier.weight(1f)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
index 7ce1fdc8..6eae3472 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
@@ -38,7 +38,7 @@ fun SettingsPreferenceComponent(
                 onClick = { doOnPreferenceClick?.invoke() },
                 onLongClick = { doOnPreferenceLongClick?.invoke() },
             )
-            .padding(16.dp),
+            .padding(horizontal = 16.dp, vertical = 8.dp),
     ) {
         Text(
             text = preferenceTitle,