diff --git a/app/build.gradle b/app/build.gradle index a0a7db2da..d3d7dc217 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,6 +157,20 @@ dependencies { implementation('com.google.code.gson:gson:2.9.0') implementation('androidx.webkit:webkit:1.4.0') + //compose + // Integration with activities + implementation 'androidx.activity:activity-compose:1.4.0' + // Compose Material Design + implementation 'androidx.compose.material:material:1.1.1' + // Animations + implementation 'androidx.compose.animation:animation:1.1.1' + // Tooling support (Previews, etc.) + implementation 'androidx.compose.ui:ui-tooling:1.1.1' + // Integration with ViewModels + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1' + // UI Tests + androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.1.1' + //firebase //implementation platform('com.google.firebase:firebase-bom:29.1.0') //implementation 'com.google.firebase:firebase-analytics-ktx' 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 ec1f6c011..6720ab733 100644 --- a/app/src/main/java/io/legado/app/base/BaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt @@ -66,10 +66,10 @@ abstract class BaseActivity( override fun onCreate(savedInstanceState: Bundle?) { window.decorView.disableAutoFill() initTheme() - upBackgroundImage() super.onCreate(savedInstanceState) - setContentView(binding.root) setupSystemBar() + setContentView(binding.root) + upBackgroundImage() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { findViewById(R.id.title_bar) ?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen) @@ -158,7 +158,7 @@ abstract class BaseActivity( } } - private fun setupSystemBar() { + open fun setupSystemBar() { if (fullScreen && !isInMultiWindow) { fullScreen() } diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt index 94b8d7c98..039603e2f 100644 --- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt @@ -12,6 +12,7 @@ import io.legado.app.help.config.AppConfig import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.storage.AppWebDav import io.legado.app.lib.theme.accentColor +import io.legado.app.lib.theme.backgroundColor import io.legado.app.ui.book.read.ReadBookActivity import io.legado.app.ui.main.MainActivity import io.legado.app.utils.* @@ -47,10 +48,16 @@ open class WelcomeActivity : BaseActivity() { if (intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) { finish() } else { - binding.root.postDelayed({ startMainActivity() }, 500) + binding.root.postDelayed({ startMainActivity() }, 600) } } + override fun setupSystemBar() { + fullScreen() + setStatusBarColorAuto(backgroundColor, true, fullScreen) + upNavigationBarColor() + } + override fun upBackgroundImage() { if (getPrefBoolean(PreferKey.customWelcome)) { kotlin.runCatching {