Video Player: Add rewind and fast forward buttons

2 files changed, 19 insertions, 17 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 396adbd81..a066beee9 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -639,17 +639,19 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
                 }
             }
             checkFavorite();
-            if(controller == null) {
-                butPlaybackSpeed.setVisibility(View.GONE);
-            } else {
-                butPlaybackSpeed.setVisibility(View.VISIBLE);
-                if (controller.canSetPlaybackSpeed()) {
-                    ViewCompat.setAlpha(butPlaybackSpeed, 1.0f);
+            if(butPlaybackSpeed != null) {
+                if (controller == null) {
+                    butPlaybackSpeed.setVisibility(View.GONE);
                 } else {
-                    ViewCompat.setAlpha(butPlaybackSpeed, 0.5f);
+                    butPlaybackSpeed.setVisibility(View.VISIBLE);
+                    if (controller.canSetPlaybackSpeed()) {
+                        ViewCompat.setAlpha(butPlaybackSpeed, 1.0f);
+                    } else {
+                        ViewCompat.setAlpha(butPlaybackSpeed, 0.5f);
+                    }
                 }
+                updateButPlaybackSpeed();
             }
-            updateButPlaybackSpeed();
             return true;
         } else {
             return false;
@@ -865,7 +867,7 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
     }
 
     private void updateButPlaybackSpeed() {
-        if (controller != null) {
+        if (controller != null && butPlaybackSpeed != null) {
             butPlaybackSpeed.setText(UserPreferences.getPlaybackSpeed() + "x");
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 8d5ca5403..fbea102eb 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -43,6 +43,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private VideoControlsHider videoControlsHider = new VideoControlsHider(this);
 
+    private LinearLayout controls;
     private LinearLayout videoOverlay;
     private AspectRatioVideoView videoview;
     private ProgressBar progressIndicator;
@@ -116,6 +117,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     protected void setupGUI() {
         super.setupGUI();
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        controls = (LinearLayout) findViewById(R.id.controls);
         videoOverlay = (LinearLayout) findViewById(R.id.overlay);
         videoview = (AspectRatioVideoView) findViewById(R.id.videoview);
         progressIndicator = (ProgressBar) findViewById(R.id.progressIndicator);
@@ -259,12 +261,11 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @SuppressLint("NewApi")
     private void showVideoControls() {
         videoOverlay.setVisibility(View.VISIBLE);
-        butPlay.setVisibility(View.VISIBLE);
-        final Animation animation = AnimationUtils.loadAnimation(this,
-                R.anim.fade_in);
+        controls.setVisibility(View.VISIBLE);
+        final Animation animation = AnimationUtils.loadAnimation(this, R.anim.fade_in);
         if (animation != null) {
             videoOverlay.startAnimation(animation);
-            butPlay.startAnimation(animation);
+            controls.startAnimation(animation);
         }
         if (Build.VERSION.SDK_INT >= 14) {
             videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
@@ -273,11 +274,10 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     @SuppressLint("NewApi")
     private void hideVideoControls() {
-        final Animation animation = AnimationUtils.loadAnimation(this,
-                R.anim.fade_out);
+        final Animation animation = AnimationUtils.loadAnimation(this, R.anim.fade_out);
         if (animation != null) {
             videoOverlay.startAnimation(animation);
-            butPlay.startAnimation(animation);
+            controls.startAnimation(animation);
         }
         if (Build.VERSION.SDK_INT >= 14) {
             int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0;
@@ -286,7 +286,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             videoOverlay.setFitsSystemWindows(true);
         }
         videoOverlay.setVisibility(View.GONE);
-        butPlay.setVisibility(View.GONE);
+        controls.setVisibility(View.GONE);
     }
 
     @Override