Remove unnecessary base Nucleus classes

The reader still uses it, but we just move stuff to there.

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt

@@ -3,21 +3,17 @@ package eu.kanade.tachiyomi.ui.base.activity
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import eu.kanade.domain.base.BasePreferences
 import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
 import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegateImpl
 import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
 import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegateImpl
 import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
-import uy.kohesive.injekt.injectLazy
 
 open class BaseActivity :
     AppCompatActivity(),
     SecureActivityDelegate by SecureActivityDelegateImpl(),
     ThemingDelegate by ThemingDelegateImpl() {
 
-    protected val preferences: BasePreferences by injectLazy()
-
     override fun attachBaseContext(newBase: Context) {
         super.attachBaseContext(newBase.prepareTabletUiContext())
     }

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt

@@ -1,30 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.activity
-
-import android.content.Context
-import android.os.Bundle
-import eu.kanade.domain.base.BasePreferences
-import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
-import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegateImpl
-import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegate
-import eu.kanade.tachiyomi.ui.base.delegate.ThemingDelegateImpl
-import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
-import nucleus.view.NucleusAppCompatActivity
-import uy.kohesive.injekt.injectLazy
-
-open class BaseRxActivity<P : BasePresenter<*>> :
-    NucleusAppCompatActivity<P>(),
-    SecureActivityDelegate by SecureActivityDelegateImpl(),
-    ThemingDelegate by ThemingDelegateImpl() {
-
-    protected val preferences: BasePreferences by injectLazy()
-
-    override fun attachBaseContext(newBase: Context) {
-        super.attachBaseContext(newBase.prepareTabletUiContext())
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        applyAppTheme(this)
-        super.onCreate(savedInstanceState)
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt

@@ -9,37 +9,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.tachiyomi.databinding.ComposeControllerBinding
 import eu.kanade.tachiyomi.util.view.setComposeContent
-import nucleus.presenter.Presenter
-
-abstract class FullComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
-    NucleusController<ComposeControllerBinding, P>(bundle),
-    ComposeContentController {
-
-    override fun createBinding(inflater: LayoutInflater) =
-        ComposeControllerBinding.inflate(inflater)
-
-    override fun onViewCreated(view: View) {
-        super.onViewCreated(view)
-
-        binding.root.apply {
-            setComposeContent {
-                CompositionLocalProvider(LocalRouter provides router) {
-                    ComposeContent()
-                }
-            }
-        }
-    }
-
-    override fun handleBack(): Boolean {
-        val dispatcher = (activity as? OnBackPressedDispatcherOwner)?.onBackPressedDispatcher ?: return false
-        return if (dispatcher.hasEnabledCallbacks()) {
-            dispatcher.onBackPressed()
-            true
-        } else {
-            false
-        }
-    }
-}
 
 /**
  * Basic Compose controller without a presenter.

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt

@@ -1,7 +1,5 @@
 package eu.kanade.tachiyomi.ui.base.controller
 
-import android.content.pm.PackageManager.PERMISSION_GRANTED
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.bluelinelabs.conductor.Controller
 import com.bluelinelabs.conductor.Router
@@ -12,28 +10,10 @@ fun Router.setRoot(controller: Controller, id: Int) {
     setRoot(controller.withFadeTransaction().tag(id.toString()))
 }
 
-fun Router.popControllerWithTag(tag: String): Boolean {
-    val controller = getControllerWithTag(tag)
-    if (controller != null) {
-        popController(controller)
-        return true
-    }
-    return false
-}
-
 fun Router.pushController(controller: Controller) {
     pushController(controller.withFadeTransaction())
 }
 
-fun Controller.requestPermissionsSafe(permissions: Array<String>, requestCode: Int) {
-    val activity = activity ?: return
-    permissions.forEach { permission ->
-        if (ContextCompat.checkSelfPermission(activity, permission) != PERMISSION_GRANTED) {
-            requestPermissions(arrayOf(permission), requestCode)
-        }
-    }
-}
-
 fun Controller.withFadeTransaction(): RouterTransaction {
     return RouterTransaction.with(this)
         .pushChangeHandler(OneWayFadeChangeHandler())

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt

@@ -1,23 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.controller
-
-import android.os.Bundle
-import androidx.viewbinding.ViewBinding
-import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorDelegate
-import eu.kanade.tachiyomi.ui.base.presenter.NucleusConductorLifecycleListener
-import nucleus.factory.PresenterFactory
-import nucleus.presenter.Presenter
-
-@Suppress("LeakingThis")
-abstract class NucleusController<VB : ViewBinding, P : Presenter<*>>(val bundle: Bundle? = null) :
-    BaseController<VB>(bundle),
-    PresenterFactory<P> {
-
-    private val delegate = NucleusConductorDelegate(this)
-
-    val presenter: P
-        get() = delegate.presenter!!
-
-    init {
-        addLifecycleListener(NucleusConductorLifecycleListener(delegate))
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BasePresenter.kt

@@ -1,36 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.presenter
-
-import android.os.Bundle
-import eu.kanade.core.prefs.PreferenceMutableState
-import eu.kanade.tachiyomi.core.preference.Preference
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
-import nucleus.presenter.RxPresenter
-
-open class BasePresenter<V> : RxPresenter<V>() {
-
-    var presenterScope: CoroutineScope = MainScope()
-
-    override fun onCreate(savedState: Bundle?) {
-        try {
-            super.onCreate(savedState)
-        } catch (e: NullPointerException) {
-            // Swallow this error. This should be fixed in the library but since it's not critical
-            // (only used by restartables) it should be enough. It saves me a fork.
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        presenterScope.cancel()
-    }
-
-    // We're trying to avoid using Rx, so we "undeprecate" this
-    @Suppress("DEPRECATION")
-    override fun getView(): V? {
-        return super.getView()
-    }
-
-    fun <T> Preference<T>.asState() = PreferenceMutableState(this, presenterScope)
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/NucleusConductorDelegate.kt

@@ -1,46 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.presenter
-
-import android.os.Bundle
-import nucleus.factory.PresenterFactory
-import nucleus.presenter.Presenter
-
-class NucleusConductorDelegate<P : Presenter<*>>(private val factory: PresenterFactory<P>) {
-
-    var presenter: P? = null
-        get() {
-            if (field == null) {
-                field = factory.createPresenter()
-                field!!.create(bundle)
-                bundle = null
-            }
-            return field
-        }
-
-    private var bundle: Bundle? = null
-
-    fun onSaveInstanceState(): Bundle {
-        val bundle = Bundle()
-        //        getPresenter(); // Workaround a crash related to saving instance state with child routers
-        presenter?.save(bundle)
-        return bundle
-    }
-
-    fun onRestoreInstanceState(presenterState: Bundle?) {
-        bundle = presenterState
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun <View> Presenter<View>.takeView(view: Any) = takeView(view as View)
-
-    fun onTakeView(view: Any) {
-        presenter?.takeView(view)
-    }
-
-    fun onDropView() {
-        presenter?.dropView()
-    }
-
-    fun onDestroy() {
-        presenter?.destroy()
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/NucleusConductorLifecycleListener.kt

@@ -1,32 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.presenter
-
-import android.os.Bundle
-import android.view.View
-import com.bluelinelabs.conductor.Controller
-
-class NucleusConductorLifecycleListener(private val delegate: NucleusConductorDelegate<*>) : Controller.LifecycleListener() {
-
-    override fun postCreateView(controller: Controller, view: View) {
-        delegate.onTakeView(controller)
-    }
-
-    override fun preDestroyView(controller: Controller, view: View) {
-        delegate.onDropView()
-    }
-
-    override fun preDestroy(controller: Controller) {
-        delegate.onDestroy()
-    }
-
-    override fun onSaveInstanceState(controller: Controller, outState: Bundle) {
-        outState.putBundle(PRESENTER_STATE_KEY, delegate.onSaveInstanceState())
-    }
-
-    override fun onRestoreInstanceState(controller: Controller, savedInstanceState: Bundle) {
-        delegate.onRestoreInstanceState(savedInstanceState.getBundle(PRESENTER_STATE_KEY))
-    }
-
-    companion object {
-        private const val PRESENTER_STATE_KEY = "presenter_state"
-    }
-}