From abbb329ba614ff2c14bde2391adbb4aedb36bf75 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 19 Apr 2020 16:02:33 -0400
Subject: [PATCH] Rename offline mode to downloaded only

---
 .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 +-
 .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 2 +-
 .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt    | 2 +-
 .../kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt   | 4 ++--
 .../tachiyomi/ui/manga/chapter/ChaptersController.kt      | 2 +-
 .../tachiyomi/ui/manga/chapter/ChaptersPresenter.kt       | 8 ++++----
 .../java/eu/kanade/tachiyomi/ui/more/MoreController.kt    | 4 ++--
 app/src/main/res/values/strings.xml                       | 2 +-
 8 files changed, 13 insertions(+), 13 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 c7299157a2..84c1784cf6 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
@@ -99,7 +99,7 @@ object PreferenceKeys {
 
     const val libraryUpdatePrioritization = "library_update_prioritization"
 
-    const val offlineMode = "pref_offline_mode"
+    const val downloadedOnly = "pref_downloaded_only"
 
     const val filterDownloaded = "pref_filter_downloaded_key"
 
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 4eff9eb6eb..8df791152d 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
@@ -183,7 +183,7 @@ class PreferencesHelper(val context: Context) {
 
     fun downloadBadge() = rxPrefs.getBoolean(Keys.downloadBadge, false)
 
-    fun offlineMode() = flowPrefs.getBoolean(Keys.offlineMode, false)
+    fun downloadedOnly() = flowPrefs.getBoolean(Keys.downloadedOnly, false)
 
     fun filterDownloaded() = rxPrefs.getBoolean(Keys.filterDownloaded, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index e11d382513..f9f0d33a27 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -111,7 +111,7 @@ class LibraryPresenter(
      * @param map the map to filter.
      */
     private fun applyFilters(map: LibraryMap): LibraryMap {
-        val filterDownloaded = preferences.offlineMode().get() || preferences.filterDownloaded().getOrDefault()
+        val filterDownloaded = preferences.downloadedOnly().get() || preferences.filterDownloaded().getOrDefault()
         val filterUnread = preferences.filterUnread().getOrDefault()
         val filterCompleted = preferences.filterCompleted().getOrDefault()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
index e7d04c58c3..1773b619a4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
@@ -96,8 +96,8 @@ class LibrarySettingsSheet(
             override val footer = Item.Separator()
 
             override fun initModels() {
-                downloaded.checked = preferences.offlineMode().get() || preferences.filterDownloaded().getOrDefault()
-                downloaded.enabled = !preferences.offlineMode().get()
+                downloaded.checked = preferences.downloadedOnly().get() || preferences.filterDownloaded().getOrDefault()
+                downloaded.enabled = !preferences.downloadedOnly().get()
                 unread.checked = preferences.filterUnread().getOrDefault()
                 completed.checked = preferences.filterCompleted().getOrDefault()
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
index bb2640d1b2..47b22fa186 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
@@ -155,7 +155,7 @@ class ChaptersController : NucleusController<ChaptersControllerBinding, Chapters
         menuFilterRead.isChecked = presenter.onlyRead()
         menuFilterUnread.isChecked = presenter.onlyUnread()
         menuFilterDownloaded.isChecked = presenter.onlyDownloaded()
-        menuFilterDownloaded.isEnabled = !presenter.isOfflineMode()
+        menuFilterDownloaded.isEnabled = !presenter.forceDownloaded()
         menuFilterBookmarked.isChecked = presenter.onlyBookmarked()
 
         val filterSet = presenter.onlyRead() || presenter.onlyUnread() || presenter.onlyDownloaded() || presenter.onlyBookmarked()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
index 870e2c7cc2..e174e03d89 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
@@ -367,17 +367,17 @@ class ChaptersPresenter(
     }
 
     /**
-     * Whether offline mode is enabled (i.e. force only downloaded content).
+     * Whether downloaded only mode is enabled.
      */
-    fun isOfflineMode(): Boolean {
-        return preferences.offlineMode().get()
+    fun forceDownloaded(): Boolean {
+        return preferences.downloadedOnly().get()
     }
 
     /**
      * Whether the display only downloaded filter is enabled.
      */
     fun onlyDownloaded(): Boolean {
-        return isOfflineMode() || manga.downloadedFilter == Manga.SHOW_DOWNLOADED
+        return forceDownloaded() || manga.downloadedFilter == Manga.SHOW_DOWNLOADED
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
index b28910d15b..d475809fcb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@@ -32,8 +32,8 @@ class MoreController : SettingsController(), RootController {
         val tintColor = context.getResourceColor(R.attr.colorAccent)
 
         switchPreference {
-            key = Keys.offlineMode
-            titleRes = R.string.label_offline_mode
+            key = Keys.downloadedOnly
+            titleRes = R.string.label_downloaded_only
             iconRes = R.drawable.ic_cloud_off_24dp
             iconTint = tintColor
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f3fb74d6b..a355c7642b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
 
     <!-- Activities and fragments labels (toolbar title) -->
     <string name="label_more">More</string>
-    <string name="label_offline_mode">Offline mode</string>
+    <string name="label_downloaded_only">Downloaded only</string>
     <string name="label_settings">Settings</string>
     <string name="label_download_queue">Download queue</string>
     <string name="label_library">Library</string>