From 96495254526f47660f2dd3d8c817d68016ae4f6f Mon Sep 17 00:00:00 2001 From: heominhoe Date: Thu, 18 Jan 2024 18:21:31 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#99=20[chore]=20=EA=B8=80=EC=9E=90=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=A4=84=EB=B0=94=EA=BF=88=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/fragment_daily_routine.xml | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml index c4a6fd3b..5e025601 100644 --- a/app/src/main/res/layout/fragment_daily_routine.xml +++ b/app/src/main/res/layout/fragment_daily_routine.xml @@ -86,12 +86,15 @@ @@ -179,12 +182,15 @@ @@ -204,7 +210,7 @@ android:layout_marginStart="4dp" android:layout_marginTop="5dp" android:layout_marginBottom="21dp" - android:text="@string/daily_routine_ing" + android:text="@{@string/daily_routine_ing(viewModel.dailyRoutineListResponse[1].achieveCount)}" android:textAppearance="@style/caption1" android:textColor="@color/gray300" app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_second" @@ -267,12 +273,15 @@ @@ -292,7 +301,7 @@ android:layout_marginStart="4dp" android:layout_marginTop="5dp" android:layout_marginBottom="21dp" - android:text="@string/daily_routine_ing" + android:text="@{@string/daily_routine_ing(viewModel.dailyRoutineListResponse[2].achieveCount)}" android:textAppearance="@style/caption1" android:textColor="@color/gray300" app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_third" From 0167e9dbf61cd4e1a2d9632ea40835d4ec072b4a Mon Sep 17 00:00:00 2001 From: heominhoe Date: Thu, 18 Jan 2024 19:08:57 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#99=20[chore]=20=EB=B0=98=EC=9D=91=ED=98=95?= =?UTF-8?q?=20ui=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EA=B0=84=EA=B2=A9=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 --- .../res/layout/fragment_daily_routine.xml | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml index 5e025601..8ae6c7bc 100644 --- a/app/src/main/res/layout/fragment_daily_routine.xml +++ b/app/src/main/res/layout/fragment_daily_routine.xml @@ -76,26 +76,33 @@ + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> @@ -126,7 +132,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" - android:layout_marginTop="82dp" android:layout_marginBottom="16dp" android:background="@{viewModel.isRoutineAchieveFirst ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}" android:clickable="@{!viewModel.isRoutineAchieveFirst}" @@ -140,8 +145,7 @@ android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" /> @@ -172,26 +176,33 @@ + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> @@ -275,14 +291,14 @@ android:id="@+id/tv_daily_routine_add_name_third" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="12dp" - android:lineHeight="20dp" + android:lineSpacingExtra="4dp" android:text="@string/daily_routine_user_add" android:scrollHorizontally="false" android:textAppearance="@style/body1" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="50dp" - app:layout_constraintStart_toEndOf="@id/iv_daily_routine_icon_third" + android:layout_marginStart="75dp" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/iv_daily_routine_icon_third" /> Date: Thu, 18 Jan 2024 22:51:34 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#99=20[chore]=20=EC=82=AC=EC=A7=84=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EA=B2=8C=20=EC=BD=94=EB=93=9C=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 --- .../res/layout/fragment_daily_routine.xml | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml index 8ae6c7bc..6778c074 100644 --- a/app/src/main/res/layout/fragment_daily_routine.xml +++ b/app/src/main/res/layout/fragment_daily_routine.xml @@ -85,6 +85,7 @@ android:scaleType="centerCrop" android:src="@drawable/ic_daily" app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_first" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_first" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" @@ -95,13 +96,13 @@ android:id="@+id/tv_daily_routine_add_name_first" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="75dp" + android:layout_marginEnd="50dp" android:lineSpacingExtra="4dp" - android:text="@string/daily_routine_user_add" android:scrollHorizontally="false" + android:text="@string/daily_routine_user_add" android:textAppearance="@style/body1" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginEnd="50dp" - android:layout_marginStart="75dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/iv_daily_routine_icon_first" /> @@ -132,6 +133,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" + android:layout_marginTop="20dp" android:layout_marginBottom="16dp" android:background="@{viewModel.isRoutineAchieveFirst ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}" android:clickable="@{!viewModel.isRoutineAchieveFirst}" @@ -145,7 +147,8 @@ android:textColor="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_daily_routine_ing_first" /> @@ -185,6 +188,7 @@ android:scaleType="centerCrop" android:src="@drawable/ic_daily" app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_second" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_second" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" @@ -195,13 +199,13 @@ android:id="@+id/tv_daily_routine_add_name_second" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="75dp" + android:layout_marginEnd="50dp" android:lineSpacingExtra="4dp" - android:text="@string/daily_routine_user_add" android:scrollHorizontally="false" + android:text="@string/daily_routine_user_add" android:textAppearance="@style/body1" app:layout_constraintEnd_toEndOf="parent" - android:layout_marginEnd="50dp" - android:layout_marginStart="75dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/iv_daily_routine_icon_second" /> @@ -224,7 +228,6 @@ android:text="@{@string/daily_routine_ing(viewModel.dailyRoutineListResponse[1].achieveCount)}" android:textAppearance="@style/caption1" android:textColor="@color/gray300" - app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_second" app:layout_constraintStart_toEndOf="@id/iv_daily_routine_fin_second" app:layout_constraintTop_toBottomOf="@id/tv_daily_routine_add_name_second" /> @@ -233,7 +236,7 @@ android:layout_width="0dp" android:layout_height="38dp" android:layout_marginHorizontal="20dp" - android:layout_marginTop="82dp" + android:layout_marginTop="20dp" android:layout_marginBottom="16dp" android:background="@{viewModel.isRoutineAchieveSecond ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}" android:clickable="@{!viewModel.isRoutineAchieveSecond}" @@ -245,7 +248,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/tv_daily_routine_ing_second" /> @@ -280,24 +283,27 @@ android:layout_marginTop="22dp" android:layout_marginEnd="12dp" android:layout_marginBottom="35dp" + android:scaleType="centerCrop" + android:src="@drawable/ic_daily" app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_third" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_third" - android:src="@drawable/ic_daily" - android:scaleType="centerCrop" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintVertical_bias="0.0" app:layout_constraintTop_toTopOf="parent" /> @@ -320,7 +326,6 @@ android:text="@{@string/daily_routine_ing(viewModel.dailyRoutineListResponse[2].achieveCount)}" android:textAppearance="@style/caption1" android:textColor="@color/gray300" - app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_third" app:layout_constraintStart_toEndOf="@id/iv_daily_routine_fin_third" app:layout_constraintTop_toBottomOf="@id/tv_daily_routine_add_name_third" /> @@ -329,7 +334,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" - android:layout_marginTop="82dp" + android:layout_marginTop="20dp" android:layout_marginBottom="16dp" android:background="@{viewModel.isRoutineAchieveThird ? @drawable/shape_gray100_fill_10_rect : @drawable/shape_main1_fill_10_rect}" android:clickable="@{!viewModel.isRoutineAchieveThird}" @@ -344,7 +349,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/tv_daily_routine_ing_third" /> From 987ec0f6f1115ce5e6a648235d0ede6c20ccb4ae Mon Sep 17 00:00:00 2001 From: heominhoe Date: Thu, 18 Jan 2024 23:06:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#99=20[chore]=20=EC=82=AC=EC=A7=84=EB=8F=84?= =?UTF-8?q?=20=EB=B3=B4=EC=9D=B4=EA=B3=A0=20=EB=B0=98=EC=9D=91=ED=98=95?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=BD=94=EB=93=9C=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_daily_routine.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_daily_routine.xml b/app/src/main/res/layout/fragment_daily_routine.xml index 6778c074..6c6fb135 100644 --- a/app/src/main/res/layout/fragment_daily_routine.xml +++ b/app/src/main/res/layout/fragment_daily_routine.xml @@ -84,7 +84,6 @@ android:layout_marginBottom="35dp" android:scaleType="centerCrop" android:src="@drawable/ic_daily" - app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_first" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_first" app:layout_constraintHorizontal_bias="0.0" @@ -187,7 +186,6 @@ android:layout_marginBottom="35dp" android:scaleType="centerCrop" android:src="@drawable/ic_daily" - app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_second" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_second" app:layout_constraintHorizontal_bias="0.0" @@ -285,7 +283,6 @@ android:layout_marginBottom="35dp" android:scaleType="centerCrop" android:src="@drawable/ic_daily" - app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_yet_fin_third" app:layout_constraintEnd_toStartOf="@id/tv_daily_routine_add_name_third" app:layout_constraintStart_toStartOf="parent" app:layout_constraintDimensionRatio="1:1"