#306 [feat] 대표 룰 UI

app/src/main/java/hous/release/android/presentation/our_rules/component/RuleEmptyContent.kt

@@ -0,0 +1,39 @@
+package hous.release.android.presentation.our_rules.component
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import hous.release.android.R
+import hous.release.designsystem.theme.HousG5
+import hous.release.designsystem.theme.HousTheme
+
+@Composable
+fun RuleEmptyContent(
+    modifier: Modifier = Modifier.fillMaxWidth().padding(top = 88.dp)
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = stringResource(id = R.string.hous_empty_our_rules),
+            color = HousG5,
+            style = HousTheme.typography.b2
+        )
+    }
+}
+
+@Preview("RuleEmptyContent - RuleScreen에 Rule이 없을 떄", showBackground = true)
+@Composable
+private fun Preview() {
+    HousTheme {
+        RuleEmptyContent()
+    }
+}

app/src/main/java/hous/release/android/presentation/our_rules/component/main/DetailRuleBottomSheetContent.kt

@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import hous.release.android.presentation.our_rules.component.PhotoGrid
+import hous.release.android.presentation.our_rules.component.update.PhotoGrid
 import hous.release.android.presentation.our_rules.model.DetailRuleUiModel
 import hous.release.designsystem.component.HousDetailBottomSheet
 import hous.release.designsystem.theme.HousBlack

app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleContent.kt

@@ -20,16 +20,17 @@ import hous.release.designsystem.component.FabScreenSlot
 import hous.release.designsystem.component.HousTextField
 import hous.release.designsystem.component.HousTextFieldMode
 import hous.release.designsystem.theme.HousTheme
-import hous.release.domain.entity.rule.MainRule
+import hous.release.domain.entity.rule.Rule
 import hous.release.feature.todo.R
 
 @Composable
 fun MainRuleContent(
-    mainRules: List<MainRule> = emptyList(),
+    mainRules: List<Rule> = emptyList(),
     searchQuery: String = "",
     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(
@@ -83,10 +86,10 @@ private fun MainRuleScreenPreView2() {
     HousTheme {
         MainRuleContent(
             mainRules = listOf(
-                MainRule().copy(id = 1, name = "test1", isNew = true),
-                MainRule().copy(id = 2, name = "test2", isNew = false),
-                MainRule().copy(id = 3, name = "test3", isNew = true),
-                MainRule().copy(id = 4, name = "test4", isNew = false)
+                Rule().copy(id = 1, name = "test1", isNew = true),
+                Rule().copy(id = 2, name = "test2", isNew = false),
+                Rule().copy(id = 3, name = "test3", isNew = true),
+                Rule().copy(id = 4, name = "test4", isNew = false)
             )
         )
     }

app/src/main/java/hous/release/android/presentation/our_rules/component/main/MainRuleList.kt

@@ -1,7 +1,6 @@
 package hous.release.android.presentation.our_rules.component.main
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -11,28 +10,25 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import hous.release.android.R
+import hous.release.android.presentation.our_rules.component.RuleEmptyContent
 import hous.release.designsystem.component.HousDot
 import hous.release.designsystem.component.HousDotType
 import hous.release.designsystem.component.HousRuleSlot
 import hous.release.designsystem.theme.HousBlue
-import hous.release.designsystem.theme.HousG5
 import hous.release.designsystem.theme.HousTheme
-import hous.release.domain.entity.rule.MainRule
+import hous.release.domain.entity.rule.Rule
 
 @Composable
 fun MainRuleList(
     onNavigateToDetailRule: (Int) -> Unit = {},
-    mainRules: List<MainRule> = emptyList()
+    mainRules: List<Rule> = emptyList()
 ) {
     if (mainRules.isEmpty()) {
-        MainRuleEmptyContent()
+        RuleEmptyContent()
     } else {
         Spacer(modifier = Modifier.height(16.dp))
         LazyColumn {
@@ -46,24 +42,10 @@ fun MainRuleList(
     }
 }
 
-@Composable
-private fun MainRuleEmptyContent() {
-    Column(
-        modifier = Modifier.fillMaxWidth().padding(top = 88.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Text(
-            text = stringResource(id = R.string.hous_empty_our_rules),
-            color = HousG5,
-            style = HousTheme.typography.b2
-        )
-    }
-}
-
 @Composable
 private fun MainRuleItem(
     onClick: () -> Unit = {},
-    mainRule: MainRule = MainRule()
+    mainRule: Rule = Rule()
 ) {
     val focusManager = LocalFocusManager.current
     HousRuleSlot(
@@ -106,10 +88,10 @@ private fun MainRuleContentPreview() {
     HousTheme {
         MainRuleList(
             mainRules = listOf(
-                MainRule().copy(id = 1, name = "test1", isNew = true),
-                MainRule().copy(id = 2, name = "test2", isNew = false),
-                MainRule().copy(id = 3, name = "test3", isNew = true),
-                MainRule().copy(id = 4, name = "test4", isNew = false)
+                Rule().copy(id = 1, name = "test1", isNew = true),
+                Rule().copy(id = 2, name = "test2", isNew = false),
+                Rule().copy(id = 3, name = "test3", isNew = true),
+                Rule().copy(id = 4, name = "test4", isNew = false)
             )
         )
     }
@@ -131,7 +113,7 @@ private fun NewMainRulePreview() {
     HousTheme {
         Surface {
             MainRuleItem(
-                mainRule = MainRule().copy(isNew = true)
+                mainRule = Rule().copy(isNew = true)
             )
         }
     }

app/src/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)
     }
 }
 

app/src/main/java/hous/release/android/presentation/our_rules/component/represent/RepresentRuleList.kt

@@ -0,0 +1,122 @@
+package hous.release.android.presentation.our_rules.component.represent
+
+import androidx.compose.foundation.LocalIndication
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import hous.release.android.presentation.our_rules.component.RuleEmptyContent
+import hous.release.android.presentation.our_rules.model.RepresentRuleUiModel
+import hous.release.designsystem.component.HousCheckBox
+import hous.release.designsystem.component.HousRuleSlot
+import hous.release.designsystem.theme.HousTheme
+import hous.release.domain.entity.rule.Rule
+
+@Composable
+fun RepresentRuleList(
+    modifier: Modifier = Modifier,
+    rules: List<RepresentRuleUiModel> = emptyList(),
+    onClick: (Int) -> Unit = {}
+) {
+    if (rules.isEmpty()) {
+        RuleEmptyContent()
+    }
+    LazyColumn(modifier = modifier) {
+        itemsIndexed(rules, key = { _, rule -> rule.id }) { _, rule ->
+            RepresentRuleItem(rule, onClick)
+        }
+    }
+}
+
+@Composable
+private fun RepresentRuleItem(
+    rule: RepresentRuleUiModel,
+    onClick: (Int) -> Unit = {}
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+
+    HousRuleSlot(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(
+                interactionSource = interactionSource,
+                onClick = { onClick(rule.id) },
+                indication = LocalIndication.current
+            )
+            .padding(start = 8.dp, top = 12.dp, bottom = 12.dp),
+        text = rule.name,
+        isShowTrailingIcon = true,
+        leadingIcon = {
+            HousCheckBox(
+                interactionSource = interactionSource,
+                onCheckedChange = { onClick(rule.id) },
+                isChecked = rule.isRepresent
+            )
+        },
+        trailingIcon = {}
+    )
+}
+
+@Preview(name = "RepresentRuleList - General", showBackground = true)
+@Composable
+private fun Preview1() {
+    HousTheme {
+        var rules by remember {
+            mutableStateOf(
+                listOf(
+                    Rule(
+                        id = 1,
+                        name = "text1",
+                        isRepresent = true
+                    ),
+                    Rule(id = 2, "text 2")
+                ).map { RepresentRuleUiModel.from(it) }
+            )
+        }
+        val onClick: (Int) -> Unit = { id ->
+            rules = rules.map {
+                if (it.id == id) {
+                    it.copy(isRepresent = !it.isRepresent)
+                } else {
+                    it
+                }
+            }
+        }
+        RepresentRuleList(rules = rules, onClick = onClick)
+    }
+}
+
+@Preview(name = "RepresentRuleList - Empty Rule", showBackground = true)
+@Composable
+private fun Preview2() {
+    HousTheme {
+        RepresentRuleList()
+    }
+}
+
+@Preview(name = "RepresentRuleItem", showBackground = true)
+@Composable
+private fun Preview3() {
+    HousTheme {
+        var isRepresent by remember { mutableStateOf(false) }
+        val onClick: (Int) -> Unit = {
+            isRepresent = !isRepresent
+        }
+        RepresentRuleItem(
+            rule = RepresentRuleUiModel.from(
+                Rule(isRepresent = isRepresent)
+            ),
+            onClick = onClick
+        )
+    }
+}

app/src/main/java/hous/release/android/presentation/our_rules/component/BasicUpdateRuleScreen.kt → app/src/main/java/hous/release/android/presentation/our_rules/component/update/BasicUpdateRuleScreen.kt

@@ -1,4 +1,4 @@
-package hous.release.android.presentation.our_rules.component
+package hous.release.android.presentation.our_rules.component.update
 
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Column
@@ -25,6 +25,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import hous.release.android.R
+import hous.release.android.presentation.our_rules.component.RuleToolbar
 import hous.release.android.presentation.our_rules.component.add.RuleTitleGuide
 import hous.release.android.presentation.our_rules.model.PhotoUiModel
 import hous.release.designsystem.component.HousTextField

app/src/main/java/hous/release/android/presentation/our_rules/component/PhotoGrid.kt → app/src/main/java/hous/release/android/presentation/our_rules/component/update/PhotoGrid.kt

@@ -1,4 +1,4 @@
-package hous.release.android.presentation.our_rules.component
+package hous.release.android.presentation.our_rules.component.update
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap

app/src/main/java/hous/release/android/presentation/our_rules/component/RuleAddPhotoButton.kt → app/src/main/java/hous/release/android/presentation/our_rules/component/update/RuleAddPhotoButton.kt

@@ -1,4 +1,4 @@
-package hous.release.android.presentation.our_rules.component
+package hous.release.android.presentation.our_rules.component.update
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

app/src/main/java/hous/release/android/presentation/our_rules/component/RulePhotoStatusBar.kt → app/src/main/java/hous/release/android/presentation/our_rules/component/update/RulePhotoStatusBar.kt

@@ -1,4 +1,4 @@
-package hous.release.android.presentation.our_rules.component
+package hous.release.android.presentation.our_rules.component.update
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row