From 4f59330c845618737d8dc0ba9d8c762c876ba06f Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 4 May 2022 17:27:05 -0400
Subject: [PATCH] use flowprefs for useLargeToolbar

---
 .../java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 --
 .../eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt   | 2 +-
 .../java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt   | 2 +-
 .../tachiyomi/ui/setting/SettingsAppearanceController.kt       | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 08ff977adf..7e26b5ed48 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -229,8 +229,6 @@ object PreferenceKeys {
 
     const val themeMangaDetails = "theme_manga_details"
 
-    const val useLargeToolbar = "use_large_toolbar"
-
     const val incognitoMode = "incognito_mode"
 
     const val sideNavMode = "side_nav_mode"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 4c28f337c0..a44c89b253 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -419,7 +419,7 @@ class PreferencesHelper(val context: Context) {
 
     fun themeMangaDetails() = prefs.getBoolean(Keys.themeMangaDetails, true)
 
-    fun useLargeToolbar() = prefs.getBoolean(Keys.useLargeToolbar, true)
+    fun useLargeToolbar() = flowPrefs.getBoolean("use_large_toolbar", true)
 
     fun dohProvider() = prefs.getInt(Keys.dohProvider, -1)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
index ec104ddf2a..af049599c5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt
@@ -48,7 +48,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att
     var mainActivity: MainActivity? = null
     private var isExtraSmall = false
     val useLargeToolbar: Boolean
-        get() = preferences.useLargeToolbar() && !isExtraSmall
+        get() = preferences.useLargeToolbar().get() && !isExtraSmall
 
     var compactSearchMode = false
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
index 147844139c..5d326386eb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt
@@ -88,10 +88,9 @@ class SettingsAppearanceController : SettingsController() {
 
         preferenceCategory {
             switchPreference {
-                key = Keys.useLargeToolbar
+                bindTo(preferences.useLargeToolbar())
                 titleRes = R.string.expanded_toolbar
                 summaryRes = R.string.show_larger_toolbar
-                defaultValue = true
 
                 onChange {
                     val useLarge = it as Boolean