onclick

gzeinnumer · Jul 24, 2021 · 8730bc9 · 8730bc9
1 parent a9d6eba
commit 8730bc9
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 172 deletions.
diff --git a/README.md b/README.md
@@ -73,6 +73,26 @@ dependencies {
 <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
     <!-- Customize your theme here. -->
 </style>
+
+<style name="CustomDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
+    <item name="colorPrimary">@color/colorPrimary</item>
+    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    <item name="colorAccent">@color/colorAccent</item>
+    <item name="android:windowMinWidthMajor">80%</item>
+    <item name="android:windowMinWidthMinor">80%</item>
+    <item name="android:windowEnterAnimation">@anim/anim_in</item>
+    <item name="android:windowExitAnimation">@anim/anim_out</item>
+</style>
+```
+
+If you want to change default color, add value to `res/color.xml`
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#03DAC5</color>
+</resources>
 ```
 
 If you want to change default font, add `custom_font.ttf` to your `res` directory `res->font`.
@@ -119,16 +139,6 @@ Than add this `style` to your `style.xml`/`themes.xml`
 </style>
 ```
 
-If you want to change default color, add value to `res/color.xml`
-```xml
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
-</resources>
-```
-
 #
 ### ConfirmDialog
 Dialog with **1 Title, 1 Content, 1 Negative Button, 1 Positive Button**.
@@ -520,7 +530,7 @@ new TimeDialog(getSupportFragmentManager())
 - **3.2.3**
   - Bug Fixing
 - **3.2.4**
-  - Remove Default Animation
+  - Remove Default Animation and Color
 
 ---
 # Contribution

diff --git a/README_1.md b/README_1.md
@@ -147,6 +147,9 @@ Here is the style
 
     <!-- res->styles.xml -->
     <style name="CustomDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowMinWidthMajor">80%</item>
         <item name="android:windowMinWidthMinor">80%</item>
         <item name="android:windowEnterAnimation">@anim/anim_in</item>

diff --git a/README_2.md b/README_2.md
@@ -132,6 +132,9 @@ Here is the style
 
     <!-- res->styles.xml -->
     <style name="CustomDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowMinWidthMajor">80%</item>
         <item name="android:windowMinWidthMinor">80%</item>
         <item name="android:windowEnterAnimation">@anim/anim_in</item>

diff --git a/README_3.md b/README_3.md
@@ -151,6 +151,9 @@ Here is the style
 
     <!-- res->styles.xml -->
     <style name="CustomDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowMinWidthMajor">80%</item>
         <item name="android:windowMinWidthMinor">80%</item>
         <item name="android:windowEnterAnimation">@anim/anim_in</item>

diff --git a/README_4.md b/README_4.md
@@ -76,6 +76,9 @@ Here is the style
 
     <!-- res->styles.xml -->
     <style name="CustomDialogStyle" parent="Theme.MaterialComponents.Light.Dialog">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowMinWidthMajor">80%</item>
         <item name="android:windowMinWidthMinor">80%</item>
         <item name="android:windowEnterAnimation">@anim/anim_in</item>

diff --git a/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java b/app/src/main/java/com/gzeinnumer/dialogandroid/MainActivity.java
@@ -9,6 +9,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.android.material.timepicker.TimeFormat;
+import com.gzeinnumer.da.constant.ButtonStyle;
 import com.gzeinnumer.da.constant.DialogType;
 import com.gzeinnumer.da.dialog.confirmDialog.ConfirmDialog;
 import com.gzeinnumer.da.dialog.datePickerDialog.multi.MultiDatePickerDialog;

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.DialogAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/red_600</item>
+        <item name="colorPrimaryVariant">@color/red_400</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>

diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/confirmDialog/ConfirmDialogSetting.java
@@ -142,12 +142,17 @@ private void initDesign() {
             _tvContent.setTextSize((float) tvContentSize);
 
         if (dBtnTextSize != 0) {
-            if (btnStyle == ButtonStyle.ButtonText) _dBtnCancelMBT.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonOutlined) _dBtnCancelMBO.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonContained) _dBtnCancelMBC.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonText)
+                _dBtnCancelMBT.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonOutlined)
+                _dBtnCancelMBO.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonContained)
+                _dBtnCancelMBC.setTextSize((float) dBtnTextSize);
             if (btnStyle == ButtonStyle.ButtonText) _dBtnOkMBT.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonOutlined) _dBtnOkMBO.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonContained) _dBtnOkMBC.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonOutlined)
+                _dBtnOkMBO.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonContained)
+                _dBtnOkMBC.setTextSize((float) dBtnTextSize);
         }
 
         if (tvTitleColor != 0)
@@ -158,8 +163,10 @@ private void initDesign() {
 
         if (btnTextColorCancel != 0) {
             if (btnStyle == ButtonStyle.ButtonText) _dBtnCancelMBT.setTextColor(btnTextColorCancel);
-            if (btnStyle == ButtonStyle.ButtonOutlined) _dBtnCancelMBO.setTextColor(btnTextColorCancel);
-            if (btnStyle == ButtonStyle.ButtonContained) _dBtnCancelMBC.setTextColor(btnTextColorCancel);
+            if (btnStyle == ButtonStyle.ButtonOutlined)
+                _dBtnCancelMBO.setTextColor(btnTextColorCancel);
+            if (btnStyle == ButtonStyle.ButtonContained)
+                _dBtnCancelMBC.setTextColor(btnTextColorCancel);
         }
 
         if (btnTextColorOk != 0) {
@@ -213,60 +220,54 @@ private void initDesign() {
 
 
     private void initOnClick() {
-        if (btnStyle == ButtonStyle.ButtonText) {
-            _dBtnCancelMBT.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onCancelPressed != null)
-                        onCancelPressed.onCancelPressed();
-                    getDialog().dismiss();
-                }
-            });
-            _dBtnOkMBT.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null)
-                        onOkPressed.onOkPressed();
-                    getDialog().dismiss();
-                }
-            });
-        }
-        if (btnStyle == ButtonStyle.ButtonOutlined) {
-            _dBtnCancelMBO.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onCancelPressed != null)
-                        onCancelPressed.onCancelPressed();
-                    getDialog().dismiss();
-                }
-            });
-            _dBtnOkMBO.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null)
-                        onOkPressed.onOkPressed();
-                    getDialog().dismiss();
-                }
-            });
-        }
-        if (btnStyle == ButtonStyle.ButtonContained) {
-            _dBtnCancelMBC.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onCancelPressed != null)
-                        onCancelPressed.onCancelPressed();
-                    getDialog().dismiss();
-                }
-            });
-            _dBtnOkMBC.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null)
-                        onOkPressed.onOkPressed();
-                    getDialog().dismiss();
-                }
-            });
-        }
+        _dBtnCancelMBT.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onCancelPressed != null)
+                    onCancelPressed.onCancelPressed();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnOkMBT.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null)
+                    onOkPressed.onOkPressed();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnCancelMBO.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onCancelPressed != null)
+                    onCancelPressed.onCancelPressed();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnOkMBO.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null)
+                    onOkPressed.onOkPressed();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnCancelMBC.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onCancelPressed != null)
+                    onCancelPressed.onCancelPressed();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnOkMBC.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null)
+                    onOkPressed.onOkPressed();
+                getDialog().dismiss();
+            }
+        });
     }
 
     private void btnVisibleOk(Button button, int visible) {

diff --git a/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java b/da/src/main/java/com/gzeinnumer/da/dialog/infoDialog/InfoDialogSetting.java
@@ -146,8 +146,10 @@ private void initDesign() {
 
         if (dBtnTextSize != 0) {
             if (btnStyle == ButtonStyle.ButtonText) _dBtnOkMBT.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonOutlined) _dBtnOkMBO.setTextSize((float) dBtnTextSize);
-            if (btnStyle == ButtonStyle.ButtonContained) _dBtnOkMBC.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonOutlined)
+                _dBtnOkMBO.setTextSize((float) dBtnTextSize);
+            if (btnStyle == ButtonStyle.ButtonContained)
+                _dBtnOkMBC.setTextSize((float) dBtnTextSize);
         }
 
         if (tvTitleColor != 0)
@@ -222,39 +224,36 @@ public void onFinish() {
 
 
     private void initOnClick() {
-        if (btnStyle == ButtonStyle.ButtonText)
-            _dBtnOkMBT.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null) {
-                        if (dismissIn != -1) countDownTimer.cancel();
-                        onOkPressed.onOkPressed();
-                    }
-                    getDialog().dismiss();
+        _dBtnOkMBT.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null) {
+                    if (dismissIn != -1) countDownTimer.cancel();
+                    onOkPressed.onOkPressed();
                 }
-            });
-        if (btnStyle == ButtonStyle.ButtonOutlined)
-            _dBtnOkMBO.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null) {
-                        if (dismissIn != -1) countDownTimer.cancel();
-                        onOkPressed.onOkPressed();
-                    }
-                    getDialog().dismiss();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnOkMBO.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null) {
+                    if (dismissIn != -1) countDownTimer.cancel();
+                    onOkPressed.onOkPressed();
                 }
-            });
-        if (btnStyle == ButtonStyle.ButtonContained)
-            _dBtnOkMBC.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onOkPressed != null) {
-                        if (dismissIn != -1) countDownTimer.cancel();
-                        onOkPressed.onOkPressed();
-                    }
-                    getDialog().dismiss();
+                getDialog().dismiss();
+            }
+        });
+        _dBtnOkMBC.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onOkPressed != null) {
+                    if (dismissIn != -1) countDownTimer.cancel();
+                    onOkPressed.onOkPressed();
                 }
-            });
+                getDialog().dismiss();
+            }
+        });
     }
 
     private void btnVisibleOk(Button button, int visible) {