florent37 · yeojoy · Jul 26, 2021 · Aug 9, 2021 · Aug 17, 2022 · Aug 18, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation "androidx.appcompat:appcompat:1.5.0"
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'com.jakewharton:butterknife:10.2.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
     implementation project(':singledateandtimepicker')

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SingleDatePickerMainActivityWithDoublePicker">
+        <activity android:name=".SingleDatePickerMainActivityWithDoublePicker"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/...ava/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivity.java b/...ava/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivity.java
diff --git a/...lorent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java b/...lorent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java
@@ -3,7 +3,6 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.github.florent37.singledateandtimepicker.SingleDateAndTimePicker;
 import com.github.florent37.singledateandtimepicker.dialog.DoubleDateAndTimePickerDialog;
@@ -48,6 +47,7 @@ public class SingleDatePickerMainActivityWithDoublePicker extends AppCompatActiv
     DoubleDateAndTimePickerDialog.Builder doubleBuilder;
 
     private static String TAG = "SingleDatePickerMainActivityWithDoublePicker";
+    private long currentTime = 0L;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -74,23 +74,27 @@ protected void onPause() {
     }
 
 
-
-    @OnClick(R.id.singleTimeText)
+    /* TODO Working on it */
+    @OnClick(R.id.single_time_dialog_layout)
     public void simpleTimeClicked() {
 
-        Calendar calendar = Calendar.getInstance();
-
-        calendar.set(Calendar.HOUR_OF_DAY, 21);
-        calendar.set(Calendar.MINUTE, 50);
+        Date date = new Date();
+        if (currentTime == 0L) {
+            currentTime = System.currentTimeMillis();
+        }
+        SimpleDateFormat currentDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        System.out.println("simpleTimeClicked() " + currentDateFormat.format(currentTime));
+        date.setTime(currentTime);
 
-        final Date defaultDate = calendar.getTime();
+        TimeZone timeZone = TimeZone.getTimeZone("US/Arizona");
+        simpleTimeFormat.setTimeZone(timeZone);
 
         singleBuilder = new SingleDateAndTimePickerDialog.Builder(this)
-                .setTimeZone(TimeZone.getDefault())
+                .setTimeZone(timeZone)
                 .bottomSheet()
                 .curved()
-
-                .defaultDate(defaultDate)
+                .displayAmPm(true)
+                .defaultDate(date)
 
                 //.titleTextColor(Color.GREEN)
                 //.backgroundColor(Color.BLACK)
@@ -115,17 +119,15 @@ public void onClosed(SingleDateAndTimePicker picker) {
                 })
 
                 .title("Simple Time")
-                .listener(new SingleDateAndTimePickerDialog.Listener() {
-                    @Override
-                    public void onDateSelected(Date date) {
-                        singleTimeText.setText(simpleTimeFormat.format(date));
-                    }
+                .listener(date1 -> {
+                    currentTime = date1.getTime();
+                    singleTimeText.setText(simpleTimeFormat.format(date1));
                 });
         singleBuilder.display();
     }
 
 
-    @OnClick(R.id.singleDateText)
+    @OnClick(R.id.single_date_dialog_layout)
     public void simpleDateClicked() {
 
         final Calendar calendar = Calendar.getInstance();
@@ -135,15 +137,9 @@ public void simpleDateClicked() {
                 .setTimeZone(TimeZone.getDefault())
                 .bottomSheet()
                 .curved()
-
-                //.titleTextColor(Color.GREEN)
-                //.backgroundColor(Color.BLACK)
-                //.mainColor(Color.GREEN)
-
                 .displayHours(false)
                 .displayMinutes(false)
                 .displayDays(true)
-
                 .displayListener(new SingleDateAndTimePickerDialog.DisplayListener() {
                     @Override
                     public void onDisplayed(SingleDateAndTimePicker picker) {
@@ -155,18 +151,12 @@ public void onClosed(SingleDateAndTimePicker picker) {
                         Log.d(TAG, "Dialog closed");
                     }
                 })
-
                 .title("")
-                .listener(new SingleDateAndTimePickerDialog.Listener() {
-                    @Override
-                    public void onDateSelected(Date date) {
-                        singleDateText.setText(simpleDateOnlyFormat.format(date));
-                    }
-                });
+                .listener(date -> singleDateText.setText(simpleDateOnlyFormat.format(date)));
         singleBuilder.display();
     }
 
-    @OnClick(R.id.singleLayout)
+    @OnClick(R.id.single_dialog_layout)
     public void simpleClicked() {
 
         final Calendar calendar = Calendar.getInstance();
@@ -225,7 +215,7 @@ public void onDateSelected(Date date) {
         singleBuilder.display();
     }
 
-    @OnClick(R.id.doubleLayout)
+    @OnClick(R.id.double_dialog_layout)
     public void doubleClicked() {
 
         final Date now = new Date();
@@ -274,7 +264,7 @@ public void onDateSelected(List<Date> dates) {
         doubleBuilder.display();
     }
 
-    @OnClick(R.id.singleDateLocaleLayout)
+    @OnClick(R.id.single_date_dialog_german_layout)
     public void singleDateLocaleClicked() {
         singleBuilder = new SingleDateAndTimePickerDialog.Builder(this)
                 .customLocale(Locale.GERMAN)

diff --git a/app/src/main/res/drawable/ic_event_available_black_24dp.xml b/app/src/main/res/drawable/ic_event_available_black_24dp.xml
diff --git a/app/src/main/res/font/dinot_bold.ttf b/app/src/main/res/font/dinot_bold.ttf
diff --git a/app/src/main/res/font/dinot_regular.ttf b/app/src/main/res/font/dinot_regular.ttf
diff --git a/app/src/main/res/layout/single_date_picker_activity_main.xml b/app/src/main/res/layout/single_date_picker_activity_main.xml
diff --git a/app/src/main/res/layout/single_date_picker_activity_main_double_picker.xml b/app/src/main/res/layout/single_date_picker_activity_main_double_picker.xml
@@ -3,167 +3,149 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorPrimary"
         android:elevation="4dp"
         app:title="Picker"
-        app:titleTextColor="@android:color/white"
-        />
+        app:titleTextColor="@android:color/white" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/singleLayout"
+            android:id="@+id/single_dialog_layout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
-                app:srcCompat="@drawable/ic_event_available_black_24dp"
-                />
+                app:srcCompat="@drawable/ic_event_available_black_24dp" />
 
             <TextView
                 android:id="@+id/singleText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
                 android:text="Click me to open single dialog"
                 android:textColor="@color/textColor"
-                />
+                android:textSize="15sp" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/doubleLayout"
+            android:id="@+id/double_dialog_layout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
-                app:srcCompat="@drawable/ic_event_available_black_24dp"
-                />
+                app:srcCompat="@drawable/ic_event_available_black_24dp" />
 
             <TextView
                 android:id="@+id/doubleText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
                 android:text="Click me to open double dialog"
                 android:textColor="@color/textColor"
-                />
+                android:textSize="15sp" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/singleTimeLayout"
+            android:id="@+id/single_time_dialog_layout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
-                app:srcCompat="@drawable/ic_event_available_black_24dp"
-                />
+                app:srcCompat="@drawable/ic_event_available_black_24dp" />
 
             <TextView
                 android:id="@+id/singleTimeText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
                 android:text="Click me to open single dialog for TIME only"
                 android:textColor="@color/textColor"
-                />
+                android:textSize="15sp" />
 
         </LinearLayout>
 
 
         <LinearLayout
-            android:id="@+id/singleDateLayout"
+            android:id="@+id/single_date_dialog_layout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
-                app:srcCompat="@drawable/ic_event_available_black_24dp"
-                />
+                app:srcCompat="@drawable/ic_event_available_black_24dp" />
 
             <TextView
                 android:id="@+id/singleDateText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
                 android:text="Click me to open single dialog for DATE only"
                 android:textColor="@color/textColor"
-                />
+                android:textSize="15sp" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/singleDateLocaleLayout"
+            android:id="@+id/single_date_dialog_german_layout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="20dp"
                 android:layout_marginRight="20dp"
-                app:srcCompat="@drawable/ic_event_available_black_24dp"
-                />
+                app:srcCompat="@drawable/ic_event_available_black_24dp" />
 
             <TextView
                 android:id="@+id/singleDateLocaleText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="15sp"
                 android:text="Click me to open single dialog for DATE with German Locale"
                 android:textColor="@color/textColor"
-                />
+                android:textSize="15sp" />
 
         </LinearLayout>
 

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         // NOTE: Do not place your application dependencies here; they belong
@@ -23,8 +23,8 @@ allprojects {
 }
 
 ext {
-    sdk = 28
-    minSdk = 14
+    sdk = 32
+    minSdk = 23
 
     github = 'https://github.com/florent37/SingleDateAndTimePicker'
 

diff --git a/circle.yml b/circle.yml
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/bintray-android-v1.gradle b/gradle/bintray-android-v1.gradle
diff --git a/gradle/bintray-java-v1.gradle b/gradle/bintray-java-v1.gradle
diff --git a/gradle/install-v1.gradle b/gradle/install-v1.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/media/custom_colors.png b/media/custom_colors.png
diff --git a/media/double.png b/media/double.png
diff --git a/media/double_small.png b/media/double_small.png
diff --git a/media/double_small_crop.png b/media/double_small_crop.png
diff --git a/media/ios_double.png b/media/ios_double.png
diff --git a/media/ios_double_crop.png b/media/ios_double_crop.png
diff --git a/media/ios_simple.png b/media/ios_simple.png
diff --git a/media/ios_simple_crop.png b/media/ios_simple_crop.png
diff --git a/media/layout.png b/media/layout.png
diff --git a/media/layout_small.png b/media/layout_small.png
diff --git a/media/new_video.gif b/media/new_video.gif
diff --git a/media/new_video.mp4 b/media/new_video.mp4
diff --git a/media/simple.png b/media/simple.png
diff --git a/media/simple_small.png b/media/simple_small.png
diff --git a/media/single_small_crop.png b/media/single_small_crop.png
diff --git a/media/single_tiny_crop.png b/media/single_tiny_crop.png
diff --git a/media/years_crop.png b/media/years_crop.png
diff --git a/settings.gradle b/settings.gradle
diff --git a/singledateandtimepicker/.gitignore b/singledateandtimepicker/.gitignore
diff --git a/singledateandtimepicker/build.gradle b/singledateandtimepicker/build.gradle
@@ -6,16 +6,16 @@ android {
     defaultConfig {
         minSdkVersion project.minSdk
         targetSdkVersion project.sdk
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
     }
     lintOptions {
         abortOnError false
     }
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.5.0"
 }
 
 ext {

diff --git a/singledateandtimepicker/proguard-rules.pro b/singledateandtimepicker/proguard-rules.pro
diff --git a/singledateandtimepicker/src/main/AndroidManifest.xml b/singledateandtimepicker/src/main/AndroidManifest.xml