Don't use the deprecated ProgressDialog

Android-Boot-Manager · Feb 11, 2021 · 27f020a · 27f020a
1 parent b32129e
commit 27f020a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/.idea/modules/app/AndroidBootManager.app.iml b/.idea/modules/app/AndroidBootManager.app.iml
diff --git a/app/src/main/java/org/androidbootmanager/app/util/MiscUtils.java b/app/src/main/java/org/androidbootmanager/app/util/MiscUtils.java
@@ -1,16 +1,18 @@
 package org.androidbootmanager.app.util;
 
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
 
 import com.topjohnwu.superuser.Shell;
 
 import org.androidbootmanager.app.R;
 
 public class MiscUtils {
-    public static ProgressDialog prog;
+    public static AlertDialog prog;
     public static void sure(Context c, DialogInterface d, String msg, DialogInterface.OnClickListener v) {
         d.dismiss();
         new AlertDialog.Builder(c)
@@ -27,14 +29,13 @@ public static void sure(Context c, DialogInterface d, int msg, DialogInterface.O
     }
 
     public static void w(Context c, String msg, Runnable r) {
-        //TODO: no more deprecated ProgressDialog
-        prog = new ProgressDialog(c);
-        prog.setIndeterminate(true);
-        prog.setCanceledOnTouchOutside(false);
-        prog.setCancelable(false);
-        prog.setTitle(R.string.wait);
-        prog.setMessage(msg);
-        prog.show();
+        View v = LayoutInflater.from(c).inflate(R.layout.progressdialog, null);
+        ((TextView) v.findViewById(R.id.prog_message)).setText(msg);
+        prog = new AlertDialog.Builder(c)
+        .setCancelable(false)
+        .setTitle(R.string.wait)
+        .setView(v)
+        .show();
         r.run();
     }
 

diff --git a/app/src/main/res/layout/progressdialog.xml b/app/src/main/res/layout/progressdialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="20dp">
+    <ProgressBar
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="4"
+        android:gravity="center"
+        android:id="@+id/prog_message" />
+</LinearLayout>