From ec3eb4d3582cd6e5704b7cfd39d99590e0b554c3 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:14:31 +0900
Subject: [PATCH 01/20] =?UTF-8?q?#7=20[add]=20build=20gradle=20-=20Deps=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20(navigation,=20hilt-navigation,=20hilt=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EB=93=9C))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildSrc/src/main/java/Deps.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/Deps.kt b/buildSrc/src/main/java/Deps.kt
index 6f106b58f..3f416d1e7 100644
--- a/buildSrc/src/main/java/Deps.kt
+++ b/buildSrc/src/main/java/Deps.kt
@@ -3,7 +3,7 @@ const val kotlinVersion = "1.7.10"
 
 object AppConfig {
     const val applicationId = "hous.release.android"
-    const val buildToolsVersion = "30.0.2"
+    const val buildToolsVersion = "30.0.3"
     const val compileSdkVersion = 32
     const val minSdkVersion = 26
     const val targetSdkVersion = 32
@@ -13,6 +13,10 @@ object AppConfig {
 
 object Deps {
     object AndroidX {
+        const val hilt_navigation = "androidx.hilt:hilt-navigation-fragment:1.0.0"
+        private const val version = "2.5.1"
+        const val navigation = "androidx.navigation:navigation-ui-ktx:$version"
+        const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:$version"
         const val core = "androidx.core:core-ktx:1.8.0"
         const val appcompat = "androidx.appcompat:appcompat:1.5.0"
         const val material = "com.google.android.material:material:1.6.1"
@@ -35,7 +39,7 @@ object Deps {
     }
 
     object DI {
-        private const val version = "2.38.1"
+        private const val version = "2.43.2"
         const val hiltClassPath = "com.google.dagger:hilt-android-gradle-plugin:$version"
         const val hilt = "com.google.dagger:hilt-android:$version"
         const val hiltKapt = "com.google.dagger:hilt-compiler:$version"

From c9d113477a7cc4a2d28443d0aec4b87e36511dff Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:15:08 +0900
Subject: [PATCH 02/20] =?UTF-8?q?#7=20[add]=20RuleInfo=20entity=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/src/main/java/hous/release/domain/entity/RuleInfo.kt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 domain/src/main/java/hous/release/domain/entity/RuleInfo.kt

diff --git a/domain/src/main/java/hous/release/domain/entity/RuleInfo.kt b/domain/src/main/java/hous/release/domain/entity/RuleInfo.kt
new file mode 100644
index 000000000..29f8f4e5d
--- /dev/null
+++ b/domain/src/main/java/hous/release/domain/entity/RuleInfo.kt
@@ -0,0 +1,6 @@
+package hous.release.domain.entity
+
+data class RuleInfo(
+    val id: String = "",
+    val description: String = ""
+)

From dde7c42ad95b2fef47fa083a0031557df0242bef Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:15:39 +0900
Subject: [PATCH 03/20] =?UTF-8?q?#7=20[fix]=20Theme=20NoActionBar=EB=A1=9C?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/themes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2b8092c4a..e767bbc05 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.HousReleaseAos" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.HousReleaseAos" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

From 8a0d8f918fddbb8144ea4a11964cf7fd50add646 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:17:08 +0900
Subject: [PATCH 04/20] =?UTF-8?q?#7=20[fix]=20=EC=8B=9C=EC=9E=91=20Activit?=
 =?UTF-8?q?y=20=EB=B3=80=EA=B2=BD(Test=ED=95=B4=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0890991c8..3d086d84b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,16 +19,17 @@
         tools:targetApi="31">
         <activity
             android:name=".presentation.our_rules.OurRulesActivity"
-            android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file

From 0679bcc3ad09fa103380c6a8563805abf4211f5b Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:19:05 +0900
Subject: [PATCH 05/20] =?UTF-8?q?#7=20[add]=20build=20gradle=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f82c4b708..9b1f51133 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -67,6 +67,9 @@ dependencies {
     implementation(project(":domain"))
 
     Deps.AndroidX.run {
+        implementation(hilt_navigation)
+        implementation(navigation)
+        implementation(navigationFragment)
         implementation(core)
         implementation(appcompat)
         implementation(material)

From fcb5882e37f93a0075dee0bcb159073639ab8752 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:19:43 +0900
Subject: [PATCH 06/20] =?UTF-8?q?#7=20[feat]=20navigation=20=EA=B8=B0?=
 =?UTF-8?q?=EC=B4=88=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/navigation/nav_our_rules.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 app/src/main/res/navigation/nav_our_rules.xml

diff --git a/app/src/main/res/navigation/nav_our_rules.xml b/app/src/main/res/navigation/nav_our_rules.xml
new file mode 100644
index 000000000..8c6ee3608
--- /dev/null
+++ b/app/src/main/res/navigation/nav_our_rules.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_our_rules"
+    app:startDestination="@id/ourRulesFragment">
+
+    <fragment
+        android:id="@+id/ourRulesFragment"
+        android:name="hous.release.android.presentation.our_rules.OurRulesFragment"
+        android:label="fragment_our_rule"
+        app:defaultNavHost="true"
+        tools:layout="@layout/fragment_our_rule" />
+</navigation>
\ No newline at end of file

From 23e59160c70abe1a6ece165ef6654fb390eb29ca Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:20:00 +0900
Subject: [PATCH 07/20] =?UTF-8?q?#7=20[add]=20String=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8468c5a3c..f8b611d5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,7 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="our_house_representative_rules_empty">아직 우리 집 Rules가 없어요!</string>
     <string name="our_house_general_rules_empty">다른 Rule도 추가해보세요!</string>
+    <string name="our_house_representative_rules_number_one">1.</string>
+    <string name="our_house_representative_rules_number_two">2.</string>
+    <string name="our_house_representative_rules_number_three">3.</string>
 </resources>
\ No newline at end of file

From 95af413a49ba6e434c449d394f6cb627fec31db3 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:20:32 +0900
Subject: [PATCH 08/20] =?UTF-8?q?#7=20[add]=20RulesItemView=20enum=20class?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/our_rules/type/RuleItemViewType.kt        | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 app/src/main/java/hous/release/android/presentation/our_rules/type/RuleItemViewType.kt

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/type/RuleItemViewType.kt b/app/src/main/java/hous/release/android/presentation/our_rules/type/RuleItemViewType.kt
new file mode 100644
index 000000000..772d4875a
--- /dev/null
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/type/RuleItemViewType.kt
@@ -0,0 +1,7 @@
+package hous.release.android.presentation.our_rules.type
+
+/**
+ * 우리 집 규칙 뷰 타입 */
+enum class RuleItemViewType(val id: Int) {
+    REPRESENTATVIE_TOP(1), REPRESENTATVIE_MIDDLE(2), REPRESENTATVIE_BOTTOM(3), GENERAL(4)
+}

From 41290c67abc45ba45330d42e5307fade6341bee7 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:21:40 +0900
Subject: [PATCH 09/20] =?UTF-8?q?#7=20[feat]=20OurRulesAdapter=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=20=EB=B0=8F=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B0=94?=
 =?UTF-8?q?=EC=9D=B8=EB=94=A9=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../our_rules/adapter/OurRulesAdapter.kt      | 125 ++++++++++++++++++
 .../layout/item_our_rules_general_rule.xml    |  79 ++++++-----
 ...m_our_rules_representative_rule_bottom.xml |  87 +++++++-----
 ...m_our_rules_representative_rule_middle.xml |  94 +++++++------
 ...item_our_rules_representative_rule_top.xml |  88 ++++++------
 5 files changed, 326 insertions(+), 147 deletions(-)
 create mode 100644 app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt b/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt
new file mode 100644
index 000000000..139d8a7f6
--- /dev/null
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt
@@ -0,0 +1,125 @@
+package hous.release.android.presentation.our_rules.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import hous.release.android.databinding.ItemOurRulesGeneralRuleBinding
+import hous.release.android.databinding.ItemOurRulesRepresentativeRuleBottomBinding
+import hous.release.android.databinding.ItemOurRulesRepresentativeRuleMiddleBinding
+import hous.release.android.databinding.ItemOurRulesRepresentativeRuleTopBinding
+import hous.release.android.presentation.our_rules.type.RuleItemViewType
+import hous.release.domain.entity.RuleInfo
+
+class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesDiffUtilCallback) {
+
+    override fun getItemViewType(position: Int): Int {
+        return when (position) {
+            0 -> RuleItemViewType.REPRESENTATVIE_TOP.id
+            1 -> RuleItemViewType.REPRESENTATVIE_MIDDLE.id
+            2 -> RuleItemViewType.REPRESENTATVIE_BOTTOM.id
+            else -> RuleItemViewType.GENERAL.id
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            RuleItemViewType.REPRESENTATVIE_TOP.id -> RepresentationTopViewHolder(
+                ItemOurRulesRepresentativeRuleTopBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+            )
+            RuleItemViewType.REPRESENTATVIE_MIDDLE.id -> RepresentationMiddleViewHolder(
+                ItemOurRulesRepresentativeRuleMiddleBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+            )
+            RuleItemViewType.REPRESENTATVIE_BOTTOM.id -> RepresentationBottomViewHolder(
+                ItemOurRulesRepresentativeRuleBottomBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+            )
+            RuleItemViewType.GENERAL.id -> GeneralViewHolder(
+                ItemOurRulesGeneralRuleBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+            )
+            else -> throw IllegalArgumentException("viewType : $viewType")
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val data = currentList[position]
+        when (holder) {
+            is RepresentationTopViewHolder -> holder.onBind(data)
+            is RepresentationMiddleViewHolder -> holder.onBind(data)
+            is RepresentationBottomViewHolder -> holder.onBind(data)
+            is GeneralViewHolder -> holder.onBind(data)
+            else -> throw IllegalArgumentException("holder : $holder")
+        }
+    }
+
+    class RepresentationTopViewHolder(
+        private val binding: ItemOurRulesRepresentativeRuleTopBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun onBind(data: RuleInfo) {
+            binding.data = data
+        }
+    }
+
+    class RepresentationMiddleViewHolder(
+        private val binding: ItemOurRulesRepresentativeRuleMiddleBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun onBind(data: RuleInfo) {
+            binding.data = data
+        }
+    }
+
+    class RepresentationBottomViewHolder(
+        private val binding: ItemOurRulesRepresentativeRuleBottomBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun onBind(data: RuleInfo) {
+            binding.data = data
+        }
+    }
+
+    class GeneralViewHolder(
+        private val binding: ItemOurRulesGeneralRuleBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun onBind(data: RuleInfo) {
+            binding.data = data
+        }
+    }
+
+    companion object {
+        private val ourRulesDiffUtilCallback =
+            object : DiffUtil.ItemCallback<RuleInfo>() {
+                override fun areItemsTheSame(
+                    oldItem: RuleInfo,
+                    newItem: RuleInfo
+                ): Boolean {
+                    return oldItem.id == newItem.id
+                }
+
+                override fun areContentsTheSame(
+                    oldItem: RuleInfo,
+                    newItem: RuleInfo
+                ): Boolean {
+                    return oldItem == newItem
+                }
+            }
+    }
+}
diff --git a/app/src/main/res/layout/item_our_rules_general_rule.xml b/app/src/main/res/layout/item_our_rules_general_rule.xml
index 2f6b8ce76..a2ff0aaf2 100644
--- a/app/src/main/res/layout/item_our_rules_general_rule.xml
+++ b/app/src/main/res/layout/item_our_rules_general_rule.xml
@@ -1,39 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/cv_dot_indicator"
-        android:layout_width="8dp"
-        android:layout_height="8dp"
-        android:layout_marginStart="8dp"
-        android:backgroundTint="@color/hous_g_3"
-        android:elevation="0dp"
-        app:cardCornerRadius="50dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
 
-    <TextView
-        android:id="@+id/tv_rule_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="34dp"
-        android:layout_marginTop="15dp"
-        android:textAppearance="@style/B2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="우리 집 대장은 최코코" />
+        <variable
+            name="data"
+            type="hous.release.domain.entity.RuleInfo" />
+    </data>
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="12dp"
-        android:background="@color/hous_g_2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_rule_description" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/cv_dot_indicator"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:layout_marginStart="8dp"
+            android:backgroundTint="@color/hous_g_3"
+            android:elevation="0dp"
+            app:cardCornerRadius="50dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_rule_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="34dp"
+            android:layout_marginTop="15dp"
+            android:textAppearance="@style/B2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="@{data.description}"
+            tools:text="우리 집 대장은 최코코" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="12dp"
+            android:background="@color/hous_g_2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_rule_description" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml b/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
index a47dbd8a4..555978f86 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
@@ -1,38 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_blue_i2_fill_bottom8_rect">
-
-    <TextView
-        android:id="@+id/tv_rule_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="18dp"
-        android:fontFamily="@font/montserrat_medium"
-        android:letterSpacing="-0.02"
-        android:lineSpacingExtra="8sp"
-        android:textColor="@color/hous_blue"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="3." />
-
-    <TextView
-        android:id="@+id/tv_rule_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="52dp"
-        android:layout_marginTop="15dp"
-        android:textAppearance="@style/B2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="우리 집 대장은 최코코" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="data"
+            type="hous.release.domain.entity.RuleInfo" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:background="@drawable/shape_blue_i2_fill_bottom8_rect">
+
+        <TextView
+            android:id="@+id/tv_rule_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="18dp"
+            android:fontFamily="@font/montserrat_medium"
+            android:letterSpacing="-0.02"
+            android:lineSpacingExtra="8sp"
+            android:text="@string/our_house_representative_rules_number_three"
+            android:textColor="@color/hous_blue"
+            android:textSize="16sp"
+            android:visibility="@{data.description.empty ? View.GONE : View.VISIBLE }"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="3." />
+
+        <TextView
+            android:id="@+id/tv_rule_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="52dp"
+            android:layout_marginTop="15dp"
+            android:text="@{data.description}"
+            android:textAppearance="@style/B2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="우리 집 대장은 최코코" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml b/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
index 826819399..43782b9e6 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
@@ -1,44 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/hous_blue_l2">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
-        android:id="@+id/tv_rule_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="12dp"
-        android:fontFamily="@font/montserrat_medium"
-        android:letterSpacing="-0.02"
-        android:lineSpacingExtra="8sp"
-        android:textColor="@color/hous_blue"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="2." />
+    <data>
 
-    <TextView
-        android:id="@+id/tv_rule_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="52dp"
-        android:layout_marginTop="15dp"
-        android:textAppearance="@style/B2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="우리 집 대장은 최코코" />
+        <import type="android.view.View" />
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginHorizontal="22dp"
-        android:layout_marginTop="12dp"
-        android:background="@color/hous_blue_l1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_description" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <variable
+            name="data"
+            type="hous.release.domain.entity.RuleInfo" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@color/hous_blue_l2">
+
+        <TextView
+            android:id="@+id/tv_rule_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="12dp"
+            android:fontFamily="@font/montserrat_medium"
+            android:letterSpacing="-0.02"
+            android:lineSpacingExtra="8sp"
+            android:text="@string/our_house_representative_rules_number_two"
+            android:textColor="@color/hous_blue"
+            android:textSize="16sp"
+            android:visibility="@{data.description.empty ? View.GONE : View.VISIBLE }"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="2." />
+
+        <TextView
+            android:id="@+id/tv_rule_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="52dp"
+            android:layout_marginTop="15dp"
+            android:text="@{data.description}"
+            android:textAppearance="@style/B2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="우리 집 대장은 최코코" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:visibility="@{data.description.empty ? View.GONE : View.VISIBLE }"
+            android:layout_marginHorizontal="22dp"
+            android:layout_marginTop="12dp"
+            android:background="@color/hous_blue_l1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_rule_description" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_top.xml b/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
index 1f79e20df..c03d3916b 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
@@ -1,44 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_blue_i2_fill_top8_rect">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
-        android:id="@+id/tv_rule_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="18dp"
-        android:fontFamily="@font/montserrat_medium"
-        android:letterSpacing="-0.02"
-        android:lineSpacingExtra="8sp"
-        android:textColor="@color/hous_blue"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="1." />
+    <data>
+
+        <variable
+            name="data"
+            type="hous.release.domain.entity.RuleInfo" />
+    </data>
 
-    <TextView
-        android:id="@+id/tv_description"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="52dp"
-        android:layout_marginTop="21dp"
-        android:textAppearance="@style/B2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="우리 집 대장은 최코코" />
+        android:background="@drawable/shape_blue_i2_fill_top8_rect">
+
+        <TextView
+            android:id="@+id/tv_rule_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="28dp"
+            android:layout_marginTop="18dp"
+            android:fontFamily="@font/montserrat_medium"
+            android:letterSpacing="-0.02"
+            android:lineSpacingExtra="8sp"
+            android:text="@string/our_house_representative_rules_number_one"
+            android:textColor="@color/hous_blue"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="1." />
+
+        <TextView
+            android:id="@+id/tv_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="52dp"
+            android:layout_marginTop="21dp"
+            android:text="@{data.description}"
+            android:textAppearance="@style/B2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="우리 집 대장은 최코코" />
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginHorizontal="22dp"
-        android:layout_marginTop="12dp"
-        android:background="@color/hous_blue_l1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_description" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="22dp"
+            android:layout_marginTop="12dp"
+            android:background="@color/hous_blue_l1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_description" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

From 388e448cde7f202e958aa4f368ffbdebff37851d Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:24:10 +0900
Subject: [PATCH 10/20] =?UTF-8?q?#7=20[feat]=20Lifecycle=20=ED=99=95?=
 =?UTF-8?q?=EC=9E=A5=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/extension/LifecycleExtension.kt      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/src/main/java/hous/release/android/util/extension/LifecycleExtension.kt

diff --git a/app/src/main/java/hous/release/android/util/extension/LifecycleExtension.kt b/app/src/main/java/hous/release/android/util/extension/LifecycleExtension.kt
new file mode 100644
index 000000000..e1b412c70
--- /dev/null
+++ b/app/src/main/java/hous/release/android/util/extension/LifecycleExtension.kt
@@ -0,0 +1,33 @@
+package hous.release.android.util.extension
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
+
+/**
+ * Lifecycle에 맞게 알아서 collect/cancel을 반복해주게 해주는 확장 함수
+ *
+ * @param block
+ */
+inline fun LifecycleOwner.repeatOnStarted(crossinline block: suspend () -> Unit) {
+    when (this) {
+        is AppCompatActivity -> {
+            lifecycleScope.launch {
+                lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                    block()
+                }
+            }
+        }
+        is Fragment -> {
+            lifecycleScope.launch {
+                viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                    block()
+                }
+            }
+        }
+    }
+}

From befe512460b8a7b5564deb1805b418b953400ace Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:24:46 +0900
Subject: [PATCH 11/20] =?UTF-8?q?#7=20[feat]=202=EA=B0=80=EC=A7=80=20?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=20null=20=EC=B2=B4=ED=81=AC=ED=95=B4?=
 =?UTF-8?q?=EC=A3=BC=EB=8A=94=20=ED=99=95=EC=9E=A5=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/util/extension/SafeLetExtension.kt   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 app/src/main/java/hous/release/android/util/extension/SafeLetExtension.kt

diff --git a/app/src/main/java/hous/release/android/util/extension/SafeLetExtension.kt b/app/src/main/java/hous/release/android/util/extension/SafeLetExtension.kt
new file mode 100644
index 000000000..4a6ff94a7
--- /dev/null
+++ b/app/src/main/java/hous/release/android/util/extension/SafeLetExtension.kt
@@ -0,0 +1,16 @@
+package hous.release.android.util.extension
+
+/**
+ * 변수 2가지 이상 null 체크할 때 사용
+ *
+ * @param T1
+ * @param T2
+ * @param R
+ * @param p1
+ * @param p2
+ * @param block
+ * @return
+ */
+inline fun <T1 : Any, T2 : Any, R : Any> safeLet(p1: T1?, p2: T2?, block: (T1, T2) -> R?): R? {
+    return if (p1 != null && p2 != null) block(p1, p2) else null
+}

From e780853c897b0dfc931e21d08b81f7603db15b39 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:25:11 +0900
Subject: [PATCH 12/20] =?UTF-8?q?#7=20[feat]=20ItemDecorationUtil=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/util/ItemDecorationUtil.kt        | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/src/main/java/hous/release/android/util/ItemDecorationUtil.kt

diff --git a/app/src/main/java/hous/release/android/util/ItemDecorationUtil.kt b/app/src/main/java/hous/release/android/util/ItemDecorationUtil.kt
new file mode 100644
index 000000000..956e11b5a
--- /dev/null
+++ b/app/src/main/java/hous/release/android/util/ItemDecorationUtil.kt
@@ -0,0 +1,37 @@
+package hous.release.android.util
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.TypedValue
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class ItemDecorationUtil(
+    private val context: Context,
+    dp: Int,
+    private val position: Int
+) :
+    RecyclerView.ItemDecoration() {
+    private val margin = getPixelValue(dp)
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        super.getItemOffsets(outRect, view, parent, state)
+        val viewPosition = parent.getChildAdapterPosition(view)
+        if (viewPosition == position) {
+            outRect.top = margin
+        }
+    }
+
+    private fun getPixelValue(dp: Int): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp.toFloat(),
+            context.resources.displayMetrics
+        ).toInt()
+    }
+}

From e0198b323d6081f77129f3f7fe03104ee8ad7bc4 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:25:33 +0900
Subject: [PATCH 13/20] =?UTF-8?q?#7=20[chore]=20@AndroidEntryPoint=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../release/android/presentation/our_rules/OurRulesActivity.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesActivity.kt b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesActivity.kt
index 8466febc2..f988e87e1 100644
--- a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesActivity.kt
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesActivity.kt
@@ -2,8 +2,10 @@ package hous.release.android.presentation.our_rules
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import dagger.hilt.android.AndroidEntryPoint
 import hous.release.android.R
 
+@AndroidEntryPoint
 class OurRulesActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

From 549346f35566950f0242fc067ac8515911d6db29 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:26:02 +0900
Subject: [PATCH 14/20] =?UTF-8?q?#7=20[feat]=20OurRulesViewModel=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../our_rules/OurRulesViewModel.kt            | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
new file mode 100644
index 000000000..b1c4a857f
--- /dev/null
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
@@ -0,0 +1,101 @@
+package hous.release.android.presentation.our_rules
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import hous.release.domain.entity.RuleInfo
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+@HiltViewModel
+class OurRulesViewModel @Inject constructor() : ViewModel() {
+    private var _uiState = MutableStateFlow(OurRulesUiState())
+    val uiState: StateFlow<OurRulesUiState>
+        get() = _uiState.asStateFlow()
+    private var _isEmptyRepresentativeRuleList = MutableStateFlow(true)
+    val isEmptyRepresentativeRuleList: StateFlow<Boolean>
+        get() = _isEmptyRepresentativeRuleList.asStateFlow()
+    private var _isEmptyGeneralRuleList = MutableStateFlow(true)
+    val isEmptyGeneralRuleList: StateFlow<Boolean>
+        get() = _isEmptyGeneralRuleList.asStateFlow()
+
+    fun getOurRulesInfo() {
+        // 일단 dummy data로 (추후에 repository or usecase에서 받아오기)
+        val rules: List<RuleInfo> =
+            listOf(
+                RuleInfo("1111", "우리 집 대장은 최코코"),
+                RuleInfo("2222", "10시, 18시 코코님 밥 챙겨드리기"),
+                RuleInfo("3333", "자기가 먹은 건 자기가 치우기!"),
+                RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
+                RuleInfo("5555", "밤 10시 지나면 이어폰 끼기"),
+                RuleInfo("11412311", "우리 집 대장은 최코코"),
+                RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
+                RuleInfo("512355", "밤 10시 지나면 이어폰 끼기"),
+                RuleInfo("612366", "냄새나는 음식  먹고나서 환기하기"),
+                RuleInfo("7721377", "맛있는 식당 찾으면 공유하기"),
+                RuleInfo("112311", "우리 집 대장은 최코코"),
+                RuleInfo("2221322", "10시, 18시 코코님 밥 챙겨드리기"),
+                RuleInfo("3331233", "자기가 먹은 건 자기가 치우기!"),
+                RuleInfo("4412344", "아침에 일어나면 이불 정리하기"),
+                RuleInfo("5552135", "밤 10시 지나면 이어폰 끼기"),
+                RuleInfo("6612366", "냄새나는 음식  먹고나서 환기하기"),
+                RuleInfo("7771237", "맛있는 식당 찾으면 공유하기")
+            )
+        if (rules.isEmpty()) {
+            _uiState.value = _uiState.value.copy(
+                ourRuleList = defaultRuleList
+            )
+            _isEmptyRepresentativeRuleList.value = true
+            _isEmptyGeneralRuleList.value = true
+        } else if (rules.size <= 3) {
+            val tmpRuleList = _uiState.value.ourRuleList.toMutableList()
+            rules.forEachIndexed { idx, value ->
+                tmpRuleList[idx] = value
+            }
+            _uiState.value = _uiState.value.copy(
+                ourRuleList = tmpRuleList.toList()
+            )
+            _isEmptyRepresentativeRuleList.value = false
+            _isEmptyGeneralRuleList.value = true
+        } else {
+            _uiState.value = _uiState.value.copy(
+                ourRuleList = rules
+            )
+            _isEmptyRepresentativeRuleList.value = false
+            _isEmptyGeneralRuleList.value = false
+        }
+    }
+
+    data class OurRulesUiState(
+        val ourRuleList: List<RuleInfo> = defaultRuleList
+    )
+
+    companion object {
+        private val defaultRuleList = listOf(
+            RuleInfo("1111", ""),
+            RuleInfo("2222", ""),
+            RuleInfo("3333", "")
+        )
+    }
+}
+// dummyData
+// listOf(
+// RuleInfo("1111", "우리 집 대장은 최코코"),
+// RuleInfo("2222", "10시, 18시 코코님 밥 챙겨드리기"),
+// RuleInfo("3333", "자기가 먹은 건 자기가 치우기!"),
+// RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
+// RuleInfo("5555", "밤 10시 지나면 이어폰 끼기"),
+// RuleInfo("11412311", "우리 집 대장은 최코코"),
+// RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
+// RuleInfo("512355", "밤 10시 지나면 이어폰 끼기"),
+// RuleInfo("612366", "냄새나는 음식  먹고나서 환기하기"),
+// RuleInfo("7721377", "맛있는 식당 찾으면 공유하기"),
+// RuleInfo("112311", "우리 집 대장은 최코코"),
+// RuleInfo("2221322", "10시, 18시 코코님 밥 챙겨드리기"),
+// RuleInfo("3331233", "자기가 먹은 건 자기가 치우기!"),
+// RuleInfo("4412344", "아침에 일어나면 이불 정리하기"),
+// RuleInfo("5552135", "밤 10시 지나면 이어폰 끼기"),
+// RuleInfo("6612366", "냄새나는 음식  먹고나서 환기하기"),
+// RuleInfo("7771237", "맛있는 식당 찾으면 공유하기")
+//        )

From f1cff56fc21e3c04d61836328c4e2edcc392e019 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:27:26 +0900
Subject: [PATCH 15/20] =?UTF-8?q?#7=20[add]=20FragmentContainer=EC=97=90?=
 =?UTF-8?q?=20nav=5Fgraph=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_our_rules.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_our_rules.xml b/app/src/main/res/layout/activity_our_rules.xml
index 03a8b9271..c809053ad 100644
--- a/app/src/main/res/layout/activity_our_rules.xml
+++ b/app/src/main/res/layout/activity_our_rules.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.our_rules.OurRulesActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_our_rules"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        app:navGraph="@navigation/nav_our_rules"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 411c8815e09c7346313a543f79ac33d2972be7e2 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:28:45 +0900
Subject: [PATCH 16/20] =?UTF-8?q?#7=20[feat]=20OurRulesFragment=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../our_rules/OurRulesFragment.kt             | 71 ++++++++++++++++---
 1 file changed, 60 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesFragment.kt b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesFragment.kt
index 066b28b2f..3796063ea 100644
--- a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesFragment.kt
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesFragment.kt
@@ -1,21 +1,70 @@
 package hous.release.android.presentation.our_rules
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import dagger.hilt.android.AndroidEntryPoint
 import hous.release.android.R
+import hous.release.android.databinding.FragmentOurRuleBinding
+import hous.release.android.presentation.our_rules.adapter.OurRulesAdapter
+import hous.release.android.util.ItemDecorationUtil
+import hous.release.android.util.binding.BindingFragment
+import hous.release.android.util.extension.repeatOnStarted
+import hous.release.android.util.extension.safeLet
+import timber.log.Timber
 
 @AndroidEntryPoint
-class OurRulesFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_our_rule, container, false)
+class OurRulesFragment : BindingFragment<FragmentOurRuleBinding>(R.layout.fragment_our_rule) {
+
+    private val viewModel: OurRulesViewModel by hiltNavGraphViewModels(R.id.nav_our_rules)
+    private var ourRulesAdapter: OurRulesAdapter? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.vm = viewModel
+        setOurRulesAdapter()
+        observeOurRules()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        // 여기에서 서버통신을 하는게 맞을 지 고민이 되네요
+        // 일단은 프래그먼트 백스택에서 꺼내올 때, 서버통신을 하도록 넣어놓았습니다 ㅎ ㅎ ㅎ
+        viewModel.getOurRulesInfo()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        ourRulesAdapter = null
+    }
+
+    private fun setOurRulesAdapter() {
+        ourRulesAdapter = OurRulesAdapter()
+        safeLet(ourRulesAdapter, context) { ourRulesAdapter, context ->
+            binding.rvOurRules.run {
+                adapter = ourRulesAdapter
+                addItemDecoration(
+                    ItemDecorationUtil(context, MARGIN, POSITION)
+                )
+            }
+        } ?: Timber.e("NullPointException - ourRulesAdapter, context : $ourRulesAdapter, $context")
+    }
+
+    private fun observeOurRules() {
+        repeatOnStarted {
+            viewModel.uiState.collect { uiState ->
+                ourRulesAdapter?.let { ourRulesAdapter ->
+                    // this callback runs when the list is updated
+                    ourRulesAdapter.submitList(uiState.ourRuleList) {
+                        binding.rvOurRules.invalidateItemDecorations()
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val MARGIN = 4
+        private const val POSITION = 3
     }
 }

From a21fc90f203133b3a49cf84645935b0ca14c4128 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Fri, 2 Sep 2022 21:29:00 +0900
Subject: [PATCH 17/20] =?UTF-8?q?#7=20[feat]=20dataBinding=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_our_rule.xml | 171 ++++++++++--------
 1 file changed, 93 insertions(+), 78 deletions(-)

diff --git a/app/src/main/res/layout/fragment_our_rule.xml b/app/src/main/res/layout/fragment_our_rule.xml
index 848f5e29f..233b36170 100644
--- a/app/src/main/res/layout/fragment_our_rule.xml
+++ b/app/src/main/res/layout/fragment_our_rule.xml
@@ -1,95 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".presentation.our_rules.OurRulesFragment">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="36dp"
-        android:text="@string/our_house_rules"
-        android:textAppearance="@style/B1"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
 
-    <ImageView
-        android:id="@+id/iv_back_button"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="36dp"
-        android:src="@drawable/ic_our_rules_back"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <import type="android.view.View" />
 
-    <ImageView
-        android:id="@+id/iv_setting_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="38dp"
-        android:layout_marginEnd="36dp"
-        android:src="@drawable/ic_our_rules_setting"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <variable
+            name="vm"
+            type="hous.release.android.presentation.our_rules.OurRulesViewModel" />
+    </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_empty_rules"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="28dp"
-        android:background="@drawable/shape_blue_i2_fill_8_rect"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_title">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".presentation.our_rules.OurRulesFragment">
 
         <TextView
-            android:id="@+id/tv_representative_rule_empty"
+            android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginVertical="68dp"
-            android:text="@string/our_house_representative_rules_empty"
+            android:layout_marginTop="36dp"
+            android:text="@string/our_house_rules"
+            android:textAppearance="@style/B1"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_back_button"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="36dp"
+            android:src="@drawable/ic_our_rules_back"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_setting_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="38dp"
+            android:layout_marginEnd="36dp"
+            android:src="@drawable/ic_our_rules_setting"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_empty_rules"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="28dp"
+            android:background="@drawable/shape_blue_i2_fill_8_rect"
+            android:visibility="@{vm.isEmptyRepresentativeRuleList() ? View.VISIBLE : View.INVISIBLE}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title">
+
+            <TextView
+                android:id="@+id/tv_representative_rule_empty"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="68dp"
+                android:text="@string/our_house_representative_rules_empty"
+                android:textAppearance="@style/B2"
+                android:textColor="@color/hous_g_5"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <TextView
+            android:id="@+id/tv_general_rule_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="28dp"
+            android:text="@string/our_house_general_rules_empty"
             android:textAppearance="@style/B2"
             android:textColor="@color/hous_g_5"
+            android:visibility="@{vm.isEmptyGeneralRuleList ? View.VISIBLE : View.GONE}"
+            app:layout_constraintEnd_toEndOf="@id/cl_empty_rules"
+            app:layout_constraintStart_toStartOf="@id/cl_empty_rules"
+            app:layout_constraintTop_toBottomOf="@id/cl_empty_rules" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_our_rules"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginHorizontal="24dp"
+            android:layout_marginTop="28dp"
+            android:clipToPadding="false"
+            android:layout_marginBottom="100dp"
+            android:overScrollMode="never"
+            android:visibility="@{vm.isEmptyRepresentativeRuleList ? View.GONE : View.VISIBLE}"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_our_rules_representative_rule_bottom" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <TextView
-        android:id="@+id/tv_general_rule_empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
-        android:text="@string/our_house_representative_rules_empty"
-        android:textAppearance="@style/B2"
-        android:textColor="@color/hous_g_5"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/cl_empty_rules"
-        app:layout_constraintStart_toStartOf="@id/cl_empty_rules"
-        app:layout_constraintTop_toBottomOf="@id/cl_empty_rules" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_our_rules"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="28dp"
-        android:clipToPadding="false"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_title"
-        tools:itemCount="3"
-        tools:listitem="@layout/item_our_rules_representative_rule_bottom" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</layout>
\ No newline at end of file

From 9c9fda50cbe379c435a45c28d12b4764ee152e13 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Mon, 5 Sep 2022 18:30:57 +0900
Subject: [PATCH 18/20] =?UTF-8?q?#7=20[chore]=20RuleInfo=20->=20Rule=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../our_rules/OurRulesViewModel.kt            | 76 +++++++------------
 .../our_rules/adapter/OurRulesAdapter.kt      | 22 +++---
 .../layout/item_our_rules_general_rule.xml    |  2 +-
 ...m_our_rules_representative_rule_bottom.xml |  2 +-
 ...m_our_rules_representative_rule_middle.xml |  2 +-
 ...item_our_rules_representative_rule_top.xml |  2 +-
 .../domain/entity/{RuleInfo.kt => Rule.kt}    |  2 +-
 7 files changed, 43 insertions(+), 65 deletions(-)
 rename domain/src/main/java/hous/release/domain/entity/{RuleInfo.kt => Rule.kt} (82%)

diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
index b1c4a857f..b1fd2807c 100644
--- a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
@@ -2,7 +2,7 @@ package hous.release.android.presentation.our_rules
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import hous.release.domain.entity.RuleInfo
+import hous.release.domain.entity.Rule
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -11,36 +11,34 @@ import javax.inject.Inject
 @HiltViewModel
 class OurRulesViewModel @Inject constructor() : ViewModel() {
     private var _uiState = MutableStateFlow(OurRulesUiState())
-    val uiState: StateFlow<OurRulesUiState>
-        get() = _uiState.asStateFlow()
+    val uiState: StateFlow<OurRulesUiState> = _uiState.asStateFlow()
     private var _isEmptyRepresentativeRuleList = MutableStateFlow(true)
-    val isEmptyRepresentativeRuleList: StateFlow<Boolean>
-        get() = _isEmptyRepresentativeRuleList.asStateFlow()
+    val isEmptyRepresentativeRuleList: StateFlow<Boolean> =
+        _isEmptyRepresentativeRuleList.asStateFlow()
     private var _isEmptyGeneralRuleList = MutableStateFlow(true)
-    val isEmptyGeneralRuleList: StateFlow<Boolean>
-        get() = _isEmptyGeneralRuleList.asStateFlow()
+    val isEmptyGeneralRuleList: StateFlow<Boolean> = _isEmptyGeneralRuleList.asStateFlow()
 
     fun getOurRulesInfo() {
         // 일단 dummy data로 (추후에 repository or usecase에서 받아오기)
-        val rules: List<RuleInfo> =
+        val rules: List<Rule> =
             listOf(
-                RuleInfo("1111", "우리 집 대장은 최코코"),
-                RuleInfo("2222", "10시, 18시 코코님 밥 챙겨드리기"),
-                RuleInfo("3333", "자기가 먹은 건 자기가 치우기!"),
-                RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
-                RuleInfo("5555", "밤 10시 지나면 이어폰 끼기"),
-                RuleInfo("11412311", "우리 집 대장은 최코코"),
-                RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
-                RuleInfo("512355", "밤 10시 지나면 이어폰 끼기"),
-                RuleInfo("612366", "냄새나는 음식  먹고나서 환기하기"),
-                RuleInfo("7721377", "맛있는 식당 찾으면 공유하기"),
-                RuleInfo("112311", "우리 집 대장은 최코코"),
-                RuleInfo("2221322", "10시, 18시 코코님 밥 챙겨드리기"),
-                RuleInfo("3331233", "자기가 먹은 건 자기가 치우기!"),
-                RuleInfo("4412344", "아침에 일어나면 이불 정리하기"),
-                RuleInfo("5552135", "밤 10시 지나면 이어폰 끼기"),
-                RuleInfo("6612366", "냄새나는 음식  먹고나서 환기하기"),
-                RuleInfo("7771237", "맛있는 식당 찾으면 공유하기")
+                Rule("1111", "우리 집 대장은 최코코"),
+                Rule("2222", "10시, 18시 코코님 밥 챙겨드리기"),
+                Rule("3333", "자기가 먹은 건 자기가 치우기!"),
+                Rule("4444", "아침에 일어나면 이불 정리하기"),
+                Rule("5555", "밤 10시 지나면 이어폰 끼기"),
+                Rule("11412311", "우리 집 대장은 최코코"),
+                Rule("4444", "아침에 일어나면 이불 정리하기"),
+                Rule("512355", "밤 10시 지나면 이어폰 끼기"),
+                Rule("612366", "냄새나는 음식  먹고나서 환기하기"),
+                Rule("7721377", "맛있는 식당 찾으면 공유하기"),
+                Rule("112311", "우리 집 대장은 최코코"),
+                Rule("2221322", "10시, 18시 코코님 밥 챙겨드리기"),
+                Rule("3331233", "자기가 먹은 건 자기가 치우기!"),
+                Rule("4412344", "아침에 일어나면 이불 정리하기"),
+                Rule("5552135", "밤 10시 지나면 이어폰 끼기"),
+                Rule("6612366", "냄새나는 음식  먹고나서 환기하기"),
+                Rule("7771237", "맛있는 식당 찾으면 공유하기")
             )
         if (rules.isEmpty()) {
             _uiState.value = _uiState.value.copy(
@@ -68,34 +66,14 @@ class OurRulesViewModel @Inject constructor() : ViewModel() {
     }
 
     data class OurRulesUiState(
-        val ourRuleList: List<RuleInfo> = defaultRuleList
+        val ourRuleList: List<Rule> = defaultRuleList
     )
 
     companion object {
         private val defaultRuleList = listOf(
-            RuleInfo("1111", ""),
-            RuleInfo("2222", ""),
-            RuleInfo("3333", "")
+            Rule("1111", ""),
+            Rule("2222", ""),
+            Rule("3333", "")
         )
     }
 }
-// dummyData
-// listOf(
-// RuleInfo("1111", "우리 집 대장은 최코코"),
-// RuleInfo("2222", "10시, 18시 코코님 밥 챙겨드리기"),
-// RuleInfo("3333", "자기가 먹은 건 자기가 치우기!"),
-// RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
-// RuleInfo("5555", "밤 10시 지나면 이어폰 끼기"),
-// RuleInfo("11412311", "우리 집 대장은 최코코"),
-// RuleInfo("4444", "아침에 일어나면 이불 정리하기"),
-// RuleInfo("512355", "밤 10시 지나면 이어폰 끼기"),
-// RuleInfo("612366", "냄새나는 음식  먹고나서 환기하기"),
-// RuleInfo("7721377", "맛있는 식당 찾으면 공유하기"),
-// RuleInfo("112311", "우리 집 대장은 최코코"),
-// RuleInfo("2221322", "10시, 18시 코코님 밥 챙겨드리기"),
-// RuleInfo("3331233", "자기가 먹은 건 자기가 치우기!"),
-// RuleInfo("4412344", "아침에 일어나면 이불 정리하기"),
-// RuleInfo("5552135", "밤 10시 지나면 이어폰 끼기"),
-// RuleInfo("6612366", "냄새나는 음식  먹고나서 환기하기"),
-// RuleInfo("7771237", "맛있는 식당 찾으면 공유하기")
-//        )
diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt b/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt
index 139d8a7f6..a87c98faa 100644
--- a/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/adapter/OurRulesAdapter.kt
@@ -10,9 +10,9 @@ import hous.release.android.databinding.ItemOurRulesRepresentativeRuleBottomBind
 import hous.release.android.databinding.ItemOurRulesRepresentativeRuleMiddleBinding
 import hous.release.android.databinding.ItemOurRulesRepresentativeRuleTopBinding
 import hous.release.android.presentation.our_rules.type.RuleItemViewType
-import hous.release.domain.entity.RuleInfo
+import hous.release.domain.entity.Rule
 
-class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesDiffUtilCallback) {
+class OurRulesAdapter : ListAdapter<Rule, RecyclerView.ViewHolder>(ourRulesDiffUtilCallback) {
 
     override fun getItemViewType(position: Int): Int {
         return when (position) {
@@ -72,7 +72,7 @@ class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesD
         private val binding: ItemOurRulesRepresentativeRuleTopBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
-        fun onBind(data: RuleInfo) {
+        fun onBind(data: Rule) {
             binding.data = data
         }
     }
@@ -81,7 +81,7 @@ class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesD
         private val binding: ItemOurRulesRepresentativeRuleMiddleBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
-        fun onBind(data: RuleInfo) {
+        fun onBind(data: Rule) {
             binding.data = data
         }
     }
@@ -90,7 +90,7 @@ class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesD
         private val binding: ItemOurRulesRepresentativeRuleBottomBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
-        fun onBind(data: RuleInfo) {
+        fun onBind(data: Rule) {
             binding.data = data
         }
     }
@@ -99,24 +99,24 @@ class OurRulesAdapter : ListAdapter<RuleInfo, RecyclerView.ViewHolder>(ourRulesD
         private val binding: ItemOurRulesGeneralRuleBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
-        fun onBind(data: RuleInfo) {
+        fun onBind(data: Rule) {
             binding.data = data
         }
     }
 
     companion object {
         private val ourRulesDiffUtilCallback =
-            object : DiffUtil.ItemCallback<RuleInfo>() {
+            object : DiffUtil.ItemCallback<Rule>() {
                 override fun areItemsTheSame(
-                    oldItem: RuleInfo,
-                    newItem: RuleInfo
+                    oldItem: Rule,
+                    newItem: Rule
                 ): Boolean {
                     return oldItem.id == newItem.id
                 }
 
                 override fun areContentsTheSame(
-                    oldItem: RuleInfo,
-                    newItem: RuleInfo
+                    oldItem: Rule,
+                    newItem: Rule
                 ): Boolean {
                     return oldItem == newItem
                 }
diff --git a/app/src/main/res/layout/item_our_rules_general_rule.xml b/app/src/main/res/layout/item_our_rules_general_rule.xml
index a2ff0aaf2..9d36aa397 100644
--- a/app/src/main/res/layout/item_our_rules_general_rule.xml
+++ b/app/src/main/res/layout/item_our_rules_general_rule.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="data"
-            type="hous.release.domain.entity.RuleInfo" />
+            type="hous.release.domain.entity.Rule" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml b/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
index 555978f86..535cd8a01 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_bottom.xml
@@ -9,7 +9,7 @@
 
         <variable
             name="data"
-            type="hous.release.domain.entity.RuleInfo" />
+            type="hous.release.domain.entity.Rule" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml b/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
index 43782b9e6..d165479e1 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_middle.xml
@@ -9,7 +9,7 @@
 
         <variable
             name="data"
-            type="hous.release.domain.entity.RuleInfo" />
+            type="hous.release.domain.entity.Rule" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_our_rules_representative_rule_top.xml b/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
index c03d3916b..d63f45c0f 100644
--- a/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
+++ b/app/src/main/res/layout/item_our_rules_representative_rule_top.xml
@@ -7,7 +7,7 @@
 
         <variable
             name="data"
-            type="hous.release.domain.entity.RuleInfo" />
+            type="hous.release.domain.entity.Rule" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/domain/src/main/java/hous/release/domain/entity/RuleInfo.kt b/domain/src/main/java/hous/release/domain/entity/Rule.kt
similarity index 82%
rename from domain/src/main/java/hous/release/domain/entity/RuleInfo.kt
rename to domain/src/main/java/hous/release/domain/entity/Rule.kt
index 29f8f4e5d..39b3acfcc 100644
--- a/domain/src/main/java/hous/release/domain/entity/RuleInfo.kt
+++ b/domain/src/main/java/hous/release/domain/entity/Rule.kt
@@ -1,6 +1,6 @@
 package hous.release.domain.entity
 
-data class RuleInfo(
+data class Rule(
     val id: String = "",
     val description: String = ""
 )

From a35b2d9cc78476231a50bb0bd1360701970af5e1 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Mon, 5 Sep 2022 18:33:16 +0900
Subject: [PATCH 19/20] =?UTF-8?q?#7=20[fix]=20=EC=BD=94=EB=93=9C=EB=A6=AC?=
 =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                          | 8 ++++----
 .../android/presentation/our_rules/OurRulesViewModel.kt   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3d086d84b..2fa18117e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,16 +20,16 @@
         <activity
             android:name=".presentation.our_rules.OurRulesActivity"
             android:exported="true" >
+        </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
-        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
index b1fd2807c..bcd6fea93 100644
--- a/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
+++ b/app/src/main/java/hous/release/android/presentation/our_rules/OurRulesViewModel.kt
@@ -52,7 +52,7 @@ class OurRulesViewModel @Inject constructor() : ViewModel() {
                 tmpRuleList[idx] = value
             }
             _uiState.value = _uiState.value.copy(
-                ourRuleList = tmpRuleList.toList()
+                ourRuleList = tmpRuleList
             )
             _isEmptyRepresentativeRuleList.value = false
             _isEmptyGeneralRuleList.value = true

From d1f2abe7c21106b230a061b4c8bb33400a43fdc6 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Mon, 5 Sep 2022 18:37:06 +0900
Subject: [PATCH 20/20] =?UTF-8?q?#7=20[add]=20colors,=20textAppearance=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/appearance.xml | 7 +++++++
 app/src/main/res/values/colors.xml     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/res/values/appearance.xml b/app/src/main/res/values/appearance.xml
index 433797f30..8474ac836 100644
--- a/app/src/main/res/values/appearance.xml
+++ b/app/src/main/res/values/appearance.xml
@@ -57,4 +57,11 @@
         <item name="android:lineSpacingExtra">6.5sp</item>
     </style>
 
+    <style name="Description">
+        <item name="android:fontFamily">@font/spoqa_han_sans_neo_medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:letterSpacing">-0.02</item>
+        <item name="android:lineSpacingExtra">3.6sp</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d4469433b..d50484d72 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,6 +13,10 @@
     <color name="hous_blue">#5E9EFF</color>
     <color name="hous_blue_l1">#BCD7FF</color>
     <color name="hous_blue_l2">#F5F9FF</color>
+    <color name="hous_purple">#d99cff</color>
+    <color name="kakao_brown">#4e2a00</color>
+    <color name="hous_green">#93e491</color>
+    <color name="kakao_yellow">#fee400</color>
     <color name="hous_white">#FFFFFF</color>
     <color name="hous_g_1">#fafafa</color>
     <color name="hous_g_2">#f2f2f2</color>