diff --git a/app/build.gradle b/app/build.gradle index b443b1edce6e..bba1b6b3c9d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -388,6 +388,7 @@ dependencies { // Android KTX implementation AndroidX.core.ktx + implementation AndroidX.core.splashscreen implementation AndroidX.fragment.ktx // ViewModel and LiveData diff --git a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt index 6d621d25b639..6796c4339c29 100644 --- a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt @@ -17,6 +17,7 @@ package com.duckduckgo.app.launch import android.os.Bundle +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.lifecycleScope import com.duckduckgo.anvil.annotations.InjectWith import com.duckduckgo.app.browser.BrowserActivity @@ -32,7 +33,10 @@ class LaunchBridgeActivity : DuckDuckGoActivity() { private val viewModel: LaunchViewModel by bindViewModel() override fun onCreate(savedInstanceState: Bundle?) { + val splashScreen = installSplashScreen() super.onCreate(savedInstanceState) + splashScreen.setKeepOnScreenCondition { true } + setContentView(R.layout.activity_launch) configureObservers() diff --git a/common/common-ui/build.gradle b/common/common-ui/build.gradle index 9e9c93a111a4..bf36030e672c 100644 --- a/common/common-ui/build.gradle +++ b/common/common-ui/build.gradle @@ -46,6 +46,7 @@ dependencies { implementation AndroidX.appCompat implementation Google.android.material implementation AndroidX.constraintLayout + implementation AndroidX.core.splashscreen implementation AndroidX.recyclerView implementation AndroidX.lifecycle.viewModelKtx // just to get the dagger annotations diff --git a/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml b/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml deleted file mode 100644 index ccb65956918b..000000000000 --- a/common/common-ui/src/main/res/values-night-v31/design-system-theming.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/common/common-ui/src/main/res/values-night/design-system-theming.xml b/common/common-ui/src/main/res/values-night/design-system-theming.xml index 5be4428aeddb..4350821f20d8 100644 --- a/common/common-ui/src/main/res/values-night/design-system-theming.xml +++ b/common/common-ui/src/main/res/values-night/design-system-theming.xml @@ -15,5 +15,12 @@ --> - diff --git a/common/common-ui/src/main/res/values-v31/design-system-theming.xml b/common/common-ui/src/main/res/values-v31/design-system-theming.xml deleted file mode 100644 index 09fbc2b87231..000000000000 --- a/common/common-ui/src/main/res/values-v31/design-system-theming.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml index de8a74c80137..766b83126357 100644 --- a/common/common-ui/src/main/res/values/design-system-theming.xml +++ b/common/common-ui/src/main/res/values/design-system-theming.xml @@ -296,7 +296,18 @@ @color/white - + +