Hide irrelevant settings on tablets

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -237,6 +237,18 @@ class MangaController :
             it.scrollEvents()
                 .onEach { updateToolbarTitleAlpha() }
                 .launchIn(viewScope)
+
+            // Skips directly to chapters list if navigated to from the library
+            it.post {
+                if (!fromSource && preferences.jumpToChapters()) {
+                    (it.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(1, 0)
+                }
+
+                // Delayed in case we need to jump to chapters
+                it.post {
+                    updateToolbarTitleAlpha()
+                }
+            }
         }
         // Tablet layout
         binding.infoRecycler?.let {
@@ -248,19 +260,7 @@ class MangaController :
 
         chaptersAdapter?.fastScroller = binding.fastScroller
 
-        actionFabScrollListener = actionFab?.shrinkOnScroll(chaptersRecycler)
+        actionFabScrollListener = actionFab?.shrinkOnScroll(chapterRecycler)
-
-        // Skips directly to chapters list if navigated to from the library
-        chaptersRecycler.post {
-            if (!fromSource && preferences.jumpToChapters()) {
-                (chaptersRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(1, 0)
-            }
-
-            // Delayed in case we need to jump to chapters
-            binding.fullRecycler?.post {
-                updateToolbarTitleAlpha()
-            }
-        }
 
         binding.swipeRefresh.refreshes()
             .onEach {
@@ -340,7 +340,7 @@ class MangaController :
 
     override fun cleanupFab(fab: ExtendedFloatingActionButton) {
         fab.setOnClickListener(null)
-        actionFabScrollListener?.let { binding.fullRecycler?.removeOnScrollListener(it) }
+        actionFabScrollListener?.let { chapterRecycler.removeOnScrollListener(it) }
         actionFab = null
     }
 
@@ -1103,7 +1103,7 @@ class MangaController :
 
     // Tracker sheet - end
 
-    private val chaptersRecycler: RecyclerView
+    private val chapterRecycler: RecyclerView
         get() = binding.fullRecycler ?: binding.chaptersRecycler!!
 
     companion object {

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt

@@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.LocaleHelper
+import eu.kanade.tachiyomi.util.system.isTablet
 import kotlinx.coroutines.flow.launchIn
 import java.util.Date
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
@@ -45,10 +46,12 @@ class SettingsGeneralController : SettingsController() {
             titleRes = R.string.pref_confirm_exit
             defaultValue = false
         }
-        switchPreference {
+        if (!context.isTablet()) {
-            key = Keys.hideBottomBar
+            switchPreference {
-            titleRes = R.string.pref_hide_bottom_bar_on_scroll
+                key = Keys.hideBottomBar
-            defaultValue = true
+                titleRes = R.string.pref_hide_bottom_bar_on_scroll
+                defaultValue = true
+            }
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt

@@ -28,6 +28,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
+import eu.kanade.tachiyomi.util.system.isTablet
 import eu.kanade.tachiyomi.widget.MinMaxNumberPicker
 import eu.kanade.tachiyomi.widget.materialdialogs.QuadStateCheckBox
 import eu.kanade.tachiyomi.widget.materialdialogs.listItemsQuadStateMultiChoice
@@ -75,10 +76,12 @@ class SettingsLibraryController : SettingsController() {
                     }
                     .launchIn(viewScope)
             }
-            switchPreference {
+            if (!context.isTablet()) {
-                key = Keys.jumpToChapters
+                switchPreference {
-                titleRes = R.string.pref_jump_to_chapters
+                    key = Keys.jumpToChapters
-                defaultValue = false
+                    titleRes = R.string.pref_jump_to_chapters
+                    defaultValue = false
+                }
             }
         }
 

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -258,3 +258,10 @@ fun Context.createFileInCacheDir(name: String): File {
     file.createNewFile()
     return file
 }
+
+/**
+ * We consider anything with a width of >= 600dp as a tablet, i.e. with layouts in layout-sw600dp.
+ */
+fun Context.isTablet(): Boolean {
+    return resources.configuration.screenWidthDp >= 600
+}