Merge pull request #179 from YAPP-Github/BOOK-308-fix/#178

feat: Guest Mode 약관동의 화면에서 앱 종료되는 문제 해결

Author: easyhooon

app/src/main/kotlin/com/ninecraft/booket/di/CircuitModule.kt

@@ -28,7 +28,7 @@ abstract class CircuitModule {
         ): Circuit = Circuit.Builder()
             .addPresenterFactories(presenterFactories)
             .addUiFactories(uiFactories)
-            // .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
+            .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
             .build()
     }
 }

app/src/main/kotlin/com/ninecraft/booket/di/CrossFadeNavDecorator.kt

@@ -6,13 +6,16 @@ import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
+import com.ninecraft.booket.feature.screens.LoginScreen
+import com.ninecraft.booket.feature.screens.SplashScreen
+import com.ninecraft.booket.feature.screens.TermsAgreementScreen
 import com.slack.circuit.backstack.NavArgument
 import com.slack.circuit.foundation.NavigatorDefaults
 import com.slack.circuit.foundation.animation.AnimatedNavDecorator
 import com.slack.circuit.foundation.animation.AnimatedNavEvent
 import com.slack.circuit.foundation.animation.AnimatedNavState
 
-data class CrossFadeNavDecoratorFactory(val durationMillis: Int = 300) :
+data class CrossFadeNavDecoratorFactory(val durationMillis: Int = 500) :
     AnimatedNavDecorator.Factory {
     override fun <T : NavArgument> create(): AnimatedNavDecorator<T, *> =
         CrossFadeNavDecorator(durationMillis)
@@ -24,6 +27,34 @@ class CrossFadeNavDecorator<T : NavArgument>(private val durationMillis: Int) :
     override fun AnimatedContentTransitionScope<AnimatedNavState>.transitionSpec(
         animatedNavEvent: AnimatedNavEvent,
     ): ContentTransform {
-        return fadeIn(tween(durationMillis)) togetherWith fadeOut(tween(durationMillis))
+        val shouldUseFade = shouldUseFadeAnimation(initialState, targetState)
+
+        return if (shouldUseFade) {
+            fadeIn(tween(durationMillis)) togetherWith fadeOut(tween(durationMillis))
+        } else {
+            // Circuit 기본 애니메이션 사용
+            with(NavigatorDefaults.DefaultDecorator<T>()) {
+                transitionSpec(animatedNavEvent)
+            }
+        }
+    }
+
+    private fun shouldUseFadeAnimation(
+        initialState: AnimatedNavState,
+        targetState: AnimatedNavState,
+    ): Boolean {
+        val fadeScreens = setOf(
+            SplashScreen::class,
+            LoginScreen::class,
+            TermsAgreementScreen::class,
+        )
+
+        val initialScreenClass = initialState.top.screen::class
+        val targetScreenClass = targetState.top.screen::class
+
+        // 앱 시작시 SplashScreen이 첫 화면인 경우 처리
+        val isAppLaunchToSplash = targetScreenClass == SplashScreen::class
+
+        return isAppLaunchToSplash || initialScreenClass in fadeScreens || targetScreenClass in fadeScreens
     }
 }

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginPresenter.kt

@@ -53,7 +53,11 @@ class LoginPresenter @AssistedInject constructor(
                                 navigator.popUntil { it == screen.returnToScreen }
                             }
                         } else {
-                            navigator.resetRoot(TermsAgreementScreen(screen.returnToScreen))
+                            if (screen.returnToScreen == null) {
+                                navigator.resetRoot(TermsAgreementScreen())
+                            } else {
+                                navigator.goTo(TermsAgreementScreen(screen.returnToScreen))
+                            }
                         }
                     }.onFailure { exception ->
                         exception.message?.let { Logger.e(it) }

feature/splash/src/main/kotlin/com/ninecraft/booket/splash/SplashUi.kt

@@ -1,6 +1,5 @@
 package com.ninecraft.booket.splash
 
-import android.R.attr.description
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ minSdk = "28"
 targetSdk = "35"
 compileSdk = "35"
 versionName = "1.2.0"
-versionCode = "7"
+versionCode = "8"
 packageName = "com.ninecraft.booket"
 
 ## Android gradle plugin
@@ -43,7 +43,7 @@ okhttp = "5.1.0"
 retrofit = "3.0.0"
 
 ## Circuit
-circuit = "0.29.1"
+circuit = "0.30.0"
 
 ## Logging
 logger = "2.2.0"