From 0225711f6f91417af0ae41d42f81c70c86a572ab Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 18 Sep 2022 17:22:54 -0400 Subject: [PATCH] Clean up base classes Should be able to throw away some of the search controller stuff after Global Search is migrated --- .../ui/base/controller/BaseController.kt | 51 ------------------- .../ui/base/controller/NucleusController.kt | 2 +- .../ui/base/controller/RxController.kt | 31 ----------- .../controller/SearchableNucleusController.kt | 49 ++++++++++-------- .../ui/base/presenter/BasePresenter.kt | 9 ---- .../globalsearch/GlobalSearchController.kt | 2 - .../tachiyomi/ui/more/MoreController.kt | 3 -- .../tachiyomi/ui/reader/ReaderPresenter.kt | 9 ++++ .../ui/setting/SettingsController.kt | 15 +----- .../kanade/tachiyomi/util/storage/DiskUtil.kt | 7 +-- .../core/security/SecurityPreferences.kt | 1 - 11 files changed, 42 insertions(+), 137 deletions(-) delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt index 9003b2ce30..94039e8891 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.base.controller import android.os.Bundle import android.view.LayoutInflater -import android.view.MenuItem import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity @@ -75,60 +74,10 @@ abstract class BaseController(bundle: Bundle? = null) : Contro } fun setTitle(title: String? = null) { - var parentController = parentController - while (parentController != null) { - if (parentController is BaseController<*> && parentController.getTitle() != null) { - return - } - parentController = parentController.parentController - } - (activity as? AppCompatActivity)?.supportActionBar?.title = title ?: getTitle() } private fun Controller.instance(): String { return "${javaClass.simpleName}@${Integer.toHexString(hashCode())}" } - - /** - * Workaround for buggy menu item layout after expanding/collapsing an expandable item like a SearchView. - * This method should be removed when fixed upstream. - * Issue link: https://issuetracker.google.com/issues/37657375 - */ - var expandActionViewFromInteraction = false - - fun MenuItem.fixExpand(onExpand: ((MenuItem) -> Boolean)? = null, onCollapse: ((MenuItem) -> Boolean)? = null) { - setOnActionExpandListener( - object : MenuItem.OnActionExpandListener { - override fun onMenuItemActionExpand(item: MenuItem): Boolean { - return onExpand?.invoke(item) ?: true - } - - override fun onMenuItemActionCollapse(item: MenuItem): Boolean { - activity?.invalidateOptionsMenu() - - return onCollapse?.invoke(item) ?: true - } - }, - ) - - if (expandActionViewFromInteraction) { - expandActionViewFromInteraction = false - expandActionView() - } - } - - /** - * Workaround for menu items not disappearing when expanding an expandable item like a SearchView. - * [expandActionViewFromInteraction] should be set to true in [onOptionsItemSelected] when the expandable item is selected - * This method should be called as part of [MenuItem.OnActionExpandListener.onMenuItemActionExpand] - */ - open fun invalidateMenuOnExpand(): Boolean { - return if (expandActionViewFromInteraction) { - activity?.invalidateOptionsMenu() - false - } else { - true - } - } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt index 0786d5e137..89dfd23990 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt @@ -9,7 +9,7 @@ import nucleus.presenter.Presenter @Suppress("LeakingThis") abstract class NucleusController>(val bundle: Bundle? = null) : - RxController(bundle), + BaseController(bundle), PresenterFactory

{ private val delegate = NucleusConductorDelegate(this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt deleted file mode 100644 index 493504aeb7..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt +++ /dev/null @@ -1,31 +0,0 @@ -package eu.kanade.tachiyomi.ui.base.controller - -import android.os.Bundle -import android.view.View -import androidx.annotation.CallSuper -import androidx.viewbinding.ViewBinding -import rx.Observable -import rx.Subscription -import rx.subscriptions.CompositeSubscription - -abstract class RxController(bundle: Bundle? = null) : BaseController(bundle) { - - private var untilDestroySubscriptions = CompositeSubscription() - - @CallSuper - override fun onViewCreated(view: View) { - if (untilDestroySubscriptions.isUnsubscribed) { - untilDestroySubscriptions = CompositeSubscription() - } - } - - @CallSuper - override fun onDestroyView(view: View) { - super.onDestroyView(view) - untilDestroySubscriptions.unsubscribe() - } - - fun Observable.subscribeUntilDestroy(onNext: (T) -> Unit): Subscription { - return subscribe(onNext).also { untilDestroySubscriptions.add(it) } - } -} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt index 34b01895dd..48d6fd4c48 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt @@ -6,7 +6,6 @@ import android.text.style.CharacterStyle import android.view.Menu import android.view.MenuInflater import android.view.MenuItem -import androidx.annotation.StringRes import androidx.appcompat.widget.SearchView import androidx.core.text.getSpans import androidx.core.widget.doAfterTextChanged @@ -43,10 +42,7 @@ abstract class SearchableNucleusController Boolean)? = null, onCollapse: ((MenuItem) -> Boolean)? = null) { + setOnActionExpandListener( + object : MenuItem.OnActionExpandListener { + override fun onMenuItemActionExpand(item: MenuItem): Boolean { + return onExpand?.invoke(item) ?: true + } + + override fun onMenuItemActionCollapse(item: MenuItem): Boolean { + activity?.invalidateOptionsMenu() + + return onCollapse?.invoke(item) ?: true + } + }, + ) + + if (expandActionViewFromInteraction) { + expandActionViewFromInteraction = false + expandActionView() + } + } + /** * During the conversion to SearchableNucleusController (after which I plan to merge its code * into BaseController) this addresses an issue where the searchView.onTextFocus event is not * triggered */ - override fun invalidateMenuOnExpand(): Boolean { + private fun invalidateMenuOnExpand(): Boolean { return if (expandActionViewFromInteraction) { activity?.invalidateOptionsMenu() setCurrentSearchViewState(SearchViewState.FOCUSED) // we are technically focused here diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt index edc2a77525..2a373aad4e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt @@ -40,15 +40,6 @@ open class BasePresenter : RxPresenter() { fun Preference.asState() = PreferenceMutableState(this, presenterScope) - /** - * Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle - * subscription list. - * - * @param onNext function to execute when the observable emits an item. - * @param onError function to execute when the observable throws an error. - */ - fun Observable.subscribeFirst(onNext: (V, T) -> Unit, onError: ((V, Throwable) -> Unit) = { _, _ -> }) = compose(deliverFirst()).subscribe(split(onNext, onError)).apply { add(this) } - /** * Subscribes an observable with [deliverLatestCache] and adds it to the presenter's lifecycle * subscription list. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index 2304826d6c..46a243b1a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -92,8 +92,6 @@ open class GlobalSearchController( inflater, R.menu.global_search, R.id.action_search, - null, - false, // the onMenuItemActionExpand will handle this ) optionsMenuSearchItem = menu.findItem(R.id.action_search) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 80c0052d3c..7e43a24ddb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.more import androidx.compose.runtime.Composable import eu.kanade.presentation.more.MoreScreen -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.FullComposeController import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.pushController @@ -15,8 +14,6 @@ class MoreController : FullComposeController(), RootController { - override fun getTitle() = resources?.getString(R.string.label_more) - override fun createPresenter() = MorePresenter() @Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index e9e2e33dd6..033e0cab41 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -879,6 +879,15 @@ class ReaderPresenter( } } + /** + * Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle + * subscription list. + * + * @param onNext function to execute when the observable emits an item. + * @param onError function to execute when the observable throws an error. + */ + private fun Observable.subscribeFirst(onNext: (ReaderActivity, T) -> Unit, onError: ((ReaderActivity, Throwable) -> Unit) = { _, _ -> }) = compose(deliverFirst()).subscribe(split(onNext, onError)).apply { add(this) } + companion object { // Safe theoretical max filename size is 255 bytes and 1 char = 2-4 bytes (UTF-8) private const val MAX_FILE_NAME_BYTES = 250 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt index a2e20a57d5..79445818f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt @@ -21,7 +21,6 @@ import com.bluelinelabs.conductor.ControllerChangeType import dev.chrisbanes.insetter.applyInsetter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.util.preference.asHotFlow import eu.kanade.tachiyomi.util.system.getResourceColor import kotlinx.coroutines.CoroutineScope @@ -114,20 +113,8 @@ abstract class SettingsController : PreferenceController() { } } - open fun getTitle(): String? { - return preferenceScreen?.title?.toString() - } - private fun setTitle() { - var parentController = parentController - while (parentController != null) { - if (parentController is BaseController<*> && parentController.getTitle() != null) { - return - } - parentController = parentController.parentController - } - - (activity as? AppCompatActivity)?.supportActionBar?.title = getTitle() + (activity as? AppCompatActivity)?.supportActionBar?.title = preferenceScreen?.title?.toString() } inline fun Preference.visibleIf(preference: eu.kanade.tachiyomi.core.preference.Preference, crossinline block: (T) -> Boolean) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt index bcbbf25209..50a5099e90 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt @@ -43,9 +43,8 @@ object DiskUtil { /** * Returns the root folders of all the available external storages. */ - fun getExternalStorages(context: Context): Collection { - val directories = mutableSetOf() - directories += ContextCompat.getExternalFilesDirs(context, null) + fun getExternalStorages(context: Context): List { + return ContextCompat.getExternalFilesDirs(context, null) .filterNotNull() .mapNotNull { val file = File(it.absolutePath.substringBefore("/Android/")) @@ -56,8 +55,6 @@ object DiskUtil { null } } - - return directories } /** diff --git a/core/src/main/java/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt b/core/src/main/java/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt index d4aeb5c380..dbd1194eaf 100644 --- a/core/src/main/java/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/core/security/SecurityPreferences.kt @@ -27,5 +27,4 @@ class SecurityPreferences( INCOGNITO(R.string.pref_incognito_mode), NEVER(R.string.lock_never), } - }