Merge pull request #146 from Team-Motivoo/qa/#145-exercise-qa

[QA] 운동 뷰 QA 2차 수정
Team-Motivoo · Apr 29, 2024 · 5278522 · 5278522
2 parents 30254f1 + d408777
commit 5278522
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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/nickname"
             android:textColor="@color/gray_700_464747"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git 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"
@@ -225,8 +223,10 @@
         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"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_exercise_today_our_history" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -98,7 +98,6 @@
     <string name="mypage_version">v.</string>
     <string name="mypage_ask_kakao">문의하기</string>
     <string name="mypage_before">이전</string>
-    <string name="mypage_name">이름</string>
     <string name="mypage_age">나이</string>
     <string name="mypage_logout">로그아웃</string>
     <string name="mypage_out">회원탈퇴</string>