Use ProgressBar instead of off center ProgressDialog

guardianproject · Feb 26, 2018 · f930ced · f930ced
1 parent e3f9397
commit f930ced
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
@@ -11,13 +11,11 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.torproject.android.BuildConfig;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.R;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.TorifiedApp;
 
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -40,12 +38,14 @@
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 public class AppManagerActivity extends AppCompatActivity implements OnClickListener, OrbotConstants {
 
     private GridView listApps;
     private ListAdapter adapterApps;
+    private ProgressBar progressBar;
     private final static String TAG = "Orbot";
     PackageManager pMgr = null;
 
@@ -57,7 +57,8 @@ protected void onCreate(Bundle savedInstanceState) {
         this.setContentView(R.layout.layout_apps);
         setTitle(R.string.apps_mode);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
+        listApps = findViewById(R.id.applistview);
+        progressBar = findViewById(R.id.progressBar);
     }
 
     /*
@@ -94,28 +95,23 @@ else if (item.getItemId() == R.id.menu_apps_refresh)
     @Override
     protected void onResume() {
         super.onResume();
-        listApps = (GridView) findViewById(R.id.applistview);
         mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
         reloadApps();
     }
 
     private void reloadApps () {
-
         new AsyncTask<Void, Void, Void>() {
-            private ProgressDialog dialog;
-
             protected void onPreExecute() {
                 // Pre Code
-                dialog = new ProgressDialog(AppManagerActivity.this, android.support.v4.app.DialogFragment.STYLE_NO_TITLE);
-                dialog.show();
+                progressBar.setVisibility(View.VISIBLE);
             }
             protected Void doInBackground(Void... unused) {
                 loadApps(mPrefs);
                 return null;
             }
             protected void onPostExecute(Void unused) {
                 listApps.setAdapter(adapterApps);
-                dialog.cancel();
+                progressBar.setVisibility(View.GONE);
             }
         }.execute();
 

diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml
@@ -4,6 +4,13 @@
     android:layout_height="match_parent"
     android:duplicateParentState="true">
 
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+
     <GridView
         android:id="@+id/applistview"
         android:layout_width="match_parent"