From 00ea4521764cb1fe494068278935b3987462ef69 Mon Sep 17 00:00:00 2001 From: heominhoe Date: Thu, 18 Jan 2024 23:59:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#103=20[chore]=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EB=8B=AC=EC=84=B1=EC=8B=9C=20=EC=82=AC=EC=A7=84=20=EA=B5=90?= =?UTF-8?q?=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complete/DailyRoutineCompleteActivity.kt | 8 +- .../complete/HappyRoutineCompleteActivity.kt | 8 +- .../res/drawable/ic_daily_complete_brown.xml | 80 +++++++++ .../res/drawable/ic_daily_complete_gray.xml | 83 ++++++++++ .../res/drawable/ic_daily_complete_panda.xml | 98 +++++++++++ .../res/drawable/ic_daily_complete_red.xml | 119 ++++++++++++++ .../res/drawable/ic_happy_complete_brown.xml | 87 ++++++++++ .../res/drawable/ic_happy_complete_gray.xml | 153 ++++++++++++++++++ .../res/drawable/ic_happy_complete_panda.xml | 101 ++++++++++++ .../res/drawable/ic_happy_complete_red.xml | 142 ++++++++++++++++ .../res/layout/activity_routine_complete.xml | 5 +- 11 files changed, 873 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/ic_daily_complete_brown.xml create mode 100644 app/src/main/res/drawable/ic_daily_complete_gray.xml create mode 100644 app/src/main/res/drawable/ic_daily_complete_panda.xml create mode 100644 app/src/main/res/drawable/ic_daily_complete_red.xml create mode 100644 app/src/main/res/drawable/ic_happy_complete_brown.xml create mode 100644 app/src/main/res/drawable/ic_happy_complete_gray.xml create mode 100644 app/src/main/res/drawable/ic_happy_complete_panda.xml create mode 100644 app/src/main/res/drawable/ic_happy_complete_red.xml diff --git a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/complete/DailyRoutineCompleteActivity.kt b/app/src/main/java/com/sopetit/softie/ui/dailyroutine/complete/DailyRoutineCompleteActivity.kt index 05441916..8cc98e2d 100644 --- a/app/src/main/java/com/sopetit/softie/ui/dailyroutine/complete/DailyRoutineCompleteActivity.kt +++ b/app/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/app/src/main/java/com/sopetit/softie/ui/happyroutine/complete/HappyRoutineCompleteActivity.kt b/app/src/main/java/com/sopetit/softie/ui/happyroutine/complete/HappyRoutineCompleteActivity.kt index 6d29c62c..2f972841 100644 --- a/app/src/main/java/com/sopetit/softie/ui/happyroutine/complete/HappyRoutineCompleteActivity.kt +++ b/app/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 new file mode 100644 index 00000000..c120e8ea --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_complete_brown.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_daily_complete_gray.xml b/app/src/main/res/drawable/ic_daily_complete_gray.xml new file mode 100644 index 00000000..56a60a8a --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_complete_gray.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_daily_complete_panda.xml b/app/src/main/res/drawable/ic_daily_complete_panda.xml new file mode 100644 index 00000000..e9eeebb0 --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_complete_panda.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_daily_complete_red.xml b/app/src/main/res/drawable/ic_daily_complete_red.xml new file mode 100644 index 00000000..d1709708 --- /dev/null +++ b/app/src/main/res/drawable/ic_daily_complete_red.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_happy_complete_brown.xml b/app/src/main/res/drawable/ic_happy_complete_brown.xml new file mode 100644 index 00000000..26a8d7ed --- /dev/null +++ b/app/src/main/res/drawable/ic_happy_complete_brown.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_happy_complete_gray.xml b/app/src/main/res/drawable/ic_happy_complete_gray.xml new file mode 100644 index 00000000..472d574b --- /dev/null +++ b/app/src/main/res/drawable/ic_happy_complete_gray.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_happy_complete_panda.xml b/app/src/main/res/drawable/ic_happy_complete_panda.xml new file mode 100644 index 00000000..a04585f5 --- /dev/null +++ b/app/src/main/res/drawable/ic_happy_complete_panda.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_happy_complete_red.xml b/app/src/main/res/drawable/ic_happy_complete_red.xml new file mode 100644 index 00000000..fd95c864 --- /dev/null +++ b/app/src/main/res/drawable/ic_happy_complete_red.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_routine_complete.xml b/app/src/main/res/layout/activity_routine_complete.xml index 37fca71e..24a86d6d 100644 --- a/app/src/main/res/layout/activity_routine_complete.xml +++ b/app/src/main/res/layout/activity_routine_complete.xml @@ -45,11 +45,10 @@ 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_constraintDimensionRatio="1:0.68" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" /> Date: Fri, 19 Jan 2024 00:25:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#103=20[chore]=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B9=84=EC=9C=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_routine_complete.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/activity_routine_complete.xml b/app/src/main/res/layout/activity_routine_complete.xml index 24a86d6d..4df3a33e 100644 --- a/app/src/main/res/layout/activity_routine_complete.xml +++ b/app/src/main/res/layout/activity_routine_complete.xml @@ -45,7 +45,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginHorizontal="36dp" - app:layout_constraintDimensionRatio="1:0.68" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" />