From e29879ef7c9f6435b15cf44ae90e561f21f2f20d Mon Sep 17 00:00:00 2001 From: oreocube Date: Wed, 11 Jan 2023 19:58:31 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=83=89=EC=83=81=EA=B0=92=20?= =?UTF-8?q?=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/values-night/colors.xml | 13 ++++++++----- app/src/main/res/values/colors.xml | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3260172..625affd 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -11,9 +11,12 @@ @color/black @color/black @color/white - @color/black - @color/black - @color/black - @color/black - @color/black + @color/gray_1d + @color/gray_59 + @color/gray_d0 + @color/gray_14 + @color/gray_c5 + @color/white + @color/gray_22 + @color/gray_d4 \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 37b785e..4bbebb1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,12 +5,19 @@ #00000000 #4D000000 #FFFBFBFB + #FFEFEFEF #FFF6F6F6 #FFD4D4D4 + #FFD0D0D0 #FFC5C5C5 #FF818181 + #FFB9B9B9 + #FF595959 #FF545454 #FF4A4A4A + #FF222222 + #FF1D1D1D + #FF141414 #FFFFBBAC #DC6046 #FFFED977 @@ -31,9 +38,12 @@ @color/gray_f6 @color/gray_81 @color/gray_4a - @color/gray_d4 + @color/gray_ef + @color/gray_b9 @color/gray_54 @color/white @color/gray_c5 - @color/white + @color/white + @color/gray_fb + @color/gray_4a \ No newline at end of file From f1db8b7807c938b972c76b3913c27c2cd8d63927 Mon Sep 17 00:00:00 2001 From: oreocube Date: Wed, 11 Jan 2023 20:05:49 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=EC=83=89=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 --- app/src/main/res/layout/fragment_notification_setting.xml | 8 ++++---- app/src/main/res/values/style_button.xml | 1 + app/src/main/res/values/style_text.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/fragment_notification_setting.xml b/app/src/main/res/layout/fragment_notification_setting.xml index c87c2bb..2345483 100644 --- a/app/src/main/res/layout/fragment_notification_setting.xml +++ b/app/src/main/res/layout/fragment_notification_setting.xml @@ -39,7 +39,7 @@ android:layout_marginTop="@dimen/space_default" android:gravity="center" android:text="@string/message_hrhn_summary" - android:textColor="@color/gray_54" + android:textColor="@color/dim" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_notification_message" /> @@ -48,7 +48,7 @@ android:id="@+id/btn_time_picker" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="@color/gray_f6" + android:backgroundTint="@color/cell_fill" android:insetTop="0dp" android:insetBottom="0dp" android:paddingHorizontal="@dimen/space_large" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/space_text" android:text="@string/button_no_alarm" - android:textColor="@color/gray_54" + android:textColor="@color/dim" app:layout_constraintBottom_toTopOf="@+id/tv_notification_setting_message" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -84,7 +84,7 @@ android:layout_marginBottom="@dimen/space_default" android:gravity="center" android:text="@string/message_notification_setting_info" - android:textColor="@color/gray_54" + android:textColor="@color/dim" app:layout_constraintBottom_toTopOf="@id/btn_set_alarm" /> diff --git a/app/src/main/res/values/style_text.xml b/app/src/main/res/values/style_text.xml index d711b4c..97b8466 100644 --- a/app/src/main/res/values/style_text.xml +++ b/app/src/main/res/values/style_text.xml @@ -17,7 +17,7 @@ \ No newline at end of file From b2319ab4d5e4cd792bcc4b514ba7665280212d1b Mon Sep 17 00:00:00 2001 From: oreocube Date: Wed, 11 Jan 2023 21:05:00 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EC=83=89=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 --- app/src/main/res/drawable/bg_challenge_card.xml | 2 +- app/src/main/res/layout/fragment_past_challenge.xml | 4 ++-- app/src/main/res/layout/fragment_today.xml | 4 ++-- app/src/main/res/layout/item_challenge.xml | 5 +++-- app/src/main/res/values/style_button.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable/bg_challenge_card.xml b/app/src/main/res/drawable/bg_challenge_card.xml index 24b9807..f653ab9 100644 --- a/app/src/main/res/drawable/bg_challenge_card.xml +++ b/app/src/main/res/drawable/bg_challenge_card.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_past_challenge.xml b/app/src/main/res/layout/fragment_past_challenge.xml index 2c8fd6c..d1ef7db 100644 --- a/app/src/main/res/layout/fragment_past_challenge.xml +++ b/app/src/main/res/layout/fragment_past_challenge.xml @@ -24,7 +24,7 @@ android:id="@+id/tb_past_challenge" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_scrollFlags="scroll|snap"> + app:layout_scrollFlags="scroll|exitUntilCollapsed"> From b115f15212b095b8a27ae5f82b31c97b8bb39ac5 Mon Sep 17 00:00:00 2001 From: oreocube Date: Wed, 11 Jan 2023 21:05:25 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=EC=B1=8C=EB=A6=B0=EC=A7=80=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=ED=99=94=EB=A9=B4=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=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/fragment_add_challenge.xml | 4 +++- app/src/main/res/layout/fragment_check_challenge.xml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_add_challenge.xml b/app/src/main/res/layout/fragment_add_challenge.xml index 89ed8ba..1d806d6 100644 --- a/app/src/main/res/layout/fragment_add_challenge.xml +++ b/app/src/main/res/layout/fragment_add_challenge.xml @@ -39,7 +39,7 @@ android:paddingHorizontal="@dimen/space_large" android:paddingVertical="@dimen/space_default" android:text="@={vm.input}" - android:textColor="@color/gray_4a" + android:textColor="@color/cell_label" android:textSize="20sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/btn_next" @@ -51,6 +51,7 @@ android:layout_height="wrap_content" android:gravity="end" android:text="@{String.valueOf(vm.input.length())}" + android:textColor="@color/cell_label" android:textStyle="bold" app:layout_constraintBaseline_toBaselineOf="@id/tv_max" app:layout_constraintEnd_toStartOf="@id/tv_max" @@ -63,6 +64,7 @@ android:layout_margin="@dimen/space_default" android:gravity="end" android:text="/50" + android:textColor="@color/cell_label" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/et_new_challenge" app:layout_constraintEnd_toEndOf="@id/et_new_challenge" /> diff --git a/app/src/main/res/layout/fragment_check_challenge.xml b/app/src/main/res/layout/fragment_check_challenge.xml index 79dfe90..a86a906 100644 --- a/app/src/main/res/layout/fragment_check_challenge.xml +++ b/app/src/main/res/layout/fragment_check_challenge.xml @@ -38,10 +38,11 @@ android:minHeight="100dp" android:padding="@dimen/space_default" android:text="@{viewModel.lastChallenge.content}" - android:textColor="@color/gray_4a" + android:textColor="@color/cell_label" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/rv_emoji" - app:layout_constraintTop_toBottomOf="@+id/tv_title_check" /> + app:layout_constraintTop_toBottomOf="@+id/tv_title_check" + tools:text="물 2L 마시기" /> Date: Wed, 11 Jan 2023 21:05:36 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=EC=84=A4=EC=A0=95=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EC=83=89=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 --- app/src/main/res/layout/fragment_notification_setting.xml | 1 + app/src/main/res/layout/preference_time_picker.xml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_notification_setting.xml b/app/src/main/res/layout/fragment_notification_setting.xml index 2345483..c4a222b 100644 --- a/app/src/main/res/layout/fragment_notification_setting.xml +++ b/app/src/main/res/layout/fragment_notification_setting.xml @@ -56,6 +56,7 @@ android:stateListAnimator="@null" android:textColor="@color/red_02" android:textSize="@dimen/text_size_body1" + app:cornerRadius="16dp" app:elevation="0dp" app:layout_constraintBottom_toTopOf="@id/btn_no_alarm" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/preference_time_picker.xml b/app/src/main/res/layout/preference_time_picker.xml index 8c0240d..3c93073 100644 --- a/app/src/main/res/layout/preference_time_picker.xml +++ b/app/src/main/res/layout/preference_time_picker.xml @@ -1,8 +1,10 @@ \ No newline at end of file + android:backgroundTint="@color/cell_fill" + android:textColor="@color/red_02" + app:elevation="0dp" /> \ No newline at end of file From f2264543c44f4f09c5fb46663708e73f6b33e585 Mon Sep 17 00:00:00 2001 From: oreocube Date: Wed, 11 Jan 2023 21:14:58 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C?= =?UTF-8?q?=20=EC=83=89=EC=83=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-night/colors.xml | 5 ----- app/src/main/res/values/colors.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 625affd..5d293d8 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -6,11 +6,6 @@ #2E3C3C43 @color/white - @color/black - @color/black - @color/black - @color/black - @color/white @color/gray_1d @color/gray_59 @color/gray_d0 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4bbebb1..1d162f7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -33,11 +33,6 @@ #2E3C3C43 @color/black - @color/gray_fb - @color/gray_4a - @color/gray_f6 - @color/gray_81 - @color/gray_4a @color/gray_ef @color/gray_b9 @color/gray_54