From b1dba8531d5f8fcf8dc0047cf0bda5334728df9b Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 20 Jan 2022 21:52:48 +0100
Subject: [PATCH 01/22] Some gradle upgrade to be able to build

---
 build.gradle                             | 5 +++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 library/build.gradle                     | 1 -
 sample/build.gradle                      | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0cd64bc..4597bb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 593b82c..79f07f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 4516d89..5cd0a4e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.jfrog.bintray'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/sample/build.gradle b/sample/build.gradle
index c0c48ee..a872a21 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
 
     defaultConfig {
         applicationId "com.leavjenn.smoothdaterangepicker"

From 82d3b6c63a1d9eb54abad27341a138ab59241e72 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 20 Jan 2022 21:58:30 +0100
Subject: [PATCH 02/22] Fix ThemeDark on Landscape : White numbers on white
 background on calendar part

https://github.com/leavjenn/SmoothDateRangePicker/issues/20
---
 .../date/SmoothDateRangePickerFragment.java              | 1 +
 .../smoothdaterangepickerexample/MainActivity.java       | 5 +++++
 sample/src/main/res/layout/activity_main.xml             | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 3d6ed5a..0611212 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -396,6 +396,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         }
 
         mAnimator = (AccessibleDateAnimator) view.findViewById(R.id.animator);
+        mAnimator.setBackgroundColor(activity.getResources().getColor(bgColorResource));
 
         mAnimator.addView(mDayPickerView);
         mAnimator.addView(mYearPickerView);
diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
index 30ae77b..8bdcd6e 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
@@ -6,6 +6,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.DatePicker;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment;
@@ -22,6 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         tvDateRange = (TextView) findViewById(R.id.tv_date_range);
         tvDate = (TextView) findViewById(R.id.tv_date);
+
         Button btnDateRange = (Button) findViewById(R.id.btn_date_range_picker);
         btnDateRange.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -41,6 +43,9 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                                         tvDateRange.setText(date);
                                     }
                                 });
+
+                boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
+                smoothDateRangePickerFragment.setThemeDark(isThemeDark);
                 smoothDateRangePickerFragment.show(getFragmentManager(), "Datepickerdialog");
             }
         });
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 63e7fea..ed93c52 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -5,6 +5,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <Switch
+        android:id="@+id/switch_dark_theme"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="Dark theme"
+        android:checked="false"
+        />
+
     <Button
         android:id="@+id/btn_date_range_picker"
         android:layout_width="wrap_content"

From 0ed33dc5e7ecf9e0da54b9fbde9182c2907a077a Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 20 Jan 2022 22:01:31 +0100
Subject: [PATCH 03/22] Fix On little screens, depending on language/month,
 date can be badly displayed

https://github.com/leavjenn/SmoothDateRangePicker/issues/22
---
 library/src/main/res/values/dimens.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index f4f3a87..267aae2 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -26,8 +26,8 @@
     <dimen name="mdtp_picker_dimen">280dip</dimen>
     <dimen name="mdtp_time_picker_height">280dip</dimen>
 
-    <dimen name="mdtp_date_picker_component_width">270dp</dimen>
-    <dimen name="mdtp_date_picker_component_width_half">129dp</dimen>
+    <dimen name="mdtp_date_picker_component_width">280dp</dimen>
+    <dimen name="mdtp_date_picker_component_width_half">134dp</dimen>
     <dimen name="mdtp_date_picker_header_height">30dp</dimen>
     <dimen name="mdtp_selected_calendar_layout_height">155dp</dimen>
     <dimen name="mdtp_selected_date_height">190dp</dimen>

From bd7807172552550567cc9f0038068bbbf36ce1b4 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 20 Jan 2022 22:06:48 +0100
Subject: [PATCH 04/22] Permits to hide duration

---
 .../date/SmoothDateRangePickerFragment.java   | 69 +++++++++-------
 .../MainActivity.java                         | 79 ++++++++++++-------
 sample/src/main/res/layout/activity_main.xml  |  9 +++
 3 files changed, 99 insertions(+), 58 deletions(-)

diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 0611212..724f062 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -74,7 +74,6 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
     private static final String KEY_SELECTED_MONTH_END = "selected_month_end";
     private static final String KEY_SELECTED_DAY = "selected_day";
     private static final String KEY_SELECTED_DAY_END = "selected_day_end";
-    private static final String KEY_DURATION_DAYS = "duration_days";
     private static final String KEY_LIST_POSITION = "list_position";
     private static final String KEY_LIST_POSITION_END = "list_position_end";
     private static final String KEY_WEEK_START = "week_start";
@@ -92,6 +91,7 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
     private static final String KEY_ACCENT = "accent";
     private static final String KEY_VIBRATE = "vibrate";
     private static final String KEY_DISMISS = "dismiss";
+    private static final String KEY_SHOW_DURATION = "show_duration";
 
     private static final int DEFAULT_START_YEAR = 1900;
     private static final int DEFAULT_END_YEAR = 2100;
@@ -159,6 +159,8 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
 
     private boolean mDelayAnimation = true;
 
+    private boolean mShowDuration = true;
+
     // Accessibility strings.
     private String mDayPickerDescription;
     private String mSelectDay;
@@ -182,8 +184,9 @@ public interface OnDateRangeSetListener {
          *                         with {@link Calendar}.
          * @param dayEnd    The end day of the month that was set.
          */
-        void onDateRangeSet(SmoothDateRangePickerFragment view, int yearStart, int monthStart,
-                            int dayStart, int yearEnd, int monthEnd, int dayEnd);
+        void onDateRangeSet(SmoothDateRangePickerFragment view,
+                            int yearStart, int monthStart, int dayStart,
+                            int yearEnd, int monthEnd, int dayEnd);
     }
 
     /**
@@ -292,6 +295,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putInt(KEY_ACCENT, mAccentColor);
         outState.putBoolean(KEY_VIBRATE, mVibrate);
         outState.putBoolean(KEY_DISMISS, mDismissOnPause);
+        outState.putBoolean(KEY_SHOW_DURATION, mShowDuration);
     }
 
     @Override
@@ -299,6 +303,33 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         Log.d(TAG, "onCreateView: ");
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+
+        int listPosition = -1;
+        int listPositionOffset = 0;
+        int listPositionEnd = -1;
+        int listPositionOffsetEnd = 0;
+        int currentView = MONTH_AND_DAY_VIEW;
+        if (savedInstanceState != null) {
+            mWeekStart = savedInstanceState.getInt(KEY_WEEK_START);
+            mMinYear = savedInstanceState.getInt(KEY_YEAR_START);
+            mMaxYear = savedInstanceState.getInt(KEY_YEAR_END);
+            currentView = savedInstanceState.getInt(KEY_CURRENT_VIEW);
+            listPosition = savedInstanceState.getInt(KEY_LIST_POSITION);
+            listPositionOffset = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET);
+            listPositionEnd = savedInstanceState.getInt(KEY_LIST_POSITION_END);
+            listPositionOffsetEnd = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET_END);
+            mMinDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE);
+            mMaxDate = (Calendar) savedInstanceState.getSerializable(KEY_MAX_DATE);
+            mMinSelectableDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE_SELECTABLE);
+            highlightedDays = (Calendar[]) savedInstanceState.getSerializable(KEY_HIGHLIGHTED_DAYS);
+            selectableDays = (Calendar[]) savedInstanceState.getSerializable(KEY_SELECTABLE_DAYS);
+            mThemeDark = savedInstanceState.getBoolean(KEY_THEME_DARK);
+            mAccentColor = savedInstanceState.getInt(KEY_ACCENT);
+            mVibrate = savedInstanceState.getBoolean(KEY_VIBRATE);
+            mDismissOnPause = savedInstanceState.getBoolean(KEY_DISMISS);
+            mShowDuration = savedInstanceState.getBoolean(KEY_SHOW_DURATION);
+        }
+
         View view = inflater.inflate(R.layout.sdrp_dialog, container);
 
         mDayOfWeekView = (TextView) view.findViewById(R.id.date_picker_header);
@@ -320,6 +351,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mYearViewEnd.setOnClickListener(this);
 
         mDurationView = (LinearLayout) view.findViewById(R.id.date_picker_duration_layout);
+        if(!mShowDuration) {
+            mDurationView.setVisibility(View.GONE);
+        }
         mDurationView.setOnClickListener(this);
         mDurationTextView = (TextView) view.findViewById(R.id.date_picker_duration_days);
         mDurationEditText = (EditText) view.findViewById(R.id.date_picker_duration_days_et);
@@ -339,31 +373,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         viewList.add(YEAR_VIEW_END, mYearViewEnd);
         viewList.add(DURATION_VIEW, mDurationView);
 
-        int listPosition = -1;
-        int listPositionOffset = 0;
-        int listPositionEnd = -1;
-        int listPositionOffsetEnd = 0;
-        int currentView = MONTH_AND_DAY_VIEW;
-        if (savedInstanceState != null) {
-            mWeekStart = savedInstanceState.getInt(KEY_WEEK_START);
-            mMinYear = savedInstanceState.getInt(KEY_YEAR_START);
-            mMaxYear = savedInstanceState.getInt(KEY_YEAR_END);
-            currentView = savedInstanceState.getInt(KEY_CURRENT_VIEW);
-            listPosition = savedInstanceState.getInt(KEY_LIST_POSITION);
-            listPositionOffset = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET);
-            listPositionEnd = savedInstanceState.getInt(KEY_LIST_POSITION_END);
-            listPositionOffsetEnd = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET_END);
-            mMinDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE);
-            mMaxDate = (Calendar) savedInstanceState.getSerializable(KEY_MAX_DATE);
-            mMinSelectableDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE_SELECTABLE);
-            highlightedDays = (Calendar[]) savedInstanceState.getSerializable(KEY_HIGHLIGHTED_DAYS);
-            selectableDays = (Calendar[]) savedInstanceState.getSerializable(KEY_SELECTABLE_DAYS);
-            mThemeDark = savedInstanceState.getBoolean(KEY_THEME_DARK);
-            mAccentColor = savedInstanceState.getInt(KEY_ACCENT);
-            mVibrate = savedInstanceState.getBoolean(KEY_VIBRATE);
-            mDismissOnPause = savedInstanceState.getBoolean(KEY_DISMISS);
-        }
-
         final Activity activity = getActivity();
         mDayPickerView = new SimpleDayPickerView(activity, this);
         mYearPickerView = new YearPickerView(activity, this);
@@ -782,6 +791,10 @@ public void setMaxDate(Calendar calendar) {
         }
     }
 
+    public void setShowDuration(boolean showDuration) {
+        this.mShowDuration = showDuration;
+    }
+
     /**
      * @return The maximal date supported by this DatePicker. Null if it has not been set.
      */
diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
index 8bdcd6e..57cee02 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
@@ -15,54 +15,73 @@
 
 
 public class MainActivity extends AppCompatActivity {
-    private TextView tvDateRange, tvDate;
-
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        tvDateRange = (TextView) findViewById(R.id.tv_date_range);
-        tvDate = (TextView) findViewById(R.id.tv_date);
+        onCreateDateRange();
+        onCreateDate();
+    }
 
-        Button btnDateRange = (Button) findViewById(R.id.btn_date_range_picker);
-        btnDateRange.setOnClickListener(new View.OnClickListener() {
+    protected void onCreateDateRange()
+    {
+        final TextView tvDateRange = (TextView) findViewById(R.id.tv_date_range);
+        final Button btnDateRange = (Button) findViewById(R.id.btn_date_range_picker);
+        btnDateRange.setOnClickListener(new View.OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v)
+            {
                 SmoothDateRangePickerFragment smoothDateRangePickerFragment =
-                        SmoothDateRangePickerFragment
-                                .newInstance(new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
-                                    @Override
-                                    public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                                               int yearStart, int monthStart,
-                                                               int dayStart, int yearEnd,
-                                                               int monthEnd, int dayEnd) {
-                                        String date = "You picked the following date range: \n"
-                                                + "From " + dayStart + "/" + (++monthStart)
-                                                + "/" + yearStart + " To " + dayEnd + "/"
-                                                + (++monthEnd) + "/" + yearEnd;
-                                        tvDateRange.setText(date);
-                                    }
-                                });
+                    SmoothDateRangePickerFragment
+                        .newInstance(new SmoothDateRangePickerFragment.OnDateRangeSetListener()
+                        {
+                            @Override
+                            public void onDateRangeSet(SmoothDateRangePickerFragment view,
+                                                       int yearStart, int monthStart,
+                                                       int dayStart, int yearEnd,
+                                                       int monthEnd, int dayEnd)
+                            {
+                                String date = "You picked the following date range: \n"
+                                        + "From " + dayStart + "/" + (++monthStart)
+                                        + "/" + yearStart + " To " + dayEnd + "/"
+                                        + (++monthEnd) + "/" + yearEnd;
+                                tvDateRange.setText(date);
+                            }
+                        });
 
                 boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
                 smoothDateRangePickerFragment.setThemeDark(isThemeDark);
+
+                boolean showDuration = ((Switch) findViewById(R.id.switch_show_duration)).isChecked();
+                smoothDateRangePickerFragment.setShowDuration(showDuration);
+
                 smoothDateRangePickerFragment.show(getFragmentManager(), "Datepickerdialog");
             }
         });
+    }
 
-        Button btnDate = (Button) findViewById(R.id.btn_date_picker);
-        btnDate.setOnClickListener(new View.OnClickListener() {
+    protected void onCreateDate()
+    {
+        final TextView tvDate = (TextView) findViewById(R.id.tv_date);
+        final Button btnDate = (Button) findViewById(R.id.btn_date_picker);
+        btnDate.setOnClickListener(new View.OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v)
+            {
                 final Calendar c = Calendar.getInstance();
-                int year = c.get(Calendar.YEAR);
-                int month = c.get(Calendar.MONTH);
-                int day = c.get(Calendar.DAY_OF_MONTH);
+                final int year = c.get(Calendar.YEAR);
+                final int month = c.get(Calendar.MONTH);
+                final int day = c.get(Calendar.DAY_OF_MONTH);
 
                 DatePickerDialog datePickerDialog = new DatePickerDialog(MainActivity.this,
-                        new android.app.DatePickerDialog.OnDateSetListener() {
+                        new android.app.DatePickerDialog.OnDateSetListener()
+                        {
                             @Override
-                            public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
+                            public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth)
+                            {
                                 tvDate.setText("You picked the following date: \n"
                                         + (year + "/" + monthOfYear + "/" + dayOfMonth));
                             }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index ed93c52..db7c2be 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -5,6 +5,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <Switch
+        android:id="@+id/switch_show_duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="Shows duration"
+        android:checked="false"
+        />
+
     <Switch
         android:id="@+id/switch_dark_theme"
         android:layout_width="wrap_content"

From 1ba0387feb197dad513c52ab935d2b6134d59668 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:02:07 +0100
Subject: [PATCH 05/22] Fix onDateRangeSet never called after screen rotation

https://github.com/leavjenn/SmoothDateRangePicker/issues/21
---
 .../MainActivity.java                         | 46 ++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
index 57cee02..7b3ee02 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
@@ -1,6 +1,7 @@
 package com.leavjenn.smoothdaterangepickerexample;
 
 import android.app.DatePickerDialog;
+import android.app.Fragment;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -26,7 +27,8 @@ protected void onCreate(Bundle savedInstanceState)
 
     protected void onCreateDateRange()
     {
-        final TextView tvDateRange = (TextView) findViewById(R.id.tv_date_range);
+        final String pickerFragmentTag = "Datepickerdialog";
+
         final Button btnDateRange = (Button) findViewById(R.id.btn_date_range_picker);
         btnDateRange.setOnClickListener(new View.OnClickListener()
         {
@@ -43,11 +45,10 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                                                        int dayStart, int yearEnd,
                                                        int monthEnd, int dayEnd)
                             {
-                                String date = "You picked the following date range: \n"
-                                        + "From " + dayStart + "/" + (++monthStart)
-                                        + "/" + yearStart + " To " + dayEnd + "/"
-                                        + (++monthEnd) + "/" + yearEnd;
-                                tvDateRange.setText(date);
+                                onActivityDateRangeSet(view,
+                                                       yearStart, monthStart,
+                                                       dayStart, yearEnd,
+                                                       monthEnd, dayEnd);
                             }
                         });
 
@@ -57,9 +58,40 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                 boolean showDuration = ((Switch) findViewById(R.id.switch_show_duration)).isChecked();
                 smoothDateRangePickerFragment.setShowDuration(showDuration);
 
-                smoothDateRangePickerFragment.show(getFragmentManager(), "Datepickerdialog");
+                smoothDateRangePickerFragment.show(getFragmentManager(), pickerFragmentTag);
             }
         });
+
+        Fragment fragment = getFragmentManager().findFragmentByTag(pickerFragmentTag);
+        if (fragment != null) {
+            // Means that activity and picker have been re-created (following screen rotation)
+            // So picker has loose its listener, so must set it again
+            SmoothDateRangePickerFragment pickerFragment = (SmoothDateRangePickerFragment)fragment;
+            pickerFragment.setOnDateSetListener(new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
+                @Override
+                public void onDateRangeSet(SmoothDateRangePickerFragment view,
+                                           int yearStart, int monthStart, int dayStart,
+                                           int yearEnd, int monthEnd, int dayEnd)
+                {
+                    onActivityDateRangeSet(view,
+                                           yearStart, monthStart, dayStart,
+                                           yearEnd, monthEnd, dayEnd);
+                }
+            });
+        }
+    }
+
+    protected void onActivityDateRangeSet(SmoothDateRangePickerFragment view,
+                                  int yearStart, int monthStart,
+                                  int dayStart, int yearEnd,
+                                  int monthEnd, int dayEnd)
+    {
+        final TextView tvDateRange = (TextView) findViewById(R.id.tv_date_range);
+        String date = "You picked the following date range: \n"
+                + "From " + dayStart + "/" + (++monthStart)
+                + "/" + yearStart + " To " + dayEnd + "/"
+                + (++monthEnd) + "/" + yearEnd;
+        tvDateRange.setText(date);
     }
 
     protected void onCreateDate()

From fe5f8b7e5cc4bb2e60ccdb28678af67a508da007 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:10:31 +0100
Subject: [PATCH 06/22] Sample sets date min and max on Date range picker

---
 .../smoothdaterangepickerexample/MainActivity.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
index 7b3ee02..43ffddb 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
@@ -52,6 +52,15 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                             }
                         });
 
+                final Calendar cMin = Calendar.getInstance();
+                cMin.set(1999, 0, 1);
+                smoothDateRangePickerFragment.setMinDate(cMin);  // 1999/01/01
+
+                final Calendar cMax = Calendar.getInstance();
+                cMax.set(Calendar.MONTH, 11);
+                cMax.set(Calendar.DAY_OF_MONTH, 31);
+                smoothDateRangePickerFragment.setMaxDate(cMax);  // last day of current year
+
                 boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
                 smoothDateRangePickerFragment.setThemeDark(isThemeDark);
 

From 8da7bdae3e697d627e13303ac4d59c2a59d16ca8 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:17:12 +0100
Subject: [PATCH 07/22] Some upgrades proposed by AndroidStudio

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4597bb7..6aa5572 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 7239df1a01f5b8f7969fc74f6c69f212ca677346 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:20:05 +0100
Subject: [PATCH 08/22] Move to sdk 31

---
 library/build.gradle | 4 ++--
 sample/build.gradle  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 5cd0a4e..6196794 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 31
         versionCode 2
         versionName "0.2.0"
     }
diff --git a/sample/build.gradle b/sample/build.gradle
index a872a21..2b62f99 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.leavjenn.smoothdaterangepicker"
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

From c9d1ff4e2c417a3f8654c54e3172cd5c6d439112 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:22:31 +0100
Subject: [PATCH 09/22] Remove compile ... deprecated keywords

---
 library/build.gradle | 2 +-
 sample/build.gradle  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 6196794..d4882a4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    api 'com.android.support:appcompat-v7:23.1.0'
 }
 
 task generateSourcesJar(type: Jar) {
diff --git a/sample/build.gradle b/sample/build.gradle
index 2b62f99..7bc1cd6 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile project (":library")
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
+    implementation project (":library")
+    implementation 'com.android.support:appcompat-v7:23.1.0'
 }

From abfc7b5cd69f8e1a7bb1ccc1a0b2e7cf22c9ab01 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:30:45 +0100
Subject: [PATCH 10/22] Upgrade gradle

---
 build.gradle                             | 5 +++--
 gradle/wrapper/gradle-wrapper.properties | 6 +++---
 sample/src/main/AndroidManifest.xml      | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6aa5572..2eadab4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
@@ -17,6 +17,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 79f07f0..dfb622c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Oct 18 14:27:15 CST 2015
+#Sat Jan 22 16:26:13 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 4bbb5c6..b7e1bae 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-        <activity android:name=".MainActivity" >
+        <activity android:name=".MainActivity"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

From 86ad5755f1862ac46f5d543b3625befc1f965c42 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:35:21 +0100
Subject: [PATCH 11/22] Migrate to AndroidX

---
 gradle.properties                                         | 4 +++-
 library/build.gradle                                      | 2 +-
 .../leavjenn/smoothdaterangepicker/TypefaceHelper.java    | 2 +-
 .../smoothdaterangepicker/date/DayPickerView.java         | 2 +-
 .../leavjenn/smoothdaterangepicker/date/MonthView.java    | 8 ++++----
 .../date/SmoothDateRangePickerFragment.java               | 2 +-
 .../date/TextViewWithCircularIndicator.java               | 2 +-
 sample/build.gradle                                       | 2 +-
 .../smoothdaterangepickerexample/MainActivity.java        | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index d4882a4..b669dcc 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:appcompat-v7:23.1.0'
+    api 'androidx.appcompat:appcompat:1.0.0'
 }
 
 task generateSourcesJar(type: Jar) {
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java
index 7e54317..c9ab6df 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java
@@ -3,7 +3,7 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
 
 /*
     Each call to Typeface.createFromAsset will load a new instance of the typeface into memory,
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java
index 0558116..15f7b9f 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java
@@ -21,7 +21,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java
index 0c44f47..5fa8032 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java
@@ -25,10 +25,10 @@
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 724f062..a6af8fe 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -23,7 +23,7 @@
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.InputType;
 import android.text.format.DateUtils;
 import android.util.Log;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
index 47df9a4..ee1a6f0 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
@@ -24,7 +24,7 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
diff --git a/sample/build.gradle b/sample/build.gradle
index 7bc1cd6..eceaae5 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -22,5 +22,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
     implementation project (":library")
-    implementation 'com.android.support:appcompat-v7:23.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }
diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
index 43ffddb..0a8f510 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
@@ -3,7 +3,7 @@
 import android.app.DatePickerDialog;
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.DatePicker;

From e3577c9d72f9e34713907b7f3f93b918ea1aa58b Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:37:19 +0100
Subject: [PATCH 12/22] Upgrade some components

---
 library/build.gradle | 2 +-
 sample/build.gradle  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index b669dcc..e5bcbfd 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.appcompat:appcompat:1.4.1'
 }
 
 task generateSourcesJar(type: Jar) {
diff --git a/sample/build.gradle b/sample/build.gradle
index eceaae5..67f2058 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     implementation project (":library")
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
 }

From 03f073512615b09ceec7d03098956852b98b6751 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 22 Jan 2022 16:53:05 +0100
Subject: [PATCH 13/22] Begin date and End date factorization

---
 .../date/SmoothDateRangePickerFragment.java   | 503 +++++++++---------
 .../src/main/res/layout-land/sdrp_dialog.xml  |   4 +-
 .../res/layout-sw600dp-land/sdrp_dialog.xml   |   4 +-
 .../main/res/layout-sw600dp/sdrp_dialog.xml   |   4 +-
 library/src/main/res/layout/sdrp_dialog.xml   |   4 +-
 .../main/res/layout/sdrp_header_view_end.xml  |  28 -
 .../res/layout/sdrp_selected_date_end.xml     |  96 ----
 .../res/layout/sdrp_view_animator_end.xml     |  23 -
 8 files changed, 262 insertions(+), 404 deletions(-)
 delete mode 100644 library/src/main/res/layout/sdrp_header_view_end.xml
 delete mode 100644 library/src/main/res/layout/sdrp_selected_date_end.xml
 delete mode 100644 library/src/main/res/layout/sdrp_view_animator_end.xml

diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index a6af8fe..ec42b4f 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -61,6 +61,167 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
 
     private static final String TAG = "SmoothDateRangePickerFragment";
 
+    static class DateData implements OnClickListener
+    {
+        public DateData(SmoothDateRangePickerFragment fragment,
+                        String bundleKeyPrefix,
+                        int yearViewIndex,
+                        int monthAndDayViewIndex)
+        {
+            mFragment = fragment;
+            mBundleKeyPrefix = bundleKeyPrefix;
+            mYearViewIndex = yearViewIndex;
+            mMonthAndDayViewIndex = monthAndDayViewIndex;
+        }
+
+        @Override
+        public void onClick(View view) {
+            int i = view.getId();
+            if (i == R.id.date_picker_year) {
+                mFragment.setCurrentView(mYearViewIndex);
+            }
+            else if (i == R.id.date_picker_month_and_day)
+            {
+                mFragment.setCurrentView(mMonthAndDayViewIndex);
+            }
+        }
+
+        public void onCreate(Bundle savedInstanceState) {
+            if (savedInstanceState != null) {
+                mCalendar.set(Calendar.YEAR, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_YEAR));
+                mCalendar.set(Calendar.MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_MONTH));
+                mCalendar.set(Calendar.DAY_OF_MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_DAY));
+            }
+        }
+
+        public void onSaveInstanceState(@NonNull Bundle outState)
+        {
+            outState.putInt(mBundleKeyPrefix+KEY_SELECTED_YEAR, mCalendar.get(Calendar.YEAR));
+            outState.putInt(mBundleKeyPrefix+KEY_SELECTED_MONTH, mCalendar.get(Calendar.MONTH));
+            outState.putInt(mBundleKeyPrefix+KEY_SELECTED_DAY, mCalendar.get(Calendar.DAY_OF_MONTH));
+
+            int listPosition = -1;
+            if (mFragment.mCurrentView == MONTH_AND_DAY_VIEW) {
+                listPosition = mDayPickerView.getMostVisiblePosition();
+            } else if (mFragment.mCurrentView == YEAR_VIEW) {
+                listPosition = mYearPickerView.getFirstVisiblePosition();
+                outState.putInt(mBundleKeyPrefix+KEY_LIST_POSITION_OFFSET, mYearPickerView.getFirstPositionOffset());
+            }
+            outState.putInt(mBundleKeyPrefix+KEY_LIST_POSITION, listPosition);
+        }
+
+        public void onCreateView(ViewGroup view)
+        {
+            mMainView = view;
+
+            mDayOfWeekView = (TextView) view.findViewById(R.id.date_picker_header);
+            mMonthAndDayView = (LinearLayout) view.findViewById(R.id.date_picker_month_and_day);
+            mMonthAndDayView.setOnClickListener(this);
+
+            mSelectedMonthTextView = (TextView) view.findViewById(R.id.date_picker_month);
+            mSelectedDayTextView = (TextView) view.findViewById(R.id.date_picker_day);
+
+            mYearView = (TextView) view.findViewById(R.id.date_picker_year);
+            mYearView.setOnClickListener(this);
+
+            final Activity activity = mFragment.getActivity();
+            mDayPickerView = new SimpleDayPickerView(activity, mFragment);
+            mYearPickerView = new YearPickerView(activity, mFragment);
+        }
+
+        public void onCreateViewSetListPosition(Bundle savedInstanceState)
+        {
+            if (savedInstanceState == null) {
+                return;
+            }
+
+            final int currentView = mFragment.mCurrentView;
+            final int listPosition = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION);
+            final int listPositionOffset = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION_OFFSET);
+
+            if (currentView == mMonthAndDayViewIndex) {
+                mDayPickerView.postSetSelection(listPosition);
+            } else if (currentView == mYearViewIndex) {
+                mYearPickerView.postSetSelectionFromTop(listPosition, listPositionOffset);
+            }
+        }
+
+        public void addViews(AccessibleDateAnimator animator) {
+            animator.addView(mDayPickerView);
+            animator.addView(mYearPickerView);
+        }
+
+        public void setAccentColor(int mAccentColor) {
+            if (mAccentColor == -1)
+            {
+                return;
+            }
+            if (mDayOfWeekView != null)
+                mDayOfWeekView.setBackgroundColor(mAccentColor);
+
+            mMainView.setBackgroundColor(mAccentColor);
+            mYearPickerView.setAccentColor(mAccentColor);
+            mDayPickerView.setAccentColor(mAccentColor);
+        }
+
+        private void updateDisplay() {
+            if (mDayOfWeekView != null) {
+                mDayOfWeekView.setText(mCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG,
+                        Locale.getDefault()).toUpperCase(Locale.getDefault()));
+            }
+
+            mSelectedMonthTextView.setText(mCalendar.getDisplayName(Calendar.MONTH, Calendar.SHORT,
+                    Locale.getDefault()).toUpperCase(Locale.getDefault()));
+            mSelectedDayTextView.setText(DAY_FORMAT.format(mCalendar.getTime()));
+            mYearView.setText(YEAR_FORMAT.format(mCalendar.getTime()));
+
+            // Accessibility.
+            long millis = mCalendar.getTimeInMillis();
+            int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR;
+            String monthAndDayText = DateUtils.formatDateTime(mFragment.getActivity(), millis, flags);
+            mMonthAndDayView.setContentDescription(monthAndDayText);
+        }
+
+        public void onChange() {
+            if (mDayPickerView != null) {
+                mDayPickerView.onChange();
+            }
+        }
+
+        public void onYearSelected(int year) {
+            mFragment.adjustDayInMonthIfNeeded(mCalendar);
+            mCalendar.set(Calendar.YEAR, year);
+
+            //make sure date is always after min date and before max date
+            if (mFragment.getMinDate() != null && mCalendar.before(mFragment.getMinDate())) {
+                mCalendar.setTime(mFragment.getMinDate().getTime());
+            } else if (mFragment.getMaxDate() != null && mCalendar.after(mFragment.getMaxDate())) {
+                mCalendar.setTime(mFragment.getMaxDate().getTime());
+            }
+        }
+
+        SmoothDateRangePickerFragment mFragment;
+        View mMainView;
+        String mBundleKeyPrefix;
+        int mYearViewIndex;
+        int mMonthAndDayViewIndex;
+
+        Calendar mCalendar = Calendar.getInstance();
+        TextView mDayOfWeekView;
+        LinearLayout mMonthAndDayView;
+        TextView mSelectedMonthTextView;
+        TextView mSelectedDayTextView;
+        TextView mYearView;
+        private DayPickerView mDayPickerView;
+        private YearPickerView mYearPickerView;
+
+        private static final String KEY_SELECTED_YEAR = "selected_year";
+        private static final String KEY_SELECTED_MONTH = "selected_month";
+        private static final String KEY_SELECTED_DAY = "selected_day";
+        private static final String KEY_LIST_POSITION = "list_position";
+        private static final String KEY_LIST_POSITION_OFFSET = "list_position_offset";
+    };
+
     private static final int UNINITIALIZED = -1;
     private static final int MONTH_AND_DAY_VIEW = 0;
     private static final int YEAR_VIEW = 1;
@@ -68,20 +229,10 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
     private static final int YEAR_VIEW_END = 3;
     private static final int DURATION_VIEW = 4;
 
-    private static final String KEY_SELECTED_YEAR = "selected_year";
-    private static final String KEY_SELECTED_YEAR_END = "selected_year_end";
-    private static final String KEY_SELECTED_MONTH = "selected_month";
-    private static final String KEY_SELECTED_MONTH_END = "selected_month_end";
-    private static final String KEY_SELECTED_DAY = "selected_day";
-    private static final String KEY_SELECTED_DAY_END = "selected_day_end";
-    private static final String KEY_LIST_POSITION = "list_position";
-    private static final String KEY_LIST_POSITION_END = "list_position_end";
     private static final String KEY_WEEK_START = "week_start";
     private static final String KEY_YEAR_START = "year_start";
     private static final String KEY_YEAR_END = "year_end";
     private static final String KEY_CURRENT_VIEW = "current_view";
-    private static final String KEY_LIST_POSITION_OFFSET = "list_position_offset";
-    private static final String KEY_LIST_POSITION_OFFSET_END = "list_position_offset_end";
     private static final String KEY_MIN_DATE = "min_date";
     private static final String KEY_MIN_DATE_SELECTABLE = "min_date_end";
     private static final String KEY_MAX_DATE = "max_date";
@@ -102,8 +253,6 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
     private static SimpleDateFormat YEAR_FORMAT = new SimpleDateFormat("yyyy", Locale.getDefault());
     private static SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("dd", Locale.getDefault());
 
-    private Calendar mCalendar = Calendar.getInstance();
-    private Calendar mCalendarEnd = Calendar.getInstance();
     private OnDateRangeSetListener mCallBack;
     private HashSet<OnDateChangedListener> mListeners = new HashSet<>();
     private DialogInterface.OnCancelListener mOnCancelListener;
@@ -111,21 +260,8 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
 
     private AccessibleDateAnimator mAnimator;
 
-    private TextView mDayOfWeekView;
-    private LinearLayout mMonthAndDayView;
-    private TextView mSelectedMonthTextView;
-    private TextView mSelectedDayTextView;
-    private TextView mYearView;
-    private DayPickerView mDayPickerView;
-    private YearPickerView mYearPickerView;
-
-    private TextView mDayOfWeekViewEnd;
-    private LinearLayout mMonthAndDayViewEnd;
-    private TextView mSelectedMonthTextViewEnd;
-    private TextView mSelectedDayTextViewEnd;
-    private TextView mYearViewEnd;
-    private SimpleDayPickerView mDayPickerViewEnd;
-    private YearPickerView mYearPickerViewEnd;
+    private DateData mDateStart = new DateData(this, "date_start_", YEAR_VIEW, MONTH_AND_DAY_VIEW);
+    private DateData mDateEnd = new DateData(this, "date_end_", YEAR_VIEW_END, MONTH_AND_DAY_VIEW_END);
 
     private List<View> viewList;
 
@@ -139,7 +275,7 @@ public class SmoothDateRangePickerFragment extends DialogFragment implements OnC
 
     private int mCurrentView = UNINITIALIZED;
 
-    private int mWeekStart = mCalendar.getFirstDayOfWeek();
+    private int mWeekStart = mDateStart.mCalendar.getFirstDayOfWeek();
     private int mMinYear = DEFAULT_START_YEAR;
     private int mMaxYear = DEFAULT_END_YEAR;
     private Calendar mMinDate;
@@ -228,12 +364,12 @@ public static SmoothDateRangePickerFragment newInstance(OnDateRangeSetListener c
 
     public void initialize(OnDateRangeSetListener callBack, int year, int monthOfYear, int dayOfMonth) {
         mCallBack = callBack;
-        mCalendar.set(Calendar.YEAR, year);
-        mCalendar.set(Calendar.MONTH, monthOfYear);
-        mCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-        mCalendarEnd.set(Calendar.YEAR, year);
-        mCalendarEnd.set(Calendar.MONTH, monthOfYear);
-        mCalendarEnd.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+        mDateStart.mCalendar.set(Calendar.YEAR, year);
+        mDateStart.mCalendar.set(Calendar.MONTH, monthOfYear);
+        mDateStart.mCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+        mDateEnd.mCalendar.set(Calendar.YEAR, year);
+        mDateEnd.mCalendar.set(Calendar.MONTH, monthOfYear);
+        mDateEnd.mCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
 
         mThemeDark = false;
         mAccentColor = -1;
@@ -247,45 +383,20 @@ public void onCreate(Bundle savedInstanceState) {
         final Activity activity = getActivity();
         activity.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-        if (savedInstanceState != null) {
-            mCalendar.set(Calendar.YEAR, savedInstanceState.getInt(KEY_SELECTED_YEAR));
-            mCalendar.set(Calendar.MONTH, savedInstanceState.getInt(KEY_SELECTED_MONTH));
-            mCalendar.set(Calendar.DAY_OF_MONTH, savedInstanceState.getInt(KEY_SELECTED_DAY));
-            mCalendarEnd.set(Calendar.YEAR, savedInstanceState.getInt(KEY_SELECTED_YEAR_END));
-            mCalendarEnd.set(Calendar.MONTH, savedInstanceState.getInt(KEY_SELECTED_MONTH_END));
-            mCalendarEnd.set(Calendar.DAY_OF_MONTH, savedInstanceState.getInt(KEY_SELECTED_DAY_END));
-        }
+        mDateStart.onCreate(savedInstanceState);
+        mDateEnd.onCreate(savedInstanceState);
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(KEY_SELECTED_YEAR, mCalendar.get(Calendar.YEAR));
-        outState.putInt(KEY_SELECTED_MONTH, mCalendar.get(Calendar.MONTH));
-        outState.putInt(KEY_SELECTED_DAY, mCalendar.get(Calendar.DAY_OF_MONTH));
-        outState.putInt(KEY_SELECTED_YEAR_END, mCalendarEnd.get(Calendar.YEAR));
-        outState.putInt(KEY_SELECTED_MONTH_END, mCalendarEnd.get(Calendar.MONTH));
-        outState.putInt(KEY_SELECTED_DAY_END, mCalendarEnd.get(Calendar.DAY_OF_MONTH));
+        mDateStart.onSaveInstanceState(outState);
+        mDateEnd.onSaveInstanceState(outState);
         outState.putInt(KEY_YEAR_START, mMinYear);
         outState.putInt(KEY_YEAR_END, mMaxYear);
 
         outState.putInt(KEY_WEEK_START, mWeekStart);
         outState.putInt(KEY_CURRENT_VIEW, mCurrentView);
-        int listPosition = -1;
-        int listPositionEnd = -1;
-        if (mCurrentView == MONTH_AND_DAY_VIEW) {
-            listPosition = mDayPickerView.getMostVisiblePosition();
-        } else if (mCurrentView == YEAR_VIEW) {
-            listPosition = mYearPickerView.getFirstVisiblePosition();
-            outState.putInt(KEY_LIST_POSITION_OFFSET, mYearPickerView.getFirstPositionOffset());
-        } else if (mCurrentView == MONTH_AND_DAY_VIEW_END) {
-            listPositionEnd = mDayPickerViewEnd.getMostVisiblePosition();
-        } else if (mCurrentView == YEAR_VIEW_END) {
-            listPositionEnd = mYearPickerViewEnd.getFirstVisiblePosition();
-            outState.putInt(KEY_LIST_POSITION_OFFSET_END, mYearPickerViewEnd.getFirstPositionOffset());
-        }
-        outState.putInt(KEY_LIST_POSITION, listPosition);
-        outState.putInt(KEY_LIST_POSITION_END, listPositionEnd);
         outState.putSerializable(KEY_MIN_DATE, mMinDate);
         outState.putSerializable(KEY_MAX_DATE, mMaxDate);
         outState.putSerializable(KEY_MIN_DATE_SELECTABLE, mMinSelectableDate);
@@ -304,20 +415,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Log.d(TAG, "onCreateView: ");
         getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
 
-        int listPosition = -1;
-        int listPositionOffset = 0;
-        int listPositionEnd = -1;
-        int listPositionOffsetEnd = 0;
         int currentView = MONTH_AND_DAY_VIEW;
         if (savedInstanceState != null) {
             mWeekStart = savedInstanceState.getInt(KEY_WEEK_START);
             mMinYear = savedInstanceState.getInt(KEY_YEAR_START);
             mMaxYear = savedInstanceState.getInt(KEY_YEAR_END);
             currentView = savedInstanceState.getInt(KEY_CURRENT_VIEW);
-            listPosition = savedInstanceState.getInt(KEY_LIST_POSITION);
-            listPositionOffset = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET);
-            listPositionEnd = savedInstanceState.getInt(KEY_LIST_POSITION_END);
-            listPositionOffsetEnd = savedInstanceState.getInt(KEY_LIST_POSITION_OFFSET_END);
             mMinDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE);
             mMaxDate = (Calendar) savedInstanceState.getSerializable(KEY_MAX_DATE);
             mMinSelectableDate = (Calendar) savedInstanceState.getSerializable(KEY_MIN_DATE_SELECTABLE);
@@ -332,23 +435,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         View view = inflater.inflate(R.layout.sdrp_dialog, container);
 
-        mDayOfWeekView = (TextView) view.findViewById(R.id.date_picker_header);
-        mDayOfWeekViewEnd = (TextView) view.findViewById(R.id.date_picker_header_end);
-        mMonthAndDayView = (LinearLayout) view.findViewById(R.id.date_picker_month_and_day);
-        mMonthAndDayViewEnd = (LinearLayout) view.findViewById(R.id.date_picker_month_and_day_end);
-        mMonthAndDayView.setOnClickListener(this);
-        mMonthAndDayViewEnd.setOnClickListener(this);
-
-        mSelectedMonthTextView = (TextView) view.findViewById(R.id.date_picker_month);
-        mSelectedMonthTextViewEnd = (TextView) view.findViewById(R.id.date_picker_month_end);
-
-        mSelectedDayTextView = (TextView) view.findViewById(R.id.date_picker_day);
-        mSelectedDayTextViewEnd = (TextView) view.findViewById(R.id.date_picker_day_end);
-
-        mYearView = (TextView) view.findViewById(R.id.date_picker_year);
-        mYearViewEnd = (TextView) view.findViewById(R.id.date_picker_year_end);
-        mYearView.setOnClickListener(this);
-        mYearViewEnd.setOnClickListener(this);
+        mDateStart.onCreateView(view.findViewById(R.id.sdrp_selected_date_start));
+        mDateEnd.onCreateView(view.findViewById(R.id.sdrp_selected_date_end));
 
         mDurationView = (LinearLayout) view.findViewById(R.id.date_picker_duration_layout);
         if(!mShowDuration) {
@@ -367,17 +455,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mDurationArrowEnd.setOnClickListener(this);
 
         viewList = new ArrayList<>();
-        viewList.add(MONTH_AND_DAY_VIEW, mMonthAndDayView);
-        viewList.add(YEAR_VIEW, mYearView);
-        viewList.add(MONTH_AND_DAY_VIEW_END, mMonthAndDayViewEnd);
-        viewList.add(YEAR_VIEW_END, mYearViewEnd);
+        viewList.add(MONTH_AND_DAY_VIEW, mDateStart.mMonthAndDayView);
+        viewList.add(YEAR_VIEW, mDateStart.mYearView);
+        viewList.add(MONTH_AND_DAY_VIEW_END, mDateEnd.mMonthAndDayView);
+        viewList.add(YEAR_VIEW_END, mDateEnd.mYearView);
         viewList.add(DURATION_VIEW, mDurationView);
 
         final Activity activity = getActivity();
-        mDayPickerView = new SimpleDayPickerView(activity, this);
-        mYearPickerView = new YearPickerView(activity, this);
-        mDayPickerViewEnd = new SimpleDayPickerView(activity, this);
-        mYearPickerViewEnd = new YearPickerView(activity, this);
         mNumberPadView = new NumberPadView(activity, this);
 
 
@@ -396,23 +480,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                     .getColor(R.color.date_picker_selector_unselected_dark_theme));
             Utils.setMultiTextColorList(activity.getResources()
                             .getColorStateList(R.color.sdrp_selector_dark),
-                    mDayOfWeekView, mDayOfWeekViewEnd,
-                    mSelectedMonthTextView, mSelectedMonthTextViewEnd,
-                    mSelectedDayTextView, mSelectedDayTextViewEnd,
-                    mYearView, mYearViewEnd, mDurationTextView,
+                    mDateStart.mDayOfWeekView, mDateEnd.mDayOfWeekView,
+                    mDateStart.mSelectedMonthTextView, mDateEnd.mSelectedMonthTextView,
+                    mDateStart.mSelectedDayTextView, mDateEnd.mSelectedDayTextView,
+                    mDateStart.mYearView, mDateEnd.mYearView, mDurationTextView,
                     mDurationDayTextView, mDurationArrow, mDurationArrowEnd,
                     mDurationEditText, (TextView) view.findViewById(R.id.tv_duration));
         }
 
-        mAnimator = (AccessibleDateAnimator) view.findViewById(R.id.animator);
+        mAnimator = view.findViewById(R.id.animator);
         mAnimator.setBackgroundColor(activity.getResources().getColor(bgColorResource));
 
-        mAnimator.addView(mDayPickerView);
-        mAnimator.addView(mYearPickerView);
-        mAnimator.addView(mDayPickerViewEnd);
-        mAnimator.addView(mYearPickerViewEnd);
+        mDateStart.addViews(mAnimator);
+        mDateEnd.addViews(mAnimator);
         mAnimator.addView(mNumberPadView);
-        mAnimator.setDateMillis(mCalendar.getTimeInMillis());
+        mAnimator.setDateMillis(mDateStart.mCalendar.getTimeInMillis());
         Animation animation = new AlphaAnimation(0.0f, 1.0f);
         animation.setDuration(ANIMATION_DURATION);
         mAnimator.setInAnimation(animation);
@@ -428,9 +510,9 @@ public void onClick(View v) {
                 tryVibrate();
                 if (mCallBack != null) {
                     mCallBack.onDateRangeSet(SmoothDateRangePickerFragment.this,
-                            mCalendar.get(Calendar.YEAR), mCalendar.get(Calendar.MONTH),
-                            mCalendar.get(Calendar.DAY_OF_MONTH), mCalendarEnd.get(Calendar.YEAR),
-                            mCalendarEnd.get(Calendar.MONTH), mCalendarEnd.get(Calendar.DAY_OF_MONTH));
+                            mDateStart.mCalendar.get(Calendar.YEAR), mDateStart.mCalendar.get(Calendar.MONTH),
+                            mDateStart.mCalendar.get(Calendar.DAY_OF_MONTH), mDateEnd.mCalendar.get(Calendar.YEAR),
+                            mDateEnd.mCalendar.get(Calendar.MONTH), mDateEnd.mCalendar.get(Calendar.DAY_OF_MONTH));
                 }
                 dismiss();
             }
@@ -456,43 +538,21 @@ public void onClick(View v) {
             }
         }
         if (mAccentColor != -1) {
-            if (mDayOfWeekView != null)
-                mDayOfWeekView.setBackgroundColor(mAccentColor);
-            if (mDayOfWeekViewEnd != null)
-                mDayOfWeekViewEnd.setBackgroundColor(mAccentColor);
-
             view.findViewById(R.id.layout_container).setBackgroundColor(mAccentColor);
-            view.findViewById(R.id.day_picker_selected_date_layout).setBackgroundColor(mAccentColor);
-            view.findViewById(R.id.day_picker_selected_date_layout_end).setBackgroundColor(mAccentColor);
             mDurationView.setBackgroundColor(mAccentColor);
             mDurationEditText.setHighlightColor(Utils.darkenColor(mAccentColor));
             mDurationEditText.getBackground().setColorFilter(Utils.darkenColor(mAccentColor), PorterDuff.Mode.SRC_ATOP);
             okButton.setTextColor(mAccentColor);
             cancelButton.setTextColor(mAccentColor);
-            mYearPickerView.setAccentColor(mAccentColor);
-            mDayPickerView.setAccentColor(mAccentColor);
-            mYearPickerViewEnd.setAccentColor(mAccentColor);
-            mDayPickerViewEnd.setAccentColor(mAccentColor);
+            mDateStart.setAccentColor(mAccentColor);
+            mDateEnd.setAccentColor(mAccentColor);
         }
 
         updateDisplay(false);
         setCurrentView(currentView);
 
-        if (listPosition != -1) {
-            if (currentView == MONTH_AND_DAY_VIEW) {
-                mDayPickerView.postSetSelection(listPosition);
-            } else if (currentView == YEAR_VIEW) {
-                mYearPickerView.postSetSelectionFromTop(listPosition, listPositionOffset);
-            }
-        }
-
-        if (listPositionEnd != -1) {
-            if (currentView == MONTH_AND_DAY_VIEW_END) {
-                mDayPickerViewEnd.postSetSelection(listPositionEnd);
-            } else if (currentView == YEAR_VIEW_END) {
-                mYearPickerViewEnd.postSetSelectionFromTop(listPositionEnd, listPositionOffsetEnd);
-            }
-        }
+        mDateStart.onCreateViewSetListPosition(savedInstanceState);
+        mDateEnd.onCreateViewSetListPosition(savedInstanceState);
 
         mHapticFeedbackController = new HapticFeedbackController(activity);
 
@@ -525,8 +585,8 @@ public void onDismiss(DialogInterface dialog) {
     }
 
     private void setCurrentView(final int viewIndex) {
-        long millis = mCalendar.getTimeInMillis();
-        long millisEnd = mCalendarEnd.getTimeInMillis();
+        long millis = mDateStart.mCalendar.getTimeInMillis();
+        long millisEnd = mDateEnd.mCalendar.getTimeInMillis();
 
         if (viewIndex != DURATION_VIEW) {
             if (mCurrentView != viewIndex) {
@@ -542,7 +602,7 @@ private void setCurrentView(final int viewIndex) {
         switch (viewIndex) {
             case MONTH_AND_DAY_VIEW:
                 mMinSelectableDate = mMinDate;
-                mDayPickerView.onDateChanged();
+                mDateStart.mDayPickerView.onDateChanged();
 
                 int flags = DateUtils.FORMAT_SHOW_DATE;
                 String dayString = DateUtils.formatDateTime(getActivity(), millis, flags);
@@ -550,8 +610,8 @@ private void setCurrentView(final int viewIndex) {
                 Utils.tryAccessibilityAnnounce(mAnimator, mSelectDay);
                 break;
             case MONTH_AND_DAY_VIEW_END:
-                mMinSelectableDate = mCalendar;
-                mDayPickerViewEnd.onDateChanged();
+                mMinSelectableDate = mDateStart.mCalendar;
+                mDateEnd.mDayPickerView.onDateChanged();
 
                 flags = DateUtils.FORMAT_SHOW_DATE;
                 String dayStringEnd = DateUtils.formatDateTime(getActivity(), millisEnd, flags);
@@ -560,17 +620,17 @@ private void setCurrentView(final int viewIndex) {
                 break;
             case YEAR_VIEW:
                 mMinSelectableDate = mMinDate;
-                mYearPickerView.onDateChanged();
-                mYearPickerView.refreshYearAdapter();
+                mDateStart.mYearPickerView.onDateChanged();
+                mDateStart.mYearPickerView.refreshYearAdapter();
 
                 CharSequence yearString = YEAR_FORMAT.format(millis);
                 mAnimator.setContentDescription(mYearPickerDescription + ": " + yearString);
                 Utils.tryAccessibilityAnnounce(mAnimator, mSelectYear);
                 break;
             case YEAR_VIEW_END:
-                mMinSelectableDate = mCalendar;
-                mYearPickerViewEnd.onDateChanged();
-                mYearPickerViewEnd.refreshYearAdapter();
+                mMinSelectableDate = mDateStart.mCalendar;
+                mDateEnd.mYearPickerView.onDateChanged();
+                mDateEnd.mYearPickerView.refreshYearAdapter();
 
                 CharSequence yearStringEnd = YEAR_FORMAT.format(millisEnd);
                 mAnimator.setContentDescription(mYearPickerDescription + ": " + yearStringEnd);
@@ -579,12 +639,12 @@ private void setCurrentView(final int viewIndex) {
             case DURATION_VIEW:
                 if (mCurrentView == YEAR_VIEW || mCurrentView == MONTH_AND_DAY_VIEW
                         || mDurationArrow.getVisibility() == View.VISIBLE) {
-                    setViewSelected(mMonthAndDayView, mYearView, mDurationView);
+                    setViewSelected(mDateStart.mMonthAndDayView, mDateStart.mYearView, mDurationView);
                     mDurationArrow.setVisibility(View.GONE);
                     mDurationArrowEnd.setVisibility(View.VISIBLE);
                 } else if (mCurrentView == YEAR_VIEW_END || mCurrentView == MONTH_AND_DAY_VIEW_END
                         || mDurationArrowEnd.getVisibility() == View.VISIBLE) {
-                    setViewSelected(mMonthAndDayViewEnd, mYearViewEnd, mDurationView);
+                    setViewSelected(mDateEnd.mMonthAndDayView, mDateEnd.mYearView, mDurationView);
                     mDurationArrow.setVisibility(View.VISIBLE);
                     mDurationArrowEnd.setVisibility(View.GONE);
                 }
@@ -592,7 +652,7 @@ private void setCurrentView(final int viewIndex) {
                 mDurationTextView.setVisibility(View.GONE);
                 mDurationEditText.setVisibility(View.VISIBLE);
                 mDurationEditText.requestFocus();
-                mDurationEditText.setText(String.valueOf(Utils.daysBetween(mCalendar, mCalendarEnd)));
+                mDurationEditText.setText(String.valueOf(Utils.daysBetween(mDateStart.mCalendar, mDateEnd.mCalendar)));
                 mDurationEditText.selectAll();
                 //TODO Accessibility
                 break;
@@ -601,10 +661,10 @@ private void setCurrentView(final int viewIndex) {
     }
 
     private void setViewSelected(View... views) {
-        mMonthAndDayView.setSelected(false);
-        mMonthAndDayViewEnd.setSelected(false);
-        mYearView.setSelected(false);
-        mYearViewEnd.setSelected(false);
+        mDateStart.mMonthAndDayView.setSelected(false);
+        mDateEnd.mMonthAndDayView.setSelected(false);
+        mDateStart.mYearView.setSelected(false);
+        mDateEnd.mYearView.setSelected(false);
         mDurationView.setSelected(false);
         for (View view : views) {
             view.setSelected(true);
@@ -620,37 +680,19 @@ private void setViewSelected(View... views) {
     }
 
     private void updateDisplay(boolean announce) {
-        if (mDayOfWeekView != null && mDayOfWeekViewEnd != null) {
-            mDayOfWeekView.setText(mCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG,
-                    Locale.getDefault()).toUpperCase(Locale.getDefault()));
-            mDayOfWeekViewEnd.setText(mCalendarEnd.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG,
-                    Locale.getDefault()).toUpperCase(Locale.getDefault()));
-        }
+        mDateStart.updateDisplay();
+        mDateEnd.updateDisplay();
 
-        mSelectedMonthTextView.setText(mCalendar.getDisplayName(Calendar.MONTH, Calendar.SHORT,
-                Locale.getDefault()).toUpperCase(Locale.getDefault()));
-        mSelectedMonthTextViewEnd.setText(mCalendarEnd.getDisplayName(Calendar.MONTH, Calendar.SHORT,
-                Locale.getDefault()).toUpperCase(Locale.getDefault()));
-        mSelectedDayTextView.setText(DAY_FORMAT.format(mCalendar.getTime()));
-        mSelectedDayTextViewEnd.setText(DAY_FORMAT.format(mCalendarEnd.getTime()));
-        mYearView.setText(YEAR_FORMAT.format(mCalendar.getTime()));
-        mYearViewEnd.setText(YEAR_FORMAT.format(mCalendarEnd.getTime()));
-        mDuration = Utils.daysBetween(mCalendar, mCalendarEnd);
+        mDuration = Utils.daysBetween(mDateStart.mCalendar, mDateEnd.mCalendar);
         mDurationTextView.setText(String.valueOf(mDuration));
         mDurationDayTextView.setText(mDuration > 1 ? getString(R.string.days) : getString(R.string.day));
 
         // Accessibility.
-        long millis = mCalendar.getTimeInMillis();
-        long millisEnd = mCalendarEnd.getTimeInMillis();
+        long millis = mDateStart.mCalendar.getTimeInMillis();
         mAnimator.setDateMillis(millis);
-        int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR;
-        String monthAndDayText = DateUtils.formatDateTime(getActivity(), millis, flags);
-        String monthAndDayTextEnd = DateUtils.formatDateTime(getActivity(), millisEnd, flags);
-        mMonthAndDayView.setContentDescription(monthAndDayText);
-        mMonthAndDayViewEnd.setContentDescription(monthAndDayTextEnd);
 
         if (announce) {
-            flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR;
+            int flags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR;
             String fullDateText = DateUtils.formatDateTime(getActivity(), millis, flags);
 //            String fullDateTextEnd = DateUtils.formatDateTime(getActivity(), millisEnd, flags);
             Utils.tryAccessibilityAnnounce(mAnimator, fullDateText);
@@ -720,13 +762,8 @@ public void setFirstDayOfWeek(int startOfWeek, int startWeekEnd) {
         }
         mWeekStart = startOfWeek;
 
-        if (mDayPickerView != null) {
-            mDayPickerView.onChange();
-        }
-
-        if (mDayPickerViewEnd != null) {
-            mDayPickerViewEnd.onChange();
-        }
+        mDateStart.onChange();
+        mDateEnd.onChange();
     }
 
     @SuppressWarnings("unused")
@@ -737,10 +774,8 @@ public void setYearRange(int startYear, int endYear) {
 
         mMinYear = startYear;
         mMaxYear = endYear;
-        if (mDayPickerView != null && mDayPickerViewEnd != null) {
-            mDayPickerView.onChange();
-            mDayPickerViewEnd.onChange();
-        }
+        mDateStart.onChange();
+        mDateEnd.onChange();
     }
 
     /**
@@ -752,10 +787,8 @@ public void setYearRange(int startYear, int endYear) {
     @SuppressWarnings("unused")
     public void setMinDate(Calendar calendar) {
         mMinDate = calendar;
-        if (mDayPickerView != null && mDayPickerViewEnd != null) {
-            mDayPickerView.onChange();
-            mDayPickerViewEnd.onChange();
-        }
+        mDateStart.onChange();
+        mDateEnd.onChange();
     }
 
     /**
@@ -785,10 +818,8 @@ public Calendar getMinSelectableDate() {
     public void setMaxDate(Calendar calendar) {
         mMaxDate = calendar;
 
-        if (mDayPickerView != null && mDayPickerViewEnd != null) {
-            mDayPickerView.onChange();
-            mDayPickerViewEnd.onChange();
-        }
+        mDateStart.onChange();
+        mDateEnd.onChange();
     }
 
     public void setShowDuration(boolean showDuration) {
@@ -807,9 +838,9 @@ public Calendar getMaxDate() {
     // update highlight days
     private void updateHighlightDays() {
         List<Calendar> highlightList = new ArrayList<>();
-        for (int i = 0; i < Utils.daysBetween(mCalendar, mCalendarEnd) + 1; i++) {
+        for (int i = 0; i < Utils.daysBetween(mDateStart.mCalendar, mDateEnd.mCalendar) + 1; i++) {
             Calendar c = Calendar.getInstance();
-            c.setTime(mCalendar.getTime());
+            c.setTime(mDateStart.mCalendar.getTime());
             c.add(Calendar.DAY_OF_YEAR, i);
             highlightList.add(c);
         }
@@ -890,53 +921,27 @@ private void adjustDayInMonthIfNeeded(Calendar calendar) {
     public void onClick(View v) {
         tryVibrate();
         int i = v.getId();
-        if (i == R.id.date_picker_year) {
-            setCurrentView(YEAR_VIEW);
-
-        } else if (i == R.id.date_picker_year_end) {
-            setCurrentView(YEAR_VIEW_END);
-
-        } else if (i == R.id.date_picker_month_and_day) {
-            setCurrentView(MONTH_AND_DAY_VIEW);
-
-        } else if (i == R.id.date_picker_month_and_day_end) {
-            setCurrentView(MONTH_AND_DAY_VIEW_END);
-
-        } else if (i == R.id.date_picker_duration_layout || i == R.id.arrow_start || i == R.id.arrow_end) {
+        if (i == R.id.date_picker_duration_layout || i == R.id.arrow_start || i == R.id.arrow_end) {
             setCurrentView(DURATION_VIEW);
-
         }
     }
 
+
     @Override
     public void onYearSelected(int year) {
         updatePickers();
         if (mCurrentView == YEAR_VIEW) {
-            adjustDayInMonthIfNeeded(mCalendar);
-            mCalendar.set(Calendar.YEAR, year);
-            //make sure start date always after min date and before max date
-            if (getMinDate() != null && mCalendar.before(getMinDate())) {
-                mCalendar.setTime(getMinDate().getTime());
-            } else if (getMaxDate() != null && mCalendar.after(getMaxDate())) {
-                mCalendar.setTime(getMaxDate().getTime());
-            }
-            if (mCalendar.after(mCalendarEnd)) {
+            mDateStart.onYearSelected(year);
+            if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
                 //make sure end date always after start date
-                mCalendarEnd.setTime(mCalendar.getTime());
+                mDateEnd.mCalendar.setTime(mDateStart.mCalendar.getTime());
             }
             setCurrentView(MONTH_AND_DAY_VIEW);
         } else if (mCurrentView == YEAR_VIEW_END) {
-            adjustDayInMonthIfNeeded(mCalendarEnd);
-            mCalendarEnd.set(Calendar.YEAR, year);
-            //make sure end date always after min date and before max date
-            if (getMinDate() != null && mCalendarEnd.before(getMinDate())) {
-                mCalendarEnd.setTime(getMinDate().getTime());
-            } else if (getMaxDate() != null && mCalendarEnd.after(getMaxDate())) {
-                mCalendarEnd.setTime(getMaxDate().getTime());
-            }
-            if (mCalendar.after(mCalendarEnd)) {
+            mDateEnd.onYearSelected(year);
+            if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
                 //make sure end date always after start date
-                mCalendarEnd.setTime(mCalendar.getTime());
+                mDateStart.mCalendar.setTime(mDateEnd.mCalendar.getTime());
             }
             setCurrentView(MONTH_AND_DAY_VIEW_END);
         }
@@ -947,18 +952,18 @@ public void onYearSelected(int year) {
     @Override
     public void onDayOfMonthSelected(int year, int month, int day) {
         if (mCurrentView == MONTH_AND_DAY_VIEW) {
-            mCalendar.set(Calendar.YEAR, year);
-            mCalendar.set(Calendar.MONTH, month);
-            mCalendar.set(Calendar.DAY_OF_MONTH, day);
-            if (mCalendar.after(mCalendarEnd)) {
-                mCalendarEnd.setTime(mCalendar.getTime());
+            mDateStart.mCalendar.set(Calendar.YEAR, year);
+            mDateStart.mCalendar.set(Calendar.MONTH, month);
+            mDateStart.mCalendar.set(Calendar.DAY_OF_MONTH, day);
+            if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
+                mDateEnd.mCalendar.setTime(mDateStart.mCalendar.getTime());
             }
             // jump to end day selector
             setCurrentView(MONTH_AND_DAY_VIEW_END);
         } else if (mCurrentView == MONTH_AND_DAY_VIEW_END) {
-            mCalendarEnd.set(Calendar.YEAR, year);
-            mCalendarEnd.set(Calendar.MONTH, month);
-            mCalendarEnd.set(Calendar.DAY_OF_MONTH, day);
+            mDateEnd.mCalendar.set(Calendar.YEAR, year);
+            mDateEnd.mCalendar.set(Calendar.MONTH, month);
+            mDateEnd.mCalendar.set(Calendar.DAY_OF_MONTH, day);
         }
         updatePickers();
         updateHighlightDays();
@@ -971,12 +976,12 @@ public void onDurationChanged(int num) {
         if (num >= 0) {
             Calendar limitDay = Calendar.getInstance();
             int limitDuration;
-            if (mMonthAndDayView.isSelected()) {
+            if (mDateStart.mMonthAndDayView.isSelected()) {
                 limitDay.set(1900, 0, 1);
-                limitDuration = Utils.daysBetween(limitDay, mCalendarEnd) + 1;
+                limitDuration = Utils.daysBetween(limitDay, mDateEnd.mCalendar) + 1;
             } else {
                 limitDay.set(2100, 11, 31);
-                limitDuration = Utils.daysBetween(mCalendar, limitDay);
+                limitDuration = Utils.daysBetween(mDateStart.mCalendar, limitDay);
             }
             if (mDurationEditText.hasSelection()) {
                 mDuration = num;
@@ -990,12 +995,12 @@ public void onDurationChanged(int num) {
         }
         mDurationEditText.setText(String.valueOf(mDuration));
         mDurationEditText.setSelection(String.valueOf(mDuration).length());
-        if (mMonthAndDayView.isSelected()) {
-            mCalendar.setTime(mCalendarEnd.getTime());
-            mCalendar.add(Calendar.DATE, -mDuration);
+        if (mDateStart.mMonthAndDayView.isSelected()) {
+            mDateStart.mCalendar.setTime(mDateEnd.mCalendar.getTime());
+            mDateStart.mCalendar.add(Calendar.DATE, -mDuration);
         } else {
-            mCalendarEnd.setTime(mCalendar.getTime());
-            mCalendarEnd.add(Calendar.DATE, mDuration);
+            mDateEnd.mCalendar.setTime(mDateStart.mCalendar.getTime());
+            mDateEnd.mCalendar.add(Calendar.DATE, mDuration);
         }
 
         updateHighlightDays();
@@ -1008,10 +1013,10 @@ private void updatePickers() {
 
     @Override
     public MonthAdapter.CalendarDay getSelectedDay() {
-        if (mYearView.isSelected() || mMonthAndDayView.isSelected()) {
-            return new MonthAdapter.CalendarDay(mCalendar);
+        if (mDateStart.mYearView.isSelected() || mDateStart.mMonthAndDayView.isSelected()) {
+            return new MonthAdapter.CalendarDay(mDateStart.mCalendar);
         } else {
-            return new MonthAdapter.CalendarDay(mCalendarEnd);
+            return new MonthAdapter.CalendarDay(mDateEnd.mCalendar);
         }
     }
 
diff --git a/library/src/main/res/layout-land/sdrp_dialog.xml b/library/src/main/res/layout-land/sdrp_dialog.xml
index e1e89fe..ac1550f 100644
--- a/library/src/main/res/layout-land/sdrp_dialog.xml
+++ b/library/src/main/res/layout-land/sdrp_dialog.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <include layout="@layout/sdrp_selected_date" />
+                <include android:id="@+id/sdrp_selected_date_start" layout="@layout/sdrp_selected_date" />
 
                 <View
                     android:id="@+id/hyphen"
@@ -49,7 +49,7 @@
                     android:layout_gravity="center"
                     android:background="@color/mdtp_accent_color_focused" />
 
-                <include layout="@layout/sdrp_selected_date_end" />
+                <include android:id="@+id/sdrp_selected_date_end" layout="@layout/sdrp_selected_date" />
 
             </LinearLayout>
 
diff --git a/library/src/main/res/layout-sw600dp-land/sdrp_dialog.xml b/library/src/main/res/layout-sw600dp-land/sdrp_dialog.xml
index e1e89fe..ac1550f 100644
--- a/library/src/main/res/layout-sw600dp-land/sdrp_dialog.xml
+++ b/library/src/main/res/layout-sw600dp-land/sdrp_dialog.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <include layout="@layout/sdrp_selected_date" />
+                <include android:id="@+id/sdrp_selected_date_start" layout="@layout/sdrp_selected_date" />
 
                 <View
                     android:id="@+id/hyphen"
@@ -49,7 +49,7 @@
                     android:layout_gravity="center"
                     android:background="@color/mdtp_accent_color_focused" />
 
-                <include layout="@layout/sdrp_selected_date_end" />
+                <include android:id="@+id/sdrp_selected_date_end" layout="@layout/sdrp_selected_date" />
 
             </LinearLayout>
 
diff --git a/library/src/main/res/layout-sw600dp/sdrp_dialog.xml b/library/src/main/res/layout-sw600dp/sdrp_dialog.xml
index 03d8bb1..f40c399 100644
--- a/library/src/main/res/layout-sw600dp/sdrp_dialog.xml
+++ b/library/src/main/res/layout-sw600dp/sdrp_dialog.xml
@@ -32,7 +32,7 @@
         <!--android:layout_height="wrap_content"-->
         <!--android:orientation="vertical">-->
 
-        <include layout="@layout/sdrp_selected_date" />
+        <include android:id="@+id/sdrp_selected_date_start" layout="@layout/sdrp_selected_date" />
 
         <View
             android:id="@+id/hyphen"
@@ -50,7 +50,7 @@
         <!--android:layout_height="wrap_content"-->
         <!--android:orientation="vertical">-->
 
-        <include layout="@layout/sdrp_selected_date_end" />
+        <include android:id="@+id/sdrp_selected_date_end" layout="@layout/sdrp_selected_date" />
 
     </LinearLayout>
 
diff --git a/library/src/main/res/layout/sdrp_dialog.xml b/library/src/main/res/layout/sdrp_dialog.xml
index d5ab002..7829f60 100644
--- a/library/src/main/res/layout/sdrp_dialog.xml
+++ b/library/src/main/res/layout/sdrp_dialog.xml
@@ -27,7 +27,7 @@
         android:background="@color/mdtp_accent_color"
         android:orientation="horizontal">
 
-        <include layout="@layout/sdrp_selected_date" />
+        <include android:id="@+id/sdrp_selected_date_start" layout="@layout/sdrp_selected_date" />
 
         <View
             android:id="@+id/hyphen"
@@ -36,7 +36,7 @@
             android:layout_gravity="center"
             android:background="@color/mdtp_accent_color_focused" />
 
-        <include layout="@layout/sdrp_selected_date_end" />
+        <include android:id="@+id/sdrp_selected_date_end" layout="@layout/sdrp_selected_date" />
 
     </LinearLayout>
 
diff --git a/library/src/main/res/layout/sdrp_header_view_end.xml b/library/src/main/res/layout/sdrp_header_view_end.xml
deleted file mode 100644
index b06c64c..0000000
--- a/library/src/main/res/layout/sdrp_header_view_end.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/date_picker_header_end"
-    android:layout_width="@dimen/mdtp_date_picker_component_width"
-    android:layout_height="@dimen/mdtp_date_picker_header_height"
-    android:gravity="center"
-    android:includeFontPadding="false"
-    android:textColor="@color/mdtp_accent_color_focused"
-    android:textSize="@dimen/mdtp_date_picker_header_text_size"
-    android:importantForAccessibility="no" />
-
-    <!--android:textColor="@color/mdtp_white"-->
-    <!--android:background="@color/mdtp_calendar_header"-->
\ No newline at end of file
diff --git a/library/src/main/res/layout/sdrp_selected_date_end.xml b/library/src/main/res/layout/sdrp_selected_date_end.xml
deleted file mode 100644
index c6b3f1d..0000000
--- a/library/src/main/res/layout/sdrp_selected_date_end.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/day_picker_selected_date_layout_end"
-    android:layout_width="@dimen/mdtp_date_picker_component_width_half"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:background="@color/mdtp_accent_color"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="20dp">
-
-    <com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout
-        android:id="@+id/date_picker_month_and_day_end"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:clickable="true"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:textColor="@color/sdrp_selector">
-
-        <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/date_picker_header_end"
-            android:layout_width="@dimen/mdtp_date_picker_component_width"
-            android:layout_height="@dimen/mdtp_date_picker_header_height"
-            android:gravity="center"
-            android:importantForAccessibility="no"
-            android:includeFontPadding="false"
-            android:textColor="@color/sdrp_selector"
-            android:textSize="15sp"
-            tools:text="Wednesday"
-            />
-
-        <com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout
-            android:id="@+id/date_picker_month_and_day_end1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:clickable="false"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:textColor="@color/sdrp_selector">
-
-            <TextView
-                android:id="@+id/date_picker_month_end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:duplicateParentState="true"
-                android:gravity="center_horizontal|bottom"
-                android:includeFontPadding="false"
-                android:textColor="@color/sdrp_selector"
-                android:textSize="22sp"
-                tools:text="May" />
-
-            <TextView
-                android:id="@+id/date_picker_day_end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="8dp"
-                android:duplicateParentState="true"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:textColor="@color/sdrp_selector"
-                android:textSize="22sp"
-                tools:text="15" />
-        </com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout>
-    </com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout>
-
-    <com.leavjenn.smoothdaterangepicker.AccessibleTextView
-        android:id="@+id/date_picker_year_end"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center_horizontal|top"
-        android:includeFontPadding="false"
-        android:textColor="@color/sdrp_selector"
-        android:textSize="@dimen/mdtp_selected_date_year_size"
-        tools:text="2015" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/sdrp_view_animator_end.xml b/library/src/main/res/layout/sdrp_view_animator_end.xml
deleted file mode 100644
index 185f03d..0000000
--- a/library/src/main/res/layout/sdrp_view_animator_end.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.leavjenn.smoothdaterangepicker.sample.date.AccessibleDateAnimator
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     android:id="@+id/animator_end"
-     android:layout_width="@dimen/mdtp_date_picker_component_width"
-     android:layout_height="@dimen/mdtp_date_picker_view_animator_height"
-     android:gravity="center"
-     android:paddingLeft="8dp"
-     android:paddingRight="8dp" />
\ No newline at end of file

From ea65cabc678560c5843b36a1adad509418142d27 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sun, 23 Jan 2022 10:53:05 +0100
Subject: [PATCH 14/22] Rename leavjenn to wsbak, update README.md, upgrade
 version

---
 README.md                                      | 18 +++++++++++++-----
 library/build.gradle                           | 18 +++++++++---------
 library/src/main/AndroidManifest.xml           |  2 +-
 .../AccessibleLinearLayout.java                |  2 +-
 .../AccessibleTextView.java                    |  2 +-
 .../HapticFeedbackController.java              |  2 +-
 .../smoothdaterangepicker/TypefaceHelper.java  |  2 +-
 .../smoothdaterangepicker/Utils.java           |  2 +-
 .../date/AccessibleDateAnimator.java           |  2 +-
 .../date/DayPickerView.java                    |  6 +++---
 .../date/MonthAdapter.java                     |  2 +-
 .../smoothdaterangepicker/date/MonthView.java  |  8 ++++----
 .../date/NumberPadView.java                    |  4 ++--
 .../date/SimpleDayPickerView.java              |  2 +-
 .../date/SimpleMonthAdapter.java               |  2 +-
 .../date/SimpleMonthView.java                  |  2 +-
 .../date/SmoothDateRangePickerController.java  |  2 +-
 .../date/SmoothDateRangePickerFragment.java    | 10 +++++-----
 .../date/TextViewWithCircularIndicator.java    |  4 ++--
 .../date/YearPickerView.java                   |  4 ++--
 library/src/main/res/layout/sdrp_duration.xml  |  4 ++--
 .../src/main/res/layout/sdrp_selected_date.xml | 10 +++++-----
 .../src/main/res/layout/sdrp_view_animator.xml |  2 +-
 .../res/layout/sdrp_year_label_text_view.xml   |  2 +-
 sample/build.gradle                            |  2 +-
 .../ApplicationTest.java                       |  2 +-
 sample/src/main/AndroidManifest.xml            |  4 ++--
 .../MainActivity.java                          |  4 ++--
 .../smoothdaterangepicker/ExampleUnitTest.java |  2 +-
 29 files changed, 68 insertions(+), 60 deletions(-)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/AccessibleLinearLayout.java (97%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/AccessibleTextView.java (97%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/HapticFeedbackController.java (98%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/TypefaceHelper.java (97%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/Utils.java (99%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/AccessibleDateAnimator.java (96%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/DayPickerView.java (98%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/MonthAdapter.java (99%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/MonthView.java (99%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/NumberPadView.java (97%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/SimpleDayPickerView.java (96%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/SimpleMonthAdapter.java (95%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/SimpleMonthView.java (97%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/SmoothDateRangePickerController.java (96%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java (99%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/TextViewWithCircularIndicator.java (98%)
 rename library/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepicker/date/YearPickerView.java (98%)
 rename sample/src/androidTest/java/com/{leavjenn => wsbak}/smoothdaterangepickerexample/ApplicationTest.java (86%)
 rename sample/src/main/java/com/{leavjenn => wsbak}/smoothdaterangepickerexample/MainActivity.java (97%)
 rename sample/src/test/java/com/{leavjenn => wsbak}/smoothdaterangepicker/ExampleUnitTest.java (84%)

diff --git a/README.md b/README.md
index 57f5ef7..d785078 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # SmoothDateRangePicker
+Based on [SmoothDateRangePicker by leavjenn] (https://github.com/leavjenn/SmoothDateRangePicker)
+
 Smooth Date Range Picker is an android widget for selecting date range quickly and easily, following Material Design principle. This library is based on [datetimepicker from Android frameworks](https://android.googlesource.com/platform/frameworks/opt/datetimepicker/) and [Material DateTime Picker by wdullaer](https://github.com/wdullaer/MaterialDateTimePicker).
 
 Date Range Picker | Duration Number Pad | Date Range Picker Dark Theme | Date Range Picker Landscape
@@ -9,9 +11,10 @@ Date Range Picker | Duration Number Pad | Date Range Picker Dark Theme | Date Ra
 
 **Gradle:**
 
-Add jcenter repository into project `build.gradle`:
+Add google repository into project `build.gradle`:
 ```
 repositories {
+    google()
     jcenter()
 }
 ```
@@ -19,7 +22,7 @@ repositories {
 Add the following into app `build.gradle`:
 ```
 dependencies {
-  compile 'com.leavjenn.smoothdaterangepicker:library:0.2.0'
+  compile 'com.wsbak.smoothdaterangepicker:library:0.2.0'
 }
 ```
 
@@ -49,9 +52,8 @@ SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePic
 new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
                     @Override
                     public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                               int yearStart, int monthStart,
-                                               int dayStart, int yearEnd,
-                                               int monthEnd, int dayEnd) {
+                                               int yearStart, int monthStart, int dayStart,
+                                               int yearEnd, int monthEnd, int dayEnd) {
                         // grab the date range, do what you want
                     }
                 });
@@ -82,6 +84,12 @@ smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"
 `setMaxDate(Calendar calendar)`
 
 
+### Duration
+**Hide duration:**
+
+`setShowDuration(false)`
+
+
 ## License
     Copyright (c) 2015 Leav Jenn
 
diff --git a/library/build.gradle b/library/build.gradle
index e5bcbfd..416d98f 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 31
-        versionCode 2
-        versionName "0.2.0"
+        versionCode 3
+        versionName "0.3.2"
     }
     buildTypes {
         release {
@@ -45,20 +45,20 @@ artifacts {
 
 
 ext {
-    publishedGroupId = 'com.leavjenn.smoothdaterangepicker'
+    publishedGroupId = 'com.wsbak.smoothdaterangepicker'
     libraryName = 'SmoothDateRangePicker'
     artifact = 'smoothdaterangepicker'
 
     libraryDescription = 'An Android date range picker widget based on stock material design date picker'
 
-    siteUrl = 'https://github.com/leavjenn/SmoothDateRangePicker'
-    gitUrl = 'https://github.com/leavjenn/SmoothDateRangePicker.git'
+    siteUrl = 'https://github.com/wsbak/SmoothDateRangePicker'
+    gitUrl = 'https://github.com/wsbak/SmoothDateRangePicker.git'
 
-    libraryVersion = '0.2.0'
+    libraryVersion = '0.3.2'
 
-    developerId = 'leavjenn'
-    developerName = 'Leav Jenn'
-    developerEmail = 'leavjenn@gmail.com'
+    developerId = 'wsbak'
+    developerName = 'wsbak'
+    developerEmail = ''
 
     licenseName = 'The Apache Software License, Version 2.0'
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 91db14c..bd7c14e 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.leavjenn.smoothdaterangepicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.wsbak.smoothdaterangepicker">
 
     <application android:allowBackup="true" android:label="@string/app_name"
         android:supportsRtl="true">
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleLinearLayout.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleLinearLayout.java
similarity index 97%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleLinearLayout.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleLinearLayout.java
index 7f2d182..7104117 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleLinearLayout.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleLinearLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker;
+package com.wsbak.smoothdaterangepicker;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleTextView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleTextView.java
similarity index 97%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleTextView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleTextView.java
index 91aa09f..fbc33ba 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/AccessibleTextView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/AccessibleTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker;
+package com.wsbak.smoothdaterangepicker;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/HapticFeedbackController.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/HapticFeedbackController.java
similarity index 98%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/HapticFeedbackController.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/HapticFeedbackController.java
index 40ee320..0d093e6 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/HapticFeedbackController.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/HapticFeedbackController.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepicker;
+package com.wsbak.smoothdaterangepicker;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/TypefaceHelper.java
similarity index 97%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/TypefaceHelper.java
index c9ab6df..beceb46 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/TypefaceHelper.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/TypefaceHelper.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepicker;
+package com.wsbak.smoothdaterangepicker;
 
 
 import android.content.Context;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/Utils.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/Utils.java
similarity index 99%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/Utils.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/Utils.java
index a4d025d..748757a 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/Utils.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker;
+package com.wsbak.smoothdaterangepicker;
 
 import android.animation.Keyframe;
 import android.animation.ObjectAnimator;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/AccessibleDateAnimator.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/AccessibleDateAnimator.java
similarity index 96%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/AccessibleDateAnimator.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/AccessibleDateAnimator.java
index fcc09af..4a24406 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/AccessibleDateAnimator.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/AccessibleDateAnimator.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.text.format.DateUtils;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/DayPickerView.java
similarity index 98%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/DayPickerView.java
index 15f7b9f..139e7e3 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/DayPickerView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/DayPickerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,8 +32,8 @@
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.ListView;
 
-import com.leavjenn.smoothdaterangepicker.Utils;
-import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment.OnDateChangedListener;
+import com.wsbak.smoothdaterangepicker.Utils;
+import com.wsbak.smoothdaterangepicker.date.SmoothDateRangePickerFragment.OnDateChangedListener;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthAdapter.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthAdapter.java
similarity index 99%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthAdapter.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthAdapter.java
index 2fcd02c..756707f 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthAdapter.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthView.java
similarity index 99%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthView.java
index 5fa8032..8e78279 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/MonthView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/MonthView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -37,9 +37,9 @@
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 
-import com.leavjenn.smoothdaterangepicker.R;
-import com.leavjenn.smoothdaterangepicker.TypefaceHelper;
-import com.leavjenn.smoothdaterangepicker.date.MonthAdapter.CalendarDay;
+import com.wsbak.smoothdaterangepicker.R;
+import com.wsbak.smoothdaterangepicker.TypefaceHelper;
+import com.wsbak.smoothdaterangepicker.date.MonthAdapter.CalendarDay;
 
 import java.security.InvalidParameterException;
 import java.util.Calendar;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/NumberPadView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/NumberPadView.java
similarity index 97%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/NumberPadView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/NumberPadView.java
index 10898dd..ec0a939 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/NumberPadView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/NumberPadView.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -7,7 +7,7 @@
 import android.widget.Button;
 import android.widget.TableLayout;
 
-import com.leavjenn.smoothdaterangepicker.R;
+import com.wsbak.smoothdaterangepicker.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleDayPickerView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleDayPickerView.java
similarity index 96%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleDayPickerView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleDayPickerView.java
index 144b0b6..99781b3 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleDayPickerView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleDayPickerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthAdapter.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthAdapter.java
similarity index 95%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthAdapter.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthAdapter.java
index 6fcace2..e786720 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthAdapter.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthView.java
similarity index 97%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthView.java
index 6ec2335..80a5494 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SimpleMonthView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SimpleMonthView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Typeface;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerController.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerController.java
similarity index 96%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerController.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerController.java
index 785082c..eab4bd4 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerController.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import java.util.Calendar;
 
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
similarity index 99%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index ec42b4f..1e9471b 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.animation.ObjectAnimator;
 import android.app.Activity;
@@ -40,10 +40,10 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.leavjenn.smoothdaterangepicker.HapticFeedbackController;
-import com.leavjenn.smoothdaterangepicker.R;
-import com.leavjenn.smoothdaterangepicker.TypefaceHelper;
-import com.leavjenn.smoothdaterangepicker.Utils;
+import com.wsbak.smoothdaterangepicker.HapticFeedbackController;
+import com.wsbak.smoothdaterangepicker.R;
+import com.wsbak.smoothdaterangepicker.TypefaceHelper;
+import com.wsbak.smoothdaterangepicker.Utils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
similarity index 98%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
index ee1a6f0..c006b18 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/TextViewWithCircularIndicator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -28,7 +28,7 @@
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import com.leavjenn.smoothdaterangepicker.R;
+import com.wsbak.smoothdaterangepicker.R;
 
 /**
  * A text view which, when pressed or activated, displays a colored circle around the text.
diff --git a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/YearPickerView.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/YearPickerView.java
similarity index 98%
rename from library/src/main/java/com/leavjenn/smoothdaterangepicker/date/YearPickerView.java
rename to library/src/main/java/com/wsbak/smoothdaterangepicker/date/YearPickerView.java
index e5a4e34..f0147fb 100644
--- a/library/src/main/java/com/leavjenn/smoothdaterangepicker/date/YearPickerView.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/YearPickerView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.leavjenn.smoothdaterangepicker.date;
+package com.wsbak.smoothdaterangepicker.date;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -28,7 +28,7 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.leavjenn.smoothdaterangepicker.R;
+import com.wsbak.smoothdaterangepicker.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/library/src/main/res/layout/sdrp_duration.xml b/library/src/main/res/layout/sdrp_duration.xml
index 6b796aa..70e8c77 100644
--- a/library/src/main/res/layout/sdrp_duration.xml
+++ b/library/src/main/res/layout/sdrp_duration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.wsbak.smoothdaterangepicker.AccessibleLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/date_picker_duration_layout"
     android:layout_width="match_parent"
@@ -64,4 +64,4 @@
         android:text="&gt;"
         android:textSize="20sp"
         />
-</com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout>
\ No newline at end of file
+</com.wsbak.smoothdaterangepicker.AccessibleLinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/sdrp_selected_date.xml b/library/src/main/res/layout/sdrp_selected_date.xml
index eed84fa..71007b0 100644
--- a/library/src/main/res/layout/sdrp_selected_date.xml
+++ b/library/src/main/res/layout/sdrp_selected_date.xml
@@ -23,7 +23,7 @@
     android:orientation="vertical"
     android:padding="20dp">
 
-    <com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout
+    <com.wsbak.smoothdaterangepicker.AccessibleLinearLayout
         android:id="@+id/date_picker_month_and_day"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             tools:text="Wednesday" />
 
 
-        <com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout
+        <com.wsbak.smoothdaterangepicker.AccessibleLinearLayout
             android:id="@+id/date_picker_month_and_day1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -78,11 +78,11 @@
                 android:textColor="@color/sdrp_selector"
                 android:textSize="22sp"
                 tools:text="15" />
-        </com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout>
+        </com.wsbak.smoothdaterangepicker.AccessibleLinearLayout>
 
-    </com.leavjenn.smoothdaterangepicker.AccessibleLinearLayout>
+    </com.wsbak.smoothdaterangepicker.AccessibleLinearLayout>
 
-    <com.leavjenn.smoothdaterangepicker.AccessibleTextView
+    <com.wsbak.smoothdaterangepicker.AccessibleTextView
         android:id="@+id/date_picker_year"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/library/src/main/res/layout/sdrp_view_animator.xml b/library/src/main/res/layout/sdrp_view_animator.xml
index cd0cd2c..d840714 100644
--- a/library/src/main/res/layout/sdrp_view_animator.xml
+++ b/library/src/main/res/layout/sdrp_view_animator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.leavjenn.smoothdaterangepicker.date.AccessibleDateAnimator
+<com.wsbak.smoothdaterangepicker.date.AccessibleDateAnimator
      xmlns:android="http://schemas.android.com/apk/res/android"
      android:id="@+id/animator"
      android:layout_width="@dimen/mdtp_date_picker_component_width"
diff --git a/library/src/main/res/layout/sdrp_year_label_text_view.xml b/library/src/main/res/layout/sdrp_year_label_text_view.xml
index 36e63a9..7c6f026 100644
--- a/library/src/main/res/layout/sdrp_year_label_text_view.xml
+++ b/library/src/main/res/layout/sdrp_year_label_text_view.xml
@@ -12,7 +12,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.leavjenn.smoothdaterangepicker.date.TextViewWithCircularIndicator
+<com.wsbak.smoothdaterangepicker.date.TextViewWithCircularIndicator
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/month_text_view"
     android:layout_width="match_parent"
diff --git a/sample/build.gradle b/sample/build.gradle
index 67f2058..5687a61 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        applicationId "com.leavjenn.smoothdaterangepicker"
+        applicationId "com.wsbak.smoothdaterangepicker"
         minSdkVersion 14
         targetSdkVersion 31
         versionCode 1
diff --git a/sample/src/androidTest/java/com/leavjenn/smoothdaterangepickerexample/ApplicationTest.java b/sample/src/androidTest/java/com/wsbak/smoothdaterangepickerexample/ApplicationTest.java
similarity index 86%
rename from sample/src/androidTest/java/com/leavjenn/smoothdaterangepickerexample/ApplicationTest.java
rename to sample/src/androidTest/java/com/wsbak/smoothdaterangepickerexample/ApplicationTest.java
index 91db57b..c508c74 100644
--- a/sample/src/androidTest/java/com/leavjenn/smoothdaterangepickerexample/ApplicationTest.java
+++ b/sample/src/androidTest/java/com/wsbak/smoothdaterangepickerexample/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepickerexample;
+package com.wsbak.smoothdaterangepickerexample;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index b7e1bae..a54b75e 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.leavjenn.smoothdaterangepickerexample" >
+    package="com.wsbak.smoothdaterangepickerexample" >
 
     <application
         android:allowBackup="true"
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-        <activity android:name=".MainActivity"
+        <activity android:name="com.wsbak.smoothdaterangepickerexample.MainActivity"
             android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
similarity index 97%
rename from sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
rename to sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
index 0a8f510..d1533a8 100644
--- a/sample/src/main/java/com/leavjenn/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepickerexample;
+package com.wsbak.smoothdaterangepickerexample;
 
 import android.app.DatePickerDialog;
 import android.app.Fragment;
@@ -10,7 +10,7 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment;
+import com.wsbak.smoothdaterangepicker.date.SmoothDateRangePickerFragment;
 
 import java.util.Calendar;
 
diff --git a/sample/src/test/java/com/leavjenn/smoothdaterangepicker/ExampleUnitTest.java b/sample/src/test/java/com/wsbak/smoothdaterangepicker/ExampleUnitTest.java
similarity index 84%
rename from sample/src/test/java/com/leavjenn/smoothdaterangepicker/ExampleUnitTest.java
rename to sample/src/test/java/com/wsbak/smoothdaterangepicker/ExampleUnitTest.java
index aa2eb91..7aac9c0 100644
--- a/sample/src/test/java/com/leavjenn/smoothdaterangepicker/ExampleUnitTest.java
+++ b/sample/src/test/java/com/wsbak/smoothdaterangepicker/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.leavjenn.smoothdaterangepickerexample;
+package com.wsbak.smoothdaterangepickerexample;
 
 import org.junit.Test;
 

From f80303f65c0972dd0e2142feefa7373715263e13 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sun, 23 Jan 2022 19:46:46 +0100
Subject: [PATCH 15/22] Fix README.md

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d785078..9afcee5 100644
--- a/README.md
+++ b/README.md
@@ -11,18 +11,17 @@ Date Range Picker | Duration Number Pad | Date Range Picker Dark Theme | Date Ra
 
 **Gradle:**
 
-Add google repository into project `build.gradle`:
+Add jitpack repository into project `build.gradle`:
 ```
 repositories {
-    google()
-    jcenter()
+    maven { url "https://jitpack.io" }
 }
 ```
 
 Add the following into app `build.gradle`:
 ```
 dependencies {
-  compile 'com.wsbak.smoothdaterangepicker:library:0.2.0'
+  implementation 'com.github.wsbak:SmoothDateRangePicker:master-SNAPSHOT'
 }
 ```
 

From 3c25d0da5ca70ac10f0da8dadf5f69732798e3e9 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sun, 23 Jan 2022 19:57:58 +0100
Subject: [PATCH 16/22] Remove deprecated jcenter/bintray

---
 build.gradle         |  5 ++---
 library/build.gradle | 24 ------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2eadab4..3e4f015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,6 +17,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index 416d98f..a4793c2 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
 
 android {
     compileSdkVersion 31
@@ -103,26 +102,3 @@ version = libraryVersion
 //        }
 //    }
 //}
-
-// bintray
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = 'maven'
-        name = libraryName
-        desc = libraryDescription
-        vcsUrl = gitUrl
-        websiteUrl = siteUrl
-        licenses = allLicenses
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            name = libraryVersion
-            desc = libraryDescription
-        }
-    }
-}
\ No newline at end of file

From 4303070b20cd12fd85bdbdf32fe60c3e40b35ee8 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Fri, 28 Jan 2022 22:06:58 +0100
Subject: [PATCH 17/22] User can select an open date range

Add switch on each date which permits to disable it
Both dates can NOT be disabled at the same time
---
 README.md                                     |  11 +-
 library/build.gradle                          |   9 +-
 .../date/SmoothDateRangePickerFragment.java   | 273 +++++++++++++-----
 .../res/color/mdtp_material_switch_thumb.xml  |   5 +
 .../color/mdtp_material_switch_thumb_dark.xml |   5 +
 .../res/color/mdtp_material_switch_track.xml  |   5 +
 library/src/main/res/layout/sdrp_duration.xml |  22 +-
 .../main/res/layout/sdrp_selected_date.xml    |  15 +
 library/src/main/res/values/styles.xml        |   5 +
 sample/build.gradle                           |   2 +-
 .../MainActivity.java                         |  51 ++--
 sample/src/main/res/layout/activity_main.xml  |   9 +
 12 files changed, 301 insertions(+), 111 deletions(-)
 create mode 100644 library/src/main/res/color/mdtp_material_switch_thumb.xml
 create mode 100644 library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
 create mode 100644 library/src/main/res/color/mdtp_material_switch_track.xml

diff --git a/README.md b/README.md
index 9afcee5..8d6d23b 100644
--- a/README.md
+++ b/README.md
@@ -51,9 +51,10 @@ SmoothDateRangePickerFragment smoothDateRangePickerFragment = SmoothDateRangePic
 new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
                     @Override
                     public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                               int yearStart, int monthStart, int dayStart,
-                                               int yearEnd, int monthEnd, int dayEnd) {
+                                               Calendar calendarStart,
+                                               Calendar calendarEnd) {
                         // grab the date range, do what you want
+                        // calendarStart or calendarEnd can be null if user disable it
                     }
                 });
                 
@@ -83,6 +84,12 @@ smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"
 `setMaxDate(Calendar calendar)`
 
 
+### Enable Date
+**Show disable/enable date control:**
+
+`setShowDateEnableDisable(true)`
+
+
 ### Duration
 **Hide duration:**
 
diff --git a/library/build.gradle b/library/build.gradle
index a4793c2..3fb36a2 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -5,10 +5,10 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 31
-        versionCode 3
-        versionName "0.3.2"
+        versionCode 4
+        versionName "0.4.0"
     }
     buildTypes {
         release {
@@ -20,6 +20,7 @@ android {
 
 dependencies {
     api 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
 }
 
 task generateSourcesJar(type: Jar) {
@@ -53,7 +54,7 @@ ext {
     siteUrl = 'https://github.com/wsbak/SmoothDateRangePicker'
     gitUrl = 'https://github.com/wsbak/SmoothDateRangePicker.git'
 
-    libraryVersion = '0.3.2'
+    libraryVersion = '0.4.0'
 
     developerId = 'wsbak'
     developerName = 'wsbak'
diff --git a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 1e9471b..0225bd9 100644
--- a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -40,6 +40,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.wsbak.smoothdaterangepicker.HapticFeedbackController;
 import com.wsbak.smoothdaterangepicker.R;
 import com.wsbak.smoothdaterangepicker.TypefaceHelper;
@@ -76,21 +77,27 @@ public DateData(SmoothDateRangePickerFragment fragment,
 
         @Override
         public void onClick(View view) {
-            int i = view.getId();
-            if (i == R.id.date_picker_year) {
+            if (view == mYearView) {
                 mFragment.setCurrentView(mYearViewIndex);
             }
-            else if (i == R.id.date_picker_month_and_day)
+            else if (view == mMonthAndDayView)
             {
                 mFragment.setCurrentView(mMonthAndDayViewIndex);
             }
-        }
-
-        public void onCreate(Bundle savedInstanceState) {
-            if (savedInstanceState != null) {
-                mCalendar.set(Calendar.YEAR, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_YEAR));
-                mCalendar.set(Calendar.MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_MONTH));
-                mCalendar.set(Calendar.DAY_OF_MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_DAY));
+            else if (view == mDateEnabledView)
+            {
+                if (mDateEnabledView.isChecked())
+                {
+                    mYearView.setVisibility(View.VISIBLE);
+                    mMonthAndDayView.setVisibility(View.VISIBLE);
+                    mFragment.onDateEnabled(this);
+                }
+                else
+                {
+                    mYearView.setVisibility(View.INVISIBLE);
+                    mMonthAndDayView.setVisibility(View.INVISIBLE);
+                    mFragment.onDateDisabled(this);
+                }
             }
         }
 
@@ -99,6 +106,8 @@ public void onSaveInstanceState(@NonNull Bundle outState)
             outState.putInt(mBundleKeyPrefix+KEY_SELECTED_YEAR, mCalendar.get(Calendar.YEAR));
             outState.putInt(mBundleKeyPrefix+KEY_SELECTED_MONTH, mCalendar.get(Calendar.MONTH));
             outState.putInt(mBundleKeyPrefix+KEY_SELECTED_DAY, mCalendar.get(Calendar.DAY_OF_MONTH));
+            outState.putBoolean(mBundleKeyPrefix+KEY_SHOW_DATE_ENABLE_DISABLE, mShowDateEnableDisable);
+            outState.putBoolean(mBundleKeyPrefix+KEY_DATE_ENABLED, mDateEnabledView.isChecked());
 
             int listPosition = -1;
             if (mFragment.mCurrentView == MONTH_AND_DAY_VIEW) {
@@ -110,39 +119,88 @@ public void onSaveInstanceState(@NonNull Bundle outState)
             outState.putInt(mBundleKeyPrefix+KEY_LIST_POSITION, listPosition);
         }
 
-        public void onCreateView(ViewGroup view)
+        public void loadInstanceState(Bundle savedInstanceState) {
+            if (savedInstanceState != null) {
+                mCalendar.set(Calendar.YEAR, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_YEAR));
+                mCalendar.set(Calendar.MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_MONTH));
+                mCalendar.set(Calendar.DAY_OF_MONTH, savedInstanceState.getInt(mBundleKeyPrefix+KEY_SELECTED_DAY));
+                mShowDateEnableDisable = savedInstanceState.getBoolean(mBundleKeyPrefix+KEY_SHOW_DATE_ENABLE_DISABLE);
+                boolean dateEnabled = savedInstanceState.getBoolean(mBundleKeyPrefix+KEY_DATE_ENABLED);
+                if (mDateEnabledView != null) {
+                    mDateEnabledView.setChecked(dateEnabled);
+                }
+            }
+        }
+
+        public void onCreate(Bundle savedInstanceState) {
+            loadInstanceState(savedInstanceState);
+        }
+
+        public void onCreateView(ViewGroup view,
+                                 Bundle savedInstanceState)
         {
             mMainView = view;
 
-            mDayOfWeekView = (TextView) view.findViewById(R.id.date_picker_header);
-            mMonthAndDayView = (LinearLayout) view.findViewById(R.id.date_picker_month_and_day);
+            mDayOfWeekView = view.findViewById(R.id.date_picker_header);
+            mMonthAndDayView = view.findViewById(R.id.date_picker_month_and_day);
             mMonthAndDayView.setOnClickListener(this);
 
-            mSelectedMonthTextView = (TextView) view.findViewById(R.id.date_picker_month);
-            mSelectedDayTextView = (TextView) view.findViewById(R.id.date_picker_day);
+            mSelectedMonthTextView = view.findViewById(R.id.date_picker_month);
+            mSelectedDayTextView = view.findViewById(R.id.date_picker_day);
 
-            mYearView = (TextView) view.findViewById(R.id.date_picker_year);
+            mYearView = view.findViewById(R.id.date_picker_year);
             mYearView.setOnClickListener(this);
 
             final Activity activity = mFragment.getActivity();
             mDayPickerView = new SimpleDayPickerView(activity, mFragment);
             mYearPickerView = new YearPickerView(activity, mFragment);
+
+            mDateEnabledView = view.findViewById(R.id.date_picker_enable);
+            mDateEnabledView.setOnClickListener(this);
+
+            loadInstanceState(savedInstanceState);
+        }
+
+        public void onCreateViewApplyThemeDark()
+        {
+            Utils.setMultiTextColorList(mFragment.getResources()
+                            .getColorStateList(R.color.sdrp_selector_dark),
+                    mDayOfWeekView,
+                    mSelectedMonthTextView,
+                    mSelectedDayTextView,
+                    mYearView);
+
+            mDateEnabledView.setThumbTintList(mFragment.getResources()
+                    .getColorStateList(R.color.mdtp_material_switch_thumb_dark));
         }
 
         public void onCreateViewSetListPosition(Bundle savedInstanceState)
         {
-            if (savedInstanceState == null) {
-                return;
+            if (savedInstanceState != null) {
+                final int currentView = mFragment.mCurrentView;
+                final int listPosition = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION);
+
+                if (currentView == mMonthAndDayViewIndex) {
+                    mDayPickerView.postSetSelection(listPosition);
+                } else if (currentView == mYearViewIndex) {
+                    final int listPositionOffset = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION_OFFSET);
+                    mYearPickerView.postSetSelectionFromTop(listPosition, listPositionOffset);
+                }
             }
+        }
 
-            final int currentView = mFragment.mCurrentView;
-            final int listPosition = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION);
-            final int listPositionOffset = savedInstanceState.getInt(mBundleKeyPrefix+KEY_LIST_POSITION_OFFSET);
+        public void onCreateViewFinalize()
+        {
+            if (!mShowDateEnableDisable) {
+                mDateEnabledView.setVisibility(View.GONE);
+                return;
+            }
 
-            if (currentView == mMonthAndDayViewIndex) {
-                mDayPickerView.postSetSelection(listPosition);
-            } else if (currentView == mYearViewIndex) {
-                mYearPickerView.postSetSelectionFromTop(listPosition, listPositionOffset);
+            if (!mDateEnabledView.isChecked())
+            {
+                // Must perform click to trigger hide date, change date highlight ...
+                mDateEnabledView.setChecked(true);
+                mDateEnabledView.performClick();
             }
         }
 
@@ -200,6 +258,13 @@ public void onYearSelected(int year) {
             }
         }
 
+        public boolean isEnabled() {
+            return mDateEnabledView.isChecked();
+        }
+        public boolean isDisabled() {
+            return !mDateEnabledView.isChecked();
+        }
+
         SmoothDateRangePickerFragment mFragment;
         View mMainView;
         String mBundleKeyPrefix;
@@ -214,10 +279,14 @@ public void onYearSelected(int year) {
         TextView mYearView;
         private DayPickerView mDayPickerView;
         private YearPickerView mYearPickerView;
+        SwitchMaterial mDateEnabledView;
+        private boolean mShowDateEnableDisable = false;
 
         private static final String KEY_SELECTED_YEAR = "selected_year";
         private static final String KEY_SELECTED_MONTH = "selected_month";
         private static final String KEY_SELECTED_DAY = "selected_day";
+        private static final String KEY_SHOW_DATE_ENABLE_DISABLE = "show_date_enable_disable";
+        private static final String KEY_DATE_ENABLED = "date_enabled";
         private static final String KEY_LIST_POSITION = "list_position";
         private static final String KEY_LIST_POSITION_OFFSET = "list_position_offset";
     };
@@ -250,18 +319,19 @@ public void onYearSelected(int year) {
     private static final int ANIMATION_DURATION = 300;
     private static final int ANIMATION_DELAY = 500;
 
-    private static SimpleDateFormat YEAR_FORMAT = new SimpleDateFormat("yyyy", Locale.getDefault());
-    private static SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("dd", Locale.getDefault());
+    private static final SimpleDateFormat YEAR_FORMAT = new SimpleDateFormat("yyyy", Locale.getDefault());
+    private static final SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("dd", Locale.getDefault());
 
     private OnDateRangeSetListener mCallBack;
-    private HashSet<OnDateChangedListener> mListeners = new HashSet<>();
+    private final HashSet<OnDateChangedListener> mListeners = new HashSet<>();
     private DialogInterface.OnCancelListener mOnCancelListener;
     private DialogInterface.OnDismissListener mOnDismissListener;
 
     private AccessibleDateAnimator mAnimator;
 
-    private DateData mDateStart = new DateData(this, "date_start_", YEAR_VIEW, MONTH_AND_DAY_VIEW);
-    private DateData mDateEnd = new DateData(this, "date_end_", YEAR_VIEW_END, MONTH_AND_DAY_VIEW_END);
+    private final DateData mDateStart = new DateData(this, "date_start_", YEAR_VIEW, MONTH_AND_DAY_VIEW);
+    private final DateData mDateEnd = new DateData(this, "date_end_", YEAR_VIEW_END, MONTH_AND_DAY_VIEW_END);
+    private View mDateHyphen;
 
     private List<View> viewList;
 
@@ -311,18 +381,12 @@ public interface OnDateRangeSetListener {
 
         /**
          * @param view             The view associated with this listener.
-         * @param yearStart        The start year that was set.
-         * @param monthStart The start month that was set (0-11) for compatibility
-         *                         with {@link Calendar}.
-         * @param dayStart  The start day of the month that was set.
-         * @param yearEnd          The end year that was set.
-         * @param monthEnd   The end month that was set (0-11) for compatibility
-         *                         with {@link Calendar}.
-         * @param dayEnd    The end day of the month that was set.
+         * @param calendarStart    The start date that was set, null if user disable it
+         * @param calendarEnd      The end date that was set, null if user disable it
          */
         void onDateRangeSet(SmoothDateRangePickerFragment view,
-                            int yearStart, int monthStart, int dayStart,
-                            int yearEnd, int monthEnd, int dayEnd);
+                            Calendar calendarStart,
+                            Calendar calendarEnd);
     }
 
     /**
@@ -435,23 +499,24 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         View view = inflater.inflate(R.layout.sdrp_dialog, container);
 
-        mDateStart.onCreateView(view.findViewById(R.id.sdrp_selected_date_start));
-        mDateEnd.onCreateView(view.findViewById(R.id.sdrp_selected_date_end));
+        mDateStart.onCreateView(view.findViewById(R.id.sdrp_selected_date_start), savedInstanceState);
+        mDateEnd.onCreateView(view.findViewById(R.id.sdrp_selected_date_end), savedInstanceState);
+        mDateHyphen = view.findViewById(R.id.hyphen);
 
-        mDurationView = (LinearLayout) view.findViewById(R.id.date_picker_duration_layout);
+        mDurationView = view.findViewById(R.id.date_picker_duration_layout);
         if(!mShowDuration) {
             mDurationView.setVisibility(View.GONE);
         }
         mDurationView.setOnClickListener(this);
-        mDurationTextView = (TextView) view.findViewById(R.id.date_picker_duration_days);
-        mDurationEditText = (EditText) view.findViewById(R.id.date_picker_duration_days_et);
+        mDurationTextView = view.findViewById(R.id.date_picker_duration_days);
+        mDurationEditText = view.findViewById(R.id.date_picker_duration_days_et);
         // disable soft keyboard popup when edittext is selected
         mDurationEditText.setRawInputType(InputType.TYPE_CLASS_TEXT);
         mDurationEditText.setTextIsSelectable(true);
-        mDurationDayTextView = (TextView) view.findViewById(R.id.tv_duration_day);
-        mDurationArrow = (TextView) view.findViewById(R.id.arrow_start);
+        mDurationDayTextView = view.findViewById(R.id.tv_duration_day);
+        mDurationArrow = view.findViewById(R.id.arrow_start);
         mDurationArrow.setOnClickListener(this);
-        mDurationArrowEnd = (TextView) view.findViewById(R.id.arrow_end);
+        mDurationArrowEnd = view.findViewById(R.id.arrow_end);
         mDurationArrowEnd.setOnClickListener(this);
 
         viewList = new ArrayList<>();
@@ -476,16 +541,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         view.setBackgroundColor(activity.getResources().getColor(bgColorResource));
 
         if (mThemeDark) {
-            view.findViewById(R.id.hyphen).setBackgroundColor(activity.getResources()
+            mDateHyphen.setBackgroundColor(activity.getResources()
                     .getColor(R.color.date_picker_selector_unselected_dark_theme));
             Utils.setMultiTextColorList(activity.getResources()
                             .getColorStateList(R.color.sdrp_selector_dark),
-                    mDateStart.mDayOfWeekView, mDateEnd.mDayOfWeekView,
-                    mDateStart.mSelectedMonthTextView, mDateEnd.mSelectedMonthTextView,
-                    mDateStart.mSelectedDayTextView, mDateEnd.mSelectedDayTextView,
-                    mDateStart.mYearView, mDateEnd.mYearView, mDurationTextView,
-                    mDurationDayTextView, mDurationArrow, mDurationArrowEnd,
-                    mDurationEditText, (TextView) view.findViewById(R.id.tv_duration));
+                    mDurationTextView, mDurationDayTextView,
+                    mDurationArrow, mDurationArrowEnd,
+                    mDurationEditText, view.findViewById(R.id.tv_duration));
+            mDateStart.onCreateViewApplyThemeDark();
+            mDateEnd.onCreateViewApplyThemeDark();
         }
 
         mAnimator = view.findViewById(R.id.animator);
@@ -509,10 +573,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             public void onClick(View v) {
                 tryVibrate();
                 if (mCallBack != null) {
-                    mCallBack.onDateRangeSet(SmoothDateRangePickerFragment.this,
-                            mDateStart.mCalendar.get(Calendar.YEAR), mDateStart.mCalendar.get(Calendar.MONTH),
-                            mDateStart.mCalendar.get(Calendar.DAY_OF_MONTH), mDateEnd.mCalendar.get(Calendar.YEAR),
-                            mDateEnd.mCalendar.get(Calendar.MONTH), mDateEnd.mCalendar.get(Calendar.DAY_OF_MONTH));
+                    Calendar start = mDateStart.isEnabled() ? mDateStart.mCalendar : null;
+                    Calendar end = mDateEnd.isEnabled() ? mDateEnd.mCalendar : null;
+                    mCallBack.onDateRangeSet(SmoothDateRangePickerFragment.this, start, end);
                 }
                 dismiss();
             }
@@ -556,6 +619,9 @@ public void onClick(View v) {
 
         mHapticFeedbackController = new HapticFeedbackController(activity);
 
+        mDateStart.onCreateViewFinalize();
+        mDateEnd.onCreateViewFinalize();
+
         return view;
     }
 
@@ -584,9 +650,46 @@ public void onDismiss(DialogInterface dialog) {
         if (mOnDismissListener != null) mOnDismissListener.onDismiss(dialog);
     }
 
+    private void onDateDisabled(DateData date) {
+        final DateData otherDate = (date == mDateStart) ? mDateEnd : mDateStart;
+
+        // If other date is disabled, enable it
+        if (!otherDate.mDateEnabledView.isChecked())
+        {
+            otherDate.mDateEnabledView.performClick();
+        }
+
+        // Hide duration (if not GONE)
+        if (mShowDuration)
+        {
+            mDurationView.setVisibility(View.INVISIBLE);
+        }
+
+        // Select other date
+        setCurrentView(otherDate.mMonthAndDayViewIndex);
+
+        updateHighlightDays();
+        updateDisplay(true);
+    }
+
+    private void onDateEnabled(DateData date) {
+        if (mDateStart.isEnabled() && mDateEnd.isEnabled()) {
+            // Show duration (if not GONE)
+            if (mShowDuration)
+            {
+                mDurationView.setVisibility(View.VISIBLE);
+            }
+        }
+
+        setCurrentView(date.mMonthAndDayViewIndex);
+
+        updateHighlightDays();
+        updateDisplay(true);
+    }
+
     private void setCurrentView(final int viewIndex) {
-        long millis = mDateStart.mCalendar.getTimeInMillis();
-        long millisEnd = mDateEnd.mCalendar.getTimeInMillis();
+        final long millis = mDateStart.mCalendar.getTimeInMillis();
+        final long millisEnd = mDateEnd.mCalendar.getTimeInMillis();
 
         if (viewIndex != DURATION_VIEW) {
             if (mCurrentView != viewIndex) {
@@ -610,7 +713,7 @@ private void setCurrentView(final int viewIndex) {
                 Utils.tryAccessibilityAnnounce(mAnimator, mSelectDay);
                 break;
             case MONTH_AND_DAY_VIEW_END:
-                mMinSelectableDate = mDateStart.mCalendar;
+                mMinSelectableDate = mDateStart.isEnabled() ? mDateStart.mCalendar : mMinDate;
                 mDateEnd.mDayPickerView.onDateChanged();
 
                 flags = DateUtils.FORMAT_SHOW_DATE;
@@ -628,7 +731,7 @@ private void setCurrentView(final int viewIndex) {
                 Utils.tryAccessibilityAnnounce(mAnimator, mSelectYear);
                 break;
             case YEAR_VIEW_END:
-                mMinSelectableDate = mDateStart.mCalendar;
+                mMinSelectableDate = mDateStart.isEnabled() ? mDateStart.mCalendar : mMinDate;
                 mDateEnd.mYearPickerView.onDateChanged();
                 mDateEnd.mYearPickerView.refreshYearAdapter();
 
@@ -688,7 +791,8 @@ private void updateDisplay(boolean announce) {
         mDurationDayTextView.setText(mDuration > 1 ? getString(R.string.days) : getString(R.string.day));
 
         // Accessibility.
-        long millis = mDateStart.mCalendar.getTimeInMillis();
+        final DateData date = mDateStart.isEnabled() ? mDateStart : mDateEnd;
+        final long millis = date.mCalendar.getTimeInMillis();
         mAnimator.setDateMillis(millis);
 
         if (announce) {
@@ -822,10 +926,6 @@ public void setMaxDate(Calendar calendar) {
         mDateEnd.onChange();
     }
 
-    public void setShowDuration(boolean showDuration) {
-        this.mShowDuration = showDuration;
-    }
-
     /**
      * @return The maximal date supported by this DatePicker. Null if it has not been set.
      */
@@ -834,14 +934,35 @@ public Calendar getMaxDate() {
         return mMaxDate;
     }
 
+    public void setShowDuration(boolean showDuration) {
+        this.mShowDuration = showDuration;
+    }
+
+
+    public void setShowDateEnableDisable(boolean show) {
+        mDateStart.mShowDateEnableDisable = show;
+        mDateEnd.mShowDateEnableDisable = show;
+    }
+
 
     // update highlight days
     private void updateHighlightDays() {
         List<Calendar> highlightList = new ArrayList<>();
-        for (int i = 0; i < Utils.daysBetween(mDateStart.mCalendar, mDateEnd.mCalendar) + 1; i++) {
+        if (mDateStart.isEnabled() && mDateEnd.isEnabled())
+        {
+            for (int i = 0; i < Utils.daysBetween(mDateStart.mCalendar, mDateEnd.mCalendar) + 1; i++)
+            {
+                Calendar c = Calendar.getInstance();
+                c.setTime(mDateStart.mCalendar.getTime());
+                c.add(Calendar.DAY_OF_YEAR, i);
+                highlightList.add(c);
+            }
+        }
+        else
+        {
+            DateData enabledDate = mDateStart.isEnabled() ? mDateStart : mDateEnd;
             Calendar c = Calendar.getInstance();
-            c.setTime(mDateStart.mCalendar.getTime());
-            c.add(Calendar.DAY_OF_YEAR, i);
+            c.setTime(enabledDate.mCalendar.getTime());
             highlightList.add(c);
         }
         Calendar[] calendars = highlightList.toArray(new Calendar[highlightList.size()]);
@@ -958,12 +1079,18 @@ public void onDayOfMonthSelected(int year, int month, int day) {
             if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
                 mDateEnd.mCalendar.setTime(mDateStart.mCalendar.getTime());
             }
-            // jump to end day selector
-            setCurrentView(MONTH_AND_DAY_VIEW_END);
+            if (mDateEnd.isEnabled())
+            {
+                // jump to end day selector
+                setCurrentView(MONTH_AND_DAY_VIEW_END);
+            }
         } else if (mCurrentView == MONTH_AND_DAY_VIEW_END) {
             mDateEnd.mCalendar.set(Calendar.YEAR, year);
             mDateEnd.mCalendar.set(Calendar.MONTH, month);
             mDateEnd.mCalendar.set(Calendar.DAY_OF_MONTH, day);
+            if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
+                mDateStart.mCalendar.setTime(mDateEnd.mCalendar.getTime());
+            }
         }
         updatePickers();
         updateHighlightDays();
diff --git a/library/src/main/res/color/mdtp_material_switch_thumb.xml b/library/src/main/res/color/mdtp_material_switch_thumb.xml
new file mode 100644
index 0000000..5686d88
--- /dev/null
+++ b/library/src/main/res/color/mdtp_material_switch_thumb.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"  android:color="@color/mdtp_white"/>
+    <item android:state_checked="false" android:color="@color/mdtp_accent_color"/>
+</selector>
diff --git a/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml b/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
new file mode 100644
index 0000000..a0821d0
--- /dev/null
+++ b/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"  android:color="@color/mdtp_ampm_text_color"/>
+    <item android:state_checked="false" android:color="@color/mdtp_accent_color"/>
+</selector>
diff --git a/library/src/main/res/color/mdtp_material_switch_track.xml b/library/src/main/res/color/mdtp_material_switch_track.xml
new file mode 100644
index 0000000..24a7690
--- /dev/null
+++ b/library/src/main/res/color/mdtp_material_switch_track.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"  android:color="@color/mdtp_accent_color_dark"/>
+    <item android:state_checked="false" android:color="@color/mdtp_accent_color_dark"/>
+</selector>
diff --git a/library/src/main/res/layout/sdrp_duration.xml b/library/src/main/res/layout/sdrp_duration.xml
index 70e8c77..14b968f 100644
--- a/library/src/main/res/layout/sdrp_duration.xml
+++ b/library/src/main/res/layout/sdrp_duration.xml
@@ -8,17 +8,17 @@
     android:paddingBottom="20dp"
     android:orientation="horizontal">
 
-<TextView
-    android:id="@+id/arrow_start"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textColor="@color/sdrp_selector"
-    android:visibility="gone"
-    android:text="&lt;"
-    android:textSize="20sp"
-    android:paddingRight="20dp"
-    android:paddingLeft="20dp"
-    />
+    <TextView
+        android:id="@+id/arrow_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/sdrp_selector"
+        android:visibility="gone"
+        android:text="&lt;"
+        android:textSize="20sp"
+        android:paddingRight="20dp"
+        android:paddingLeft="20dp"
+        />
     <TextView
         android:id="@+id/tv_duration"
         android:layout_width="wrap_content"
diff --git a/library/src/main/res/layout/sdrp_selected_date.xml b/library/src/main/res/layout/sdrp_selected_date.xml
index 71007b0..87e5531 100644
--- a/library/src/main/res/layout/sdrp_selected_date.xml
+++ b/library/src/main/res/layout/sdrp_selected_date.xml
@@ -15,6 +15,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/day_picker_selected_date_layout"
     android:layout_width="@dimen/mdtp_date_picker_component_width_half"
     android:layout_height="wrap_content"
@@ -93,4 +94,18 @@
         android:textSize="@dimen/mdtp_selected_date_year_size"
         tools:text="2015" />
 
+    <!-- saveEnabled="false" because fragment restore data of views with id
+          and 2 views have the same id (this layout is inflated twice)
+          so the same value is restored on both views
+     -->
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/date_picker_enable"
+        android:saveEnabled="false"
+        android:checked="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:useMaterialThemeColors="false"
+        style="@style/DateSwitchStyle"
+        />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index cb88ccf..0b19869 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -67,4 +67,9 @@
         <item name="android:includeFontPadding">false</item>
         <item name="android:textAllCaps">false</item>
     </style>
+
+    <style name="DateSwitchStyle">
+        <item name="thumbTint">@color/mdtp_material_switch_thumb</item>
+        <item name="trackTint">@color/mdtp_material_switch_track</item>
+    </style>
 </resources>
diff --git a/sample/build.gradle b/sample/build.gradle
index 5687a61..ccbbc51 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "com.wsbak.smoothdaterangepicker"
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
diff --git a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
index d1533a8..4b43546 100644
--- a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
@@ -41,14 +41,10 @@ public void onClick(View v)
                         {
                             @Override
                             public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                                       int yearStart, int monthStart,
-                                                       int dayStart, int yearEnd,
-                                                       int monthEnd, int dayEnd)
+                                                       Calendar calendarStart,
+                                                       Calendar calendarEnd)
                             {
-                                onActivityDateRangeSet(view,
-                                                       yearStart, monthStart,
-                                                       dayStart, yearEnd,
-                                                       monthEnd, dayEnd);
+                                onActivityDateRangeSet(view, calendarStart, calendarEnd);
                             }
                         });
 
@@ -67,6 +63,9 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                 boolean showDuration = ((Switch) findViewById(R.id.switch_show_duration)).isChecked();
                 smoothDateRangePickerFragment.setShowDuration(showDuration);
 
+                boolean showDateEnableDisable = ((Switch) findViewById(R.id.switch_show_date_enable_disable)).isChecked();
+                smoothDateRangePickerFragment.setShowDateEnableDisable(showDateEnableDisable);
+
                 smoothDateRangePickerFragment.show(getFragmentManager(), pickerFragmentTag);
             }
         });
@@ -79,30 +78,42 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
             pickerFragment.setOnDateSetListener(new SmoothDateRangePickerFragment.OnDateRangeSetListener() {
                 @Override
                 public void onDateRangeSet(SmoothDateRangePickerFragment view,
-                                           int yearStart, int monthStart, int dayStart,
-                                           int yearEnd, int monthEnd, int dayEnd)
+                                           Calendar calendarStart,
+                                           Calendar calendarEnd)
                 {
-                    onActivityDateRangeSet(view,
-                                           yearStart, monthStart, dayStart,
-                                           yearEnd, monthEnd, dayEnd);
+                    onActivityDateRangeSet(view, calendarStart, calendarEnd);
                 }
             });
         }
     }
 
     protected void onActivityDateRangeSet(SmoothDateRangePickerFragment view,
-                                  int yearStart, int monthStart,
-                                  int dayStart, int yearEnd,
-                                  int monthEnd, int dayEnd)
+                                          Calendar calendarStart,
+                                          Calendar calendarEnd)
     {
-        final TextView tvDateRange = (TextView) findViewById(R.id.tv_date_range);
-        String date = "You picked the following date range: \n"
-                + "From " + dayStart + "/" + (++monthStart)
-                + "/" + yearStart + " To " + dayEnd + "/"
-                + (++monthEnd) + "/" + yearEnd;
+        String date;
+        if (calendarStart == null && calendarEnd == null) {
+            date = "No date enabled !";  // impossible case
+        } else {
+            date = "You picked the following date range: \n"
+                    + "From " + formatDate(calendarStart)
+                    + " To " + formatDate(calendarEnd);
+        }
+
+        final TextView tvDateRange = findViewById(R.id.tv_date_range);
         tvDateRange.setText(date);
     }
 
+    private static String formatDate(Calendar calendar) {
+        if (calendar != null) {
+            return calendar.get(Calendar.YEAR) + "/" +
+                    (calendar.get(Calendar.MONTH) + 1) + "/" +
+                    calendar.get(Calendar.DAY_OF_MONTH);
+        } else {
+            return "...";
+        }
+    }
+
     protected void onCreateDate()
     {
         final TextView tvDate = (TextView) findViewById(R.id.tv_date);
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index db7c2be..f14cb98 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -14,6 +14,15 @@
         android:checked="false"
         />
 
+    <Switch
+        android:id="@+id/switch_show_date_enable_disable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="Shows date enable/disable switch"
+        android:checked="false"
+        />
+
     <Switch
         android:id="@+id/switch_dark_theme"
         android:layout_width="wrap_content"

From 9043dea55abfdcbc0050e777781b9a7db576d22d Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Mon, 31 Jan 2022 21:53:58 +0100
Subject: [PATCH 18/22] Rollback minSdkVersion to 14 (instead of 21)

---
 library/build.gradle | 2 +-
 sample/build.gradle  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/build.gradle b/library/build.gradle
index 3fb36a2..b3480a4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 14
         targetSdkVersion 31
         versionCode 4
         versionName "0.4.0"
diff --git a/sample/build.gradle b/sample/build.gradle
index ccbbc51..5687a61 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "com.wsbak.smoothdaterangepicker"
-        minSdkVersion 21
+        minSdkVersion 14
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"

From 1d4fdc1b444c3d13051f2fed5bbc5dfb2237c7dd Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Wed, 2 Feb 2022 21:48:37 +0100
Subject: [PATCH 19/22] Add publishToMavenLocal so library is locally available
 for another project

Must add mavenLocal() into gradle's repositories of the other project
---
 library/build.gradle | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/library/build.gradle b/library/build.gradle
index b3480a4..9ff59f5 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion 31
@@ -68,6 +69,25 @@ ext {
 group = publishedGroupId
 version = libraryVersion
 
+def artifactId = artifact
+def groupId = publishedGroupId
+
+// https://medium.com/android-news/android-local-libraries-with-maven-b7456d4268cf
+// Gradle / library / Tasks / publishing / publishToMavenLocal
+project.afterEvaluate {
+    publishing {
+        publications {
+            library(MavenPublication) {
+                setGroupId groupId
+                setArtifactId artifactId
+                version android.defaultConfig.versionName
+
+                artifact bundleReleaseAar
+            }
+        }
+    }
+}
+
 //install {
 //    repositories.mavenInstaller {
 //        // This generates POM.xml with proper parameters

From e32b07155f86da4fa270806d8bbbd5082e3791b2 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 3 Feb 2022 16:20:25 +0100
Subject: [PATCH 20/22] Add setStartDate & setEndDate

Remove method newInstance with date
Remove method initialize
---
 README.md                                     | 16 ++--
 .../date/SmoothDateRangePickerFragment.java   | 86 +++++++++++--------
 .../color/mdtp_material_switch_thumb_dark.xml |  1 +
 .../MainActivity.java                         |  8 ++
 4 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index 8d6d23b..000de34 100644
--- a/README.md
+++ b/README.md
@@ -35,12 +35,6 @@ SmoothDateRangePickerFragment.newInstance(SmoothDateRangePickerFragment.OnDateRa
 ```
 
 
-**Instantiation, specify the default selected date:**
-```
-SmoothDateRangePickerFragment.newInstance(SmoothDateRangePickerFragment.OnDateRangeSetListener callBack, 
-int year, int monthOfYear, int dayOfMonth)
-```
-
 After instantiation, remember to call
 
 `show (FragmentManager manager, String tag)`
@@ -83,8 +77,16 @@ smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"
 
 `setMaxDate(Calendar calendar)`
 
+**Set the default selected start date:**
+
+`setStartDate(Calendar calendar)`
+
+**Set the default selected end date:**
+
+`setEndDate(Calendar calendar)`
+
 
-### Enable Date
+### Disable/Enable Date
 **Show disable/enable date control:**
 
 `setShowDateEnableDisable(true)`
diff --git a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 0225bd9..945f86f 100644
--- a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -356,10 +356,10 @@ public boolean isDisabled() {
 
     private int mDuration;
 
-    private boolean mThemeDark;
+    private boolean mThemeDark = false;
     private int mAccentColor = -1;
-    private boolean mVibrate;
-    private boolean mDismissOnPause;
+    private boolean mVibrate = true;
+    private boolean mDismissOnPause = false;
 
     private HapticFeedbackController mHapticFeedbackController;
 
@@ -400,47 +400,19 @@ public SmoothDateRangePickerFragment() {
         // Empty constructor required for dialog fragment.
     }
 
-    /**
-     * @param callBack    How the parent is notified that the date is set.
-     * @param year        The initial year of the dialog.
-     * @param monthOfYear The initial month of the dialog.
-     * @param dayOfMonth  The initial day of the dialog.
-     */
-    public static SmoothDateRangePickerFragment newInstance(OnDateRangeSetListener callBack, int year,
-                                                    int monthOfYear,
-                                                    int dayOfMonth) {
-        SmoothDateRangePickerFragment ret = new SmoothDateRangePickerFragment();
-        ret.initialize(callBack, year, monthOfYear, dayOfMonth);
-        return ret;
-    }
-
     /**
      * @param callBack How the parent is notified that the date is set.
      *                 the initial date is set to today
      */
     public static SmoothDateRangePickerFragment newInstance(OnDateRangeSetListener callBack) {
         SmoothDateRangePickerFragment ret = new SmoothDateRangePickerFragment();
+        ret.mCallBack = callBack;
         Calendar todayCal = Calendar.getInstance();
-        ret.initialize(callBack, todayCal.get(Calendar.YEAR), todayCal.get(Calendar.MONTH),
-                todayCal.get(Calendar.DAY_OF_MONTH));
+        ret.setStartDate(todayCal);
+        ret.setEndDate(todayCal);
         return ret;
     }
 
-    public void initialize(OnDateRangeSetListener callBack, int year, int monthOfYear, int dayOfMonth) {
-        mCallBack = callBack;
-        mDateStart.mCalendar.set(Calendar.YEAR, year);
-        mDateStart.mCalendar.set(Calendar.MONTH, monthOfYear);
-        mDateStart.mCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-        mDateEnd.mCalendar.set(Calendar.YEAR, year);
-        mDateEnd.mCalendar.set(Calendar.MONTH, monthOfYear);
-        mDateEnd.mCalendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-
-        mThemeDark = false;
-        mAccentColor = -1;
-        mVibrate = true;
-        mDismissOnPause = false;
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -882,6 +854,52 @@ public void setYearRange(int startYear, int endYear) {
         mDateEnd.onChange();
     }
 
+    /**
+     * Sets the default selected start date
+     * Must be coherent with MinDate & MaxDate
+     *
+     * @param calendar a Calendar object set to the year, month, day desired as the selected start date.
+     */
+    public void setStartDate(Calendar calendar) {
+        if (calendar.before(mMinDate)) {
+            throw new IllegalArgumentException("calendar must be >= mMinDate");
+        }
+        if (calendar.after(mMaxDate)) {
+            throw new IllegalArgumentException("calendar must be <= mMaxDate");
+        }
+
+        mDateStart.mCalendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR));
+        mDateStart.mCalendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH));
+        mDateStart.mCalendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH));
+
+        if (mDateEnd.mCalendar.before(mDateStart.mCalendar)) {
+            setEndDate(mDateStart.mCalendar);
+        }
+    }
+
+    /**
+     * Sets the default selected end date
+     * Must be coherent with MinDate & MaxDate
+     *
+     * @param calendar a Calendar object set to the year, month, day desired as the selected end date.
+     */
+    public void setEndDate(Calendar calendar) {
+        if (calendar.before(mMinDate)) {
+            throw new IllegalArgumentException("calendar must be >= mMinDate");
+        }
+        if (calendar.after(mMaxDate)) {
+            throw new IllegalArgumentException("calendar must be <= mMaxDate");
+        }
+
+        mDateEnd.mCalendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR));
+        mDateEnd.mCalendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH));
+        mDateEnd.mCalendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH));
+
+        if (mDateStart.mCalendar.after(mDateEnd.mCalendar)) {
+            setStartDate(mDateEnd.mCalendar);
+        }
+    }
+
     /**
      * Sets the minimal date supported by this DatePicker. Dates before (but not including) the
      * specified date will be disallowed from being selected.
diff --git a/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml b/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
index a0821d0..55a87a1 100644
--- a/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
+++ b/library/src/main/res/color/mdtp_material_switch_thumb_dark.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true"  android:color="@color/mdtp_ampm_text_color"/>
+<!--    <item android:state_checked="true"  android:color="@color/mdtp_date_picker_view_animator_dark_theme"/>-->
     <item android:state_checked="false" android:color="@color/mdtp_accent_color"/>
 </selector>
diff --git a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
index 4b43546..1d9033c 100644
--- a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
@@ -57,6 +57,14 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                 cMax.set(Calendar.DAY_OF_MONTH, 31);
                 smoothDateRangePickerFragment.setMaxDate(cMax);  // last day of current year
 
+                final Calendar cStart = Calendar.getInstance();
+                cStart.add(Calendar.DAY_OF_MONTH, -3);
+                smoothDateRangePickerFragment.setStartDate(cStart);
+
+                final Calendar cEnd = Calendar.getInstance();
+                cEnd.add(Calendar.DAY_OF_MONTH, +1);
+                smoothDateRangePickerFragment.setEndDate(cEnd);
+
                 boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
                 smoothDateRangePickerFragment.setThemeDark(isThemeDark);
 

From 7a3c1bbcdcf6f1a168249496d1946b9b8ce3cd84 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Sat, 5 Feb 2022 18:39:40 +0100
Subject: [PATCH 21/22] Add enableStartDate and enableEndDate

---
 README.md                                     | 10 ++++-
 library/build.gradle                          |  4 +-
 .../date/SmoothDateRangePickerFragment.java   | 17 ++++++++-
 .../MainActivity.java                         | 26 +++++++++++--
 sample/src/main/res/layout/activity_main.xml  | 37 ++++++++++++++++---
 5 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 000de34..f961131 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ repositories {
 Add the following into app `build.gradle`:
 ```
 dependencies {
-  implementation 'com.github.wsbak:SmoothDateRangePicker:master-SNAPSHOT'
+  implementation 'com.github.wsbak:SmoothDateRangePicker:0.4.1'
 }
 ```
 
@@ -91,6 +91,14 @@ smoothDateRangePickerFragment.show(getFragmentManager(), "smoothDateRangePicker"
 
 `setShowDateEnableDisable(true)`
 
+**Disable start date:**
+
+`enableStartDate(false)`
+
+**Disable end date:**
+
+`enableEndDate(false)`
+
 
 ### Duration
 **Hide duration:**
diff --git a/library/build.gradle b/library/build.gradle
index 9ff59f5..9d157c7 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 31
         versionCode 4
-        versionName "0.4.0"
+        versionName "0.4.1"
     }
     buildTypes {
         release {
@@ -55,7 +55,7 @@ ext {
     siteUrl = 'https://github.com/wsbak/SmoothDateRangePicker'
     gitUrl = 'https://github.com/wsbak/SmoothDateRangePicker.git'
 
-    libraryVersion = '0.4.0'
+    libraryVersion = '0.4.1'
 
     developerId = 'wsbak'
     developerName = 'wsbak'
diff --git a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
index 945f86f..ef22700 100644
--- a/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
+++ b/library/src/main/java/com/wsbak/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
@@ -156,6 +156,7 @@ public void onCreateView(ViewGroup view,
             mYearPickerView = new YearPickerView(activity, mFragment);
 
             mDateEnabledView = view.findViewById(R.id.date_picker_enable);
+            mDateEnabledView.setChecked(mDateEnabledAtBeginning);
             mDateEnabledView.setOnClickListener(this);
 
             loadInstanceState(savedInstanceState);
@@ -193,7 +194,6 @@ public void onCreateViewFinalize()
         {
             if (!mShowDateEnableDisable) {
                 mDateEnabledView.setVisibility(View.GONE);
-                return;
             }
 
             if (!mDateEnabledView.isChecked())
@@ -280,6 +280,7 @@ public boolean isDisabled() {
         private DayPickerView mDayPickerView;
         private YearPickerView mYearPickerView;
         SwitchMaterial mDateEnabledView;
+        private boolean mDateEnabledAtBeginning = true;
         private boolean mShowDateEnableDisable = false;
 
         private static final String KEY_SELECTED_YEAR = "selected_year";
@@ -962,6 +963,20 @@ public void setShowDateEnableDisable(boolean show) {
         mDateEnd.mShowDateEnableDisable = show;
     }
 
+    public void enableStartDate(boolean enable) {
+        if (!enable && !mDateEnd.mDateEnabledAtBeginning) {
+            throw new IllegalArgumentException("1 date must be enabled");
+        }
+        mDateStart.mDateEnabledAtBeginning = enable;
+    }
+
+    public void enableEndDate(boolean enable) {
+        if (!enable && !mDateStart.mDateEnabledAtBeginning) {
+            throw new IllegalArgumentException("1 date must be enabled");
+        }
+        mDateEnd.mDateEnabledAtBeginning = enable;
+    }
+
 
     // update highlight days
     private void updateHighlightDays() {
diff --git a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
index 1d9033c..e22293d 100644
--- a/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
+++ b/sample/src/main/java/com/wsbak/smoothdaterangepickerexample/MainActivity.java
@@ -25,6 +25,20 @@ protected void onCreate(Bundle savedInstanceState)
         onCreateDate();
     }
 
+    public void onEnableDateClick(View view)
+    {
+        final Switch startDateEnable = (Switch) findViewById(R.id.switch_enable_start_date);
+        final Switch endDateEnable = (Switch) findViewById(R.id.switch_enable_end_date);
+        if (!startDateEnable.isChecked() && !endDateEnable.isChecked()) {
+            // 1 date must be enable, so enable the other one
+            if (view == startDateEnable) {
+                endDateEnable.setChecked(true);
+            } else {
+                startDateEnable.setChecked(true);
+            }
+        }
+    }
+
     protected void onCreateDateRange()
     {
         final String pickerFragmentTag = "Datepickerdialog";
@@ -65,15 +79,21 @@ public void onDateRangeSet(SmoothDateRangePickerFragment view,
                 cEnd.add(Calendar.DAY_OF_MONTH, +1);
                 smoothDateRangePickerFragment.setEndDate(cEnd);
 
-                boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
+                final boolean isThemeDark = ((Switch) findViewById(R.id.switch_dark_theme)).isChecked();
                 smoothDateRangePickerFragment.setThemeDark(isThemeDark);
 
-                boolean showDuration = ((Switch) findViewById(R.id.switch_show_duration)).isChecked();
+                final boolean showDuration = ((Switch) findViewById(R.id.switch_show_duration)).isChecked();
                 smoothDateRangePickerFragment.setShowDuration(showDuration);
 
-                boolean showDateEnableDisable = ((Switch) findViewById(R.id.switch_show_date_enable_disable)).isChecked();
+                final boolean showDateEnableDisable = ((Switch) findViewById(R.id.switch_show_date_enable_disable)).isChecked();
                 smoothDateRangePickerFragment.setShowDateEnableDisable(showDateEnableDisable);
 
+                final boolean startDateEnable = ((Switch) findViewById(R.id.switch_enable_start_date)).isChecked();
+                smoothDateRangePickerFragment.enableStartDate(startDateEnable);
+
+                final boolean endDateEnable = ((Switch) findViewById(R.id.switch_enable_end_date)).isChecked();
+                smoothDateRangePickerFragment.enableEndDate(endDateEnable);
+
                 smoothDateRangePickerFragment.show(getFragmentManager(), pickerFragmentTag);
             }
         });
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index f14cb98..908fdb6 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -11,17 +11,42 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="Shows duration"
-        android:checked="false"
+        android:checked="true"
         />
 
-    <Switch
-        android:id="@+id/switch_show_date_enable_disable"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="Shows date enable/disable switch"
-        android:checked="false"
-        />
+        >
+        <Switch
+            android:id="@+id/switch_show_date_enable_disable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Shows date enable/disable"
+            android:checked="true"
+            />
+        <Switch
+            android:id="@+id/switch_enable_start_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Start"
+            android:checked="true"
+            android:onClick="onEnableDateClick"
+            />
+        <Switch
+            android:id="@+id/switch_enable_end_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="End"
+            android:checked="true"
+            android:onClick="onEnableDateClick"
+            />
+
+    </LinearLayout>
 
     <Switch
         android:id="@+id/switch_dark_theme"

From 83b62373bdcd9662d428f481bb0e9ffdfd459693 Mon Sep 17 00:00:00 2001
From: wsbak <wsbak@free.fr>
Date: Thu, 10 Feb 2022 21:54:07 +0100
Subject: [PATCH 22/22] Update screenshots

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f961131..fed906b 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,11 @@ Smooth Date Range Picker is an android widget for selecting date range quickly a
 
 Date Range Picker | Duration Number Pad | Date Range Picker Dark Theme | Date Range Picker Landscape
 ---- | ----| ----| ----
-![Date Range Picker](https://raw.githubusercontent.com/leavjenn/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker.png) | ![Duration Number Pad](https://raw.githubusercontent.com/leavjenn/SmoothDateRangePicker/gh-pages/screenshots/date_duration_number_pad.png) | ![Date Range Picker Dark Theme](https://raw.githubusercontent.com/leavjenn/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker_dark_theme.png) | ![Date Range Picker Landscape](https://raw.githubusercontent.com/leavjenn/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker_landscape.png)
+![Date Range Picker](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker.png) | ![Duration Number Pad](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/date_duration_number_pad.png) | ![Date Range Picker Dark Theme](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker_dark_theme.png) | ![Date Range Picker Landscape](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/date_range_picker_landscape.png)
+
+Date Disable Enable Controls | Start Date Disabled | End Date Disabled | End Date Disabled Landscape Dark Theme
+---- | ----| ----| ----
+![Date Disable Enable Controls](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/Date_disable_enable_controls.png) | ![Start Date Disabled](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/Start_date_disabled.png) | ![End Date Disabled](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/End_date_disabled.png) | ![End Date Disabled Landscape Dark Theme](https://raw.githubusercontent.com/wsbak/SmoothDateRangePicker/gh-pages/screenshots/End_date_disabled_landscape_dark_theme.png)
 
 ## Setup