Feat : 학사 일정 데이트 피커

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/DatePickerDialog.kt

@@ -0,0 +1,105 @@
+package com.dongyang.android.youdongknowme.ui.view.schedule
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.NumberPicker
+import androidx.fragment.app.activityViewModels
+import com.dongyang.android.youdongknowme.R
+import com.dongyang.android.youdongknowme.databinding.DialogDatepickerBinding
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import org.threeten.bp.LocalDate
+
+class DatePickerDialog(
+    private val year: Int,
+    private val month: Int,
+    private val listener: ScheduleClickListener
+) : BottomSheetDialogFragment() {
+
+    private var _binding: DialogDatepickerBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+
+        _binding = DialogDatepickerBinding.inflate(inflater, container, false)
+        val view = binding.root
+
+        // 현재 연도
+        val currentYear = LocalDate.now().year
+
+        // 순환 막기
+        binding.numberpickerDialogDatepickerYear.wrapSelectorWheel = false
+        binding.numberpickerDialogDatepickerMonth.wrapSelectorWheel = false
+
+        // editText 설정 막기
+        binding.numberpickerDialogDatepickerYear.descendantFocusability =
+            NumberPicker.FOCUS_BLOCK_DESCENDANTS
+        binding.numberpickerDialogDatepickerMonth.descendantFocusability =
+            NumberPicker.FOCUS_BLOCK_DESCENDANTS
+
+        // 연도 최소/최대값 설정 및 출력 방식 설정
+        with(binding.numberpickerDialogDatepickerYear) {
+            minValue = currentYear - 1
+            maxValue = currentYear + 1
+            displayedValues =
+                ((minValue..maxValue).map { "$it${getString(R.string.calendar_year)}" }
+                    .toTypedArray())
+        }
+
+        // 월 최소/최대값 설정 및 출력 방식 설정
+        with(binding.numberpickerDialogDatepickerMonth) {
+            minValue = 1
+            maxValue = if (year == currentYear + 1) 2 else 12
+
+            // 연도 선택에 따른 월의 최대값 동적 설정
+            binding.numberpickerDialogDatepickerYear.setOnValueChangedListener { _, _, newYear ->
+                maxValue = if (newYear == currentYear + 1) 2 else 12
+            }
+
+            displayedValues =
+                ((minValue..maxValue).map { "$it${getString(R.string.calendar_month)}" }
+                    .toTypedArray())
+        }
+
+        // 초기 설정
+        binding.numberpickerDialogDatepickerYear.value = year
+        binding.numberpickerDialogDatepickerMonth.value = month
+
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.tvDialogPermissionComplete.setOnClickListener {
+            val year = binding.numberpickerDialogDatepickerYear.value
+            val month = binding.numberpickerDialogDatepickerMonth.value
+            val date = CalendarDay.from(year, month, 1)
+
+            listener.buttonClick(date = date)
+
+            dismiss()
+        }
+    }
+
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        return BottomSheetDialog(requireContext(), R.style.CustomBottomSheetDialogTheme)
+    }
+
+    override fun onDestroyView() {
+
+        super.onDestroyView()
+        _binding = null
+    }
+}

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleClickListener.kt

@@ -0,0 +1,7 @@
+package com.dongyang.android.youdongknowme.ui.view.schedule
+
+import com.prolificinteractive.materialcalendarview.CalendarDay
+
+interface ScheduleClickListener {
+    fun buttonClick(date: CalendarDay)
+}

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleFragment.kt

@@ -1,14 +1,7 @@
 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
@@ -21,20 +14,65 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.threeten.bp.LocalDate
 
 /* 학사 일정 화면 */
-class ScheduleFragment : BaseFragment<FragmentScheduleBinding, ScheduleViewModel>() {
+class ScheduleFragment : BaseFragment<FragmentScheduleBinding, ScheduleViewModel>(),
+    ScheduleClickListener {
 
     override val layoutResourceId: Int = R.layout.fragment_schedule
     override val viewModel: ScheduleViewModel by viewModel()
 
     private lateinit var adapter: ScheduleAdapter
 
+    private var _year = LocalDate.now().year.toString()
+    private var year = _year
+
+    private var _month = LocalDate.now().month.toString()
+    private var month = _month
+
+    override fun buttonClick(date: CalendarDay) {
+        viewModel.setPickedDate(date)
+    }
+
+    // 연/월 방식으로 타이틀 처리
+    fun setCalenderHeader() {
+        binding.mvScheduleCalendar.setTitleFormatter { day ->
+            val inputText: LocalDate = day.date
+            val calendarHeaderElements = inputText.toString().split("-").toTypedArray()
+
+            year = calendarHeaderElements[0]
+            month = calendarHeaderElements[1]
+
+            val calendarHeaderBuilder = StringBuilder()
+            calendarHeaderBuilder.append(year)
+                .append(getString(R.string.calendar_year))
+                .append(" ")
+                .append(month)
+                .append(getString(R.string.calendar_month))
+            calendarHeaderBuilder.toString()
+        }
+    }
+
     override fun initStartView() {
+
         binding.vm = viewModel
 
         viewModel.setPickedDate(binding.mvScheduleCalendar.currentDate)
 
-        binding.mvScheduleCalendar.leftArrow.setTintList(ColorStateList.valueOf(ContextCompat.getColor(this.requireContext(), R.color.blue300)))
-        binding.mvScheduleCalendar.rightArrow.setTintList(ColorStateList.valueOf(ContextCompat.getColor(this.requireContext(), R.color.blue300)))
+        binding.mvScheduleCalendar.leftArrow.setTintList(
+            ColorStateList.valueOf(
+                ContextCompat.getColor(
+                    this.requireContext(),
+                    R.color.blue300
+                )
+            )
+        )
+        binding.mvScheduleCalendar.rightArrow.setTintList(
+            ColorStateList.valueOf(
+                ContextCompat.getColor(
+                    this.requireContext(),
+                    R.color.blue300
+                )
+            )
+        )
 
         adapter = ScheduleAdapter()
         binding.rvScheduleList.apply {
@@ -55,10 +93,18 @@ class ScheduleFragment : BaseFragment<FragmentScheduleBinding, ScheduleViewModel
             else dismissLoading()
         }
 
+        viewModel.pickYear.observe(viewLifecycleOwner) {
+            viewModel.getSchedules()
+        }
+
         viewModel.pickMonth.observe(viewLifecycleOwner) {
             viewModel.getSchedules()
         }
 
+        viewModel.selectedDate.observe(viewLifecycleOwner) { date ->
+            updateCalendarViewHeader(date)
+        }
+
         viewModel.scheduleList.observe(viewLifecycleOwner) {
             adapter.submitList(it)
         }
@@ -68,34 +114,35 @@ class ScheduleFragment : BaseFragment<FragmentScheduleBinding, ScheduleViewModel
         }
     }
 
+    private fun updateCalendarViewHeader(date: CalendarDay) {
+        binding.mvScheduleCalendar.setCurrentDate(date)
+
+        setCalenderHeader()
+    }
+
+
     override fun initAfterBinding() {
 
         binding.mvScheduleCalendar.setOnMonthChangedListener { _, date ->
             viewModel.setPickedDate(date)
         }
 
+        binding.mvScheduleCalendar.setOnTitleClickListener {
+            val dialog = DatePickerDialog(
+                year = year.toInt(),
+                month = month.toInt(),
+                listener = this@ScheduleFragment
+            )
+            dialog.show(requireActivity().supportFragmentManager, "CustomDialog")
+        }
+
         // 최소 날짜, 최대 날짜 지정
         binding.mvScheduleCalendar.apply {
             this.state().edit().setMinimumDate(CalendarDay.from(2023, 1, 1))
                 .setMaximumDate(CalendarDay.from(2025, 2, 28))
                 .commit()
         }
 
-        // 연/월 방식으로 타이틀 처리
-        binding.mvScheduleCalendar.setTitleFormatter { day ->
-            val inputText: LocalDate = day.date
-            val calendarHeaderElements = inputText.toString().split("-").toTypedArray()
-
-            val year = calendarHeaderElements[0]
-            val month = calendarHeaderElements[1]
-
-            val calendarHeaderBuilder = StringBuilder()
-            calendarHeaderBuilder.append(year)
-                .append(getString(R.string.calendar_year))
-                .append(" ")
-                .append(month)
-                .append(getString(R.string.calendar_month))
-            calendarHeaderBuilder.toString()
-        }
+        setCalenderHeader()
     }
 }

app/src/main/java/com/dongyang/android/youdongknowme/ui/view/schedule/ScheduleViewModel.kt

@@ -36,9 +36,14 @@ class ScheduleViewModel(private val scheduleRepository: ScheduleRepository) : Ba
     private val _pickMonth = MutableLiveData<Int>()
     val pickMonth: LiveData<Int> = _pickMonth
 
+    private val _selectedDate = MutableLiveData<CalendarDay>()
+    val selectedDate: LiveData<CalendarDay> = _selectedDate
+
     fun setPickedDate(date: CalendarDay) {
+        _selectedDate.value = date
         _pickYear.value = date.year
         _pickMonth.value = date.month
+        getSchedules()
     }
 
     fun getSchedules() {
@@ -51,7 +56,6 @@ class ScheduleViewModel(private val scheduleRepository: ScheduleRepository) : Ba
                         val scheduleList = result.data
 
                         // 선택한 연월 조건에 따라 리스트 출력
-
                         _scheduleList.postValue(getSchedulesForPickDate(scheduleList))
 
                         scheduleRepository.setLocalSchedules(Gson().toJson(scheduleList))

app/src/main/res/drawable/bg_white_radius_20dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp" />
+    <solid android:color="@color/white" />
+</shape>

app/src/main/res/drawable/ic_dialog_handle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="5dp"
+    android:viewportWidth="48"
+    android:viewportHeight="5">
+  <path
+      android:pathData="M0,2.035C0,0.911 0.911,0 2.035,0H45.965C47.089,0 48,0.911 48,2.035V2.035C48,3.159 47.089,4.07 45.965,4.07H2.035C0.911,4.07 0,3.159 0,2.035V2.035Z"
+      android:fillColor="#7F8295"/>
+</vector>

app/src/main/res/layout/dialog_datepicker.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="20dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_dialog_handle"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="10dp"/>
+
+    <NumberPicker
+        android:id="@+id/numberpicker_dialog_datepicker_year"
+        style="@style/PretendardMedium24"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginVertical="36dp"
+        android:theme="@style/Theme.YouDongKnowMe.NumberPicker"
+        app:layout_constraintEnd_toStartOf="@id/numberpicker_dialog_datepicker_month"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <NumberPicker
+        android:id="@+id/numberpicker_dialog_datepicker_month"
+        style="@style/PretendardMedium24"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginVertical="36dp"
+        android:theme="@style/Theme.YouDongKnowMe.NumberPicker"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/numberpicker_dialog_datepicker_year"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/tv_dialog_permission_complete"
+        style="@style/PretendardMedium24"
+        android:layout_width="0dp"
+        android:layout_height="56dp"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginVertical="20dp"
+        android:background="@drawable/btn_gray_to_blue_10dp_enabled"
+        android:text="@string/dialog_datepicker_comlete"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/numberpicker_dialog_datepicker_year" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -148,4 +148,7 @@
     <string name="dialog_permission_early_content">내용</string>
     <string name="dialog_permission_early_cancel">취소</string>
     <string name="dialog_permission_early_complete">설정 화면 이동</string>
+
+    <!-- datepicker dialog -->
+    <string name="dialog_datepicker_comlete">완료</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -29,4 +29,12 @@
         <item name="android:fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">@dimen/font_size_12</item>
     </style>
+
+    <style name="CustomBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/CustomBottomSheetCornerStyle</item>
+    </style>
+
+    <style name="CustomBottomSheetCornerStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/bg_white_radius_20dp</item>
+    </style>
 </resources>