From 6920167723ac595eb2a44a151f359f8b46425267 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:16:01 +0900
Subject: [PATCH 1/6] =?UTF-8?q?[ui]=20#104=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=8B=89=EB=84=A4=EC=9E=84=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_my_page.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 25039bb2..d50376c9 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -92,18 +92,26 @@
                     android:textAppearance="@style/TextAppearance.WINEY.Headline_b_28_xxl"
                     app:layout_constraintStart_toStartOf="@id/tv_mypage_level_token"
                     app:layout_constraintTop_toBottomOf="@id/tv_mypage_level_token"
-                    tools:text = "식비낮춰"/>
+                    tools:text="식비낮춰" />
+
+                <ImageView
+                    android:id="@+id/iv_mypage_nickname"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_mypage_next"
+                    app:layout_constraintBottom_toTopOf="@id/iv_mypage_profile"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
                 <ImageView
                     android:id="@+id/iv_mypage_profile"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_mypage_lv1_profile"
-                    android:adjustViewBounds="true"
-                    android:scaleType="fitXY"
                     android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="10dp"
+                    android:adjustViewBounds="true"
                     android:backgroundTint="@color/purple_100"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_mypage_lv1_profile"
                     app:cardCornerRadius="10dp"
                     app:cardElevation="0dp"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -310,6 +318,7 @@
                         android:layout_marginTop="17dp"
                         android:text="@string/mypage_myfeed"
                         android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
+                        android:textColor="@color/gray_700"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
@@ -334,7 +343,7 @@
                     android:id="@+id/cl_mypage_to_1on1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toTopOf="@id/v_mypage_space"
+                    app:layout_constraintBottom_toTopOf="@id/v_mypage_line7"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/v_mypage_line6">
 
@@ -346,6 +355,7 @@
                         android:layout_marginTop="17dp"
                         android:text="@string/mypage_1on1"
                         android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
+                        android:textColor="@color/gray_700"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 

From 867b9ef09a0b0c263429c09e958b280f32726a64 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:16:37 +0900
Subject: [PATCH 2/6] =?UTF-8?q?[ui]=20#104=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_my_page.xml | 43 +++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index d50376c9..77ee5ae7 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -371,9 +371,48 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
-                    android:id="@+id/v_mypage_space"
+                    android:id="@+id/v_mypage_line7"
                     android:layout_width="match_parent"
-                    android:layout_height="32dp"
+                    android:layout_height="4dp"
+                    android:background="@color/gray_50"
+                    app:layout_constraintTop_toBottomOf="@id/cl_mypage_to_1on1" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_mypage_logout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/v_mypage_line7">
+
+                    <TextView
+                        android:id="@+id/tv_mypage_logout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="23dp"
+                        android:layout_marginTop="17dp"
+                        android:text="@string/mypage_logout"
+                        android:textAppearance="@style/TextAppearance.WINEY.body_m_16"
+                        android:textColor="@color/gray_700"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/iv_mypage_logout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@android:color/transparent"
+                        android:src="@drawable/ic_mypage_next"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    android:id="@+id/v_mypage_line8"
+                    android:layout_width="match_parent"
+                    android:layout_height="33dp"
+                    android:background="@color/gray_50"
+                    app:layout_constraintTop_toBottomOf="@id/cl_mypage_logout" />
                     android:background="@color/gray_50"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"

From 21648a36f99038fbac150ca7f84d18c021a215e7 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:16:54 +0900
Subject: [PATCH 3/6] =?UTF-8?q?[ui]=20#104=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=83=88=ED=87=B4=ED=95=98=EA=B8=B0=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_my_page.xml | 41 ++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 77ee5ae7..d88f0011 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -413,15 +413,50 @@
                     android:layout_height="33dp"
                     android:background="@color/gray_50"
                     app:layout_constraintTop_toBottomOf="@id/cl_mypage_logout" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_mypage_withdraw"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:background="@color/gray_50"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cl_mypage_to_1on1" />
+                    app:layout_constraintTop_toBottomOf="@id/v_mypage_line8">
+
+                    <TextView
+                        android:id="@+id/tv_mypage_withdraw"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="23dp"
+                        android:layout_marginTop="17dp"
+                        android:text="@string/mypage_withdraw"
+                        android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
+                        android:textColor="@color/gray_400"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/iv_mypage_withdraw"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@android:color/transparent"
+                        android:src="@drawable/ic_mypage_next"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    android:id="@+id/v_mypage_space"
+                    android:layout_width="match_parent"
+                    android:layout_height="25dp"
+                    android:background="@color/gray_50"
+                    app:layout_constraintTop_toBottomOf="@id/cl_mypage_withdraw" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </ScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</layout>
\ No newline at end of file
+</layout>

From 08c653373a349d91a4c27d280a19b546b3457746 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:17:17 +0900
Subject: [PATCH 4/6] =?UTF-8?q?[ui]=20#104=20=EC=B6=94=EC=B2=9C=ED=94=BC?=
 =?UTF-8?q?=EB=93=9C=20=ED=97=A4=EB=8D=94=20=EC=95=84=EC=9D=B4=ED=85=9C=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/ic_recommend_item_saver.xml  |  4 +-
 .../main/res/layout/item_recommend_header.xml | 53 +++++++------------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/drawable/ic_recommend_item_saver.xml b/app/src/main/res/drawable/ic_recommend_item_saver.xml
index ebb79c03..b04f0bd9 100644
--- a/app/src/main/res/drawable/ic_recommend_item_saver.xml
+++ b/app/src/main/res/drawable/ic_recommend_item_saver.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
+    android:width="85dp"
+    android:height="85dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
diff --git a/app/src/main/res/layout/item_recommend_header.xml b/app/src/main/res/layout/item_recommend_header.xml
index 64e9d454..e3183239 100644
--- a/app/src/main/res/layout/item_recommend_header.xml
+++ b/app/src/main/res/layout/item_recommend_header.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -11,56 +10,40 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        android:layout_marginBottom="16dp">
+        android:layout_marginBottom="16dp"
+        android:background="@color/gray_50">
 
         <TextView
             android:id="@+id/tv_recommend_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="11dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="30dp"
             android:text="@string/recommend_header_title"
             android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/cv_recommend_card"
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/tv_recommend_text"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:backgroundTint="@color/purple_100"
-            app:cardCornerRadius="5dp"
-            app:cardElevation="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="18dp"
+            android:text="@string/recommend_header_text"
+            android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
+            android:textColor="@color/gray_500"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_recommend_title">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="19dp"
-                    android:layout_marginBottom="18dp"
-                    android:text="@string/recommend_header_text"
-                    android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.cardview.widget.CardView>
+            app:layout_constraintTop_toBottomOf="@id/tv_recommend_title" />
 
         <ImageView
             android:id="@+id/iv_recommend_saver"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
             android:src="@drawable/ic_recommend_item_saver"
-            app:layout_constraintBottom_toBottomOf="@id/cv_recommend_card"
-            app:layout_constraintEnd_toEndOf="@id/cv_recommend_card" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>

From 5cd41e5e9047a1c6864a06c349a193cf8f04d9e1 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:17:57 +0900
Subject: [PATCH 5/6] =?UTF-8?q?[add]=20#104=20string=20=EB=A6=AC=EC=86=8C?=
 =?UTF-8?q?=EC=8A=A4=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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f36c07a9..9a6ea2da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,8 @@
     <string name="impossible_dialog_message">절약 목표 기간이 지나지 않아\n 목표를 수정할 수 없어요</string>
     <string name="impossible_dialog_close">닫기</string>
     <string name="mypage_1on1"><u>1:1 문의</u></string>
+    <string name="mypage_withdraw">탈퇴하기</string>
+    <string name="mypage_logout">로그아웃</string>
 
     <string name="target_amount_cancel">취소</string>
     <string name="target_amount_set_amount">목표 절약 금액을 설정해주세요</string>
@@ -90,7 +92,7 @@
     <!-- recommend -->
     <string name="recommend_discount">%s 절약</string>
     <string name="upload_amount_hint_text">0</string>
-    <string name="recommend_header_title">위니가 알려주는 추천 절약법</string>
+    <string name="recommend_header_title">예비 황제를 위한 추천 절약법</string>
     <string name="recommend_header_text">쉿, 그대를 위한 절약방법이 도착했어.\n황실 내에서도 비밀인데 특별히 알려줄게:)</string>
 
     <string name="upload_content_error_text">6자 이상 작성해주세요</string>

From e5737b3e0a671030ca8f9fc4a02ad26df6505346 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Thu, 10 Aug 2023 11:18:13 +0900
Subject: [PATCH 6/6] =?UTF-8?q?[ui]=20#104=20=EB=AA=A9=ED=91=9C=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20=EB=A7=88?=
 =?UTF-8?q?=EC=A7=84=20=EA=B0=92=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/fragment_target_amount_bottom_sheet.xml    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_target_amount_bottom_sheet.xml b/app/src/main/res/layout/fragment_target_amount_bottom_sheet.xml
index f6364c15..89fcad72 100644
--- a/app/src/main/res/layout/fragment_target_amount_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_target_amount_bottom_sheet.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -43,7 +42,7 @@
                 android:id="@+id/tv_target_amount_set_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="18dp"
                 android:text="@string/target_amount_set_amount"
                 android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
@@ -56,7 +55,7 @@
                 style="?textInputOutlinedStyle"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="8dp"
                 app:boxStrokeColor="@drawable/sel_target_amount_til_stroke_color"
                 app:boxStrokeErrorColor="@color/red_500"
@@ -113,7 +112,7 @@
                 android:id="@+id/tv_target_amount_set_day"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="34dp"
                 android:text="@string/target_amount_set_day"
                 android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
@@ -126,7 +125,7 @@
                 style="?textInputOutlinedStyle"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="8dp"
                 app:boxStrokeColor="@drawable/sel_target_amount_til_stroke_color"
                 app:boxStrokeErrorColor="@color/red_500"