Daily version bump

* Don't always be green

app/build.gradle

@@ -2,6 +2,8 @@ import java.nio.file.Paths
 
 plugins {
     id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
 }
 
 android {
@@ -16,6 +18,8 @@ android {
     splits {
         abi {
             enable = true
+            reset()
+            include 'arm64-v8a', 'x86_64'
         }
     }
 
@@ -32,10 +36,10 @@ android {
 
     defaultConfig {
         applicationId "io.github.nekoinverter.ehviewer"
-        minSdkVersion 26
+        minSdkVersion 31
         targetSdkVersion 32
-        versionCode 114514
-        versionName "1.7.26.5"
+        versionCode 114515
+        versionName "1.7.26.6"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -44,6 +48,10 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     lint {
         abortOnError true
         checkReleaseBuilds false

app/src/main/java/com/hippo/easyrecyclerview/EasyRecyclerView.java

@@ -16,7 +16,9 @@
 
 package com.hippo.easyrecyclerview;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.hardware.SensorManager;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
@@ -24,12 +26,18 @@ import android.util.SparseBooleanArray;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewConfiguration;
 import android.widget.Checkable;
 
 import androidx.annotation.NonNull;
 import androidx.collection.LongSparseArray;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.BridgeRecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import com.hippo.ehviewer.Settings;
 import com.hippo.yorozuya.NumberUtils;
@@ -38,7 +46,7 @@ import com.hippo.yorozuya.NumberUtils;
  * Add setChoiceMode for RecyclerView
  */
 // Get some code from twoway-view and AbsListView.
-public class EasyRecyclerView extends ScrollLessRecyclerView {
+public class EasyRecyclerView extends BridgeRecyclerView {
 
     /**
      * Represents an invalid position. All valid positions are in the range 0 to 1 less than the
@@ -70,6 +78,14 @@ public class EasyRecyclerView extends ScrollLessRecyclerView {
      * The list allows multiple choices in custom action
      */
     public static final int CHOICE_MODE_MULTIPLE_CUSTOM = 4;
+    private static final float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
+    // Fling friction
+    private final float mFlingFriction = ViewConfiguration.getScrollFriction();
+    public float pageScrollThreshold;
+    double flingMoveDistanceX;
+    double flingMoveDistanceY;
+    boolean canScrollVertical = true;
+    boolean canScrollHorizontally = true;
 
     /**
      * Controls if/how the user may choose/check items in the list
@@ -119,19 +135,29 @@ public class EasyRecyclerView extends ScrollLessRecyclerView {
     private LongSparseArray<Integer> mCheckedIdStates;
 
     private Adapter<?> mAdapter;
+    private boolean isScrollBefore = false;
+    private int initialTouchX;
+    private int initialTouchY;
+    // A context-specific coefficient adjusted to physical values.
+    private float mPhysicalCoeff;
+    private int defaultOverflowItemScrollKeep;
+    private boolean enableScroll = false;
 
     public EasyRecyclerView(Context context) {
         super(context);
+        EasyRecyclerView.this.init(context);
         setEnableScroll(!Settings.getEInkMode());
     }
 
     public EasyRecyclerView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        EasyRecyclerView.this.init(context);
         setEnableScroll(!Settings.getEInkMode());
     }
 
     public EasyRecyclerView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        EasyRecyclerView.this.init(context);
         setEnableScroll(!Settings.getEInkMode());
     }
 
@@ -532,6 +558,301 @@ public class EasyRecyclerView extends ScrollLessRecyclerView {
         }
     }
 
+    private void init(Context context) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        final float ppi = scale * 160.0f;
+        mPhysicalCoeff = SensorManager.GRAVITY_EARTH // g (m/s^2)
+                * 39.37f // inch/meter
+                * ppi
+                * 0.84f; // look and feel tuning
+        pageScrollThreshold = scale * 80;
+    }
+
+    public void setPageScrollThreshold(float pageScrollThreshold) {
+        this.pageScrollThreshold = pageScrollThreshold;
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public boolean onTouchEvent(MotionEvent e) {
+        if (enableScroll) {
+            return super.onTouchEvent(e);
+        }
+        boolean superTouchResult = super.onTouchEvent(e);
+        if (superTouchResult) {
+            switch (e.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    initialTouchX = (int) (e.getX() + 0.5f);
+                    initialTouchY = (int) (e.getY() + 0.5f);
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    if (initialTouchX < 0 || initialTouchY < 0) {
+                        initialTouchX = (int) (e.getX() + 0.5f);
+                        initialTouchY = (int) (e.getY() + 0.5f);
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    if (isScrollBefore) {
+                        int moveDistanceX = (int) (initialTouchX - e.getX() + flingMoveDistanceX);
+                        int moveDistanceY = (int) (initialTouchY - e.getY() + flingMoveDistanceY);
+                        onTouchScroll(moveDistanceX, moveDistanceY);
+                        initialTouchX = initialTouchY = -1;
+                    }
+                    break;
+            }
+            isScrollBefore = getScrollState() == SCROLL_STATE_DRAGGING;
+        }
+        return superTouchResult;
+    }
+
+    @Override
+    public boolean scrollByInternal(int x, int y, MotionEvent ev, int type) {
+        if (enableScroll) {
+            return super.scrollByInternal(x, y, ev, type);
+        }
+        //disable drag scroll effect，e-ink screen don't need it
+        return false;
+    }
+
+    @Override
+    public boolean fling(int velocityX, int velocityY) {
+        if (enableScroll) {
+            return super.fling(velocityX, velocityY);
+        }
+        flingMoveDistanceX = getSplineFlingDistance(velocityX) * Math.signum(velocityX);
+        flingMoveDistanceY = getSplineFlingDistance(velocityY) * Math.signum(velocityY);
+        //disable fling scroll effect,e-ink screen don't need it
+        return false;
+    }
+
+    protected void onTouchScroll(int dx, int dy) {
+        canScrollVertical = true;
+        canScrollHorizontally = true;
+        LayoutManager layout = getLayoutManager();
+        if (layout != null) {
+            if (dy > pageScrollThreshold) {
+                if (canScrollVertical && layout.canScrollVertically()) {
+                    canScrollVertical = false;
+                    onScrollDown();
+                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
+                    canScrollHorizontally = false;
+                    onScrollRight();
+                }
+            } else if (dy < -pageScrollThreshold) {
+                if (canScrollVertical && layout.canScrollVertically()) {
+                    canScrollVertical = false;
+                    onScrollUp();
+                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
+                    canScrollHorizontally = false;
+                    onScrollLeft();
+                }
+            }
+
+            if (dx > pageScrollThreshold) {
+                if (canScrollVertical && layout.canScrollVertically()) {
+                    onScrollDown();
+                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
+                    onScrollRight();
+                }
+            } else if (dx < -pageScrollThreshold) {
+                if (canScrollVertical && layout.canScrollVertically()) {
+                    onScrollUp();
+                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
+                    onScrollLeft();
+                }
+            }
+        }
+    }
+
+    protected void onScrollLeft() {
+        LayoutManager layout = getLayoutManager();
+        if (layout instanceof LinearLayoutManager) {
+            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
+            int firstVisiblePosition = realLayout.findFirstVisibleItemPosition();
+            ViewHolder firstVisibleItem = findViewHolderForAdapterPosition(firstVisiblePosition);
+
+            if (firstVisibleItem == null) {
+                return;
+            }
+
+            //when the item width overscreen, findLastCompletelyVisibleItemPosition always return NO_POSITION
+            if (firstVisibleItem.itemView.getMeasuredWidth() > getMeasuredWidth()) {
+                super.scrollByInternal(-getMeasuredWidth() + defaultOverflowItemScrollKeep, 0, null, ViewCompat.TYPE_TOUCH);
+            } else if (firstVisibleItem.itemView.getMeasuredWidth() == getMeasuredWidth()) {
+                super.scrollByInternal(-getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
+            } else {
+                super.scrollByInternal(firstVisibleItem.itemView.getRight() - getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
+            }
+        } else if (layout instanceof StaggeredGridLayoutManager) {
+            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
+            int[] firstVisiblePosition = realLayout.findFirstVisibleItemPositions(null);
+            ViewHolder[] firstVisibleItems = new ViewHolder[firstVisiblePosition.length];
+            for (int i = 0; i < firstVisiblePosition.length; i++) {
+                firstVisibleItems[i] = findViewHolderForAdapterPosition(firstVisiblePosition[i]);
+            }
+            int scrollDistance = Integer.MAX_VALUE;
+            for (ViewHolder firstVisibleItem : firstVisibleItems) {
+                if (firstVisibleItem != null) {
+                    if (firstVisibleItem.itemView.getRight() < scrollDistance) {
+                        scrollDistance = firstVisibleItem.itemView.getRight();
+                    }
+                }
+            }
+
+            if (scrollDistance == getMeasuredWidth()) {
+                scrollDistance = 0;
+            }
+            super.scrollByInternal(scrollDistance - getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
+        }
+    }
+
+    protected void onScrollRight() {
+        LayoutManager layout = getLayoutManager();
+        if (layout instanceof LinearLayoutManager) {
+            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
+            int lastVisiblePosition = realLayout.findLastVisibleItemPosition();
+            ViewHolder lastVisibleItem = findViewHolderForAdapterPosition(lastVisiblePosition);
+
+            if (lastVisibleItem == null) {
+                return;
+            }
+
+            //when the item width overflow screen, findLastCompletelyVisibleItemPosition always return NO_POSITION
+            if (lastVisibleItem.itemView.getMeasuredWidth() > getMeasuredWidth()) {
+                super.scrollByInternal(getMeasuredWidth() - defaultOverflowItemScrollKeep, 0, null, ViewCompat.TYPE_TOUCH);
+            } else if (lastVisibleItem.itemView.getMeasuredWidth() == getMeasuredWidth()) {
+                super.scrollByInternal(getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
+            } else {
+                super.scrollByInternal(lastVisibleItem.itemView.getLeft(), 0, null, ViewCompat.TYPE_TOUCH);
+            }
+        } else if (layout instanceof StaggeredGridLayoutManager) {
+            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
+            int[] lastVisiblePosition = realLayout.findLastVisibleItemPositions(null);
+            ViewHolder[] lastVisibleItems = new ViewHolder[lastVisiblePosition.length];
+            for (int i = 0; i < lastVisiblePosition.length; i++) {
+                lastVisibleItems[i] = findViewHolderForAdapterPosition(lastVisiblePosition[i]);
+            }
+            int scrollDistance = 0;
+            for (ViewHolder lastVisibleItem : lastVisibleItems) {
+                if (lastVisibleItem != null) {
+                    if (lastVisibleItem.itemView.getLeft() > scrollDistance) {
+                        scrollDistance = lastVisibleItem.itemView.getLeft();
+                    }
+                }
+            }
+            if (scrollDistance == 0) {
+                scrollDistance = getMeasuredWidth();
+            }
+            super.scrollByInternal(scrollDistance, 0, null, ViewCompat.TYPE_TOUCH);
+        }
+    }
+
+    protected void onScrollUp() {
+        LayoutManager layout = getLayoutManager();
+        if (layout instanceof LinearLayoutManager) {
+            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
+            int firstVisiblePosition = realLayout.findFirstVisibleItemPosition();
+            ViewHolder firstVisibleItem = findViewHolderForAdapterPosition(firstVisiblePosition);
+
+            if (firstVisibleItem == null) {
+                return;
+            }
+
+            //when the item height overscreen, findLastCompletelyVisibleItemPosition always return NO_POSITION
+            if (firstVisibleItem.itemView.getMeasuredHeight() > getMeasuredHeight()) {
+                super.scrollByInternal(0, -getMeasuredHeight() + defaultOverflowItemScrollKeep, null, ViewCompat.TYPE_TOUCH);
+            } else if (firstVisibleItem.itemView.getMeasuredHeight() == getMeasuredHeight()) {
+                super.scrollByInternal(0, -getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
+            } else {
+                super.scrollByInternal(0, firstVisibleItem.itemView.getBottom() - getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
+            }
+        } else if (layout instanceof StaggeredGridLayoutManager) {
+            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
+            int[] firstVisiblePosition = realLayout.findFirstVisibleItemPositions(null);
+            ViewHolder[] firstVisibleItems = new ViewHolder[firstVisiblePosition.length];
+            for (int i = 0; i < firstVisiblePosition.length; i++) {
+                firstVisibleItems[i] = findViewHolderForAdapterPosition(firstVisiblePosition[i]);
+            }
+            int scrollDistance = Integer.MAX_VALUE;
+            for (ViewHolder firstVisibleItem : firstVisibleItems) {
+                if (firstVisibleItem != null) {
+                    if (firstVisibleItem.itemView.getBottom() < scrollDistance) {
+                        scrollDistance = firstVisibleItem.itemView.getBaseline();
+                    }
+                }
+            }
+            if (scrollDistance == getMeasuredWidth()) {
+                scrollDistance = 0;
+            }
+            super.scrollByInternal(0, scrollDistance - getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
+        }
+    }
+
+    protected void onScrollDown() {
+        LayoutManager layout = getLayoutManager();
+        if (layout instanceof LinearLayoutManager) {
+            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
+            int lastVisiblePosition = realLayout.findLastVisibleItemPosition();
+            ViewHolder lastVisibleItem = findViewHolderForAdapterPosition(lastVisiblePosition);
+
+            if (lastVisibleItem == null) {
+                return;
+            }
+
+            //when the item height overflow screen, findLastCompletelyVisibleItemPosition always return NO_POSITION
+            if (lastVisibleItem.itemView.getMeasuredHeight() > getMeasuredHeight()) {
+                super.scrollByInternal(0, getMeasuredHeight() - defaultOverflowItemScrollKeep, null, ViewCompat.TYPE_TOUCH);
+            } else if (lastVisibleItem.itemView.getMeasuredHeight() == getMeasuredHeight()) {
+                super.scrollByInternal(0, getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
+            } else {
+                super.scrollByInternal(0, lastVisibleItem.itemView.getTop(), null, ViewCompat.TYPE_TOUCH);
+            }
+        } else if (layout instanceof StaggeredGridLayoutManager) {
+            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
+            int[] lastVisiblePosition = realLayout.findLastVisibleItemPositions(null);
+            ViewHolder[] lastVisibleItems = new ViewHolder[lastVisiblePosition.length];
+            for (int i = 0; i < lastVisiblePosition.length; i++) {
+                lastVisibleItems[i] = findViewHolderForAdapterPosition(lastVisiblePosition[i]);
+            }
+            int scrollDistance = 0;
+            for (ViewHolder lastVisibleItem : lastVisibleItems) {
+                if (lastVisibleItem != null) {
+                    if (lastVisibleItem.itemView.getTop() > scrollDistance) {
+                        scrollDistance = lastVisibleItem.itemView.getTop();
+                    }
+                }
+            }
+            if (scrollDistance == 0) {
+                scrollDistance = getMeasuredHeight();
+            }
+            super.scrollByInternal(0, scrollDistance, null, ViewCompat.TYPE_TOUCH);
+        }
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        defaultOverflowItemScrollKeep = (int) (h * 0.05f);
+    }
+
+    private double getSplineDeceleration(int velocity) {
+        return Math.log(0.35f * Math.abs(velocity) / (mFlingFriction * mPhysicalCoeff));
+    }
+
+    private double getSplineFlingDistance(int velocity) {
+        final double l = getSplineDeceleration(velocity);
+        final double decelMinusOne = DECELERATION_RATE - 1.0;
+        return mFlingFriction * mPhysicalCoeff * Math.exp(DECELERATION_RATE / decelMinusOne * l);
+    }
+
+    public void setEnableScroll(boolean enableScroll) {
+        this.enableScroll = enableScroll;
+    }
+
+    public boolean isEnableScroll() {
+        return enableScroll;
+    }
+
     /**
      * This saved state class is a Parcelable and should not extend
      * {@link android.view.View.BaseSavedState} nor {@link android.view.AbsSavedState}

app/src/main/java/com/hippo/easyrecyclerview/ScrollLessRecyclerView.java

@@ -1,349 +0,0 @@
-package com.hippo.easyrecyclerview;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.hardware.SensorManager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.BridgeRecyclerView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
-public class ScrollLessRecyclerView extends BridgeRecyclerView {
-
-    private boolean isScrollBefore = false;
-    private int initialTouchX;
-    private int initialTouchY;
-
-    // A context-specific coefficient adjusted to physical values.
-    private float mPhysicalCoeff;
-    // Fling friction
-    private final float mFlingFriction = ViewConfiguration.getScrollFriction();
-    private static final float DECELERATION_RATE = (float) (Math.log(0.78) / Math.log(0.9));
-
-    public float pageScrollThreshold;
-    private int defaultOverflowItemScrollKeep;
-
-    private boolean enableScroll = false;
-
-    public ScrollLessRecyclerView(@NonNull Context context) {
-        super(context);
-        init(context);
-    }
-
-    public ScrollLessRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
-    }
-
-    public ScrollLessRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context);
-    }
-
-    private void init(Context context) {
-        float scale = context.getResources().getDisplayMetrics().density;
-        final float ppi = scale * 160.0f;
-        mPhysicalCoeff = SensorManager.GRAVITY_EARTH // g (m/s^2)
-                * 39.37f // inch/meter
-                * ppi
-                * 0.84f; // look and feel tuning
-        pageScrollThreshold = scale * 80;
-    }
-
-    public void setPageScrollThreshold(float pageScrollThreshold) {
-        this.pageScrollThreshold = pageScrollThreshold;
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public boolean onTouchEvent(MotionEvent e) {
-        if (enableScroll) {
-            return super.onTouchEvent(e);
-        }
-        boolean superTouchResult = super.onTouchEvent(e);
-        if (superTouchResult) {
-            switch (e.getAction()) {
-                case MotionEvent.ACTION_DOWN:
-                    initialTouchX = (int) (e.getX() + 0.5f);
-                    initialTouchY = (int) (e.getY() + 0.5f);
-                    break;
-                case MotionEvent.ACTION_MOVE:
-                    if (initialTouchX < 0 || initialTouchY < 0) {
-                        initialTouchX = (int) (e.getX() + 0.5f);
-                        initialTouchY = (int) (e.getY() + 0.5f);
-                    }
-                    break;
-                case MotionEvent.ACTION_UP:
-                    if (isScrollBefore) {
-                        int moveDistanceX = (int) (initialTouchX - e.getX() + flingMoveDistanceX);
-                        int moveDistanceY = (int) (initialTouchY - e.getY() + flingMoveDistanceY);
-                        onTouchScroll(moveDistanceX, moveDistanceY);
-                        initialTouchX = initialTouchY = -1;
-                    }
-                    break;
-            }
-            isScrollBefore = getScrollState() == SCROLL_STATE_DRAGGING;
-        }
-        return superTouchResult;
-    }
-
-    @Override
-    public boolean scrollByInternal(int x, int y, MotionEvent ev, int type) {
-        if (enableScroll) {
-            return super.scrollByInternal(x, y, ev, type);
-        }
-        //disable drag scroll effect，e-ink screen don't need it
-        return false;
-    }
-
-    double flingMoveDistanceX;
-    double flingMoveDistanceY;
-
-    @Override
-    public boolean fling(int velocityX, int velocityY) {
-        if (enableScroll) {
-            return super.fling(velocityX, velocityY);
-        }
-        flingMoveDistanceX = getSplineFlingDistance(velocityX) * Math.signum(velocityX);
-        flingMoveDistanceY = getSplineFlingDistance(velocityY) * Math.signum(velocityY);
-        //disable fling scroll effect,e-ink screen don't need it
-        return false;
-    }
-
-    boolean canScrollVertical = true;
-    boolean canScrollHorizontally = true;
-
-    protected void onTouchScroll(int dx, int dy) {
-        canScrollVertical = true;
-        canScrollHorizontally = true;
-        LayoutManager layout = getLayoutManager();
-        if (layout != null) {
-            if (dy > pageScrollThreshold) {
-                if (canScrollVertical && layout.canScrollVertically()) {
-                    canScrollVertical = false;
-                    onScrollDown();
-                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
-                    canScrollHorizontally = false;
-                    onScrollRight();
-                }
-            } else if (dy < -pageScrollThreshold) {
-                if (canScrollVertical && layout.canScrollVertically()) {
-                    canScrollVertical = false;
-                    onScrollUp();
-                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
-                    canScrollHorizontally = false;
-                    onScrollLeft();
-                }
-            }
-
-            if (dx > pageScrollThreshold) {
-                if (canScrollVertical && layout.canScrollVertically()) {
-                    onScrollDown();
-                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
-                    onScrollRight();
-                }
-            } else if (dx < -pageScrollThreshold) {
-                if (canScrollVertical && layout.canScrollVertically()) {
-                    onScrollUp();
-                } else if (canScrollHorizontally && layout.canScrollHorizontally()) {
-                    onScrollLeft();
-                }
-            }
-        }
-    }
-
-    protected void onScrollLeft() {
-        LayoutManager layout = getLayoutManager();
-        if (layout instanceof LinearLayoutManager) {
-            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
-            int firstVisiblePosition = realLayout.findFirstVisibleItemPosition();
-            ViewHolder firstVisibleItem = findViewHolderForAdapterPosition(firstVisiblePosition);
-
-            if (firstVisibleItem == null) {
-                return;
-            }
-
-            //when the item width overscreen, findLastCompletelyVisibleItemPosition always return NO_POSITION
-            if (firstVisibleItem.itemView.getMeasuredWidth() > getMeasuredWidth()) {
-                super.scrollByInternal(-getMeasuredWidth() + defaultOverflowItemScrollKeep, 0, null, ViewCompat.TYPE_TOUCH);
-            } else if (firstVisibleItem.itemView.getMeasuredWidth() == getMeasuredWidth()) {
-                super.scrollByInternal(-getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
-            } else {
-                super.scrollByInternal(firstVisibleItem.itemView.getRight() - getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
-            }
-        } else if (layout instanceof StaggeredGridLayoutManager) {
-            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
-            int[] firstVisiblePosition = realLayout.findFirstVisibleItemPositions(null);
-            ViewHolder[] firstVisibleItems = new ViewHolder[firstVisiblePosition.length];
-            for (int i = 0; i < firstVisiblePosition.length; i++) {
-                firstVisibleItems[i] = findViewHolderForAdapterPosition(firstVisiblePosition[i]);
-            }
-            int scrollDistance = Integer.MAX_VALUE;
-            for (ViewHolder firstVisibleItem : firstVisibleItems) {
-                if (firstVisibleItem != null) {
-                    if (firstVisibleItem.itemView.getRight() < scrollDistance) {
-                        scrollDistance = firstVisibleItem.itemView.getRight();
-                    }
-                }
-            }
-
-            if (scrollDistance == getMeasuredWidth()) {
-                scrollDistance = 0;
-            }
-            super.scrollByInternal(scrollDistance - getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
-        }
-    }
-
-    protected void onScrollRight() {
-        LayoutManager layout = getLayoutManager();
-        if (layout instanceof LinearLayoutManager) {
-            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
-            int lastVisiblePosition = realLayout.findLastVisibleItemPosition();
-            ViewHolder lastVisibleItem = findViewHolderForAdapterPosition(lastVisiblePosition);
-
-            if (lastVisibleItem == null) {
-                return;
-            }
-
-            //when the item width overflow screen, findLastCompletelyVisibleItemPosition always return NO_POSITION
-            if (lastVisibleItem.itemView.getMeasuredWidth() > getMeasuredWidth()) {
-                super.scrollByInternal(getMeasuredWidth() - defaultOverflowItemScrollKeep, 0, null, ViewCompat.TYPE_TOUCH);
-            } else if (lastVisibleItem.itemView.getMeasuredWidth() == getMeasuredWidth()) {
-                super.scrollByInternal(getMeasuredWidth(), 0, null, ViewCompat.TYPE_TOUCH);
-            } else {
-                super.scrollByInternal(lastVisibleItem.itemView.getLeft(), 0, null, ViewCompat.TYPE_TOUCH);
-            }
-        } else if (layout instanceof StaggeredGridLayoutManager) {
-            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
-            int[] lastVisiblePosition = realLayout.findLastVisibleItemPositions(null);
-            ViewHolder[] lastVisibleItems = new ViewHolder[lastVisiblePosition.length];
-            for (int i = 0; i < lastVisiblePosition.length; i++) {
-                lastVisibleItems[i] = findViewHolderForAdapterPosition(lastVisiblePosition[i]);
-            }
-            int scrollDistance = 0;
-            for (ViewHolder lastVisibleItem : lastVisibleItems) {
-                if (lastVisibleItem != null) {
-                    if (lastVisibleItem.itemView.getLeft() > scrollDistance) {
-                        scrollDistance = lastVisibleItem.itemView.getLeft();
-                    }
-                }
-            }
-            if (scrollDistance == 0) {
-                scrollDistance = getMeasuredWidth();
-            }
-            super.scrollByInternal(scrollDistance, 0, null, ViewCompat.TYPE_TOUCH);
-        }
-    }
-
-    protected void onScrollUp() {
-        LayoutManager layout = getLayoutManager();
-        if (layout instanceof LinearLayoutManager) {
-            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
-            int firstVisiblePosition = realLayout.findFirstVisibleItemPosition();
-            ViewHolder firstVisibleItem = findViewHolderForAdapterPosition(firstVisiblePosition);
-
-            if (firstVisibleItem == null) {
-                return;
-            }
-
-            //when the item height overscreen, findLastCompletelyVisibleItemPosition always return NO_POSITION
-            if (firstVisibleItem.itemView.getMeasuredHeight() > getMeasuredHeight()) {
-                super.scrollByInternal(0, -getMeasuredHeight() + defaultOverflowItemScrollKeep, null, ViewCompat.TYPE_TOUCH);
-            } else if (firstVisibleItem.itemView.getMeasuredHeight() == getMeasuredHeight()) {
-                super.scrollByInternal(0, -getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
-            } else {
-                super.scrollByInternal(0, firstVisibleItem.itemView.getBottom() - getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
-            }
-        } else if (layout instanceof StaggeredGridLayoutManager) {
-            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
-            int[] firstVisiblePosition = realLayout.findFirstVisibleItemPositions(null);
-            ViewHolder[] firstVisibleItems = new ViewHolder[firstVisiblePosition.length];
-            for (int i = 0; i < firstVisiblePosition.length; i++) {
-                firstVisibleItems[i] = findViewHolderForAdapterPosition(firstVisiblePosition[i]);
-            }
-            int scrollDistance = Integer.MAX_VALUE;
-            for (ViewHolder firstVisibleItem : firstVisibleItems) {
-                if (firstVisibleItem != null) {
-                    if (firstVisibleItem.itemView.getBottom() < scrollDistance) {
-                        scrollDistance = firstVisibleItem.itemView.getBaseline();
-                    }
-                }
-            }
-            if (scrollDistance == getMeasuredWidth()) {
-                scrollDistance = 0;
-            }
-            super.scrollByInternal(0, scrollDistance - getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
-        }
-    }
-
-    protected void onScrollDown() {
-        LayoutManager layout = getLayoutManager();
-        if (layout instanceof LinearLayoutManager) {
-            LinearLayoutManager realLayout = (LinearLayoutManager) layout;
-            int lastVisiblePosition = realLayout.findLastVisibleItemPosition();
-            ViewHolder lastVisibleItem = findViewHolderForAdapterPosition(lastVisiblePosition);
-
-            if (lastVisibleItem == null) {
-                return;
-            }
-
-            //when the item height overflow screen, findLastCompletelyVisibleItemPosition always return NO_POSITION
-            if (lastVisibleItem.itemView.getMeasuredHeight() > getMeasuredHeight()) {
-                super.scrollByInternal(0, getMeasuredHeight() - defaultOverflowItemScrollKeep, null, ViewCompat.TYPE_TOUCH);
-            } else if (lastVisibleItem.itemView.getMeasuredHeight() == getMeasuredHeight()) {
-                super.scrollByInternal(0, getMeasuredHeight(), null, ViewCompat.TYPE_TOUCH);
-            } else {
-                super.scrollByInternal(0, lastVisibleItem.itemView.getTop(), null, ViewCompat.TYPE_TOUCH);
-            }
-        } else if (layout instanceof StaggeredGridLayoutManager) {
-            StaggeredGridLayoutManager realLayout = (StaggeredGridLayoutManager) layout;
-            int[] lastVisiblePosition = realLayout.findLastVisibleItemPositions(null);
-            ViewHolder[] lastVisibleItems = new ViewHolder[lastVisiblePosition.length];
-            for (int i = 0; i < lastVisiblePosition.length; i++) {
-                lastVisibleItems[i] = findViewHolderForAdapterPosition(lastVisiblePosition[i]);
-            }
-            int scrollDistance = 0;
-            for (ViewHolder lastVisibleItem : lastVisibleItems) {
-                if (lastVisibleItem != null) {
-                    if (lastVisibleItem.itemView.getTop() > scrollDistance) {
-                        scrollDistance = lastVisibleItem.itemView.getTop();
-                    }
-                }
-            }
-            if (scrollDistance == 0) {
-                scrollDistance = getMeasuredHeight();
-            }
-            super.scrollByInternal(0, scrollDistance, null, ViewCompat.TYPE_TOUCH);
-        }
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        defaultOverflowItemScrollKeep = (int) (h * 0.05f);
-    }
-
-    private double getSplineDeceleration(int velocity) {
-        return Math.log(0.35f * Math.abs(velocity) / (mFlingFriction * mPhysicalCoeff));
-    }
-
-    private double getSplineFlingDistance(int velocity) {
-        final double l = getSplineDeceleration(velocity);
-        final double decelMinusOne = DECELERATION_RATE - 1.0;
-        return mFlingFriction * mPhysicalCoeff * Math.exp(DECELERATION_RATE / decelMinusOne * l);
-    }
-
-    public void setEnableScroll(boolean enableScroll) {
-        this.enableScroll = enableScroll;
-    }
-
-    public boolean isEnableScroll() {
-        return enableScroll;
-    }
-}

app/src/main/res/drawable/category_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <color android:color="@android:color/white" />
+        <color android:color="@android:color/system_neutral1_50" />
     </item>
     <item android:drawable="?android:attr/selectableItemBackground" />
 </layer-list>

app/src/main/res/layout/activity_filter.xml

@@ -38,7 +38,6 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/fab"
-        style="@style/Widget.FloatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/corner_fab_margin"

app/src/main/res/layout/activity_hosts.xml

@@ -39,7 +39,6 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/fab"
-        style="@style/Widget.FloatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/corner_fab_margin"

app/src/main/res/layout/activity_preference.xml

@@ -11,17 +11,13 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/toolbarColor"
         android:elevation="4dp"
-        android:fitsSystemWindows="true"
-        app:statusBarForeground="?colorPrimaryDark">
+        android:fitsSystemWindows="true">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_height="?attr/actionBarSize"
-            android:layout_width="match_parent"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
-            app:popupTheme="?attr/toolbarPopupTheme" />
+            android:layout_width="match_parent" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

app/src/main/res/layout/gallery_detail_header.xml

@@ -30,7 +30,6 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:background="?attr/galleryDetailHeaderBackgroundColor"
             android:elevation="4dp"
             app:fitsSystemWindowsInsets="top" />
 
@@ -49,7 +48,6 @@
             android:id="@+id/header_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
             app:fitsSystemWindowsInsets="top">
 
             <com.hippo.widget.LoadImageView
@@ -70,7 +68,6 @@
                 android:layout_toRightOf="@id/thumb"
                 android:ellipsize="end"
                 android:maxLines="5"
-                android:textColor="@android:color/white"
                 android:textSize="@dimen/text_little_large" />
 
             <TextView
@@ -84,7 +81,6 @@
                 android:background="?selectableItemBackground"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:textColor="@android:color/white"
                 android:textSize="@dimen/text_little_small" />
 
             <TextView

app/src/main/res/layout/scene_download.xml

@@ -62,37 +62,36 @@
         app:fitsSystemWindowsInsets="bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_check_all_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_play_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_pause_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_delete_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_folder_move_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_close_dark_x24" />

app/src/main/res/layout/scene_favorites.xml

@@ -44,46 +44,45 @@
         app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_heart_box_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_go_to_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_refresh_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:srcCompat="@drawable/v_download_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:srcCompat="@drawable/v_delete_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
+            app:fabSize="mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:srcCompat="@drawable/v_folder_move_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 

app/src/main/res/layout/scene_gallery_comments.xml

@@ -69,8 +69,7 @@
             android:maxHeight="112dp"
             android:minHeight="56dp"
             android:padding="@dimen/keyline_margin"
-            android:textColor="?colorOnPrimarySurface"
-            android:theme="@style/CommentEditText" />
+            android:textColor="?colorOnPrimarySurface" />
 
         <ImageView
             android:id="@+id/send"
@@ -95,7 +94,6 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
-            style="@style/Widget.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/v_reply_dark_x24" />

app/src/main/res/layout/scene_gallery_list.xml

@@ -51,25 +51,24 @@
         app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:fabSize="mini"
             app:srcCompat="@drawable/v_magnify_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:fabSize="mini"
             app:srcCompat="@drawable/v_go_to_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton.Accent.Mini"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:fabSize="mini"
             app:srcCompat="@drawable/v_refresh_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            style="@style/Widget.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -84,7 +83,6 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/search_fab"
-            style="@style/Widget.FloatingActionButton.Accent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleX="0"

app/src/main/res/layout/scene_toolbar.xml

@@ -24,16 +24,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:background="?attr/toolbarColor"
         android:elevation="4dp"
-        app:statusBarForeground="?colorPrimaryDark">
+        app:liftOnScroll="true">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
-            app:popupTheme="?attr/toolbarPopupTheme" />
+            app:layout_scrollFlags="scroll|enterAlways|snap"/>
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout

app/src/main/res/values/themes.xml

@@ -20,9 +20,6 @@
     <!-- Base Theme -->
     <!-- ========== -->
     <style name="Base.AppTheme.Light" parent="Theme.Material3.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">@color/ic_launcher_background</item>
 
@@ -61,9 +58,6 @@
     </style>
 
     <style name="Base.AppTheme" parent="Theme.Material3.DayNight">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/grey_875</item>
-        <item name="colorAccent">@color/colorPrimary</item>
         <item name="colorControlActivated">@color/colorPrimary</item>
         <item name="android:colorBackground">@color/grey_850</item>
         <item name="android:windowSplashScreenIconBackgroundColor" tools:targetApi="s">@color/ic_launcher_background</item>
@@ -109,8 +103,6 @@
     <style name="ThemeOverlay" />
 
     <style name="ThemeOverlay.Black">
-        <item name="colorPrimaryDark">@android:color/black</item>
-
         <item name="android:colorBackground">@android:color/black</item>
 
         <item name="android:textColorPrimary">@color/primary_text_material_black</item>
@@ -143,25 +135,9 @@
     <!-- ============ -->
     <!-- Widget Theme -->
     <!-- ============ -->
-    <style name="CommentEditText" parent="ThemeOverlay.Material3">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@android:color/white</item>
-    </style>
 
     <style name="RatingBarTheme" parent="ThemeOverlay.Material3">
         <item name="colorControlNormal">@color/yellow_800</item>
         <item name="colorControlActivated">@color/yellow_800</item>
     </style>
-
-    <style name="Widget.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Tertiary">
-    </style>
-
-    <style name="Widget.FloatingActionButton.Accent" parent="Widget.Material3.FloatingActionButton.Secondary">
-    </style>
-
-    <style name="Widget.FloatingActionButton.Accent.Mini" parent="Widget.FloatingActionButton.Accent">
-        <item name="fabSize">mini</item>
-    </style>
-
 </resources>

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.application' version '7.2.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 
 task clean(type: Delete) {

native/build.gradle

@@ -8,7 +8,7 @@ android {
     ndkVersion "24.0.8215888"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdkVersion 31
         targetSdkVersion 32
         consumerProguardFiles 'proguard-rules.pro'
 
@@ -17,6 +17,10 @@ android {
                 arguments '-DANDROID_STL=c++_static'
             }
         }
+
+        ndk {
+            abiFilters 'arm64-v8a', 'x86_64'
+        }
     }
 
     externalNativeBuild {