From 092bbfd10bc3be23badaf65160d680dd7cb4d100 Mon Sep 17 00:00:00 2001
From: Acclorite <140836141+Acclorite@users.noreply.github.com>
Date: Tue, 7 Jan 2025 22:18:48 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Chapters=20Settings'=20subcatego?=
 =?UTF-8?q?ry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Moved "Chapter's title alignment" from Text to the new Chapters subcategory
---
 .../reader/ReaderSettingsBottomSheet.kt       |  4 +++
 .../settings/reader/ReaderSettingsCategory.kt |  4 +++
 .../reader/chapters/ChaptersSubcategory.kt    | 30 +++++++++++++++++++
 .../components/ChapterTitleAlignmentOption.kt |  2 +-
 .../settings/reader/text/TextSubcategory.kt   |  5 ----
 app/src/main/res/values-uk/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt
 rename app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/{text => chapters}/components/ChapterTitleAlignmentOption.kt (95%)

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 382df140..d71244c4 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
@@ -23,6 +23,7 @@ import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWit
 import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet
 import ua.acclorite.book_story.presentation.core.util.LocalActivity
 import ua.acclorite.book_story.presentation.settings.appearance.colors.ColorsSubcategory
+import ua.acclorite.book_story.presentation.settings.reader.chapters.ChaptersSubcategory
 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
@@ -120,6 +121,9 @@ fun ReaderSettingsBottomSheet(
                         TextSubcategory(
                             titleColor = { MaterialTheme.colorScheme.onSurface }
                         )
+                        ChaptersSubcategory(
+                            titleColor = { MaterialTheme.colorScheme.onSurface }
+                        )
                         TranslatorSubcategory(
                             titleColor = { MaterialTheme.colorScheme.onSurface },
                             showDivider = false
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 efa7e4b1..cd526f00 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,6 +6,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import ua.acclorite.book_story.presentation.settings.reader.chapters.ChaptersSubcategory
 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
@@ -24,6 +25,9 @@ fun LazyListScope.ReaderSettingsCategory(
     TextSubcategory(
         titleColor = titleColor
     )
+    ChaptersSubcategory(
+        titleColor = titleColor
+    )
     ReadingModeSubcategory(
         titleColor = titleColor
     )
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt
new file mode 100644
index 00000000..29fe8008
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/ChaptersSubcategory.kt
@@ -0,0 +1,30 @@
+@file:Suppress("FunctionName")
+
+package ua.acclorite.book_story.presentation.settings.reader.chapters
+
+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.res.stringResource
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
+import ua.acclorite.book_story.presentation.settings.reader.chapters.components.ChapterTitleAlignmentOption
+
+fun LazyListScope.ChaptersSubcategory(
+    titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary },
+    title: @Composable () -> String = { stringResource(id = R.string.chapters_reader_settings) },
+    showTitle: Boolean = true,
+    showDivider: Boolean = true,
+) {
+    SettingsSubcategory(
+        titleColor = titleColor,
+        title = title,
+        showTitle = showTitle,
+        showDivider = showDivider
+    ) {
+        item {
+            ChapterTitleAlignmentOption()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ChapterTitleAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
similarity index 95%
rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ChapterTitleAlignmentOption.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
index 8430d44b..8b886e34 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/text/components/ChapterTitleAlignmentOption.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/reader/chapters/components/ChapterTitleAlignmentOption.kt
@@ -1,4 +1,4 @@
-package ua.acclorite.book_story.presentation.settings.reader.text.components
+package ua.acclorite.book_story.presentation.settings.reader.chapters.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
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 bde02ab4..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
@@ -9,7 +9,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 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.ChapterTitleAlignmentOption
 import ua.acclorite.book_story.presentation.settings.reader.text.components.LineHeightOption
 import ua.acclorite.book_story.presentation.settings.reader.text.components.ParagraphHeightOption
 import ua.acclorite.book_story.presentation.settings.reader.text.components.ParagraphIndentationOption
@@ -31,10 +30,6 @@ fun LazyListScope.TextSubcategory(
             TextAlignmentOption()
         }
 
-        item {
-            ChapterTitleAlignmentOption()
-        }
-
         item {
             LineHeightOption()
         }
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 53b853fd..86a5bd40 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -136,6 +136,7 @@
     <string name="reading_speed_reader_settings">Швидкість читання</string>
     <string name="reading_mode_reader_settings">Режим читання</string>
     <string name="system_reader_settings">Система</string>
+    <string name="chapters_reader_settings">Розділи</string>
     <string name="theme_appearance_settings">Налаштування теми</string>
     <string name="colors_appearance_settings">Кольори</string>
     <string name="general_browse_settings">Головні</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dba06544..ce9e2ee0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,6 +189,7 @@
     <string name="reading_speed_reader_settings">Reading speed</string>
     <string name="reading_mode_reader_settings">Reading mode</string>
     <string name="system_reader_settings">System</string>
+    <string name="chapters_reader_settings">Chapters</string>
     <string name="theme_appearance_settings">Theme preferences</string>
     <string name="colors_appearance_settings">Colors</string>
     <string name="general_browse_settings">General</string>