Base activities cleanup (#6848)

* secure delegate * theming delegate
2022-04-02 20:54:21 +07:00
parent 27a60423dc
commit dbad60d03b
14 changed files with 157 additions and 137 deletions
@@ -0,0 +1,29 @@
+package eu.kanade.tachiyomi.ui.base.activity
+
+import android.content.Context
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+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: PreferencesHelper by injectLazy()
+
+    override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(newBase.prepareTabletUiContext())
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        applyAppTheme(this)
+        super.onCreate(savedInstanceState)
+    }
+}
@@ -2,32 +2,29 @@ package eu.kanade.tachiyomi.ui.base.activity

 import android.content.Context
 import android.os.Bundle
-import androidx.viewbinding.ViewBinding
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+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.ui.security.SecureActivityDelegate
 import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
 import nucleus.view.NucleusAppCompatActivity
+import uy.kohesive.injekt.injectLazy

-abstract class BaseRxActivity<VB : ViewBinding, P : BasePresenter<*>> : NucleusAppCompatActivity<P>() {
+open class BaseRxActivity<P : BasePresenter<*>> :
+    NucleusAppCompatActivity<P>(),
+    SecureActivityDelegate by SecureActivityDelegateImpl(),
+    ThemingDelegate by ThemingDelegateImpl() {

-    @Suppress("LeakingThis")
-    private val secureActivityDelegate = SecureActivityDelegate(this)
-
-    lateinit var binding: VB
+    protected val preferences: PreferencesHelper by injectLazy()

    override fun attachBaseContext(newBase: Context) {
        super.attachBaseContext(newBase.prepareTabletUiContext())
    }

    override fun onCreate(savedInstanceState: Bundle?) {
+        applyAppTheme(this)
        super.onCreate(savedInstanceState)
-
-        secureActivityDelegate.onCreate()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        secureActivityDelegate.onResume()
    }
 }
@@ -1,25 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.activity
-
-import android.os.Bundle
-import androidx.viewbinding.ViewBinding
-import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate
-
-abstract class BaseViewBindingActivity<VB : ViewBinding> : BaseThemedActivity() {
-
-    lateinit var binding: VB
-
-    @Suppress("LeakingThis")
-    private val secureActivityDelegate = SecureActivityDelegate(this)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        secureActivityDelegate.onCreate()
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        secureActivityDelegate.onResume()
-    }
-}
@@ -0,0 +1,73 @@
+package eu.kanade.tachiyomi.ui.base.delegate
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import eu.kanade.tachiyomi.data.preference.PreferenceValues
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.ui.security.UnlockActivity
+import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
+import eu.kanade.tachiyomi.util.view.setSecureScreen
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import uy.kohesive.injekt.injectLazy
+import java.util.Date
+
+interface SecureActivityDelegate {
+    fun registerSecureActivity(activity: AppCompatActivity)
+
+    companion object {
+        var locked: Boolean = true
+    }
+}
+
+class SecureActivityDelegateImpl : SecureActivityDelegate, DefaultLifecycleObserver {
+
+    private lateinit var activity: AppCompatActivity
+
+    private val preferences: PreferencesHelper by injectLazy()
+
+    override fun registerSecureActivity(activity: AppCompatActivity) {
+        this.activity = activity
+        activity.lifecycle.addObserver(this)
+    }
+
+    override fun onCreate(owner: LifecycleOwner) {
+        setSecureScreen()
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        setAppLock()
+    }
+
+    private fun setSecureScreen() {
+        val secureScreenFlow = preferences.secureScreen().asFlow()
+        val incognitoModeFlow = preferences.incognitoMode().asFlow()
+        combine(secureScreenFlow, incognitoModeFlow) { secureScreen, incognitoMode ->
+            secureScreen == PreferenceValues.SecureScreenMode.ALWAYS ||
+                secureScreen == PreferenceValues.SecureScreenMode.INCOGNITO && incognitoMode
+        }
+            .onEach { activity.window.setSecureScreen(it) }
+            .launchIn(activity.lifecycleScope)
+    }
+
+    private fun setAppLock() {
+        if (!preferences.useAuthenticator().get()) return
+        if (activity.isAuthenticationSupported()) {
+            if (!isAppLocked()) return
+            activity.startActivity(Intent(activity, UnlockActivity::class.java))
+            activity.overridePendingTransition(0, 0)
+        } else {
+            preferences.useAuthenticator().set(false)
+        }
+    }
+
+    private fun isAppLocked(): Boolean {
+        if (!SecureActivityDelegate.locked) return false
+        return preferences.lockAppAfter().get() <= 0 ||
+            Date().time >= preferences.lastAppUnlock().get() + 60 * 1000 * preferences.lockAppAfter().get()
+    }
+}
@@ -1,33 +1,16 @@
-package eu.kanade.tachiyomi.ui.base.activity
+package eu.kanade.tachiyomi.ui.base.delegate

-import android.content.Context
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import android.app.Activity
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.util.system.prepareTabletUiContext
-import uy.kohesive.injekt.injectLazy
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get

-abstract class BaseThemedActivity : AppCompatActivity() {
-
-    val preferences: PreferencesHelper by injectLazy()
-
-    override fun attachBaseContext(newBase: Context) {
-        super.attachBaseContext(newBase.prepareTabletUiContext())
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        applyAppTheme(preferences)
-        super.onCreate(savedInstanceState)
-    }
+interface ThemingDelegate {
+    fun applyAppTheme(activity: Activity)

    companion object {
-        fun AppCompatActivity.applyAppTheme(preferences: PreferencesHelper) {
-            getThemeResIds(preferences.appTheme().get(), preferences.themeDarkAmoled().get())
-                .forEach { setTheme(it) }
-        }
-
        fun getThemeResIds(appTheme: PreferenceValues.AppTheme, isAmoled: Boolean): List<Int> {
            val resIds = mutableListOf<Int>()
            when (appTheme) {
@@ -68,3 +51,11 @@ abstract class BaseThemedActivity : AppCompatActivity() {
        }
    }
 }
+
+class ThemingDelegateImpl : ThemingDelegate {
+    override fun applyAppTheme(activity: Activity) {
+        val preferences = Injekt.get<PreferencesHelper>()
+        ThemingDelegate.getThemeResIds(preferences.appTheme().get(), preferences.themeDarkAmoled().get())
+            .forEach { activity.setTheme(it) }
+    }
+}