diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt index 981252ed..7b1e59f3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt @@ -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 ) } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt index 5946c2aa..382df140 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/ReaderSettingsBottomSheet.kt @@ -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 } ) } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt index 0ed73474..a8604212 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/AppearanceSettingsCategory.kt @@ -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 ) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt index afeb0ec0..abb55ab9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/colors/ColorsSubcategory.kt @@ -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( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt index 538eca06..5811fc7f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/appearance/theme_preferences/ThemePreferencesSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt index 557f2853..1508c43e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt @@ -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 ) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt index ceb254cd..e462c9a8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/filter/BrowseFilterSubcategory.kt @@ -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() } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt index 4115d7b5..c1307d68 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt index 5880f048..4b2992e7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/BrowseSortSubcategory.kt @@ -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() } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt index 01910af0..9be663e4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/components/SettingsSubcategory.kt @@ -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() } } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt index 19343d15..efa7e4b1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/ReaderSettingsCategory.kt @@ -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 ) } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt index c2240e67..eddb7f3e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/font/FontSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt index f88bd2d6..21213082 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/misc/MiscSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt index a9c77e41..911d84c3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/padding/PaddingSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt index 97354cfa..b4ca36bd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_mode/ReadingModeSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt index ccdcdc49..43aa95aa 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/reading_speed/ReadingSpeedSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt index bc898563..03a68f21 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/system/SystemSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt index 3a7128a9..2959f3cf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/TextSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt index 617fa362..d16d0f55 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/translator/TranslatorSubcategory.kt @@ -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() diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt index e79cfba9..2d78fde8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartSettingsLayoutAppearance.kt @@ -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 ) } \ No newline at end of file