Comfortable Grid (#3238) (my last few changes from preview)

* Comfortable Grid

* Add requested changes

* Add more requested changes

(cherry picked from commit 52e82b3548)

# 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

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)
 

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.
      *