From a8cb7caec2359954c67d0fb8de407d89508c111a Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 5 Dec 2024 21:31:23 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/utils/ResUtil.java | 31 ++----------------- .../tv/ui/custom/CustomKeyDownLive.java | 8 ++--- .../tv/ui/custom/CustomKeyDownVod.java | 4 +-- 3 files changed, 9 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java index a4de1f2bd..67b6f8ae6 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java @@ -1,11 +1,10 @@ package com.fongmi.android.tv.utils; +import android.app.Activity; import android.content.Context; import android.content.res.Configuration; -import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Paint; -import android.graphics.Point; import android.graphics.drawable.Drawable; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -29,22 +28,6 @@ public class ResUtil { return App.get().getResources().getDisplayMetrics(); } - public static boolean hasNavigationBar(Context context) { - Display display = getDisplay(context); - Point size = new Point(); - Point realSize = new Point(); - display.getSize(size); - display.getRealSize(realSize); - return realSize.x != size.x || realSize.y != size.y; - } - - public static int getNavigationBarHeight(Context context) { - if (!hasNavigationBar(context)) return 0; - Resources resources = context.getResources(); - int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android"); - return resources.getDimensionPixelSize(resourceId); - } - public static int getScreenWidth() { return getDisplayMetrics().widthPixels; } @@ -53,10 +36,6 @@ public class ResUtil { return context.getResources().getDisplayMetrics().widthPixels; } - public static int getScreenWidthNav() { - return getDisplayMetrics().widthPixels + getNavigationBarHeight(App.get()); - } - public static int getScreenHeight() { return getDisplayMetrics().heightPixels; } @@ -65,12 +44,8 @@ public class ResUtil { return context.getResources().getDisplayMetrics().heightPixels; } - public static int getScreenHeightNav() { - return getDisplayMetrics().heightPixels + getNavigationBarHeight(App.get()); - } - - public static boolean isEdge(MotionEvent e, int edge) { - return e.getRawX() < edge || e.getRawX() > getScreenWidthNav() - edge || e.getRawY() < edge || e.getRawY() > getScreenHeightNav() - edge; + public static boolean isEdge(Activity activity, MotionEvent e, int edge) { + return e.getRawX() < edge || e.getRawX() > getScreenWidth(activity) - edge || e.getRawY() < edge || e.getRawY() > getScreenHeight(activity) - edge; } public static boolean isLand(Context context) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java index bf80779e6..6c45005f8 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownLive.java @@ -60,7 +60,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } private boolean isEdge(MotionEvent e) { - return ResUtil.isEdge(e, ResUtil.dp2px(32)); + return ResUtil.isEdge(activity, e, ResUtil.dp2px(40)); } @Override @@ -104,7 +104,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { @Override public boolean onSingleTapConfirmed(@NonNull MotionEvent e) { - int half = ResUtil.getScreenWidthNav() / 2; + int half = ResUtil.getScreenWidth(activity) / 2; if (e.getX() > half || lock) listener.onDoubleTap(); else listener.onSingleTap(); return true; @@ -124,7 +124,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } private void checkFunc(float distanceX, float distanceY, MotionEvent e2) { - int four = ResUtil.getScreenWidthNav() / 4; + int four = ResUtil.getScreenWidth(activity) / 4; if (e2.getX() > four && e2.getX() < four * 3) center = true; else if (Math.abs(distanceX) < Math.abs(distanceY)) checkSide(e2); if (Math.abs(distanceX) >= Math.abs(distanceY)) changeTime = true; @@ -146,7 +146,7 @@ public class CustomKeyDownLive extends GestureDetector.SimpleOnGestureListener { } private void checkSide(MotionEvent e2) { - int half = ResUtil.getScreenWidthNav() / 2; + int half = ResUtil.getScreenWidth(activity) / 2; if (e2.getX() > half) changeVolume = true; else changeBright = true; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index 137720799..15c39225a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -55,7 +55,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { } private boolean isEdge(MotionEvent e) { - return ResUtil.isEdge(e, ResUtil.dp2px(32)); + return ResUtil.isEdge(activity, e, ResUtil.dp2px(40)); } @Override @@ -115,7 +115,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { } private void checkSide(MotionEvent e2) { - int half = ResUtil.getScreenWidthNav() / 2; + int half = ResUtil.getScreenWidth(activity) / 2; if (e2.getX() > half) changeVolume = true; else changeBright = true; }