From 0b27cb170bae8106c8154ff7d45ffc92f8ec6343 Mon Sep 17 00:00:00 2001
From: Akash <akash@digios-MacBook-Pro.local>
Date: Mon, 15 Feb 2021 18:11:36 +0530
Subject: [PATCH 1/2] #311 issue resolved,Added background shape custmisation,
 OK button text can be change now, ok button text color, Added small icon
 container to show next button icon configurable

---
 app/build.gradle                              |   6 +-
 ...atePickerMainActivityWithDoublePicker.java |  12 +-
 app/src/main/res/drawable/curve_shape.xml     |  16 +++
 .../drawable/ic_right_arrow_light_blue.xml    |   9 ++
 ...ate_picker_activity_main_double_picker.xml |   3 +
 build.gradle                                  |   4 +-
 singledateandtimepicker/build.gradle          |   2 +-
 .../SingleDateAndTimePicker.java              |   7 ++
 .../dialog/BaseDialog.java                    |   8 ++
 .../dialog/SingleDateAndTimePickerDialog.java | 105 +++++++++++++++++-
 .../bottom_sheet_picker_bottom_sheet.xml      |  13 ++-
 .../bottom_sheet_picker_bottom_sheet.xml      |  15 ++-
 12 files changed, 189 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/curve_shape.xml
 create mode 100644 app/src/main/res/drawable/ic_right_arrow_light_blue.xml

diff --git a/app/build.gradle b/app/build.gradle
index afec38dd..e17406ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,9 +28,9 @@ 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 'com.jakewharton:butterknife:10.2.1'
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.jakewharton:butterknife:10.2.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
     implementation project(':singledateandtimepicker')
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java b/app/src/main/java/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java
index c6846449..1c7a738d 100644
--- a/app/src/main/java/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java
+++ b/app/src/main/java/com/github/florent37/sample/singledateandtimepicker/SingleDatePickerMainActivityWithDoublePicker.java
@@ -1,5 +1,6 @@
 package com.github.florent37.sample.singledateandtimepicker;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
@@ -99,6 +100,8 @@ public void simpleTimeClicked() {
                 .displayMinutes(true)
                 .displayHours(true)
                 .displayDays(false)
+                .minutesStep(15)
+                .setBackgroundShape(R.drawable.curve_shape)
                 //.displayMonth(true)
                 //.displayYears(true)
 
@@ -113,8 +116,13 @@ public void onClosed(SingleDateAndTimePicker picker) {
                         Log.d(TAG, "Dialog closed");
                     }
                 })
-
-                .title("Simple Time")
+                .titleTextColor(Color.parseColor("#E8EAEE"))
+                .mainColor(Color.parseColor("#FAFAFA"))
+                .backgroundColor(Color.parseColor("#1D2D51"))
+                .title("Pickup Time")
+                .setButtonName("NEXT")
+                .setButtonIconRight(R.drawable.ic_right_arrow_light_blue)
+                .setButtonTextColor(Color.parseColor("#FD9731"))
                 .listener(new SingleDateAndTimePickerDialog.Listener() {
                     @Override
                     public void onDateSelected(Date date) {
diff --git a/app/src/main/res/drawable/curve_shape.xml b/app/src/main/res/drawable/curve_shape.xml
new file mode 100644
index 00000000..a1b9f429
--- /dev/null
+++ b/app/src/main/res/drawable/curve_shape.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <padding
+                android:bottom="0dp"
+                android:left="0dp"
+                android:right="0dp"
+                android:top="0dp" />
+            <solid android:color="#1D2D51" />
+            <stroke android:color="#0e0e0f" android:width="0dp"  />
+            <corners android:topLeftRadius="20dp" android:topRightRadius="20dp"
+                android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_right_arrow_light_blue.xml b/app/src/main/res/drawable/ic_right_arrow_light_blue.xml
new file mode 100644
index 00000000..5a0f2292
--- /dev/null
+++ b/app/src/main/res/drawable/ic_right_arrow_light_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="451.846"
+    android:viewportHeight="451.847">
+  <path
+      android:pathData="M345.441,248.292L151.154,442.573c-12.359,12.365 -32.397,12.365 -44.75,0c-12.354,-12.354 -12.354,-32.391 0,-44.744L278.318,225.92L106.409,54.017c-12.354,-12.359 -12.354,-32.394 0,-44.748c12.354,-12.359 32.391,-12.359 44.75,0l194.287,194.284c6.177,6.18 9.262,14.271 9.262,22.366C354.708,234.018 351.617,242.115 345.441,248.292z"
+      android:fillColor="#039AEA"/>
+</vector>
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
index 17cb48cd..ae69635d 100644
--- 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
@@ -54,6 +54,7 @@
         <LinearLayout
             android:id="@+id/doubleLayout"
             android:layout_width="match_parent"
+            android:visibility="gone"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
@@ -113,6 +114,7 @@
             android:id="@+id/singleDateLayout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
+            android:visibility="gone"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:orientation="horizontal"
@@ -142,6 +144,7 @@
             android:id="@+id/singleDateLocaleLayout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
+            android:visibility="gone"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:orientation="horizontal"
diff --git a/build.gradle b/build.gradle
index ba2ea3fd..b5cb63c5 100644
--- 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,7 +23,7 @@ allprojects {
 }
 
 ext {
-    sdk = 28
+    sdk = 30
     minSdk = 14
 
     github = 'https://github.com/florent37/SingleDateAndTimePicker'
diff --git a/singledateandtimepicker/build.gradle b/singledateandtimepicker/build.gradle
index a19bbffe..0a917a2b 100644
--- a/singledateandtimepicker/build.gradle
+++ b/singledateandtimepicker/build.gradle
@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
 }
 
 ext {
diff --git a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/SingleDateAndTimePicker.java b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/SingleDateAndTimePicker.java
index baf26241..6fe3084e 100644
--- a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/SingleDateAndTimePicker.java
+++ b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/SingleDateAndTimePicker.java
@@ -78,6 +78,8 @@ public class SingleDateAndTimePicker extends LinearLayout {
 
     private View dtSelector;
     private boolean mustBeOnFuture;
+    private View picker_divider_1;
+    private View picker_divider_2;
 
     @Nullable
     private Date minDate;
@@ -119,6 +121,8 @@ public SingleDateAndTimePicker(Context context, AttributeSet attrs, int defStyle
         hoursPicker = findViewById(R.id.hoursPicker);
         amPmPicker = findViewById(R.id.amPmPicker);
         dtSelector = findViewById(R.id.dtSelector);
+        picker_divider_1 = findViewById(R.id.picker_divider_1);
+        picker_divider_2 = findViewById(R.id.picker_divider_2);
 
         pickers.addAll(Arrays.asList(
                 daysPicker,
@@ -371,6 +375,9 @@ private void setFontToAllPickers(int resourceId) {
 
     public void setSelectorColor(int selectorColor) {
         dtSelector.setBackgroundColor(selectorColor);
+        picker_divider_1.setBackgroundColor(selectorColor);
+        picker_divider_2.setBackgroundColor(selectorColor);
+
     }
 
     public void setSelectorHeight(int selectorHeight) {
diff --git a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/BaseDialog.java b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/BaseDialog.java
index 51f77f70..36e5a022 100644
--- a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/BaseDialog.java
+++ b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/BaseDialog.java
@@ -60,6 +60,10 @@ public abstract class BaseDialog {
 
     protected Locale customLocale;
 
+    @Nullable
+    @ColorInt
+    protected Integer buttonTextColor = null;
+
     public void display() {
         this.isDisplaying = true;
     }
@@ -88,6 +92,10 @@ public void setTitleTextColor(@NonNull @ColorInt int titleTextColor) {
         this.titleTextColor = titleTextColor;
     }
 
+    public void setButtonTextColor(@ColorInt Integer buttonTextColor){
+        this.buttonTextColor = buttonTextColor;
+    }
+
     protected void onClose() {
         this.isDisplaying = false;
     }
diff --git a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/SingleDateAndTimePickerDialog.java b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/SingleDateAndTimePickerDialog.java
index 7307e624..9f1c423e 100644
--- a/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/SingleDateAndTimePickerDialog.java
+++ b/singledateandtimepicker/src/main/java/com/github/florent37/singledateandtimepicker/dialog/SingleDateAndTimePickerDialog.java
@@ -1,8 +1,12 @@
 package com.github.florent37.singledateandtimepicker.dialog;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.github.florent37.singledateandtimepicker.DateHelper;
@@ -16,8 +20,10 @@
 import java.util.TimeZone;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 import static com.github.florent37.singledateandtimepicker.widget.SingleDateAndTimeConstants.STEP_MINUTES_DEFAULT;
 
@@ -39,14 +45,27 @@ public class SingleDateAndTimePickerDialog extends BaseDialog {
     @Nullable
     private DisplayListener displayListener;
 
+    @Nullable
+    private String buttonName;
+
+    @Nullable
+    private int backgroundShape;
+
+    @Nullable
+    private int buttonIconRight;
+
+    private Context mContext;
+
     private SingleDateAndTimePickerDialog(Context context) {
         this(context, false);
+        this.mContext = context;
     }
 
     private SingleDateAndTimePickerDialog(Context context, boolean bottomSheet) {
         final int layout = bottomSheet ? R.layout.bottom_sheet_picker_bottom_sheet :
                 R.layout.bottom_sheet_picker;
         this.bottomSheetHelper = new BottomSheetHelper(context, layout);
+        this.mContext = context;
 
         this.bottomSheetHelper.setListener(new BottomSheetHelper.Listener() {
             @Override
@@ -84,6 +103,12 @@ private void init(View view) {
             }
         }
 
+        final ImageView buttonIcon = view.findViewById(R.id.buttonIcon);
+        if (buttonIcon != null){
+            if (buttonIconRight != 0){
+                buttonIcon.setImageResource(buttonIconRight);
+            }
+        }
         final TextView buttonOk = (TextView) view.findViewById(R.id.buttonOk);
         if (buttonOk != null) {
             buttonOk.setOnClickListener(new View.OnClickListener() {
@@ -96,11 +121,22 @@ public void onClick(View view) {
 
             if (mainColor != null) {
                 buttonOk.setTextColor(mainColor);
+                buttonIcon.setColorFilter(mainColor, PorterDuff.Mode.SRC_IN);
+
             }
 
             if (titleTextSize != null) {
                 buttonOk.setTextSize(titleTextSize);
             }
+
+            if (buttonName != null){
+                buttonOk.setText(buttonName);
+            }
+            if (buttonTextColor != null){
+                buttonOk.setTextColor(buttonTextColor);
+                buttonIcon.setColorFilter(buttonTextColor, PorterDuff.Mode.SRC_IN);
+
+            }
         }
 
         final View sheetContentLayout = view.findViewById(R.id.sheetContentLayout);
@@ -114,6 +150,17 @@ public void onClick(View v) {
 
             if (backgroundColor != null) {
                 sheetContentLayout.setBackgroundColor(backgroundColor);
+
+            }
+
+            /**  validation for shape customization **/
+            if (backgroundShape != 0){
+                final int sdk = android.os.Build.VERSION.SDK_INT;
+                if (sdk < android.os.Build.VERSION_CODES.JELLY_BEAN){
+                    sheetContentLayout.setBackgroundDrawable(ContextCompat.getDrawable(mContext, backgroundShape));
+                }else {
+                    sheetContentLayout.setBackground(ContextCompat.getDrawable(mContext, backgroundShape));
+                }
             }
         }
 
@@ -306,6 +353,23 @@ private SingleDateAndTimePickerDialog setTimeZone(TimeZone timeZone) {
         return this;
     }
 
+    private SingleDateAndTimePickerDialog setButtonName(@Nullable String buttonName){
+        this.buttonName = buttonName;
+        return this;
+    }
+
+    private SingleDateAndTimePickerDialog setBackgroundShape(@Nullable int backgroundShape){
+        this.backgroundShape = backgroundShape;
+        return this;
+    }
+
+    private SingleDateAndTimePickerDialog setButtonIconRight(@Nullable int buttonIconRight){
+        this.buttonIconRight = buttonIconRight;
+        return this;
+    }
+
+
+
     @Override
     public void display() {
         super.display();
@@ -402,6 +466,19 @@ public static class Builder {
         private Locale customLocale;
         private TimeZone timeZone;
 
+        @Nullable
+        private String buttonName;
+
+        @Nullable
+        private int backgroundShape;
+
+        @ColorInt
+        @Nullable
+        private int buttonTextColor;
+
+        @Nullable
+        private int buttonIconRight = 0;
+
         public Builder(Context context) {
             this.context = context;
         }
@@ -546,6 +623,25 @@ public Builder focusable() {
             return this;
         }
 
+        public Builder setButtonName(@Nullable String buttonName){
+            this.buttonName = buttonName;
+            return this;
+        }
+
+        public Builder setBackgroundShape(@Nullable int backgroundShape){
+            this.backgroundShape = backgroundShape;
+            return this;
+        }
+        public Builder setButtonTextColor(@Nullable @ColorInt int buttonTextColor){
+            this.buttonTextColor = buttonTextColor;
+            return this;
+        }
+
+        public Builder setButtonIconRight(@Nullable int buttonIconRight){
+            this.buttonIconRight = buttonIconRight;
+            return this;
+        }
+
         public SingleDateAndTimePickerDialog build() {
             final SingleDateAndTimePickerDialog dialog = new SingleDateAndTimePickerDialog(context, bottomSheet)
                     .setTitle(title)
@@ -569,7 +665,10 @@ public SingleDateAndTimePickerDialog build() {
                     .setCustomLocale(customLocale)
                     .setMustBeOnFuture(mustBeOnFuture)
                     .setTimeZone(timeZone)
-                    .setFocusable(focusable);
+                    .setFocusable(focusable)
+                    .setBackgroundShape(backgroundShape)
+                    .setButtonName(buttonName)
+                    .setButtonIconRight(buttonIconRight);
 
             if (mainColor != null) {
                 dialog.setMainColor(mainColor);
@@ -591,6 +690,10 @@ public SingleDateAndTimePickerDialog build() {
                 dialog.setIsAmPm(isAmPm);
             }
 
+            if (buttonTextColor != 0){
+                dialog.setButtonTextColor(buttonTextColor);
+            }
+
             return dialog;
         }
 
diff --git a/singledateandtimepicker/src/main/res/layout-v21/bottom_sheet_picker_bottom_sheet.xml b/singledateandtimepicker/src/main/res/layout-v21/bottom_sheet_picker_bottom_sheet.xml
index fb78bf79..20288280 100644
--- a/singledateandtimepicker/src/main/res/layout-v21/bottom_sheet_picker_bottom_sheet.xml
+++ b/singledateandtimepicker/src/main/res/layout-v21/bottom_sheet_picker_bottom_sheet.xml
@@ -19,6 +19,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_marginTop="5dp"
             >
 
             <TextView
@@ -28,7 +29,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="start|center_vertical"
                 android:gravity="center"
-                android:layout_marginLeft="12dp"
+                android:layout_marginLeft="20dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:text="title here"
                 android:textColor="@color/picker_button_background_selected"
@@ -48,6 +49,16 @@
                 android:textAllCaps="true"
                 android:textColor="@color/picker_button_background_selected"
                 android:textStyle="bold"
+                android:layout_marginRight="10dp"
+
+                />
+            <ImageView
+                android:id="@+id/buttonIcon"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:tint="@color/picker_background"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginRight="12dp"
                 />
 
         </FrameLayout>
diff --git a/singledateandtimepicker/src/main/res/layout/bottom_sheet_picker_bottom_sheet.xml b/singledateandtimepicker/src/main/res/layout/bottom_sheet_picker_bottom_sheet.xml
index 44b7ae1e..4cd80e48 100644
--- a/singledateandtimepicker/src/main/res/layout/bottom_sheet_picker_bottom_sheet.xml
+++ b/singledateandtimepicker/src/main/res/layout/bottom_sheet_picker_bottom_sheet.xml
@@ -19,6 +19,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_marginTop="5dp"
             >
 
             <TextView
@@ -30,7 +31,7 @@
                 android:gravity="center"
                 android:background="?android:attr/selectableItemBackground"
                 android:text="title here"
-                android:layout_marginLeft="12dp"
+                android:layout_marginLeft="20dp"
                 android:textColor="@color/picker_button_background_selected"
                 android:textStyle="bold"
                 />
@@ -47,8 +48,20 @@
                 android:textAllCaps="true"
                 android:textColor="@color/picker_button_background_selected"
                 android:textStyle="bold"
+                android:layout_marginRight="10dp"
                 />
 
+            <ImageView
+                android:id="@+id/buttonIcon"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:tint="@color/picker_background"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginRight="12dp"
+
+                />
+<!--                android:src="@drawable/ic_right_arrow_light_blue"
+-->
         </FrameLayout>
 
         <com.github.florent37.singledateandtimepicker.SingleDateAndTimePicker

From 8e46df95cab24354518bc4db47440da5ea9a4b0d Mon Sep 17 00:00:00 2001
From: Akash <akash@digios-MacBook-Pro.local>
Date: Wed, 17 Feb 2021 12:05:27 +0530
Subject: [PATCH 2/2] enable sample app clicks layout

---
 .../single_date_picker_activity_main_double_picker.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
index ae69635d..2de13933 100644
--- 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
@@ -54,7 +54,7 @@
         <LinearLayout
             android:id="@+id/doubleLayout"
             android:layout_width="match_parent"
-            android:visibility="gone"
+            android:visibility="visible"
             android:layout_height="60dp"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
@@ -114,7 +114,7 @@
             android:id="@+id/singleDateLayout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:visibility="gone"
+            android:visibility="visible"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:orientation="horizontal"
@@ -144,7 +144,7 @@
             android:id="@+id/singleDateLocaleLayout"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:visibility="gone"
+            android:visibility="visible"
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:orientation="horizontal"