From 291cf3a13c93df8f617f5af5df49d5d0776a2244 Mon Sep 17 00:00:00 2001 From: KIM MINJEONG Date: Fri, 12 Jan 2024 17:06:20 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#40=20[mod]=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=ED=85=8C=EB=A7=88&=EB=A3=A8=ED=8B=B4=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=20=EB=B7=B0=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...e_background_gradation_bot_fill_0_rect.xml | 8 ++ ...e_background_gradation_top_fill_0_rect.xml | 8 ++ .../fragment_onboarding_choice_routine.xml | 84 ++++++++++--------- .../fragment_onboarding_choice_theme.xml | 9 +- 4 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/drawable/shape_background_gradation_bot_fill_0_rect.xml create mode 100644 app/src/main/res/drawable/shape_background_gradation_top_fill_0_rect.xml diff --git a/app/src/main/res/drawable/shape_background_gradation_bot_fill_0_rect.xml b/app/src/main/res/drawable/shape_background_gradation_bot_fill_0_rect.xml new file mode 100644 index 00000000..4e4e4b78 --- /dev/null +++ b/app/src/main/res/drawable/shape_background_gradation_bot_fill_0_rect.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/drawable/shape_background_gradation_top_fill_0_rect.xml b/app/src/main/res/drawable/shape_background_gradation_top_fill_0_rect.xml new file mode 100644 index 00000000..7defdd6d --- /dev/null +++ b/app/src/main/res/drawable/shape_background_gradation_top_fill_0_rect.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml index 4eb5b968..3c0cc447 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml @@ -18,7 +18,8 @@ + android:layout_height="match_parent" + android:background="@color/background"> + + + + - - - - - + app:layout_constraintEnd_toStartOf="@id/btn_onboarding_routine_select_routine" /> - + diff --git a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml index 669af818..14179ee4 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml @@ -25,13 +25,16 @@ android:id="@+id/rv_onboarding_choice_theme" android:layout_width="0dp" android:layout_height="0dp" + android:layout_marginHorizontal="21dp" android:layout_marginTop="34dp" android:layout_marginBottom="21dp" - android:layout_marginHorizontal="21dp" - app:layout_constraintStart_toStartOf="parent" + android:overScrollMode="never" + app:layout_constraintBottom_toTopOf="@id/btn_onboarding_choice_theme" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.512" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_onboarding_choice_theme_title_bear" - app:layout_constraintBottom_toTopOf="@id/btn_onboarding_choice_theme" + app:layout_constraintVertical_bias="1.0" tools:listitem="@layout/item_onboarding_choice_theme" /> Date: Fri, 12 Jan 2024 17:15:15 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#40=20[mod]=20=EC=BD=94=EB=93=9C=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_onboarding_choice_theme.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml index 14179ee4..6f0275d4 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml @@ -31,10 +31,8 @@ android:overScrollMode="never" app:layout_constraintBottom_toTopOf="@id/btn_onboarding_choice_theme" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.512" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_onboarding_choice_theme_title_bear" - app:layout_constraintVertical_bias="1.0" tools:listitem="@layout/item_onboarding_choice_theme" /> Date: Fri, 12 Jan 2024 22:54:56 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#40=20[add]=20button=20=EA=B7=B8=EB=A6=BC?= =?UTF-8?q?=EC=9E=90=20=EC=97=86=EC=95=A0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_onboarding_choice_routine.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml index 3c0cc447..388c3208 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml @@ -113,6 +113,7 @@ android:background="@drawable/shape_gray100_fill_12_rect" android:layout_marginStart="20dp" android:layout_marginBottom="33dp" + android:outlineProvider="none" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/btn_onboarding_routine_select_routine" /> From b7ab7c1df8376124a7b357815e7eee9489f3e4ba Mon Sep 17 00:00:00 2001 From: KIM MINJEONG Date: Sun, 14 Jan 2024 03:17:05 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#40=20[ui]=20button=20=EA=B7=B8=EB=A6=BC?= =?UTF-8?q?=EC=9E=90=20=EC=97=86=EC=95=A0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_onboarding_choice_routine.xml | 1 + app/src/main/res/layout/fragment_onboarding_choice_theme.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml index 388c3208..cdb65905 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_routine.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_routine.xml @@ -130,6 +130,7 @@ android:background="@{routineViewModel.isRoutineBtnEnabled ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}" android:enabled="@{routineViewModel.isRoutineBtnEnabled ? true : false}" android:clickable="@{routineViewModel.isRoutineBtnEnabled ? true : false}" + android:outlineProvider="none" app:layout_constraintTop_toTopOf="@id/btn_onboarding_routine_back_theme" app:layout_constraintBottom_toBottomOf="@id/btn_onboarding_routine_back_theme" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml index 6f0275d4..00c53552 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml @@ -45,6 +45,7 @@ android:background="@{themeViewModel.themeBtnEnabled ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}" android:enabled="@{themeViewModel.themeBtnEnabled ? true : false}" android:clickable="@{themeViewModel.themeBtnEnabled ? true : false}" + android:outlineProvider="none" android:layout_marginHorizontal="20dp" android:layout_marginBottom="34dp" app:layout_constraintStart_toStartOf="parent"