From 2baf4c6c7fc89a1ee7cadc66ba655cb4e45dd039 Mon Sep 17 00:00:00 2001
From: murjune <sis9221302@gmail.com>
Date: Sun, 10 Sep 2023 21:05:52 +0900
Subject: [PATCH] =?UTF-8?q?#312=20[ui]=20Hous-=20Screen=20-=20=EB=8C=80?=
 =?UTF-8?q?=ED=91=9C=20=EB=A3=B0=20=EC=88=AB=EC=9E=90=20->=20Dot=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_hous.xml | 109 ++++++++++------------
 1 file changed, 47 insertions(+), 62 deletions(-)

diff --git a/app/src/main/res/layout/fragment_hous.xml b/app/src/main/res/layout/fragment_hous.xml
index 7483141e..97116d05 100644
--- a/app/src/main/res/layout/fragment_hous.xml
+++ b/app/src/main/res/layout/fragment_hous.xml
@@ -285,7 +285,8 @@
                 android:layout_marginHorizontal="16dp"
                 android:layout_marginTop="16dp"
                 android:background="@drawable/shape_blue_i2_fill_8_rect"
-                android:paddingVertical="18dp"
+                android:paddingHorizontal="22dp"
+                android:paddingBottom="18dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_hous_our_rules_title">
@@ -304,18 +305,13 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <TextView
-                    android:id="@+id/tv_hous_our_rules_num_1"
-                    android:layout_width="14dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="28dp"
-                    android:fontFamily="@font/montserrat_semibold"
-                    android:letterSpacing="-0.02"
-                    android:lineSpacingExtra="8dp"
-                    android:text="@string/our_house_representative_rules_number_one"
-                    android:textColor="@color/hous_blue"
-                    android:textSize="16dp"
-                    android:textStyle="normal"
+                <View
+                    android:id="@+id/view_hous_our_rules_num_1"
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="26dp"
+                    android:background="@drawable/shape_blue_fill_oval"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -329,37 +325,31 @@
                     android:textColor="@{vm.hous.ourRules.size >= 1 ? @color/hous_g_7 : @color/hous_g_4}"
                     android:theme="@style/B2"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_hous_our_rules_num_1"
-                    app:layout_constraintStart_toEndOf="@id/tv_hous_our_rules_num_1"
-                    app:layout_constraintTop_toTopOf="@id/tv_hous_our_rules_num_1" />
+                    app:layout_constraintBottom_toBottomOf="@id/view_hous_our_rules_num_1"
+                    app:layout_constraintStart_toEndOf="@id/view_hous_our_rules_num_1"
+                    app:layout_constraintTop_toTopOf="@id/view_hous_our_rules_num_1"
+                    tools:text="test1" />
 
                 <View
                     android:id="@+id/view_hous_our_rules_division_1"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginHorizontal="16dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="17dp"
                     android:background="@color/hous_blue_l1"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_hous_our_rules_num_1" />
+                    app:layout_constraintTop_toBottomOf="@id/view_hous_our_rules_num_1"
+                    tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/tv_hous_our_rules_num_2"
-                    android:layout_width="14dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:fontFamily="@font/montserrat_semibold"
-                    android:letterSpacing="-0.02"
-                    android:lineSpacingExtra="8dp"
-                    android:text="@string/our_house_representative_rules_number_two"
-                    android:textColor="@color/hous_blue"
-                    android:textSize="16dp"
-                    android:textStyle="normal"
+                <View
+                    android:id="@+id/view_hous_our_rules_num_2"
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginTop="23dp"
+                    android:background="@drawable/shape_blue_fill_oval"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintStart_toStartOf="@id/tv_hous_our_rules_num_1"
-                    app:layout_constraintTop_toBottomOf="@id/view_hous_our_rules_division_1" />
+                    app:layout_constraintStart_toStartOf="@id/view_hous_our_rules_num_1"
+                    app:layout_constraintTop_toBottomOf="@id/view_hous_our_rules_division_1"
+                    tools:visibility="visible" />
 
                 <TextView
                     android:id="@+id/tv_hous_our_rules_rule_2"
@@ -370,37 +360,31 @@
                     android:textColor="@{vm.hous.ourRules.size >= 2 ? @color/hous_g_7 : @color/hous_g_4}"
                     android:theme="@style/B2"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_hous_our_rules_num_2"
-                    app:layout_constraintStart_toEndOf="@id/tv_hous_our_rules_num_2"
-                    app:layout_constraintTop_toTopOf="@id/tv_hous_our_rules_num_2" />
+                    app:layout_constraintBottom_toBottomOf="@id/view_hous_our_rules_num_2"
+                    app:layout_constraintStart_toEndOf="@id/view_hous_our_rules_num_2"
+                    app:layout_constraintTop_toTopOf="@id/view_hous_our_rules_num_2"
+                    tools:text="test2" />
 
                 <View
                     android:id="@+id/view_hous_our_rules_division_2"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginHorizontal="16dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="17dp"
                     android:background="@color/hous_blue_l1"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_hous_our_rules_num_2" />
+                    app:layout_constraintTop_toBottomOf="@id/tv_hous_our_rules_rule_2"
+                    tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/tv_hous_our_rules_num_3"
-                    android:layout_width="14dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:fontFamily="@font/montserrat_semibold"
-                    android:letterSpacing="-0.02"
-                    android:lineSpacingExtra="8dp"
-                    android:text="@string/our_house_representative_rules_number_three"
-                    android:textColor="@color/hous_blue"
-                    android:textSize="16dp"
-                    android:textStyle="normal"
+                <View
+                    android:id="@+id/view_hous_our_rules_num_3"
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginTop="23dp"
+                    android:background="@drawable/shape_blue_fill_oval"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintStart_toStartOf="@id/tv_hous_our_rules_num_1"
-                    app:layout_constraintTop_toBottomOf="@id/view_hous_our_rules_division_2" />
+                    app:layout_constraintStart_toStartOf="@id/view_hous_our_rules_num_1"
+                    app:layout_constraintTop_toBottomOf="@id/view_hous_our_rules_division_2"
+                    tools:visibility="visible" />
 
                 <TextView
                     android:id="@+id/tv_hous_our_rules_rule_3"
@@ -411,9 +395,10 @@
                     android:textColor="@{vm.hous.ourRules.size >= 3 ? @color/hous_g_7 : @color/hous_g_4}"
                     android:theme="@style/B2"
                     android:visibility="@{vm.hous.ourRules.size > 0 ? View.VISIBLE : View.INVISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_hous_our_rules_num_3"
-                    app:layout_constraintStart_toEndOf="@id/tv_hous_our_rules_num_3"
-                    app:layout_constraintTop_toTopOf="@id/tv_hous_our_rules_num_3" />
+                    app:layout_constraintBottom_toBottomOf="@id/view_hous_our_rules_num_3"
+                    app:layout_constraintStart_toEndOf="@id/view_hous_our_rules_num_3"
+                    app:layout_constraintTop_toTopOf="@id/view_hous_our_rules_num_3"
+                    tools:text="test3" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>