From 36609667bc46183f7ca1412f80792b7af6168dfb Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Sun, 27 Aug 2023 19:27:20 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[mod]=20#154=20=ED=84=B0=EC=B9=98=20?=
 =?UTF-8?q?=EC=98=81=EC=97=AD=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../go/sopt/winey/presentation/main/mypage/MyPageFragment.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
index 599be978..cad08e1e 100644
--- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
@@ -197,7 +197,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
     }
 
     private fun initBottomSheetClickListener(data: User?) {
-        binding.btnMypageTargetModify.setOnSingleClickListener {
+        binding.cvMypageTargetmoney.setOnSingleClickListener {
             when (data?.isOver) {
                 true -> {
                     val bottomSheet = TargetAmountBottomSheetFragment()

From 21879b9252f5f2d01c1d0531f9304a60531ff6ef Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Sun, 27 Aug 2023 19:27:49 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20#157=20=EC=A1=B4=EC=9E=AC=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=9A=8C=EC=9B=90=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=ED=86=A0=ED=81=B0=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../go/sopt/winey/data/interceptor/AuthInterceptor.kt        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt b/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt
index f7c642a2..274b24f0 100644
--- a/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt
+++ b/app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt
@@ -42,6 +42,10 @@ class AuthInterceptor @Inject constructor(
                     saveAccessToken("", "")
                 }
             }
+
+            CODE_INVALID_USER -> {
+                saveAccessToken("", "")
+            }
         }
         return response
     }
@@ -95,6 +99,7 @@ class AuthInterceptor @Inject constructor(
     companion object {
         private const val HEADER_TOKEN = "accessToken"
         private const val CODE_TOKEN_EXPIRED = 401
+        private const val CODE_INVALID_USER = 404
         private const val REFRESH_TOKEN = "refreshToken"
     }
 }

From 9f22e60f8c9ec10de93723f7da645ad7b0c5d922 Mon Sep 17 00:00:00 2001
From: Sangwook123 <operawook@catholic.ac.kr>
Date: Sun, 27 Aug 2023 20:47:57 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[mod]=20#154=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/mypage/MyPageFragment.kt             |  2 +-
 app/src/main/res/layout/fragment_my_page.xml  | 78 +++++++++++--------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
index cad08e1e..096159b6 100644
--- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
@@ -197,7 +197,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
     }
 
     private fun initBottomSheetClickListener(data: User?) {
-        binding.cvMypageTargetmoney.setOnSingleClickListener {
+        binding.clMypageTargetmoney.setOnSingleClickListener {
             when (data?.isOver) {
                 true -> {
                     val bottomSheet = TargetAmountBottomSheetFragment()
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 68b09b10..de9cf1dd 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -78,11 +78,11 @@
                     android:id="@+id/btn_mypage_level_help"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_mypage_lv_help"
                     android:background="@android:color/transparent"
+                    android:src="@drawable/ic_mypage_lv_help"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_mypage_level_token"
                     app:layout_constraintStart_toEndOf="@id/tv_mypage_level_token"
-                    app:layout_constraintTop_toTopOf="@id/tv_mypage_level_token"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_mypage_level_token"/>
+                    app:layout_constraintTop_toTopOf="@id/tv_mypage_level_token" />
 
                 <TextView
                     android:id="@+id/tv_mypage_username"
@@ -153,35 +153,49 @@
                     app:strokeColor="@color/gray_200"
                     app:strokeWidth="1dp">
 
-                    <TextView
-                        android:id="@+id/tv_mypage_target"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="21dp"
-                        android:layout_marginTop="11dp"
-                        android:text="@string/mypage_target_amount"
-                        android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
-                        android:textColor="@color/gray_600" />
-
-                    <TextView
-                        android:id="@+id/tv_mypage_target_amount"
-                        setAmount="@{targetMoney.targetMoney}"
-                        setSuffix="@{@string/mypage_amount}"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginStart="21dp"
-                        android:layout_marginBottom="11dp"
-                        android:textAppearance="@style/TextAppearance.WINEY.body_b_16"
-                        tools:text="10,000원" />
-
-                    <androidx.appcompat.widget.AppCompatImageButton
-                        android:id="@+id/btn_mypage_target_modify"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:background="@android:color/transparent"
-                        android:src="@drawable/ic_mypage_edit_btn" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_mypage_targetmoney"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:id="@+id/tv_mypage_target"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="21dp"
+                            android:layout_marginTop="11dp"
+                            android:text="@string/mypage_target_amount"
+                            android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
+                            android:textColor="@color/gray_600"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/tv_mypage_target_amount"
+                            setAmount="@{targetMoney.targetMoney}"
+                            setSuffix="@{@string/mypage_amount}"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:layout_marginStart="21dp"
+                            android:layout_marginBottom="11dp"
+                            android:textAppearance="@style/TextAppearance.WINEY.body_b_16"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            tools:text="10,000원" />
+
+                        <ImageView
+                            android:id="@+id/iv_mypage_target_modify"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end"
+                            android:background="@android:color/transparent"
+                            android:src="@drawable/ic_mypage_edit_btn"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </com.google.android.material.card.MaterialCardView>