From a50e430cd96ae508a66755678f21b318d00127f8 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 10 Apr 2020 22:12:45 +0200
Subject: [PATCH] Fix checkstyle issues and improve code formatting

Also calculate differently the moved distance of a pointer: use euclidean and not manhattan geometry
---
 .../newpipe/player/PopupVideoPlayer.java      | 59 ++++++++-----------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index 71e0feac8..de9e9b746 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -1217,8 +1217,8 @@ public final class PopupVideoPlayer extends Service {
                 initSecPointerX = event.getX(1);
                 initSecPointerY = event.getY(1);
                 //record distance between fingers
-                initPointerDistance = Math.hypot(event.getX(0) - event.getX(1),
-                                                event.getY(0) - event.getY(1));
+                initPointerDistance = Math.hypot(initFirstPointerX - initSecPointerX,
+                                                 initFirstPointerY - initSecPointerY);
 
                 isResizing = true;
             }
@@ -1245,7 +1245,10 @@ public final class PopupVideoPlayer extends Service {
                     isResizing = false;
 
                     initPointerDistance = -1;
-                    initFirstPointerX = initFirstPointerY = initSecPointerX = initSecPointerY = -1;
+                    initFirstPointerX = -1;
+                    initFirstPointerY = -1;
+                    initSecPointerX = -1;
+                    initSecPointerY = -1;
 
                     animateView(playerImpl.getResizingIndicator(), false, 100, 0);
                     playerImpl.changeState(playerImpl.getCurrentState());
@@ -1261,49 +1264,33 @@ public final class PopupVideoPlayer extends Service {
         }
 
         private boolean handleMultiDrag(final MotionEvent event) {
-            if (event.getPointerCount() != 2) {
-                return false;
-            }
+            if (initPointerDistance != -1 && event.getPointerCount() == 2) {
+                // get the movements of the fingers
+                double firstPointerMove = Math.hypot(event.getX(0) - initFirstPointerX,
+                                                     event.getY(0) - initFirstPointerY);
+                double secPointerMove = Math.hypot(event.getX(1) - initSecPointerX,
+                                                   event.getY(1) - initSecPointerY);
 
-            if (initPointerDistance != -1) {
-
-                //get the movements of the fingers
-                float firstPointerMoveX = event.getX(0) - initFirstPointerX;
-                float firstPointerMoveY = event.getY(0) - initFirstPointerY;
-                float secPointerMoveX = event.getX(1) - initSecPointerX;
-                float secPointerMoveY = event.getY(1) - initSecPointerY;
-                //minimum threshold beyond which pinch gesture will work
-                int scaledTouchSlop = ViewConfiguration.get(PopupVideoPlayer.this).getScaledTouchSlop();
-
-                if (firstPointerMoveX > scaledTouchSlop ||firstPointerMoveY > scaledTouchSlop
-                        || secPointerMoveX > scaledTouchSlop || secPointerMoveY > scaledTouchSlop) {
-
-                    double newWidth = popupWidth;
-
-                    //calculate current distance between the pointers
-                    double currentPointerDistance = Math.hypot(event.getX(0) - event.getX(1),
-                                                                event.getY(0) - event.getY(1));
-
-                    //scale popup width
-                    double scale = currentPointerDistance / initPointerDistance;
-
-                    newWidth = (popupWidth * scale);
-
-                    //change co-ordinates of popup so the center stays at the same position
-                    popupLayoutParams.x += (popupWidth - newWidth)/2;
+                // minimum threshold beyond which pinch gesture will work
+                int minimumMove = ViewConfiguration.get(PopupVideoPlayer.this).getScaledTouchSlop();
 
+                if (Math.max(firstPointerMove, secPointerMove) > minimumMove) {
+                    // calculate current distance between the pointers
+                    double currentPointerDistance =
+                            Math.hypot(event.getX(0) - event.getX(1),
+                                       event.getY(0) - event.getY(1));
 
+                    // change co-ordinates of popup so the center stays at the same position
+                    double newWidth = (popupWidth * currentPointerDistance / initPointerDistance);
                     initPointerDistance = currentPointerDistance;
+                    popupLayoutParams.x += (popupWidth - newWidth) / 2;
 
                     checkPopupPositionBounds();
                     updateScreenSize();
 
-                    final int width = (int) Math.min(screenWidth, newWidth);
-                    updatePopupSize(width, -1);
-
+                    updatePopupSize((int) Math.min(screenWidth, newWidth), -1);
                     return true;
                 }
-
             }
             return false;
         }