Animate in the authorization dialogs to spec (#374)

solana-mobile · Nov 27, 2024 · 70a118b · 70a118b
1 parent c9df4ee
commit 70a118b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/SeedVaultSimulator/src/main/AndroidManifest.xml b/SeedVaultSimulator/src/main/AndroidManifest.xml
@@ -102,7 +102,7 @@
             android:name=".ui.AuthorizeActivity"
             android:finishOnCloseSystemDialogs="true"
             android:noHistory="true"
-            android:theme="@style/Theme.SeedVaultImpl.Transparent" />
+            android:theme="@style/Theme.SeedVaultImpl.NoActionBar.Transparent" />
 
         <!-- NOTE: Order set below that of the privileged alias in case an app holds both
              permissions. Apps normally should hold only one of the two permissions, but the

diff --git a/SeedVaultSimulator/src/main/java/com/solanamobile/seedvaultimpl/ui/AuthorizeActivity.kt b/SeedVaultSimulator/src/main/java/com/solanamobile/seedvaultimpl/ui/AuthorizeActivity.kt
@@ -12,6 +12,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -59,6 +61,8 @@ class AuthorizeActivity : ComponentActivity() {
                 NavHost(
                     modifier = Modifier.fillMaxSize(),
                     navController = navController,
+                    enterTransition = { EnterTransition.None },
+                    exitTransition = { ExitTransition.None },
                     startDestination = "auth"
                 ) {
                     composable("auth") {

diff --git a/...tSimulator/src/main/java/com/solanamobile/seedvaultimpl/ui/authorize/AuthorizeContents.kt b/...tSimulator/src/main/java/com/solanamobile/seedvaultimpl/ui/authorize/AuthorizeContents.kt
@@ -450,6 +450,7 @@ fun NonPrivilegedAuthorizeContents(
                 testTagsAsResourceId = true
             },
         sheetState = sheetState,
+        scrimColor = Color.Transparent, // scrim provided at window level by backgroundDimEnabled in theme
         contentWindowInsets = { BottomSheetDefaults.windowInsets.only(WindowInsetsSides.Top) },
         onDismissRequest = onCancel
     ) {

diff --git a/SeedVaultSimulator/src/main/res/values/themes.xml b/SeedVaultSimulator/src/main/res/values/themes.xml
@@ -21,18 +21,18 @@
     <style name="Theme.SeedVaultImpl.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="Theme.SeedVaultImpl.Transparent" parent="android:Theme">
+    <style name="Theme.SeedVaultImpl.NoActionBar.Transparent">
         <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:backgroundDimEnabled">true</item> <!-- window provides scrim over transparent areas -->
+        <item name="android:windowAnimationStyle">@null</item> <!-- window contents provide entry/exit animations -->
     </style>
 
 </resources>