From ff249f41f7c92a05eca0d7902a73afb76e7c5dc8 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 6 May 2022 12:57:34 -0400 Subject: [PATCH] Remove debug search view logic since the logic works fine now --- .../tachiyomi/ui/recents/RecentsController.kt | 17 ----------------- .../tachiyomi/ui/source/BrowseController.kt | 9 --------- .../ui/source/browse/BrowseSourceController.kt | 14 -------------- 3 files changed, 40 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index a3a5870111..72d91adcde 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -11,7 +11,6 @@ import android.view.MenuItem import android.view.RoundedCorner import android.view.View import android.view.ViewGroup -import androidx.appcompat.widget.SearchView import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.isInvisible import androidx.core.view.isVisible @@ -28,7 +27,6 @@ import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar import com.google.android.material.tabs.TabLayout import eu.davidea.flexibleadapter.FlexibleAdapter -import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupRestoreService import eu.kanade.tachiyomi.data.database.models.History @@ -480,21 +478,6 @@ class RecentsController(bundle: Bundle? = null) : } setBottomPadding() binding.downloadBottomSheet.dlBottomSheet.update(!presenter.downloadManager.isPaused()) - - if (BuildConfig.DEBUG && query.isBlank() && isControllerVisible) { - val searchItem = - (activity as? MainActivity)?.binding?.searchToolbar?.menu?.findItem(R.id.action_search) - val searchView = searchItem?.actionView as? SearchView ?: return - if (!isControllerVisible) return - setOnQueryTextChangeListener(searchView) { - if (query != it) { - query = it ?: return@setOnQueryTextChangeListener false - resetProgressItem() - refresh() - } - true - } - } } override fun onDestroy() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index 1202108287..82aa1574b0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -26,7 +26,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.snackbar.Snackbar import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible -import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.BrowseControllerBinding @@ -475,14 +474,6 @@ class BrowseController : if (showingExtensions) { updateSheetMenu() } - if (BuildConfig.DEBUG && isControllerVisible) { - val searchView = activityBinding?.searchToolbar?.searchView - - setOnQueryTextChangeListener(searchView, onlyOnSubmit = true) { - if (!it.isNullOrBlank()) performGlobalSearch(it) - true - } - } } override fun onItemClick(view: View, position: Int): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt index d0a03da99f..3dab90149f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.source.browse -import android.app.Activity import android.os.Build import android.os.Bundle import android.view.LayoutInflater @@ -20,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.snackbar.Snackbar import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible -import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper @@ -495,18 +493,6 @@ open class BrowseSourceController(bundle: Bundle) : } } - override fun onActivityResumed(activity: Activity) { - super.onActivityResumed(activity) - - if (BuildConfig.DEBUG && isControllerVisible) { - val searchView = activityBinding?.searchToolbar?.searchView - setOnQueryTextChangeListener(searchView, onlyOnSubmit = true, hideKbOnSubmit = true) { - searchWithQuery(it ?: "") - true - } - } - } - /** * Called from the presenter when the network request fails. *