mirror of
https://github.com/mihonapp/mihon.git
synced 2025-11-15 05:27:28 +01:00
Remove some minor settings
Some spring cleaning to remove some unnecessary complexity so things are easier to maintain. - Start screen: redundant with app shortcuts in Android 7.1+ - Jump to chapters: irrelevant in tablet mode and people can scroll a tiny bit if they really have to - Option to not scroll away bottom nav: issues with fast scroll will be irrelevant with it being replaced or removed in the Compose migrations Get ready for people malding over their special needs. https://xkcd.com/1172/
This commit is contained in:
@@ -83,15 +83,7 @@ class MainActivity : BaseActivity() {
|
||||
|
||||
private lateinit var router: Router
|
||||
|
||||
private val startScreenId by lazy {
|
||||
when (preferences.startScreen()) {
|
||||
2 -> R.id.nav_history
|
||||
3 -> R.id.nav_updates
|
||||
4 -> R.id.nav_browse
|
||||
else -> R.id.nav_library
|
||||
}
|
||||
}
|
||||
|
||||
private val startScreenId = R.id.nav_library
|
||||
private var isConfirmingExit: Boolean = false
|
||||
private var isHandlingShortcut: Boolean = false
|
||||
|
||||
|
||||
@@ -265,18 +265,6 @@ class MangaController :
|
||||
.build()
|
||||
it.adapter = ConcatAdapter(config, mangaInfoAdapter, chaptersHeaderAdapter, chaptersAdapter)
|
||||
|
||||
// Skips directly to chapters list if navigated to from the library
|
||||
it.post {
|
||||
if (!fromSource && preferences.jumpToChapters()) {
|
||||
val mainActivityAppBar = (activity as? MainActivity)?.binding?.appbar
|
||||
(it.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
|
||||
1,
|
||||
mainActivityAppBar?.height ?: 0,
|
||||
)
|
||||
mainActivityAppBar?.isLifted = true
|
||||
}
|
||||
}
|
||||
|
||||
it.scrollStateChanges()
|
||||
.onEach { _ ->
|
||||
// Disable swipe refresh when view is not at the top
|
||||
|
||||
@@ -93,10 +93,10 @@ class SettingsAppearanceController : SettingsController() {
|
||||
}
|
||||
}
|
||||
|
||||
preferenceCategory {
|
||||
titleRes = R.string.pref_category_navigation
|
||||
if (context.isTablet()) {
|
||||
preferenceCategory {
|
||||
titleRes = R.string.pref_category_navigation
|
||||
|
||||
if (context.isTablet()) {
|
||||
intListPreference {
|
||||
bindTo(preferences.sideNavIconAlignment())
|
||||
titleRes = R.string.pref_side_nav_icon_alignment
|
||||
@@ -108,11 +108,6 @@ class SettingsAppearanceController : SettingsController() {
|
||||
entryValues = arrayOf("0", "1", "2")
|
||||
summary = "%s"
|
||||
}
|
||||
} else {
|
||||
switchPreference {
|
||||
bindTo(preferences.hideBottomBarOnScroll())
|
||||
titleRes = R.string.pref_hide_bottom_bar_on_scroll
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,6 @@ import androidx.preference.PreferenceScreen
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.util.preference.bindTo
|
||||
import eu.kanade.tachiyomi.util.preference.defaultValue
|
||||
import eu.kanade.tachiyomi.util.preference.entriesRes
|
||||
import eu.kanade.tachiyomi.util.preference.intListPreference
|
||||
import eu.kanade.tachiyomi.util.preference.onClick
|
||||
import eu.kanade.tachiyomi.util.preference.preference
|
||||
import eu.kanade.tachiyomi.util.preference.switchPreference
|
||||
@@ -20,19 +18,6 @@ class SettingsGeneralController : SettingsController() {
|
||||
override fun setupPreferenceScreen(screen: PreferenceScreen) = screen.apply {
|
||||
titleRes = R.string.pref_category_general
|
||||
|
||||
intListPreference {
|
||||
key = Keys.startScreen
|
||||
titleRes = R.string.pref_start_screen
|
||||
entriesRes = arrayOf(
|
||||
R.string.label_library,
|
||||
R.string.label_recent_updates,
|
||||
R.string.label_recent_manga,
|
||||
R.string.browse,
|
||||
)
|
||||
entryValues = arrayOf("1", "3", "2", "4")
|
||||
defaultValue = "1"
|
||||
summary = "%s"
|
||||
}
|
||||
switchPreference {
|
||||
bindTo(preferences.showUpdatesNavBadge())
|
||||
titleRes = R.string.pref_library_update_show_tab_badge
|
||||
|
||||
@@ -35,7 +35,6 @@ 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.materialdialogs.QuadStateTextView
|
||||
import eu.kanade.tachiyomi.widget.materialdialogs.setQuadStateMultiChoiceItems
|
||||
import kotlinx.coroutines.flow.combine
|
||||
@@ -84,13 +83,6 @@ class SettingsLibraryController : SettingsController() {
|
||||
}
|
||||
.launchIn(viewScope)
|
||||
}
|
||||
if (!context.isTablet()) {
|
||||
switchPreference {
|
||||
key = Keys.jumpToChapters
|
||||
titleRes = R.string.pref_jump_to_chapters
|
||||
defaultValue = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
preferenceCategory {
|
||||
|
||||
Reference in New Issue
Block a user