Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🚀 Change Settings' subcategory padding

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt
View file

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

37
app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt
View file

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

14
app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt
View file

@ -6,25 +6,17 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
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.theme_preferences.ThemePreferencesSubcategory
fun LazyListScope.AppearanceSettingsCategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
topPadding: Dp = 16.dp,
bottomPadding: Dp = 16.dp
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
) {
ThemePreferencesSubcategory(
titleColor = titleColor,
topPadding = topPadding,
bottomPadding = 0.dp
titleColor = titleColor
)
ColorsSubcategory(
titleColor = titleColor,
showDivider = false,
topPadding = 22.dp,
bottomPadding = bottomPadding
showDivider = false
)
}

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
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.AppThemeOption
@ -20,17 +19,13 @@ fun LazyListScope.ThemePreferencesSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.theme_appearance_settings) },
showTitle: Boolean = true,
showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
showDivider: Boolean = true
) {
SettingsSubcategory(
titleColor = titleColor,
title = title,
showTitle = showTitle,
showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
showDivider = showDivider
) {
item {
DarkThemeOption()

21
app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt
View file

@ -3,27 +3,14 @@
package ua.acclorite.book_story.presentation.settings.browse
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.general.BrowseGeneralSubcategory
import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory
fun LazyListScope.BrowseSettingsCategory(
topPadding: Dp = 16.dp,
bottomPadding: Dp = 16.dp
) {
BrowseGeneralSubcategory(
topPadding = topPadding,
bottomPadding = 0.dp
)
BrowseFilterSubcategory(
topPadding = 22.dp,
bottomPadding = 0.dp
)
fun LazyListScope.BrowseSettingsCategory() {
BrowseGeneralSubcategory()
BrowseFilterSubcategory()
BrowseSortSubcategory(
showDivider = false,
topPadding = 22.dp,
bottomPadding = bottomPadding
showDivider = false
)
}

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
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.BrowseLayoutOption
@ -19,17 +18,13 @@ fun LazyListScope.BrowseGeneralSubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
title: @Composable () -> String = { stringResource(id = R.string.general_browse_settings) },
showTitle: Boolean = true,
showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
showDivider: Boolean = true
) {
SettingsSubcategory(
titleColor = titleColor,
title = title,
showTitle = showTitle,
showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
showDivider = showDivider
) {
item {
FilesStructureOption()

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt
View file

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

18
app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt
View file

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

38
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt
View file

@ -6,8 +6,6 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
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.misc.MiscSubcategory
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
fun LazyListScope.ReaderSettingsCategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
topPadding: Dp = 16.dp,
bottomPadding: Dp = 16.dp
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }
) {
FontSubcategory(
titleColor = titleColor,
topPadding = topPadding,
bottomPadding = 0.dp
titleColor = titleColor
)
TextSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
ReadingModeSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
PaddingSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
SystemSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
ReadingSpeedSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
TranslatorSubcategory(
titleColor = titleColor,
topPadding = 22.dp,
bottomPadding = 0.dp
titleColor = titleColor
)
MiscSubcategory(
titleColor = titleColor,
showDivider = false,
topPadding = 22.dp,
bottomPadding = bottomPadding
showDivider = false
)
}

7
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
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) },
showTitle: Boolean = true,
showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
) {
SettingsSubcategory(
titleColor = titleColor,
title = title,
showTitle = showTitle,
showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
showDivider = showDivider
) {
item {
FontFamilyOption()

7
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
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 },
title: @Composable () -> String = { stringResource(id = R.string.reading_mode_reader_settings) },
showTitle: Boolean = true,
showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
showDivider: Boolean = true
) {
SettingsSubcategory(
titleColor = titleColor,
title = title,
showTitle = showTitle,
showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
showDivider = showDivider
) {
item {
HorizontalGestureOption()

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt
View file

@ -7,7 +7,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
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 },
title: @Composable () -> String = { stringResource(id = R.string.reading_speed_reader_settings) },
showTitle: Boolean = true,
showDivider: Boolean = true,
topPadding: Dp,
bottomPadding: Dp
showDivider: Boolean = true
) {
SettingsSubcategory(
titleColor = titleColor,
title = title,
showTitle = showTitle,
showDivider = showDivider,
topPadding = topPadding,
bottomPadding = bottomPadding
showDivider = showDivider
) {
item {
PerceptionExpanderOption()

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt
View file

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

9
app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt
View file

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

5
app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt
View file

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