Merge pull request #189 from simeunseok/feature/#160

simeunseok · web-flow · commit 9090bf6f9779 · 2021-11-18T20:26:39.000+09:00
체크포인트로 달력 나누는 기능 구현
diff --git a/app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarFragment.kt b/app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarFragment.kt
@@ -34,16 +34,16 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        mainCalendarViewModel.fetchCalendarList()
         setupCalendarView()
         setupDataBinding()
+        collectScheduleList()
+        collectCalendarSet()
+        collectCalendarList()
         setupToolbar()
         setupMonthCalendar()
         collectFabClickEvent()
-        collectCalendarList()
-        collectCheckPointList()
-        collectScheduleList()
         collectDaySecondClickListener()
+        mainCalendarViewModel.fetchCalendarList()
         collectCalendarDesignObject()
     }
 
@@ -57,72 +57,6 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
         binding.mainCalendarViewModel = mainCalendarViewModel
     }
 
-    private fun setupToolbar() {
-        binding.toolbarMainCalendar.setupWithNavController(navController, binding.layoutDrawer)
-        setupOnMenuItemClickListener()
-        setupAddDrawerListener()
-    }
-
-    private fun setupAddDrawerListener() = with(binding) {
-        val drawerHeaderBinding = DrawerHeaderBinding.bind(navView.getHeaderView(FIRST_HEADER))
-        layoutDrawer.addDrawerListener(object : DrawerLayout.DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                val menuItemOrder = this@MainCalendarFragment.mainCalendarViewModel.menuItemOrder.value
-                if (binding.navView.menu.isEmpty()) return
-                binding.navView.menu[menuItemOrder].isChecked = true
-                drawerHeaderBinding.tvDrawerHeaderTitle.text = binding.navView.menu[menuItemOrder].title
-            }
-
-            override fun onDrawerOpened(drawerView: View) {}
-            override fun onDrawerClosed(drawerView: View) {}
-            override fun onDrawerStateChanged(newState: Int) {}
-        })
-    }
-
-    private fun setupOnMenuItemClickListener() {
-        binding.toolbarMainCalendar.setOnMenuItemClickListener { item ->
-            when (item.itemId) {
-                R.id.menu_main_calendar_calendar -> {
-                    isMonthCalendar = !isMonthCalendar
-                    setupCalendarView()
-                }
-                R.id.menu_main_calendar_search -> navigateToSearchSchedule()
-                else -> return@setOnMenuItemClickListener false
-            }
-            true
-        }
-    }
-
-    private fun navigateToSearchSchedule() {
-        val action = MainCalendarFragmentDirections.toSearchSchedule()
-        navController.navigate(action)
-    }
-
-    private fun setupMonthCalendar() {
-        // TODO: 2021-11-16 이벤트를 발행하는 부분을 xml로 이동시킬 수 있으면 좋을듯
-        binding.calendarMonth.setOnDaySecondClickListener { date, _ ->
-            mainCalendarViewModel.emitDaySecondClickEvent(date)
-        }
-    }
-
-    private fun collectFabClickEvent() {
-        sharedCollect(mainCalendarViewModel.fabClickEvent) { calendarId ->
-            val action = MainCalendarFragmentDirections.toSaveSchedule(calendarId, 0)
-            navController.navigate(action)
-        }
-    }
-
-    private fun collectCalendarList() {
-        stateCollect(mainCalendarViewModel.calendarList) { calendarList ->
-            setupNavigationView(calendarList)
-
-            val menuItemOrder = mainCalendarViewModel.menuItemOrder.value
-            if (calendarList.isEmpty()) return@stateCollect
-            val calendar = calendarList[menuItemOrder]
-            mainCalendarViewModel.setCalendar(calendar)
-        }
-    }
-
     private fun setupNavigationView(calendarList: List<Calendar>) {
         val menu = binding.navView.menu
         menu.clear()
@@ -133,7 +67,6 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
                 .setCheckable(true)
                 .setOnMenuItemClickListener {
                     mainCalendarViewModel.setMenuItemOrder(index)
-                    // TODO: 2021-11-11 item에 맞는 캘린더 뷰로 변경
                     mainCalendarViewModel.setCalendar(calendar)
                     binding.layoutDrawer.closeDrawer(GravityCompat.START)
                     true
@@ -158,6 +91,7 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
         manageMenu.add(getString(R.string.drawer_theme_setting))
             .setIcon(R.drawable.ic_palette)
             .setOnMenuItemClickListener {
+                // TODO: 2021-11-11 테마 설정 화면으로 이동
                 val action = MainCalendarFragmentDirections.toThemeFragment()
                 navController.navigate(action)
                 true
@@ -176,19 +110,85 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
         binding.layoutDrawer.closeDrawer(GravityCompat.START)
     }
 
-    private fun collectCheckPointList() {
-        stateCollect(mainCalendarViewModel.checkPointList) { checkPointList ->
-            // TODO: 2021-11-10 CheckPoint 날짜 읽어서 뷰 나누기
-        }
-    }
-
     private fun collectScheduleList() {
         stateCollect(mainCalendarViewModel.scheduleList) { scheduleList ->
             binding.calendarMonth.setSchedules(scheduleList)
             binding.calendarYear.setSchedules(scheduleList)
         }
     }
 
+    private fun collectCalendarSet() {
+        stateCollect(mainCalendarViewModel.calendarSetList) { calendarSetList ->
+            binding.calendarMonth.setCalendarSetList(calendarSetList)
+        }
+    }
+
+    private fun collectCalendarList() {
+        stateCollect(mainCalendarViewModel.calendarList) { calendarList ->
+            setupNavigationView(calendarList)
+
+            val menuItemOrder = mainCalendarViewModel.menuItemOrder.value
+            if (calendarList.isEmpty()) return@stateCollect
+            val calendar = calendarList[menuItemOrder]
+            mainCalendarViewModel.setCalendar(calendar)
+        }
+    }
+
+    private fun setupToolbar() {
+        binding.toolbarMainCalendar.setupWithNavController(navController, binding.layoutDrawer)
+        setupOnMenuItemClickListener()
+        setupAddDrawerListener()
+    }
+
+    private fun setupAddDrawerListener() = with(binding) {
+        val drawerHeaderBinding = DrawerHeaderBinding.bind(navView.getHeaderView(FIRST_HEADER))
+        layoutDrawer.addDrawerListener(object : DrawerLayout.DrawerListener {
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+                val menuItemOrder = this@MainCalendarFragment.mainCalendarViewModel.menuItemOrder.value
+                if (binding.navView.menu.isEmpty()) return
+                binding.navView.menu[menuItemOrder].isChecked = true
+                drawerHeaderBinding.tvDrawerHeaderTitle.text = binding.navView.menu[menuItemOrder].title
+            }
+
+            override fun onDrawerOpened(drawerView: View) {}
+            override fun onDrawerClosed(drawerView: View) {}
+            override fun onDrawerStateChanged(newState: Int) {}
+        })
+    }
+
+    private fun setupOnMenuItemClickListener() {
+        binding.toolbarMainCalendar.setOnMenuItemClickListener { item ->
+            when (item.itemId) {
+                R.id.menu_main_calendar_calendar -> {
+                    isMonthCalendar = !isMonthCalendar
+                    setupCalendarView()
+                }
+                R.id.menu_main_calendar_search -> navigateToSearchSchedule()
+                else -> return@setOnMenuItemClickListener false
+            }
+            true
+        }
+    }
+
+    private fun navigateToSearchSchedule() {
+        val action = MainCalendarFragmentDirections.toSearchSchedule()
+        navController.navigate(action)
+    }
+
+    private fun setupMonthCalendar() {
+        // TODO: 2021-11-16 이벤트를 발행하는 부분을 xml로 이동시킬 수 있으면 좋을듯
+        binding.calendarMonth.setOnDaySecondClickListener { date, _ ->
+            mainCalendarViewModel.emitDaySecondClickEvent(date)
+        }
+    }
+
+    private fun collectFabClickEvent() {
+        sharedCollect(mainCalendarViewModel.fabClickEvent) { calendarId ->
+            val action = MainCalendarFragmentDirections.toSaveSchedule(calendarId, 0)
+            navController.navigate(action)
+        }
+    }
+
     private fun collectDaySecondClickListener() {
         // TODO: 2021-11-16 현재 flow 확장함수가 StateFlow와 SharedFlow만 받기 때문에 라이프사이클 처리를 명시해주고 있는데 개선이 필요해보임.
         viewLifecycleOwner.lifecycleScope.launch {
diff --git a/app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarViewModel.kt b/app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarViewModel.kt
@@ -9,9 +9,16 @@ import com.drunkenboys.calendarun.data.checkpoint.entity.CheckPoint
 import com.drunkenboys.calendarun.data.checkpoint.local.CheckPointLocalDataSource
 import com.drunkenboys.calendarun.data.schedule.entity.Schedule
 import com.drunkenboys.calendarun.data.schedule.local.ScheduleLocalDataSource
+import com.drunkenboys.calendarun.util.nextDay
 import com.drunkenboys.calendarun.ui.theme.toCalendarDesignObject
 import com.drunkenboys.ckscalendar.data.CalendarScheduleObject
+import com.drunkenboys.ckscalendar.data.CalendarSet
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import java.time.LocalDate
@@ -32,11 +39,13 @@ class MainCalendarViewModel @Inject constructor(
     val calendarList: StateFlow<List<Calendar>> = _calendarList
 
     private val _checkPointList = MutableStateFlow<List<CheckPoint>>(emptyList())
-    val checkPointList: StateFlow<List<CheckPoint>> = _checkPointList
 
     private val _scheduleList = MutableStateFlow<List<CalendarScheduleObject>>(emptyList())
     val scheduleList: StateFlow<List<CalendarScheduleObject>> = _scheduleList
 
+    private val _calendarSetList = MutableStateFlow<List<CalendarSet>>(emptyList())
+    val calendarSetList: StateFlow<List<CalendarSet>> = _calendarSetList
+
     private val _menuItemOrder = MutableStateFlow(0)
     val menuItemOrder: StateFlow<Int> = _menuItemOrder
 
@@ -49,8 +58,9 @@ class MainCalendarViewModel @Inject constructor(
     fun setCalendar(calendar: Calendar) {
         viewModelScope.launch {
             _calendar.emit(calendar)
-            fetchCheckPointList(calendar.id)
+            fetchCheckPointList(calendar.id).join()
             fetchScheduleList(calendar.id)
+            createCalendarSetList()
         }
     }
 
@@ -60,9 +70,9 @@ class MainCalendarViewModel @Inject constructor(
         }
     }
 
-    private fun fetchCheckPointList(calendarId: Long) {
-        viewModelScope.launch {
-            _checkPointList.emit(checkPointLocalDataSource.fetchCalendarCheckPoints(calendarId))
+    private fun fetchCheckPointList(calendarId: Long): Job {
+        return viewModelScope.launch {
+            _checkPointList.emit(checkPointLocalDataSource.fetchCalendarCheckPoints(calendarId).sortedBy { checkPoint -> checkPoint.date })
         }
     }
 
@@ -100,6 +110,57 @@ class MainCalendarViewModel @Inject constructor(
         }
     }
 
+    private fun createCalendarSetList() {
+        viewModelScope.launch {
+            val calendarNameList = createCalendarSetNameList() ?: return@launch
+            val calendarDateList = createCalendarSetDateList() ?: return@launch
+            val (calendarStartDateList, calendarEndDateList) = calendarDateList.first to calendarDateList.second
+
+            val calendarSetList = mutableListOf<CalendarSet>()
+
+            for (i in calendarNameList.indices) {
+                calendarSetList.add(
+                    CalendarSet(
+                        id = i,
+                        name = calendarNameList[i],
+                        startDate = calendarStartDateList[i],
+                        endDate = calendarEndDateList[i]
+                    )
+                )
+            }
+
+            _calendarSetList.emit(calendarSetList.toList())
+        }
+    }
+
+    private fun createCalendarSetNameList(): List<String>? {
+        val calendarName = _calendar.value?.name ?: return null
+        val checkPointNameList = _checkPointList.value.map { checkPoint -> checkPoint.name }
+
+        val calendarSetNameList = mutableListOf<String>()
+        checkPointNameList.forEach { checkPointName -> calendarSetNameList.add(checkPointName) }
+        calendarSetNameList.add(calendarName)
+
+        return calendarSetNameList
+    }
+
+    private fun createCalendarSetDateList(): Pair<List<LocalDate>, List<LocalDate>>? {
+        val startDate = _calendar.value?.startDate ?: return null
+        val endDate = _calendar.value?.endDate ?: return null
+        val checkPointDateList = _checkPointList.value.map { checkPoint -> checkPoint.date }
+        val calendarStartDateList = mutableListOf<LocalDate>()
+        val calendarEndDateList = mutableListOf<LocalDate>()
+
+        calendarStartDateList.add(startDate)
+        if (checkPointDateList.isNotEmpty()) {
+            calendarStartDateList.addAll(checkPointDateList.map { localDate -> localDate.nextDay() })
+            calendarEndDateList.addAll(checkPointDateList)
+        }
+        calendarEndDateList.add(endDate)
+
+        return calendarStartDateList to calendarEndDateList
+    }
+    
     fun fetchCalendarDesignObject() = calendarThemeDataSource.fetchCalendarTheme()
         .map { it.toCalendarDesignObject() }
 }
diff --git a/app/src/main/java/com/drunkenboys/calendarun/util/DateConverter.kt b/app/src/main/java/com/drunkenboys/calendarun/util/DateConverter.kt
@@ -12,4 +12,8 @@ fun stringToLocalDate(date: String): LocalDate =
 
 fun LocalDate?.localDateToString(): String = this?.format(DateTimeFormatter.ofPattern("yyyy.M.d")) ?: ""
 
-fun LocalDate.toLong() = toEpochDay() * 24 * 60 * 60 * 1000
+fun LocalDate.toSecondLong() = toEpochDay() * 24 * 60 * 60 * 1000
+
+fun LocalDate.toLong() = toEpochDay()
+
+fun LocalDate.nextDay(): LocalDate = LocalDate.ofEpochDay(toLong() + 1L)
diff --git a/app/src/main/java/com/drunkenboys/calendarun/util/extensions/FragmentExt.kt b/app/src/main/java/com/drunkenboys/calendarun/util/extensions/FragmentExt.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.drunkenboys.calendarun.R
-import com.drunkenboys.calendarun.util.toLong
+import com.drunkenboys.calendarun.util.toSecondLong
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
@@ -27,7 +27,7 @@ fun Fragment.showToast(message: String) {
 suspend fun Fragment.pickDateInMillis(localDate: LocalDate? = null) = suspendCancellableCoroutine<Long?> { cont ->
     val datePicker = MaterialDatePicker.Builder.datePicker()
         .setTitleText(getString(R.string.saveSchedule_pickDate))
-        .setSelection(localDate?.toLong() ?: MaterialDatePicker.todayInUtcMilliseconds())
+        .setSelection(localDate?.toSecondLong() ?: MaterialDatePicker.todayInUtcMilliseconds())
         .build()
     datePicker.apply {
         addOnPositiveButtonClickListener { timeInMillis -> cont.resume(timeInMillis) }
