Merge pull request #30 from gzeinnumer/dev-1

gzeinnumer · web-flow · commit 14bc44c395db · 2021-01-27T00:50:38.000+07:00
Bug Color
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 </h1>
 
 <div align="center">
-    <a><img src="https://img.shields.io/badge/Version-2.2.1-brightgreen.svg?style=flat"></a>
+    <a><img src="https://img.shields.io/badge/Version-2.2.2-brightgreen.svg?style=flat"></a>
     <a><img src="https://img.shields.io/badge/ID-gzeinnumer-blue.svg?style=flat"></a>
     <a><img src="https://img.shields.io/badge/Java-Suport-green?logo=java&style=flat"></a>
     <a><img src="https://img.shields.io/badge/Koltin-Suport-green?logo=kotlin&style=flat"></a>
@@ -407,6 +407,8 @@ You can Customize your dialog UI. [**ReadMore**](https://github.com/gzeinnumer/M
   - Bug Fixing
 - **2.2.1**
   - Bug Fixing
+- **2.2.2**
+  - Change color method
 
 ---
 
diff --git a/README_1.md b/README_1.md
@@ -12,7 +12,7 @@ You can change UI with this configuration.
 - Change Text Title Size
   - `.setTitleSize(21)`
 - Change Text Title Color
-  - `.setTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setTitleColor(Color.parseColor("#03DAC5"))`
 - Change Text Title Alignment
   - `.setTitleAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -28,7 +28,7 @@ You can change UI with this configuration.
 - Change Text Content Size
   - `.setContentSize(21)`
 - Change Text Content Color
-  - `.setContentColor(getResources().getColor(R.color.colorAccent))`
+  - `.setContentColor(getResources().getColor(R.color.colorPrimary))`
   - `.setContentColor(Color.parseColor("#03DAC5"))`
 - Change Text Content Alignment
   - `.setContentAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -42,7 +42,7 @@ You can change UI with this configuration.
 - Change Text Button Cancel
   - `.setBtnCancelTitle("Batal")`
 - Change Text Button Cancel Color
-  - `.setBtnCancelTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setBtnCancelTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setBtnCancelTitleColor(Color.parseColor("#03DAC5"))`
 - Change Icon Button Cancel
   - `.setCancelIconLeft(R.drawable.ic_baseline_add_24)`
@@ -54,7 +54,7 @@ You can change UI with this configuration.
 - Change Text Button Ok
   - `.setBtnOkTitle("Yuhuu")`
 - Change Text Button Ok Color
-  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setBtnOkTitleColor(Color.parseColor("#03DAC5"))`
 - Change Icon Button Ok
   - `.setOkIconLeft(R.drawable.ic_baseline_add_24)`
@@ -79,7 +79,7 @@ You can change UI with this configuration.
       - `Gravity.START`
       - etc.
 - Change Button Background Color
-  - `.setButtonColor(R.color.amber_200)` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
+  - `.setButtonColor(getResources().getColor(R.color.colorPrimary))` or `.setButtonColor(Color.parseColor("#03DAC5"))` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
 - Disable Text All Caps On Button
   - `.setButtonAllCaps(false)` default value is true.
 
diff --git a/README_2.md b/README_2.md
@@ -12,7 +12,7 @@ You can change UI with this configuration.
 - Change Text Title Size
   - `.setTitleSize(21)`
 - Change Text Title Color
-  - `.setTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setTitleColor(Color.parseColor("#03DAC5"))`
 - Change Text Title Alignment
   - `.setTitleAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -28,7 +28,7 @@ You can change UI with this configuration.
 - Change Text Content Size
   - `.setContentSize(21)`
 - Change Text Content Color
-  - `.setContentColor(getResources().getColor(R.color.colorAccent))`
+  - `.setContentColor(getResources().getColor(R.color.colorPrimary))`
   - `.setContentColor(Color.parseColor("#03DAC5"))`
 - Change Text Content Alignment
   - `.setContentAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -42,7 +42,7 @@ You can change UI with this configuration.
 - Change Text Button Ok
   - `.setBtnOkTitle("Yuhuu")`
 - Change Text Button Ok Color
-  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setBtnOkTitleColor(Color.parseColor("#03DAC5"))`
 - Change Icon Button Ok
   - `.setOkIconLeft(R.drawable.ic_baseline_add_24)`
@@ -74,7 +74,7 @@ You can change UI with this configuration.
       - `Gravity.START`
       - etc.
 - Change Button Background Color
-  - `.setButtonColor(R.color.amber_200)` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
+  - `.setButtonColor(getResources().getColor(R.color.colorPrimary))` or `.setButtonColor(Color.parseColor("#03DAC5"))` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
 - Disable Text All Caps On Button
   - `.setButtonAllCaps(false)` default value is true.
 
diff --git a/README_3.md b/README_3.md
@@ -12,7 +12,7 @@ You can change UI with this configuration.
 - Change Text Title Size
   - `.setTitleSize(21)`
 - Change Text Title Color
-  - `.setTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setTitleColor(Color.parseColor("#03DAC5"))`
 - Change Text Title Alignment
   - `.setTitleAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -28,7 +28,7 @@ You can change UI with this configuration.
 - Change Text Content Size
   - `.setContentSize(21)`
 - Change Text Content Color
-  - `.setContentColor(getResources().getColor(R.color.colorAccent))`
+  - `.setContentColor(getResources().getColor(R.color.colorPrimary))`
   - `.setContentColor(Color.parseColor("#03DAC5"))`
 - Change Text Content Alignment
   - `.setContentAlignment(View.TEXT_ALIGNMENT_TEXT_END)`
@@ -42,7 +42,7 @@ You can change UI with this configuration.
 - Change Text Button Cancel
   - `.setBtnCancelTitle("Batal")`
 - Change Text Button Cancel Color
-  - `.setBtnCancelTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setBtnCancelTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setBtnCancelTitleColor(Color.parseColor("#03DAC5"))`
 - Change Icon Button Cancel
   - `.setCancelIconLeft(R.drawable.ic_baseline_add_24)`
@@ -54,7 +54,7 @@ You can change UI with this configuration.
 - Change Text Button Ok
   - `.setBtnOkTitle("Yuhuu")`
 - Change Text Button Ok Color
-  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorAccent))`
+  - `.setBtnOkTitleColor(getResources().getColor(R.color.colorPrimary))`
   - `.setBtnOkTitleColor(Color.parseColor("#03DAC5"))`
 - Change Icon Button Ok
   - `.setOkIconLeft(R.drawable.ic_baseline_add_24)`
@@ -79,7 +79,7 @@ You can change UI with this configuration.
       - `Gravity.START`
       - etc.
 - Change Button Background Color
-  - `.setButtonColor(R.color.amber_200)` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
+  - `.setButtonColor(getResources().getColor(R.color.colorPrimary))` or `.setButtonColor(Color.parseColor("#03DAC5"))` you can use this only if you use `.setButtonStyle(ButtonStyle.ButtonContained)`
 - Disable Text All Caps On Button
   - `.setButtonAllCaps(false)` default value is true.
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,8 +35,9 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
     api 'com.agrawalsuneet.androidlibs:dotsloader:1.4'
+    implementation 'com.github.gzeinnumer:MyLibStyle:0.1.5'
 
     implementation project(':lib')
 
diff --git a/app/src/main/java/com/gzeinnumer/mylibdialog/MainActivity.java b/app/src/main/java/com/gzeinnumer/mylibdialog/MainActivity.java
@@ -1,14 +1,11 @@
 package com.gzeinnumer.mylibdialog;
 
 import android.os.Bundle;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Button;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gzeinnumer.mylibdialog.constant.ButtonStyle;
-import com.gzeinnumer.mylibdialog.dialog.infoDialog.InfoDialog;
 import com.gzeinnumer.mylibdialog.dialog.numberPicker.NumberPickerDialog;
 
 public class MainActivity extends AppCompatActivity {
@@ -17,5 +14,27 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        new NumberPickerDialog(getSupportFragmentManager())
+                .setLastValue(12)
+                .setTitle("ini title")
+                .setContent("ini content")
+                .setContentColor(getResources().getColor(R.color.colorPrimary))
+                .setButtonStyle(ButtonStyle.ButtonContained)
+                .setButtonColor(getResources().getColor(R.color.red_500))
+//                .setButtonColor(Color.parseColor("#03DAC5"))
+                .onOkPressedCallBack(new NumberPickerDialog.OnOkPressed() {
+                    @Override
+                    public void onOkPressed(int value) {
+                        Toast.makeText(MainActivity.this, "Nilai nya " + value, Toast.LENGTH_SHORT).show();
+                    }
+                })
+                .onCancelPressedCallBack(new NumberPickerDialog.OnCancelPressed() {
+                    @Override
+                    public void onCancelPressed() {
+                        Toast.makeText(MainActivity.this, "Cancel", Toast.LENGTH_SHORT).show();
+                    }
+                })
+                .show();
     }
 }
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/red_500</item>
+        <item name="colorPrimaryDark">@color/red_800</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 </resources>
diff --git a/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/confirmDialog/ConfirmDialogSetting.java b/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/confirmDialog/ConfirmDialogSetting.java
@@ -184,8 +184,8 @@ private void initDesign() {
         }
 
         if (buttonColor!=0 && btnStyle == ButtonStyle.ButtonContained){
-            _dBtnCancelMBC.setBackgroundColor(getResources().getColor(buttonColor));
-            _dBtnOkMBC.setBackgroundColor(getResources().getColor(buttonColor));
+            _dBtnCancelMBC.setBackgroundColor(buttonColor);
+            _dBtnOkMBC.setBackgroundColor(buttonColor);
         }
 
         if (!buttonAllCaps){
diff --git a/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/infoDialog/InfoDialogSetting.java b/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/infoDialog/InfoDialogSetting.java
@@ -182,7 +182,7 @@ private void initDesign() {
         }
 
         if (buttonColor!=0 && btnStyle == ButtonStyle.ButtonContained){
-            _dBtnOkMBC.setBackgroundColor(getResources().getColor(buttonColor));
+            _dBtnOkMBC.setBackgroundColor(buttonColor);
         }
 
         if (!buttonAllCaps){
diff --git a/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/numberPicker/NumberPickerDialogSetting.java b/lib/src/main/java/com/gzeinnumer/mylibdialog/dialog/numberPicker/NumberPickerDialogSetting.java
@@ -188,16 +188,21 @@ private void initDesign() {
             _tvTitle.setTextAlignment(tvTitleAlignment);
         }
 
-        if(tvContentAlignment != View.TEXT_ALIGNMENT_TEXT_START){
+        if (tvContentAlignment != View.TEXT_ALIGNMENT_TEXT_START) {
             _tvContent.setTextAlignment(tvContentAlignment);
         }
 
-        if (buttonColor!=0 && btnStyle == ButtonStyle.ButtonContained){
-            _dBtnCancelMBC.setBackgroundColor(getResources().getColor(buttonColor));
-            _dBtnOkMBC.setBackgroundColor(getResources().getColor(buttonColor));
+        if (buttonColor != 0 && btnStyle == ButtonStyle.ButtonContained) {
+            _dBtnCancelMBC.setBackgroundColor(buttonColor);
+            _dBtnOkMBC.setBackgroundColor(buttonColor);
         }
 
-        if (!buttonAllCaps){
+        if (buttonColor != 0) {
+            _btnSubtract.setBackgroundColor(buttonColor);
+            _btnAdd.setBackgroundColor(buttonColor);
+        }
+
+        if (!buttonAllCaps) {
             _dBtnCancelMBT.setAllCaps(false);
             _dBtnCancelMBO.setAllCaps(false);
             _dBtnCancelMBC.setAllCaps(false);
diff --git a/lib/src/main/res/layout/confirm_dialog.xml b/lib/src/main/res/layout/confirm_dialog.xml
@@ -46,6 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/def_margin"
                 android:text="@string/cancel"
+                android:textColor="@color/colorPrimary"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -55,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/ok"
+                android:textColor="@color/colorPrimary"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -65,6 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/def_margin"
                 android:text="@string/cancel"
+                android:textColor="@color/colorPrimary"
                 android:visibility="gone" />
 
             <Button
@@ -73,6 +76,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/ok"
+                android:textColor="@color/colorPrimary"
                 android:visibility="gone" />
 
             <Button
@@ -81,6 +85,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/def_margin"
+                android:backgroundTint="@color/colorPrimary"
                 android:text="@string/cancel"
                 android:visibility="gone" />
 
@@ -89,6 +94,7 @@
                 style="@style/MyButtonContained"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:backgroundTint="@color/colorPrimary"
                 android:text="@string/ok"
                 android:visibility="gone" />
 
diff --git a/lib/src/main/res/values/colors.xml b/lib/src/main/res/values/colors.xml

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ private void initDesign() {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`if (buttonColor!=0 && btnStyle == ButtonStyle.ButtonContained){`
`187`		`- _dBtnCancelMBC.setBackgroundColor(getResources().getColor(buttonColor));`
`188`		`- _dBtnOkMBC.setBackgroundColor(getResources().getColor(buttonColor));`
	`187`	`+ _dBtnCancelMBC.setBackgroundColor(buttonColor);`
	`188`	`+ _dBtnOkMBC.setBackgroundColor(buttonColor);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if (!buttonAllCaps){`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private void initDesign() {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (buttonColor!=0 && btnStyle == ButtonStyle.ButtonContained){`
`185`		`- _dBtnOkMBC.setBackgroundColor(getResources().getColor(buttonColor));`
	`185`	`+ _dBtnOkMBC.setBackgroundColor(buttonColor);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`if (!buttonAllCaps){`