From 111a0f9f171341f2c35f1c10cdddcb9dcf53f405 Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Sat, 31 Mar 2018 10:58:11 -0700
Subject: [PATCH] -Modified playback parameter dialog to use translucent
 background. (reverted from commit 0d25254d4831aca92ad6cf6c0c772279b32b4a07)

---
 .../newpipe/player/ServicePlayerActivity.java |  4 +-
 .../helper/PlaybackParameterDialog.java       | 40 ++++++-------------
 .../res/layout/dialog_playback_parameter.xml  | 16 ++------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 4138ead7d..ccaa6f225 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -459,8 +459,8 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     private void openPlaybackParameterDialog() {
         if (player == null) return;
-        PlaybackParameterDialog.newInstance(player.getPlaybackSpeed(), player.getPlaybackPitch())
-                .show(getSupportFragmentManager(), getTag());
+        PlaybackParameterDialog.newInstance(player.getPlaybackSpeed(),
+                player.getPlaybackPitch()).show(getSupportFragmentManager(), getTag());
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index 289661aea..7c7d87791 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -2,12 +2,11 @@ package org.schabi.newpipe.player.helper;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
@@ -16,7 +15,6 @@ import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.SliderStrategy;
-import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.player.BasePlayer.DEBUG;
 
@@ -70,7 +68,6 @@ public class PlaybackParameterDialog extends DialogFragment {
     @Nullable private CheckBox unhookingCheckbox;
 
     @Nullable private TextView nightCorePresetText;
-    @Nullable private TextView defaultPresetText;
     @Nullable private TextView resetPresetText;
 
     public static PlaybackParameterDialog newInstance(final double playbackTempo,
@@ -118,23 +115,19 @@ public class PlaybackParameterDialog extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        final Context context = requireContext();
-
         final View view = View.inflate(getContext(), R.layout.dialog_playback_parameter, null);
         setupControlViews(view);
 
-        Dialog dialog = new Dialog(context);
-        dialog.setCancelable(true);
-        dialog.setCanceledOnTouchOutside(true);
-        dialog.setTitle(R.string.playback_speed_control);
-        dialog.setContentView(view);
-        if (dialog.getWindow() != null) {
-            @ColorInt final int backgroundColor = ThemeHelper.resolveColorFromAttr(context,
-                    R.attr.queue_background_color);
-            dialog.getWindow().setBackgroundDrawable(new ColorDrawable(backgroundColor));
-        }
+        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireActivity())
+                .setTitle(R.string.playback_speed_control)
+                .setView(view)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, (dialogInterface, i) ->
+                        setPlaybackParameters(initialTempo, initialPitch))
+                .setPositiveButton(R.string.finish, (dialogInterface, i) ->
+                        setCurrentPlaybackParameters());
 
-        return dialog;
+        return dialogBuilder.create();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -251,20 +244,11 @@ public class PlaybackParameterDialog extends DialogFragment {
             });
         }
 
-        defaultPresetText = rootView.findViewById(R.id.presetDefault);
-        if (defaultPresetText != null) {
-            defaultPresetText.setOnClickListener(view -> {
-                setTempoSlider(DEFAULT_TEMPO);
-                setPitchSlider(DEFAULT_PITCH);
-                setCurrentPlaybackParameters();
-            });
-        }
-
         resetPresetText = rootView.findViewById(R.id.presetReset);
         if (resetPresetText != null) {
             resetPresetText.setOnClickListener(view -> {
-                setTempoSlider(initialTempo);
-                setPitchSlider(initialPitch);
+                setTempoSlider(DEFAULT_TEMPO);
+                setPitchSlider(DEFAULT_PITCH);
                 setCurrentPlaybackParameters();
             });
         }
diff --git a/app/src/main/res/layout/dialog_playback_parameter.xml b/app/src/main/res/layout/dialog_playback_parameter.xml
index a3062567e..a8c6a5dcd 100644
--- a/app/src/main/res/layout/dialog_playback_parameter.xml
+++ b/app/src/main/res/layout/dialog_playback_parameter.xml
@@ -4,7 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="false"
-    android:padding="@dimen/video_item_search_padding">
+    android:paddingLeft="@dimen/video_item_search_padding"
+    android:paddingRight="@dimen/video_item_search_padding"
+    android:paddingTop="@dimen/video_item_search_padding">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -294,23 +296,13 @@
                 android:background="?attr/selectableItemBackground"
                 android:textColor="?attr/colorAccent"/>
 
-            <TextView
-                android:id="@+id/presetDefault"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/playback_default"
-                android:background="?attr/selectableItemBackground"
-                android:textColor="?attr/colorAccent"/>
-
             <TextView
                 android:id="@+id/presetReset"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="Reset"
+                android:text="@string/playback_default"
                 android:background="?attr/selectableItemBackground"
                 android:textColor="?attr/colorAccent"/>
         </LinearLayout>