Change settings screen to object (#8604)

2024-12-30 17:31:50 +01:00 · 2022-11-23 21:14:55 +07:00 · 2022-11-23 21:14:55 +07:00 · 7d34ff214c
commit 7d34ff214c
parent e2179a6669
14 changed files with 150 additions and 152 deletions
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
@ -52,7 +52,7 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.TimeZone

-class AboutScreen : Screen {
+object AboutScreen : Screen {

    @Composable
    override fun Content() {
@ -199,56 +199,54 @@ class AboutScreen : Screen {
        }
    }

-    companion object {
-        fun getVersionName(withBuildDate: Boolean): String {
-            return when {
-                BuildConfig.DEBUG -> {
-                    "Debug ${BuildConfig.COMMIT_SHA}".let {
-                        if (withBuildDate) {
-                            "$it (${getFormattedBuildTime()})"
-                        } else {
-                            it
-                        }
-                    }
-                }
-                BuildConfig.PREVIEW -> {
-                    "Preview r${BuildConfig.COMMIT_COUNT}".let {
-                        if (withBuildDate) {
-                            "$it (${BuildConfig.COMMIT_SHA}, ${getFormattedBuildTime()})"
-                        } else {
-                            "$it (${BuildConfig.COMMIT_SHA})"
-                        }
-                    }
-                }
-                else -> {
-                    "Stable ${BuildConfig.VERSION_NAME}".let {
-                        if (withBuildDate) {
-                            "$it (${getFormattedBuildTime()})"
-                        } else {
-                            it
-                        }
+    fun getVersionName(withBuildDate: Boolean): String {
+        return when {
+            BuildConfig.DEBUG -> {
+                "Debug ${BuildConfig.COMMIT_SHA}".let {
+                    if (withBuildDate) {
+                        "$it (${getFormattedBuildTime()})"
+                    } else {
+                        it
                    }
                }
            }
-        }
-
-        private fun getFormattedBuildTime(): String {
-            return try {
-                val inputDf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'", Locale.US)
-                inputDf.timeZone = TimeZone.getTimeZone("UTC")
-                val buildTime = inputDf.parse(BuildConfig.BUILD_TIME)
-
-                val outputDf = DateFormat.getDateTimeInstance(
-                    DateFormat.MEDIUM,
-                    DateFormat.SHORT,
-                    Locale.getDefault(),
-                )
-                outputDf.timeZone = TimeZone.getDefault()
-
-                buildTime!!.toDateTimestampString(UiPreferences.dateFormat(Injekt.get<UiPreferences>().dateFormat().get()))
-            } catch (e: Exception) {
-                BuildConfig.BUILD_TIME
+            BuildConfig.PREVIEW -> {
+                "Preview r${BuildConfig.COMMIT_COUNT}".let {
+                    if (withBuildDate) {
+                        "$it (${BuildConfig.COMMIT_SHA}, ${getFormattedBuildTime()})"
+                    } else {
+                        "$it (${BuildConfig.COMMIT_SHA})"
+                    }
+                }
+            }
+            else -> {
+                "Stable ${BuildConfig.VERSION_NAME}".let {
+                    if (withBuildDate) {
+                        "$it (${getFormattedBuildTime()})"
+                    } else {
+                        it
+                    }
+                }
            }
        }
    }
+
+    private fun getFormattedBuildTime(): String {
+        return try {
+            val inputDf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'", Locale.US)
+            inputDf.timeZone = TimeZone.getTimeZone("UTC")
+            val buildTime = inputDf.parse(BuildConfig.BUILD_TIME)
+
+            val outputDf = DateFormat.getDateTimeInstance(
+                DateFormat.MEDIUM,
+                DateFormat.SHORT,
+                Locale.getDefault(),
+            )
+            outputDf.timeZone = TimeZone.getDefault()
+
+            buildTime!!.toDateTimestampString(UiPreferences.dateFormat(Injekt.get<UiPreferences>().dateFormat().get()))
+        } catch (e: Exception) {
+            BuildConfig.BUILD_TIME
+        }
+    }
 }
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
@ -68,7 +68,7 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File

-class SettingsAdvancedScreen : SearchableSettings {
+object SettingsAdvancedScreen : SearchableSettings {
    @ReadOnlyComposable
    @Composable
    @StringRes
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
@ -27,7 +27,7 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.util.Date

-class SettingsAppearanceScreen : SearchableSettings {
+object SettingsAppearanceScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
@ -59,7 +59,7 @@ import kotlinx.coroutines.launch
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsBackupScreen : SearchableSettings {
+object SettingsBackupScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsBrowseScreen : SearchableSettings {
+object SettingsBrowseScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
@ -32,7 +32,7 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.io.File

-class SettingsDownloadScreen : SearchableSettings {
+object SettingsDownloadScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsGeneralScreen.kt
@ -25,7 +25,7 @@ import org.xmlpull.v1.XmlPullParser
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsGeneralScreen : SearchableSettings {
+object SettingsGeneralScreen : SearchableSettings {

    @Composable
    @ReadOnlyComposable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
@ -61,7 +61,7 @@ import kotlinx.coroutines.runBlocking
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsLibraryScreen : SearchableSettings {
+object SettingsLibraryScreen : SearchableSettings {

    @Composable
    @ReadOnlyComposable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
@ -175,84 +175,84 @@ object SettingsMainScreen : Screen {
    private fun Navigator.navigate(screen: Screen, twoPane: Boolean) {
        if (twoPane) replaceAll(screen) else push(screen)
    }
+
+    private data class Item(
+        @StringRes val titleRes: Int,
+        @StringRes val subtitleRes: Int,
+        val formatSubtitle: @Composable () -> String = { stringResource(subtitleRes) },
+        val icon: ImageVector,
+        val screen: Screen,
+    )
+
+    private val items = listOf(
+        Item(
+            titleRes = R.string.pref_category_general,
+            subtitleRes = R.string.pref_general_summary,
+            icon = Icons.Outlined.Tune,
+            screen = SettingsGeneralScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_appearance,
+            subtitleRes = R.string.pref_appearance_summary,
+            icon = Icons.Outlined.Palette,
+            screen = SettingsAppearanceScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_library,
+            subtitleRes = R.string.pref_library_summary,
+            icon = Icons.Outlined.CollectionsBookmark,
+            screen = SettingsLibraryScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_reader,
+            subtitleRes = R.string.pref_reader_summary,
+            icon = Icons.Outlined.ChromeReaderMode,
+            screen = SettingsReaderScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_downloads,
+            subtitleRes = R.string.pref_downloads_summary,
+            icon = Icons.Outlined.GetApp,
+            screen = SettingsDownloadScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_tracking,
+            subtitleRes = R.string.pref_tracking_summary,
+            icon = Icons.Outlined.Sync,
+            screen = SettingsTrackingScreen,
+        ),
+        Item(
+            titleRes = R.string.browse,
+            subtitleRes = R.string.pref_browse_summary,
+            icon = Icons.Outlined.Explore,
+            screen = SettingsBrowseScreen,
+        ),
+        Item(
+            titleRes = R.string.label_backup,
+            subtitleRes = R.string.pref_backup_summary,
+            icon = Icons.Outlined.SettingsBackupRestore,
+            screen = SettingsBackupScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_security,
+            subtitleRes = R.string.pref_security_summary,
+            icon = Icons.Outlined.Security,
+            screen = SettingsSecurityScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_advanced,
+            subtitleRes = R.string.pref_advanced_summary,
+            icon = Icons.Outlined.Code,
+            screen = SettingsAdvancedScreen,
+        ),
+        Item(
+            titleRes = R.string.pref_category_about,
+            subtitleRes = 0,
+            formatSubtitle = {
+                "${stringResource(R.string.app_name)} ${AboutScreen.getVersionName(withBuildDate = false)}"
+            },
+            icon = Icons.Outlined.Info,
+            screen = AboutScreen,
+        ),
+    )
 }
-
-private data class Item(
-    @StringRes val titleRes: Int,
-    @StringRes val subtitleRes: Int,
-    val formatSubtitle: @Composable () -> String = { stringResource(subtitleRes) },
-    val icon: ImageVector,
-    val screen: Screen,
-)
-
-private val items = listOf(
-    Item(
-        titleRes = R.string.pref_category_general,
-        subtitleRes = R.string.pref_general_summary,
-        icon = Icons.Outlined.Tune,
-        screen = SettingsGeneralScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_appearance,
-        subtitleRes = R.string.pref_appearance_summary,
-        icon = Icons.Outlined.Palette,
-        screen = SettingsAppearanceScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_library,
-        subtitleRes = R.string.pref_library_summary,
-        icon = Icons.Outlined.CollectionsBookmark,
-        screen = SettingsLibraryScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_reader,
-        subtitleRes = R.string.pref_reader_summary,
-        icon = Icons.Outlined.ChromeReaderMode,
-        screen = SettingsReaderScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_downloads,
-        subtitleRes = R.string.pref_downloads_summary,
-        icon = Icons.Outlined.GetApp,
-        screen = SettingsDownloadScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_tracking,
-        subtitleRes = R.string.pref_tracking_summary,
-        icon = Icons.Outlined.Sync,
-        screen = SettingsTrackingScreen(),
-    ),
-    Item(
-        titleRes = R.string.browse,
-        subtitleRes = R.string.pref_browse_summary,
-        icon = Icons.Outlined.Explore,
-        screen = SettingsBrowseScreen(),
-    ),
-    Item(
-        titleRes = R.string.label_backup,
-        subtitleRes = R.string.pref_backup_summary,
-        icon = Icons.Outlined.SettingsBackupRestore,
-        screen = SettingsBackupScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_security,
-        subtitleRes = R.string.pref_security_summary,
-        icon = Icons.Outlined.Security,
-        screen = SettingsSecurityScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_advanced,
-        subtitleRes = R.string.pref_advanced_summary,
-        icon = Icons.Outlined.Code,
-        screen = SettingsAdvancedScreen(),
-    ),
-    Item(
-        titleRes = R.string.pref_category_about,
-        subtitleRes = 0,
-        formatSubtitle = {
-            "${stringResource(R.string.app_name)} ${AboutScreen.getVersionName(withBuildDate = false)}"
-        },
-        icon = Icons.Outlined.Info,
-        screen = AboutScreen(),
-    ),
-)
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.util.system.isReleaseBuildType
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsReaderScreen : SearchableSettings {
+object SettingsReaderScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt
@ -282,16 +282,16 @@ private fun getLocalizedBreadcrumb(path: String, node: String?): String {
 }

 private val settingScreens = listOf(
-    SettingsGeneralScreen(),
-    SettingsAppearanceScreen(),
-    SettingsLibraryScreen(),
-    SettingsReaderScreen(),
-    SettingsDownloadScreen(),
-    SettingsTrackingScreen(),
-    SettingsBrowseScreen(),
-    SettingsBackupScreen(),
-    SettingsSecurityScreen(),
-    SettingsAdvancedScreen(),
+    SettingsGeneralScreen,
+    SettingsAppearanceScreen,
+    SettingsLibraryScreen,
+    SettingsReaderScreen,
+    SettingsDownloadScreen,
+    SettingsTrackingScreen,
+    SettingsBrowseScreen,
+    SettingsBackupScreen,
+    SettingsSecurityScreen,
+    SettingsAdvancedScreen,
 )

 private data class SettingsData(
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupport
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsSecurityScreen : SearchableSettings {
+object SettingsSecurityScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt
@ -59,7 +59,7 @@ import eu.kanade.tachiyomi.util.system.toast
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-class SettingsTrackingScreen : SearchableSettings {
+object SettingsTrackingScreen : SearchableSettings {

    @ReadOnlyComposable
    @Composable
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
@ -45,9 +45,9 @@ class SettingsMainController(bundle: Bundle = bundleOf()) : BasicFullComposeCont
            if (!isTabletUi) {
                Navigator(
                    screen = if (toBackupScreen) {
-                        SettingsBackupScreen()
+                        SettingsBackupScreen
                    } else if (toAboutScreen) {
-                        AboutScreen()
+                        AboutScreen
                    } else {
                        SettingsMainScreen
                    },
@ -63,11 +63,11 @@ class SettingsMainController(bundle: Bundle = bundleOf()) : BasicFullComposeCont
            } else {
                Navigator(
                    screen = if (toBackupScreen) {
-                        SettingsBackupScreen()
+                        SettingsBackupScreen
                    } else if (toAboutScreen) {
-                        AboutScreen()
+                        AboutScreen
                    } else {
-                        SettingsGeneralScreen()
+                        SettingsGeneralScreen
                    },
                ) {
                    TwoPanelBox(