From 5fc78afa0aa44c1f40889f87308878b25023e4a3 Mon Sep 17 00:00:00 2001 From: Brian Yencho Date: Thu, 28 Sep 2023 14:18:03 -0500 Subject: [PATCH] BIT-147: Improve splash screen handling for all OS levels (#72) --- README.md | 5 +++++ app/build.gradle.kts | 1 + .../java/com/x8bit/bitwarden/MainActivity.kt | 7 ++++++- .../ui/auth/feature/login/LoginScreen.kt | 2 ++ .../platform/feature/rootnav/RootNavScreen.kt | 7 +++++++ app/src/main/res/drawable-hdpi/logo_legacy.png | Bin 6997 -> 0 bytes .../res/drawable-hdpi/logo_white_legacy.png | Bin 6945 -> 0 bytes app/src/main/res/drawable-xhdpi/logo_legacy.png | Bin 10888 -> 0 bytes .../res/drawable-xhdpi/logo_white_legacy.png | Bin 10486 -> 0 bytes .../main/res/drawable-xxhdpi/logo_legacy.png | Bin 8426 -> 0 bytes .../res/drawable-xxhdpi/logo_white_legacy.png | Bin 8402 -> 0 bytes app/src/main/res/drawable/splash_screen.xml | 9 --------- .../main/res/drawable/splash_screen_dark.xml | 12 ------------ app/src/main/res/values-night/styles.xml | 8 ++++---- app/src/main/res/values/styles.xml | 10 +++++----- .../feature/rootnav/RootNavScreenTest.kt | 6 ++++++ gradle/libs.versions.toml | 2 ++ 17 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/logo_legacy.png delete mode 100644 app/src/main/res/drawable-hdpi/logo_white_legacy.png delete mode 100644 app/src/main/res/drawable-xhdpi/logo_legacy.png delete mode 100644 app/src/main/res/drawable-xhdpi/logo_white_legacy.png delete mode 100644 app/src/main/res/drawable-xxhdpi/logo_legacy.png delete mode 100644 app/src/main/res/drawable-xxhdpi/logo_white_legacy.png delete mode 100644 app/src/main/res/drawable/splash_screen.xml delete mode 100644 app/src/main/res/drawable/splash_screen_dark.xml diff --git a/README.md b/README.md index a77ffdeac2..88205047a0 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,11 @@ The following is a list of all third-party dependencies included as part of the - Purpose: Supplementary Android Compose features. - License: Apache 2.0 +- **Core SplashScreen** + - https://developer.android.com/jetpack/androidx/releases/core + - Purpose: Backwards compatible SplashScreen API implementation. + - License: Apache 2.0 + - **Dagger Hilt** - https://github.com/google/dagger - Purpose: Dependency injection framework. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f0a6b90b13..b5860a55c0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -91,6 +91,7 @@ dependencies { ksp(libs.androidx.room.compiler) implementation(libs.androidx.room.ktx) implementation(libs.androidx.room.runtime) + implementation(libs.androidx.splashscreen) implementation(platform(libs.google.firebase.bom)) implementation(libs.bitwarden.sdk) implementation(libs.bumptech.glide) diff --git a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt index 233056b8a8..ee579f97ae 100644 --- a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.x8bit.bitwarden.ui.platform.feature.rootnav.RootNavScreen import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme import dagger.hilt.android.AndroidEntryPoint @@ -13,10 +14,14 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { + var shouldShowSplashScreen = true + installSplashScreen().setKeepOnScreenCondition { shouldShowSplashScreen } super.onCreate(savedInstanceState) setContent { BitwardenTheme { - RootNavScreen() + RootNavScreen( + onSplashScreenRemoved = { shouldShowSplashScreen = false }, + ) } } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt index bcfbd12b53..5068deda81 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button @@ -42,6 +43,7 @@ fun LoginScreen( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier + .fillMaxSize() .background(MaterialTheme.colorScheme.background) .padding(horizontal = 16.dp, vertical = 32.dp), ) { diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt index 5c66dd506a..173fffadbb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.platform.feature.rootnav import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -23,9 +24,15 @@ import com.x8bit.bitwarden.ui.platform.feature.vaultunlocked.vaultUnlockedDestin fun RootNavScreen( viewModel: RootNavViewModel = hiltViewModel(), navController: NavHostController = rememberNavController(), + onSplashScreenRemoved: () -> Unit = {}, ) { val state by viewModel.stateFlow.collectAsStateWithLifecycle() + val isNotSplashScreen = state != RootNavState.Splash + LaunchedEffect(isNotSplashScreen) { + if (isNotSplashScreen) onSplashScreenRemoved() + } + NavHost( navController = navController, startDestination = SPLASH_ROUTE, diff --git a/app/src/main/res/drawable-hdpi/logo_legacy.png b/app/src/main/res/drawable-hdpi/logo_legacy.png deleted file mode 100644 index c1f80693e55921f67366cb9c175045401cdb7cb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6997 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 diff --git a/app/src/main/res/drawable-hdpi/logo_white_legacy.png b/app/src/main/res/drawable-hdpi/logo_white_legacy.png deleted file mode 100644 index d476025e83a4af630b6ee772f4738b36384e5f57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6945 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 diff --git a/app/src/main/res/drawable-xhdpi/logo_white_legacy.png b/app/src/main/res/drawable-xhdpi/logo_white_legacy.png deleted file mode 100644 index d3d9f58052c2b0141956c5ce2c6ea106508c6624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10486 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 diff --git a/app/src/main/res/drawable-xxhdpi/logo_legacy.png b/app/src/main/res/drawable-xxhdpi/logo_legacy.png deleted file mode 100644 index 90473167697b867ede9400b31c6dce93b7e39ebc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8426 zcmXY01zeQR(?10%0S^#q5CKU^fg_F%siV83k&vVF0O>{vsRJaAPLWROZX^Xxq>hqq zc#r?@eV)(f+1c;T%+BoYv$M}Lk!lcm0z67Q002Os@J>bp0KkBt=@1+&^s`XJcNAS< z+DNKM0sxi$f={Bh(RB(pSv@yRCu=uPGZ!m>q@|O&)k_6OGaD-nD>F-P=K(8G0N|yc zf{dh=*TQZlQhTXkHar=8nKh61tN3MN%{5H<2|X#d7O)6_z5{cDl-WA`R$O_tfQ3Ps zTA#^UzubB0_a=b9x><>j35k6M&?>bh?5j34`J5hasy;y*fWDe9W7+cMjW;8mXV=?Q9*AXlL!qDiw|2jkHL`tlRBDWCE?k*bXr#zS3#5~-y@FyGPq_@VZW z5&n`6ujGLQ0FapfD*~baYXbDg&T2gh`CHk3H#rX&lBf@mB{bWB*kZL_9U6d5$h7Fu+LcMA zP655~CJI+&{+Um7&MvMyaf&KYvxCncy6(gU$c4X94#!xs`M4kI^E% zNo!M%!GlL=D=l)oS|E>?be~o;%{)azILrWYjBMUkK{WlKBv&1)rQXDyt;if*PsOu< z$oq3ne|f_r645Q%d23%nfrfz)Z-&!hiV%_*$+sU)9yQsQP@>TSK#mV!%~FmOO#@!S zAD$1a|CQ)&a1=<9d~KQ|Xn>p4MDqzC&#JU@-+cjxWz8?1S0@z*-GCO8cpBUln5!HF zZCaEDwRXy&(GIc)&xag4d`)p#Ry4kVfoKq|xr+HJ1_3OU@~Pc6khm247xn)>N<$q& z;!b=$5NgOy-~)!{C6TTKWfHQu{jfE7%0iZl`ya~9Qrfp8v6muSA#kpT%R0qu!j5i0 zTk+mjK<+~CP}BD&)&wzGs^pWrU7nEGW?1-=%M0-!OEUQdLpi#HKG0e&q(x?rwL+uA zj^sbtmz0LdoAgz?PUuMp+ya(h1B9xz;J+VM2znR-bwJJk-#g&V^C)gG8kPV(0{jTF z{r^b|#Q47bU^RL+zC9WJ_@E{Ka~$<*`zFQq!HTHKGnDS&N0suwS@v(A=sEr;B=PKw zh{vaLxDzM;``XIKVfTBla;i?e&d$5nXie|%a(uW+k@-(1N7hcq)=n=Eg}3R`lZXt5 zdRzC0+nI8Q&iTgOUsU6pYNys@_+zyIUW!{6jHSgl#CUXmKK}P7#*}FW*y5kJz{?Kd z_W0U6!1Y*gX{c`pb=ag+CPlE`VTAVr0jOU1X#@^^MmBc!-8$9zbl2&$J)o#i+vN%o z5Y0g4uI3f@tj^!j7*!N(Fo1`wJ9|GQVDIN{HiQ_ue1B(b!8v*uFi}OH-Bc$~!*gn+ zK34AGuyc0#6_3u4P@@lrnVj8q%`1h7>Z;NCM0KW;TWqT@lBn4tlV~QmLw#s0fSf2x znrhMg<)Ji|<2T2dlk2rw#jS{B8tUbZmAYGB3+f2NV_4k5#@&-oTSJp`J4o7t4ewSv zDxnwSgz?jN>{iEQgSr_W@ZgbdRP(b~nq=Rly#9tPcabXwiEMoVl)IQjhS$JX$9vs9 zS6B4n|H8*$uHjymt-@S{t!3@q><&+{TQcJvoC_Hen^nBy_{&`DD_iw~6OPv>62WA& zIYu2ep3N^vLUMI$L?th8PUpUSbZ?xQ#izLeB;k1$iL$Y#zEJ&iJ=8g!S)2BB#?k2@ zo+wr&TdSe9Zp3H#?LvV}oX3gwBJG&b+ukqZB#6*UxK-Cz-x(fX_)Faqn&5%Wklf

*?lVy@ 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 A`2YX_ diff --git a/app/src/main/res/drawable-xxhdpi/logo_white_legacy.png b/app/src/main/res/drawable-xxhdpi/logo_white_legacy.png deleted file mode 100644 index 7d76d07d2dbc95d1fb927b1510ace8ac4487048e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8402 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 diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml deleted file mode 100644 index 56530dc151..0000000000 --- a/app/src/main/res/drawable/splash_screen.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/splash_screen_dark.xml b/app/src/main/res/drawable/splash_screen_dark.xml deleted file mode 100644 index 6e5563e7db..0000000000 --- a/app/src/main/res/drawable/splash_screen_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 53fa6f596f..d76de1bcf2 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -12,6 +12,7 @@ @null false true + @null true @@ -20,10 +21,9 @@ - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 87e723c8ff..d49b211635 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,6 +12,7 @@ @android:style/ThemeOverlay.Material.Light @null false + @null true true @@ -21,13 +22,12 @@ - diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreenTest.kt index efe9ff6d6c..68257b55f5 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreenTest.kt @@ -8,6 +8,8 @@ import io.mockk.mockk import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Test class RootNavScreenTest : BaseComposeTest() { @@ -47,15 +49,18 @@ class RootNavScreenTest : BaseComposeTest() { every { eventFlow } returns emptyFlow() every { stateFlow } returns rootNavStateFlow } + var isSplashScreenRemoved = false composeTestRule.setContent { RootNavScreen( viewModel = viewModel, navController = fakeNavHostController, + onSplashScreenRemoved = { isSplashScreenRemoved = true }, ) } composeTestRule.runOnIdle { fakeNavHostController.assertCurrentRoute("splash") } + assertFalse(isSplashScreenRemoved) // Make sure navigating to Auth works as expected: rootNavStateFlow.value = RootNavState.Auth @@ -65,6 +70,7 @@ class RootNavScreenTest : BaseComposeTest() { navOptions = expectedNavOptions, ) } + assertTrue(isSplashScreenRemoved) // Make sure navigating to vault unlocked works as expected: rootNavStateFlow.value = RootNavState.VaultUnlocked diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4e5569d331..0fe03c1d04 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,7 @@ androidxHiltNavigationCompose = "1.0.0" androidxLifecycle = "2.6.1" androidxNavigation = "2.7.2" androidxRoom = "2.5.2" +androidxSplash = "1.1.0-alpha02" # Once the app and SDK reach a critical point of completeness we should begin fixing the version # here (BIT-311). bitwardenSdk = "0.3.0-SNAPSHOT" @@ -60,6 +61,7 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidxRoom" } androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidxRoom" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidxRoom" } +androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidxSplash" } bitwarden-sdk = { module = "com.bitwarden:sdk-android", version.ref = "bitwardenSdk" } bumptech-glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } detekt-detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }