From 672c95f719386a6f4cdbb13d1ee37de9807cce48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= <84004687+huiwoo-jo@users.noreply.github.com> Date: Sun, 11 Feb 2024 18:26:31 +0900 Subject: [PATCH 1/7] =?UTF-8?q?refactor=20:=20=ED=95=99=EC=82=AC=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=20-=20=EB=B7=B0=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20id=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/schedule/ScheduleFragment.kt | 14 +++++++------- app/src/main/res/layout/fragment_schedule.xml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt index 6fb3a779..a986b34f 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt @@ -20,10 +20,10 @@ class ScheduleFragment : BaseFragment + binding.mvScheduleCalendar.setOnMonthChangedListener { _, date -> viewModel.setPickedDate(date) } // 최소 날짜, 최대 날짜 지정 - binding.scheduleCalendar.apply { - this.state().edit().setMinimumDate(CalendarDay.from(2022, 1, 1)) - .setMaximumDate(CalendarDay.from(2023, 2, 28)) + binding.mvScheduleCalendar.apply { + this.state().edit().setMinimumDate(CalendarDay.from(2024, 1, 1)) + .setMaximumDate(CalendarDay.from(2025, 2, 28)) .commit() } // 연/월 방식으로 타이틀 처리 - binding.scheduleCalendar.setTitleFormatter { day -> + binding.mvScheduleCalendar.setTitleFormatter { day -> val inputText: LocalDate = day.date val calendarHeaderElements = inputText.toString().split("-").toTypedArray() diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml index 65ba10f9..c8545796 100644 --- a/app/src/main/res/layout/fragment_schedule.xml +++ b/app/src/main/res/layout/fragment_schedule.xml @@ -18,7 +18,7 @@ app:title="@{@string/schedule_title}" /> + app:layout_constraintTop_toBottomOf="@id/mv_schedule_calendar"> Date: Sun, 11 Feb 2024 18:26:31 +0900 Subject: [PATCH 2/7] =?UTF-8?q?refactor=20:=20=ED=95=99=EC=82=AC=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=20-=20=EB=B7=B0=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20id=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/view/schedule/ScheduleFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt index a8f3716f..f33cf31a 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt @@ -21,6 +21,7 @@ class ScheduleFragment : BaseFragment Date: Tue, 26 Mar 2024 14:55:48 +0900 Subject: [PATCH 3/7] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20=EB=85=84?= =?UTF-8?q?,=20=EC=9B=94=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/themes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7c04ddfc..20afd528 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -23,7 +23,7 @@ \ No newline at end of file From 5e838c7786260adddbc65f1df694d872073beede Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:56:07 +0900 Subject: [PATCH 4/7] =?UTF-8?q?design=20:=20=EC=8B=9D=EB=8B=A8=20=EC=9B=94?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=20=ED=99=94=EC=82=B4=ED=91=9C=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/schedule/ScheduleFragment.kt | 14 +++++++++++++- app/src/main/res/drawable/ic_arrow_left.xml | 10 ++++++++++ app/src/main/res/layout/fragment_schedule.xml | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_arrow_left.xml diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt index f33cf31a..6ea70cab 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt @@ -1,5 +1,14 @@ package com.dongyang.android.youdongknowme.ui.view.schedule +import android.content.res.ColorStateList +import android.graphics.Bitmap +import android.graphics.Canvas +import android.graphics.PorterDuff +import android.graphics.drawable.BitmapDrawable +import android.graphics.drawable.Drawable +import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.drawable.DrawableCompat import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import com.dongyang.android.youdongknowme.R @@ -22,6 +31,9 @@ class ScheduleFragment : BaseFragment + + diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml index 9b30ba30..e4d80aa0 100644 --- a/app/src/main/res/layout/fragment_schedule.xml +++ b/app/src/main/res/layout/fragment_schedule.xml @@ -26,6 +26,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/toolbar_schedule" app:mcv_headerTextAppearance="@style/CalendarHeader" + app:mcv_leftArrowMask="@drawable/ic_arrow_left" + app:mcv_rightArrowMask="@drawable/ic_arrow_right" app:mcv_tileHeight="50dp" app:mcv_tileWidth="0dp" /> From ef90d9a9bea217440e8acb7c090b1747ff314615 Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:07:36 +0900 Subject: [PATCH 5/7] =?UTF-8?q?design=20:=20=ED=95=99=EC=82=AC=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=20=EB=B6=80=EB=B6=84=20=EC=A4=84=20=EB=B0=94=EA=BF=88?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/ui/adapter/ScheduleAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/ScheduleAdapter.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/ScheduleAdapter.kt index 7ff40932..ba84eda0 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/ScheduleAdapter.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/adapter/ScheduleAdapter.kt @@ -20,7 +20,7 @@ class ScheduleAdapter : RecyclerView.Adapter() { : RecyclerView.ViewHolder(binding.root) { fun bind(item: ScheduleEntry) { - binding.tvItemScheduleDate.text = if(item.dates[0] == item.dates[1]) item.dates[0] else "${item.dates[0]} ~ \n${item.dates[1]}" + binding.tvItemScheduleDate.text = if(item.dates[0] == item.dates[1]) item.dates[0] else "${item.dates[0]}\n~ ${item.dates[1]}" binding.tvItemScheduleContents.text = item.contents } } From aa4aefe9cd2127165f112fa78f293505c0a4689a Mon Sep 17 00:00:00 2001 From: huiwoo-jo <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:12:50 +0900 Subject: [PATCH 6/7] =?UTF-8?q?design=20:=20=EC=8A=A4=EC=BC=80=EC=A5=B4=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=ED=8C=A8=EB=94=A9=EA=B0=92=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_schedule.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_schedule.xml b/app/src/main/res/layout/item_schedule.xml index bdb9cc64..43f5e739 100644 --- a/app/src/main/res/layout/item_schedule.xml +++ b/app/src/main/res/layout/item_schedule.xml @@ -6,7 +6,8 @@ + android:paddingVertical="20dp" + android:paddingHorizontal="18dp"> Date: Tue, 26 Mar 2024 20:26:42 +0900 Subject: [PATCH 7/7] =?UTF-8?q?refactor=20:=20=EC=8A=A4=EC=BC=80=EC=A4=84?= =?UTF-8?q?=20=EC=95=84=EC=9D=B4=ED=85=9C=20=ED=8C=A8=EB=94=A9=EA=B0=92?= =?UTF-8?q?=EC=9D=84=20=EC=95=88=EB=93=9C=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=97=90=20=EB=A7=9E=EC=B6=B0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_schedule.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_schedule.xml b/app/src/main/res/layout/item_schedule.xml index 43f5e739..ca6cf449 100644 --- a/app/src/main/res/layout/item_schedule.xml +++ b/app/src/main/res/layout/item_schedule.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="20dp" - android:paddingHorizontal="18dp"> + android:paddingHorizontal="16dp">