From d266ed4383e317b9d716de45d81c4f677ff37d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Tue, 25 Dec 2018 14:44:52 +0100
Subject: [PATCH] - Moved playspeed into options menu

---
 .../peertube/activity/VideoPlayActivity.java  | 42 +-------------
 .../fragment/VideoOptionsFragment.java        | 19 ++++++-
 .../main/res/layout/activity_video_play.xml   | 44 --------------
 .../bottom_sheet_video_options_fragment.xml   | 57 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  4 ++
 5 files changed, 73 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index 5c563a9..fa781a2 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -245,11 +245,6 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
                 ImageButton moreButton = findViewById(R.id.moreButton);
                 ImageButton videoOptions = findViewById(R.id.exo_more);
 
-                //Playback speed buttons
-                Button speed05 = findViewById(R.id.speed05);
-                Button speed10 = findViewById(R.id.speed10);
-                Button speed15 = findViewById(R.id.speed15);
-                Button speed20 = findViewById(R.id.speed20);
 
                 Video video = response.body();
 
@@ -296,50 +291,17 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
                     popup.show();
                 });
 
+                // video player options
                 videoOptions.setOnClickListener(v -> {
 
                     VideoOptionsFragment videoOptionsFragment =
-                            VideoOptionsFragment.newInstance();
+                            VideoOptionsFragment.newInstance(mService);
                     videoOptionsFragment.show(getSupportFragmentManager(),
                             "video_options_fragment");
                 });
 
                 mService.setCurrentStreamUrl(video.getFiles().get(0).getFileUrl());
 
-                //Playback speed controls
-                speed05.setOnClickListener(view -> {
-                    mService.setPlayBackSpeed(0.5f);
-                    speed05.setTextColor(getResources().getColor(R.color.primaryColorRed));
-
-                    speed10.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed15.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed20.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-
-                });
-                speed10.setOnClickListener(view -> {
-                    mService.setPlayBackSpeed(1.0f);
-                    speed10.setTextColor(getResources().getColor(R.color.primaryColorRed));
-
-                    speed05.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed15.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed20.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                });
-                speed15.setOnClickListener(view -> {
-                    mService.setPlayBackSpeed(1.5f);
-                    speed15.setTextColor(getResources().getColor(R.color.primaryColorRed));
-
-                    speed05.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed10.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed20.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                });
-                speed20.setOnClickListener(view -> {
-                    mService.setPlayBackSpeed(2.0f);
-                    speed20.setTextColor(getResources().getColor(R.color.primaryColorRed));
-
-                    speed05.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed10.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                    speed15.setTextColor(getResources().getColor(R.color.secondaryTextColorRed));
-                });
 
                 SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
                 if (sharedPref.getBoolean("pref_torrent_player", false)) {
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java
index 27bf542..d2a9cf9 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoOptionsFragment.java
@@ -4,16 +4,21 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 import net.schueller.peertube.R;
+import net.schueller.peertube.service.VideoPlayerService;
 
 import androidx.annotation.Nullable;
 
 public class VideoOptionsFragment extends BottomSheetDialogFragment {
 
-    public static VideoOptionsFragment newInstance() {
+    private static VideoPlayerService videoPlayerService;
+
+    public static VideoOptionsFragment newInstance(VideoPlayerService mService) {
+        videoPlayerService = mService;
         return new VideoOptionsFragment();
     }
 
@@ -28,6 +33,18 @@ public class VideoOptionsFragment extends BottomSheetDialogFragment {
 
         // get the views and attach the listener
 
+        //Playback speed buttons
+        TextView speed05 = view.findViewById(R.id.video_speed05);
+        TextView speed10 = view.findViewById(R.id.video_speed10);
+        TextView speed15 = view.findViewById(R.id.video_speed15);
+        TextView speed20 = view.findViewById(R.id.video_speed20);
+
+        //Playback speed controls
+        speed05.setOnClickListener(v -> videoPlayerService.setPlayBackSpeed(0.5f));
+        speed10.setOnClickListener(v -> videoPlayerService.setPlayBackSpeed(1.0f));
+        speed15.setOnClickListener(v -> videoPlayerService.setPlayBackSpeed(1.5f));
+        speed20.setOnClickListener(v -> videoPlayerService.setPlayBackSpeed(2.0f));
+
         return view;
 
     }
diff --git a/app/src/main/res/layout/activity_video_play.xml b/app/src/main/res/layout/activity_video_play.xml
index 0bb4c66..6e38fce 100644
--- a/app/src/main/res/layout/activity_video_play.xml
+++ b/app/src/main/res/layout/activity_video_play.xml
@@ -109,50 +109,6 @@
                 android:layout_marginEnd="12dp"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
 
-            <TextView
-                android:id="@+id/playback_speed_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/description"
-                android:text="Playback Speed"
-                android:layout_marginTop="16dp"/>
-
-            <Button
-                android:id="@+id/speed05"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/playback_speed_label"
-                android:text="0.5x"
-                android:textAllCaps="false"/>
-
-            <Button
-                android:id="@+id/speed10"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/playback_speed_label"
-                android:layout_toRightOf="@id/speed05"
-                android:text="1.0x"
-                android:textAllCaps="false"
-                android:textColor="@color/primaryColorRed"
-                />
-
-            <Button
-                android:id="@+id/speed15"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/playback_speed_label"
-                android:layout_toRightOf="@id/speed10"
-                android:text="1.5x"
-                android:textAllCaps="false"/>
-
-            <Button
-                android:id="@+id/speed20"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/playback_speed_label"
-                android:layout_toRightOf="@id/speed15"
-                android:text="2.0x"
-                android:textAllCaps="false"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_video_options_fragment.xml b/app/src/main/res/layout/bottom_sheet_video_options_fragment.xml
index 7646e31..c016aca 100644
--- a/app/src/main/res/layout/bottom_sheet_video_options_fragment.xml
+++ b/app/src/main/res/layout/bottom_sheet_video_options_fragment.xml
@@ -1,24 +1,65 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
     android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
     android:background="@color/videoBackgroundColor"
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/tv_bottom_sheet_heading"
+        android:id="@+id/video_speed05"
         android:layout_width="wrap_content"
-        android:gravity="center"
-        android:text="Option 1"
-        android:textSize="16sp"
         android:layout_height="56dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
         android:textColor="#ffffff"
+        android:textSize="16sp"
+
+        android:text="@string/video_speed_05"
+        android:textAllCaps="false"
         />
 
+    <TextView
+        android:id="@+id/video_speed10"
+
+        android:layout_width="wrap_content"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
+        android:textColor="#ffffff"
+        android:textSize="16sp"
+
+        android:textAllCaps="false"
+        android:text="@string/video_speed_10"
+        />
+
+    <TextView
+        android:id="@+id/video_speed15"
+        android:layout_width="wrap_content"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
+        android:textColor="#ffffff"
+        android:textSize="16sp"
+
+        android:text="@string/video_speed_15"
+        android:textAllCaps="false" />
+
+    <TextView
+        android:id="@+id/video_speed20"
+        android:layout_width="wrap_content"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center"
+        android:textColor="#ffffff"
+        android:textSize="16sp"
+
+        android:text="@string/video_speed_20"
+        android:textAllCaps="false" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index efb5081..f3a20a0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,5 +84,9 @@
     <string name="brown">Brown</string>
     <string name="gray">Gray</string>
     <string name="bluegray">Bluegray</string>
+    <string name="video_speed_05">0.5x</string>
+    <string name="video_speed_10">Normal</string>
+    <string name="video_speed_15">1.5x</string>
+    <string name="video_speed_20">2x</string>
 
 </resources>