feat: show loading indicator for apps #116

Xtr126 · Nov 30, 2024 · 6c52443 · 6c52443
1 parent d9b311b
commit 6c52443
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/app/src/main/java/xtr/keymapper/profiles/ProfileSelector.java b/app/src/main/java/xtr/keymapper/profiles/ProfileSelector.java
@@ -103,12 +103,15 @@ public static void createNewProfileForApp(@UiContext Context context, String pac
     }
 
     public static void showAppSelectionDialog(Context context, OnAppSelectedListener listener) {
-        ProfilesApps appsView = new ProfilesApps(context).asyncLoadApps((p, adapter) ->
-            p.binding.appsGrid.setAdapter(adapter)
-        );
-
+        ProfilesApps appsView = new ProfilesApps(context);
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
-        builder.setView(appsView.view);
+        builder.setView(R.layout.loading);
+
+        appsView.asyncLoadApps((p, adapter) -> {
+            p.binding.appsGrid.setAdapter(adapter);
+            builder.setView(p.view);
+        });
+
         AlertDialog dialog = showDialog(builder);
 
         appsView.setListener(packageName -> {

diff --git a/app/src/main/java/xtr/keymapper/profiles/ProfilesApps.java b/app/src/main/java/xtr/keymapper/profiles/ProfilesApps.java
@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
 
 import xtr.keymapper.databinding.AppViewBinding;
 import xtr.keymapper.databinding.FragmentProfilesAppsBinding;
@@ -38,7 +37,7 @@ public ProfilesApps(Context context){
     }
 
     @UiThread
-    ProfilesApps asyncLoadApps(OnAppsLoadedListener l) {
+    void asyncLoadApps(OnAppsLoadedListener l) {
         Context context = view.getContext();
 
         new Thread(() -> {
@@ -47,7 +46,6 @@ ProfilesApps asyncLoadApps(OnAppsLoadedListener l) {
             mHandler.post(() -> l.onAppsLoaded(ProfilesApps.this, adapter));
         }).start();
 
-        return this;
     }
 
     public void setListener(ProfileSelector.OnAppSelectedListener mListener) {

diff --git a/app/src/main/res/layout/loading.xml b/app/src/main/res/layout/loading.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp"
+    android:gravity="center"
+    android:orientation="vertical">
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/loading"/>
+</LinearLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -108,4 +108,5 @@
     <string name="use_shizuku_for_activation">Use Shizuku for activation?</string>
     <string name="add_games">Add Games</string>
     <string name="macro">Macro</string>
+    <string name="loading">Loading…</string>
 </resources>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
@@ -107,4 +107,5 @@
     <string name="use_shizuku_for_activation">Use Shizuku for activation?</string>
     <string name="add_games">Add Games</string>
     <string name="macro">Macro</string>
+    <string name="loading">Loading…</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -106,4 +106,5 @@
     <string name="use_shizuku_for_activation">Use Shizuku for activation?</string>
     <string name="add_games">Add Games</string>
     <string name="macro">Macro</string>
+    <string name="loading">Loading…</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -107,4 +107,5 @@
     <string name="use_shizuku_for_activation">Use Shizuku for activation?</string>
     <string name="add_games">Add Games</string>
     <string name="macro">Macro</string>
+    <string name="loading">Loading…</string>
 </resources>