[feat] #80 스플래시~이용약관 프로세스 구성

app/src/main/java/com/neki/android/app/AuthScreen.kt

@@ -0,0 +1,30 @@
+package com.neki.android.app
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Modifier
+import androidx.navigation3.runtime.NavEntry
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.ui.NavDisplay
+
+@Composable
+fun AuthScreen(
+    entries: SnapshotStateList<NavEntry<NavKey>>,
+    onBack: () -> Unit,
+) {
+    Scaffold(
+        modifier = Modifier
+            .fillMaxSize()
+            .navigationBarsPadding(),
+    ) { innerPadding ->
+        NavDisplay(
+            modifier = Modifier.padding(innerPadding),
+            entries = entries,
+            onBack = onBack,
+        )
+    }
+}

app/src/main/java/com/neki/android/app/MainActivity.kt

@@ -20,7 +20,9 @@ import com.neki.android.core.navigation.result.ResultEventBus
 import com.neki.android.core.navigation.root.RootNavKey
 import com.neki.android.core.navigation.root.RootNavigationState
 import com.neki.android.core.navigation.toEntries
-import com.neki.android.feature.auth.impl.LoginRoute
+import com.neki.android.core.navigation.auth.AuthNavigatorImpl
+import com.neki.android.core.navigation.auth.toEntries
+import com.neki.android.feature.auth.impl.navigation.authEntryProvider
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -31,6 +33,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var rootNavigationState: RootNavigationState
 
+    @Inject
+    lateinit var authNavigator: AuthNavigatorImpl
+
     @Inject
     lateinit var navigator: NavigatorImpl
 
@@ -52,9 +57,14 @@ class MainActivity : ComponentActivity() {
                 NekiTheme {
                     CompositionLocalProvider(LocalResultEventBus provides resultBus) {
                         when (rootNavigationState.currentRootKey) {
-                            RootNavKey.Login -> {
-                                LoginRoute(
-                                    navigateToMain = { navigator.navigateRoot(RootNavKey.Main) },
+                            RootNavKey.Auth -> {
+                                AuthScreen(
+                                    entries = authNavigator.state.toEntries(
+                                        entryProvider = entryProvider {
+                                            authEntryProvider(authNavigator).invoke(this)
+                                        },
+                                    ),
+                                    onBack = { authNavigator.goBack() },
                                 )
                             }
 
@@ -70,7 +80,7 @@ class MainActivity : ComponentActivity() {
                                     ),
                                     onTabSelected = { navigator.navigate(it) },
                                     onBack = { navigator.goBack() },
-                                    navigateToLogin = { navigator.navigateRoot(RootNavKey.Login) },
+                                    navigateToLogin = { navigator.navigateRoot(RootNavKey.Auth) },
                                 )
                             }
                         }
@@ -92,7 +102,7 @@ class MainActivity : ComponentActivity() {
                             Toast.LENGTH_SHORT,
                         ).show()
 
-                        navigator.navigateRoot(RootNavKey.Login)
+                        navigator.navigateRoot(RootNavKey.Auth)
                     }
                 }
             }

app/src/main/java/com/neki/android/app/navigation/di/NavigationModule.kt

@@ -1,9 +1,11 @@
 package com.neki.android.app.navigation.di
 
+import com.neki.android.app.navigation.keys.START_AUTH_NAV_KEY
 import com.neki.android.app.navigation.keys.START_NAV_KEY
 import com.neki.android.app.navigation.keys.START_ROOT_NAV_KEY
 import com.neki.android.app.navigation.keys.TOP_LEVEL_NAV_KEYS
 import com.neki.android.core.navigation.NavigationState
+import com.neki.android.core.navigation.auth.AuthNavigationState
 import com.neki.android.core.navigation.root.RootNavigationState
 import dagger.Module
 import dagger.Provides
@@ -17,18 +19,26 @@ internal object NavigationModule {
 
     @Provides
     @ActivityRetainedScoped
-    fun providesNavigationState(): NavigationState {
-        return NavigationState(
-            startKey = START_NAV_KEY,
-            topLevelKeys = TOP_LEVEL_NAV_KEYS.toSet(),
+    fun providesRootNavigationState(): RootNavigationState {
+        return RootNavigationState(
+            startKey = START_ROOT_NAV_KEY,
         )
     }
 
     @Provides
     @ActivityRetainedScoped
-    fun providesRootNavigationState(): RootNavigationState {
-        return RootNavigationState(
-            startKey = START_ROOT_NAV_KEY,
+    fun providesAuthNavigationState(): AuthNavigationState {
+        return AuthNavigationState(
+            startKey = START_AUTH_NAV_KEY,
+        )
+    }
+
+    @Provides
+    @ActivityRetainedScoped
+    fun providesNavigationState(): NavigationState {
+        return NavigationState(
+            startKey = START_NAV_KEY,
+            topLevelKeys = TOP_LEVEL_NAV_KEYS.toSet(),
         )
     }
 }

app/src/main/java/com/neki/android/app/navigation/keys/Keys.kt

@@ -3,7 +3,9 @@ package com.neki.android.app.navigation.keys
 import com.neki.android.app.navigation.TopLevelNavItem
 import com.neki.android.core.navigation.root.RootNavKey
 import com.neki.android.feature.archive.api.ArchiveNavKey
+import com.neki.android.feature.auth.api.AuthNavKey
 
-internal val START_ROOT_NAV_KEY = RootNavKey.Login
+internal val START_ROOT_NAV_KEY = RootNavKey.Auth
+internal val START_AUTH_NAV_KEY = AuthNavKey.Splash
 internal val START_NAV_KEY = ArchiveNavKey.Archive
 internal val TOP_LEVEL_NAV_KEYS = TopLevelNavItem.entries.map { it.navKey }

core/common/src/main/java/com/neki/android/core/common/kakao/KakaoAuthHelper.kt

@@ -3,10 +3,9 @@ package com.neki.android.core.common.kakao
 import android.content.Context
 import com.kakao.sdk.user.UserApiClient
 
-class KakaoAuthHelper(
-    private val context: Context,
-) {
+object KakaoAuthHelper {
     fun login(
+        context: Context,
         onSuccess: (String) -> Unit,
         onFailure: (String) -> Unit,
     ) {

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/AuthRepository.kt

@@ -1,9 +1,13 @@
 package com.neki.android.core.dataapi.repository
 
 import com.neki.android.core.model.Auth
+import kotlinx.coroutines.flow.Flow
 
 interface AuthRepository {
     suspend fun loginWithKakao(idToken: String): Result<Auth>
     suspend fun updateAccessToken(refreshToken: String): Result<Auth>
     suspend fun withdrawAccount(): Result<Unit>
+
+    fun hasCompletedOnboarding(): Flow<Boolean>
+    suspend fun setCompletedOnboarding(value: Boolean)
 }

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/TokenRepository.kt

@@ -7,7 +7,7 @@ interface TokenRepository {
         accessToken: String,
         refreshToken: String,
     )
-    fun isSavedTokens(): Flow<Boolean>
+    fun hasTokens(): Flow<Boolean>
     fun getAccessToken(): Flow<String>
     fun getRefreshToken(): Flow<String>
     suspend fun clearTokens()

core/data/src/main/java/com/neki/android/core/data/remote/di/NetworkModule.kt

@@ -88,7 +88,7 @@ internal object NetworkModule {
             install(Auth) {
                 bearer {
                     loadTokens {
-                        if (tokenRepository.isSavedTokens().first()) {
+                        if (tokenRepository.hasTokens().first()) {
                             BearerTokens(
                                 accessToken = tokenRepository.getAccessToken().first(),
                                 refreshToken = tokenRepository.getRefreshToken().first(),

core/data/src/main/java/com/neki/android/core/data/repository/di/RepositoryModule.kt

@@ -2,7 +2,6 @@ package com.neki.android.core.data.repository.di
 
 import com.neki.android.core.data.auth.AuthEventManagerImpl
 import com.neki.android.core.data.repository.impl.AuthRepositoryImpl
-import com.neki.android.core.data.repository.impl.DataStoreRepositoryImpl
 import com.neki.android.core.data.repository.impl.MediaUploadRepositoryImpl
 import com.neki.android.core.data.repository.impl.FolderRepositoryImpl
 import com.neki.android.core.data.repository.impl.MapRepositoryImpl
@@ -13,7 +12,6 @@ import com.neki.android.core.data.repository.impl.UserRepositoryImpl
 import com.neki.android.core.dataapi.auth.AuthEventManager
 import com.neki.android.core.dataapi.repository.FolderRepository
 import com.neki.android.core.dataapi.repository.AuthRepository
-import com.neki.android.core.dataapi.repository.DataStoreRepository
 import com.neki.android.core.dataapi.repository.MediaUploadRepository
 import com.neki.android.core.dataapi.repository.MapRepository
 import com.neki.android.core.dataapi.repository.PhotoRepository
@@ -30,12 +28,6 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 internal interface RepositoryModule {
 
-    @Binds
-    @Singleton
-    fun bindDataStoreRepositoryImpl(
-        dataStoreRepositoryImpl: DataStoreRepositoryImpl,
-    ): DataStoreRepository
-
     @Binds
     @Singleton
     fun bindAuthRepositoryImpl(

core/data/src/main/java/com/neki/android/core/data/repository/impl/AuthRepositoryImpl.kt

@@ -1,14 +1,22 @@
 package com.neki.android.core.data.repository.impl
 
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import com.neki.android.core.data.local.di.AuthDataStore
 import com.neki.android.core.data.remote.api.AuthService
 import com.neki.android.core.data.remote.model.request.KakaoLoginRequest
 import com.neki.android.core.data.remote.model.request.RefreshTokenRequest
 import com.neki.android.core.data.util.runSuspendCatching
 import com.neki.android.core.dataapi.repository.AuthRepository
 import com.neki.android.core.model.Auth
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
+    @AuthDataStore private val dataStore: DataStore<Preferences>,
     private val authService: AuthService,
 ) : AuthRepository {
     override suspend fun loginWithKakao(idToken: String): Result<Auth> = runSuspendCatching {
@@ -30,4 +38,20 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun withdrawAccount(): Result<Unit> = runSuspendCatching {
         authService.withdrawAccount()
     }
+
+    override fun hasCompletedOnboarding(): Flow<Boolean> {
+        return dataStore.data.map { preferences ->
+            preferences[HAS_COMPLETED_ONBOARDING] ?: false
+        }
+    }
+
+    override suspend fun setCompletedOnboarding(value: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[HAS_COMPLETED_ONBOARDING] = value
+        }
+    }
+
+    companion object {
+        private val HAS_COMPLETED_ONBOARDING = booleanPreferencesKey("has_completed_onboarding")
+    }
 }

core/data/src/main/java/com/neki/android/core/data/repository/impl/TokenRepositoryImpl.kt

@@ -3,8 +3,8 @@ package com.neki.android.core.data.repository.impl
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
 import com.neki.android.core.common.crypto.CryptoManager
-import com.neki.android.core.dataapi.datastore.DataStoreKey
 import com.neki.android.core.dataapi.auth.AuthCacheManager
 import com.neki.android.core.dataapi.repository.TokenRepository
 import kotlinx.coroutines.flow.Flow
@@ -16,42 +16,48 @@ class TokenRepositoryImpl @Inject constructor(
     @TokenDataStore private val dataStore: DataStore<Preferences>,
     private val authCacheManager: AuthCacheManager,
 ) : TokenRepository {
+
+    companion object {
+        val ACCESS_TOKEN = stringPreferencesKey("access_token")
+        val REFRESH_TOKEN = stringPreferencesKey("refresh_token")
+    }
+
     override suspend fun saveTokens(
         accessToken: String,
         refreshToken: String,
     ) {
         dataStore.edit { preferences ->
-            preferences[DataStoreKey.ACCESS_TOKEN] = CryptoManager.encrypt(accessToken)
-            preferences[DataStoreKey.REFRESH_TOKEN] = CryptoManager.encrypt(refreshToken)
+            preferences[ACCESS_TOKEN] = CryptoManager.encrypt(accessToken)
+            preferences[REFRESH_TOKEN] = CryptoManager.encrypt(refreshToken)
         }
         authCacheManager.invalidateTokenCache()
     }
 
-    override fun isSavedTokens(): Flow<Boolean> {
+    override fun hasTokens(): Flow<Boolean> {
         return dataStore.data.map { preferences ->
-            val accessToken = preferences[DataStoreKey.ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) }
-            val refreshToken = preferences[DataStoreKey.REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) }
+            val accessToken = preferences[ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) }
+            val refreshToken = preferences[REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) }
 
             !accessToken.isNullOrBlank() && !refreshToken.isNullOrBlank()
         }
     }
 
     override fun getAccessToken(): Flow<String> {
         return dataStore.data.map { preferences ->
-            preferences[DataStoreKey.ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
+            preferences[ACCESS_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
         }
     }
 
     override fun getRefreshToken(): Flow<String> {
         return dataStore.data.map { preferences ->
-            preferences[DataStoreKey.REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
+            preferences[REFRESH_TOKEN]?.let { CryptoManager.decrypt(it) } ?: ""
         }
     }
 
     override suspend fun clearTokens() {
         dataStore.edit { preferences ->
-            preferences.remove(DataStoreKey.ACCESS_TOKEN)
-            preferences.remove(DataStoreKey.REFRESH_TOKEN)
+            preferences.remove(ACCESS_TOKEN)
+            preferences.remove(REFRESH_TOKEN)
         }
         authCacheManager.invalidateTokenCache()
     }