Remove help/about from main settings

3 commits back as mentioned added help/about in the overflow dialog, so they can be removed from here
This commit is contained in:
Jays2Kings 2021-04-18 00:57:16 -04:00
parent 27d49401ae
commit 19ce2d2427
5 changed files with 0 additions and 30 deletions

View File

@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.ui.library.display
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Context import android.content.Context
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.style.ForegroundColorSpan
import android.util.AttributeSet import android.util.AttributeSet
import android.view.ViewTreeObserver import android.view.ViewTreeObserver
import android.widget.SeekBar import android.widget.SeekBar
@ -15,7 +12,6 @@ import eu.kanade.tachiyomi.databinding.LibraryDisplayLayoutBinding
import eu.kanade.tachiyomi.util.bindToPreference import eu.kanade.tachiyomi.util.bindToPreference
import eu.kanade.tachiyomi.util.lang.withSubtitle import eu.kanade.tachiyomi.util.lang.withSubtitle
import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.rowsForValue import eu.kanade.tachiyomi.util.view.rowsForValue
import eu.kanade.tachiyomi.widget.BaseLibraryDisplayView import eu.kanade.tachiyomi.widget.BaseLibraryDisplayView
import eu.kanade.tachiyomi.widget.EndAnimatorListener import eu.kanade.tachiyomi.widget.EndAnimatorListener

View File

@ -1,9 +1,6 @@
package eu.kanade.tachiyomi.ui.recents package eu.kanade.tachiyomi.ui.recents
import android.app.Activity import android.app.Activity
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.style.ForegroundColorSpan
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.text.set import androidx.core.text.set
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
@ -13,7 +10,6 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.RecentsOptionsSheetBinding import eu.kanade.tachiyomi.databinding.RecentsOptionsSheetBinding
import eu.kanade.tachiyomi.util.bindToPreference import eu.kanade.tachiyomi.util.bindToPreference
import eu.kanade.tachiyomi.util.lang.withSubtitle import eu.kanade.tachiyomi.util.lang.withSubtitle
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener
import eu.kanade.tachiyomi.util.view.setEdgeToEdge import eu.kanade.tachiyomi.util.view.setEdgeToEdge
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy

View File

@ -10,7 +10,6 @@ import com.bluelinelabs.conductor.RouterTransaction
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.setting.search.SettingsSearchController import eu.kanade.tachiyomi.ui.setting.search.SettingsSearchController
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.openInBrowser
import eu.kanade.tachiyomi.util.view.withFadeTransaction import eu.kanade.tachiyomi.util.view.withFadeTransaction
class SettingsMainController : SettingsController() { class SettingsMainController : SettingsController() {
@ -78,12 +77,6 @@ class SettingsMainController : SettingsController() {
titleRes = R.string.advanced titleRes = R.string.advanced
onClick { navigateTo(SettingsAdvancedController()) } onClick { navigateTo(SettingsAdvancedController()) }
} }
preference {
iconRes = R.drawable.ic_info_24dp
iconTint = tintColor
titleRes = R.string.about
onClick { navigateTo(AboutController()) }
}
this this
} }
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@ -114,14 +107,6 @@ class SettingsMainController : SettingsController() {
) )
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.action_help -> activity?.openInBrowser(URL_HELP)
else -> return super.onOptionsItemSelected(item)
}
return true
}
private fun navigateTo(controller: Controller) { private fun navigateTo(controller: Controller) {
router.pushController(controller.withFadeTransaction()) router.pushController(controller.withFadeTransaction())
} }

View File

@ -59,7 +59,6 @@ class SettingsSearchController :
inflater.inflate(R.menu.settings_main, menu) inflater.inflate(R.menu.settings_main, menu)
// Initialize search menu // Initialize search menu
menu.findItem(R.id.action_help).isVisible = false
val searchItem = menu.findItem(R.id.action_search) val searchItem = menu.findItem(R.id.action_search)
searchView = searchItem.actionView as SearchView searchView = searchItem.actionView as SearchView
searchView.maxWidth = Int.MAX_VALUE searchView.maxWidth = Int.MAX_VALUE

View File

@ -8,10 +8,4 @@
android:title="@string/search" android:title="@string/search"
app:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="collapseActionView|ifRoom" /> app:showAsAction="collapseActionView|ifRoom" />
<item
android:id="@+id/action_help"
android:title="@string/help"
android:icon="@drawable/ic_help_24dp"
app:showAsAction="ifRoom"/>
</menu> </menu>