Merge pull request #196 from PsPLoG/feature/#187

PsPLoG · web-flow · commit 08e5f3dfc41c · 2021-11-19T03:10:23.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
@@ -94,6 +94,7 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
                 // TODO: 2021-11-11 테마 설정 화면으로 이동
                 val action = MainCalendarFragmentDirections.toThemeFragment()
                 navController.navigate(action)
+                binding.layoutDrawer.closeDrawer(GravityCompat.START)
                 true
             }
     }
@@ -119,7 +120,13 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
 
     private fun collectCalendarSet() {
         stateCollect(mainCalendarViewModel.calendarSetList) { calendarSetList ->
-            binding.calendarMonth.setCalendarSetList(calendarSetList)
+            if (calendarSetList.isEmpty()) return@stateCollect
+
+            if (calendarSetList.firstOrNull()?.id == 1) { // CalendarSet 기본캘린더 ID에 대한 Unique 값이 필요함
+                binding.calendarMonth.setupDefaultCalendarSet()
+            } else {
+                binding.calendarMonth.setCalendarSetList(calendarSetList)
+            }
         }
     }
 
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,16 +9,12 @@ 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.calendarun.util.nextDay
 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
@@ -60,7 +56,7 @@ class MainCalendarViewModel @Inject constructor(
             _calendar.emit(calendar)
             fetchCheckPointList(calendar.id).join()
             fetchScheduleList(calendar.id)
-            createCalendarSetList()
+            createCalendarSetList(calendar.id)
         }
     }
 
@@ -110,7 +106,7 @@ class MainCalendarViewModel @Inject constructor(
         }
     }
 
-    private fun createCalendarSetList() {
+    private fun createCalendarSetList(id: Long) {
         viewModelScope.launch {
             val calendarNameList = createCalendarSetNameList() ?: return@launch
             val calendarDateList = createCalendarSetDateList() ?: return@launch
@@ -121,7 +117,7 @@ class MainCalendarViewModel @Inject constructor(
             for (i in calendarNameList.indices) {
                 calendarSetList.add(
                     CalendarSet(
-                        id = i,
+                        id = id.toInt(), // CalendarSet 기본캘린더 ID에 대한 Unique 값이 필요함
                         name = calendarNameList[i],
                         startDate = calendarStartDateList[i],
                         endDate = calendarEndDateList[i]
@@ -160,7 +156,7 @@ class MainCalendarViewModel @Inject constructor(
 
         return calendarStartDateList to calendarEndDateList
     }
-    
+
     fun fetchCalendarDesignObject() = calendarThemeDataSource.fetchCalendarTheme()
         .map { it.toCalendarDesignObject() }
 }
diff --git a/library/build.gradle b/library/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode 1
-        versionName "0.0.1"
+        versionName "0.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -90,7 +90,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.boostcampwm-2021'
                 artifactId = 'android01-CalendaRun'
-                version = '0.0.1'
+                version = '0.0.3'
             }
         }
     }
diff --git a/library/src/main/java/com/drunkenboys/ckscalendar/month/MonthCalendarView.kt b/library/src/main/java/com/drunkenboys/ckscalendar/month/MonthCalendarView.kt
@@ -69,12 +69,6 @@ class MonthCalendarView @JvmOverloads constructor(
         binding.vpMonthPage.registerOnPageChangeCallback(onPageChange)
 
         setupDefaultCalendarSet()
-        calendarList.forEachIndexed { index, calendarSet ->
-            if (calendarSet.startDate.monthValue == today.monthValue) {
-                binding.vpMonthPage.setCurrentItem(Int.MAX_VALUE / 2 + index, false)
-                return@forEachIndexed
-            }
-        }
 
         // xml에서 넘어온 attribute 값 적용
         val attr = context.obtainStyledAttributes(attrs, R.styleable.MonthCalendarView)
@@ -100,19 +94,23 @@ class MonthCalendarView @JvmOverloads constructor(
         }
     }
 
-    private fun initAttribute() {
-
-    }
-
     fun setCalendarSetList(calendarList: List<CalendarSet>) {
         this.calendarList = calendarList
         pageAdapter.setItems(calendarList, false)
+        binding.tvMonthCalendarViewCurrentMonth.text = calendarList.first().name
     }
 
     fun setupDefaultCalendarSet() {
         calendarList = CalendarSet.generateCalendarOfYear(context, today.year)
         pageAdapter.setItems(calendarList, true)
-        binding.vpMonthPage.setCurrentItem(Int.MAX_VALUE / 2, false)
+
+        calendarList.forEachIndexed { index, calendarSet -> //오늘 날짜로 이동
+            if (calendarSet.startDate.monthValue == today.monthValue) {
+                binding.tvMonthCalendarViewCurrentMonth.text = calendarSet.name
+                binding.vpMonthPage.setCurrentItem(Int.MAX_VALUE / 2 + index, false)
+                return@forEachIndexed
+            }
+        }
     }
 
     fun setOnDayClickListener(onDayClickListener: OnDayClickListener) {
diff --git a/library/src/main/java/com/drunkenboys/ckscalendar/month/MonthCellFactory.kt b/library/src/main/java/com/drunkenboys/ckscalendar/month/MonthCellFactory.kt
@@ -23,11 +23,19 @@ class MonthCellFactory {
                     }
 
                     // add Start Dates
-                    dates.addAll(makeDates(item.startDate, month))
+                    if (startMonth == endMonth) {
+                        dates.addAll(makeDates(item.startDate.dayOfMonth, item.endDate.dayOfMonth, month, item.startDate.year))
+                    } else {
+                        dates.addAll(makeDates(item.startDate.dayOfMonth, item.startDate.lengthOfMonth(), month, item.startDate.year))
+                    }
+                }
+                endMonth -> {
+                    dates.addAll(makeDates(1, item.endDate.dayOfMonth, month, item.endDate.year))
                 }
                 else -> {
                     // add Normal Dates
-                    dates.addAll(makeDates(item.endDate, month))
+                    val monthDate = LocalDate.of(item.endDate.year, month, 1)
+                    dates.addAll(makeDates(1, monthDate.lengthOfMonth(), month, monthDate.year))
                 }
             }
         }
@@ -44,10 +52,9 @@ class MonthCellFactory {
         return dates
     }
 
-    private fun makeDates(selectedDate: LocalDate, month: Int): List<CalendarDate> {
-        val monthDate = LocalDate.of(selectedDate.year, month, 1)
-        return (1..monthDate.lengthOfMonth()).map { day ->
-            val date = LocalDate.of(selectedDate.year, month, day)
+    private fun makeDates(startDay: Int, endDay: Int, month: Int, year: Int): List<CalendarDate> {
+        return (startDay..endDay).map { day ->
+            val date = LocalDate.of(year, month, day)
             val dayType = TimeUtils.parseDayWeekToDayType(date.dayOfWeek)
             CalendarDate(date, dayType)
         }
@@ -59,7 +66,7 @@ class MonthCellFactory {
         }
     }
 
-    companion object{
+    companion object {
 
         private const val WEEK_SIZE = 7
         private const val CALENDAR_FULL_SIZE = 42

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.`
`94`	`94`	`// TODO: 2021-11-11 테마 설정 화면으로 이동`
`95`	`95`	`val action = MainCalendarFragmentDirections.toThemeFragment()`
`96`	`96`	`navController.navigate(action)`
	`97`	`+ binding.layoutDrawer.closeDrawer(GravityCompat.START)`
`97`	`98`	`true`
`98`	`99`	`}`
`99`	`100`	`}`
`@@ -119,7 +120,13 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.`
`119`	`120`
`120`	`121`	`private fun collectCalendarSet() {`
`121`	`122`	`stateCollect(mainCalendarViewModel.calendarSetList) { calendarSetList ->`
`122`		`- binding.calendarMonth.setCalendarSetList(calendarSetList)`
	`123`	`+ if (calendarSetList.isEmpty()) return@stateCollect`
	`124`	`+`
	`125`	`+ if (calendarSetList.firstOrNull()?.id == 1) { // CalendarSet 기본캘린더 ID에 대한 Unique 값이 필요함`
	`126`	`+ binding.calendarMonth.setupDefaultCalendarSet()`
	`127`	`+ } else {`
	`128`	`+ binding.calendarMonth.setCalendarSetList(calendarSetList)`
	`129`	`+ }`
`123`	`130`	`}`
`124`	`131`	`}`
`125`	`132`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ android {`
`12`	`12`	`minSdk 21`
`13`	`13`	`targetSdk 31`
`14`	`14`	`versionCode 1`
`15`		`- versionName "0.0.1"`
	`15`	`+ versionName "0.0.3"`
`16`	`16`
`17`	`17`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`18`	`18`	`consumerProguardFiles "consumer-rules.pro"`
`@@ -90,7 +90,7 @@ afterEvaluate {`
`90`	`90`	`from components.release`
`91`	`91`	`groupId = 'com.github.boostcampwm-2021'`
`92`	`92`	`artifactId = 'android01-CalendaRun'`
`93`		`- version = '0.0.1'`
	`93`	`+ version = '0.0.3'`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,19 @@ class MonthCellFactory {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`// add Start Dates`
`26`		`- dates.addAll(makeDates(item.startDate, month))`
	`26`	`+ if (startMonth == endMonth) {`
	`27`	`+ dates.addAll(makeDates(item.startDate.dayOfMonth, item.endDate.dayOfMonth, month, item.startDate.year))`
	`28`	`+ } else {`
	`29`	`+ dates.addAll(makeDates(item.startDate.dayOfMonth, item.startDate.lengthOfMonth(), month, item.startDate.year))`
	`30`	`+ }`
	`31`	`+ }`
	`32`	`+ endMonth -> {`
	`33`	`+ dates.addAll(makeDates(1, item.endDate.dayOfMonth, month, item.endDate.year))`
`27`	`34`	`}`
`28`	`35`	`else -> {`
`29`	`36`	`// add Normal Dates`
`30`		`- dates.addAll(makeDates(item.endDate, month))`
	`37`	`+ val monthDate = LocalDate.of(item.endDate.year, month, 1)`
	`38`	`+ dates.addAll(makeDates(1, monthDate.lengthOfMonth(), month, monthDate.year))`
`31`	`39`	`}`
`32`	`40`	`}`
`33`	`41`	`}`
`@@ -44,10 +52,9 @@ class MonthCellFactory {`
`44`	`52`	`return dates`
`45`	`53`	`}`
`46`	`54`
`47`		`- private fun makeDates(selectedDate: LocalDate, month: Int): List<CalendarDate> {`
`48`		`- val monthDate = LocalDate.of(selectedDate.year, month, 1)`
`49`		`- return (1..monthDate.lengthOfMonth()).map { day ->`
`50`		`- val date = LocalDate.of(selectedDate.year, month, day)`
	`55`	`+ private fun makeDates(startDay: Int, endDay: Int, month: Int, year: Int): List<CalendarDate> {`
	`56`	`+ return (startDay..endDay).map { day ->`
	`57`	`+ val date = LocalDate.of(year, month, day)`
`51`	`58`	`val dayType = TimeUtils.parseDayWeekToDayType(date.dayOfWeek)`
`52`	`59`	`CalendarDate(date, dayType)`
`53`	`60`	`}`
`@@ -59,7 +66,7 @@ class MonthCellFactory {`
`59`	`66`	`}`
`60`	`67`	`}`
`61`	`68`
`62`		`- companion object{`
	`69`	`+ companion object {`
`63`	`70`
`64`	`71`	`private const val WEEK_SIZE = 7`
`65`	`72`	`private const val CALENDAR_FULL_SIZE = 42`