Clean up code

Follow Checkstyle Move to PlayerGestureListener from VideoPlayerImpl Update app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java Co-authored-by: wb9688 <46277131+wb9688@users.noreply.github.com>
TeamNewPipe · May 9, 2020 · 0abd2bc · 0abd2bc
1 parent 562754c
commit 0abd2bc
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -1125,24 +1125,6 @@ public void onStartDrag(final PlayQueueItemHolder viewHolder) {
             };
         }
 
-        private int getNavigationBarHeight()
-        {
-            int resId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
-            if (resId > 0) {
-                return getResources().getDimensionPixelSize(resId);
-            }
-            return 0;
-        }
-
-        private int getStatusBarHeight()
-        {
-            int resId = getResources().getIdentifier("status_bar_height", "dimen", "android");
-            if (resId > 0) {
-                return getResources().getDimensionPixelSize(resId);
-            }
-            return 0;
-        }
-
         ///////////////////////////////////////////////////////////////////////////
         // Getters
         ///////////////////////////////////////////////////////////////////////////
@@ -1263,10 +1245,10 @@ public boolean onScroll(final MotionEvent initialEvent, final MotionEvent moving
                 return false;
             }
 
-            final boolean isTouchingStatusBar = initialEvent.getY() < playerImpl.getStatusBarHeight();
-            final boolean isTouchingNavigationBar = initialEvent.getY() > playerImpl.getRootView().getHeight() - playerImpl.getNavigationBarHeight();
-            if (isTouchingStatusBar || isTouchingNavigationBar)
-            {
+            final boolean isTouchingStatusBar = initialEvent.getY() < getStatusBarHeight();
+            final boolean isTouchingNavigationBar = initialEvent.getY()
+                            > playerImpl.getRootView().getHeight() - getNavigationBarHeight();
+            if (isTouchingStatusBar || isTouchingNavigationBar) {
                 return false;
             }
 
@@ -1358,6 +1340,22 @@ public boolean onScroll(final MotionEvent initialEvent, final MotionEvent moving
             return true;
         }
 
+        private int getNavigationBarHeight() {
+            int resId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+            if (resId > 0) {
+                return getResources().getDimensionPixelSize(resId);
+            }
+            return 0;
+        }
+
+        private int getStatusBarHeight() {
+            int resId = getResources().getIdentifier("status_bar_height", "dimen", "android");
+            if (resId > 0) {
+                return getResources().getDimensionPixelSize(resId);
+            }
+            return 0;
+        }
+
         private void onScrollEnd() {
             if (DEBUG) {
                 Log.d(TAG, "onScrollEnd() called");