[fix] mash-up-kr#111 시그널 보내기 후 홈 돌아올때 백스택 제거

JaesungLeee · Jul 10, 2023 · 7e923d3 · 7e923d3
1 parent 8184351
commit 7e923d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/presentation/src/main/java/com/mashup/presentation/feature/home/HomeScreen.kt b/presentation/src/main/java/com/mashup/presentation/feature/home/HomeScreen.kt
@@ -1,11 +1,13 @@
 package com.mashup.presentation.feature.home
 
-import androidx.compose.animation.*
-import androidx.compose.foundation.*
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text

diff --git a/presentation/src/main/java/com/mashup/presentation/feature/home/navigation/HomeNavigation.kt b/presentation/src/main/java/com/mashup/presentation/feature/home/navigation/HomeNavigation.kt
@@ -7,7 +7,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.navigation
 import com.mashup.presentation.feature.home.HomeRoute
 import com.mashup.presentation.feature.guide.GuideRoute
-import com.mashup.presentation.feature.home.SubscribeRoute
+import com.mashup.presentation.feature.subscribe.SubscribeRoute
 import com.mashup.presentation.navigation.KeyLinkNavigationRoute
 
 /**

diff --git a/...ation/src/main/java/com/mashup/presentation/feature/signal/navigation/SignalNavigation.kt b/...ation/src/main/java/com/mashup/presentation/feature/signal/navigation/SignalNavigation.kt
@@ -61,6 +61,9 @@ fun NavGraphBuilder.signalGraph(
                 onCloseClick = {
                     navController.navigateToHome(
                         navOptions {
+                            popUpTo(KeyLinkNavigationRoute.SignalGraph.SignalContentRoute.route) {
+                                inclusive = true
+                            }
                             launchSingleTop = true
                         }
                     )

diff --git a/...ntation/src/main/java/com/mashup/presentation/feature/subscribe/SubscribeKeywordScreen.kt b/...ntation/src/main/java/com/mashup/presentation/feature/subscribe/SubscribeKeywordScreen.kt
@@ -1,4 +1,4 @@
-package com.mashup.presentation.feature.home
+package com.mashup.presentation.feature.subscribe
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -12,7 +12,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.mashup.presentation.R
-import com.mashup.presentation.feature.subscribe.SubscribeViewModel
 import com.mashup.presentation.ui.common.*
 import com.mashup.presentation.ui.theme.*