Up to 1.0.7

Add progress param to loading dialog
Dan629pl · Aug 9, 2020 · 81893cf · 81893cf
1 parent b0d3710
commit 81893cf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Add this to your module's `build.gradle` file:
 ```gradle
 dependencies {
 	...
-	implementation 'com.github.Dan629pl:nordan-material-dialog-android:1.0.6'
+	implementation 'com.github.Dan629pl:nordan-material-dialog-android:1.0.7'
 }
 ```
 <h1>Nordan Alert Dialog</h1>

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
-        versionName "Nordan Material Dialog v1.0.6"
+        versionName "Nordan Material Dialog v1.0.7"
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java b/app/src/main/java/com/nordan/dialog/NordanLoadingDialog.java
@@ -18,10 +18,14 @@
 public class NordanLoadingDialog {
 
     public static Dialog createLoadingDialog(Activity activity, String loadingText) {
-        return createLoadingDialog(activity, loadingText, 0);
+        return createLoadingDialog(activity, loadingText, 0, -1);
     }
 
     public static Dialog createLoadingDialog(Activity activity, String loadingText, int accentColor) {
+        return createLoadingDialog(activity, loadingText, accentColor, -1);
+    }
+
+    public static Dialog createLoadingDialog(Activity activity, String loadingText, int accentColor, int progress) {
         Dialog loadingDialog = new Dialog(activity);
         loadingDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         Optional.ofNullable(loadingDialog.getWindow())
@@ -33,6 +37,10 @@ public static Dialog createLoadingDialog(Activity activity, String loadingText,
         if (accentColor > 0) {
             loadingBar.getIndeterminateDrawable().setColorFilter(activity.getColor(accentColor), android.graphics.PorterDuff.Mode.MULTIPLY);
         }
+        if (progress > -1) {
+            loadingBar.setIndeterminate(false);
+            loadingBar.setProgress(progress);
+        }
         return loadingDialog;
     }
 }
diff --git a/app/src/main/res/layout/nordan_loading_dialog.xml b/app/src/main/res/layout/nordan_loading_dialog.xml
@@ -31,7 +31,7 @@
                 android:gravity="center"
                 android:text="Loading…"
                 android:textAlignment="center"
-                android:textSize="24sp" />
+                android:textSize="22sp" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </RelativeLayout>
diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 1
-        versionName "Nordan Material Dialog v1.0.6"
+        versionName "Nordan Material Dialog v1.0.7"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8