From 3608a241f246371570cacc0cc53587fad61b535e Mon Sep 17 00:00:00 2001 From: hyunjium Date: Thu, 25 Apr 2024 04:03:46 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[add]=20#145=20=EC=9A=B4=EB=8F=99=EB=B7=B0?= =?UTF-8?q?=20=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EB=B9=84=EC=96=B4?= =?UTF-8?q?=EC=9E=88=EC=9D=84=20=EB=95=8C=20=ED=9D=B0=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EB=B0=91=20=EB=A7=88=EC=A7=84=20=EA=B0=92=2059dp=EB=A1=9C?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_exercise_today.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/layout/item_exercise_today.xml b/app/src/main/res/layout/item_exercise_today.xml index e9907000..2ebcb051 100644 --- a/app/src/main/res/layout/item_exercise_today.xml +++ b/app/src/main/res/layout/item_exercise_today.xml @@ -226,7 +226,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="44dp" + android:layout_marginBottom="59dp" android:src="@drawable/img_notexercise_white" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_exercise_today_our_history" /> From c10b1f98dbc7b8d2418b7b5a4402e339d7f101e6 Mon Sep 17 00:00:00 2001 From: hyunjium Date: Thu, 25 Apr 2024 04:13:40 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[chore]=20#145=20=EC=9A=B4=EB=8F=99?= =?UTF-8?q?=EB=B7=B0=20=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EB=B9=84?= =?UTF-8?q?=EC=96=B4=EC=9E=88=EC=9D=84=20=EB=95=8C=20=ED=9D=B0=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9C=84=20=EB=A7=88=EC=A7=84=20=EA=B0=92=2052dp?= =?UTF-8?q?=EB=A1=9C=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/item_exercise_today.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_exercise_today.xml b/app/src/main/res/layout/item_exercise_today.xml index 2ebcb051..79d34597 100644 --- a/app/src/main/res/layout/item_exercise_today.xml +++ b/app/src/main/res/layout/item_exercise_today.xml @@ -225,7 +225,7 @@ android:id="@+id/iv_exercise_today_empty_history" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="44dp" + android:layout_marginTop="52dp" android:layout_marginBottom="59dp" android:src="@drawable/img_notexercise_white" app:layout_constraintBottom_toBottomOf="parent" From f4732574c831be127275a4dd05eeee97a23cf18e Mon Sep 17 00:00:00 2001 From: hyunjium Date: Fri, 26 Apr 2024 17:35:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[chore]=20#145=20=EC=98=A4=EB=8A=98?= =?UTF-8?q?=EC=9D=98=20=EC=9A=B4=EB=8F=99=20~=20=EC=9A=B4=EB=8F=99=20?= =?UTF-8?q?=EB=AF=B8=EC=85=98=20=EB=A7=88=EC=A7=84=20=ED=99=88=20=EB=B7=B0?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=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/item_exercise_today.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/res/layout/item_exercise_today.xml b/app/src/main/res/layout/item_exercise_today.xml index 79d34597..a504da86 100644 --- a/app/src/main/res/layout/item_exercise_today.xml +++ b/app/src/main/res/layout/item_exercise_today.xml @@ -33,7 +33,6 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="41dp" - android:paddingVertical="4dp" android:text="@string/exercise_today_exercise" android:textColor="@color/gray_600_707276" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +44,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="6dp" - android:paddingVertical="5dp" android:text="@string/exercise_today_mission" android:textColor="@color/gray_900_161616" app:layout_constraintStart_toStartOf="@id/tv_exercise_today_exercise" @@ -92,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="85dp" + android:layout_marginTop="78dp" android:layout_marginBottom="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/cl_exercise_today_right" From f944748081031c051638b80179dcf88318f8f66c Mon Sep 17 00:00:00 2001 From: hyunjium Date: Fri, 26 Apr 2024 17:52:11 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[chore]=20#145=20=EB=82=B4=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=B7=B0=20=EC=9D=B4=EB=A6=84->=EB=B3=84=EB=AA=85?= =?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_mypage_myinfo.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_mypage_myinfo.xml b/app/src/main/res/layout/fragment_mypage_myinfo.xml index 004ceaa1..e75ef23e 100644 --- a/app/src/main/res/layout/fragment_mypage_myinfo.xml +++ b/app/src/main/res/layout/fragment_mypage_myinfo.xml @@ -52,7 +52,7 @@ android:paddingHorizontal="1dp" android:paddingVertical="25dp" android:paddingStart="20dp" - android:text="@string/mypage_name" + android:text="@string/mypage_nickname" android:textColor="@color/gray_700_464747" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46e49925..4c34458e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ v. 문의하기 이전 - 이름 + 별명 나이 로그아웃 회원탈퇴 From d408777f9134c0f67808957259973578759b6983 Mon Sep 17 00:00:00 2001 From: hyunjium Date: Fri, 26 Apr 2024 18:06:57 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[chore]=20#145=20strings.xml=20=EA=B2=B9?= =?UTF-8?q?=EC=B9=98=EB=8A=94=20=EA=B2=83=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_mypage_myinfo.xml | 2 +- app/src/main/res/values/strings.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_mypage_myinfo.xml b/app/src/main/res/layout/fragment_mypage_myinfo.xml index e75ef23e..0673a401 100644 --- a/app/src/main/res/layout/fragment_mypage_myinfo.xml +++ b/app/src/main/res/layout/fragment_mypage_myinfo.xml @@ -52,7 +52,7 @@ android:paddingHorizontal="1dp" android:paddingVertical="25dp" android:paddingStart="20dp" - android:text="@string/mypage_nickname" + android:text="@string/nickname" android:textColor="@color/gray_700_464747" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4c34458e..e7860ffa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,6 @@ v. 문의하기 이전 - 별명 나이 로그아웃 회원탈퇴