🚀 Change Settings' subcategory padding

* Changed verticalPadding to 18.dp
This commit is contained in:
Acclorite 2024-12-25 17:39:56 +02:00
parent d7c3e2b4e1
commit dee6ae10c7
20 changed files with 57 additions and 202 deletions

View file

@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar
import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet
@ -54,9 +53,7 @@ fun BrowseFilterBottomSheet(
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseGeneralSubcategory( BrowseGeneralSubcategory(
showTitle = false, showTitle = false,
showDivider = false, showDivider = false
topPadding = 16.dp,
bottomPadding = 8.dp
) )
} }
} }
@ -65,9 +62,7 @@ fun BrowseFilterBottomSheet(
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseFilterSubcategory( BrowseFilterSubcategory(
showTitle = false, showTitle = false,
showDivider = false, showDivider = false
topPadding = 16.dp,
bottomPadding = 8.dp
) )
} }
} }
@ -76,9 +71,7 @@ fun BrowseFilterBottomSheet(
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseSortSubcategory( BrowseSortSubcategory(
showTitle = false, showTitle = false,
showDivider = false, showDivider = false
topPadding = 16.dp,
bottomPadding = 8.dp
) )
} }
} }

View file

@ -18,7 +18,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
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.unit.dp
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar
import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet
@ -95,30 +94,20 @@ fun ReaderSettingsBottomSheet(
0 -> { 0 -> {
LazyColumnWithScrollbar(Modifier.fillMaxSize()) { LazyColumnWithScrollbar(Modifier.fillMaxSize()) {
ReadingModeSubcategory( ReadingModeSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 22.dp,
bottomPadding = 0.dp
) )
PaddingSubcategory( PaddingSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 22.dp,
bottomPadding = 0.dp
) )
SystemSubcategory( SystemSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 22.dp,
bottomPadding = 0.dp
) )
ReadingSpeedSubcategory( ReadingSpeedSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 22.dp,
bottomPadding = 0.dp
) )
MiscSubcategory( MiscSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface },
showDivider = false, showDivider = false
topPadding = 22.dp,
bottomPadding = 8.dp
) )
} }
} }
@ -126,20 +115,14 @@ fun ReaderSettingsBottomSheet(
1 -> { 1 -> {
LazyColumnWithScrollbar(Modifier.fillMaxSize()) { LazyColumnWithScrollbar(Modifier.fillMaxSize()) {
FontSubcategory( FontSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 16.dp,
bottomPadding = 0.dp
) )
TextSubcategory( TextSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface }
topPadding = 22.dp,
bottomPadding = 0.dp
) )
TranslatorSubcategory( TranslatorSubcategory(
titleColor = { MaterialTheme.colorScheme.onSurface }, titleColor = { MaterialTheme.colorScheme.onSurface },
showDivider = false, showDivider = false
topPadding = 22.dp,
bottomPadding = 8.dp
) )
} }
} }
@ -149,9 +132,7 @@ fun ReaderSettingsBottomSheet(
ColorsSubcategory( ColorsSubcategory(
showTitle = false, showTitle = false,
showDivider = false, showDivider = false,
backgroundColor = { MaterialTheme.colorScheme.surfaceContainer }, backgroundColor = { MaterialTheme.colorScheme.surfaceContainer }
topPadding = 16.dp,
bottomPadding = 8.dp
) )
} }
} }

View file

@ -6,25 +6,17 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory
import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory
fun LazyListScope.AppearanceSettingsCategory( fun LazyListScope.AppearanceSettingsCategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
topPadding: Dp = 16.dp,
bottomPadding: Dp = 16.dp
) { ) {
ThemePreferencesSubcategory( ThemePreferencesSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = topPadding,
bottomPadding = 0.dp
) )
ColorsSubcategory( ColorsSubcategory(
titleColor = titleColor, titleColor = titleColor,
showDivider = false, showDivider = false
topPadding = 22.dp,
bottomPadding = bottomPadding
) )
} }

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.appearance.colors.components.ColorPresetOption import ua.acclorite.book_story.presentation.settings.appearance.colors.components.ColorPresetOption
import ua.acclorite.book_story.presentation.settings.appearance.colors.components.FastColorPresetChangeOption import ua.acclorite.book_story.presentation.settings.appearance.colors.components.FastColorPresetChangeOption
@ -18,17 +17,13 @@ fun LazyListScope.ColorsSubcategory(
title: @Composable () -> String = { stringResource(id = R.string.colors_appearance_settings) }, title: @Composable () -> String = { stringResource(id = R.string.colors_appearance_settings) },
backgroundColor: @Composable () -> Color = { MaterialTheme.colorScheme.surfaceContainerLow }, backgroundColor: @Composable () -> Color = { MaterialTheme.colorScheme.surfaceContainerLow },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
ColorPresetOption( ColorPresetOption(

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AbsoluteDarkOption import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AbsoluteDarkOption
import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AppThemeOption import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.components.AppThemeOption
@ -20,17 +19,13 @@ fun LazyListScope.ThemePreferencesSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.theme_appearance_settings) }, title: @Composable () -> String = { stringResource(id = R.string.theme_appearance_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
DarkThemeOption() DarkThemeOption()

View file

@ -3,27 +3,14 @@
package ua.acclorite.book_story.presentation.settings.browse package ua.acclorite.book_story.presentation.settings.browse
import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory
import ua.acclorite.book_story.presentation.settings.browse.general.BrowseGeneralSubcategory import ua.acclorite.book_story.presentation.settings.browse.general.BrowseGeneralSubcategory
import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory
fun LazyListScope.BrowseSettingsCategory( fun LazyListScope.BrowseSettingsCategory() {
topPadding: Dp = 16.dp, BrowseGeneralSubcategory()
bottomPadding: Dp = 16.dp BrowseFilterSubcategory()
) {
BrowseGeneralSubcategory(
topPadding = topPadding,
bottomPadding = 0.dp
)
BrowseFilterSubcategory(
topPadding = 22.dp,
bottomPadding = 0.dp
)
BrowseSortSubcategory( BrowseSortSubcategory(
showDivider = false, showDivider = false
topPadding = 22.dp,
bottomPadding = bottomPadding
) )
} }

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.browse.filter.components.BrowseFilterOption import ua.acclorite.book_story.presentation.settings.browse.filter.components.BrowseFilterOption
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
@ -16,17 +15,13 @@ fun LazyListScope.BrowseFilterSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.filter_browse_settings) }, title: @Composable () -> String = { stringResource(id = R.string.filter_browse_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
BrowseFilterOption() BrowseFilterOption()
} }

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseGridSizeOption import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseGridSizeOption
import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseLayoutOption import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseLayoutOption
@ -19,17 +18,13 @@ fun LazyListScope.BrowseGeneralSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.general_browse_settings) }, title: @Composable () -> String = { stringResource(id = R.string.general_browse_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
FilesStructureOption() FilesStructureOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.browse.sort.components.BrowseSortOption import ua.acclorite.book_story.presentation.settings.browse.sort.components.BrowseSortOption
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
@ -16,17 +15,13 @@ fun LazyListScope.BrowseSortSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.sort_browse_settings) }, title: @Composable () -> String = { stringResource(id = R.string.sort_browse_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
BrowseSortOption() BrowseSortOption()
} }

View file

@ -10,8 +10,6 @@ import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
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.unit.Dp
import androidx.compose.ui.unit.coerceAtLeast
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
fun LazyListScope.SettingsSubcategory( fun LazyListScope.SettingsSubcategory(
@ -19,8 +17,6 @@ fun LazyListScope.SettingsSubcategory(
title: @Composable () -> String, title: @Composable () -> String,
showTitle: Boolean, showTitle: Boolean,
showDivider: Boolean, showDivider: Boolean,
topPadding: Dp,
bottomPadding: Dp,
content: LazyListScope.() -> Unit content: LazyListScope.() -> Unit
) { ) {
item { item {
@ -30,25 +26,19 @@ fun LazyListScope.SettingsSubcategory(
color = titleColor.invoke(), color = titleColor.invoke(),
modifier = Modifier modifier = Modifier
.padding( .padding(
top = topPadding, top = 18.dp,
bottom = 8.dp bottom = 8.dp
) )
) )
} else { } else {
Spacer( Spacer(modifier = Modifier.height(18.dp))
modifier = Modifier.height((topPadding - 8.dp).coerceAtLeast(0.dp))
)
} }
} }
content() content()
item { item {
if (showDivider) { Spacer(modifier = Modifier.height(18.dp))
Spacer(modifier = Modifier.height(10.dp)) if (showDivider) HorizontalDivider()
HorizontalDivider()
}
Spacer(modifier = Modifier.height(bottomPadding))
} }
} }

View file

@ -6,8 +6,6 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.presentation.settings.reader.font.FontSubcategory import ua.acclorite.book_story.presentation.settings.reader.font.FontSubcategory
import ua.acclorite.book_story.presentation.settings.reader.misc.MiscSubcategory import ua.acclorite.book_story.presentation.settings.reader.misc.MiscSubcategory
import ua.acclorite.book_story.presentation.settings.reader.padding.PaddingSubcategory import ua.acclorite.book_story.presentation.settings.reader.padding.PaddingSubcategory
@ -18,49 +16,31 @@ import ua.acclorite.book_story.presentation.settings.reader.text.TextSubcategory
import ua.acclorite.book_story.presentation.settings.reader.translator.TranslatorSubcategory import ua.acclorite.book_story.presentation.settings.reader.translator.TranslatorSubcategory
fun LazyListScope.ReaderSettingsCategory( fun LazyListScope.ReaderSettingsCategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
topPadding: Dp = 16.dp,
bottomPadding: Dp = 16.dp
) { ) {
FontSubcategory( FontSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = topPadding,
bottomPadding = 0.dp
) )
TextSubcategory( TextSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
ReadingModeSubcategory( ReadingModeSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
PaddingSubcategory( PaddingSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
SystemSubcategory( SystemSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
ReadingSpeedSubcategory( ReadingSpeedSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
TranslatorSubcategory( TranslatorSubcategory(
titleColor = titleColor, titleColor = titleColor
topPadding = 22.dp,
bottomPadding = 0.dp
) )
MiscSubcategory( MiscSubcategory(
titleColor = titleColor, titleColor = titleColor,
showDivider = false, showDivider = false
topPadding = 22.dp,
bottomPadding = bottomPadding
) )
} }

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.font.components.FontFamilyOption import ua.acclorite.book_story.presentation.settings.reader.font.components.FontFamilyOption
@ -20,16 +19,12 @@ fun LazyListScope.FontSubcategory(
title: @Composable () -> String = { stringResource(id = R.string.font_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.font_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
FontFamilyOption() FontFamilyOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.misc.components.CheckForTextUpdateOption import ua.acclorite.book_story.presentation.settings.reader.misc.components.CheckForTextUpdateOption
@ -20,17 +19,13 @@ fun LazyListScope.MiscSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.misc_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.misc_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
CheckForTextUpdateOption() CheckForTextUpdateOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.padding.components.CutoutPaddingOption import ua.acclorite.book_story.presentation.settings.reader.padding.components.CutoutPaddingOption
@ -18,17 +17,13 @@ fun LazyListScope.PaddingSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.padding_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.padding_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
SidePaddingOption() SidePaddingOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureOption import ua.acclorite.book_story.presentation.settings.reader.reading_mode.components.HorizontalGestureOption
@ -17,17 +16,13 @@ fun LazyListScope.ReadingModeSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.reading_mode_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.reading_mode_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
HorizontalGestureOption() HorizontalGestureOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.PerceptionExpanderOption import ua.acclorite.book_story.presentation.settings.reader.reading_speed.components.PerceptionExpanderOption
@ -18,17 +17,13 @@ fun LazyListScope.ReadingSpeedSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.reading_speed_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.reading_speed_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
PerceptionExpanderOption() PerceptionExpanderOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.system.components.CustomScreenBrightnessOption import ua.acclorite.book_story.presentation.settings.reader.system.components.CustomScreenBrightnessOption
@ -18,17 +17,13 @@ fun LazyListScope.SystemSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.system_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.system_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
CustomScreenBrightnessOption() CustomScreenBrightnessOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.text.components.LineHeightOption import ua.acclorite.book_story.presentation.settings.reader.text.components.LineHeightOption
@ -19,17 +18,13 @@ fun LazyListScope.TextSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.text_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.text_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
TextAlignmentOption() TextAlignmentOption()

View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.settings.reader.translator.components.DoubleClickTranslationOption import ua.acclorite.book_story.presentation.settings.reader.translator.components.DoubleClickTranslationOption
@ -16,17 +15,13 @@ fun LazyListScope.TranslatorSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.translator_reader_settings) }, title: @Composable () -> String = { stringResource(id = R.string.translator_reader_settings) },
showTitle: Boolean = true, showTitle: Boolean = true,
showDivider: Boolean = true, showDivider: Boolean = true
topPadding: Dp,
bottomPadding: Dp
) { ) {
SettingsSubcategory( SettingsSubcategory(
titleColor = titleColor, titleColor = titleColor,
title = title, title = title,
showTitle = showTitle, showTitle = showTitle,
showDivider = showDivider, showDivider = showDivider
topPadding = topPadding,
bottomPadding = bottomPadding
) { ) {
item { item {
DoubleClickTranslationOption() DoubleClickTranslationOption()

View file

@ -4,15 +4,12 @@ package ua.acclorite.book_story.presentation.start
import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory import ua.acclorite.book_story.presentation.settings.appearance.theme_preferences.ThemePreferencesSubcategory
fun LazyListScope.StartSettingsLayoutAppearance() { fun LazyListScope.StartSettingsLayoutAppearance() {
ThemePreferencesSubcategory( ThemePreferencesSubcategory(
title = { stringResource(id = R.string.start_theme_preferences) }, title = { stringResource(id = R.string.start_theme_preferences) },
showDivider = false, showDivider = false
topPadding = 16.dp,
bottomPadding = 8.dp
) )
} }