From 6523826a55748df84a410bc624febb63904e6c7e Mon Sep 17 00:00:00 2001
From: jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 25 May 2020 13:39:14 -0400
Subject: [PATCH] Comfortable Grid (#3238) (my last few changes from preview)

* Comfortable Grid

* Add requested changes

* Add more requested changes

(cherry picked from commit 52e82b35483910620a855935a803998e657e6a9e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
#	app/src/main/res/menu/source_browse.xml
#	app/src/main/res/values/strings.xml
---
 .../data/preference/PreferencesHelper.kt          |  5 +++--
 .../browse/source/browse/BrowseSourcePresenter.kt | 15 ++++++++-------
 app/src/main/res/menu/source_browse.xml           |  6 +++---
 app/src/main/res/values/strings.xml               |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

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 b0f7bfb9f..e16086e5b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -7,6 +7,7 @@ import androidx.preference.PreferenceManager
 import com.tfcporciuncula.flow.FlowSharedPreferences
 import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -138,7 +139,7 @@ class PreferencesHelper(val context: Context) {
 
     fun lastVersionCode() = flowPrefs.getInt("last_version_code", 0)
 
-    fun catalogueDisplayMode() = flowPrefs.getInt(Keys.catalogueDisplayMode, 0)
+    fun catalogueDisplayMode() = flowPrefs.getInt(Keys.catalogueDisplayMode, DISPLAY_COMPACT_GRID)
 
     fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("all", "en", Locale.getDefault().language))
 
@@ -186,7 +187,7 @@ class PreferencesHelper(val context: Context) {
 
     fun libraryUpdatePrioritization() = flowPrefs.getInt(Keys.libraryUpdatePrioritization, 0)
 
-    fun libraryDisplayMode() = flowPrefs.getInt(Keys.libraryDisplayMode, 0)
+    fun libraryDisplayMode() = flowPrefs.getInt(Keys.libraryDisplayMode, DISPLAY_COMPACT_GRID)
 
     fun downloadBadge() = flowPrefs.getBoolean(Keys.downloadBadge, false)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
index b4babfa2b..b37c1dba6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
@@ -72,6 +72,7 @@ open class BrowseSourcePresenter(
      */
     var query = if (recommends) "" else searchQuery ?: ""
         private set
+
     /**
      * Modifiable list of filters.
      */
@@ -197,13 +198,6 @@ open class BrowseSourcePresenter(
         return pager.hasNextPage
     }
 
-    /**
-     * Refeshes the display mode.
-     */
-    fun refreshDisplayMode() {
-        subscribeToMangaInitializer()
-    }
-
     /**
      * Subscribes to the initializer of manga details and updates the view if needed.
      */
@@ -285,6 +279,13 @@ open class BrowseSourcePresenter(
         db.insertManga(manga).executeAsBlocking()
     }
 
+    /**
+     * Refreshes the active display mode.
+     */
+    fun refreshDisplayMode() {
+        subscribeToMangaInitializer()
+    }
+
     /**
      * Set the filter states for the current source.
      *
diff --git a/app/src/main/res/menu/source_browse.xml b/app/src/main/res/menu/source_browse.xml
index 7f3157c7e..e98a68bb4 100644
--- a/app/src/main/res/menu/source_browse.xml
+++ b/app/src/main/res/menu/source_browse.xml
@@ -19,12 +19,12 @@
                 <item
                     android:id="@+id/action_compact_grid"
                     android:title="@string/action_display_grid" />
-                <item
-                    android:id="@+id/action_list"
-                    android:title="@string/action_display_list" />
                 <item
                     android:id="@+id/action_comfortable_grid"
                     android:title="@string/action_display_comfortable_grid" />
+                <item
+                    android:id="@+id/action_list"
+                    android:title="@string/action_display_list" />
             </group>
         </menu>
     </item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22e6c9174..46437d815 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,8 +81,9 @@
     <string name="action_migrate">Migrate</string>
     <string name="action_display_mode">Display mode</string>
     <string name="action_display">Display</string>
-    <string name="action_display_grid">Compact Grid</string>
+    <string name="action_display_grid">Compact grid</string>
     <string name="action_display_list">List</string>
+    <string name="action_display_comfortable_grid">Comfortable grid</string>
     <string name="action_display_download_badge">Download badges</string>
     <string name="action_display_unread_badge">Unread badges</string>
     <string name="action_hide">Hide</string>
@@ -566,7 +567,6 @@
     <string name="migration_info">Tap to select the source to migrate from</string>
     <string name="migration_dialog_what_to_include">Select data to include</string>
     <string name="migration_selection_prompt">Select a source to migrate from</string>
-    <string name="select">Select</string>
     <string name="migrate">Migrate</string>
     <string name="copy">Copy</string>