[MOD]

- mod GnrNavHost - mod MatchDetailScreen - mod MatchNavigation
eshc123 · May 22, 2024 · 4890e46 · 4890e46
1 parent 38408d9
commit 4890e46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/src/main/java/com/eshc/goonersapp/navigation/GnrNavHost.kt b/app/src/main/java/com/eshc/goonersapp/navigation/GnrNavHost.kt
@@ -77,6 +77,7 @@ fun GnrNavHost(
 
         matchDetailScreen(
             onClickChat = { navController.navigateToChatRoom(it) },
+            onBackIconClick = { navController.popBackStack() },
             onShowSnackbar = onShowSnackbar
         )
 

diff --git a/feature/match/src/main/java/com/eshc/goonersapp/feature/match/detail/MatchDetailScreen.kt b/feature/match/src/main/java/com/eshc/goonersapp/feature/match/detail/MatchDetailScreen.kt
@@ -45,6 +45,7 @@ import com.eshc.goonersapp.core.common.state.UiState
 import com.eshc.goonersapp.core.common.util.DateUtil
 import com.eshc.goonersapp.core.designsystem.IconPack
 import com.eshc.goonersapp.core.designsystem.component.GnrTabItem
+import com.eshc.goonersapp.core.designsystem.component.GnrTopBar
 import com.eshc.goonersapp.core.designsystem.component.MatchLeagueInfo
 import com.eshc.goonersapp.core.designsystem.iconpack.IcTalk
 import com.eshc.goonersapp.core.designsystem.theme.ColorFF10358A
@@ -60,14 +61,21 @@ import com.eshc.goonersapp.feature.match.state.MatchDetailUiState
 
 @Composable
 fun MatchDetailRootScreen(
+    onBackIconClick: () -> Unit,
     onShowSnackbar: (String) -> Unit,
     onClickChat: (MatchUiModel) -> Unit,
     viewModel: MatchDetailViewModel = hiltViewModel(),
 ) {
     val matchData by viewModel.matchDetailUiState.collectAsStateWithLifecycle()
 
     Scaffold(
-        topBar = { /* TODO("Not yet implemented") */ }
+        topBar = {
+            GnrTopBar(
+                title = "",
+                onBackIconClick = onBackIconClick,
+                content = {  }
+            )
+        }
     ) { paddingValues ->
         MatchDetailScreen(
             matchDetailUiState = matchData,
@@ -88,6 +96,7 @@ fun MatchDetailScreen(
     var selectedTab by remember { mutableStateOf(DetailTab.SUMMARY) }
     val match = matchDetailUiState.match
     val matchDetail = matchDetailUiState.matchDetailState
+
     Box(
         modifier = modifier
             .fillMaxSize()
@@ -238,13 +247,8 @@ fun MatchDetailScreen(
 
             item {
                 when (selectedTab) {
-                    DetailTab.SUMMARY -> {
-                        SummaryScreen()
-                    }
-
-                    DetailTab.COMMENT -> {
-
-                    }
+                    DetailTab.SUMMARY -> { SummaryScreen() }
+                    DetailTab.COMMENT -> { /* TODO("Not yet implemented") */ }
                 }
             }
         }

diff --git a/feature/match/src/main/java/com/eshc/goonersapp/feature/match/navigation/MatchNavigation.kt b/feature/match/src/main/java/com/eshc/goonersapp/feature/match/navigation/MatchNavigation.kt
@@ -45,6 +45,7 @@ fun NavGraphBuilder.matchScreen(
 
 
 fun NavGraphBuilder.matchDetailScreen(
+    onBackIconClick: () -> Unit,
     onClickChat : (MatchUiModel) -> Unit,
     onShowSnackbar : (String) -> Unit
 ) {
@@ -54,6 +55,7 @@ fun NavGraphBuilder.matchDetailScreen(
     ) {
         MatchDetailRootScreen(
             onClickChat = onClickChat,
+            onBackIconClick = onBackIconClick,
             onShowSnackbar = onShowSnackbar
         )
     }