Merge pull request #11272 from t895/tv-update-fix

Android: Use progress bar that does not inherit from AppCompat on leanback

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java

@@ -10,13 +10,15 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.databinding.DialogProgressBinding;
+import org.dolphinemu.dolphinemu.databinding.DialogProgressTvBinding;
 
 public class SystemUpdateProgressBarDialogFragment extends DialogFragment
 {
@@ -32,32 +34,58 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
     SystemUpdateViewModel viewModel =
             new ViewModelProvider(requireActivity()).get(SystemUpdateViewModel.class);
 
-    DialogProgressBinding dialogProgressBinding =
-            DialogProgressBinding.inflate(getLayoutInflater());
+    DialogProgressBinding dialogProgressBinding;
+    DialogProgressTvBinding dialogProgressTvBinding;
 
     // We need to set the message to something here, otherwise the text will not appear when we set it later.
-    AlertDialog progressDialog = new MaterialAlertDialogBuilder(requireContext())
-            .setTitle(getString(R.string.updating))
-            .setMessage("")
-            .setNegativeButton(getString(R.string.cancel), null)
-            .setView(dialogProgressBinding.getRoot())
-            .setCancelable(false)
-            .create();
-
-    viewModel.getProgressData()
-            .observe(this, (@Nullable
-                    Integer progress) -> dialogProgressBinding.updateProgress.setProgress(
-                    progress));
-
-    viewModel.getTotalData().observe(this, (@Nullable Integer total) ->
+    MaterialAlertDialogBuilder progressDialogBuilder =
+            new MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(getString(R.string.updating))
+                    .setMessage("")
+                    .setNegativeButton(getString(R.string.cancel), null)
+                    .setCancelable(false);
+
+    // TODO: Remove dialog_progress_tv if we switch to an AppCompatActivity for leanback
+    if (getActivity() instanceof AppCompatActivity)
     {
-      if (total == 0)
+      dialogProgressBinding = DialogProgressBinding.inflate(getLayoutInflater());
+      progressDialogBuilder.setView(dialogProgressBinding.getRoot());
+
+      viewModel.getProgressData().observe(this,
+              (@Nullable Integer progress) -> dialogProgressBinding.updateProgress.setProgress(
+                      progress));
+
+      viewModel.getTotalData().observe(this, (@Nullable Integer total) ->
       {
-        return;
-      }
+        if (total == 0)
+        {
+          return;
+        }
 
-      dialogProgressBinding.updateProgress.setMax(total);
-    });
+        dialogProgressBinding.updateProgress.setMax(total);
+      });
+    }
+    else
+    {
+      dialogProgressTvBinding = DialogProgressTvBinding.inflate(getLayoutInflater());
+      progressDialogBuilder.setView(dialogProgressTvBinding.getRoot());
+
+      viewModel.getProgressData().observe(this,
+              (@Nullable Integer progress) -> dialogProgressTvBinding.updateProgress.setProgress(
+                      progress));
+
+      viewModel.getTotalData().observe(this, (@Nullable Integer total) ->
+      {
+        if (total == 0)
+        {
+          return;
+        }
+
+        dialogProgressTvBinding.updateProgress.setMax(total);
+      });
+    }
+
+    AlertDialog progressDialog = progressDialogBuilder.create();
 
     viewModel.getTitleIdData().observe(this, (@Nullable Long titleId) -> progressDialog.setMessage(
             getString(R.string.updating_message, titleId)));

Source/Android/app/src/main/res/layout/dialog_progress_tv.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/dialog_progress"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/update_progress"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:indeterminate="false" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>