[LoadingDialog] Apply some review comments and make title customizable.

TeamNewPipe · Sep 16, 2023 · a66ce46 · a66ce46
1 parent 378079c
commit a66ce46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -790,10 +790,10 @@ public void onResume(@NonNull final LifecycleOwner owner) {
                     }
                 }
 
-            }, () -> {
+            }, () ->
                 // this branch is executed if there is no activity context
-                inFlight(false);
-            });
+                inFlight(false)
+            );
         }
 
         <T> Single<T> pleaseWait(final Single<T> single) {
@@ -813,7 +813,7 @@ <T> Single<T> pleaseWait(final Single<T> single) {
         @SuppressLint("CheckResult")
         private void openDownloadDialog(final int currentServiceId, final String currentUrl) {
             inFlight(true);
-            final LoadingDialog loadingDialog = new LoadingDialog();
+            final LoadingDialog loadingDialog = new LoadingDialog(R.string.loading_metadata_title);
             loadingDialog.show(getParentFragmentManager(), "loadingDialog");
             disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
                     .subscribeOn(Schedulers.io())

diff --git a/app/src/main/java/org/schabi/newpipe/download/LoadingDialog.java b/app/src/main/java/org/schabi/newpipe/download/LoadingDialog.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.download;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -9,6 +8,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
 
@@ -17,11 +17,18 @@
 import org.schabi.newpipe.databinding.DownloadLoadingDialogBinding;
 import org.schabi.newpipe.util.PermissionHelper;
 
-
+/**
+ * This dialog shows a loading indicator and a customizable title.
+ */
 public class LoadingDialog extends DialogFragment {
     private static final String TAG = "LoadingDialog";
     private static final boolean DEBUG = MainActivity.DEBUG;
     private DownloadLoadingDialogBinding dialogLoadingBinding;
+    private final @StringRes int title;
+
+    public LoadingDialog(final @StringRes int title) {
+        this.title = title;
+    }
 
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
@@ -62,29 +69,14 @@ private void initToolbar(final Toolbar toolbar) {
         if (DEBUG) {
             Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
         }
-        toolbar.setTitle("Loading Metadata...");
+        toolbar.setTitle(requireContext().getString(title));
         toolbar.setNavigationOnClickListener(v -> dismiss());
 
     }
 
-    @Override
-    public void onDismiss(@NonNull final DialogInterface dialog) {
-        super.onDismiss(dialog);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
     @Override
     public void onDestroyView() {
         dialogLoadingBinding = null;
         super.onDestroyView();
     }
-
-    @Override
-    public void onSaveInstanceState(@NonNull final Bundle outState) {
-        super.onSaveInstanceState(outState);
-    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -167,7 +167,7 @@
     <string name="duration_live">Live</string>
     <string name="downloads">Downloads</string>
     <string name="downloads_title">Downloads</string>
-    <string name="loading_title">Loading Metadata…</string>
+    <string name="loading_metadata_title">Loading Metadata…</string>
     <string name="error_report_title">Error report</string>
     <string name="all">All</string>
     <string name="channels">Channels</string>