From 36b4134838b62797ceb34b96948f6f06ba9d39f2 Mon Sep 17 00:00:00 2001
From: TheLastGimbus <mateusz.soszynski@tuta.io>
Date: Sun, 14 Jun 2020 15:15:38 +0200
Subject: [PATCH] Remove speed buttons from bottom menu

---
 .../newpipe/player/ServicePlayerActivity.java | 15 +--------
 .../layout/activity_player_queue_control.xml  | 31 -------------------
 2 files changed, 1 insertion(+), 45 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 54022c0cb..0d355d61f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -45,7 +45,6 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.util.Collections;
 import java.util.List;
 
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatPitch;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
@@ -91,9 +90,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private ImageButton shuffleButton;
     private ProgressBar progressBar;
 
-    private TextView playbackSpeedButton;
-    private TextView playbackPitchButton;
-
     private Menu menu;
 
     ////////////////////////////////////////////////////////////////////////////
@@ -317,8 +313,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
         fastForwardButton = rootView.findViewById(R.id.control_fast_forward);
         forwardButton = rootView.findViewById(R.id.control_forward);
         shuffleButton = rootView.findViewById(R.id.control_shuffle);
-        playbackSpeedButton = rootView.findViewById(R.id.control_playback_speed);
-        playbackPitchButton = rootView.findViewById(R.id.control_playback_pitch);
         progressBar = rootView.findViewById(R.id.control_progress_bar);
 
         repeatButton.setOnClickListener(this);
@@ -328,8 +322,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
         fastForwardButton.setOnClickListener(this);
         forwardButton.setOnClickListener(this);
         shuffleButton.setOnClickListener(this);
-        playbackSpeedButton.setOnClickListener(this);
-        playbackPitchButton.setOnClickListener(this);
     }
 
     private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
@@ -489,10 +481,6 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             player.onPlayNext();
         } else if (view.getId() == shuffleButton.getId()) {
             player.onShuffleClicked();
-        } else if (view.getId() == playbackSpeedButton.getId()) {
-            openPlaybackParameterDialog();
-        } else if (view.getId() == playbackPitchButton.getId()) {
-            openPlaybackParameterDialog();
         } else if (view.getId() == metadata.getId()) {
             scrollToSelected();
         } else if (view.getId() == progressLiveSync.getId()) {
@@ -700,8 +688,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     private void onPlaybackParameterChanged(final PlaybackParameters parameters) {
         if (parameters != null) {
-            playbackSpeedButton.setText(formatSpeed(parameters.speed));
-            playbackPitchButton.setText(formatPitch(parameters.pitch));
+            Log.d("Dupa", "12");
         }
     }
 
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 6a8b31f43..dbe3d718a 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -169,22 +169,6 @@
         android:orientation="horizontal"
         tools:ignore="RtlHardcoded">
 
-        <TextView
-            android:id="@+id/control_playback_speed"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/control_repeat"
-            android:gravity="center"
-            android:minWidth="50dp"
-            android:text="1x"
-            android:textColor="?attr/colorAccent"
-            android:textStyle="bold"
-            android:background="?attr/selectableItemBackground"
-            tools:ignore="HardcodedText,RtlHardcoded"/>
-
         <ImageButton
             android:id="@+id/control_repeat"
             android:layout_width="30dp"
@@ -311,21 +295,6 @@
             android:src="@drawable/ic_shuffle_white_24dp"
             tools:ignore="ContentDescription"/>
 
-        <TextView
-            android:id="@+id/control_playback_pitch"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:layout_centerVertical="true"
-            android:layout_toRightOf="@+id/control_shuffle"
-            android:gravity="center"
-            android:minWidth="50dp"
-            android:text="100%"
-            android:textColor="?attr/colorAccent"
-            android:textStyle="bold"
-            android:background="?attr/selectableItemBackground"
-            tools:ignore="HardcodedText,RtlHardcoded"/>
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file