Merge pull request #106 from Team-Sopetit/feature/#103-routine-achiev…

…e-image-change #103 [fix] 루틴 달성 완료 뷰 qa
Team-Sopetit · Jan 18, 2024 · 6012071 · 6012071
2 parents 7f54302 + 65d21ba
commit 6012071
Show file tree

Hide file tree

Showing 11 changed files with 872 additions and 11 deletions.
diff --git a/...src/main/java/com/sopetit/softie/ui/dailyroutine/complete/DailyRoutineCompleteActivity.kt b/...src/main/java/com/sopetit/softie/ui/dailyroutine/complete/DailyRoutineCompleteActivity.kt
@@ -24,10 +24,10 @@ class DailyRoutineCompleteActivity : RoutineCompleteActivity(Cotton.DAILY) {
 
     private fun setDailyRoutineImage() {
         val bearDrawableMap = mapOf(
-            BROWN to R.drawable.ic_bear_handsup_brown,
-            GRAY to R.drawable.ic_bear_handsup_gray,
-            RED to R.drawable.ic_bear_handsup_red,
-            WHITE to R.drawable.ic_bear_handsup_panda
+            BROWN to R.drawable.ic_daily_complete_brown,
+            GRAY to R.drawable.ic_daily_complete_gray,
+            RED to R.drawable.ic_daily_complete_red,
+            WHITE to R.drawable.ic_daily_complete_panda
         )
         val resourceId =
             bearDrawableMap[viewModel.getBearType()] ?: R.drawable.ic_bear_handsup_brown

diff --git a/...src/main/java/com/sopetit/softie/ui/happyroutine/complete/HappyRoutineCompleteActivity.kt b/...src/main/java/com/sopetit/softie/ui/happyroutine/complete/HappyRoutineCompleteActivity.kt
@@ -24,10 +24,10 @@ class HappyRoutineCompleteActivity : RoutineCompleteActivity(Cotton.HAPPINESS) {
 
     private fun setHappyRoutineImage() {
         val bearDrawableMap = mapOf(
-            BROWN to R.drawable.ic_bear_happy_complete_brown,
-            GRAY to R.drawable.ic_bear_happy_complete_gray,
-            RED to R.drawable.ic_bear_happy_complete_red,
-            WHITE to R.drawable.ic_bear_happy_complete_panda
+            BROWN to R.drawable.ic_happy_complete_brown,
+            GRAY to R.drawable.ic_happy_complete_gray,
+            RED to R.drawable.ic_happy_complete_red,
+            WHITE to R.drawable.ic_happy_complete_panda
         )
         val resourceId =
             bearDrawableMap[viewModel.getBearType()] ?: R.drawable.ic_bear_handsup_brown

diff --git a/app/src/main/res/drawable/ic_daily_complete_brown.xml b/app/src/main/res/drawable/ic_daily_complete_brown.xml
diff --git a/app/src/main/res/drawable/ic_daily_complete_gray.xml b/app/src/main/res/drawable/ic_daily_complete_gray.xml
diff --git a/app/src/main/res/drawable/ic_daily_complete_panda.xml b/app/src/main/res/drawable/ic_daily_complete_panda.xml
diff --git a/app/src/main/res/drawable/ic_daily_complete_red.xml b/app/src/main/res/drawable/ic_daily_complete_red.xml
diff --git a/app/src/main/res/drawable/ic_happy_complete_brown.xml b/app/src/main/res/drawable/ic_happy_complete_brown.xml
diff --git a/app/src/main/res/drawable/ic_happy_complete_gray.xml b/app/src/main/res/drawable/ic_happy_complete_gray.xml
diff --git a/app/src/main/res/drawable/ic_happy_complete_panda.xml b/app/src/main/res/drawable/ic_happy_complete_panda.xml
diff --git a/app/src/main/res/drawable/ic_happy_complete_red.xml b/app/src/main/res/drawable/ic_happy_complete_red.xml
diff --git a/app/src/main/res/layout/activity_routine_complete.xml b/app/src/main/res/layout/activity_routine_complete.xml
@@ -45,11 +45,9 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginHorizontal="36dp"
-            android:layout_marginTop="-230dp"
-            app:layout_constraintDimensionRatio="1:0.94"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <com.airbnb.lottie.LottieAnimationView
             android:id="@+id/lottie_routine_complete"