Merge pull request #5 from andrewjapar/bug/fix_mismatch_date_shown

Implement showDayOfWeekTitle feature and fix major bugs

- Fix mismatch day with date in calendarPicker
- Fix wrong calculation in calendarPicker
- Support disable day of week title

README.md

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.andrewjapar.rangedatepicker:rangedatepicker:0.2.1'
+    implementation 'com.andrewjapar.rangedatepicker:rangedatepicker:0.2.2'
 }
 ```
 
@@ -36,10 +36,11 @@ val startDate = Calendar.getInstance(TimeZone.getDefault(), Locale.getDefault())
 val endDate = Calendar.getInstance(TimeZone.getDefault(), Locale.getDefault())
 endDate.add(Calendar.MONTH, 6) // Add 6 months ahead from current date
 
-calendar_view.apply {
+calendar_view.modify {
   setMode(SelectionMode.RANGE) // You can set it via XML
   setRangeDate(startDate.time, endDate.time)
   setSelectionDate(startDate.time, endDate.time)
+  showDayOfWeekTitle(false) // If you want to disable day of the week title, just make it false
 }
 ```
 ### 3. Don't forget to set the listener to get range selection date

app/src/main/java/com/andrewjapar/sample/MainActivity.kt

@@ -12,7 +12,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         val firstCalendarDate = Calendar.getInstance()
-        firstCalendarDate.add(Calendar.MONTH, 0)
+        firstCalendarDate.set(2019, 9, 1)
 
         val secondCalendarDate = Calendar.getInstance()
         secondCalendarDate.time = firstCalendarDate.time
@@ -22,17 +22,17 @@ class MainActivity : AppCompatActivity() {
         thirdCalendarDate.time = firstCalendarDate.time
         thirdCalendarDate.add(Calendar.MONTH, 2)
 
-        calendar_view.setOnRangeSelectedListener { startDate, endDate, startLabel, endLabel ->
-            departure_date.text = startLabel
-            return_date.text = endLabel
-        }
+        calendar_view.modify {
+            setOnRangeSelectedListener { startDate, endDate, startLabel, endLabel ->
+                departure_date.text = startLabel
+                return_date.text = endLabel
+            }
 
-        calendar_view.setOnStartSelectedListener { startDate, label ->
-            departure_date.text = label
-            return_date.text = "-"
-        }
+            setOnStartSelectedListener { startDate, label ->
+                departure_date.text = label
+                return_date.text = "-"
+            }
 
-        calendar_view.apply {
             setRangeDate(firstCalendarDate.time, secondCalendarDate.time)
             setSelectionDate(firstCalendarDate.time, thirdCalendarDate.time)
         }

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

@@ -73,7 +73,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/shadow_overlay"
-        app:picker_type="range" />
+        app:pickerType="range" />
 
     <View
         android:id="@+id/shadow_overlay"

rangedatepicker/build.gradle

@@ -47,7 +47,7 @@ tasks.withType(Javadoc) {
 }
 
 group = 'com.andrewjapar.rangedatepicker'
-version = '0.2.0'
+version = '0.2.2'
 
 ext {
     bintrayRepo = 'Android'

rangedatepicker/src/main/java/com/andrewjapar/rangedatepicker/CalendarPicker.kt

@@ -38,6 +38,7 @@ class CalendarPicker : RecyclerView {
     private var mStartDateSelection: SelectedDate? = null
     private var mEndDateSelection: SelectedDate? = null
     private var mPickerSelectionType = SelectionMode.RANGE
+    private var mShowDayOfWeekTitle = true
 
     private var mOnStartSelectedListener: (startDate: Date, label: String) -> Unit = { _, _ -> }
     private var mOnRangeSelectedListener: (startDate: Date, endDate: Date, startLabel: String, endLabel: String) -> Unit =
@@ -70,14 +71,22 @@ class CalendarPicker : RecyclerView {
         initListener()
     }
 
+    fun modify(func: CalendarPicker.() -> Unit): CalendarPicker {
+        this.func()
+        this.refreshData()
+
+        return this
+    }
+
     fun setRangeDate(startDate: Date, endDate: Date) {
         require(startDate.time <= endDate.time) { "startDate can't be higher than endDate" }
 
-        startCalendar.time = startDate
-        endCalendar.time = endDate
+        startCalendar.withTime(startDate)
+        endCalendar.withTime(endDate)
+    }
 
-        mCalendarData = buildCalendarData()
-        calendarAdapter.setData(mCalendarData)
+    fun showDayOfWeekTitle(show: Boolean) {
+        mShowDayOfWeekTitle = show
     }
 
     fun setSelectionDate(startDate: Date, endDate: Date? = null) {
@@ -126,21 +135,27 @@ class CalendarPicker : RecyclerView {
             }
         }
         adapter = calendarAdapter
+        refreshData()
+    }
+
+    private fun refreshData() {
         mCalendarData = buildCalendarData()
         calendarAdapter.setData(mCalendarData)
     }
 
     private fun extractAttributes(attrs: AttributeSet) {
         val typedArray = context.obtainStyledAttributes(attrs, R.styleable.CalendarPicker)
         mPickerSelectionType =
-            SelectionMode.values()[typedArray.getInt(R.styleable.CalendarPicker_picker_type, 0)]
+            SelectionMode.values()[typedArray.getInt(R.styleable.CalendarPicker_pickerType, 0)]
+        mShowDayOfWeekTitle =
+            typedArray.getBoolean(R.styleable.CalendarPicker_showDayOfWeekTitle, true)
         typedArray.recycle()
     }
 
     private fun buildCalendarData(): MutableList<CalendarEntity> {
         val calendarData = mutableListOf<CalendarEntity>()
         val cal = getInstance(timeZone, locale)
-        cal.time = startCalendar.time
+        cal.withTime(startCalendar.time)
 
         val monthDifference = endCalendar.totalMonthDifference(startCalendar)
 
@@ -159,9 +174,9 @@ class CalendarPicker : RecyclerView {
                     DateState.WEEKDAY
                 }
                 when (day) {
-                    cal.firstDayOfWeek -> {
+                    1 -> {
                         calendarData.add(CalendarEntity.Month(cal.toPrettyMonthString()))
-                        calendarData.add(CalendarEntity.Week)
+                        if (mShowDayOfWeekTitle) calendarData.add(CalendarEntity.Week)
                         calendarData.addAll(createStartEmptyView(dayOfWeek))
                         calendarData.add(
                             CalendarEntity.Day(
@@ -213,7 +228,7 @@ class CalendarPicker : RecyclerView {
         }
 
         val listEmpty = mutableListOf<CalendarEntity.Empty>()
-        repeat((0..numberOfEmptyView).count()) { listEmpty.add(CalendarEntity.Empty) }
+        repeat((0 until numberOfEmptyView).count()) { listEmpty.add(CalendarEntity.Empty) }
         return listEmpty
     }
 
@@ -229,7 +244,7 @@ class CalendarPicker : RecyclerView {
         }
 
         val listEmpty = mutableListOf<CalendarEntity.Empty>()
-        repeat((0..numberOfEmptyView).count()) { listEmpty.add(CalendarEntity.Empty) }
+        repeat((0 until numberOfEmptyView).count()) { listEmpty.add(CalendarEntity.Empty) }
         return listEmpty
     }
 
@@ -324,6 +339,15 @@ class CalendarPicker : RecyclerView {
         )
     }
 
+    private fun Calendar.withTime(date: Date) {
+        clear()
+        time = date
+        set(HOUR_OF_DAY, 0)
+        set(MINUTE, 0)
+        set(SECOND, 0)
+        set(MILLISECOND, 0)
+    }
+
     internal data class SelectedDate(val day: CalendarEntity.Day, val position: Int)
 
     enum class SelectionMode { SINGLE, RANGE }

rangedatepicker/src/main/res/values/attrs.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="CalendarPicker">
-        <attr name="picker_type" format="enum">
+        <attr name="pickerType" format="enum">
             <enum name="single" value="0" />
             <enum name="range" value="1" />
         </attr>
+        <attr name="showDayOfWeekTitle" format="boolean" />
     </declare-styleable>
 </resources>