Tweak seek, update metadata

moneytoo · Feb 6, 2021 · b19ce0a · b19ce0a
1 parent b3f51b5
commit b19ce0a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ HDR (HDR10+ and Dolby Vision) video playback on compatible/supported hardware.
  * Playback speed control
  * Horizontal swipe to quickly seek
  * Vertical swipe to change brightness (left) / volume (right)
+ * Pinch to zoom (Android 7 or higher), since v0.19
  * PiP (Picture in Picture) on Android 8 or higher
  * Resize (fit/crop)
  * Volume boost

diff --git a/app/src/main/java/com/brouken/player/CustomStyledPlayerView.java b/app/src/main/java/com/brouken/player/CustomStyledPlayerView.java
@@ -42,7 +42,7 @@ public final class CustomStyledPlayerView extends StyledPlayerView implements Ge
 
     private boolean restorePlayState;
 
-    private ScaleGestureDetector mScaleDetector;
+    private final  ScaleGestureDetector mScaleDetector;
     private float mScaleFactor = 1.f;
 
     public final Runnable textClearRunnable = () -> {
@@ -80,7 +80,7 @@ public void clearIcon() {
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && gestureOrientation == Orientation.UNKNOWN)
             mScaleDetector.onTouchEvent(ev);
 
         switch (ev.getActionMasked()) {
@@ -184,23 +184,24 @@ public boolean onScroll(MotionEvent motionEvent, MotionEvent motionEvent1, float
 
                 gestureOrientation = Orientation.HORIZONTAL;
                 final long position;
+                float distanceDiff = Math.max(0.5f, Math.min(Math.abs(Utils.pxToDp(distanceX) / 4), 10.f));
 
                 if (PlayerActivity.haveMedia) {
                     if (gestureScrollX > 0) {
-                        if (seekStart + seekChange - SEEK_STEP >= 0) {
+                        if (seekStart + seekChange - SEEK_STEP  * distanceDiff >= 0) {
                             PlayerActivity.player.setSeekParameters(SeekParameters.PREVIOUS_SYNC);
-                            seekChange -= SEEK_STEP;
+                            seekChange -= SEEK_STEP * distanceDiff;
                             position = seekStart + seekChange;
                             PlayerActivity.player.seekTo(position);
                         }
                     } else {
                         PlayerActivity.player.setSeekParameters(SeekParameters.NEXT_SYNC);
                         if (seekMax == C.TIME_UNSET) {
-                            seekChange += SEEK_STEP;
+                            seekChange += SEEK_STEP * distanceDiff;
                             position = seekStart + seekChange;
                             PlayerActivity.player.seekTo(position);
                         } else if (seekStart + seekChange + SEEK_STEP < seekMax) {
-                            seekChange += SEEK_STEP;
+                            seekChange += SEEK_STEP  * distanceDiff;
                             position = seekStart + seekChange;
                             PlayerActivity.player.seekTo(position);
                         }

diff --git a/app/src/main/java/com/brouken/player/PlayerActivity.java b/app/src/main/java/com/brouken/player/PlayerActivity.java
@@ -127,6 +127,7 @@ public class PlayerActivity extends Activity {
     private boolean play;
     private float subtitlesScale = 1.0f;
     private boolean scrubbing;
+    private long scrubbingStart;
 
     final Rational rationalLimitWide = new Rational(239, 100);
     final Rational rationalLimitTall = new Rational(100, 239);
@@ -164,6 +165,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onScrubStart(TimeBar timeBar, long position) {
                 scrubbing = false;
+                scrubbingStart = player.getCurrentPosition();
                 reportScrubbing(position);
             }
 
@@ -961,13 +963,14 @@ void showSnack(final String textPrimary, final String textSecondary) {
     }
 
     void reportScrubbing(long position) {
-        final long diff = position - PlayerActivity.player.getCurrentPosition();
+        final long diff = position - scrubbingStart;
         if (Math.abs(diff) > 1000) {
             scrubbing = true;
         }
         if (scrubbing) {
             playerView.clearIcon();
             playerView.setCustomErrorMessage(Utils.formatMilis(diff));
         }
+        player.seekTo(position);
     }
 }
diff --git a/app/src/main/java/com/brouken/player/Utils.java b/app/src/main/java/com/brouken/player/Utils.java
@@ -23,9 +23,9 @@ public static int dpToPx(int dp) {
         return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
     }
 
-//    public static int pxToDp(int px) {
-//        return (int) (px / Resources.getSystem().getDisplayMetrics().density);
-//    }
+    public static float pxToDp(float px) {
+        return px / Resources.getSystem().getDisplayMetrics().density;
+    }
 
     public static boolean fileExists(final Context context, final Uri uri) {
         if ("file".equals(uri.getScheme())) {

diff --git a/fastlane/metadata/android/cs/full_description.txt b/fastlane/metadata/android/cs/full_description.txt
@@ -17,6 +17,7 @@ Funkce
  * Nastavení rychlosti přehrávání
  * Horizontální swipe pro rychlý posun v čase
  * Vertikální swipe pro změnu jasu (vlevo) / hlasitosti (vpravo)
+ * Zoom/přiblížení dvěma prsty (Android 7 a výš)
  * Obraz v obraze (plovoucí okno) na Androidu 8 a výš
  * Změna velikosti (přizpůsobení/oříznutí)
  * Zvýšení hlasitosti

diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -0,0 +1 @@
+Add pinch to zoom (Android 7+) and other small fixes and improvements
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -17,6 +17,7 @@ Features
  * Playback speed control
  * Horizontal swipe to quickly seek
  * Vertical swipe to change brightness (left) / volume (right)
+ * Pinch to zoom (Android 7 or higher)
  * PiP (Picture in Picture) on Android 8 or higher
  * Resize (fit/crop)
  * Volume boost