[fix/#135] 운동 달성률 제거 & 로딩 뷰 배경색 변

Team-Motivoo · Mar 25, 2024 · 4d6a00b · 4d6a00b
1 parent 8618799
commit 4d6a00b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/res/layout/bottom_sheet_home.xml b/app/src/main/res/layout/bottom_sheet_home.xml
@@ -87,7 +87,7 @@
         android:id="@+id/pv_loading"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@color/gray_600_7072764d"
+        android:background="@color/white_FFFFFF4d"
         android:padding="150dp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/dialog_home_photo.xml b/app/src/main/res/layout/dialog_home_photo.xml
@@ -35,7 +35,7 @@
             android:id="@+id/pv_loading"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="@color/gray_600_7072764d"
+            android:background="@color/white_FFFFFF4d"
             android:padding="150dp"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -171,7 +171,7 @@
                     style="@style/Caption2_re"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{vm.isHighFive() ? @string/home_success_hifive : @string/home_exercise_percent}"
+                    android:text="@{vm.isHighFive() ? @string/home_success_hifive : @string/home_empty_text }"
                     android:textColor="@{vm.isHighFive() ? @color/red_400_FF6259 : @color/gray_600_707276}"
                     app:layout_constraintBottom_toBottomOf="@+id/iv_step_count"
                     app:layout_constraintEnd_toEndOf="@id/iv_step_count"
@@ -258,7 +258,7 @@
                 android:id="@+id/pv_loading"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:background="@color/gray_600_7072764d"
+                android:background="@color/white_FFFFFF4d"
                 android:padding="150dp"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
     <color name="black_090909">#090909</color>
     <color name="white_FFFFFF">#FFFFFF</color>
+    <color name="white_FFFFFF4d">#4dFFFFFF</color>
     <color name="pink_FF19A3">#FF19A3</color>
     <color name="pink_100_FFE6F5">#FFE6F5</color>
     <!--Red-->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -66,14 +66,14 @@
     <string name="home_child_step_count">자녀 걸음</string>
     <string name="home_today_exercise">오늘의 운동</string>
     <string name="home_exercise_method">운동 방법</string>
-    <string name="home_exercise_percent">운동 달성률</string>
     <string name="home_verify_exercise">운동 인증하기</string>
     <string name="home_success">운동 완료</string>
     <string name="home_bottom_sheet_take_photo">사진 찍기</string>
     <string name="home_bottom_sheet_select_in_album">앨범에서 선택하기</string>
     <string name="home_child">자녀</string>
     <string name="home_parent">부모</string>
     <string name="home_success_hifive">하이파이브 성공!</string>
+    <string name="home_empty_text"></string>
     <string name="verify_exercise">운동 인증이 완료되었어요!</string>
     <string name="verify_exercise_description">오늘도 멋지게 운동을 해내셨군요</string>
     <string name="motivoo_logo">motivoo_logo</string>