Base activities cleanup (#6848)

* secure delegate

* theming delegate

(cherry picked from commit dbad60d03b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
This commit is contained in:
Ivan Iskandar
2022-04-02 20:54:21 +07:00
committed by Jobobby04
parent b487e29059
commit a700c1a230
16 changed files with 157 additions and 117 deletions
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding
import eu.kanade.tachiyomi.source.online.UrlImportableSource
import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
@@ -24,9 +24,11 @@ import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
class InterceptActivity : BaseViewBindingActivity<EhActivityInterceptBinding>() {
class InterceptActivity : BaseActivity() {
private var statusJob: Job? = null
lateinit var binding: EhActivityInterceptBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -138,6 +140,10 @@ class InterceptActivity : BaseViewBindingActivity<EhActivityInterceptBinding>()
}
}
}
init {
registerSecureActivity(this)
}
}
sealed class InterceptResult {
@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.EhActivityLoginBinding
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.ui.base.activity.BaseViewBindingActivity
import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.WebViewUtil
import eu.kanade.tachiyomi.util.system.setDefaultSettings
@@ -36,7 +36,9 @@ import java.util.Locale
/**
* LoginController
*/
class EhLoginActivity : BaseViewBindingActivity<EhActivityLoginBinding>() {
class EhLoginActivity : BaseActivity() {
lateinit var binding: EhActivityLoginBinding
val preferenceManager: PreferencesHelper by injectLazy()
val sourceManager: SourceManager by injectLazy()