From 067d423ec640d75b32af3ba507df07fd1a527684 Mon Sep 17 00:00:00 2001
From: pump9918 <hoyeon9918@gmail.com>
Date: Fri, 8 Mar 2024 11:25:17 +0900
Subject: [PATCH 1/2] =?UTF-8?q?#166=20[ui]=20=EC=B9=B4=EB=93=9C=20?=
 =?UTF-8?q?=EA=B8=B0=EA=B8=B0=EB=8C=80=EC=9D=91=20DimensionRatio=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_happy_delete.xml | 14 ++++---
 .../res/layout/fragment_happy_my_routine.xml  | 39 ++++++++++++-------
 .../res/layout/fragment_happy_routine.xml     | 17 +++++---
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/fragment_happy_delete.xml b/app/src/main/res/layout/fragment_happy_delete.xml
index b2e4fe13..473a3bd4 100644
--- a/app/src/main/res/layout/fragment_happy_delete.xml
+++ b/app/src/main/res/layout/fragment_happy_delete.xml
@@ -77,12 +77,14 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_happy_delete_card_front"
-            android:layout_width="280dp"
-            android:layout_height="398dp"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_marginTop="24dp"
+            android:layout_marginBottom="41dp"
             android:background="@drawable/shape_white_fill_gray100_stroke_20_rect"
             android:visibility="visible"
             app:layout_constraintBottom_toTopOf="@id/btn_happy_delete_clear"
+            app:layout_constraintDimensionRatio="0.7"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_happy_delete_subtitle"
@@ -90,8 +92,10 @@
 
             <ImageView
                 android:id="@+id/iv_happy_delete_card_front"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
                 android:src="@drawable/ic_happy_card_base"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -126,8 +130,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_happy_delete_card_back"
-            android:layout_width="280dp"
-            android:layout_height="398dp"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:background="@drawable/shape_white_fill_gray100_stroke_20_rect"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="@id/cl_happy_delete_card_front"
diff --git a/app/src/main/res/layout/fragment_happy_my_routine.xml b/app/src/main/res/layout/fragment_happy_my_routine.xml
index d6313e51..9c8dc61f 100644
--- a/app/src/main/res/layout/fragment_happy_my_routine.xml
+++ b/app/src/main/res/layout/fragment_happy_my_routine.xml
@@ -73,20 +73,25 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_happy_routine_empty_card"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 android:layout_marginStart="40dp"
                 android:layout_marginTop="53dp"
                 android:layout_marginEnd="40dp"
-                android:layout_marginBottom="200dp"
+                android:layout_marginBottom="127dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="0.7"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/iv_happy_routine_default_mention">
+                app:layout_constraintTop_toBottomOf="@id/iv_happy_routine_default_mention"
+                app:layout_constraintVertical_bias="0">
 
                 <ImageView
                     android:id="@+id/iv_happy_routine_empty_card"
-                    android:layout_width="280dp"
-                    android:layout_height="398dp"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
                     android:src="@drawable/shape_white_fill_gray000_stroke_radius_20"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -97,9 +102,8 @@
                     style="@style/body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="84dp"
+                    android:layout_marginTop="82dp"
                     android:gravity="center"
-                    android:lineSpacingExtra="4dp"
                     android:text="@string/happy_empty_card"
                     android:textColor="@color/gray300"
                     app:layout_constraintBottom_toTopOf="@id/iv_happy_routine_empty_card_bear"
@@ -111,14 +115,13 @@
                     android:id="@+id/iv_happy_routine_empty_card_bear"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="64dp"
+                    android:layout_marginTop="62dp"
                     android:src="@drawable/ic_happy_add"
                     app:layout_constraintEnd_toEndOf="@id/iv_happy_routine_empty_card"
                     app:layout_constraintStart_toStartOf="@id/iv_happy_routine_empty_card"
                     app:layout_constraintTop_toBottomOf="@id/tv_happy_routine_empty_card" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -192,12 +195,14 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_happy_progress_card_front"
-                android:layout_width="280dp"
-                android:layout_height="398dp"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 android:layout_marginTop="24dp"
+                android:layout_marginBottom="41dp"
                 android:background="@drawable/shape_white_fill_gray100_stroke_20_rect"
                 android:visibility="visible"
                 app:layout_constraintBottom_toTopOf="@id/btn_happy_progress_clear"
+                app:layout_constraintDimensionRatio="0.7"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_happy_progress_subtitle"
@@ -206,9 +211,12 @@
                 <ImageView
                     android:id="@+id/iv_happy_progress_card_front"
                     setHappyCoilImage="@{viewModel.happyProgressResponse.contentImageUrl}"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
                     android:src="@drawable/ic_happy_card_base"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -243,11 +251,12 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_happy_progress_card_back"
-                android:layout_width="280dp"
-                android:layout_height="398dp"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 android:background="@drawable/shape_white_fill_gray100_stroke_20_rect"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="@id/cl_happy_progress_card_front"
+                app:layout_constraintDimensionRatio="0.7"
                 app:layout_constraintEnd_toEndOf="@id/cl_happy_progress_card_front"
                 app:layout_constraintStart_toStartOf="@id/cl_happy_progress_card_front"
                 app:layout_constraintTop_toTopOf="@id/cl_happy_progress_card_front">
diff --git a/app/src/main/res/layout/fragment_happy_routine.xml b/app/src/main/res/layout/fragment_happy_routine.xml
index 1d60ff8d..89720f55 100644
--- a/app/src/main/res/layout/fragment_happy_routine.xml
+++ b/app/src/main/res/layout/fragment_happy_routine.xml
@@ -56,20 +56,25 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_happy_routine_empty_card"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_marginStart="40dp"
             android:layout_marginTop="53dp"
             android:layout_marginEnd="40dp"
-            android:layout_marginBottom="200dp"
+            android:layout_marginBottom="127dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="0.7"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_happy_routine_default_mention">
+            app:layout_constraintTop_toBottomOf="@id/iv_happy_routine_default_mention"
+            app:layout_constraintVertical_bias="0">
 
             <ImageView
                 android:id="@+id/iv_happy_routine_empty_card"
-                android:layout_width="280dp"
-                android:layout_height="398dp"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
                 android:src="@drawable/shape_white_fill_gray000_stroke_radius_20"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

From 98ce710c3286d9a2cfb17b8f384de876f3d5d164 Mon Sep 17 00:00:00 2001
From: pump9918 <hoyeon9918@gmail.com>
Date: Fri, 8 Mar 2024 11:42:46 +0900
Subject: [PATCH 2/2] =?UTF-8?q?#166=20[chore]=20dp=EA=B0=92=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_happy_my_routine.xml | 4 ++--
 app/src/main/res/layout/fragment_happy_routine.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/fragment_happy_my_routine.xml b/app/src/main/res/layout/fragment_happy_my_routine.xml
index 9c8dc61f..c6ce858f 100644
--- a/app/src/main/res/layout/fragment_happy_my_routine.xml
+++ b/app/src/main/res/layout/fragment_happy_my_routine.xml
@@ -102,7 +102,7 @@
                     style="@style/body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="82dp"
+                    android:layout_marginTop="84dp"
                     android:gravity="center"
                     android:text="@string/happy_empty_card"
                     android:textColor="@color/gray300"
@@ -115,7 +115,7 @@
                     android:id="@+id/iv_happy_routine_empty_card_bear"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="62dp"
+                    android:layout_marginTop="64dp"
                     android:src="@drawable/ic_happy_add"
                     app:layout_constraintEnd_toEndOf="@id/iv_happy_routine_empty_card"
                     app:layout_constraintStart_toStartOf="@id/iv_happy_routine_empty_card"
diff --git a/app/src/main/res/layout/fragment_happy_routine.xml b/app/src/main/res/layout/fragment_happy_routine.xml
index 89720f55..d9c45c3d 100644
--- a/app/src/main/res/layout/fragment_happy_routine.xml
+++ b/app/src/main/res/layout/fragment_happy_routine.xml
@@ -85,7 +85,7 @@
                 style="@style/body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="82dp"
+                android:layout_marginTop="84dp"
                 android:gravity="center"
                 android:text="@string/happy_empty_card"
                 android:textColor="@color/gray300"
@@ -98,7 +98,7 @@
                 android:id="@+id/iv_happy_routine_empty_card_bear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="62dp"
+                android:layout_marginTop="64dp"
                 android:src="@drawable/ic_happy_add"
                 app:layout_constraintEnd_toEndOf="@id/iv_happy_routine_empty_card"
                 app:layout_constraintStart_toStartOf="@id/iv_happy_routine_empty_card"