From 40cd8a63498722212bba5fdd79e83f05c925987c Mon Sep 17 00:00:00 2001 From: hyein Date: Sun, 8 Jan 2023 21:57:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=98=A4=EB=8A=98=EC=9D=B4=20?= =?UTF-8?q?=EC=8B=A4=EC=B2=9C=ED=95=9C=20=EB=82=A0=EC=9D=B8=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=8A=A4=ED=8A=B8=EB=A1=9C=ED=81=AC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depromeet/threedays/history/detail/view/Calendar.kt | 7 ++++++- .../history/src/main/res/drawable/bg_today_selection.xml | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 presentation/history/src/main/res/drawable/bg_today_selection.xml diff --git a/presentation/history/src/main/java/com/depromeet/threedays/history/detail/view/Calendar.kt b/presentation/history/src/main/java/com/depromeet/threedays/history/detail/view/Calendar.kt index 6f7c10e5..51c8a0db 100644 --- a/presentation/history/src/main/java/com/depromeet/threedays/history/detail/view/Calendar.kt +++ b/presentation/history/src/main/java/com/depromeet/threedays/history/detail/view/Calendar.kt @@ -45,9 +45,11 @@ class DayBind(private val executeDateWithStatusList: Map = em val rangeBetweenBackground = context.getDrawableCompat(R.drawable.bg_range_middle) as GradientDrawable val singleBackground = context.getDrawableCompat(R.drawable.bg_single_selection) as GradientDrawable val todayBackground = context.getDrawableCompat(R.drawable.bg_today) + val achievedTodayBackground = context.getDrawableCompat(R.drawable.bg_today_selection) as GradientDrawable rangeBetweenBackground.setColor(context.getHabitColor(color)) singleBackground.setColor(context.getHabitColor(color)) + achievedTodayBackground.setColor(context.getHabitColor(color)) container.textView.text = data.date.dayOfMonth.toString() roundBgView.visibility = View.INVISIBLE @@ -90,7 +92,10 @@ class DayBind(private val executeDateWithStatusList: Map = em roundBgView.applyBackground(singleBackground) } Status.SINGLE -> { - roundBgView.applyBackground(singleBackground) + roundBgView.applyBackground( + if(data.date == today) achievedTodayBackground + else singleBackground + ) } } } diff --git a/presentation/history/src/main/res/drawable/bg_today_selection.xml b/presentation/history/src/main/res/drawable/bg_today_selection.xml new file mode 100644 index 00000000..7d47fe69 --- /dev/null +++ b/presentation/history/src/main/res/drawable/bg_today_selection.xml @@ -0,0 +1,8 @@ + + + + + From 1550b479746b1f960bb457242dc71bad60d12048 Mon Sep 17 00:00:00 2001 From: hyein Date: Sun, 8 Jan 2023 22:29:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=EC=9D=B4=EC=A0=84=20=EC=9B=94=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EB=8B=A4=EC=9D=8C=EC=9B=94?= =?UTF-8?q?=EB=A1=9C=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EA=B0=80=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depromeet/threedays/history/detail/DetailHistoryActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/history/src/main/java/com/depromeet/threedays/history/detail/DetailHistoryActivity.kt b/presentation/history/src/main/java/com/depromeet/threedays/history/detail/DetailHistoryActivity.kt index 973e6196..672117a6 100644 --- a/presentation/history/src/main/java/com/depromeet/threedays/history/detail/DetailHistoryActivity.kt +++ b/presentation/history/src/main/java/com/depromeet/threedays/history/detail/DetailHistoryActivity.kt @@ -54,7 +54,7 @@ class DetailHistoryActivity : binding.ivPrevious.setOnSingleClickListener { binding.cvHistory.findFirstVisibleMonth()?.let { calendarMonth -> binding.cvHistory.smoothScrollToMonth(calendarMonth.yearMonth.previousMonth) - onCalendarMonthMoved(calendarMonth.yearMonth.nextMonth) + onCalendarMonthMoved(calendarMonth.yearMonth.previousMonth) } } From 823f18c706718aab19fc32941af809f89fb46a9c Mon Sep 17 00:00:00 2001 From: hyein Date: Sun, 8 Jan 2023 22:30:40 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AA=A8=EC=A7=80=EA=B0=80?= =?UTF-8?q?=20=EC=82=B4=EC=A7=9D=20=EC=95=84=EB=9E=98=EB=A1=9C=20=EB=82=B4?= =?UTF-8?q?=EB=A0=A4=EC=84=9C=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../history/src/main/res/layout/activity_detail_history.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/presentation/history/src/main/res/layout/activity_detail_history.xml b/presentation/history/src/main/res/layout/activity_detail_history.xml index 2b802375..dd81d8d9 100644 --- a/presentation/history/src/main/res/layout/activity_detail_history.xml +++ b/presentation/history/src/main/res/layout/activity_detail_history.xml @@ -41,6 +41,7 @@ android:id="@+id/container_title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="36dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_back"> @@ -51,6 +52,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textColor="@color/transparency_color" + android:includeFontPadding="false" android:textSize="20sp" tools:text="\uD83D\uDE00" /> From bbd196c644dd0fbfc67e50f4c23a51d29457b393 Mon Sep 17 00:00:00 2001 From: hyein Date: Sun, 8 Jan 2023 22:31:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?ui:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?= =?UTF-8?q?=EC=9D=B4=EC=A0=84/=EB=8B=A4=EC=9D=8C=20=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=EC=9D=98=20=ED=84=B0=EC=B9=98=20=EC=98=81=EC=97=AD=20=EB=8D=94?= =?UTF-8?q?=20=ED=81=AC=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 --- .../history/src/main/res/layout/activity_detail_history.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/presentation/history/src/main/res/layout/activity_detail_history.xml b/presentation/history/src/main/res/layout/activity_detail_history.xml index dd81d8d9..c06f472c 100644 --- a/presentation/history/src/main/res/layout/activity_detail_history.xml +++ b/presentation/history/src/main/res/layout/activity_detail_history.xml @@ -256,7 +256,8 @@ android:id="@+id/iv_previous" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="20dp" + android:padding="10dp" + android:layout_marginEnd="10dp" app:layout_constraintBottom_toBottomOf="@id/tv_today" app:layout_constraintEnd_toStartOf="@id/tv_today" app:layout_constraintTop_toTopOf="@id/tv_today" @@ -266,7 +267,8 @@ android:id="@+id/iv_next" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dp" + android:padding="10dp" + android:layout_marginStart="10dp" app:layout_constraintBottom_toBottomOf="@id/tv_today" app:layout_constraintStart_toEndOf="@id/tv_today" app:layout_constraintTop_toTopOf="@id/tv_today"