#310 [ui] navigate Represent Rule Screen

Hous-Release · Sep 2, 2023 · a57c596 · a57c596
1 parent eeeb491
commit a57c596
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt b/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt
@@ -30,6 +30,7 @@ fun MainRuleContent(
     onSearch: (String) -> Unit = {},
     onOpenDetailRule: (Int) -> Unit = {},
     onNavigateToAddRule: () -> Unit = {},
+    onNavigateToRepresentRule: () -> Unit = {},
     onFinish: () -> Unit = {}
 ) {
     val focusManager = LocalFocusManager.current
@@ -42,7 +43,8 @@ fun MainRuleContent(
                 .padding(
                     start = 16.dp,
                     end = 16.dp
-                ).pointerInput(Unit) {
+                )
+                .pointerInput(Unit) {
                     detectTapGestures(
                         onTap = {
                             focusManager.clearFocus()
@@ -52,7 +54,8 @@ fun MainRuleContent(
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             MainRuleToolbar(
-                onBack = onFinish
+                onBack = onFinish,
+                onNavigateToRepresentRule = onNavigateToRepresentRule
             )
             Spacer(modifier = Modifier.padding(top = 4.dp))
             HousTextField(

diff --git a/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleToolbar.kt b/...c/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleToolbar.kt
@@ -24,7 +24,7 @@ import hous.release.designsystem.theme.HousTheme
 
 @Composable
 fun MainRuleToolbar(
-    onClickSetting: () -> Unit = {},
+    onNavigateToRepresentRule: () -> Unit = {},
     modifier: Modifier = Modifier,
     title: String = "우리 집 Rules",
     onBack: () -> Unit = { }
@@ -62,7 +62,7 @@ fun MainRuleToolbar(
                 )
             }
         )
-        MainRuleDropDownMenu(expanded, onDismiss)
+        MainRuleDropDownMenu(expanded, onDismiss, onNavigateToRepresentRule)
     }
 }
 

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt b/app/src/main/java/hous/release/android/presentation/our_rules/graph/RuleNavGraph.kt
@@ -102,6 +102,7 @@ private fun NavGraphBuilder.mainRuleScreen(
             onSearch = viewModel::searchRule,
             onNavigateToAddRule = viewModel::canAddRule,
             onNavigateToUpdateRule = navController::navigateUpdateRule,
+            onNavigateToRepresentRule = navController::navigateToRepresentRule,
             onFinish = activity::finish,
             refresh = viewModel::fetchMainRules,
             deleteRule = viewModel::deleteRule,
@@ -309,7 +310,6 @@ private fun NavGraphBuilder.representativeRuleScreen(onBack: () -> Unit) {
     }
 }
 // Navigation
-
 fun NavController.navigateToAddRule() {
     navigate(RulesScreens.Add.route)
 }
@@ -321,3 +321,7 @@ fun NavController.navigateUpdateRule(detailRuleUiModel: DetailRuleUiModel) {
     )
     navigate(RulesScreens.Update.route)
 }
+
+fun NavController.navigateToRepresentRule() {
+    navigate(RulesScreens.Represent.route)
+}
diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt b/app/src/main/java/hous/release/android/presentation/our_rules/screen/MainRuleScreen.kt
@@ -38,6 +38,7 @@ fun MainRuleScreen(
     onSearch: (String) -> Unit = {},
     onNavigateToUpdateRule: (DetailRuleUiModel) -> Unit = {},
     onNavigateToAddRule: () -> Unit = {},
+    onNavigateToRepresentRule: () -> Unit = {},
     onFinish: () -> Unit = {},
     refresh: () -> Unit = {}
 ) {
@@ -108,6 +109,7 @@ fun MainRuleScreen(
                 }
             },
             onNavigateToAddRule = onNavigateToAddRule,
+            onNavigateToRepresentRule = onNavigateToRepresentRule,
             onFinish = onFinish
         )
     }

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/screen/UpdateRuleScreen.kt b/app/src/main/java/hous/release/android/presentation/our_rules/screen/UpdateRuleScreen.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import hous.release.android.R
-import hous.release.android.presentation.our_rules.component.BasicUpdateRuleScreen
+import hous.release.android.presentation.our_rules.component.update.BasicUpdateRuleScreen
 import hous.release.android.presentation.our_rules.model.PhotoUiModel
 import hous.release.designsystem.theme.HousTheme