From bbeaf11fd95584450017e505c227a34094c0f7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Chaqu=C3=A9s?= <javichaques@gmail.com>
Date: Sun, 6 Aug 2017 15:52:29 +0200
Subject: [PATCH 1/4] - Update Build Tools Version to 25.0.3 - Update Support
 Library Version to 25.4.0 - Add neutral button

---
 build.gradle                                  |   8 +-
 sample/build.gradle                           |  19 ++--
 .../switchdatetimesample/Sample.java          | 106 +++++++++++-------
 .../src/main/res/layout/activity_sample.xml   |  10 +-
 sample/src/main/res/values/strings.xml        |   2 +
 switchdatetime/build.gradle                   |  23 ++--
 .../SwitchDateTimeDialogFragment.java         |  29 +++++
 7 files changed, 124 insertions(+), 73 deletions(-)

diff --git a/build.gradle b/build.gradle
index c2eea8e..f456794 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,16 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath "com.android.tools.build:gradle:2.3.3"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://maven.google.com" }
     }
 }
 
diff --git a/sample/build.gradle b/sample/build.gradle
index c8d5d4a..f13d8eb 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,30 +1,27 @@
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "com.kunzisoft.switchdatetimepicker.sample"
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 }
 
+def supportVersion = "25.4.0"
+
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
-    compile project(path: ':switchdatetime')
+    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "com.android.support:appcompat-v7:$supportVersion"
+    compile project(path: ":switchdatetime")
 }
diff --git a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
index 600ef06..e5f467c 100644
--- a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
+++ b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
@@ -41,59 +41,81 @@ protected void onCreate(Bundle savedInstanceState) {
             textView.setText(savedInstanceState.getCharSequence(STATE_TEXTVIEW));
         }
 
-        // Construct SwitchDateTimePicker
-        dateTimeFragment = (SwitchDateTimeDialogFragment) getSupportFragmentManager().findFragmentByTag(TAG_DATETIME_FRAGMENT);
-        if(dateTimeFragment == null) {
-            dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
-                    getString(R.string.label_datetime_dialog),
-                    getString(android.R.string.ok),
-                    getString(android.R.string.cancel)
-            );
-        }
-
-        // Assign values we want
-        final SimpleDateFormat myDateFormat = new SimpleDateFormat("d MMM yyyy HH:mm", java.util.Locale.getDefault());
-        dateTimeFragment.startAtCalendarView();
-        dateTimeFragment.set24HoursMode(false);
-        dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
-        dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
-        dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
-        // Or assign each element, default element is the current moment
-        // dateTimeFragment.setDefaultHourOfDay(15);
-        // dateTimeFragment.setDefaultMinute(20);
-        // dateTimeFragment.setDefaultDay(4);
-        // dateTimeFragment.setDefaultMonth(Calendar.MARCH);
-        // dateTimeFragment.setDefaultYear(2017);
-
-        // Define new day and month format
-        try {
-            dateTimeFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("MMMM dd", Locale.getDefault()));
-        } catch (SwitchDateTimeDialogFragment.SimpleDateMonthAndDayFormatException e) {
-            Log.e(TAG, e.getMessage());
-        }
-
-        // Set listener for date
-        dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonClickListener() {
+        Button buttonView = (Button) findViewById(R.id.button);
+        buttonView.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onPositiveButtonClick(Date date) {
-                textView.setText(myDateFormat.format(date));
-            }
+            public void onClick(View view) {
+                dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
+                        getString(R.string.label_datetime_dialog),
+                        getString(android.R.string.ok),
+                        getString(android.R.string.cancel)
+                );
+                setupDatetimeFragment();
 
-            @Override
-            public void onNegativeButtonClick(Date date) {
-                textView.setText("");
+                dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
             }
         });
 
-        Button buttonView = (Button) findViewById(R.id.button);
-        buttonView.setOnClickListener(new View.OnClickListener() {
+        Button neutralButtonView = (Button) findViewById(R.id.button_neutral);
+        neutralButtonView.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
+            public void onClick(View v) {
+                dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
+                        getString(R.string.label_datetime_dialog),
+                        getString(android.R.string.ok),
+                        getString(android.R.string.cancel),
+                        getString(R.string.clean)
+                );
+                setupDatetimeFragment();
+
                 dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
             }
         });
     }
 
+    private void setupDatetimeFragment() {
+        if (dateTimeFragment != null) {
+            // Assign values we want
+            final SimpleDateFormat myDateFormat = new SimpleDateFormat("d MMM yyyy HH:mm", java.util.Locale.getDefault());
+            dateTimeFragment.startAtCalendarView();
+            dateTimeFragment.set24HoursMode(false);
+            dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
+            dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
+            dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
+            // Or assign each element, default element is the current moment
+            // dateTimeFragment.setDefaultHourOfDay(15);
+            // dateTimeFragment.setDefaultMinute(20);
+            // dateTimeFragment.setDefaultDay(4);
+            // dateTimeFragment.setDefaultMonth(Calendar.MARCH);
+            // dateTimeFragment.setDefaultYear(2017);
+
+            // Define new day and month format
+            try {
+                dateTimeFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("MMMM dd", Locale.getDefault()));
+            } catch (SwitchDateTimeDialogFragment.SimpleDateMonthAndDayFormatException e) {
+                Log.e(TAG, e.getMessage());
+            }
+
+            // Set listener for date
+            dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonClickListener() {
+                @Override
+                public void onPositiveButtonClick(Date date) {
+                    textView.setText(myDateFormat.format(date));
+                }
+
+                @Override
+                public void onNegativeButtonClick(Date date) {
+
+                }
+
+                @Override
+                public void onNeutralButtonClick(Date date) {
+                    textView.setText("");
+                }
+            });
+        }
+    }
+
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         // Save the current textView
diff --git a/sample/src/main/res/layout/activity_sample.xml b/sample/src/main/res/layout/activity_sample.xml
index 696c0f6..455065d 100644
--- a/sample/src/main/res/layout/activity_sample.xml
+++ b/sample/src/main/res/layout/activity_sample.xml
@@ -16,11 +16,19 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true" />
 
+    <Button
+        android:id="@+id/button_neutral"
+        android:text="@string/open_datetime_dialog_with_neutral_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/button"/>
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/button"
+        android:layout_below="@+id/button_neutral"
         android:layout_centerHorizontal="true" />
 
 </RelativeLayout>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index c1269d3..a3c77ca 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="switch_datetime_picker_name">Switch DateTime Picker</string>
     <string name="open_datetime_dialog">Open DateTime Dialog</string>
+    <string name="open_datetime_dialog_with_neutral_button">Open DateTime Dialog with Neutral Button</string>
+    <string name="clean">Clean</string>
 </resources>
diff --git a/switchdatetime/build.gradle b/switchdatetime/build.gradle
index e8e80f3..af05044 100644
--- a/switchdatetime/build.gradle
+++ b/switchdatetime/build.gradle
@@ -1,32 +1,29 @@
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 }
 
+def supportVersion = "25.4.0"
+
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.prolificinteractive:material-calendarview:1.4.3'
-    testCompile 'junit:junit:4.12'
+    compile fileTree(dir: "libs", include: ["*.jar"])
+    compile "com.android.support:appcompat-v7:$supportVersion"
+    compile "com.android.support:recyclerview-v7:$supportVersion"
+    compile "com.prolificinteractive:material-calendarview:1.4.3"
 }
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index d3c0ccd..e72ad76 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -47,10 +47,12 @@ public class SwitchDateTimeDialogFragment extends DialogFragment {
     private static final String TAG_LABEL = "LABEL";
     private static final String TAG_POSITIVE_BUTTON = "POSITIVE_BUTTON";
     private static final String TAG_NEGATIVE_BUTTON = "NEGATIVE_BUTTON";
+    private static final String TAG_NEUTRAL_BUTTON = "NEUTRAL_BUTTON";
 
     private String mLabel;
     private String mPositiveButton;
     private String mNegativeButton;
+    private String mNeutralButton;
     private OnButtonClickListener mListener;
 
     private final static int UNDEFINED_TIME_VALUE = -1;
@@ -87,12 +89,26 @@ public class SwitchDateTimeDialogFragment extends DialogFragment {
      * @return DialogFragment
      */
     public static SwitchDateTimeDialogFragment newInstance(String label, String positiveButton, String negativeButton) {
+        return newInstance(label, positiveButton, negativeButton, null);
+    }
+
+    /**
+     * Create a new instance of SwitchDateTimeDialogFragment
+     * @param label Title of dialog
+     * @param positiveButton Text for positive button
+     * @param negativeButton Text for negative button
+     * @return DialogFragment
+     */
+    public static SwitchDateTimeDialogFragment newInstance(String label, String positiveButton, String negativeButton, String neutralButton) {
         SwitchDateTimeDialogFragment switchDateTimeDialogFragment = new SwitchDateTimeDialogFragment();
         // Add arguments
         Bundle args = new Bundle();
         args.putString(TAG_LABEL, label);
         args.putString(TAG_POSITIVE_BUTTON, positiveButton);
         args.putString(TAG_NEGATIVE_BUTTON, negativeButton);
+        if (neutralButton != null) {
+            args.putString(TAG_NEUTRAL_BUTTON, neutralButton);
+        }
         switchDateTimeDialogFragment.setArguments(args);
 
         return switchDateTimeDialogFragment;
@@ -123,6 +139,7 @@ public void onSaveInstanceState(Bundle savedInstanceState) {
             mLabel = getArguments().getString(TAG_LABEL);
             mPositiveButton = getArguments().getString(TAG_POSITIVE_BUTTON);
             mNegativeButton = getArguments().getString(TAG_NEGATIVE_BUTTON);
+            mNeutralButton = getArguments().getString(TAG_NEUTRAL_BUTTON);
         }
 
         if (!assignDefaultDateTimeCalendar && savedInstanceState != null) {
@@ -337,6 +354,17 @@ public void onClick(DialogInterface dialog, int which) {
                     }
                 });
 
+        if (mNegativeButton != null) {
+            db.setNeutralButton(mNeutralButton, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (mListener != null) {
+                        assignAllValuesToCalendar();
+                        mListener.onNeutralButtonClick(dateTimeCalendar.getTime());
+                    }
+                }
+            });
+        }
         return db.create();
     }
 
@@ -593,6 +621,7 @@ public class SimpleDateMonthAndDayFormatException extends Exception {
     public interface OnButtonClickListener {
         void onPositiveButtonClick(Date date);
         void onNegativeButtonClick(Date date);
+        void onNeutralButtonClick(Date date);
     }
 
     /**

From 610bf0a387ef8dc928e4f24b082cbcfcde21d202 Mon Sep 17 00:00:00 2001
From: JJamet <jamet.jeremy@outlook.com>
Date: Mon, 7 Aug 2017 15:01:42 +0200
Subject: [PATCH 2/4] Solve bug in sample and update readme

---
 ReadMe.md                                     |  31 ++++-
 art/screen3.jpg                               | Bin 0 -> 3005 bytes
 .../switchdatetimesample/Sample.java          | 114 ++++++++----------
 .../src/main/res/layout/activity_sample.xml   |  10 +-
 .../SwitchDateTimeDialogFragment.java         |  12 +-
 5 files changed, 90 insertions(+), 77 deletions(-)
 create mode 100644 art/screen3.jpg

diff --git a/ReadMe.md b/ReadMe.md
index dc43d4b..9ddca42 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -28,7 +28,7 @@ Add the JitPack repository in your build.gradle at the end of repositories:
 And add the dependency
 ```
 	dependencies {
-	        compile 'com.github.Kunzisoft:Android-SwitchDateTimePicker:1.7'
+	        compile 'com.github.Kunzisoft:Android-SwitchDateTimePicker:1.8'
 	}
 ```
 
@@ -137,6 +137,35 @@ dateTimeDialogFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment
 // Show
 dateTimeDialogFragment.show(getSupportFragmentManager(), "dialog_time");
 ```
+
+#### Neutral button
+
+<img src="https://raw.githubusercontent.com/Kunzisoft/Android-SwitchDateTimePicker/master/art/screen3.jpg" width="320">
+
+To use with a neutral button, initialize with another parameter and implement the *OnButtonWithNeutralClickListener* :
+```
+SwitchDateTimeDialogFragment dateTimeDialogFragment = SwitchDateTimeDialogFragment.newInstance(
+        "Title example",
+        "OK",
+        "Cancel",
+        "Clean"
+);
+
+dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonWithNeutralClickListener() {
+    @Override
+    public void onPositiveButtonClick(Date date) {
+    }
+
+    @Override
+    public void onNegativeButtonClick(Date date) {
+    }
+
+    @Override
+    public void onNeutralButtonClick(Date date) {
+    }
+});
+```
+
 ## Bonus
 You can follow the project live on https://www.livecoding.tv/kunzisoft/
 
diff --git a/art/screen3.jpg b/art/screen3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..32258465cbdfe37c8782212c701e754721b00393
GIT binary patch
literal 3005
zcmb7Gc|25WA3tXn#y&G<EJemPlR`7LB)e=ym`g}y3}vUWl!%*(l(MBLOEg*HMsg*x
zkFi7~A|y?gY>`Ywk@x8B_IdC9eC{9bbDlrWIlt#Q=lMS0@9+D2)?co_0nmHREX@EA
z1OW@^0@jBC695i_ZFHz1ppHZ#kq88mpO=>hCCD!*D8MfuAS8@M3khR{1q9GyXpATh
zkH-s&h)am!B(OL<ZsQ{$9GZhb@*$CYI3WQc-2dIyn*a<7AcI6Whyh?25RL)Yn}N*$
z2*9D$g21l^t&j%>qM)E8^co8Oia<9oC<?9*0fKN4fT7`N007sh|2yEH_k=4|xcSGr
zT+VH8$E9w+u8hw|p&?SQkJQephkZOkEfw(iyxDOnFBOpB2F7=&c5B5{83M-~9$X6#
zo_(=@6Y`tdlyllib22n5Nc-Chj^Fc`tzJFliu_#e!Be|;E;T^kYBAki84|qn&)|Rl
z{cq2|Ly%<95F!8~;}@zQh;X6=ESZLffT19~AQHCf{z_CaTxF%zGe}}SKUavLhx3Ln
z#MW`^9X}<G?T_nr(P-2$EtGAXdBE5`ZH$XD{c6X!BIT2~%{ubJH}B2^o<;qSGcTl+
zKVVb0x>Z<A5-I7vnn%~DwTn+)&CI_mI*2FwtZLN`wD~yh=U<JU>e?$!G#s$WERVm{
zy0K7A3;@Dm2pFW3pCDk61ON<HmSQLBh9k%^8p&!#wCLpAGR_C2yaJV;((_~a5Mc)3
zCrW<%m>J7~8TT5?sS1@2S_!1eb5FL%PgCW|O-YOZ%Z^!7bgY`i=sb5$EkN6%_E{ZX
zG2!w|MZ|DB7p&(ywEDDWN3A+K%VVTIV{vrENHFvA1JjVhx?XNdTRq<qRmZzmbI%GF
zemGRUZP;2bmEv@q{cxnZ=(hJKrWAr%=}_2oZ}Et-{OzORQwp&rk-S*d>HU-@KZ`U?
zZqR6{(0C$2S_R`ZruAB$ggH_9+ClHmF5+@}k!$$P68&SDhE2t*fu(iVt$tHWQ1Y;6
zMNC|e_YLf-HleG4$F^zhn5)P2*JEXOnHg5v6kI)(@1gSm-`r5OG+%*u)RUaw$8hWK
z_*TL7zh2QQahc;)>h9{}(vlgjMds;vkaKq=)S-*{XP;w+yaxNC#`9NG)?Mny7GsjG
zTIu7JF7xkqH|>5_Yio2>!r6F_tiyncm!j72rL&fU0VA{2PKBsE@jt5z^m@}e`qlx6
zDI%0kFc=8q`K2ik24LV=Sy3YbnPNwClT%|v|DXo8LCvx|+3uKNYzwPjem<l5WVp^E
zkFBdkmB}s}?<-#p*VL7*6~_%~(&|1;z=^S;KHqbn9QceL4@F*T@N<pHd|jj(8Uz1g
z=SnwRoH+cfFnX{MBv%lO1=$w7JnO(<ZyON2b`$HA=<=3^a2KB_R#Uy!sXa<;nehtJ
zy#F3ni)CdbJWX~2htL|doUf6cfu|kMzt)W@J}0ck%ARyb8VHYyK%msn0Hik<0_5lY
znJFL)4j?dCQCW(Sof@P+d9pFhjgf3ZrRO&Ga29{24vztBnKF^YL3`Xx41d|2vb^~~
z)LPN*ES=Djdz!dx3#<~LQyCt4_dPj?$$pkS`lvYm5I(Fbszm0!!cfS}^xT)2^37Ib
z!H!$Px^~;6y-C3tQAb`#GgUQ9a@N#`O7xtGyAVd^brv!s*7g3Ca%LWYmWjx{eaa7`
z?a=jn!K+jQ6%+k{X7s`np8O7Pz~1^{sK&7Jg%M3Txk>G1Ngbc}?_L?#k&JnKwEKtl
z7{qxT0=WyeE_yYy1Zxr{)1J4zbmt3laOr-==faX3*T$W94&f7@k9B(L6@A=;Bs!l@
zrp!(yuGlKaxkv5#tv9iJpXtLBS;9$-DR<o^$DoS`q**bJi3#FqM^=69d(?O<q!^sj
zeGAIYH&m}%?WhCbF^3gS%*zexYqG@VkcSn-zR=BM()wrR)4G`P$2??D)p&?#Id@Vm
zacxXW$sZWQnt;axbZX9`1JlbsJ?(PPN$JGyH$Q}@h=!aDG6l%Zep&>Gkp&=n+!)ch
z1TrnTtnt5=06Ch0?5bMu)m}-_LHeYE$PR5obz0}Cry_()av_ad?{uFjC?sVbf2c4;
zD;tt9W^FG=7kv73ud-zO+z10-am7FFL|OdyuD4rmFjV*1n#+tSY~!ox%hRWv3pXNL
z(KDG_6qfVPdn$P!9~Po<4V%?jx}1A6DwV?SCnuw02T6W<ZPh5RN*hVC4Uft~0t+Sn
zDDS%@Ay;^9#jDpHCdY>inHy?|MoIX6o#5>Ioq46A?QZ$`ycUe^<_T@KZU2B>4L!iJ
z#PexgnZH}AuN6u!9K{LAOyX@x*%h^Oo8eV&Vb4PjuuSiJ8Z=fm<w+V>@4F17$RAY-
z*w`I(ilxH8b|YuhMznqNw8BKYLRy&D#z-=6kVWmkPT3f50Og4y2C5fO`oloPPZA&w
zD1eb0!!8-3AUgLi4mNBVy_T-!03U9U_1((8lm>oK*FCC4ZC^XCoRZRL7Pwj<6M)N#
zH43vcNYs@cFMU$z%1AsvrjncGC-dbitxfLD(}Q){itIN;9T_if$CH=MpOaiU`@S?J
zoy{Yo0v7V8f<+VhantS0kNT1={?{drUhl8E;ZN#ap6qk7vwoYd<T4u%#t9i;rLF@u
zTdXtZLR`g}<p$y(x8F}2IIV0_gfHpM31}I+lG(%G8Cth#JC>-?wq>yUbRfo$Glg?K
z`eqa@|HnD5$nuAkHy88a+_n!}AC(UVsOASsNo_;hoprcD?rSB3IxbG#(HG8~y%%xD
zyoI+VjMe8s@IUxEzBr6T3f(;nho6*Q+=IQp{o2&3T~o5LnJHV8G=RafjkIVd4&XXD
zgv-+7k%<W}`_^v#uvbXF(6I?b{#CM}^9xi2-55qt@q_mGm-}qkEBYH{i`xC>#v4lo
z)p6%7H55}uS1jBU9#78|@`_ZhXd+R!3g}WxkwgvV={1dyLl?y?Z?Oq3sX=Ama+RND
zwtXq&1FCu}_V_GcTI~qCghdVtZHgAtStxiK+<cd<c~#2SDu_;Qy{YUXMd`GCl<I+8
zNb$6;{>{($2yX$-%I*7_8vFL}p2@HU8=+3i2>O!mDE=HaLS27vWX=vUvMQg1ZRelD
zp9qSd8!1FIOYd2}qXb7Z+1hJ4%}C$9cHM2*Ja}~QM|#VmH;!KbB&@#yHzGjLA!Q~1
zbleSDsqYo*;IIBTn_j&M!GDb(E~lDCvZy}nYrHg!f&DSU>p=Gzr(_S2+EL#kj=sG=
zgB!R{YFlX$FD@8QT8Yv)6S;VwSU1@lESmBhtzy0ud@793oR0PO*%?qh2HP@Z+ozOO
zEgI{F53!ZoX7@3#gB|7_m(YHiCP~N$k^H?bMHnT59nk<d_AHB%0VCYS&>pG4i}o)H
zv`-Pr{j>7|Q}XuTLZ-*d>5y(K@H7`+iX@+L@wm0Cso<jXCIORkRFBZOR>M-`bHicm
zYU~@|2!qcdt$x-XH8yuvL&Vu($0QC^lo7S_9A1ohU3qk}^X5C<rjQQ}Uv=pdUv2x+
zy})@|FH5gSCFfvQ&M8))anc<O7UW+NoZzM+QY*8Q)3f#^9)z7qHS?8mn$(Y<hB1pr
U+#@~@>9DLmP1M#GK-)d|AE>IrK>z>%

literal 0
HcmV?d00001

diff --git a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
index e5f467c..5d81a1c 100644
--- a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
+++ b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
@@ -41,79 +41,65 @@ protected void onCreate(Bundle savedInstanceState) {
             textView.setText(savedInstanceState.getCharSequence(STATE_TEXTVIEW));
         }
 
-        Button buttonView = (Button) findViewById(R.id.button);
-        buttonView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
-                        getString(R.string.label_datetime_dialog),
-                        getString(android.R.string.ok),
-                        getString(android.R.string.cancel)
-                );
-                setupDatetimeFragment();
+        // Construct SwitchDateTimePicker
+        dateTimeFragment = (SwitchDateTimeDialogFragment) getSupportFragmentManager().findFragmentByTag(TAG_DATETIME_FRAGMENT);
+        if(dateTimeFragment == null) {
+            dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
+                    getString(R.string.label_datetime_dialog),
+                    getString(android.R.string.ok),
+                    getString(android.R.string.cancel),
+                    getString(R.string.clean) // Optional
+            );
+        }
 
-                dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
+        // Assign values we want
+        final SimpleDateFormat myDateFormat = new SimpleDateFormat("d MMM yyyy HH:mm", java.util.Locale.getDefault());
+        dateTimeFragment.startAtCalendarView();
+        dateTimeFragment.set24HoursMode(false);
+        dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
+        dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
+        dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
+        // Or assign each element, default element is the current moment
+        // dateTimeFragment.setDefaultHourOfDay(15);
+        // dateTimeFragment.setDefaultMinute(20);
+        // dateTimeFragment.setDefaultDay(4);
+        // dateTimeFragment.setDefaultMonth(Calendar.MARCH);
+        // dateTimeFragment.setDefaultYear(2017);
+
+        // Define new day and month format
+        try {
+            dateTimeFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("MMMM dd", Locale.getDefault()));
+        } catch (SwitchDateTimeDialogFragment.SimpleDateMonthAndDayFormatException e) {
+            Log.e(TAG, e.getMessage());
+        }
+
+        // Set listener for date
+        // Or use dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonClickListener() {
+        dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonWithNeutralClickListener() {
+            @Override
+            public void onPositiveButtonClick(Date date) {
+                textView.setText(myDateFormat.format(date));
             }
-        });
 
-        Button neutralButtonView = (Button) findViewById(R.id.button_neutral);
-        neutralButtonView.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
-                dateTimeFragment = SwitchDateTimeDialogFragment.newInstance(
-                        getString(R.string.label_datetime_dialog),
-                        getString(android.R.string.ok),
-                        getString(android.R.string.cancel),
-                        getString(R.string.clean)
-                );
-                setupDatetimeFragment();
+            public void onNegativeButtonClick(Date date) {
+                // Do nothing
+            }
 
-                dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
+            @Override
+            public void onNeutralButtonClick(Date date) {
+                // Optional if neutral button does'nt exists
+                textView.setText("");
             }
         });
-    }
 
-    private void setupDatetimeFragment() {
-        if (dateTimeFragment != null) {
-            // Assign values we want
-            final SimpleDateFormat myDateFormat = new SimpleDateFormat("d MMM yyyy HH:mm", java.util.Locale.getDefault());
-            dateTimeFragment.startAtCalendarView();
-            dateTimeFragment.set24HoursMode(false);
-            dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
-            dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
-            dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
-            // Or assign each element, default element is the current moment
-            // dateTimeFragment.setDefaultHourOfDay(15);
-            // dateTimeFragment.setDefaultMinute(20);
-            // dateTimeFragment.setDefaultDay(4);
-            // dateTimeFragment.setDefaultMonth(Calendar.MARCH);
-            // dateTimeFragment.setDefaultYear(2017);
-
-            // Define new day and month format
-            try {
-                dateTimeFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("MMMM dd", Locale.getDefault()));
-            } catch (SwitchDateTimeDialogFragment.SimpleDateMonthAndDayFormatException e) {
-                Log.e(TAG, e.getMessage());
+        Button buttonView = (Button) findViewById(R.id.button);
+        buttonView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
             }
-
-            // Set listener for date
-            dateTimeFragment.setOnButtonClickListener(new SwitchDateTimeDialogFragment.OnButtonClickListener() {
-                @Override
-                public void onPositiveButtonClick(Date date) {
-                    textView.setText(myDateFormat.format(date));
-                }
-
-                @Override
-                public void onNegativeButtonClick(Date date) {
-
-                }
-
-                @Override
-                public void onNeutralButtonClick(Date date) {
-                    textView.setText("");
-                }
-            });
-        }
+        });
     }
 
     @Override
diff --git a/sample/src/main/res/layout/activity_sample.xml b/sample/src/main/res/layout/activity_sample.xml
index 455065d..696c0f6 100644
--- a/sample/src/main/res/layout/activity_sample.xml
+++ b/sample/src/main/res/layout/activity_sample.xml
@@ -16,19 +16,11 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true" />
 
-    <Button
-        android:id="@+id/button_neutral"
-        android:text="@string/open_datetime_dialog_with_neutral_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/button"/>
-
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/button_neutral"
+        android:layout_below="@+id/button"
         android:layout_centerHorizontal="true" />
 
 </RelativeLayout>
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index e72ad76..8618e84 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -353,14 +353,14 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     }
                 });
-
-        if (mNegativeButton != null) {
+        if (mNeutralButton != null) {
             db.setNeutralButton(mNeutralButton, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     if (mListener != null) {
                         assignAllValuesToCalendar();
-                        mListener.onNeutralButtonClick(dateTimeCalendar.getTime());
+                        if(mListener instanceof OnButtonWithNeutralClickListener)
+                            ((OnButtonWithNeutralClickListener) mListener).onNeutralButtonClick(dateTimeCalendar.getTime());
                     }
                 }
             });
@@ -621,6 +621,12 @@ public class SimpleDateMonthAndDayFormatException extends Exception {
     public interface OnButtonClickListener {
         void onPositiveButtonClick(Date date);
         void onNegativeButtonClick(Date date);
+    }
+
+    /**
+     * Callback class for assign action on positive, negative and neutral button
+     */
+    public interface OnButtonWithNeutralClickListener extends OnButtonClickListener {
         void onNeutralButtonClick(Date date);
     }
 

From 14812161755292b9bdabb553ebd7d5727227a8c7 Mon Sep 17 00:00:00 2001
From: JJamet <jamet.jeremy@outlook.com>
Date: Sun, 13 Aug 2017 19:36:47 +0200
Subject: [PATCH 3/4] Solve default time bug

---
 .../switchdatetimesample/Sample.java          |  14 +-
 .../SwitchDateTimeDialogFragment.java         | 126 +++++++-----------
 .../time/RadialPickerLayout.java              |  31 +++--
 .../switchdatetime/time/SwitchTimePicker.java |  13 +-
 .../layout-ldrtl-v17/time_header_label.xml    |  41 +-----
 .../src/main/res/layout/time_header_label.xml |  49 +------
 6 files changed, 82 insertions(+), 192 deletions(-)

diff --git a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
index 5d81a1c..9b0034c 100644
--- a/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
+++ b/sample/src/main/java/com/kunzisoft/switchdatetimesample/Sample.java
@@ -52,19 +52,12 @@ protected void onCreate(Bundle savedInstanceState) {
             );
         }
 
-        // Assign values we want
+        // Init format
         final SimpleDateFormat myDateFormat = new SimpleDateFormat("d MMM yyyy HH:mm", java.util.Locale.getDefault());
-        dateTimeFragment.startAtCalendarView();
+        // Assign unmodifiable values
         dateTimeFragment.set24HoursMode(false);
         dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
         dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
-        dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
-        // Or assign each element, default element is the current moment
-        // dateTimeFragment.setDefaultHourOfDay(15);
-        // dateTimeFragment.setDefaultMinute(20);
-        // dateTimeFragment.setDefaultDay(4);
-        // dateTimeFragment.setDefaultMonth(Calendar.MARCH);
-        // dateTimeFragment.setDefaultYear(2017);
 
         // Define new day and month format
         try {
@@ -97,6 +90,9 @@ public void onNeutralButtonClick(Date date) {
         buttonView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                // Re-init each time
+                dateTimeFragment.startAtCalendarView();
+                dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
                 dateTimeFragment.show(getSupportFragmentManager(), TAG_DATETIME_FRAGMENT);
             }
         });
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index 8618e84..9f6e7d5 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -40,6 +40,9 @@ public class SwitchDateTimeDialogFragment extends DialogFragment {
     private static final String TAG = "SwitchDateTimeDialogFrg";
 
     private static final String STATE_DATETIME = "STATE_DATETIME";
+    private static final String STATE_CURRENT_POSITION = "STATE_CURRENT_POSITION";
+
+    private static final int UNDEFINED_POSITION = -1;
     private Calendar dateTimeCalendar = Calendar.getInstance();
     private Calendar minimumDateTime = new GregorianCalendar(1970, 1, 1);
     private Calendar maximumDateTime = new GregorianCalendar(2200, 1, 1);
@@ -55,16 +58,9 @@ public class SwitchDateTimeDialogFragment extends DialogFragment {
     private String mNeutralButton;
     private OnButtonClickListener mListener;
 
-    private final static int UNDEFINED_TIME_VALUE = -1;
-    private int year = UNDEFINED_TIME_VALUE;
-    private int month = UNDEFINED_TIME_VALUE;
-    private int day = UNDEFINED_TIME_VALUE;
-    private int hourOfDay = UNDEFINED_TIME_VALUE;
-    private int minute = UNDEFINED_TIME_VALUE;
-    private boolean assignDefaultDateTimeCalendar;
-
     private boolean is24HoursMode = false;
-    private int startAtPosition = 0;
+    private int startAtPosition = UNDEFINED_POSITION;
+    private int currentPosition = 0;
     private int alertStyleId;
 
     private SimpleDateFormat dayAndMonthSimpleDate;
@@ -124,8 +120,9 @@ public void setOnButtonClickListener(OnButtonClickListener onButtonClickListener
 
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
-        // Save the current datetime
+        // Save the current datetime and position
         savedInstanceState.putLong(STATE_DATETIME, dateTimeCalendar.getTimeInMillis());
+        savedInstanceState.putInt(STATE_CURRENT_POSITION, currentPosition);
         timePicker.onSaveInstanceState(savedInstanceState);
 
         super.onSaveInstanceState(savedInstanceState);
@@ -142,26 +139,11 @@ public void onSaveInstanceState(Bundle savedInstanceState) {
             mNeutralButton = getArguments().getString(TAG_NEUTRAL_BUTTON);
         }
 
-        if (!assignDefaultDateTimeCalendar && savedInstanceState != null) {
-            // Restore value from saved state
+        if(savedInstanceState != null) {
+            currentPosition = savedInstanceState.getInt(STATE_CURRENT_POSITION);
             dateTimeCalendar.setTime(new Date(savedInstanceState.getLong(STATE_DATETIME)));
         }
 
-        // Init values with current time if setDefault is not used
-        if(assignDefaultDateTimeCalendar || year == UNDEFINED_TIME_VALUE)
-            year = dateTimeCalendar.get(Calendar.YEAR);
-        if(assignDefaultDateTimeCalendar || month == UNDEFINED_TIME_VALUE)
-            month = dateTimeCalendar.get(Calendar.MONTH);
-        if(assignDefaultDateTimeCalendar || day == UNDEFINED_TIME_VALUE)
-            day = dateTimeCalendar.get(Calendar.DAY_OF_MONTH);
-        if(assignDefaultDateTimeCalendar || hourOfDay == UNDEFINED_TIME_VALUE)
-            hourOfDay = dateTimeCalendar.get(Calendar.HOUR_OF_DAY);
-        if(assignDefaultDateTimeCalendar || minute == UNDEFINED_TIME_VALUE)
-            minute = dateTimeCalendar.get(Calendar.MINUTE);
-        assignAllValuesToCalendar();
-
-        assignDefaultDateTimeCalendar = false;
-
         // Throw exception if default select date isn't between minimumDateTime and maximumDateTime
         if(dateTimeCalendar.before(minimumDateTime) || dateTimeCalendar.after(maximumDateTime))
             throw new RuntimeException("Default date " + dateTimeCalendar.getTime() + " must be between "
@@ -169,7 +151,6 @@ public void onSaveInstanceState(Bundle savedInstanceState) {
 
         LayoutInflater inflater = LayoutInflater.from(getActivity());
         getActivity().getTheme().applyStyle(R.style.Theme_SwitchDateTime, false);
-        //getActivity().setTheme(R.style.Theme_SwitchDateTime);
         View dateTimeLayout = inflater.inflate(R.layout.dialog_switch_datetime_picker,
                 (ViewGroup) getActivity().findViewById(R.id.datetime_picker));
 
@@ -193,6 +174,7 @@ public void onAnimationStart(Animation animation) {
             @Override
             public void onAnimationEnd(Animation animation) {
                 blockAnimationIn = false;
+                currentPosition = viewSwitcher.getDisplayedChild();
             }
 
             @Override
@@ -212,7 +194,11 @@ public void onAnimationEnd(Animation animation) {
             @Override
             public void onAnimationRepeat(Animation animation) {}
         });
-        viewSwitcher.setDisplayedChild(startAtPosition);
+
+        // Defined the start position
+        if(startAtPosition != UNDEFINED_POSITION)
+            currentPosition = startAtPosition;
+        viewSwitcher.setDisplayedChild(currentPosition);
 
         // Button for switch between Hours/Minutes, Calendar and YearList
         ImageButton buttonSwitch = (ImageButton) dateTimeLayout.findViewById(R.id.button_switch);
@@ -249,27 +235,22 @@ public void onClick(View view) {
             yearSimpleDate = new SimpleDateFormat("yyyy", Locale.getDefault());
 
         // Init headers
-        yearHeaderValues.setText(String.valueOf(year));
+        yearHeaderValues.setText(String.valueOf(dateTimeCalendar.get(Calendar.YEAR)));
         monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(dateTimeCalendar.getTime()));
 
         // Construct TimePicker
         SwitchTimePicker.OnTimeSelectedListener onTimeSelectedListener = new SwitchTimePicker.OnTimeSelectedListener() {
             @Override
             public void onTimeSelected(int hourOfDayTime, int minuteTime) {
-                hourOfDay = hourOfDayTime;
-                minute = minuteTime;
                 dateTimeCalendar.set(Calendar.HOUR_OF_DAY, hourOfDayTime);
                 dateTimeCalendar.set(Calendar.MINUTE, minuteTime);
             }
         };
         // Init time with saved elements
-        if(savedInstanceState == null)
-            timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener);
-        else
-            timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener, savedInstanceState);
+        timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener, savedInstanceState);
         timePicker.setIs24HourMode(is24HoursMode);
-        timePicker.setHourOfDay(hourOfDay);
-        timePicker.setMinute(minute);
+        timePicker.setHourOfDay(dateTimeCalendar.get(Calendar.HOUR_OF_DAY));
+        timePicker.setMinute(dateTimeCalendar.get(Calendar.MINUTE));
         timePicker.onCreateView(dateTimeLayout, savedInstanceState);
         timePicker.setOnClickTimeListener(onTimeClickListener);
 
@@ -285,16 +266,11 @@ public void onTimeSelected(int hourOfDayTime, int minuteTime) {
             @Override
             public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull CalendarDay calendarDay, boolean selected) {
                 Date currentDate = calendarDay.getDate();
-                year = calendarDay.getYear();
-                month = calendarDay.getMonth();
-                day = calendarDay.getDay();
-
-                dateTimeCalendar.set(Calendar.YEAR, year);
-                dateTimeCalendar.set(Calendar.MONTH, month);
-                dateTimeCalendar.set(Calendar.DAY_OF_MONTH, day);
-                listPickerYearView.assignCurrentYear(year);
-
-                yearHeaderValues.setText(String.valueOf(year));
+                dateTimeCalendar.set(Calendar.YEAR, calendarDay.getYear());
+                dateTimeCalendar.set(Calendar.MONTH, calendarDay.getMonth());
+                dateTimeCalendar.set(Calendar.DAY_OF_MONTH, calendarDay.getDay());
+                listPickerYearView.assignCurrentYear(calendarDay.getYear());
+                yearHeaderValues.setText(String.valueOf(calendarDay.getYear()));
                 monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(currentDate));
             }
         });
@@ -304,14 +280,12 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
         listPickerYearView = (ListPickerYearView) dateTimeLayout.findViewById(R.id.yearPicker);
         listPickerYearView.setMinYear(minimumDateTime.get(Calendar.YEAR));
         listPickerYearView.setMaxYear(maximumDateTime.get(Calendar.YEAR));
-        listPickerYearView.assignCurrentYear(year);
+        listPickerYearView.assignCurrentYear(dateTimeCalendar.get(Calendar.YEAR));
         listPickerYearView.setDatePickerListener(new OnYearSelectedListener() {
             @Override
             public void onYearSelected(View view, int yearPicker) {
-                year = yearPicker;
-
-                dateTimeCalendar.set(Calendar.YEAR, year);
-                yearHeaderValues.setText(String.valueOf(year));
+                dateTimeCalendar.set(Calendar.YEAR, yearPicker);
+                yearHeaderValues.setText(String.valueOf(yearPicker));
 
                 // Unfortunately, we have lags here and thread isn't a solution :/
                 materialCalendarView.setCurrentDate(dateTimeCalendar.getTime());
@@ -336,7 +310,6 @@ public void onYearSelected(View view, int yearPicker) {
                 DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         if(mListener !=null) {
-                            assignAllValuesToCalendar();
                             mListener.onPositiveButtonClick(dateTimeCalendar.getTime());
                         }
                     }
@@ -348,7 +321,6 @@ public void onClick(DialogInterface dialog, int which) {
                     public void onClick(DialogInterface dialog, int which) {
                         // Close dialog
                         if(mListener !=null) {
-                            assignAllValuesToCalendar();
                             mListener.onNegativeButtonClick(dateTimeCalendar.getTime());
                         }
                     }
@@ -358,7 +330,6 @@ public void onClick(DialogInterface dialog, int which) {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     if (mListener != null) {
-                        assignAllValuesToCalendar();
                         if(mListener instanceof OnButtonWithNeutralClickListener)
                             ((OnButtonWithNeutralClickListener) mListener).onNeutralButtonClick(dateTimeCalendar.getTime());
                     }
@@ -368,37 +339,31 @@ public void onClick(DialogInterface dialog, int which) {
         return db.create();
     }
 
-    /**
-     * Assign each value of time in calendar
-     */
-    private void assignAllValuesToCalendar() {
-        dateTimeCalendar.set(Calendar.YEAR, year);
-        dateTimeCalendar.set(Calendar.MONTH, month);
-        dateTimeCalendar.set(Calendar.DAY_OF_MONTH, day);
-        dateTimeCalendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
-        dateTimeCalendar.set(Calendar.MINUTE, minute);
-        dateTimeCalendar.set(Calendar.SECOND, 0);
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        startAtPosition = UNDEFINED_POSITION;
     }
 
     /**
      * Define "Time" as the first view to show
      */
     public void startAtTimeView() {
-        startAtPosition = 0;
+        startAtPosition = HeaderViewsPosition.VIEW_HOURS_AND_MINUTES.getPosition();
     }
 
     /**
      * Define "Calendar" as the first view to show
      */
     public void startAtCalendarView() {
-        startAtPosition = 1;
+        startAtPosition = HeaderViewsPosition.VIEW_MONTH_AND_DAY.getPosition();
     }
 
     /**
      * Define "Year" as the first view to show
      */
     public void startAtYearView() {
-        startAtPosition = 2;
+        startAtPosition = HeaderViewsPosition.VIEW_YEAR.getPosition();
     }
 
     /**
@@ -406,7 +371,7 @@ public void startAtYearView() {
      * @param year
      */
     public void setDefaultYear(int year) {
-        this.year = year;
+        this.dateTimeCalendar.set(Calendar.YEAR, year);
     }
 
     @Deprecated
@@ -424,7 +389,7 @@ public void setYear(int year) {
      * @param month
      */
     public void setDefaultMonth(int month) {
-        this.month = month;
+        this.dateTimeCalendar.set(Calendar.MONTH, month);
     }
 
     @Deprecated
@@ -441,7 +406,7 @@ public void setMonth(int month) {
      * @param day
      */
     public void setDefaultDay(int day) {
-        this.day = day;
+        this.dateTimeCalendar.set(Calendar.DAY_OF_MONTH, day);
     }
 
     @Deprecated
@@ -458,7 +423,7 @@ public void setDay(int day) {
      * @param hourOfDay
      */
     public void setDefaultHourOfDay(int hourOfDay) {
-        this.hourOfDay = hourOfDay;
+        this.dateTimeCalendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
     }
 
     @Deprecated
@@ -475,7 +440,7 @@ public void setHour(int hour) {
      * @param minute
      */
     public void setDefaultMinute(int minute) {
-        this.minute = minute;
+        this.dateTimeCalendar.set(Calendar.MINUTE, minute);
     }
 
     @Deprecated
@@ -492,7 +457,7 @@ public void setMinute(int minute) {
      * @return
      */
     public int getYear() {
-        return year;
+        return this.dateTimeCalendar.get(Calendar.YEAR);
     }
 
     /**
@@ -501,7 +466,7 @@ public int getYear() {
      * @return
      */
     public int getMonth() {
-        return month;
+        return this.dateTimeCalendar.get(Calendar.MONTH);
     }
 
     /**
@@ -509,7 +474,7 @@ public int getMonth() {
      * @return
      */
     public int getDay() {
-        return day;
+        return this.dateTimeCalendar.get(Calendar.DAY_OF_MONTH);
     }
 
     /**
@@ -517,7 +482,7 @@ public int getDay() {
      * @return
      */
     public int getHourOfDay() {
-        return hourOfDay;
+        return this.dateTimeCalendar.get(Calendar.HOUR_OF_DAY);
     }
 
     /**
@@ -525,7 +490,7 @@ public int getHourOfDay() {
      * @return
      */
     public int getMinute() {
-        return minute;
+        return this.dateTimeCalendar.get(Calendar.MINUTE);
     }
 
     /**
@@ -534,7 +499,6 @@ public int getMinute() {
      */
     public void setDefaultDateTime(Date date) {
         this.dateTimeCalendar.setTime(date);
-        this.assignDefaultDateTimeCalendar = true;
     }
 
     /**
@@ -662,6 +626,8 @@ public void onClick(View view) {
             Utils.animLabelElement(view);
             if(viewSwitcher.getDisplayedChild() != positionView)
                 viewSwitcher.setDisplayedChild(positionView);
+
+            startAtPosition = positionView;
         }
     }
 }
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/RadialPickerLayout.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/RadialPickerLayout.java
index 4cd6c2b..2220756 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/RadialPickerLayout.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/RadialPickerLayout.java
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -48,6 +49,8 @@
 import com.kunzisoft.switchdatetime.time.widget.RadialSelectorView;
 import com.kunzisoft.switchdatetime.time.widget.RadialTextsView;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 public class RadialPickerLayout extends FrameLayout implements OnTouchListener {
@@ -578,24 +581,26 @@ public void setCurrentItemShowing(int index, boolean animate) {
         mCurrentItemShowing = index;
 
         if (animate && (index != lastIndex)) {
-            ObjectAnimator[] anims = new ObjectAnimator[4];
-            if (index == MINUTE_INDEX) {
-                anims[0] = mHourRadialTextsView.getDisappearAnimator();
-                anims[1] = mHourRadialSelectorView.getDisappearAnimator();
-                anims[2] = mMinuteRadialTextsView.getReappearAnimator();
-                anims[3] = mMinuteRadialSelectorView.getReappearAnimator();
-            } else {
-                anims[0] = mHourRadialTextsView.getReappearAnimator();
-                anims[1] = mHourRadialSelectorView.getReappearAnimator();
-                anims[2] = mMinuteRadialTextsView.getDisappearAnimator();
-                anims[3] = mMinuteRadialSelectorView.getDisappearAnimator();
+            List<Animator> animators = new ArrayList<>();
+            switch(index) {
+                case MINUTE_INDEX :
+                    animators.add(mHourRadialTextsView.getDisappearAnimator());
+                    animators.add(mHourRadialSelectorView.getDisappearAnimator());
+                    animators.add(mMinuteRadialTextsView.getReappearAnimator());
+                    animators.add(mMinuteRadialSelectorView.getReappearAnimator());
+                    break;
+                case HOUR_INDEX :
+                    animators.add(mHourRadialTextsView.getReappearAnimator());
+                    animators.add(mHourRadialSelectorView.getReappearAnimator());
+                    animators.add(mMinuteRadialTextsView.getDisappearAnimator());
+                    animators.add(mMinuteRadialSelectorView.getDisappearAnimator());
+                    break;
             }
-
             if (mTransition != null && mTransition.isRunning()) {
                 mTransition.end();
             }
             mTransition = new AnimatorSet();
-            mTransition.playTogether(anims);
+            mTransition.playTogether(animators);
             mTransition.start();
         } else {
             if (Build.VERSION.SDK_INT >= 11) {
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
index dae58d3..211a71f 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
@@ -73,9 +73,7 @@ public class SwitchTimePicker implements RadialPickerLayout.OnValueSelectedListe
     private int mCurrentViewShow;
 
     private TextView mHourView;
-    private TextView mHourSpaceView;
     private TextView mMinuteView;
-    private TextView mMinuteSpaceView;
     private TextView mAmPmTextView;
     private View mAmPmHitspace;
     private RadialPickerLayout mTimePicker;
@@ -180,15 +178,16 @@ public View onCreateView(final View view,
         final Resources resources = mContext.getResources();
         mHourPickerDescription = resources.getString(R.string.hour_picker_description);
         mSelectHours = resources.getString(R.string.select_hours);
+
         mMinutePickerDescription = resources.getString(R.string.minute_picker_description);
         mSelectMinutes = resources.getString(R.string.select_minutes);
 
         mHourView = (TextView) view.findViewById(R.id.hours);
         mHourView.setOnKeyListener(keyboardListener);
-        mHourSpaceView = (TextView) view.findViewById(R.id.hour_space);
-        mMinuteSpaceView = (TextView) view.findViewById(R.id.minutes_space);
+
         mMinuteView = (TextView) view.findViewById(R.id.minutes);
         mMinuteView.setOnKeyListener(keyboardListener);
+
         mAmPmTextView = (TextView) view.findViewById(R.id.ampm_label);
         mAmPmTextView.setOnKeyListener(keyboardListener);
 
@@ -238,7 +237,7 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 // TODO bug
-                //setCurrentItemShowing(MINUTE_INDEX, true, false, true);
+                setCurrentItemShowing(MINUTE_INDEX, true, false, true);
                 mTimePicker.tryVibrate();
                 if(onClickTimeListener != null)
                     onClickTimeListener.onClick(mMinuteView);
@@ -366,7 +365,6 @@ private void attributeHour(int value, boolean announce) {
 
         CharSequence text = String.format(format, value);
         mHourView.setText(text);
-        mHourSpaceView.setText(text);
         if (announce) {
             Utils.tryAccessibilityAnnounce(mTimePicker, text);
         }
@@ -385,7 +383,6 @@ private void attributeMinute(int value) {
         CharSequence text = String.format(Locale.getDefault(), "%02d", value);
         Utils.tryAccessibilityAnnounce(mTimePicker, text);
         mMinuteView.setText(text);
-        mMinuteSpaceView.setText(text);
     }
 
     // Show either Hours or Minutes.
@@ -627,10 +624,8 @@ private void updateDisplay(boolean allowEmptyDisplay) {
             String minuteStr = (values[1] == -1) ? mDoublePlaceholderText :
                     String.format(minuteFormat, values[1]).replace(' ', mPlaceholderText);
             mHourView.setText(hourStr);
-            mHourSpaceView.setText(hourStr);
             //mHourView.setTextColor(mColor);
             mMinuteView.setText(minuteStr);
-            mMinuteSpaceView.setText(minuteStr);
             //mMinuteView.setTextColor(mColor);
             if (!mIs24HourMode) {
                 updateAmPmDisplay(values[2]);
diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
index d9b44a7..4956222 100644
--- a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
@@ -29,7 +29,7 @@
         android:importantForAccessibility="no" />
 
     <TextView
-        android:id="@+id/hour_space"
+        android:id="@+id/hours"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/time_placeholder"
@@ -38,23 +38,6 @@
         android:visibility="invisible"
         style="@style/Theme.SwitchDateTime.TimeLabelText"
         android:importantForAccessibility="no" />
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_alignEnd="@+id/hour_space"
-        android:layout_alignStart="@+id/hour_space"
-        android:layout_marginLeft="@dimen/extra_time_label_margin"
-        android:layout_marginRight="@dimen/extra_time_label_margin"
-        android:layout_centerVertical="true" >
-        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
-            android:id="@+id/hours"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/time_placeholder"
-            android:gravity="center_horizontal"
-            android:layout_gravity="center"
-            style="@style/Theme.SwitchDateTime.TimeLabelText" />
-    </FrameLayout>
 
     <TextView
         android:id="@+id/separator"
@@ -69,7 +52,7 @@
         android:importantForAccessibility="no" />
 
     <TextView
-        android:id="@+id/minutes_space"
+        android:id="@+id/minutes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/time_placeholder"
@@ -78,23 +61,7 @@
         android:visibility="invisible"
         style="@style/Theme.SwitchDateTime.TimeLabelText"
         android:importantForAccessibility="no" />
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_alignEnd="@+id/minutes_space"
-        android:layout_alignStart="@+id/minutes_space"
-        android:layout_marginLeft="@dimen/extra_time_label_margin"
-        android:layout_marginRight="@dimen/extra_time_label_margin"
-        android:layout_centerVertical="true" >
-        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
-            android:id="@+id/minutes"
-            style="@style/Theme.SwitchDateTime.TimeLabelText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/time_placeholder"
-            android:layout_gravity="center" />
-    </FrameLayout>
+
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
@@ -110,7 +77,7 @@
         android:text="@string/time_placeholder"
         android:paddingLeft="@dimen/ampm_left_padding"
         android:paddingRight="@dimen/ampm_left_padding"
-        android:layout_toEndOf="@+id/minutes_space"
+        android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
         style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
         android:importantForAccessibility="no" />
diff --git a/switchdatetime/src/main/res/layout/time_header_label.xml b/switchdatetime/src/main/res/layout/time_header_label.xml
index 1b8b7be..e51db04 100644
--- a/switchdatetime/src/main/res/layout/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout/time_header_label.xml
@@ -27,37 +27,16 @@
         android:layout_centerInParent="true"
         android:visibility="invisible"
         android:importantForAccessibility="no" />
-
     <TextView
-        android:id="@+id/hour_space"
+        android:id="@+id/hours"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/time_placeholder"
         android:layout_toLeftOf="@+id/separator"
         android:layout_toStartOf="@+id/separator"
         android:layout_centerVertical="true"
-        android:visibility="invisible"
         style="@style/Theme.SwitchDateTime.TimeLabelText"
         android:importantForAccessibility="no" />
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_alignRight="@+id/hour_space"
-        android:layout_alignEnd="@+id/hour_space"
-        android:layout_alignLeft="@+id/hour_space"
-        android:layout_alignStart="@+id/hour_space"
-        android:layout_marginLeft="@dimen/extra_time_label_margin"
-        android:layout_marginRight="@dimen/extra_time_label_margin"
-        android:layout_centerVertical="true" >
-        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
-            android:id="@+id/hours"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/time_placeholder"
-            android:gravity="center_horizontal"
-            android:layout_gravity="center"
-            style="@style/Theme.SwitchDateTime.TimeLabelText" />
-    </FrameLayout>
 
     <TextView
         android:id="@+id/separator"
@@ -73,7 +52,7 @@
         android:importantForAccessibility="no" />
 
     <TextView
-        android:id="@+id/minutes_space"
+        android:id="@+id/minutes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/time_placeholder"
@@ -83,25 +62,7 @@
         android:visibility="invisible"
         style="@style/Theme.SwitchDateTime.TimeLabelText"
         android:importantForAccessibility="no" />
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_alignRight="@+id/minutes_space"
-        android:layout_alignEnd="@+id/minutes_space"
-        android:layout_alignLeft="@+id/minutes_space"
-        android:layout_alignStart="@+id/minutes_space"
-        android:layout_marginLeft="@dimen/extra_time_label_margin"
-        android:layout_marginRight="@dimen/extra_time_label_margin"
-        android:layout_centerVertical="true" >
-        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
-            android:id="@+id/minutes"
-            style="@style/Theme.SwitchDateTime.TimeLabelText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/time_placeholder"
-            android:layout_gravity="center" />
-    </FrameLayout>
+
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
@@ -119,8 +80,8 @@
         android:text="@string/time_placeholder"
         android:paddingLeft="@dimen/ampm_left_padding"
         android:paddingRight="@dimen/ampm_left_padding"
-        android:layout_toRightOf="@+id/minutes_space"
-        android:layout_toEndOf="@+id/minutes_space"
+        android:layout_toRightOf="@+id/minutes"
+        android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
         style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
         android:importantForAccessibility="no" />

From 73d5848e23b9faa04ecea47611bf5710588b2238 Mon Sep 17 00:00:00 2001
From: JJamet <jamet.jeremy@outlook.com>
Date: Mon, 14 Aug 2017 01:55:22 +0200
Subject: [PATCH 4/4] Solve year bug

---
 .../SwitchDateTimeDialogFragment.java         |  7 +--
 .../widget/TextCircularIndicatorView.java     | 12 +----
 .../date/widget/YearPickerAdapter.java        | 13 +++++-
 .../layout-ldrtl-v17/time_header_label.xml    | 44 ++++++------------
 .../src/main/res/layout/time_header_label.xml | 46 +++++++------------
 5 files changed, 48 insertions(+), 74 deletions(-)

diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index 9f6e7d5..59479ae 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -23,6 +23,7 @@
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 import com.prolificinteractive.materialcalendarview.OnDateSelectedListener;
 
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -235,7 +236,7 @@ public void onClick(View view) {
             yearSimpleDate = new SimpleDateFormat("yyyy", Locale.getDefault());
 
         // Init headers
-        yearHeaderValues.setText(String.valueOf(dateTimeCalendar.get(Calendar.YEAR)));
+        yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
         monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(dateTimeCalendar.getTime()));
 
         // Construct TimePicker
@@ -270,7 +271,7 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
                 dateTimeCalendar.set(Calendar.MONTH, calendarDay.getMonth());
                 dateTimeCalendar.set(Calendar.DAY_OF_MONTH, calendarDay.getDay());
                 listPickerYearView.assignCurrentYear(calendarDay.getYear());
-                yearHeaderValues.setText(String.valueOf(calendarDay.getYear()));
+                yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
                 monthAndDayHeaderValues.setText(dayAndMonthSimpleDate.format(currentDate));
             }
         });
@@ -285,7 +286,7 @@ public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull Calend
             @Override
             public void onYearSelected(View view, int yearPicker) {
                 dateTimeCalendar.set(Calendar.YEAR, yearPicker);
-                yearHeaderValues.setText(String.valueOf(yearPicker));
+                yearHeaderValues.setText(yearSimpleDate.format(dateTimeCalendar.getTime()));
 
                 // Unfortunately, we have lags here and thread isn't a solution :/
                 materialCalendarView.setCurrentDate(dateTimeCalendar.getTime());
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
index 11bffbd..ebb8aea 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/TextCircularIndicatorView.java
@@ -5,11 +5,9 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.os.Build;
 import android.support.annotation.ColorInt;
-import android.support.annotation.RequiresApi;
+import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 import com.kunzisoft.switchdatetime.R;
 
@@ -17,7 +15,7 @@
  * TextView with circular colored background
  * @author JJamet
  */
-public class TextCircularIndicatorView extends TextView {
+public class TextCircularIndicatorView extends AppCompatTextView {
 
     private int mCircleColor = Color.BLUE;
     private Paint mCirclePaint = new Paint();
@@ -35,12 +33,6 @@ public TextCircularIndicatorView(Context context, AttributeSet attrs, int defSty
         init(attrs);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public TextCircularIndicatorView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(attrs);
-    }
-
     /**
      * Initialize constructor
      * @param attrs
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
index bf973c9..23cd8f4 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/date/widget/YearPickerAdapter.java
@@ -8,8 +8,12 @@
 
 import com.kunzisoft.switchdatetime.R;
 
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Adapter for manage elements of ListPickerYearView
@@ -22,6 +26,9 @@ class YearPickerAdapter extends RecyclerView.Adapter<YearPickerAdapter.TextIndic
 
     public static final int UNDEFINED = -1;
 
+    private SimpleDateFormat yearFormat;
+    private Calendar calendar;
+
     private List<Integer> listYears;
     private Integer selectedYear;
     private int positionSelectedYear;
@@ -34,6 +41,8 @@ class YearPickerAdapter extends RecyclerView.Adapter<YearPickerAdapter.TextIndic
     YearPickerAdapter() {
         this.listYears = new ArrayList<>();
         this.selectedYear = UNDEFINED;
+        this.yearFormat = new SimpleDateFormat("yyyy", Locale.getDefault());
+        this.calendar = Calendar.getInstance();
     }
 
     @Override
@@ -62,7 +71,9 @@ public TextIndicatorViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     @Override
     public void onBindViewHolder(TextIndicatorViewHolder holder, int position) {
         Integer currentYear = listYears.get(position);
-        holder.textView.setText(String.valueOf(currentYear));
+
+        calendar.set(Calendar.YEAR, currentYear);
+        holder.textView.setText(yearFormat.format(calendar.getTime()));
 
         if(onClickYearListener != null)
             holder.container.setOnClickListener(new BufferYearClickListener(currentYear, position));
diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
index 4956222..26c3d59 100644
--- a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
@@ -16,28 +16,9 @@
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:minWidth="@dimen/time_label_min_width"
     android:layout_gravity="center">
-    <View
-        android:id="@+id/center_view"
-        android:layout_width="1dp"
-        android:layout_height="1dp"
-        android:background="#00000000"
-        android:layout_centerInParent="true"
-        android:visibility="invisible"
-        android:importantForAccessibility="no" />
-
-    <TextView
-        android:id="@+id/hours"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/time_placeholder"
-        android:layout_toStartOf="@+id/separator"
-        android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
 
     <TextView
         android:id="@+id/separator"
@@ -46,10 +27,17 @@
         android:text="@string/time_separator"
         android:paddingLeft="@dimen/separator_padding"
         android:paddingRight="@dimen/separator_padding"
-        android:layout_alignEnd="@+id/center_view"
+        android:layout_centerInParent="true"
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
+
+    <TextView
+        android:id="@+id/hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toStartOf="@id/separator"
         android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <TextView
         android:id="@+id/minutes"
@@ -58,16 +46,13 @@
         android:text="@string/time_placeholder"
         android:layout_toEndOf="@+id/separator"
         android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
         android:layout_alignStart="@+id/ampm_label"
         android:layout_alignEnd="@+id/ampm_label" />
     <TextView
@@ -79,6 +64,5 @@
         android:paddingRight="@dimen/ampm_left_padding"
         android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
-        style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelAmPm" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/layout/time_header_label.xml b/switchdatetime/src/main/res/layout/time_header_label.xml
index e51db04..f187f31 100644
--- a/switchdatetime/src/main/res/layout/time_header_label.xml
+++ b/switchdatetime/src/main/res/layout/time_header_label.xml
@@ -16,27 +16,10 @@
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:minWidth="@dimen/time_label_min_width"
     android:layout_gravity="center">
-    <View
-        android:id="@+id/center_view"
-        android:layout_width="1dp"
-        android:layout_height="1dp"
-        android:background="#00000000"
-        android:layout_centerInParent="true"
-        android:visibility="invisible"
-        android:importantForAccessibility="no" />
-    <TextView
-        android:id="@+id/hours"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/time_placeholder"
-        android:layout_toLeftOf="@+id/separator"
-        android:layout_toStartOf="@+id/separator"
-        android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+    <!--TODO Accessible elements-->
 
     <TextView
         android:id="@+id/separator"
@@ -45,11 +28,18 @@
         android:text="@string/time_separator"
         android:paddingLeft="@dimen/separator_padding"
         android:paddingRight="@dimen/separator_padding"
-        android:layout_alignRight="@+id/center_view"
-        android:layout_alignEnd="@+id/center_view"
+        android:layout_centerInParent="true"
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
+
+    <TextView
+        android:id="@+id/hours"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toLeftOf="@id/separator"
+        android:layout_toStartOf="@id/separator"
         android:layout_centerVertical="true"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <TextView
         android:id="@+id/minutes"
@@ -59,16 +49,13 @@
         android:layout_toRightOf="@+id/separator"
         android:layout_toEndOf="@+id/separator"
         android:layout_centerVertical="true"
-        android:visibility="invisible"
-        style="@style/Theme.SwitchDateTime.TimeLabelText"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelText" />
 
     <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
         android:id="@+id/ampm_hitspace"
         android:layout_width="@dimen/ampm_label_size"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
         android:layout_alignLeft="@+id/ampm_label"
         android:layout_alignStart="@+id/ampm_label"
         android:layout_alignRight="@+id/ampm_label"
@@ -83,6 +70,5 @@
         android:layout_toRightOf="@+id/minutes"
         android:layout_toEndOf="@+id/minutes"
         android:layout_alignBaseline="@+id/separator"
-        style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
-        android:importantForAccessibility="no" />
+        style="@style/Theme.SwitchDateTime.TimeLabelAmPm" />
 </RelativeLayout>
\ No newline at end of file