Merge pull request #49 from aminography/auto_select_end_day

Add feature of selecting end day automatically.
aminography · Feb 25, 2021 · 7abb7ef · 7abb7ef · AminFeizi · Apr 1, 2021
2 parents f7ba94f + af01a53
commit 7abb7ef
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ repositories {
 }
   
 dependencies {
-    implementation 'com.aminography:primedatepicker:3.3.2'
+    implementation 'com.aminography:primedatepicker:3.4.0'
     implementation 'com.aminography:primecalendar:1.3.2'
 }
 ```
@@ -232,11 +232,11 @@ There are several builder functions applying relevant configurations on the date
   </tr>
 
   <tr>
-    <td><b>• initiallyPickedStartDay(startDay: PrimeCalendar, pickEndDay: Boolean)</b></td>
+    <td><b>• autoSelectPickEndDay(autoSelect: Boolean)</b></td>
     <td>RangeDays</td>
   </tr>
   <tr>
-    <td colspan="2"><i>Specifies initially picked start day when the date picker has just shown.</i></td>
+    <td colspan="2"><i>Specifies automatic selection of picking end day when the start day gets picked.</i></td>
   </tr>
 
   <tr>

diff --git a/build.gradle b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     def versionMajor = 3 // X
-    def versionMinor = 3 // Y
-    def versionPatch = 2 // Z
+    def versionMinor = 4 // Y
+    def versionPatch = 0 // Z
 
     ext.version_code = versionMajor * 10000 + versionMinor * 100 + versionPatch
     ext.version_name = "${versionMajor}.${versionMinor}.${versionPatch}"

diff --git a/library/src/main/java/com/aminography/primedatepicker/picker/PrimeDatePickerImpl.kt b/library/src/main/java/com/aminography/primedatepicker/picker/PrimeDatePickerImpl.kt
@@ -74,6 +74,7 @@ internal class PrimeDatePickerImpl(
     private var gotoView: BaseLazyView? = null
     private var direction: Direction = Direction.LTR
     private var typeface: Typeface? = null
+    private var autoSelectPickEndDay: Boolean = true
     private lateinit var themeFactory: ThemeFactory
 
     internal fun onCreate(context: Context, coroutineScope: CoroutineScope) {
@@ -94,6 +95,10 @@ internal class PrimeDatePickerImpl(
             initialDateCalendar.firstDayOfWeek = it
         }
 
+        arguments?.getBoolean("autoSelectPickEndDay", true)?.let {
+            autoSelectPickEndDay = it
+        }
+
         arguments?.getString("pickType")?.let { internalPickType = PickType.valueOf(it) }
         arguments?.getBoolean("initiallyPickEndDay")?.takeIf { it }?.let {
             internalPickType = PickType.RANGE_END
@@ -330,9 +335,14 @@ internal class PrimeDatePickerImpl(
                 (selectionBarView as SingleDaySelectionBarView).pickedDay = singleDay
             }
             PickType.RANGE_START, PickType.RANGE_END -> {
-                (selectionBarView as RangeDaysSelectionBarView).run {
-                    pickedRangeStartDay = startDay
-                    pickedRangeEndDay = endDay
+                (selectionBarView as RangeDaysSelectionBarView).let {
+                    it.pickedRangeStartDay = startDay
+                    it.pickedRangeEndDay = endDay
+
+                    if (autoSelectPickEndDay && pickType == PickType.RANGE_START && endDay == null) {
+                        it.animateBackground(false)
+                        it.onRangeEndClickListener?.invoke()
+                    }
                 }
             }
             PickType.MULTIPLE -> {

diff --git a/...y/src/main/java/com/aminography/primedatepicker/picker/builder/RangeDaysRequestBuilder.kt b/...y/src/main/java/com/aminography/primedatepicker/picker/builder/RangeDaysRequestBuilder.kt
@@ -46,6 +46,18 @@ class RangeDaysRequestBuilder<T : PrimeDatePicker> internal constructor(
         return this
     }
 
+    /**
+     * Specifies automatic selection of picking end day when the start day gets picked.
+     *
+     * @param autoSelect enables automatic selection if `true`, disables otherwise.
+     *
+     * @return current instance of [RangeDaysRequestBuilder].
+     */
+    fun autoSelectPickEndDay(autoSelect: Boolean): RangeDaysRequestBuilder<T> {
+        bundle.putBoolean("autoSelectPickEndDay", autoSelect)
+        return this
+    }
+
 //    /**
 //     * Specifies minimum length of range that can be picked.
 //     *

diff --git a/.../java/com/aminography/primedatepicker/picker/selection/range/RangeDaysSelectionBarView.kt b/.../java/com/aminography/primedatepicker/picker/selection/range/RangeDaysSelectionBarView.kt
@@ -106,7 +106,7 @@ internal class RangeDaysSelectionBarView(
             }
         }
 
-    private fun animateBackground(isStart: Boolean, duration: Long = 300) {
+    internal fun animateBackground(isStart: Boolean, duration: Long = 300) {
         rootView.backImageView.post {
             ObjectAnimator.ofFloat(
                 rootView.backImageView,
@@ -122,5 +122,4 @@ internal class RangeDaysSelectionBarView(
             }
         }
     }
-
 }