#111 Home 진입 이후 플로우 Compose Navigation 마이그레이션 작업

buildSrc/src/main/java/dependencies/Dep.kt

@@ -4,7 +4,8 @@ object Dep {
     object AndroidX {
         const val appCompat = "androidx.appcompat:appcompat:1.6.1"
         const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-        const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
+        const val constraintLayoutCompose =
+            "androidx.constraintlayout:constraintlayout-compose:1.0.1"
 
         object Activity {
             const val ktx = "androidx.activity:activity-ktx:1.2.3"
@@ -21,6 +22,7 @@ object Dep {
             const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
             const val savedState = "androidx.lifecycle:lifecycle-viewmodel-savedstate:$version"
             const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
+            const val runtimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:$version"
             const val process = "androidx.lifecycle:lifecycle-process:$version"
             const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
             const val compiler = "androidx.lifecycle:lifecycle-compiler:$version"
@@ -43,6 +45,11 @@ object Dep {
         object Core {
             const val core = "androidx.core:core-ktx:1.7.0"
         }
+
+        object Hilt {
+            const val hiltNavigation = "androidx.hilt:hilt-navigation-compose:1.0.0"
+        }
+
     }
 
     object Google {
@@ -123,7 +130,8 @@ object Dep {
         private const val version = "4.13.2"
         const val glide = "com.github.bumptech.glide:glide:$version"
         const val compiler = "com.github.bumptech.glide:compiler:$version"
-        const val recyclerviewIntegration = "com.github.bumptech.glide:recyclerview-integration:$version"
+        const val recyclerviewIntegration =
+            "com.github.bumptech.glide:recyclerview-integration:$version"
         const val okHttpIntegration = "com.github.bumptech.glide:okhttp3-integration:$version"
     }
 
@@ -154,6 +162,12 @@ object Dep {
             const val uiTooling = "androidx.compose.ui:ui-tooling:$version"
             const val uiTestManifest = "androidx.compose.ui:ui-test-manifest:$version"
         }
+
+        object Navigation {
+            private const val navigationVersion = "2.6.0"
+            const val navigationCompose =
+                "androidx.navigation:navigation-compose:$navigationVersion"
+        }
     }
 
     object Javax {

presentation/build.gradle

@@ -56,11 +56,12 @@ dependencies {
     // lifecycle
     implementation Dep.AndroidX.Lifecycle.viewModel
     implementation Dep.AndroidX.Lifecycle.savedState
-    implementation Dep.AndroidX.Lifecycle.compose
+    implementation Dep.AndroidX.Lifecycle.runtimeCompose
     kapt Dep.AndroidX.Lifecycle.compiler
 
     // ViewModel utilities for Compose
-    implementation Dep.AndroidX.Lifecycle.Compose.viewModel
+    implementation Dep.AndroidX.Lifecycle.Compose.viewModel  // 추후 제거 필요
+    implementation Dep.AndroidX.Hilt.hiltNavigation
 
     // glide
     implementation Dep.Glide.glide
@@ -71,7 +72,6 @@ dependencies {
 
     // hilt
     implementation Dep.Dagger.Hilt.hilt
-    implementation Dep.Dagger.Hilt.Compose.navigation
     kapt Dep.Dagger.Hilt.compiler
 
     // navigation
@@ -91,6 +91,7 @@ dependencies {
     implementation Dep.Compose.preview
     implementation Dep.Compose.material
     implementation Dep.AndroidX.Activity.compose
+    implementation Dep.Compose.Navigation.navigationCompose
     androidTestImplementation Dep.Compose.Test.ui
     debugImplementation Dep.Compose.Debug.uiTooling
     debugImplementation Dep.Compose.Debug.uiTestManifest

presentation/src/main/AndroidManifest.xml

@@ -3,22 +3,24 @@
 
     <application>
         <activity
-            android:name=".home.HomeActivity"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize" />
+            android:name=".navigation.MainActivity"
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
-            android:name=".onboarding.OnBoardingActivity"
+            android:name=".feature.onboarding.OnBoardingActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".login.LoginActivity"
+            android:name=".feature.login.LoginActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
         </activity>
 
         <activity

presentation/src/main/java/com/mashup/presentation/KeyLinkApp.kt

@@ -0,0 +1,53 @@
+package com.mashup.presentation
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Scaffold
+import androidx.compose.material.SnackbarDuration
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.SnackbarResult
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import com.mashup.presentation.navigation.KeyLinkNavHost
+import com.mashup.presentation.ui.common.KeyLinkBottomBar
+import com.mashup.presentation.ui.common.KeyLinkSnackBar
+import com.mashup.presentation.ui.theme.Black
+
+/**
+ * Ssam_D_Android
+ * @author jaesung
+ * @created 2023/07/04
+ */
+@Composable
+fun KeyLinkApp(
+    appState: KeyLinkAppState = rememberKeyLinkAppState()
+) {
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    Scaffold(
+        bottomBar = {
+            if (appState.isBottomBarVisible()) {
+                KeyLinkBottomBar(
+                    destinations = appState.topLevelDestinations,
+                    onNavigateToDestination = appState::navigateToTopLevelDestination,
+                    currentDestination = appState.currentDestination,
+                    modifier = Modifier
+                )
+            }
+        },
+        backgroundColor = Black,
+        snackbarHost = { KeyLinkSnackBar(snackBarHostState = snackbarHostState) }
+    ) { innerPadding ->
+        KeyLinkNavHost(
+            appState = appState,
+            modifier = Modifier.padding(innerPadding),
+            onShowSnackbar = { message, action ->
+                snackbarHostState.showSnackbar(
+                    message = message,
+                    actionLabel = action,
+                    duration = SnackbarDuration.Short
+                ) == SnackbarResult.ActionPerformed
+            }
+        )
+    }
+}

presentation/src/main/java/com/mashup/presentation/KeyLinkAppState.kt

@@ -0,0 +1,77 @@
+package com.mashup.presentation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.navigation.NavDestination
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navOptions
+import com.mashup.presentation.feature.chat.navigation.navigateToChat
+import com.mashup.presentation.feature.home.navigation.navigateToHome
+import com.mashup.presentation.feature.signal.navigation.navigateToSignal
+import com.mashup.presentation.navigation.KeyLinkNavigationRoute
+import com.mashup.presentation.navigation.TopLevelDestination
+
+/**
+ * Ssam_D_Android
+ * @author jaesung
+ * @created 2023/07/04
+ */
+
+@Composable
+fun rememberKeyLinkAppState(
+    navController: NavHostController = rememberNavController()
+): KeyLinkAppState {
+    return remember(navController) {
+        KeyLinkAppState(navController)
+    }
+}
+
+/**
+ * KeyLinkAppState에는 전반적인 어플리케이션 자체의 상태가 포함됩니다.
+ * 1. Navigation Destination
+ * 2. Multiple BackStack
+ * 3. BottomNavigation Visibility
+ * 4. NetworkMonitor(isOffline / isOnline)
+ * 5. ...
+ */
+@Stable
+class KeyLinkAppState(
+    val navController: NavHostController
+) {
+    val currentDestination: NavDestination?
+        @Composable get() = navController.currentBackStackEntryAsState().value?.destination
+
+    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.values().toList()
+
+    @Composable
+    fun isBottomBarVisible(): Boolean {
+        return when (currentDestination?.route) {
+            KeyLinkNavigationRoute.HomeGraph.HomeRoute.route,
+            KeyLinkNavigationRoute.ChatGraph.ChatRoute.route -> true
+            else -> false
+        }
+    }
+
+    /**
+     * Home, Chat Route로 다시 돌아와야 하는 경우 호출하는 메서드
+     * singleTop으로 동작 및 backstack 유지
+     */
+    fun navigateToTopLevelDestination(topLevelDestination: TopLevelDestination) {
+        val topLevelNavOptions = navOptions {
+            popUpTo(id = navController.graph.findStartDestination().id) {
+                saveState = true
+            }
+            launchSingleTop = true
+            restoreState = true
+        }
+        when (topLevelDestination) {
+            TopLevelDestination.HOME -> navController.navigateToHome(topLevelNavOptions)
+            TopLevelDestination.SIGNAL -> navController.navigateToSignal(topLevelNavOptions)
+            TopLevelDestination.CHAT -> navController.navigateToChat(topLevelNavOptions)
+        }
+    }
+}

presentation/src/main/java/com/mashup/presentation/feature/chat/ChatViewModel.kt

@@ -0,0 +1,14 @@
+package com.mashup.presentation.feature.chat
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+/**
+ * Ssam_D_Android
+ * @author jaesung
+ * @created 2023/07/09
+ */
+@HiltViewModel
+class ChatViewModel @Inject constructor() : ViewModel() {
+}

presentation/src/main/java/com/mashup/presentation/chat/compose/ChatListScreen.kt → presentation/src/main/java/com/mashup/presentation/feature/chat/compose/ChatListScreen.kt

@@ -1,4 +1,4 @@
-package com.mashup.presentation.chat.compose
+package com.mashup.presentation.feature.chat.compose
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -21,7 +21,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.mashup.presentation.R
-import com.mashup.presentation.chat.model.Message
+import com.mashup.presentation.feature.chat.model.Message
 import com.mashup.presentation.ui.theme.*
 
 /**