Skip to content

Fix splashscreen not showing <= API 30 #4889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Fix splashscreen not showing <= API 30 #4889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be90dd8
Add splashscreen compat dependency
mikescamell Aug 9, 2024
ce9a57c
Remove splashscreen styles in v31 files
mikescamell Aug 9, 2024
bb32f4b
Add new splashscreen style
mikescamell Aug 9, 2024
0b92a5e
Install splashscreen in LaunchBridgeActivity
mikescamell Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ dependencies {

// Android KTX
implementation AndroidX.core.ktx
implementation AndroidX.core.splashscreen
implementation AndroidX.fragment.ktx

// ViewModel and LiveData
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
1 change: 1 addition & 0 deletions common/common-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 0 additions & 23 deletions common/common-ui/src/main/res/values-night-v31/design-system-theming.xml
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion common/common-ui/src/main/res/values-night/design-system-theming.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,12 @@
-->

<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Dark" />
<style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
<item name="android:statusBarColor">@color/black</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">@color/black</item>

<item name="windowSplashScreenBackground">@color/black</item>
<item name="postSplashScreenTheme">@style/Theme.DuckDuckGo.Dark</item>
</style>
</resources>
28 changes: 0 additions & 28 deletions common/common-ui/src/main/res/values-v31/design-system-theming.xml
View file
Open in desktop

This file was deleted.

13 changes: 12 additions & 1 deletion common/common-ui/src/main/res/values/design-system-theming.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,18 @@
<item name="daxColorPrimaryIcon">@color/white</item>
</style>

<style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Light"/>
<style name="Theme.DuckDuckGo.SplashScreen" parent="Theme.DuckDuckGo.Splash">
<item name="android:statusBarColor">@color/whiteFive</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@color/whiteFive</item>

<item name="windowSplashScreenBackground">@color/whiteFive</item>
<item name="postSplashScreenTheme">@style/Theme.DuckDuckGo.Light</item>
</style>

<style name="Theme.DuckDuckGo.Splash" parent="Theme.SplashScreen">
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_dax_splash_screen_icon</item>
</style>

<style name="Theme.AppCompat.Transparent.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
Expand Down
2 changes: 2 additions & 0 deletions versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ version.androidx.constraintlayout=2.1.4

version.androidx.biometric=1.1.0

version.androidx.core-splashscreen=1.0.1

version.androidx.datastore=1.1.1

version.androidx.localbroadcastmanager=1.1.0
Expand Down