Release 1.7.28.4

https://developer.android.google.cn/about/versions/13/behavior-changes-13?hl=zh-cn#migration

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
-name: EhViewer
+name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   linux:
@@ -32,7 +32,7 @@ jobs:
       - name: Update ARM64
         uses: actions/upload-artifact@v3
         with:
-          name: arm64-${{ github.sha }}
+          name: arm64-v8a-${{ github.sha }}
           path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
 
       - name: Update x86_64

.github/workflows/pull_request.yml

@@ -0,0 +1,54 @@
+name: Pull Request Check
+
+on: [pull_request]
+
+jobs:
+  linux:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Android SDK Tools
+        uses: android-actions/setup-android@v2
+
+      - name: Install NDK
+        run: |
+          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.0.8775105" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+
+      - name: Gradle Build
+        uses: gradle/gradle-build-action@v2
+      - run: |
+          git submodule update --init --recursive
+          gradle assembleRelease
+
+      - name: Update ARM64
+        uses: actions/upload-artifact@v3
+        with:
+          name: arm64-v8a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk
+
+      - name: Update x86_64
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86_64-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86_64-release.apk
+
+      - name: Update ARM32
+        uses: actions/upload-artifact@v3
+        with:
+          name: armeabi-v7a-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+
+      - name: Update x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: x86-${{ github.sha }}
+          path: app/build/outputs/apk/release/app-x86-release.apk

.github/workflows/releases.yml

@@ -36,6 +36,7 @@ jobs:
         uses: softprops/action-gh-release@v0.1.14
         with:
           body: Bump Version
+          discussion_category_name: Announcements
           files: |
             app/build/outputs/apk/release/app-arm64-v8a-release.apk
             app/build/outputs/apk/release/app-x86_64-release.apk

.gitmodules

@@ -12,4 +12,4 @@
 	url = https://github.com/Ehviewer-Overhauled/libarchive
 [submodule "native/src/main/jni/liblzma"]
 	path = native/src/main/jni/liblzma
-	url = https://git.tukaani.org/xz.git
+	url = https://github.com/Ehviewer-Overhauled/xz

README.md

@@ -4,8 +4,8 @@
 </h1>
 
 <p align="center">
-  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/actions">
-    <img src="https://img.shields.io/github/workflow/status/Ehviewer-Overhauled/Ehviewer/EhViewer" alt="Github Actions">
+  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml">
+    <img src="https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml/badge.svg" alt="Github Actions">
   </a>
   <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/master/LICENSE">
     <img src="https://img.shields.io/github/license/Ehviewer-Overhauled/Ehviewer" alt="LICENSE">
@@ -52,6 +52,7 @@ Here is the libraries
 
 - [AOSP](http://source.android.com/)
 - [android-advancedrecyclerview](https://github.com/h6ah4i/android-advancedrecyclerview)
+- [material-design-icons](https://github.com/google/material-design-icons)
 - [Apache Commons Lang](https://commons.apache.org/proper/commons-lang/)
 - [apng](http://apng.sourceforge.net/)
 - [giflib](http://giflib.sourceforge.net)

app/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 114529
-        versionName "1.7.28.2"
+        versionCode 114531
+        versionName "1.7.28.4"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 

app/src/main/AndroidManifest.xml

@@ -26,10 +26,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
-
+  
+    <!-- Required to maintain app compatibility. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+                     android:maxSdkVersion="32" />
+  
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java

@@ -36,6 +36,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.slider.Slider;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
 import com.hippo.easyrecyclerview.MarginItemDecoration;
 import com.hippo.ehviewer.EhApplication;
@@ -53,7 +54,6 @@ import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.scene.SceneFragment;
 import com.hippo.widget.ContentLayout;
 import com.hippo.widget.LoadImageView;
-import com.hippo.widget.Slider;
 import com.hippo.widget.recyclerview.AutoGridLayoutManager;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.LayoutUtils;
@@ -209,7 +209,7 @@ public class GalleryPreviewsScene extends ToolbarScene {
                 return true;
             }
             int pages = mHelper.getPages();
-            if (pages > 0 && mHelper.canGoTo()) {
+            if (pages > 1 && mHelper.canGoTo()) {
                 GoToDialogHelper helper = new GoToDialogHelper(pages, mHelper.getPageForTop());
                 AlertDialog dialog = new MaterialAlertDialogBuilder(context).setTitle(R.string.go_to)
                         .setView(R.layout.dialog_go_to)
@@ -418,8 +418,8 @@ public class GalleryPreviewsScene extends ToolbarScene {
             ((TextView) ViewUtils.$$(dialog, R.id.start)).setText(String.format(Locale.US, "%d", 1));
             ((TextView) ViewUtils.$$(dialog, R.id.end)).setText(String.format(Locale.US, "%d", mPages));
             mSlider = (Slider) ViewUtils.$$(dialog, R.id.slider);
-            mSlider.setRange(1, mPages);
-            mSlider.setProgress(mCurrentPage + 1);
+            mSlider.setValueTo(mPages);
+            mSlider.setValue(mCurrentPage + 1);
 
             dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(this);
             dialog.setOnDismissListener(this);
@@ -431,7 +431,7 @@ public class GalleryPreviewsScene extends ToolbarScene {
                 return;
             }
 
-            int page = mSlider.getProgress() - 1;
+            int page = (int) (mSlider.getValue() - 1);
             if (page >= 0 && page < mPages && mHelper != null) {
                 mHelper.goTo(page);
                 if (mDialog != null) {

app/src/main/java/com/hippo/widget/Slider.java

@@ -1,515 +0,0 @@
-/*
- * Copyright 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.widget;
-
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.AnimationUtils;
-import com.hippo.yorozuya.LayoutUtils;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.SimpleHandler;
-
-public class Slider extends View {
-
-    private static final char[] CHARACTERS = {
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
-    };
-
-    private static final int BUBBLE_WIDTH = 26;
-    private static final int BUBBLE_HEIGHT = 32;
-    private final RectF mLeftRectF = new RectF();
-    private final RectF mRightRectF = new RectF();
-    private final int[] mTemp = new int[2];
-    private Context mContext;
-    private Paint mPaint;
-    private Paint mBgPaint;
-    private PopupWindow mPopup;
-    private BubbleView mBubble;
-    private int mStart;
-    private int mEnd;
-    private int mProgress;
-    private float mPercent;
-    private int mDrawProgress;
-    private float mDrawPercent;
-    private int mTargetProgress;
-    private float mThickness;
-    private float mRadius;
-    private float mCharWidth;
-    private float mCharHeight;
-    private int mBubbleWidth;
-    private int mBubbleHeight;
-    private int mBubbleMinWidth;
-    private int mBubbleMinHeight;
-    private int mPopupX;
-    private int mPopupY;
-    private int mPopupWidth;
-    private boolean mReverse = false;
-
-    private boolean mShowBubble;
-
-    private float mDrawBubbleScale = 0f;
-
-    private ValueAnimator mProgressAnimation;
-    private ValueAnimator mBubbleScaleAnimation;
-
-    private OnSetProgressListener mListener;
-
-    private CheckForShowBubble mCheckForShowBubble;
-
-    public Slider(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
-    }
-
-    public Slider(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs);
-    }
-
-    @SuppressWarnings("deprecation")
-    private void init(Context context, AttributeSet attrs) {
-        mContext = context;
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        Paint textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        textPaint.setTextAlign(Paint.Align.CENTER);
-
-        Resources resources = context.getResources();
-        mBubbleMinWidth = resources.getDimensionPixelOffset(R.dimen.slider_bubble_width);
-        mBubbleMinHeight = resources.getDimensionPixelOffset(R.dimen.slider_bubble_height);
-
-        mBubble = new BubbleView(context, textPaint);
-        mBubble.setScaleX(0.0f);
-        mBubble.setScaleY(0.0f);
-        RelativeLayout relativeLayout = new RelativeLayout(context);
-        relativeLayout.addView(mBubble);
-        relativeLayout.setBackgroundDrawable(null);
-        mPopup = new PopupWindow(relativeLayout);
-        mPopup.setOutsideTouchable(false);
-        mPopup.setTouchable(false);
-        mPopup.setFocusable(false);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Slider);
-        textPaint.setColor(a.getColor(R.styleable.Slider_textColor, Color.WHITE));
-        textPaint.setTextSize(a.getDimensionPixelSize(R.styleable.Slider_textSize, 12));
-
-        updateTextSize();
-
-        setRange(a.getInteger(R.styleable.Slider_start, 0), a.getInteger(R.styleable.Slider_end, 0));
-        setProgress(a.getInteger(R.styleable.Slider_slider_progress, 0));
-        mThickness = a.getDimension(R.styleable.Slider_thickness, 2);
-        mRadius = a.getDimension(R.styleable.Slider_radius, 6);
-
-        mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-        a.recycle();
-
-        mProgressAnimation = new ValueAnimator();
-        mProgressAnimation.setInterpolator(AnimationUtils.FAST_SLOW_INTERPOLATOR);
-        mProgressAnimation.addUpdateListener(animation -> {
-            float value = (Float) animation.getAnimatedValue();
-            mDrawPercent = value;
-            mDrawProgress = Math.round(MathUtils.lerp((float) mStart, mEnd, value));
-            updateBubblePosition();
-            mBubble.setProgress(mDrawProgress);
-            invalidate();
-        });
-
-        mBubbleScaleAnimation = new ValueAnimator();
-        mBubbleScaleAnimation.addUpdateListener(animation -> {
-            float value = (Float) animation.getAnimatedValue();
-            mDrawBubbleScale = value;
-            mBubble.setScaleX(value);
-            mBubble.setScaleY(value);
-            invalidate();
-        });
-    }
-
-    private void updateTextSize() {
-        int length = CHARACTERS.length;
-        float[] widths = new float[length];
-        mPaint.getTextWidths(CHARACTERS, 0, length, widths);
-        mCharWidth = 0.0f;
-        for (float f : widths) {
-            mCharWidth = Math.max(mCharWidth, f);
-        }
-
-        Paint.FontMetrics fm = mPaint.getFontMetrics();
-        mCharHeight = fm.bottom - fm.top;
-    }
-
-    private void updateBubbleSize() {
-        int oldWidth = mBubbleWidth;
-        int oldHeight = mBubbleHeight;
-        mBubbleWidth = (int) Math.max(mBubbleMinWidth,
-                Integer.toString(mEnd).length() * mCharWidth + LayoutUtils.dp2pix(mContext, 8));
-        mBubbleHeight = (int) Math.max(mBubbleMinHeight,
-                mCharHeight + LayoutUtils.dp2pix(mContext, 8));
-
-        if (oldWidth != mBubbleWidth && oldHeight != mBubbleHeight) {
-            RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) mBubble.getLayoutParams();
-            lp.width = mBubbleWidth;
-            lp.height = mBubbleHeight;
-            mBubble.setLayoutParams(lp);
-        }
-    }
-
-    private void updatePopup() {
-        int width = getWidth();
-        int paddingTop = getPaddingTop();
-        int paddingBottom = getPaddingBottom();
-
-        getLocationInWindow(mTemp);
-
-        mPopupWidth = (int) (width - mRadius - mRadius + mBubbleWidth);
-        int popupHeight = mBubbleHeight;
-        mPopupX = (int) (mTemp[0] + mRadius - (mBubbleWidth / 2));
-        mPopupY = (int) (mTemp[1] - popupHeight + paddingTop +
-                ((getHeight() - paddingTop - paddingBottom) / 2) -
-                mRadius - LayoutUtils.dp2pix(mContext, 2));
-
-        mPopup.update(mPopupX, mPopupY, mPopupWidth, popupHeight, false);
-    }
-
-    private void updateBubblePosition() {
-        float x = ((mPopupWidth - mBubbleWidth) * (mReverse ? (1.0f - mDrawPercent) : mDrawPercent));
-        mBubble.setX(x);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        updatePopup();
-        updateBubblePosition();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        mPopup.showAtLocation(this, Gravity.TOP | Gravity.LEFT, mPopupX, mPopupY);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-
-        mPopup.dismiss();
-    }
-
-    private void startProgressAnimation(float percent) {
-        float currentValue;
-        if (mProgressAnimation.isRunning()) {
-            mProgressAnimation.setCurrentPlayTime(mProgressAnimation.getCurrentPlayTime());
-            Object value = mProgressAnimation.getAnimatedValue();
-            if (value instanceof Float) {
-                currentValue = (float) value;
-            } else {
-                currentValue = mDrawPercent;
-            }
-        } else {
-            currentValue = mDrawPercent;
-        }
-        mProgressAnimation.cancel();
-        mProgressAnimation.setFloatValues(currentValue, percent);
-        mProgressAnimation.setDuration(Math.min(500, (long) (50 * getWidth() * Math.abs(currentValue - percent))));
-        mProgressAnimation.start();
-    }
-
-    private void startShowBubbleAnimation() {
-        mBubbleScaleAnimation.cancel();
-        mBubbleScaleAnimation.setFloatValues(mDrawBubbleScale, 1.0f);
-        mBubbleScaleAnimation.setInterpolator(AnimationUtils.FAST_SLOW_INTERPOLATOR);
-        mBubbleScaleAnimation.setDuration((long) (300 * Math.abs(mDrawBubbleScale - 1.0f)));
-        mBubbleScaleAnimation.start();
-    }
-
-    private void startHideBubbleAnimation() {
-        mBubbleScaleAnimation.cancel();
-        mBubbleScaleAnimation.setFloatValues(mDrawBubbleScale, 0.0f);
-        mBubbleScaleAnimation.setInterpolator(AnimationUtils.SLOW_FAST_INTERPOLATOR);
-        mBubbleScaleAnimation.setDuration((long) (300 * Math.abs(mDrawBubbleScale - 0.0f)));
-        mBubbleScaleAnimation.start();
-    }
-
-    public void setColor(int color) {
-        mPaint.setColor(color);
-        mBubble.setColor(color);
-        invalidate();
-    }
-
-    public void setRange(int start, int end) {
-        mStart = start;
-        mEnd = end;
-        setProgress(mProgress);
-
-        updateBubbleSize();
-    }
-
-    public int getProgress() {
-        return mProgress;
-    }
-
-    public void setProgress(int progress) {
-        progress = MathUtils.clamp(progress, mStart, mEnd);
-        int oldProgress = mProgress;
-        if (mProgress != progress) {
-            mProgress = progress;
-            mPercent = MathUtils.delerp(mStart, mEnd, mProgress);
-            mTargetProgress = progress;
-
-            if (mProgressAnimation == null) {
-                // For init
-                mDrawPercent = mPercent;
-                mDrawProgress = mProgress;
-                updateBubblePosition();
-                mBubble.setProgress(mDrawProgress);
-            } else {
-                startProgressAnimation(mPercent);
-            }
-            invalidate();
-        }
-        if (mListener != null) {
-            mListener.onSetProgress(this, progress, oldProgress, false, true);
-        }
-    }
-
-    public void setReverse(boolean reverse) {
-        if (mReverse != reverse) {
-            mReverse = reverse;
-            invalidate();
-        }
-    }
-
-    public void setOnSetProgressListener(OnSetProgressListener listener) {
-        mListener = listener;
-    }
-
-    @Override
-    protected void onDraw(@NonNull Canvas canvas) {
-        int width = getWidth();
-        int height = getHeight();
-        if (width < LayoutUtils.dp2pix(mContext, 24)) {
-            canvas.drawRect(0, 0, width, getHeight(), mPaint);
-        } else {
-            int paddingLeft = getPaddingLeft();
-            int paddingTop = getPaddingTop();
-            int paddingRight = getPaddingRight();
-            int paddingBottom = getPaddingBottom();
-            float thickness = mThickness;
-            float radius = mRadius;
-            float halfThickness = thickness / 2;
-
-            int saved = canvas.save();
-
-            canvas.translate(0, paddingTop + ((height - paddingTop - paddingBottom) / 2));
-
-            float currentX = paddingLeft + radius + (width - radius - radius - paddingLeft - paddingRight) *
-                    (mReverse ? (1.0f - mDrawPercent) : mDrawPercent);
-
-            mLeftRectF.set(paddingLeft + radius, -halfThickness, currentX, halfThickness);
-            mRightRectF.set(currentX, -halfThickness, width - paddingRight - radius, halfThickness);
-
-            // Draw bar
-            if (mReverse) {
-                canvas.drawRect(mRightRectF, mPaint);
-                canvas.drawRect(mLeftRectF, mBgPaint);
-            } else {
-                canvas.drawRect(mLeftRectF, mPaint);
-                canvas.drawRect(mRightRectF, mBgPaint);
-            }
-
-            // Draw controller
-            float scale = 1.0f - mDrawBubbleScale;
-            if (scale != 0.0f) {
-                canvas.scale(scale, scale, currentX, 0);
-                canvas.drawCircle(currentX, 0, radius, mPaint);
-            }
-
-            canvas.restoreToCount(saved);
-        }
-    }
-
-    private void setShowBubble(boolean showBubble) {
-        if (mShowBubble != showBubble) {
-            mShowBubble = showBubble;
-            if (showBubble) {
-                startShowBubbleAnimation();
-            } else {
-                startHideBubbleAnimation();
-            }
-        }
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public boolean onTouchEvent(@NonNull MotionEvent event) {
-        int action = event.getAction();
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_MOVE:
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-
-                if (mListener != null) {
-                    if (action == MotionEvent.ACTION_DOWN) {
-                        mListener.onFingerDown();
-                    } else if (action == MotionEvent.ACTION_UP) {
-                        mListener.onFingerUp();
-                    }
-                }
-
-                int paddingLeft = getPaddingLeft();
-                int paddingRight = getPaddingRight();
-                float radius = mRadius;
-                float x = event.getX();
-                int progress = Math.round(MathUtils.lerp((float) mStart, (float) mEnd,
-                        MathUtils.clamp((mReverse ? (getWidth() - paddingLeft - radius - x) : (x - radius - paddingLeft)) /
-                                (getWidth() - radius - radius - paddingLeft - paddingRight), 0.0f, 1.0f)));
-                float percent = MathUtils.delerp(mStart, mEnd, progress);
-
-                // ACTION_CANCEL not changed
-                if (action == MotionEvent.ACTION_CANCEL) {
-                    progress = mProgress;
-                    percent = mPercent;
-                }
-
-                if (mTargetProgress != progress) {
-                    mTargetProgress = progress;
-                    startProgressAnimation(percent);
-
-                    if (mListener != null) {
-                        mListener.onSetProgress(this, mProgress, progress, true, false);
-                    }
-                }
-
-                if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
-                    SimpleHandler.getInstance().removeCallbacks(mCheckForShowBubble);
-                    setShowBubble(false);
-                } else if (action == MotionEvent.ACTION_DOWN) {
-                    if (mCheckForShowBubble == null) {
-                        mCheckForShowBubble = new CheckForShowBubble();
-                    }
-                    SimpleHandler.getInstance().postDelayed(mCheckForShowBubble, ViewConfiguration.getTapTimeout());
-                }
-
-                if (action == MotionEvent.ACTION_UP) {
-                    int oldProgress = mProgress;
-                    if (mProgress != progress) {
-                        mProgress = progress;
-                        mPercent = mDrawPercent;
-                    }
-                    if (mListener != null) {
-                        mListener.onSetProgress(this, progress, oldProgress, true, true);
-                    }
-                }
-                break;
-        }
-
-        return true;
-    }
-
-    public interface OnSetProgressListener {
-
-        void onSetProgress(Slider slider, int newProgress, int oldProgress, boolean byUser, boolean confirm);
-
-        void onFingerDown();
-
-        void onFingerUp();
-    }
-
-    @SuppressLint("ViewConstructor")
-    private static class BubbleView extends AppCompatImageView {
-
-        private static final float TEXT_CENTER = (float) BUBBLE_WIDTH / 2.0f / BUBBLE_HEIGHT;
-
-        private final Drawable mDrawable;
-
-        private final Paint mTextPaint;
-        private final Rect mRect = new Rect();
-        private String mProgressStr = "";
-
-        public BubbleView(Context context, Paint paint) {
-            super(context);
-            setImageResource(R.drawable.v_slider_bubble);
-            mDrawable = DrawableCompat.wrap(getDrawable());
-            setImageDrawable(mDrawable);
-            mTextPaint = paint;
-        }
-
-        public void setColor(int color) {
-            DrawableCompat.setTint(mDrawable, color);
-        }
-
-        public void setProgress(int progress) {
-            String str = Integer.toString(progress);
-            if (!str.equals(mProgressStr)) {
-                mProgressStr = str;
-                mTextPaint.getTextBounds(str, 0, str.length(), mRect);
-                invalidate();
-            }
-        }
-
-        @Override
-        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-            super.onSizeChanged(w, h, oldw, oldh);
-            setPivotX(w / 2);
-            setPivotY(h);
-        }
-
-        @Override
-        protected void onDraw(@NonNull Canvas canvas) {
-            super.onDraw(canvas);
-
-            int width = getWidth();
-            int height = getHeight();
-            int x = width / 2;
-            int y = (int) ((height * TEXT_CENTER) + (mRect.height() / 2));
-            canvas.drawText(mProgressStr, x, y, mTextPaint);
-        }
-    }
-
-    private final class CheckForShowBubble implements Runnable {
-
-        @Override
-        public void run() {
-            setShowBubble(true);
-        }
-    }
-}

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

@@ -28,13 +28,14 @@
         android:layout_gravity="center_vertical"
         android:gravity="center_horizontal" />
 
-    <com.hippo.widget.Slider
+    <com.google.android.material.slider.Slider
         android:id="@+id/slider"
-        style="@style/Slider"
         android:layout_width="0dp"
         android:layout_height="48dp"
         android:layout_gravity="center_horizontal"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:stepSize="1"
+        android:valueFrom="1" />
 
     <TextView
         android:id="@+id/end"

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

@@ -94,62 +94,69 @@
                     android:focusable="true"
                     android:orientation="vertical">
 
-                    <TableLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="8dp">
 
-                        <TableRow>
+                        <TextView
+                            android:id="@+id/language"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="start"
+                            android:singleLine="true"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                            <TextView
-                                android:id="@+id/language"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="start"
-                                android:singleLine="true" />
+                        <TextView
+                            android:id="@+id/size"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:gravity="end"
+                            android:singleLine="true"
+                            app:layout_constraintBaseline_toBaselineOf="@id/language"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="1.0"
+                            app:layout_constraintStart_toEndOf="@id/language" />
 
-                            <TextView
-                                android:id="@+id/size"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="end"
-                                android:singleLine="true" />
 
-                        </TableRow>
+                        <TextView
+                            android:id="@+id/favoredTimes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:gravity="start"
+                            android:singleLine="true"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/language" />
 
-                        <TableRow android:paddingTop="8dp">
+                        <TextView
+                            android:id="@+id/pages"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
+                            android:gravity="end"
+                            android:singleLine="true"
+                            app:layout_constraintBaseline_toBaselineOf="@id/favoredTimes"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_bias="1.0"
+                            app:layout_constraintStart_toEndOf="@id/favoredTimes" />
 
-                            <TextView
-                                android:id="@+id/favoredTimes"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="start"
-                                android:singleLine="true" />
 
-                            <TextView
-                                android:id="@+id/pages"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="end"
-                                android:singleLine="true" />
+                        <TextView
+                            android:id="@+id/posted"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center"
+                            android:singleLine="true"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
 
-                        </TableRow>
 
-                        <TableRow android:paddingTop="8dp">
-
-                            <TextView
-                                android:id="@+id/posted"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="center"
-                                android:singleLine="true" />
-
-                        </TableRow>
-                    </TableLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </com.google.android.material.card.MaterialCardView>
 

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

@@ -51,12 +51,6 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
-    <style name="Slider">
-        <item name="thickness">2dp</item>
-        <item name="radius">6dp</item>
-        <item name="textSize">12sp</item>
-    </style>
-
     <style name="Indicating">
         <item name="indicatorHeight">1dp</item>
         <item name="indicatorColor">?attr/dividerColor</item>

native/src/main/java/com/hippo/UriArchiveAccessor.java

@@ -31,7 +31,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 
-public class UriArchiveAccessor implements Closeable {
+public class UriArchiveAccessor implements AutoCloseable {
     public static int OPEN_OK = 1;
     public static int OPEN_ERR = 2;
     private final OsReadableFile osf;
@@ -45,15 +45,18 @@ public class UriArchiveAccessor implements Closeable {
     }
 
     public void extractTargetIndexToOutputStream(int index, OutputStream os) {
-        extracttoOutputStream(osf, index, os);
+        extracttoOutputStream(index, os);
     }
 
     private native int openArchive(OsReadableFile osf);
 
-    private native int extracttoOutputStream(OsReadableFile osf, int index, OutputStream os);
+    private native void extracttoOutputStream(int index, OutputStream os);
+
+    private native void closeArchive();
 
     @Override
     public void close() throws IOException {
+        closeArchive();
         osf.close();
     }
 

native/src/main/jni/archive.c

@@ -34,17 +34,36 @@
 
 #define BLOCK_SIZE 4096 * 16
 
-typedef struct archive_inst_sc {
-    struct archive *archive;
-    JNIEnv *env;
-    jobject file;
-    jmethodID readID;
-    jmethodID seekID;
-    jmethodID skipID;
-    void *read_buffer;
-    void *output_buffer;
-    jbyteArray jbr;
-} archive_inst;
+static JNIEnv *env;
+static jobject file;
+static jmethodID readID;
+static jmethodID seekID;
+static jmethodID skipID;
+static jmethodID rewindID;
+static void* read_buffer;
+static jbyteArray jbr;
+
+static int cur_index = 0; // Current entry we haven't read any data from it yet
+static struct archive* arc;
+
+static void JNI_prepare_environment(JNIEnv* jniEnv, jobject OsReadablefile)
+{
+    env = jniEnv;
+    file = (*env)->NewGlobalRef(env, OsReadablefile);
+    readID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, OsReadablefile), "read", "([B)I");
+    seekID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, OsReadablefile), "seek", "(JI)J");
+    skipID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, OsReadablefile), "skip", "(J)J");
+    rewindID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, OsReadablefile), "rewind", "()V");
+    jbr = (*env)->NewGlobalRef(env, (*env)->NewByteArray(env, BLOCK_SIZE));
+    read_buffer = malloc(BLOCK_SIZE);
+}
+
+static void JNI_destroy_environment()
+{
+    (*env)->DeleteGlobalRef(env, file);
+    (*env)->DeleteGlobalRef(env, jbr);
+    free(read_buffer);
+}
 
 static int filename_is_playable_file(const char *name) {
     const char *dotptr = strrchr(name, '.');
@@ -63,124 +82,111 @@ static int filename_is_playable_file(const char *name) {
     return 0;
 }
 
-static long archive_list_all_entries(struct archive_inst_sc *inst) {
-    struct archive *a = inst->archive;
+static long archive_list_all_entries() {
     struct archive_entry *entry;
     long count = 0;
-    while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
+    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
         if (filename_is_playable_file(archive_entry_pathname(entry)))
             count++;
     }
     if (!count)
-        LOGE("%s", archive_error_string(inst->archive));
+        LOGE("%s", archive_error_string(arc));
     return count;
 }
 
 ssize_t ins_read(struct archive *a, void *client_data_ptr, const void **buff) {
-    archive_inst *arc = client_data_ptr;
-    int32_t r = (*arc->env)->CallIntMethod(arc->env, arc->file, arc->readID, arc->jbr);
-    (*arc->env)->GetByteArrayRegion(arc->env, arc->jbr, 0, r, arc->read_buffer);
-    *buff = arc->read_buffer;
+    int32_t r = (*env)->CallIntMethod(env, file, readID, jbr);
+    (*env)->GetByteArrayRegion(env, jbr, 0, r, read_buffer);
+    *buff = read_buffer;
     return r;
 }
 
 int ins_close(struct archive *a, void *client_data) {
-    archive_inst *arc = client_data;
-    JNIEnv *env = arc->env;
-    jmethodID rewind = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, arc->file), "rewind",
-                                           "()V");
-    (*arc->env)->CallVoidMethod(arc->env, arc->file, rewind);
+    (*env)->CallVoidMethod(env, file, rewindID);
     return ARCHIVE_OK;
 }
 
 la_int64_t ins_seek(struct archive *a, void *client_data, la_int64_t offset, int whence) {
-    archive_inst *arc = client_data;
-    jlong ret = (*arc->env)->CallLongMethod(arc->env, arc->file, arc->seekID, offset, whence);
+    jlong ret = (*env)->CallLongMethod(env, file, seekID, offset, whence);
     return ret;
 }
 
 la_int64_t ins_skip(struct archive *a, void *client_data, la_int64_t request) {
-    archive_inst *arc = client_data;
-    jlong ret = (*arc->env)->CallLongMethod(arc->env, arc->file, arc->skipID, request);
+    jlong ret = (*env)->CallLongMethod(env, file, skipID, request);
     return ret;
 }
 
-static archive_inst *archive_create_inst(JNIEnv *env, jobject file) {
-    archive_inst *inst = malloc(sizeof(archive_inst));
-    inst->archive = archive_read_new();
-    archive_read_set_seek_callback(inst->archive, ins_seek);
-    archive_read_set_skip_callback(inst->archive, ins_skip);
-    archive_read_support_format_all(inst->archive);
-    archive_read_support_filter_all(inst->archive);
-    inst->env = env;
-    inst->file = file;
-    inst->readID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, file), "read", "([B)I");
-    inst->seekID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, file), "seek", "(JI)J");
-    inst->skipID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, file), "skip", "(J)J");
-    inst->jbr = (*env)->NewByteArray(env, BLOCK_SIZE);
-    inst->read_buffer = malloc(BLOCK_SIZE);
-    inst->output_buffer = malloc(BLOCK_SIZE);
-    return inst;
-}
-
-static void archive_destroy_inst(archive_inst *inst) {
-    JNIEnv *env = inst->env;
-    archive_read_free(inst->archive);
-    (*env)->DeleteLocalRef(env, inst->jbr);
-    free(inst->read_buffer);
-    free(inst->output_buffer);
-    free(inst);
+static void archive_create() {
+    arc = archive_read_new();
+    archive_read_set_seek_callback(arc, ins_seek);
+    archive_read_set_skip_callback(arc, ins_skip);
+    archive_read_support_format_all(arc);
+    archive_read_support_filter_all(arc);
 }
 
 JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *env, jobject thiz, jobject osf) {
-    archive_inst *arc = archive_create_inst(env, osf);
-    long r = archive_read_open(arc->archive, arc, NULL, ins_read, ins_close);
+Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jobject osf) {
+    JNI_prepare_environment(_, osf);
+    archive_create();
+    long r = archive_read_open(arc, arc, NULL, ins_read, ins_close);
     if (r) {
         r = 0;
-        LOGE("%s%s", "Archive open failed:", archive_error_string(arc->archive));
+        LOGE("%s%s", "Archive open failed:", archive_error_string(arc));
     } else {
-        r = archive_list_all_entries(arc);
+        r = archive_list_all_entries();
         LOGI("%s%ld%s", "Found ", r, " image entries in archive");
     }
-    archive_read_close(arc->archive);
-    archive_destroy_inst(arc);
+    archive_read_close(arc);
+    archive_read_free(arc);
+    arc = NULL;
     return r;
 }
 
-JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *env, jobject thiz, jobject osf,
-                                                        jint index, jobject os) {
-    int count = 0;
+JNIEXPORT void JNICALL
+Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index, jobject os) {
     struct archive_entry *entry;
-    archive_inst *arc = archive_create_inst(env, osf);
-    la_ssize_t size;
+    size_t size;
+    int ret;
+    la_int64_t offset;
+    const void* buff;
+    if (!arc || index < cur_index) {
+        if (arc)
+            archive_read_close(arc);
+        archive_read_free(arc);
+        archive_create();
+        archive_read_open(arc, arc, NULL, ins_read, ins_close);
+        cur_index = 0;
+    }
     jmethodID writeID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, os), "write", "([B)V");
     jmethodID flushID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, os), "flush", "()V");
     jmethodID closeID = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, os), "close", "()V");
-    archive_read_open(arc->archive, arc, NULL, ins_read, ins_close);
-    while (archive_read_next_header(arc->archive, &entry) == ARCHIVE_OK) {
+    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
         if (!filename_is_playable_file(archive_entry_pathname(entry)))
             continue;
-        if (count++ == index) {
+        if (cur_index++ == index) {
             for (;;) {
-                size = archive_read_data(arc->archive, arc->output_buffer, BLOCK_SIZE);
-                if (size < 0) {
-                    LOGE("%s%s", "Archive read failed:", archive_error_string(arc->archive));
-                    goto free;
-                }
-                (*arc->env)->SetByteArrayRegion(env, arc->jbr, 0, size, arc->output_buffer);
-                (*arc->env)->CallVoidMethod(env, os, writeID, arc->jbr);
-                (*arc->env)->CallVoidMethod(env, os, flushID);
-                if (size < BLOCK_SIZE)
+                ret = archive_read_data_block(arc, &buff, &size, &offset);
+                if (ret == ARCHIVE_EOF)
                     break;
+                if (ret != ARCHIVE_OK) {
+                    LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
+                    break;
+                }
+                (*env)->SetByteArrayRegion(env, jbr, 0, (int)size, buff);
+                (*env)->CallVoidMethod(env, os, writeID, jbr);
             }
             break;
         }
     }
-    free:
-    (*arc->env)->CallVoidMethod(env, os, closeID);
-    archive_read_close(arc->archive);
-    archive_destroy_inst(arc);
-    return 0;
+    (*env)->CallVoidMethod(env, os, flushID);
+    (*env)->CallVoidMethod(env, os, closeID);
+}
+
+JNIEXPORT void JNICALL
+Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *jniEnv, jobject thiz) {
+    if (arc) {
+        archive_read_close(arc);
+        archive_read_free(arc);
+    }
+    JNI_destroy_environment();
 }