Feature implementation from commits 8cc5cca..208b92b

GPLAY_PRIVACY_POLICY

@@ -1,3 +1,3 @@
-1. This app (while idle) does NOT collect any sensitive information, and does NOT use network (exception is the "News" page, it uses network to load the launcher news)
+1. This app (while idle) does NOT collect any sensitive information, and uses network for downloading Minecraft resources.
 2. While running Minecraft, app also does NOT collect any sensitive information about your device. Snooper by Mojang does.
 3. Some sensitive data is stored in crash reports after the game crashes, but it's not being shared to anyone except the current user.

app_pojavlauncher/src/main/java/com/kdt/CustomSeekbar.java

@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.SeekBar;
 
@@ -19,8 +20,53 @@ public class CustomSeekbar extends SeekBar {
     private int mIncrement = 1;
     private SeekBar.OnSeekBarChangeListener mListener;
 
-    /** When using increments, this flag is used to prevent double calls to the listener */
-    private boolean mInternalChanges = false;
+    private final OnSeekBarChangeListener mInternalListener = new OnSeekBarChangeListener() {
+        /** When using increments, this flag is used to prevent double calls to the listener */
+        private boolean internalChanges = false;
+        /** Store the previous progress to prevent double calls with increments */
+        private int previousProgress = 0;
+        @Override
+        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+            if (internalChanges) return;
+            internalChanges = true;
+
+            progress += mMin;
+            progress = applyIncrement(progress);
+
+            if (progress != previousProgress) {
+                if (mListener != null) {
+                    previousProgress = progress;
+                    mListener.onProgressChanged(seekBar, progress, fromUser);
+                }
+            }
+
+            // Forces the thumb to snap to the increment
+            setProgress(progress);
+            internalChanges = false;
+        }
+
+        @Override
+        public void onStartTrackingTouch(SeekBar seekBar) {
+            if (internalChanges) return;
+
+            if (mListener != null) {
+                mListener.onStartTrackingTouch(seekBar);
+            }
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            if (internalChanges) return;
+            internalChanges = true;
+
+            setProgress(seekBar.getProgress());
+
+            if (mListener != null) {
+                mListener.onStopTrackingTouch(seekBar);
+            }
+            internalChanges = false;
+        }
+    };
 
     public CustomSeekbar(Context context) {
         super(context);
@@ -37,11 +83,6 @@ public CustomSeekbar(Context context, AttributeSet attrs, int defStyleAttr) {
         setup(attrs);
     }
 
-    public CustomSeekbar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        setup(attrs);
-    }
-
     public void setIncrement(int increment) {
         mIncrement = increment;
     }
@@ -68,10 +109,15 @@ public synchronized int getProgress() {
 
     @Override
     public synchronized void setMin(int min) {
-        super.setMin(min);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            super.setMin(0);
+        }
         mMin = min;
+        //todo perform something to update the progress ?
     }
 
+
+
     /**
      * Wrapper to allow for a listener to be set around the internal listener
      */
@@ -82,54 +128,25 @@ public void setOnSeekBarChangeListener(OnSeekBarChangeListener l) {
 
     public void setup(@Nullable AttributeSet attrs) {
         try (TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.CustomSeekbar)) {
-            mIncrement = attributes.getInt(R.styleable.CustomSeekbar_seekBarIncrement, 1);
-        }
-
-        super.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
-            /** Store the previous progress to prevent double calls with increments */
-            private int previousProgress = 0;
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                if (mInternalChanges) return;
-                mInternalChanges = true;
-
-                progress += mMin;
-                progress = applyIncrement(progress);
-
-                if (progress != previousProgress) {
-                    if (mListener != null) {
-                        previousProgress = progress;
-                        mListener.onProgressChanged(seekBar, progress, fromUser);
-                    }
-                }
-
-                // Forces the thumb to snap to the increment
-                setProgress(progress);
-                mInternalChanges = false;
+            setIncrement(attributes.getInt(R.styleable.CustomSeekbar_seekBarIncrement, 1));
+            int min = attributes.getInt(R.styleable.CustomSeekbar_android_min, 0);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                super.setMin(0);
             }
+            setRange(min, super.getMax());
+        }
 
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                if (mInternalChanges) return;
-
-                if (mListener != null) {
-                    mListener.onStartTrackingTouch(seekBar);
-                }
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                if (mInternalChanges) return;
-                mInternalChanges = true;
-
-                setProgress(seekBar.getProgress());
-
-                if (mListener != null) {
-                    mListener.onStopTrackingTouch(seekBar);
-                }
-                mInternalChanges = false;
-            }
-        });
+        // Due to issues with negative progress when setting up the seekbar
+        // We need to set a random progress to force the refresh of the thumb
+        if(super.getProgress() == 0) {
+            super.setProgress(super.getProgress() + 1);
+            post(() -> {
+                super.setProgress(super.getProgress() - 1);
+                post(() -> super.setOnSeekBarChangeListener(mInternalListener));
+            });
+        } else {
+            super.setOnSeekBarChangeListener(mInternalListener);
+        }
     }
 
     /**

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java

@@ -27,6 +27,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Process;
 import android.provider.DocumentsContract;
 import android.provider.OpenableColumns;
 import android.util.ArrayMap;
@@ -40,7 +41,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.NotificationManagerCompat;
@@ -513,33 +513,7 @@ public static DisplayMetrics getDisplayMetrics(Activity activity) {
         return displayMetrics;
     }
 
-    @SuppressWarnings("deprecation")
-    private static void setFullscreenLegacy(Activity activity, boolean fullscreen) {
-        final View decorView = activity.getWindow().getDecorView();
-        View.OnSystemUiVisibilityChangeListener visibilityChangeListener = visibility -> {
-            boolean multiWindowMode = SDK_INT >= 24 && activity.isInMultiWindowMode();
-            // When in multi-window mode, asking for fullscreen makes no sense (cause the launcher runs in a window)
-            // So, ignore the fullscreen setting when activity is in multi window mode
-            if(fullscreen && !multiWindowMode){
-                if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-                    decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                            | View.SYSTEM_UI_FLAG_FULLSCREEN
-                            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-                }
-            }else{
-                decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-            }
-
-        };
-        decorView.setOnSystemUiVisibilityChangeListener(visibilityChangeListener);
-        visibilityChangeListener.onSystemUiVisibilityChange(decorView.getSystemUiVisibility()); //call it once since the UI state may not change after the call, so the activity wont become fullscreen
-    }
-
-    @RequiresApi(Build.VERSION_CODES.R)
-    private static void setFullscreenSdk30(Activity activity, boolean fullscreen) {
+    public static void setFullscreen(Activity activity, boolean fullscreen) {
         WindowInsetsControllerCompat windowInsetsController =
                 WindowCompat.getInsetsController(activity.getWindow(), activity.getWindow().getDecorView());
         if (windowInsetsController == null) {
@@ -555,27 +529,24 @@ private static void setFullscreenSdk30(Activity activity, boolean fullscreen) {
         ViewCompat.setOnApplyWindowInsetsListener(
                 activity.getWindow().getDecorView(),
                 (view, windowInsets) -> {
-                    if (fullscreen && !activity.isInMultiWindowMode()) {
+                    boolean fullscreenImpl = fullscreen;
+                    if (SDK_INT >= Build.VERSION_CODES.N && activity.isInMultiWindowMode())
+                        fullscreenImpl = false;
+
+                    if (fullscreenImpl) {
                         windowInsetsController.hide(WindowInsetsCompat.Type.systemBars());
-                        activity.getWindow().setDecorFitsSystemWindows(false);
                     } else {
                         windowInsetsController.show(WindowInsetsCompat.Type.systemBars());
-                        activity.getWindow().setDecorFitsSystemWindows(true);
                     }
 
+                    if(SDK_INT >= Build.VERSION_CODES.R)
+                        activity.getWindow().setDecorFitsSystemWindows(!fullscreenImpl);
+
                     return ViewCompat.onApplyWindowInsets(view, windowInsets);
                 });
 
     }
 
-    public static void setFullscreen(Activity activity, boolean fullscreen) {
-        if (SDK_INT >= Build.VERSION_CODES.R) {
-            setFullscreenSdk30(activity, fullscreen);
-        }else {
-            setFullscreenLegacy(activity, fullscreen);
-        }
-    }
-
     public static DisplayMetrics currentDisplayMetrics;
 
     public static void updateWindowSize(Activity activity) {

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/LeftClickGesture.java

@@ -17,7 +17,7 @@ public class LeftClickGesture extends ValidatorGesture {
     private boolean mMouseActivated;
 
     public LeftClickGesture(Handler handler) {
-        super(handler, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
+        super(handler);
     }
 
     public final void inputEvent() {
@@ -27,6 +27,11 @@ public final void inputEvent() {
         }
     }
 
+    @Override
+    protected int getGestureDelay() {
+        return LauncherPreferences.PREF_LONGPRESS_TRIGGER;
+    }
+
     @Override
     public boolean checkAndTrigger() {
         boolean fingerStill = LeftClickGesture.isFingerStill(mGestureStartX, mGestureStartY, mGestureEndX, mGestureEndY, FINGER_STILL_THRESHOLD);

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/RightClickGesture.java

@@ -6,29 +6,35 @@
 
 import org.lwjgl.glfw.CallbackBridge;
 
-public class RightClickGesture extends ValidatorGesture{
+public class RightClickGesture extends ValidatorGesture {
     private boolean mGestureEnabled = true;
     private boolean mGestureValid = true;
     private float mGestureStartX, mGestureStartY, mGestureEndX, mGestureEndY;
     public RightClickGesture(Handler mHandler) {
-        super(mHandler, 150);
+        super(mHandler);
     }
 
     public final void inputEvent() {
         if(!mGestureEnabled) return;
         if(submit()) {
-            mGestureStartX = CallbackBridge.mouseX;
-            mGestureStartY = CallbackBridge.mouseY;
+            mGestureStartX = mGestureEndX = CallbackBridge.mouseX;
+            mGestureStartY = mGestureEndY = CallbackBridge.mouseY;
             mGestureEnabled = false;
             mGestureValid = true;
         }
     }
 
     public void setMotion(float deltaX, float deltaY) {
+        System.out.println("set motion called");
         mGestureEndX += deltaX;
         mGestureEndY += deltaY;
     }
 
+    @Override
+    protected int getGestureDelay() {
+        return 150;
+    }
+
     @Override
     public boolean checkAndTrigger() {
         // If the validate() method was called, it means that the user held on for too long. The cancellation should be ignored.
@@ -44,6 +50,7 @@ public void onGestureCancelled(boolean isSwitching) {
         mGestureEnabled = true;
         if(!mGestureValid || isSwitching) return;
         boolean fingerStill = LeftClickGesture.isFingerStill(mGestureStartX, mGestureStartY, mGestureEndX, mGestureEndY, LeftClickGesture.FINGER_STILL_THRESHOLD);
+        System.out.println("Right click: " + fingerStill);
         if(!fingerStill) return;
         CallbackBridge.sendMouseButton(LwjglGlfwKeycode.GLFW_MOUSE_BUTTON_RIGHT, true);
         CallbackBridge.sendMouseButton(LwjglGlfwKeycode.GLFW_MOUSE_BUTTON_RIGHT, false);

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/ValidatorGesture.java

@@ -9,16 +9,13 @@
 public abstract class ValidatorGesture implements Runnable{
     private final Handler mHandler;
     private boolean mGestureActive;
-    private final int mRequiredDuration;
 
     /**
      * @param mHandler the Handler that will be used for calling back the checkAndTrigger() method.
      *                 This Handler should run on the same thread as the callee of submit()/cancel()
-     * @param mRequiredDuration the duration after which the class will call checkAndTrigger().
      */
-    public ValidatorGesture(Handler mHandler, int mRequiredDuration) {
+    public ValidatorGesture(Handler mHandler) {
         this.mHandler = mHandler;
-        this.mRequiredDuration = mRequiredDuration;
     }
 
     /**
@@ -28,7 +25,7 @@ public ValidatorGesture(Handler mHandler, int mRequiredDuration) {
      */
     public final boolean submit() {
         if(mGestureActive) return false;
-        mHandler.postDelayed(this, mRequiredDuration);
+        mHandler.postDelayed(this, getGestureDelay());
         mGestureActive = true;
         return true;
     }
@@ -55,7 +52,13 @@ public final void run() {
     }
 
     /**
-     * This method will be called after mRequiredDuration milliseconds, if the gesture was not cancelled.
+     * This method will be called during gesture submission to determine the gesture check duration.
+     * @return the required gesture check duration in milliseconds
+     */
+    protected abstract int getGestureDelay();
+
+    /**
+     * This method will be called after getGestureDelay() milliseconds, if the gesture was not cancelled.
      * @return false if you want to mark this gesture as "inactive"
      *         true otherwise
      */