Merge pull request #5 from umairayub79/NewMethods

Added two new methods **.setPositiveButtonTextColor(int) **.setNegativeButtonTextColor(int)
umairayub79 · Oct 4, 2020 · c26df65 · c26df65
2 parents 1cc3229 + 39725a4
commit c26df65
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 16 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/README.md b/README.md
@@ -76,8 +76,11 @@ dependencies {
 .setBackgroundColor(int);
 .setNegativeButtonText(String);
 .setPositiveButtonText(String);
+.setPositiveButtonTextColor(int)
+.setNegativeButtonTextColor(int)
 .setCancelableOnOutsideTouch(boolean);
 .setPositiveButtonListener(MaDialogListener);
 .setNegativeButtonListener(MaDialogListener);
 .build();
+
 ```
diff --git a/app/src/main/java/umairayub/madialogdemoapp/MainActivity.kt b/app/src/main/java/umairayub/madialogdemoapp/MainActivity.kt
@@ -65,18 +65,25 @@ class MainActivity : AppCompatActivity() {
             MaDialog.Builder(this@MainActivity)
                     .setTitle("Basic with Image + Title + Buttons")
                     .setMessage(msg)
-                    .setBackgroundColor(Color.parseColor("#B71C1C"))
+                    .setMessageTextColor(Color.WHITE)
+                    .setTitleTextColor(Color.WHITE)
+                    .setBackgroundColor(Color.BLUE)
+                    .setPositiveButtonTextColor(Color.GREEN)
+                    .setNegativeButtonTextColor(Color.RED)
                     .setImage(R.drawable.image)
-                    .AddNewButton(R.style.AppTheme, "Yes", object : MaDialogListener {
+                    .setPositiveButtonText("Yes")
+                    .setNegativeButtonText("No")
+                    .setPositiveButtonListener(object : MaDialogListener {
                         override fun onClick() {
 
                         }
                     })
-                    .AddNewButton(R.style.AppTheme, "Cancel", object : MaDialogListener {
+                    .setNegativeButtonListener(object : MaDialogListener {
                         override fun onClick() {
 
                         }
                     })
+
                     .build()
         }
         btn6.setOnClickListener {

diff --git a/madialog/src/main/java/umairayub/madialog/MaDialog.kt b/madialog/src/main/java/umairayub/madialog/MaDialog.kt
@@ -32,6 +32,8 @@ class MaDialog {
         private var negativeButtonText: String? = null
 
         private var buttonTextColor: Int = 0
+        private var positiveButtonTextColor: Int = 0
+        private var negativeButtonTextColor: Int = 0
         private var messageTextColor: Int = 0
         private var titleTextColor: Int = 0
         private var backgroundColor: Int = 0
@@ -85,6 +87,16 @@ class MaDialog {
             return this
         }
 
+        fun setPositiveButtonTextColor(positiveButtonTextColor: Int): Builder {
+            this.positiveButtonTextColor = positiveButtonTextColor
+            return this
+        }
+
+        fun setNegativeButtonTextColor(negativeButtonTextColor: Int): Builder {
+            this.negativeButtonTextColor = negativeButtonTextColor
+            return this
+        }
+
         fun setCancelableOnOutsideTouch(cancelOnOutsideTouch: Boolean): Builder {
             this.cancelOnOutsideTouch = cancelOnOutsideTouch
             return this
@@ -206,6 +218,16 @@ class MaDialog {
             if (buttonTextColor != 0) {
                 btnNegative.setTextColor(buttonTextColor)
                 btnPositve.setTextColor(buttonTextColor)
+                for (i in buttons.indices) {
+                    buttons[i].setTextColor(buttonTextColor)
+                }
+
+            }
+            if (positiveButtonTextColor != 0) {
+                btnPositve.setTextColor(positiveButtonTextColor)
+            }
+            if (negativeButtonTextColor != 0) {
+                btnNegative.setTextColor(negativeButtonTextColor)
             }
             if (negativeButtonText != null) {
                 btnNegative.text = negativeButtonText

diff --git a/madialog/src/main/res/layout/madialog.xml b/madialog/src/main/res/layout/madialog.xml
@@ -30,50 +30,51 @@
                 android:id="@+id/tvTitleDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
                 android:paddingStart="16dp"
                 android:paddingTop="20dp"
                 android:paddingEnd="16dp"
                 android:paddingBottom="20dp"
                 android:textAlignment="center"
                 android:textSize="18sp"
                 android:textStyle="bold"
-                android:visibility="gone"
-                android:gravity="center_horizontal" />
+                android:visibility="gone" />
 
             <TextView
-                android:layout_margin="10dp"
                 android:id="@+id/tvMessageDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:visibility="gone"
-                android:paddingEnd="16dp"
+                android:layout_margin="10dp"
+                android:gravity="center_horizontal"
                 android:paddingStart="16dp"
-                android:gravity="center_horizontal" />
+                android:paddingEnd="16dp"
+                android:textAlignment="center"
+                android:visibility="gone" />
 
             <LinearLayout
                 android:id="@+id/buttonLayout"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="8dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <Button
                     android:id="@+id/btn_positive"
-                    android:background="@android:color/transparent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
                     android:visibility="gone" />
+
                 <Button
                     android:id="@+id/btn_negative"
-                    android:background="@android:color/transparent"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
                     android:visibility="gone" />
             </LinearLayout>
         </LinearLayout>