Merge pull request #899 from tunjid/tj/centralize-splash

Centralize splash screen logic

Author: tunjid

composeApp/src/androidMain/res/animator/splash_heron_body_animation.xml

@@ -3,17 +3,4 @@
   android:width="288dp"
   android:height="288dp"
   android:viewportWidth="35"
-  android:viewportHeight="48">
-  <target
-    android:name="head"
-    android:animation="@animator/splash_heron_head_animation" />
-  <target
-    android:name="beak"
-    android:animation="@animator/splash_heron_body_animation" />
-  <target
-    android:name="torso"
-    android:animation="@animator/splash_heron_body_animation" />
-  <target
-    android:name="feet"
-    android:animation="@animator/splash_heron_body_animation" />
-</animated-vector>
+  android:viewportHeight="48"/>

composeApp/src/androidMain/res/animator/splash_heron_head_animation.xml

@@ -72,9 +72,12 @@ import heron.scaffold.generated.resources.messages
 import heron.scaffold.generated.resources.notifications
 import heron.scaffold.generated.resources.search
 import heron.scaffold.generated.resources.splash
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.TimeSource
 import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -85,6 +88,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.StringResource
@@ -439,14 +443,10 @@ class PersistedNavigationStateHolder(
     ActionStateMutator<NavigationMutation, StateFlow<MultiStackNav>> by appMainScope.actionStateFlowMutator(
         initialState = InitialNavigationState,
         started = SharingStarted.Eagerly,
-        inputs = listOf(
-            forceSignOutMutations(
-                authRepository = authRepository,
-                userDataRepository = userDataRepository,
-            ),
-        ),
         actionTransform = { navActions ->
             flow {
+                val startTime = TimeSource.Monotonic.markNow()
+
                 // Restore saved nav from disk first
                 val savedNavigation = userDataRepository.navigation
                     // Wait for a non empty saved state to be read
@@ -466,17 +466,26 @@ class PersistedNavigationStateHolder(
                     }
                 }
 
+                val elapsed = startTime.elapsedNow()
+                if (elapsed < SplashDelay) delay(SplashDelay - elapsed)
+
                 emit { multiStackNav }
 
                 emitAll(
-                    navActions.mapToMutation { navMutation ->
-                        navMutation(
-                            ImmutableNavigationContext(
-                                state = this,
-                                routeParser = routeParser,
-                            ),
-                        )
-                    },
+                    merge(
+                        navActions.mapToMutation { navMutation ->
+                            navMutation(
+                                ImmutableNavigationContext(
+                                    state = this,
+                                    routeParser = routeParser,
+                                ),
+                            )
+                        },
+                        forceSignOutMutations(
+                            authRepository = authRepository,
+                            userDataRepository = userDataRepository,
+                        ),
+                    ),
                 )
             }
         },
@@ -661,5 +670,7 @@ private fun AppStack.toStackNav() = StackNav(
     children = listOf(rootRoute),
 )
 
+private val SplashDelay = 1.seconds
+
 private const val ReferringRouteQueryParam = "referringRoute"
 private const val OAuthUrlPathSegment = "oauth"