From 0de6928a8fdfd1e9ff171dd2f9688c0b1a1c3efd Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 15 Dec 2019 22:06:40 +0800 Subject: [PATCH] up --- app/src/main/AndroidManifest.xml | 3 +-- app/src/main/java/io/legado/app/base/BaseActivity.kt | 12 +++++++++--- .../main/java/io/legado/app/base/VMBaseActivity.kt | 4 ++-- .../io/legado/app/ui/book/info/BookInfoActivity.kt | 2 +- app/src/main/res/values/styles.xml | 7 +------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d3eff6243..6d456ff25 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,8 +78,7 @@ - + diff --git a/app/src/main/java/io/legado/app/base/BaseActivity.kt b/app/src/main/java/io/legado/app/base/BaseActivity.kt index 3c645407a..cff1863e7 100644 --- a/app/src/main/java/io/legado/app/base/BaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.cancel abstract class BaseActivity( private val layoutID: Int, private val fullScreen: Boolean = true, - private val initTheme: Boolean = true + private val theme: Theme = Theme.Auto ) : AppCompatActivity(), CoroutineScope by MainScope() { @@ -76,8 +76,10 @@ abstract class BaseActivity( private fun initTheme() { ATH.applyBackgroundTint(window.decorView) - if (initTheme) { - if (ColorUtils.isColorLight(primaryColor)) { + when (theme) { + Theme.Dark -> setTheme(R.style.AppTheme_Dark) + Theme.Light -> setTheme(R.style.AppTheme_Light) + else -> if (ColorUtils.isColorLight(primaryColor)) { setTheme(R.style.AppTheme_Light) } else { setTheme(R.style.AppTheme_Dark) @@ -105,4 +107,8 @@ abstract class BaseActivity( currentFocus?.hideSoftInput() super.finish() } + + enum class Theme { + Dark, Light, Auto + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/base/VMBaseActivity.kt b/app/src/main/java/io/legado/app/base/VMBaseActivity.kt index e52067060..65d8e123d 100644 --- a/app/src/main/java/io/legado/app/base/VMBaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/VMBaseActivity.kt @@ -5,8 +5,8 @@ import androidx.lifecycle.ViewModel abstract class VMBaseActivity( layoutID: Int, fullScreen: Boolean = true, - initTheme: Boolean = true -) : BaseActivity(layoutID, fullScreen, initTheme) { + theme: Theme = Theme.Auto +) : BaseActivity(layoutID, fullScreen, theme) { protected abstract val viewModel: VM diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 81af03c04..a7f1aad4a 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -36,7 +36,7 @@ import org.jetbrains.anko.toast class BookInfoActivity : - VMBaseActivity(R.layout.activity_book_info, initTheme = false), + VMBaseActivity(R.layout.activity_book_info, theme = Theme.Dark), GroupSelectDialog.CallBack, ChapterListAdapter.CallBack, ChangeSourceDialog.CallBack { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 61054e519..ec0b50735 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,12 +23,6 @@ true - - -