Release 1.7.28.3

2022-07-19 19:41:19 +08:00
45 changed files with 1409 additions and 1875 deletions
@@ -1,6 +1,6 @@
-name: CI
+name: EhViewer

-on: [push]
+on: [push, pull_request]

 jobs:
  linux:
@@ -32,7 +32,7 @@ jobs:
      - name: Update ARM64
        uses: actions/upload-artifact@v3
        with:
-          name: arm64-v8a-${{ github.sha }}
+          name: arm64-${{ github.sha }}
          path: app/build/outputs/apk/release/app-arm64-v8a-release.apk

      - name: Update x86_64
@@ -1,54 +0,0 @@
-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
@@ -36,7 +36,6 @@ 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
@@ -12,7 +12,4 @@
 	url = https://github.com/Ehviewer-Overhauled/libarchive
 [submodule "native/src/main/jni/liblzma"]
 	path = native/src/main/jni/liblzma
-	url = https://github.com/Ehviewer-Overhauled/xz
-[submodule "native/src/main/jni/nettle/nettle"]
-	path = native/src/main/jni/nettle/nettle
-	url = https://github.com/Ehviewer-Overhauled/nettle
+	url = https://git.tukaani.org/xz.git
@@ -4,8 +4,8 @@
 </h1>

 <p align="center">
-  <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 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>
  <a href="https://github.com/Ehviewer-Overhauled/Ehviewer/blob/master/LICENSE">
    <img src="https://img.shields.io/github/license/Ehviewer-Overhauled/Ehviewer" alt="LICENSE">
@@ -21,29 +21,30 @@
  </a>
 </p>

-# Description
-
-致力于轻量化与良好性能表现的 EhViewer 分支
+## Description
+这是一个 E-Hentai Android 平台的浏览器

 已针对性适配 Material Design 3 及其动态取色系统

+动态配色仅供 Android 12 及以上平台使用！

-EhViewer fork dedicated to lightweight and high-performance

-with Material Design 3 and Dynamic Color Support
+An E-Hentai Application for Android.

-# Download
+with Material Design 3 and Dynamic Color Support.
+
+Dynamic Color only support Android S and above!
+
+## Download

 [Github 下载](https://github.com/Ehviewer-Overhauled/Ehviewer/releases)

-[CI 版本下载（需登录）](https://github.com/Ehviewer-Overhauled/Ehviewer/actions/workflows/ci.yml)
-
-# Screenshot
+## Screenshot

 ![screenshot-01](art/screenshot-01.png)
 ![screenshot-02](art/screenshot-02.png)

-# Thanks
+## Thanks

 本项目受到了诸多开源项目的帮助

@@ -51,8 +52,6 @@ Here is the libraries

 - [AOSP](http://source.android.com/)
 - [android-advancedrecyclerview](https://github.com/h6ah4i/android-advancedrecyclerview)
- [material-components-android](https://github.com/material-components/material-components-android)
- [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)
@@ -67,7 +66,7 @@ Here is the libraries
 - [XZ Utils](https://tukaani.org/xz/)


-# License
+## License

    Copyright 2014-2019 Hippo Seven
    Copyright 2020-2022 NekoInverter
@@ -78,3 +77,5 @@ Here is the libraries
    EhViewer is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

    You should have received a copy of the GNU General Public License along with EhViewer. If not, see <https://www.gnu.org/licenses/>.
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fasuka-mio%2FEhviewer.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fasuka-mio%2FEhviewer?ref=badge_large)
@@ -34,8 +34,8 @@ android {
        applicationId "moe.tarsin.ehviewer"
        minSdkVersion 26
        targetSdkVersion 33
-        versionCode 114535
-        versionName "1.7.29.3"
+        versionCode 114530
+        versionName "1.7.28.3"
        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
    }

@@ -107,7 +107,7 @@ dependencies {
    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
    implementation "androidx.browser:browser:1.4.0"

-    def collection_version = "1.3.0-alpha02"
+    def collection_version = "1.3.0-alpha01"
    implementation "androidx.collection:collection:$collection_version"
    implementation "androidx.collection:collection-ktx:$collection_version"

@@ -122,7 +122,7 @@ dependencies {
    implementation "androidx.documentfile:documentfile:1.1.0-alpha01"
    implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"

-    def fragment_version = "1.5.1"
+    def fragment_version = "1.5.0"
    implementation "androidx.fragment:fragment:$fragment_version"
    implementation "androidx.fragment:fragment-ktx:$fragment_version"

@@ -148,6 +148,7 @@ dependencies {

    implementation 'com.drakeet.drawer:drawer:1.0.3'
    implementation 'com.google.android.material:material:1.7.0-alpha03'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
    implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
    implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1'
@@ -26,11 +26,10 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  
-    <!-- Required to maintain app compatibility. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="32" />
-  
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+
    <uses-feature
        android:glEsVersion="0x00020000"
        android:required="true" />
@@ -120,21 +119,35 @@
                <data android:mimeType="application/x-7z-compressed" />
                <data android:mimeType="application/x-rar-compressed" />
                <data android:mimeType="application/x-zip-compressed" />
-                <data android:mimeType="application/x-tar" />
-                <data android:mimeType="application/x-xz" />
-                <data android:mimeType="application/gzip" />
-                <data android:mimeType="application/x-cbz" />
-                <data android:mimeType="application/x-cbr" />
-                <data android:mimeType="application/x-cbt" />
-                <data android:mimeType="application/x-cb7" />
+            </intent-filter>

-                <!-- untested -->
-                <data android:mimeType="application/vnd.comicbook+zip" />
-                <data android:mimeType="application/vnd.comicbook-rar" />
-                <data android:mimeType="application/x-compressed-tar" />
-                <data android:mimeType="application/x-bzip-compressed-tar" />
-                <data android:mimeType="application/x-lzma-compressed-tar" />
-                <data android:mimeType="application/x-xz-compressed-tar" />
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:pathPattern=".*\\.7z" />
+                <data android:pathPattern=".*\\.rar" />
+                <data android:pathPattern=".*\\.zip" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="file" />
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+                <data android:pathPattern=".*\\.7z" />
+                <data android:pathPattern=".*\\.rar" />
+                <data android:pathPattern=".*\\.zip" />
            </intent-filter>
        </activity>

@@ -49,7 +49,7 @@ class EditTextDialogBuilder constructor(
        return mDialog as AlertDialog
    }

-    override fun onEditorAction(v: TextView?, p1: Int, event: KeyEvent?): Boolean {
+    override fun onEditorAction(v: TextView, actionId: Int, event: KeyEvent): Boolean {
        return if (mDialog != null) {
            val button = mDialog!!.getButton(DialogInterface.BUTTON_POSITIVE)
            button?.performClick()
@@ -41,7 +41,6 @@ import com.hippo.yorozuya.NumberUtils;

 import java.io.File;
 import java.util.Locale;
-import java.util.Set;

 public class Settings {

@@ -272,11 +271,6 @@ public class Settings {
    private static final int DEFAULT_DOWNLOAD_DELAY = 0;
    private static final String KEY_REQUEST_NEWS = "request_news";
    private static final boolean DEFAULT_REQUEST_NEWS = true;
-
-
-    private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
-
-
    private static Context sContext;
    private static SharedPreferences sSettingsPre;
    private static EhConfig sEhConfig;
@@ -390,21 +384,6 @@ public class Settings {
        sSettingsPre.edit().putString(key, value).apply();
    }

-    public static Set<String> getStringSet(String key) {
-        return sSettingsPre.getStringSet(key, null);
-    }
-
-    public static void putStringToStringSet(String key, String value) {
-        Set<String> set = getStringSet(key);
-        if (set == null)
-            set = Set.of(value);
-        else if (set.contains(value))
-            return;
-        else
-            set.add(value);
-        sSettingsPre.edit().putStringSet(key, set).apply();
-    }
-
    public static int getIntFromStr(String key, int defValue) {
        try {
            return NumberUtils.parseIntSafely(sSettingsPre.getString(key, Integer.toString(defValue)), defValue);
@@ -1160,12 +1139,4 @@ public class Settings {
    public static void putClipboardTextHashCode(int value) {
        putInt(KEY_CLIPBOARD_TEXT_HASH_CODE, value);
    }
-
-    public static Set<String> getArchivePasswds() {
-        return getStringSet(KEY_ARCHIVE_PASSWDS);
-    }
-
-    public static void putPasswdToArchivePasswds(String value) {
-        putStringToStringSet(KEY_ARCHIVE_PASSWDS, value);
-    }
 }
@@ -18,7 +18,6 @@ package com.hippo.ehviewer.gallery;

 import android.content.Context;
 import android.net.Uri;
-import android.os.Handler;
 import android.os.Process;

 import androidx.annotation.NonNull;
@@ -27,26 +26,22 @@ import androidx.annotation.Nullable;
 import com.hippo.UriArchiveAccessor;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
 import com.hippo.glgallery.GalleryPageView;
 import com.hippo.image.Image;
 import com.hippo.unifile.UniFile;
-import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;

+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.Stack;
 import java.util.concurrent.atomic.AtomicInteger;

 public class ArchiveGalleryProvider extends GalleryProvider2 {
+
    private static final AtomicInteger sIdGenerator = new AtomicInteger();
-    public static Handler showPasswd;
-    public static String passwd;
-    public static PVLock pv = new PVLock(0);
    private final UriArchiveAccessor archiveAccessor;
    private final Stack<Integer> requests = new Stack<>();
    private final AtomicInteger extractingIndex = new AtomicInteger(GalleryPageView.INVALID_INDEX);
@@ -61,7 +56,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
        UriArchiveAccessor archiveAccessor1;
        try {
            archiveAccessor1 = new UriArchiveAccessor(context, uri);
-        } catch (Exception e) {
+        } catch (FileNotFoundException e) {
            archiveAccessor1 = null;
            e.printStackTrace();
        }
@@ -95,11 +90,6 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
            decodeThread.interrupt();
            decodeThread = null;
        }
-        try {
-            archiveAccessor.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
    }

    @Override
@@ -169,27 +159,9 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
    }

    private class ArchiveTask implements Runnable {
-        private void waitPasswd() throws InterruptedException {
-            showPasswd.sendEmptyMessage(0);
-            pv.p();
-        }
-
-        private void notifyError() {
-            showPasswd.sendEmptyMessage(1);
-        }
-
-        private void notifyDismiss() {
-            showPasswd.sendEmptyMessage(2);
-        }
-
        @Override
        public void run() {
-            try {
-                size = archiveAccessor.open();
-            } catch (Exception e) {
-                e.printStackTrace();
-                size = 0;
-            }
+            size = archiveAccessor.open();
            if (size <= 0) {
                size = STATE_ERROR;
                error = GetText.getString(R.string.error_reading_failed);
@@ -199,34 +171,6 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
            // Update size and notify changed
            notifyDataChanged();

-            if (archiveAccessor.needPassword()) {
-                boolean need_request = true;
-                Set<String> set = Settings.getArchivePasswds();
-                if (set != null) {
-                    for (String passwd : set) {
-                        if (archiveAccessor.providePassword(passwd)) {
-                            need_request = false;
-                            break;
-                        }
-                    }
-                }
-                while (!Thread.currentThread().isInterrupted() && need_request) {
-                    try {
-                        waitPasswd();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                        return;
-                    }
-                    if (!archiveAccessor.providePassword(passwd))
-                        notifyError();
-                    else {
-                        Settings.putPasswdToArchivePasswds(passwd);
-                        notifyDismiss();
-                        break;
-                    }
-                }
-            }
-
            while (!Thread.currentThread().isInterrupted()) {
                int index;
                synchronized (requests) {
@@ -250,7 +194,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                    continue;
                }

-                Pipe pipe = new Pipe();
+                Pipe pipe = new Pipe(4096 * 16);

                synchronized (streams) {
                    if (streams.get(index) != null) {
@@ -260,8 +204,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                    streams.notify();
                }

-                archiveAccessor.extracttoOutputStream(index, pipe.getOutputFd());
-                pipe.closeOutputFd();
+                archiveAccessor.extractTargetIndexToOutputStream(index, pipe.getOutputStream());
            }
        }
    }
@@ -16,37 +16,141 @@

 package com.hippo.ehviewer.gallery;

-import android.os.ParcelFileDescriptor;
+import androidx.annotation.NonNull;

-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;

 class Pipe {
-    private ParcelFileDescriptor[] fd;
-    {
-        try {
-            fd = ParcelFileDescriptor.createPipe();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }

-    private final InputStream inputStream = new FileInputStream(fd[0].getFileDescriptor());
+    private final int capacity;
+    private final byte[] buffer;
+
+    private int head = 0;
+    private int tail = 0;
+    private boolean full = false;
+
+    private boolean inClosed = false;
+    private boolean outClosed = false;
+
+    private final InputStream inputStream = new InputStream() {
+        @Override
+        public int read() throws IOException {
+            synchronized (Pipe.this) {
+                byte[] bytes = new byte[1];
+                if (read(bytes, 0, 1) != -1) {
+                    return bytes[0];
+                } else {
+                    return -1;
+                }
+            }
+        }
+
+        @Override
+        public int read(@NonNull byte[] b, int off, int len) throws IOException {
+            synchronized (Pipe.this) {
+                for (; ; ) {
+                    if (inClosed) {
+                        throw new IOException("The InputStream is closed");
+                    }
+                    if (len == 0) {
+                        return 0;
+                    }
+
+                    if (head == tail && !full) {
+                        if (outClosed) {
+                            // No bytes available and the OutputStream is closed. So it's the end.
+                            return -1;
+                        } else {
+                            // Wait for OutputStream write bytes
+                            try {
+                                Pipe.this.wait();
+                            } catch (InterruptedException e) {
+                                throw new IOException("The thread interrupted", e);
+                            }
+                        }
+                    } else {
+                        int read = Math.min(len, (head < tail ? tail : capacity) - head);
+                        System.arraycopy(buffer, head, b, off, read);
+                        head += read;
+                        if (head == capacity) {
+                            head = 0;
+                        }
+                        full = false;
+                        Pipe.this.notifyAll();
+                        return read;
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            synchronized (Pipe.this) {
+                inClosed = true;
+                Pipe.this.notifyAll();
+            }
+        }
+    };
+
+    private final OutputStream outputStream = new OutputStream() {
+        @Override
+        public void write(int b) throws IOException {
+            synchronized (Pipe.this) {
+                byte[] bytes = new byte[]{(byte) b};
+                write(bytes, 0, 1);
+            }
+        }
+
+        @Override
+        public void write(@NonNull byte[] b, int off, int len) throws IOException {
+            synchronized (Pipe.this) {
+                while (len != 0) {
+                    if (head == tail && full) {
+                        // The buffer is full, wait for InputStream read bytes
+                        try {
+                            Pipe.this.wait();
+                        } catch (InterruptedException e) {
+                            throw new IOException("The thread interrupted", e);
+                        }
+                    } else {
+                        int write = Math.min(len, (head <= tail ? capacity : head) - tail);
+                        System.arraycopy(b, off, buffer, tail, write);
+                        off += write;
+                        len -= write;
+                        tail += write;
+                        if (tail == capacity) {
+                            tail = 0;
+                        }
+                        if (head == tail) {
+                            full = true;
+                        }
+                        Pipe.this.notifyAll();
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            synchronized (Pipe.this) {
+                outClosed = true;
+                Pipe.this.notifyAll();
+            }
+        }
+    };
+
+    Pipe(int capacity) {
+        this.capacity = capacity;
+        this.buffer = new byte[capacity];
+    }

    InputStream getInputStream() {
        return inputStream;
    }

-    int getOutputFd() {
-        return fd[1].getFd();
-    }
-
-    void closeOutputFd() {
-        try {
-            fd[1].close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    OutputStream getOutputStream() {
+        return outputStream;
    }
 }
@@ -41,28 +41,6 @@ class VersionPreference @JvmOverloads constructor(
    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
        super.onPrepareDialogBuilder(builder)
        builder.setTitle(R.string.show_library_version)
-        val info = NativeLibInfo().addLib(Native.getlibarchiveVersion())
-            .addLib("lzma(xz-utils)", Native.getliblzmaVersion())
-            .addLib("zlib", Native.getzlibVersion())
-            .addLib("libjpeg-turbo", Native.getlibjpeg_turboVersion())
-            .addLib(Native.getnettleVersion())
-        builder.setMessage(info.getMessage())
-    }
-
-    inner class NativeLibInfo {
-        private var message: String = ""
-        fun addLib(libname:String, libversion:String): NativeLibInfo {
-            message = "$message$libname $libversion\n"
-            return this
-        }
-
-        fun getMessage(): String {
-            return message;
-        }
-
-        fun addLib(msg: String): NativeLibInfo {
-            message = "$message$msg\n"
-            return this
-        }
+        builder.setMessage(Native.getlibarchiveVersion() + "\nlzma(xz-utils) " + Native.getliblzmaVersion() + "\nzlib " + Native.getzlibVersion() + "\nlibjpeg-turbo " + Native.getlibjpeg_turboVersion())
    }
 }
@@ -37,8 +37,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -69,7 +67,6 @@ import androidx.core.view.WindowInsetsControllerCompat;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.materialswitch.MaterialSwitch;
-import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.BuildConfig;
 import com.hippo.ehviewer.R;
@@ -106,7 +103,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.ref.WeakReference;

 import rikka.core.res.ConfigurationKt;
 import rikka.core.res.ResourcesKt;
@@ -318,19 +314,10 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
            onRestore(savedInstanceState);
        }

-        builder = new EditTextDialogBuilder(this, null, getString(R.string.archive_passwd));
-        builder.setTitle(getString(R.string.archive_need_passwd));
-        builder.setPositiveButton(getString(android.R.string.ok), null);
-        dialog = builder.create();
-        dialog.setCanceledOnTouchOutside(false);
-
        if (mGalleryProvider == null) {
            finish();
            return;
        }
-
-        ArchiveGalleryProvider.showPasswd = new ShowPasswdDialogHandler(this);
-
        mGalleryProvider.start();

        // Get start page
@@ -1306,69 +1293,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
        }
    }

-    private EditTextDialogBuilder builder;

-    private boolean dialogShown = false;

-    private AlertDialog dialog;

-    private void showPasswdDialog() {
-        if (!dialogShown) {
-            dialogShown = true;
-            dialog.show();
-            if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) != null) {
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-                    GalleryActivity.this.onProvidePasswd();
-                });
-            }
-            dialog.setOnCancelListener(v -> finish());
-        }
-    }
-
-    private void onProvidePasswd() {
-        String passwd = builder.getText();
-        if (passwd.isEmpty())
-            builder.setError(getString(R.string.passwd_cannot_be_empty));
-        else {
-            ArchiveGalleryProvider.passwd = passwd;
-            ArchiveGalleryProvider.pv.v();
-        }
-    }
-
-    private void onPasswdWrong() {
-        builder.setError(getString(R.string.passwd_wrong));
-    }
-
-    private void onPasswdCorrect() {
-        dialog.dismiss();
-    }
-
-    private static class ShowPasswdDialogHandler extends Handler {
-
-        //弱引用持有HandlerActivity , GC 回收时会被回收掉
-        private final WeakReference<GalleryActivity> weakReference;
-
-        public ShowPasswdDialogHandler(GalleryActivity activity) {
-            this.weakReference = new WeakReference(activity);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            GalleryActivity activity = weakReference.get();
-            super.handleMessage(msg);
-            if (null != activity) {
-                switch (msg.what) {
-                    case 0:
-                        activity.showPasswdDialog();
-                        break;
-                    case 1:
-                        activity.onPasswdWrong();
-                        break;
-                    case 2:
-                        activity.onPasswdCorrect();
-                        break;
-                }
-            }
-        }
-    }
 }
@@ -55,6 +55,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;

+import com.getkeepsafe.taptargetview.TapTarget;
+import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
@@ -388,9 +390,90 @@ public class DownloadsScene extends ToolbarScene

        updateView();

+        guide();
+
        return view;
    }

+    private void guide() {
+        if (Settings.getGuideDownloadThumb() && null != mRecyclerView) {
+            mRecyclerView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    if (Settings.getGuideDownloadThumb()) {
+                        guideDownloadThumb();
+                    }
+                    if (null != mRecyclerView) {
+                        ViewUtils.removeOnGlobalLayoutListener(mRecyclerView.getViewTreeObserver(), this);
+                    }
+                }
+            });
+        } else {
+            guideDownloadLabels();
+        }
+    }
+
+    private void guideDownloadThumb() {
+        MainActivity activity = getMainActivity();
+        if (null == activity || !Settings.getGuideDownloadThumb() || null == mLayoutManager || null == mRecyclerView) {
+            guideDownloadLabels();
+            return;
+        }
+        int position = mLayoutManager.findFirstCompletelyVisibleItemPositions(null)[0];
+        if (position < 0) {
+            guideDownloadLabels();
+            return;
+        }
+        RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(position);
+        if (null == holder) {
+            guideDownloadLabels();
+            return;
+        }
+
+        TapTargetView.showFor(requireActivity(),
+                TapTarget.forView(((DownloadHolder) holder).thumb,
+                                getString(R.string.guide_download_thumb_title),
+                                getString(R.string.guide_download_thumb_text))
+                        .transparentTarget(true),
+                new TapTargetView.Listener() {
+                    @Override
+                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
+                        super.onTargetDismissed(view, userInitiated);
+                        Settings.putGuideDownloadThumb(false);
+                        guideDownloadLabels();
+                    }
+                });
+    }
+
+    private void guideDownloadLabels() {
+        MainActivity activity = getMainActivity();
+        if (null == activity || !Settings.getGuideDownloadLabels()) {
+            return;
+        }
+
+        Display display = activity.getWindowManager().getDefaultDisplay();
+        Point point = new Point();
+        display.getSize(point);
+        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
+                point.x - LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
+
+        TapTargetView.showFor(requireActivity(),
+                TapTarget.forBounds(bounds,
+                                getString(R.string.guide_download_labels_title),
+                                getString(R.string.guide_download_labels_text))
+                        .transparentTarget(true),
+                new TapTargetView.Listener() {
+                    @Override
+                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
+                        super.onTargetClick(view);
+                        Settings.puttGuideDownloadLabels(false);
+                        openDrawer(Gravity.RIGHT);
+                    }
+                });
+    }
+
    @Override
    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
@@ -45,6 +45,8 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

+import com.getkeepsafe.taptargetview.TapTarget;
+import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.hippo.annotation.Implemented;
@@ -309,9 +311,40 @@ public class FavoritesScene extends BaseScene implements
            mHelper.firstRefresh();
        }

+        guideCollections();
+
        return view;
    }

+    private void guideCollections() {
+        Activity activity = getMainActivity();
+        if (null == activity || !Settings.getGuideCollections()) {
+            return;
+        }
+
+        Display display = activity.getWindowManager().getDefaultDisplay();
+        Point point = new Point();
+        display.getSize(point);
+        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
+                point.x - LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
+
+        TapTargetView.showFor(requireActivity(),
+                TapTarget.forBounds(bounds,
+                                getString(R.string.guide_collections_title),
+                                getString(R.string.guide_collections_text))
+                        .transparentTarget(true),
+                new TapTargetView.Listener() {
+                    @Override
+                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
+                        super.onTargetClick(view);
+                        Settings.putGuideCollections(false);
+                        openDrawer(Gravity.RIGHT);
+                    }
+                });
+    }
+
    // keyword of mUrlBuilder, fav cat of mUrlBuilder, mFavCatArray.
    // They changed, call it
    private void updateSearchBar() {
@@ -59,6 +59,8 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

+import com.getkeepsafe.taptargetview.TapTarget;
+import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
@@ -632,9 +634,40 @@ public final class GalleryListScene extends BaseScene
            mHelper.firstRefresh();
        }

+        guideQuickSearch();
+
        return view;
    }

+    private void guideQuickSearch() {
+        Activity activity = getMainActivity();
+        if (null == activity || !Settings.getGuideQuickSearch()) {
+            return;
+        }
+
+        Display display = activity.getWindowManager().getDefaultDisplay();
+        Point point = new Point();
+        display.getSize(point);
+        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
+                point.x - LayoutUtils.dp2pix(requireContext(), 20),
+                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
+
+        TapTargetView.showFor(requireActivity(),
+                TapTarget.forBounds(bounds,
+                                getString(R.string.guide_quick_search_title),
+                                getString(R.string.guide_quick_search_text))
+                        .transparentTarget(true),
+                new TapTargetView.Listener() {
+                    @Override
+                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
+                        super.onTargetClick(view);
+                        Settings.putGuideQuickSearch(false);
+                        openDrawer(Gravity.RIGHT);
+                    }
+                });
+    }
+
    @Override
    public void onDestroyView() {
        super.onDestroyView();
@@ -36,7 +36,6 @@ 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;
@@ -54,6 +53,7 @@ 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 > 1 && mHelper.canGoTo()) {
+            if (pages > 0 && 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.setValueTo(mPages);
-            mSlider.setValue(mCurrentPage + 1);
+            mSlider.setRange(1, mPages);
+            mSlider.setProgress(mCurrentPage + 1);

            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(this);
            dialog.setOnDismissListener(this);
@@ -431,7 +431,7 @@ public class GalleryPreviewsScene extends ToolbarScene {
                return;
            }

-            int page = (int) (mSlider.getValue() - 1);
+            int page = mSlider.getProgress() - 1;
            if (page >= 0 && page < mPages && mHelper != null) {
                mHelper.goTo(page);
                if (mDialog != null) {
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 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.ehviewer.widget;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+
+import com.hippo.ehviewer.R;
+import com.hippo.yorozuya.NumberUtils;
+
+public class AdvanceSearchTable extends LinearLayout {
+
+    public static final int SNAME = 0x1;
+    public static final int STAGS = 0x2;
+    public static final int SDESC = 0x4;
+    public static final int STORR = 0x8;
+    public static final int STO = 0x10;
+    public static final int SDT1 = 0x20;
+    public static final int SDT2 = 0x40;
+    public static final int SH = 0x80;
+    public static final int SFL = 0x100;
+    public static final int SFU = 0x200;
+    public static final int SFT = 0x400;
+    private static final String STATE_KEY_SUPER = "super";
+    private static final String STATE_KEY_ADVANCE_SEARCH = "advance_search";
+    private static final String STATE_KEY_MIN_RATING = "min_rating";
+    private static final String STATE_KEY_PAGE_FROM = "page_from";
+    private static final String STATE_KEY_PAGE_TO = "page_to";
+    private CheckBox mSname;
+    private CheckBox mStags;
+    private CheckBox mSdesc;
+    private CheckBox mStorr;
+    private CheckBox mSto;
+    private CheckBox mSdt1;
+    private CheckBox mSdt2;
+    private CheckBox mSh;
+    private CheckBox mSr;
+    private Spinner mMinRating;
+    private CheckBox mSp;
+    private EditText mSpf;
+    private EditText mSpt;
+    private CheckBox mSfl;
+    private CheckBox mSfu;
+    private CheckBox mSft;
+
+    public AdvanceSearchTable(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public AdvanceSearchTable(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public void init(Context context) {
+        setOrientation(LinearLayout.VERTICAL);
+
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        inflater.inflate(R.layout.widget_advance_search_table, this);
+
+        ViewGroup row0 = (ViewGroup) getChildAt(0);
+        mSname = (CheckBox) row0.getChildAt(0);
+        mStags = (CheckBox) row0.getChildAt(1);
+
+        ViewGroup row1 = (ViewGroup) getChildAt(1);
+        mSdesc = (CheckBox) row1.getChildAt(0);
+        mStorr = (CheckBox) row1.getChildAt(1);
+
+        ViewGroup row2 = (ViewGroup) getChildAt(2);
+        mSto = (CheckBox) row2.getChildAt(0);
+        mSdt1 = (CheckBox) row2.getChildAt(1);
+
+        ViewGroup row3 = (ViewGroup) getChildAt(3);
+        mSdt2 = (CheckBox) row3.getChildAt(0);
+        mSh = (CheckBox) row3.getChildAt(1);
+
+        ViewGroup row4 = (ViewGroup) getChildAt(4);
+        mSr = (CheckBox) row4.getChildAt(0);
+        mMinRating = (Spinner) row4.getChildAt(1);
+
+        ViewGroup row5 = (ViewGroup) getChildAt(5);
+        mSp = (CheckBox) row5.getChildAt(0);
+        mSpf = (EditText) row5.getChildAt(1);
+        mSpt = (EditText) row5.getChildAt(3);
+
+        ViewGroup row7 = (ViewGroup) getChildAt(7);
+        mSfl = (CheckBox) row7.getChildAt(0);
+        mSfu = (CheckBox) row7.getChildAt(1);
+        mSft = (CheckBox) row7.getChildAt(2);
+
+        // Avoid java.lang.IllegalStateException: focus search returned a view that wasn't able to take focus!
+        mSpt.setOnEditorActionListener((v, actionId, event) -> {
+            View nextView = v.focusSearch(View.FOCUS_DOWN);
+            if (nextView != null) {
+                nextView.requestFocus(View.FOCUS_DOWN);
+            }
+            return true;
+        });
+    }
+
+    public int getAdvanceSearch() {
+        int advanceSearch = 0;
+        if (mSname.isChecked()) advanceSearch |= SNAME;
+        if (mStags.isChecked()) advanceSearch |= STAGS;
+        if (mSdesc.isChecked()) advanceSearch |= SDESC;
+        if (mStorr.isChecked()) advanceSearch |= STORR;
+        if (mSto.isChecked()) advanceSearch |= STO;
+        if (mSdt1.isChecked()) advanceSearch |= SDT1;
+        if (mSdt2.isChecked()) advanceSearch |= SDT2;
+        if (mSh.isChecked()) advanceSearch |= SH;
+        if (mSfl.isChecked()) advanceSearch |= SFL;
+        if (mSfu.isChecked()) advanceSearch |= SFU;
+        if (mSft.isChecked()) advanceSearch |= SFT;
+        return advanceSearch;
+    }
+
+    public void setAdvanceSearch(int advanceSearch) {
+        mSname.setChecked(NumberUtils.int2boolean(advanceSearch & SNAME));
+        mStags.setChecked(NumberUtils.int2boolean(advanceSearch & STAGS));
+        mSdesc.setChecked(NumberUtils.int2boolean(advanceSearch & SDESC));
+        mStorr.setChecked(NumberUtils.int2boolean(advanceSearch & STORR));
+        mSto.setChecked(NumberUtils.int2boolean(advanceSearch & STO));
+        mSdt1.setChecked(NumberUtils.int2boolean(advanceSearch & SDT1));
+        mSdt2.setChecked(NumberUtils.int2boolean(advanceSearch & SDT2));
+        mSh.setChecked(NumberUtils.int2boolean(advanceSearch & SH));
+        mSfl.setChecked(NumberUtils.int2boolean(advanceSearch & SFL));
+        mSfu.setChecked(NumberUtils.int2boolean(advanceSearch & SFU));
+        mSft.setChecked(NumberUtils.int2boolean(advanceSearch & SFT));
+    }
+
+    public int getMinRating() {
+        int position = mMinRating.getSelectedItemPosition();
+        if (mSr.isChecked() && position >= 0) {
+            return position + 2;
+        } else {
+            return -1;
+        }
+    }
+
+    public void setMinRating(int minRating) {
+        if (minRating >= 2 && minRating <= 5) {
+            mSr.setChecked(true);
+            mMinRating.setSelection(minRating - 2);
+        } else {
+            mSr.setChecked(false);
+        }
+    }
+
+    public int getPageFrom() {
+        if (mSp.isChecked()) {
+            return NumberUtils.parseIntSafely(mSpf.getText().toString(), -1);
+        }
+        return -1;
+    }
+
+    public void setPageFrom(int pageFrom) {
+        if (pageFrom > 0) {
+            mSpf.setText(Integer.toString(pageFrom));
+            mSp.setChecked(true);
+        } else {
+            mSp.setChecked(false);
+            mSpf.setText(null);
+        }
+    }
+
+    public int getPageTo() {
+        if (mSp.isChecked()) {
+            return NumberUtils.parseIntSafely(mSpt.getText().toString(), -1);
+        }
+        return -1;
+    }
+
+    public void setPageTo(int pageTo) {
+        if (pageTo > 0) {
+            mSpt.setText(Integer.toString(pageTo));
+            mSp.setChecked(true);
+        } else {
+            mSp.setChecked(false);
+            mSpt.setText(null);
+        }
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        final Bundle state = new Bundle();
+        state.putParcelable(STATE_KEY_SUPER, super.onSaveInstanceState());
+        state.putInt(STATE_KEY_ADVANCE_SEARCH, getAdvanceSearch());
+        state.putInt(STATE_KEY_MIN_RATING, getMinRating());
+        state.putInt(STATE_KEY_PAGE_FROM, getPageFrom());
+        state.putInt(STATE_KEY_PAGE_TO, getPageTo());
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof Bundle) {
+            final Bundle savedState = (Bundle) state;
+            super.onRestoreInstanceState(savedState.getParcelable(STATE_KEY_SUPER));
+            setAdvanceSearch(savedState.getInt(STATE_KEY_ADVANCE_SEARCH));
+            setMinRating(savedState.getInt(STATE_KEY_MIN_RATING));
+            setPageFrom(savedState.getInt(STATE_KEY_PAGE_FROM));
+            setPageTo(savedState.getInt(STATE_KEY_PAGE_TO));
+        }
+    }
+}
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 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.ehviewer.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.*
-import com.google.android.material.textfield.TextInputLayout
-import com.hippo.ehviewer.R
-import com.hippo.yorozuya.NumberUtils
-
-class AdvanceSearchTable @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-    private var mSname: CheckBox
-    private var mStags: CheckBox
-    private var mSdesc: CheckBox
-    private var mStorr: CheckBox
-    private var mSto: CheckBox
-    private var mSdt1: CheckBox
-    private var mSdt2: CheckBox
-    private var mSh: CheckBox
-    private var mSr: CheckBox
-    private var mMinRating: TextInputLayout
-    private var mSp: CheckBox
-    private var mSpf: EditText
-    private var mSpt: EditText
-    private var mSfl: CheckBox
-    private var mSfu: CheckBox
-    private var mSft: CheckBox
-    private val mArray: Array<String> = context.resources.getStringArray(R.array.search_min_rating)
-
-    init {
-        orientation = VERTICAL
-        val inflater = LayoutInflater.from(context)
-        inflater.inflate(R.layout.widget_advance_search_table, this)
-        val row0 = getChildAt(0) as ViewGroup
-        mSname = row0.getChildAt(0) as CheckBox
-        mStags = row0.getChildAt(1) as CheckBox
-        val row1 = getChildAt(1) as ViewGroup
-        mSdesc = row1.getChildAt(0) as CheckBox
-        mStorr = row1.getChildAt(1) as CheckBox
-        val row2 = getChildAt(2) as ViewGroup
-        mSto = row2.getChildAt(0) as CheckBox
-        mSdt1 = row2.getChildAt(1) as CheckBox
-        val row3 = getChildAt(3) as ViewGroup
-        mSdt2 = row3.getChildAt(0) as CheckBox
-        mSh = row3.getChildAt(1) as CheckBox
-        val row4 = getChildAt(4) as ViewGroup
-        mSr = row4.getChildAt(0) as CheckBox
-        mMinRating = row4.getChildAt(1) as TextInputLayout
-        val row5 = getChildAt(5) as ViewGroup
-        mSp = row5.getChildAt(0) as CheckBox
-        mSpf = row5.getChildAt(1) as EditText
-        mSpt = row5.getChildAt(3) as EditText
-        val row7 = getChildAt(7) as ViewGroup
-        mSfl = row7.getChildAt(0) as CheckBox
-        mSfu = row7.getChildAt(1) as CheckBox
-        mSft = row7.getChildAt(2) as CheckBox
-
-        mSpt.setOnEditorActionListener { v: TextView, _: Int, _: KeyEvent? ->
-            val nextView = v.focusSearch(
-                FOCUS_DOWN
-            )
-            nextView?.requestFocus(FOCUS_DOWN)
-            true
-        }
-
-        mMinRating.isEnabled = mSr.isChecked
-        mSr.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
-            mMinRating.isEnabled = isChecked
-        }
-
-        mSpt.isEnabled = mSp.isChecked
-        mSpf.isEnabled = mSp.isChecked
-        mSp.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
-            mSpt.isEnabled = isChecked
-            mSpf.isEnabled = isChecked
-        }
-    }
-
-    var advanceSearch: Int
-        get() {
-            var advanceSearch = 0
-            if (mSname.isChecked) advanceSearch = advanceSearch or SNAME
-            if (mStags.isChecked) advanceSearch = advanceSearch or STAGS
-            if (mSdesc.isChecked) advanceSearch = advanceSearch or SDESC
-            if (mStorr.isChecked) advanceSearch = advanceSearch or STORR
-            if (mSto.isChecked) advanceSearch = advanceSearch or STO
-            if (mSdt1.isChecked) advanceSearch = advanceSearch or SDT1
-            if (mSdt2.isChecked) advanceSearch = advanceSearch or SDT2
-            if (mSh.isChecked) advanceSearch = advanceSearch or SH
-            if (mSfl.isChecked) advanceSearch = advanceSearch or SFL
-            if (mSfu.isChecked) advanceSearch = advanceSearch or SFU
-            if (mSft.isChecked) advanceSearch = advanceSearch or SFT
-            return advanceSearch
-        }
-        set(advanceSearch) {
-            mSname.isChecked =
-                NumberUtils.int2boolean(advanceSearch and SNAME)
-            mStags.isChecked =
-                NumberUtils.int2boolean(advanceSearch and STAGS)
-            mSdesc.isChecked =
-                NumberUtils.int2boolean(advanceSearch and SDESC)
-            mStorr.isChecked = NumberUtils.int2boolean(advanceSearch and STORR)
-            mSto.isChecked = NumberUtils.int2boolean(advanceSearch and STO)
-            mSdt1.isChecked = NumberUtils.int2boolean(advanceSearch and SDT1)
-            mSdt2.isChecked = NumberUtils.int2boolean(advanceSearch and SDT2)
-            mSh.isChecked = NumberUtils.int2boolean(advanceSearch and SH)
-            mSfl.isChecked = NumberUtils.int2boolean(advanceSearch and SFL)
-            mSfu.isChecked = NumberUtils.int2boolean(advanceSearch and SFU)
-            mSft.isChecked = NumberUtils.int2boolean(advanceSearch and SFT)
-        }
-    var minRating: Int
-        get() {
-            val position = mArray.indexOf(mMinRating.editText!!.text.toString())
-            return if (mSr.isChecked && position >= 0) {
-                position + 2
-            } else {
-                -1
-            }
-        }
-        set(minRating) {
-            if (minRating in 2..5) {
-                mSr.isChecked = true
-                (mMinRating.editText!! as AutoCompleteTextView).setText(
-                    mArray[minRating - 2],
-                    false
-                )
-            } else {
-                mSr.isChecked = false
-            }
-        }
-    var pageFrom: Int
-        get() = if (mSp.isChecked) {
-            NumberUtils.parseIntSafely(mSpf.text.toString(), -1)
-        } else -1
-        set(pageFrom) {
-            if (pageFrom > 0) {
-                mSpf.setText(pageFrom.toString())
-                mSp.isChecked = true
-            } else {
-                mSp.isChecked = false
-                mSpf.text = null
-            }
-        }
-    var pageTo: Int
-        get() = if (mSp.isChecked) {
-            NumberUtils.parseIntSafely(mSpt.text.toString(), -1)
-        } else -1
-        set(pageTo) {
-            if (pageTo > 0) {
-                mSpt.setText(pageTo.toString())
-                mSp.isChecked = true
-            } else {
-                mSp.isChecked = false
-            }
-        }
-
-    companion object {
-        const val SNAME = 0x1
-        const val STAGS = 0x2
-        const val SDESC = 0x4
-        const val STORR = 0x8
-        const val STO = 0x10
-        const val SDT1 = 0x20
-        const val SDT2 = 0x40
-        const val SH = 0x80
-        const val SFL = 0x100
-        const val SFU = 0x200
-        const val SFT = 0x400
-    }
-}
@@ -0,0 +1,515 @@
+/*
+ * 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);
+        }
+    }
+}
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 hathlife
-  ~
-  ~ This file is part of EhViewer
-  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actions"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="@dimen/keyline_margin">
-
-    <TextView
-        android:id="@+id/newerVersion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?selectableItemBackground"
-        android:gravity="center"
-        android:padding="8dp"
-        android:text="@string/newer_version_avaliable"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/keyline_margin"
-        android:paddingRight="@dimen/keyline_margin">
-
-
-        <LinearLayout
-            android:id="@+id/rate"
-            android:layout_width="484dp"
-            android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-
-            <androidx.appcompat.widget.AppCompatRatingBar
-                android:id="@+id/rating"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="0dp"
-                android:layout_marginTop="0dp"
-
-                android:isIndicator="true"
-                android:theme="@style/RatingBarTheme" />
-
-            <TextView
-                android:id="@+id/rating_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="0dp"
-                android:textColor="?android:attr/textColorPrimary" />
-
-        </LinearLayout>
-
-        <HorizontalScrollView
-            android:id="@+id/actions_scroll_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:clipToPadding="false"
-            android:paddingLeft="36dp"
-            android:paddingRight="@dimen/keyline_margin"
-            android:scrollbars="none">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:divider="@drawable/spacer_keyline"
-                android:orientation="horizontal"
-                android:showDividers="middle">
-
-                <FrameLayout
-                    android:id="@+id/heart_group"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:nextFocusUp="@+id/download">
-
-                    <TextView
-                        android:id="@+id/heart"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="4dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/favorited"
-                        android:textColor="?android:attr/textColorPrimary" />
-
-                    <TextView
-                        android:id="@+id/heart_outline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="4dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/not_favorited"
-                        android:textColor="?android:attr/textColorPrimary" />
-
-                </FrameLayout>
-
-                <TextView
-                    android:id="@+id/share"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/share"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/torrent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/archive"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/archive"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/similar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/similar_gallery"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <TextView
-                    android:id="@+id/search_cover"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:drawablePadding="4dp"
-                    android:focusable="true"
-                    android:gravity="center_horizontal"
-                    android:nextFocusRight="@+id/search_cover"
-                    android:nextFocusUp="@+id/download"
-                    android:text="@string/search_cover"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-            </LinearLayout>
-        </HorizontalScrollView>
-    </LinearLayout>
-
-</LinearLayout>
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 hathlife
-  ~
-  ~ This file is part of EhViewer
-  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
-  ~
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <View
-            android:id="@+id/color_bg"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:elevation="4dp"
-            app:fitsSystemWindowsInsets="top" />
-
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="28dp" />
-
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/TextAppearance.Material3.HeadlineSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/keyline_margin"
-            android:layout_marginRight="@dimen/keyline_margin"
-            android:ellipsize="end"
-            android:maxLines="5" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.card.MaterialCardView
-                style="@style/Widget.Material3.CardView.Elevated"
-                android:layout_width="540dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/keyline_margin"
-                android:layout_marginTop="@dimen/keyline_margin"
-                android:layout_marginRight="@dimen/keyline_margin"
-                android:layout_marginBottom="@dimen/keyline_margin"
-                app:fitsSystemWindowsInsets="top">
-
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/header_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/thumb_card"
-                        style="@style/Widget.Material3.CardView.Filled"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <com.hippo.widget.LoadImageView
-                            android:id="@+id/thumb"
-                            android:layout_width="256dp"
-                            android:layout_height="@dimen/gallery_detail_thumb_height" />
-
-                    </com.google.android.material.card.MaterialCardView>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/info"
-                        style="@style/Widget.Material3.CardView.Filled"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:nextFocusRight="@+id/read"
-                        android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:padding="8dp">
-
-
-                            <TextView
-                                android:id="@+id/language"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/size"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:gravity="right"
-                                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/favoredTimes"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/language" />
-
-                            <TextView
-                                android:id="@+id/pages"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
-                                android:gravity="right"
-                                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/posted"
-                                style="@style/TextAppearance.Material3.BodySmall"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
-                                android:gravity="left"
-                                android:singleLine="true"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toBottomOf="@id/favoredTimes" />
-
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    </com.google.android.material.card.MaterialCardView>
-
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/uploader"
-                        style="@style/Widget.Material3.Chip.Assist"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:ellipsize="end"
-                        android:nextFocusRight="@+id/read"
-                        android:nextFocusDown="@+id/rate"
-                        android:singleLine="true"
-                        android:textAllCaps="true"
-                        app:chipIcon="@drawable/file_upload_black_24dp"
-                        app:ensureMinTouchTargetSize="true"
-                        app:layout_constraintBottom_toBottomOf="@id/thumb_card"
-                        app:layout_constraintEnd_toEndOf="parent" />
-
-                    <com.google.android.material.chip.Chip
-                        android:id="@+id/category"
-                        style="@style/Widget.Material3.Chip.Assist"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/keyline_margin"
-                        android:ellipsize="end"
-                        android:nextFocusRight="@+id/read"
-                        android:singleLine="true"
-                        android:textAllCaps="true"
-                        app:chipIcon="@drawable/ic_baseline_label_24"
-                        app:ensureMinTouchTargetSize="true"
-                        app:layout_constraintBottom_toTopOf="@id/uploader"
-                        app:layout_constraintEnd_toEndOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <LinearLayout
-                android:id="@+id/action_card"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/keyline_margin"
-                android:layout_marginRight="@dimen/keyline_margin"
-                android:orientation="vertical">
-
-                <Button
-                    android:id="@+id/read"
-                    style="@style/Widget.Material3.Button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:insetLeft="40dp"
-                    android:insetRight="40dp"
-                    android:insetTop="16dp"
-                    android:text="@string/read">
-
-                    <requestFocus />
-                </Button>
-
-                <Button
-                    android:id="@+id/download"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:clickable="true"
-                    android:nextFocusDown="@+id/torrent"
-                    android:focusable="true"
-                    android:insetLeft="40dp"
-                    android:insetTop="16dp"
-                    android:insetRight="40dp" />
-
-
-                <android.widget.Space
-                    android:layout_width="match_parent"
-                    android:layout_height="80dp" />
-
-
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</FrameLayout>
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright 2022 hathlife
  ~
-  ~ This file is part of EhViewer
+  ~ 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
  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
+  ~     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.
  -->

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright 2022 hathlife
  ~
-  ~ This file is part of EhViewer
+  ~ 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
  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
+  ~     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.
  -->

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,7 +36,7 @@

            <ImageView
                android:layout_width="257dp"
-                android:layout_height="match_parent"
+                android:layout_height="518dp"
                android:layout_gravity="center_horizontal"
                android:padding="@dimen/keyline_margin"
                app:srcCompat="@mipmap/ic_launcher" />
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright 2022 hathlife
  ~
-  ~ This file is part of EhViewer
+  ~ 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
  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
+  ~     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.
  -->

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?><!--
  ~ Copyright 2022 hathlife
  ~
-  ~ This file is part of EhViewer
+  ~ 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
  ~
-  ~ EhViewer is free software: you can redistribute it and/or
-  ~ modify it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ EhViewer is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with EhViewer.
-  ~ If not, see <https://www.gnu.org/licenses/>.
+  ~     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.
  -->

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,14 +28,13 @@
        android:layout_gravity="center_vertical"
        android:gravity="center_horizontal" />

-    <com.google.android.material.slider.Slider
+    <com.hippo.widget.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:stepSize="1"
-        android:valueFrom="1" />
+        android:layout_weight="1" />

    <TextView
        android:id="@+id/end"
@@ -64,18 +64,16 @@
            android:layout_marginBottom="@dimen/keyline_margin"
            app:fitsSystemWindowsInsets="top">

-            <androidx.constraintlayout.widget.ConstraintLayout
+            <RelativeLayout
                android:id="@+id/header_content"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

                <com.google.android.material.card.MaterialCardView
                    android:id="@+id/thumb_card"
-                    style="@style/Widget.Material3.CardView.Filled"
+                    style="@style/Widget.Material3.CardView.Elevated"
                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                    android:layout_height="wrap_content">

                    <com.hippo.widget.LoadImageView
                        android:id="@+id/thumb"
@@ -89,82 +87,69 @@
                    style="@style/Widget.Material3.CardView.Filled"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
                    android:layout_marginTop="8dp"
                    android:layout_marginEnd="@dimen/keyline_margin"
                    android:clickable="true"
                    android:focusable="true"
-                    android:orientation="vertical"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                    android:orientation="vertical">

-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <TableLayout
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:padding="8dp">

-                        <TextView
-                            android:id="@+id/language"
-                            style="@style/TextAppearance.Material3.BodySmall"
-                            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" />
+                        <TableRow>

-                        <TextView
-                            android:id="@+id/size"
-                            style="@style/TextAppearance.Material3.BodySmall"
-                            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/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_weight="1"
+                                android:gravity="end"
+                                android:singleLine="true" />

-                        <TextView
-                            android:id="@+id/favoredTimes"
-                            style="@style/TextAppearance.Material3.BodySmall"
-                            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>

-                        <TextView
-                            android:id="@+id/pages"
-                            style="@style/TextAppearance.Material3.BodySmall"
-                            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" />
+                        <TableRow android:paddingTop="8dp">

+                            <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/posted"
-                            style="@style/TextAppearance.Material3.BodySmall"
-                            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" />
+                            <TextView
+                                android:id="@+id/pages"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="end"
+                                android:singleLine="true" />

+                        </TableRow>

-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                        <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>

                </com.google.android.material.card.MaterialCardView>

@@ -173,31 +158,30 @@
                    style="@style/Widget.Material3.Chip.Assist"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/thumb_card"
+                    android:layout_alignParentEnd="true"
                    android:layout_marginEnd="@dimen/keyline_margin"
                    android:ellipsize="end"
                    android:singleLine="true"
                    android:textAllCaps="true"
                    app:chipIcon="@drawable/file_upload_black_24dp"
-                    app:ensureMinTouchTargetSize="true"
-                    app:layout_constraintBottom_toBottomOf="@id/thumb_card"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:ensureMinTouchTargetSize="true" />

                <com.google.android.material.chip.Chip
                    android:id="@+id/category"
                    style="@style/Widget.Material3.Chip.Assist"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
+                    android:layout_above="@id/uploader"
+                    android:layout_alignParentEnd="true"
                    android:layout_marginEnd="@dimen/keyline_margin"
-                    app:chipSpacingHorizontal="8dp"
                    android:ellipsize="end"
                    android:singleLine="true"
                    android:textAllCaps="true"
                    app:chipIcon="@drawable/ic_baseline_label_24"
-                    app:ensureMinTouchTargetSize="true"
-                    app:layout_constraintBottom_toTopOf="@id/uploader"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    app:ensureMinTouchTargetSize="true" />

-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </RelativeLayout>

        </com.google.android.material.card.MaterialCardView>

@@ -214,17 +198,19 @@
                style="@style/Widget.Material3.Button.TonalButton"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="4dp"
                android:layout_weight="1"
                android:clickable="true"
                android:focusable="true" />

+            <android.widget.Space
+                android:layout_width="8dp"
+                android:layout_height="wrap_content" />
+
            <Button
                android:id="@+id/read"
                style="@style/Widget.Material3.Button"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="4dp"
                android:layout_weight="1"
                android:clickable="true"
                android:focusable="true"
@@ -95,30 +95,27 @@
                android:layout_height="wrap_content"
                android:clipToPadding="false"
                android:gravity="bottom"
-                android:orientation="horizontal"
+                android:orientation="vertical"
                android:paddingLeft="12dp"
                android:paddingTop="4dp"
                android:paddingRight="12dp"
                android:paddingBottom="4dp">

-                <Button
-                    android:id="@+id/register"
-                    style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="4dp"
-                    android:layout_weight="1"
-                    android:text="@string/register" />
-
                <Button
                    android:id="@+id/sign_in"
                    style="@style/Widget.Material3.Button"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="4dp"
                    android:layout_weight="1"
                    android:text="@string/sign_in" />

+                <Button
+                    android:id="@+id/register"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/register" />
            </LinearLayout>

            <LinearLayout
@@ -12,8 +12,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <LinearLayout
        android:layout_width="match_parent"
@@ -140,22 +139,13 @@
            android:minHeight="0dp"
            android:text="@string/search_sr" />

-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+        <Spinner
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
-            android:layout_marginStart="@dimen/advance_search_table_item_margin"
+            android:layout_marginLeft="@dimen/advance_search_table_item_margin"
            android:layout_weight="1"
-            android:hint="@string/search_sr">
-
-            <AutoCompleteTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="none"
-                app:simpleItems="@array/search_min_rating" />
-
-        </com.google.android.material.textfield.TextInputLayout>
+            android:entries="@array/search_min_rating" />
    </LinearLayout>

    <LinearLayout
@@ -756,17 +756,12 @@
    <string name="pick_new_download_location">选择新路径</string>
    <string name="dont_show_again">不再显示</string>
    <string name="open_settings">打开设置</string>
-    <string name="app_link_not_verified_message">对于您的设备，我们强烈建议您使用 1.8 版本。1.7 版本仅为 Android 11 及以下版本设计</string>
-    <string name="app_link_not_verified_title">升级 App 版本</string>
+    <string name="app_link_not_verified_message">对于 Android 12 及更新的版本，您需要手动添加链接到已验证链接才能在 EhViewer 中打开 E-Hentai 链接。</string>
+    <string name="app_link_not_verified_title">应用链接未验证</string>
    <string name="open_by_default">默认打开</string>

    <string name="show_library_version">依赖库之版本</string>
    <string name="settings_privacy_require_unlock">需要解锁</string>
    <string name="proxy_type_name">代理类型</string>
    <string name="filter_label">屏蔽项类型</string>
-
-    <string name="archive_passwd">归档文件密码</string>
-    <string name="archive_need_passwd">归档文件需要密码</string>
-    <string name="passwd_wrong">密码错误</string>
-    <string name="passwd_cannot_be_empty">密码不能为空</string>
 </resources>
@@ -820,17 +820,12 @@
    <string name="pick_new_download_location">Pick a new location</string>
    <string name="dont_show_again">Don\'t show again</string>
    <string name="open_settings">Open settings</string>
-    <string name="app_link_not_verified_message">For you device, We strongly recommend you to use version 1.8. version 1.7 is only made for Android 11 and below .</string>
-    <string name="app_link_not_verified_title">Update App Version</string>
+    <string name="app_link_not_verified_message">For Android 12 and newer, you need to manually add link to verified links in order to open E-Hentai links in EhViewer.</string>
+    <string name="app_link_not_verified_title">App links not verified</string>
    <string name="open_by_default">Open by default</string>

    <string name="show_library_version">Library Version</string>
    <string name="settings_privacy_require_unlock">Require Unlock</string>
    <string name="proxy_type_name">Proxy Type</string>
    <string name="filter_label">Blocker Type</string>
-
-    <string name="archive_passwd">password</string>
-    <string name="archive_need_passwd">Archive need password</string>
-    <string name="passwd_wrong">Password Wrong</string>
-    <string name="passwd_cannot_be_empty">Password can\'t be empty</string>
 </resources>
@@ -51,6 +51,12 @@
        <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>
@@ -28,9 +28,9 @@ public class Native {

    public static native String getliblzmaVersion();

+    public static native String getlibzstdVersion();
+
    public static native String getlibjpeg_turboVersion();

    public static native String getzlibVersion();
-
-    public static native String getnettleVersion();
 }
@@ -21,44 +21,103 @@ package com.hippo;
 import android.content.Context;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;

+import java.io.Closeable;
 import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;

-public class UriArchiveAccessor {
-    ParcelFileDescriptor pfd;
-    FileDescriptor fd;
-    long archiveAddr;
-    Context ctx;
-    Uri uri;
+public class UriArchiveAccessor implements Closeable {
+    public static int OPEN_OK = 1;
+    public static int OPEN_ERR = 2;
+    private final OsReadableFile osf;

-    public UriArchiveAccessor(Context ctx, Uri uri) {
-        this.ctx = ctx;
-        this.uri = uri;
+    public UriArchiveAccessor(Context ctx, Uri uri) throws FileNotFoundException {
+        osf = new OsReadableFile(ctx, uri);
    }

-    public int open() throws Exception {
-        pfd = ctx.getContentResolver().openFileDescriptor(uri, "r");
-        fd = pfd.getFileDescriptor();
-        archiveAddr = Os.mmap(0, pfd.getStatSize(), OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, fd, 0);
-        return openArchive(archiveAddr, pfd.getStatSize());
+    public int open() {
+        return openArchive(osf);
    }

-    private native int openArchive(long addr, long size);
+    public void extractTargetIndexToOutputStream(int index, OutputStream os) {
+        extracttoOutputStream(osf, index, os);
+    }

-    public native void extracttoOutputStream(int index, int fd);
+    private native int openArchive(OsReadableFile osf);

-    public native boolean needPassword();
+    private native int extracttoOutputStream(OsReadableFile osf, int index, OutputStream os);

-    public native boolean providePassword(String str);
+    @Override
+    public void close() throws IOException {
+        osf.close();
+    }

-    private native void closeArchive();
+    static class OsReadableFile {
+        ParcelFileDescriptor pfd;
+        FileDescriptor fd;

-    public void close() throws Exception {
-        closeArchive();
-        Os.munmap(archiveAddr, pfd.getStatSize());
-        Os.close(fd);
-        pfd.close();
+        public OsReadableFile(Context ctx, Uri uri) throws FileNotFoundException {
+            pfd = ctx.getContentResolver().openFileDescriptor(uri, "r");
+            fd = pfd.getFileDescriptor();
+        }
+
+        public int read(byte[] b, int off, int len) throws IOException, ErrnoException {
+            return Os.read(fd, b, off, len);
+        }
+
+        public int read(byte[] b) throws IOException, ErrnoException {
+            return read(b, 0, b.length);
+        }
+
+        public long length() throws IOException, ErrnoException {
+            return Os.fstat(fd).st_size;
+        }
+
+        public long seek(long pos, int whence) throws IOException, ErrnoException {
+            try {
+                return Os.lseek(fd, pos, whence);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return -30;
+            }
+        }
+
+        public void rewind() throws IOException, ErrnoException {
+            Os.lseek(fd, 0, OsConstants.SEEK_SET);
+        }
+
+        public long skip(long n) throws IOException, ErrnoException {
+            long pos;
+            long len;
+            long newpos;
+
+            if (n <= 0) {
+                return 0;
+            }
+            pos = Os.lseek(fd, 0L, OsConstants.SEEK_CUR);
+            len = length();
+            newpos = pos + n;
+            if (newpos > len) {
+                newpos = len;
+            }
+            seek(newpos, OsConstants.SEEK_SET);
+
+            /* return the actual number of bytes skipped */
+            return newpos - pos;
+        }
+
+        public void close() throws IOException {
+            pfd.close();
+            try {
+                Os.close(fd);
+            } catch (ErrnoException e) {
+                throw new IOException("An ErrnoException occurs", e);
+            }
+        }
    }
 }
@@ -13,20 +13,6 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Oz -fvisibility=hidden -fvisibility-inlines
           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
 		   -mllvm -polly-invariant-load-hoisting")

-# Build GNUTLS libnettle
-add_subdirectory(nettle)
-
-# Configure libnettle support for libarchive
-include_directories(nettle)
-include_directories(.)
-set(HAVE_LIBNETTLE 1)
-set(HAVE_NETTLE_AES_H 1)
-set(HAVE_NETTLE_HMAC_H 1)
-set(HAVE_NETTLE_MD5_H 1)
-set(HAVE_NETTLE_PBKDF2_H 1)
-set(HAVE_NETTLE_RIPEMD160_H 1)
-set(HAVE_NETTLE_SHA_H 1)
-
 # Build liblzma
 add_subdirectory(liblzma)

@@ -38,9 +24,6 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1)
 SET(HAVE_LZMADEC_H 1)
 SET(HAVE_LIBLZMADEC 1)

-# Configure libarchive link's static lib
-SET(LIBARCHIVE_CUSTOM_LIBS "liblzma" "nettle")
-
 # Build libarchive
 add_subdirectory(libarchive)

@@ -23,9 +23,6 @@
 #include <android/log.h>
 #include <archive.h>
 #include <archive_entry.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <stdbool.h>

 #define LOG_TAG "libarchive_wrapper"
 #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG ,__VA_ARGS__)
@@ -35,13 +32,19 @@
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG ,__VA_ARGS__)
 #define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, LOG_TAG ,__VA_ARGS__)

-static JNIEnv *env;
-static int cur_index = 0; // Current entry we haven't read any data from it yet
-static struct archive *arc = NULL;
-static bool need_encrypt = false;
-static char *passwd = NULL;
-static void *archiveAddr = NULL;
-static jlong archiveSize = 0;
+#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 int filename_is_playable_file(const char *name) {
    const char *dotptr = strrchr(name, '.');
@@ -60,132 +63,124 @@ static int filename_is_playable_file(const char *name) {
    return 0;
 }

-static long archive_list_all_entries() {
+static long archive_list_all_entries(struct archive_inst_sc *inst) {
+    struct archive *a = inst->archive;
    struct archive_entry *entry;
    long count = 0;
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
+    while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
        if (filename_is_playable_file(archive_entry_pathname(entry)))
            count++;
    }
    if (!count)
-        LOGE("%s", archive_error_string(arc));
+        LOGE("%s", archive_error_string(inst->archive));
    return count;
 }

-static void archive_release() {
-    if (arc) {
-        archive_read_close(arc);
-        archive_read_free(arc);
-        arc = NULL;
-    }
-}
-
-static int archive_alloc() {
-    archive_release();
-    arc = archive_read_new();
-    archive_read_support_format_all(arc);
-    archive_read_support_filter_all(arc);
-    if (passwd)
-        archive_read_add_passphrase(arc, passwd);
-    return archive_read_open_memory(arc, archiveAddr, archiveSize);
-}
-
-JNIEXPORT jint JNICALL
-Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jlong addr, jlong size) {
-    archiveAddr = (void *) addr;
-    archiveSize = size;
-    env = _;
-    madvise(archiveAddr, archiveSize, MADV_SEQUENTIAL | MADV_WILLNEED);
-    long r = archive_alloc();
-    if (r) {
-        r = 0;
-        LOGE("%s%s", "Archive open failed:", archive_error_string(arc));
-    } else {
-        r = archive_list_all_entries();
-        LOGI("%s%ld%s", "Found ", r, " image entries in archive");
-
-        // We must read through the file|vm then we can know whether it is encrypted
-        int encryptRet = archive_read_has_encrypted_entries(arc);
-        switch (encryptRet) {
-            case 1: // At lease 1 encrypted entry
-                need_encrypt = true;
-                break;
-            case 0: // format supports but no encrypted entry found
-            case ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW: // Sometimes we might not read through whole file|vm, but it means so far we haven't meet any encrypted entry yet
-            default:
-                need_encrypt = false;
-        }
-        LOGI("%s%d", "archive_read_has_encrypted_entries returns ", encryptRet);
-    }
-    archive_release();
+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;
    return r;
 }

-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz, jint index,
-                                                        jint fd) {
-    struct archive_entry *entry;
-    size_t size;
-    int ret;
-    la_int64_t offset;
-    const void *buff;
-    if (!arc || index < cur_index) {
-        archive_alloc();
-        cur_index = 0;
+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);
+    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);
+    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);
+    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);
+}
+
+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);
+    if (r) {
+        r = 0;
+        LOGE("%s%s", "Archive open failed:", archive_error_string(arc->archive));
+    } else {
+        r = archive_list_all_entries(arc);
+        LOGI("%s%ld%s", "Found ", r, " image entries in archive");
    }
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
+    archive_read_close(arc->archive);
+    archive_destroy_inst(arc);
+    return r;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *env, jobject thiz, jobject osf,
+                                                        jint index, jobject os) {
+    int count = 0;
+    struct archive_entry *entry;
+    archive_inst *arc = archive_create_inst(env, osf);
+    la_ssize_t size;
+    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) {
        if (!filename_is_playable_file(archive_entry_pathname(entry)))
            continue;
-        if (cur_index++ == index) {
+        if (count++ == index) {
            for (;;) {
-                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;
+                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;
                }
-                write(fd, buff, size);
+                (*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)
+                    break;
            }
            break;
        }
    }
-}
-
-JNIEXPORT void JNICALL
-Java_com_hippo_UriArchiveAccessor_closeArchive(JNIEnv *jniEnv, jobject thiz) {
-    archive_release();
-    free(passwd);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_needPassword(JNIEnv *_, jobject thiz) {
-    return need_encrypt;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *_, jobject thiz, jstring str) {
-    struct archive_entry *entry;
-    jboolean ret = true;
-    int len = (*env)->GetStringUTFLength(env, str);
-    if (passwd)
-        free(passwd);
-    passwd = calloc(len, sizeof(char));
-    strcpy(passwd, (*env)->GetStringUTFChars(env, str, NULL));
-    archive_alloc();
-    while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
-        if (!filename_is_playable_file(archive_entry_pathname(entry)))
-            continue;
-        if (!archive_entry_is_encrypted(entry))
-            continue;
-        void *tmpBuf = malloc(4096);
-        if (archive_read_data(arc, tmpBuf, 4096) < ARCHIVE_OK) {
-            LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
-            ret = false;
-        }
-        free(tmpBuf);
-        break;
-    }
-    archive_release();
-    return ret;
-}
+    free:
+    (*arc->env)->CallVoidMethod(env, os, closeID);
+    archive_read_close(arc->archive);
+    archive_destroy_inst(arc);
+    return 0;
+}
@@ -22,7 +22,6 @@
 #include <lzma.h>
 #include <zlib.h>
 #include "image/libjpeg-turbo/jconfigint.h"
-#include <nettle/config.h>

 #include "java_wrapper.h"

@@ -59,8 +58,3 @@ JNIEXPORT jstring JNICALL
 Java_com_hippo_Native_getzlibVersion(JNIEnv *env, jclass clazz) {
    return (*env)->NewStringUTF(env, ZLIB_VERSION);
 }
-
-JNIEXPORT jstring JNICALL
-Java_com_hippo_Native_getnettleVersion(JNIEnv *env, jclass clazz) {
-    return (*env)->NewStringUTF(env, PACKAGE_STRING);
-}
@@ -1,239 +0,0 @@
-cmake_minimum_required(VERSION 3.4.1)
-project(nettle C)
-
-set(LIBNETTLE_DEFINITIONS
-        -DHAVE_CONFIG_H)
-
-set(LIBNETTLE_SOURCES
-        nettle/aes-decrypt-internal.c
-        nettle/aes-decrypt.c
-        nettle/aes-decrypt-table.c
-        nettle/aes128-decrypt.c
-        nettle/aes192-decrypt.c
-        nettle/aes256-decrypt.c
-        nettle/aes-encrypt-internal.c
-        nettle/aes-encrypt.c
-        nettle/aes-encrypt-table.c
-        nettle/aes128-encrypt.c
-        nettle/aes192-encrypt.c
-        nettle/aes256-encrypt.c
-        nettle/aes-invert-internal.c
-        nettle/aes-set-key-internal.c
-        nettle/aes-set-encrypt-key.c
-        nettle/aes-set-decrypt-key.c
-        nettle/aes128-set-encrypt-key.c
-        nettle/aes128-set-decrypt-key.c
-        nettle/aes128-meta.c
-        nettle/aes192-set-encrypt-key.c
-        nettle/aes192-set-decrypt-key.c
-        nettle/aes192-meta.c
-        nettle/aes256-set-encrypt-key.c
-        nettle/aes256-set-decrypt-key.c
-        nettle/aes256-meta.c
-        nettle/nist-keywrap.c
-        nettle/arcfour.c
-        nettle/arcfour-crypt.c
-        nettle/arctwo.c
-        nettle/arctwo-meta.c
-        nettle/blowfish.c
-        nettle/blowfish-bcrypt.c
-        nettle/base16-encode.c
-        nettle/base16-decode.c
-        nettle/base16-meta.c
-        nettle/base64-encode.c
-        nettle/base64-decode.c
-        nettle/base64-meta.c
-        nettle/base64url-encode.c
-        nettle/base64url-decode.c
-        nettle/base64url-meta.c
-        nettle/buffer.c
-        nettle/buffer-init.c
-        nettle/camellia-crypt-internal.c
-        nettle/camellia-table.c
-        nettle/camellia-absorb.c
-        nettle/camellia-invert-key.c
-        nettle/camellia128-set-encrypt-key.c
-        nettle/camellia128-crypt.c
-        nettle/camellia128-set-decrypt-key.c
-        nettle/camellia128-meta.c
-        nettle/camellia192-meta.c
-        nettle/camellia256-set-encrypt-key.c
-        nettle/camellia256-crypt.c
-        nettle/camellia256-set-decrypt-key.c
-        nettle/camellia256-meta.c
-        nettle/cast128.c
-        nettle/cast128-meta.c
-        nettle/cbc.c
-        nettle/cbc-aes128-encrypt.c
-        nettle/cbc-aes192-encrypt.c
-        nettle/cbc-aes256-encrypt.c
-        nettle/ccm.c
-        nettle/ccm-aes128.c
-        nettle/ccm-aes192.c
-        nettle/ccm-aes256.c
-        nettle/cfb.c
-        nettle/siv-cmac.c
-        nettle/siv-cmac-aes128.c
-        nettle/siv-cmac-aes256.c
-        nettle/cnd-memcpy.c
-        nettle/chacha-crypt.c
-        nettle/chacha-core-internal.c
-        nettle/chacha-poly1305.c
-        nettle/chacha-poly1305-meta.c
-        nettle/chacha-set-key.c
-        nettle/chacha-set-nonce.c
-        nettle/ctr.c
-        nettle/ctr16.c
-        nettle/des.c
-        nettle/des3.c
-        nettle/eax.c
-        nettle/eax-aes128.c
-        nettle/eax-aes128-meta.c
-        nettle/ghash-set-key.c
-        nettle/ghash-update.c
-        nettle/gcm.c
-        nettle/gcm-aes.c
-        nettle/gcm-aes128.c
-        nettle/gcm-aes128-meta.c
-        nettle/gcm-aes192.c
-        nettle/gcm-aes192-meta.c
-        nettle/gcm-aes256.c
-        nettle/gcm-aes256-meta.c
-        nettle/gcm-camellia128.c
-        nettle/gcm-camellia128-meta.c
-        nettle/gcm-camellia256.c
-        nettle/gcm-camellia256-meta.c
-        nettle/cmac.c
-        nettle/cmac64.c
-        nettle/cmac-aes128.c
-        nettle/cmac-aes256.c
-        nettle/cmac-des3.c
-        nettle/cmac-aes128-meta.c
-        nettle/cmac-aes256-meta.c
-        nettle/cmac-des3-meta.c
-        nettle/gost28147.c
-        nettle/gosthash94.c
-        nettle/gosthash94-meta.c
-        nettle/hmac.c
-        nettle/hmac-gosthash94.c
-        nettle/hmac-md5.c
-        nettle/hmac-ripemd160.c
-        nettle/hmac-sha1.c
-        nettle/hmac-sha224.c
-        nettle/hmac-sha256.c
-        nettle/hmac-sha384.c
-        nettle/hmac-sha512.c
-        nettle/hmac-streebog.c
-        nettle/hmac-sm3.c
-        nettle/hmac-md5-meta.c
-        nettle/hmac-ripemd160-meta.c
-        nettle/hmac-sha1-meta.c
-        nettle/hmac-sha224-meta.c
-        nettle/hmac-sha256-meta.c
-        nettle/hmac-sha384-meta.c
-        nettle/hmac-sha512-meta.c
-        nettle/hmac-streebog-meta.c
-        nettle/hmac-sm3-meta.c
-        nettle/knuth-lfib.c
-        nettle/hkdf.c
-        nettle/md2.c
-        nettle/md2-meta.c
-        nettle/md4.c
-        nettle/md4-meta.c
-        nettle/md5.c
-        nettle/md5-compress.c
-        nettle/md5-compat.c
-        nettle/md5-meta.c
-        nettle/memeql-sec.c
-        nettle/memxor.c
-        nettle/memxor3.c
-        nettle/nettle-lookup-hash.c
-        nettle/nettle-meta-aeads.c
-        nettle/nettle-meta-armors.c
-        nettle/nettle-meta-ciphers.c
-        nettle/nettle-meta-hashes.c
-        nettle/nettle-meta-macs.c
-        nettle/pbkdf2.c
-        nettle/pbkdf2-hmac-gosthash94.c
-        nettle/pbkdf2-hmac-sha1.c
-        nettle/pbkdf2-hmac-sha256.c
-        nettle/pbkdf2-hmac-sha384.c
-        nettle/pbkdf2-hmac-sha512.c
-        nettle/poly1305-aes.c
-        nettle/poly1305-internal.c
-        nettle/realloc.c
-        nettle/ripemd160.c
-        nettle/ripemd160-compress.c
-        nettle/ripemd160-meta.c
-        nettle/salsa20-core-internal.c
-        nettle/salsa20-crypt-internal.c
-        nettle/salsa20-crypt.c
-        nettle/salsa20r12-crypt.c
-        nettle/salsa20-set-key.c
-        nettle/salsa20-set-nonce.c
-        nettle/salsa20-128-set-key.c
-        nettle/salsa20-256-set-key.c
-        nettle/sha1.c
-        nettle/sha1-compress.c
-        nettle/sha1-meta.c
-        nettle/sha256.c
-        nettle/sha256-compress.c
-        nettle/sha224-meta.c
-        nettle/sha256-meta.c
-        nettle/sha512.c
-        nettle/sha512-compress.c
-        nettle/sha384-meta.c
-        nettle/sha512-meta.c
-        nettle/sha512-224-meta.c
-        nettle/sha512-256-meta.c
-        nettle/sha3.c
-        nettle/sha3-permute.c
-        nettle/sha3-224.c
-        nettle/sha3-224-meta.c
-        nettle/sha3-256.c
-        nettle/sha3-256-meta.c
-        nettle/sha3-384.c
-        nettle/sha3-384-meta.c
-        nettle/sha3-512.c
-        nettle/sha3-512-meta.c
-        nettle/shake256.c
-        nettle/sm3.c
-        nettle/sm3-meta.c
-        nettle/serpent-set-key.c
-        nettle/serpent-encrypt.c
-        nettle/serpent-decrypt.c
-        nettle/serpent-meta.c
-        nettle/streebog.c
-        nettle/streebog-meta.c
-        nettle/twofish.c
-        nettle/twofish-meta.c
-        nettle/umac-nh.c
-        nettle/umac-nh-n.c
-        nettle/umac-l2.c
-        nettle/umac-l3.c
-        nettle/umac-poly64.c
-        nettle/umac-poly128.c
-        nettle/umac-set-key.c
-        nettle/umac32.c
-        nettle/umac64.c
-        nettle/umac96.c
-        nettle/umac128.c
-        nettle/version.c
-        nettle/write-be32.c
-        nettle/write-le32.c
-        nettle/write-le64.c
-        nettle/yarrow256.c
-        nettle/yarrow_key_event.c
-        nettle/xts.c
-        nettle/xts-aes128.c
-        nettle/xts-aes256.c
-        )
-
-set(LIBNETTLE_INCLUDES
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/nettle
-        )
-
-add_library(nettle STATIC ${LIBNETTLE_SOURCES})
-target_include_directories(nettle PUBLIC ${LIBNETTLE_INCLUDES})
-target_compile_definitions(nettle PRIVATE ${LIBNETTLE_DEFINITIONS})
@@ -1,275 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define to 1 if using 'alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if you have 'alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if <alloca.h> works. */
-#define HAVE_ALLOCA_H 1
-
-/* Define if __builtin_bswap64 is available */
-#define HAVE_BUILTIN_BSWAP64 1
-
-/* Define if clock_gettime is available */
-#define HAVE_CLOCK_GETTIME 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if fcntl file locking is available */
-#define HAVE_FCNTL_LOCKING 1
-
-/* Define if the compiler understands __attribute__ */
-#define HAVE_GCC_ATTRIBUTE 1
-
-/* Define to 1 if you have the `getline' function. */
-#define HAVE_GETLINE 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have dlopen (with -ldl). */
-#define HAVE_LIBDL 1
-
-/* Define to 1 if you have the `gmp' library (-lgmp). */
-/* #undef HAVE_LIBGMP */
-
-/* Define if compiler and linker supports __attribute__ ifunc */
-#define HAVE_LINK_IFUNC 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 each of the following for which a native (ie. CPU specific)
-    implementation of the corresponding routine exists.  */
-/* #undef HAVE_NATIVE_memxor3 */
-/* #undef HAVE_NATIVE_aes_decrypt */
-/* #undef HAVE_NATIVE_aes_encrypt */
-/* #undef HAVE_NATIVE_aes128_decrypt */
-/* #undef HAVE_NATIVE_aes128_encrypt */
-/* #undef HAVE_NATIVE_aes128_invert_key */
-/* #undef HAVE_NATIVE_aes128_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes128_set_encrypt_key */
-/* #undef HAVE_NATIVE_aes192_decrypt */
-/* #undef HAVE_NATIVE_aes192_encrypt */
-/* #undef HAVE_NATIVE_aes192_invert_key */
-/* #undef HAVE_NATIVE_aes192_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes192_set_encrypt_key */
-/* #undef HAVE_NATIVE_aes256_decrypt */
-/* #undef HAVE_NATIVE_aes256_encrypt */
-/* #undef HAVE_NATIVE_aes256_invert_key */
-/* #undef HAVE_NATIVE_aes256_set_decrypt_key */
-/* #undef HAVE_NATIVE_aes256_set_encrypt_key */
-/* #undef HAVE_NATIVE_cbc_aes128_encrypt */
-/* #undef HAVE_NATIVE_cbc_aes192_encrypt */
-/* #undef HAVE_NATIVE_cbc_aes256_encrypt */
-/* #undef HAVE_NATIVE_chacha_core */
-/* #undef HAVE_NATIVE_chacha_2core */
-/* #undef HAVE_NATIVE_chacha_3core */
-/* #undef HAVE_NATIVE_chacha_4core */
-/* #undef HAVE_NATIVE_fat_chacha_2core */
-/* #undef HAVE_NATIVE_fat_chacha_3core */
-/* #undef HAVE_NATIVE_fat_chacha_4core */
-/* #undef HAVE_NATIVE_ecc_curve25519_modp */
-/* #undef HAVE_NATIVE_ecc_curve448_modp */
-/* #undef HAVE_NATIVE_ecc_secp192r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp192r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp224r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp224r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp256r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp256r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp384r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp384r1_redc */
-/* #undef HAVE_NATIVE_ecc_secp521r1_modp */
-/* #undef HAVE_NATIVE_ecc_secp521r1_redc */
-/* #undef HAVE_NATIVE_ghash_set_key */
-/* #undef HAVE_NATIVE_ghash_update */
-/* #undef HAVE_NATIVE_salsa20_core */
-/* #undef HAVE_NATIVE_salsa20_2core */
-/* #undef HAVE_NATIVE_fat_salsa20_2core */
-/* #undef HAVE_NATIVE_sha1_compress */
-/* #undef HAVE_NATIVE_sha256_compress */
-/* #undef HAVE_NATIVE_sha512_compress */
-/* #undef HAVE_NATIVE_sha3_permute */
-/* #undef HAVE_NATIVE_umac_nh */
-/* #undef HAVE_NATIVE_umac_nh_n */
-
-/* Define to 1 if you have the <openssl/ecdsa.h> header file. */
-/* #undef HAVE_OPENSSL_ECDSA_H */
-
-/* Define to 1 if you have the <openssl/evp.h> header file. */
-/* #undef HAVE_OPENSSL_EVP_H */
-
-/* Define to 1 if you have the `secure_getenv' function. */
-/* #undef HAVE_SECURE_GETENV */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
-/* #undef HAVE_VALGRIND_MEMCHECK_H */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "nettle-bugs@lists.lysator.liu.se"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "nettle"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "nettle 3.8"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "nettle"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.8"
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG __SIZEOF_LONG__
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
-   macro is obsolete. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Defined if public key features are enabled */
-/* #undef WITH_HOGWEED */
-
-/* Define if you have openssl's libcrypto (used for benchmarking) */
-/* #undef WITH_OPENSSL */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-/* Needed for alloca on windows */
-#  if HAVE_MALLOC_H
-#   include <malloc.h>
-#  endif
-# endif
-#else /* defined __GNUC__ */
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-/* Needed for alloca on windows, also with gcc */
-#  if HAVE_MALLOC_H
-#   include <malloc.h>
-#  endif
-# endif
-#endif
-
-
-#if HAVE_STRERROR
-#define STRERROR strerror
-#else
-#define STRERROR(x) (sys_errlist[x])
-#endif
-
-
-#if __GNUC__ && HAVE_GCC_ATTRIBUTE
-# define NORETURN __attribute__ ((__noreturn__))
-# define PRINTF_STYLE(f, a) __attribute__ ((__format__ (__printf__, f, a)))
-# define UNUSED __attribute__ ((__unused__))
-#else
-# define NORETURN
-# define PRINTF_STYLE(f, a)
-# define UNUSED
-#endif
-
-
-#if defined(__x86_64__) || defined(__arch64__)
-# define HAVE_NATIVE_64_BIT 1
-#else
-/* Needs include of <limits.h> before use. */
-# define HAVE_NATIVE_64_BIT (SIZEOF_LONG * CHAR_BIT >= 64)
-#endif
-
@@ -1 +0,0 @@
- 
@@ -1 +0,0 @@
- 
@@ -1,64 +0,0 @@
-/* version.h
-
-   Information about library version.
-
-   Copyright (C) 2015 Red Hat, Inc.
-   Copyright (C) 2015 Niels Möller
-
-   This file is part of GNU Nettle.
-
-   GNU Nettle is free software: you can redistribute it and/or
-   modify it under the terms of either:
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at your
-       option) any later version.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at your
-       option) any later version.
-
-   or both in parallel, as here.
-
-   GNU Nettle is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see http://www.gnu.org/licenses/.
-*/
-
-#ifndef NETTLE_VERSION_H_INCLUDED
-#define NETTLE_VERSION_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Individual version numbers in decimal */
-#define NETTLE_VERSION_MAJOR 3
-#define NETTLE_VERSION_MINOR 8
-
-#define NETTLE_USE_MINI_GMP 0
-
-/* We need a preprocessor constant for GMP_NUMB_BITS, simply using
-   sizeof(mp_limb_t) * CHAR_BIT is not good enough. */
-#if NETTLE_USE_MINI_GMP
-# define GMP_NUMB_BITS n/a
-#endif
-
-int
-nettle_version_major (void);
-
-int
-nettle_version_minor (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NETTLE_VERSION_H_INCLUDED */