fix spacing
This commit is contained in:
parent
935011b7e5
commit
fc11f9e4f0
3 changed files with 5 additions and 11 deletions
|
@ -1,6 +1,5 @@
|
||||||
package com.simplemobiletools.calculator.compose.screens
|
package com.simplemobiletools.calculator.compose.screens
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
|
@ -12,14 +11,10 @@ import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.SideEffect
|
import androidx.compose.runtime.SideEffect
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.lerp
|
import androidx.compose.ui.graphics.lerp
|
||||||
import androidx.compose.ui.graphics.luminance
|
|
||||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
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.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import com.google.accompanist.systemuicontroller.rememberSystemUiController
|
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.settings.SettingsTitleTextComponent
|
||||||
import com.simplemobiletools.calculator.compose.theme.*
|
import com.simplemobiletools.calculator.compose.theme.*
|
||||||
import com.simplemobiletools.commons.R
|
import com.simplemobiletools.commons.R
|
||||||
import com.simplemobiletools.commons.extensions.getCustomizeColorsString
|
|
||||||
import com.simplemobiletools.commons.helpers.isTiramisuPlus
|
import com.simplemobiletools.commons.helpers.isTiramisuPlus
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
|
@ -41,7 +35,7 @@ fun SettingsScreen(
|
||||||
customizeWidgetColors: () -> Unit,
|
customizeWidgetColors: () -> Unit,
|
||||||
topBarsScrolledContainerColor: Color = MaterialTheme.colorScheme.primary,
|
topBarsScrolledContainerColor: Color = MaterialTheme.colorScheme.primary,
|
||||||
nonScrolledTextColor: Color = if (isSurfaceLitWell()) Color.Black else Color.White,
|
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,
|
preventPhoneFromSleeping: Boolean,
|
||||||
onPreventPhoneFromSleeping: (Boolean) -> Unit,
|
onPreventPhoneFromSleeping: (Boolean) -> Unit,
|
||||||
vibrateOnButtonPressFlow: Boolean,
|
vibrateOnButtonPressFlow: Boolean,
|
||||||
|
@ -98,8 +92,7 @@ fun SettingsScreen(
|
||||||
colors = TopAppBarDefaults.largeTopAppBarColors(
|
colors = TopAppBarDefaults.largeTopAppBarColors(
|
||||||
scrolledContainerColor = topBarsScrolledContainerColor
|
scrolledContainerColor = topBarsScrolledContainerColor
|
||||||
),
|
),
|
||||||
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
) { paddingValues ->
|
) { paddingValues ->
|
||||||
Box(
|
Box(
|
||||||
|
@ -117,6 +110,7 @@ fun SettingsScreen(
|
||||||
SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
|
SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
|
||||||
}) {
|
}) {
|
||||||
SettingsPreferenceComponent(
|
SettingsPreferenceComponent(
|
||||||
|
modifier = Modifier.padding(bottom = 12.dp),
|
||||||
preferenceTitle = stringResource(id = R.string.customize_colors),
|
preferenceTitle = stringResource(id = R.string.customize_colors),
|
||||||
doOnPreferenceClick = customizeColors,
|
doOnPreferenceClick = customizeColors,
|
||||||
isPreferenceEnabled = isOrWasThankYouInstalled,
|
isPreferenceEnabled = isOrWasThankYouInstalled,
|
||||||
|
|
|
@ -41,7 +41,7 @@ fun SettingsCheckBoxComponent(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.clickable(onClick = { onChange?.invoke(!initialValue) }, interactionSource = interactionSource, indication = indication)
|
.clickable(onClick = { onChange?.invoke(!initialValue) }, interactionSource = interactionSource, indication = indication)
|
||||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
.padding(horizontal = 16.dp, vertical = 6.dp),
|
||||||
) {
|
) {
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier.weight(1f)
|
modifier = Modifier.weight(1f)
|
||||||
|
|
|
@ -38,7 +38,7 @@ fun SettingsPreferenceComponent(
|
||||||
onClick = { doOnPreferenceClick?.invoke() },
|
onClick = { doOnPreferenceClick?.invoke() },
|
||||||
onLongClick = { doOnPreferenceLongClick?.invoke() },
|
onLongClick = { doOnPreferenceLongClick?.invoke() },
|
||||||
)
|
)
|
||||||
.padding(16.dp),
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = preferenceTitle,
|
text = preferenceTitle,
|
||||||
|
|
Loading…
Reference in a new issue