Version Bump (#94)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: EhViewer
 
-on: push
+on: [push, pull_request]
 
 jobs:
   linux:
@@ -21,7 +21,7 @@ jobs:
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          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

.github/workflows/releases.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Install NDK
         run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
+          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

app/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 114527
-        versionName "1.7.28.0"
+        versionCode 114529
+        versionName "1.7.28.2"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -97,22 +97,28 @@ dependencies {
     implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
     implementation 'androidx.browser:browser:1.4.0'
     implementation 'androidx.fragment:fragment:1.5.0'
+    implementation "androidx.lifecycle:lifecycle-process:2.5.0"
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'com.drakeet.drawer:drawer:1.0.3'
-    implementation 'com.google.android.material:material:1.7.0-alpha02'
+    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 'com.takisoft.preferencex:preferencex:1.1.0'
-    implementation 'dev.rikka.rikkax.core:core-ktx:1.4.0'
+    implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1'
     implementation 'dev.rikka.rikkax.insets:insets:1.3.0'
     implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
+    implementation 'dev.rikka.rikkax.material:material-preference:2.0.0'
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     implementation 'org.greenrobot:greendao:3.3.0'
     implementation 'org.jsoup:jsoup:1.15.2'
     implementation projects.native
 }
+
+configurations.all {
+    exclude group: 'dev.rikka.rikkax.appcompat', module: 'appcompat'
+    exclude group: 'dev.rikka.rikkax.material', module: 'material'
+}

app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -46,6 +47,7 @@
             android:configChanges="screenSize"
             android:exported="true"
             android:launchMode="singleTask"
+            android:banner="@mipmap/ic_leanback_banner"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
 
             <intent-filter>
@@ -53,6 +55,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />

app/src/main/java/com/hippo/ehviewer/EhApplication.java

@@ -38,6 +38,9 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.collection.LruCache;
 import androidx.core.os.LocaleListCompat;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.hippo.Native;
@@ -104,6 +107,8 @@ public class EhApplication extends SceneApplication {
     private static final boolean DEBUG_PRINT_IMAGE_COUNT = false;
     private static final long DEBUG_PRINT_INTERVAL = 3000L;
 
+    public static boolean locked = false;
+
     private static EhApplication instance;
 
     private final IntIdGenerator mIdGenerator = new IntIdGenerator();
@@ -297,9 +302,17 @@ public class EhApplication extends SceneApplication {
         return application.mFavouriteStatusRouter;
     }
 
+    static class EhlifecycleObserver implements DefaultLifecycleObserver {
+        @Override
+        public void onPause(@NonNull LifecycleOwner owner) {
+            locked = true;
+        }
+    }
+
     @SuppressLint("StaticFieldLeak")
     @Override
     public void onCreate() {
+        ProcessLifecycleOwner.get().getLifecycle().addObserver(new EhlifecycleObserver());
         instance = this;
 
         Thread.UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();

app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.java

@@ -1,191 +0,0 @@
-/*
- * Copyright 2016 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.preference;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Spinner;
-
-import androidx.appcompat.app.AlertDialog;
-
-import com.google.android.material.textfield.TextInputLayout;
-import com.hippo.ehviewer.EhApplication;
-import com.hippo.ehviewer.EhProxySelector;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.network.InetValidator;
-import com.hippo.preference.DialogPreference;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.ViewUtils;
-
-public class ProxyPreference extends DialogPreference implements View.OnClickListener {
-
-    private Spinner mType;
-    private TextInputLayout mIpInputLayout;
-    private EditText mIp;
-    private TextInputLayout mPortInputLayout;
-    private EditText mPort;
-
-    public ProxyPreference(Context context) {
-        super(context);
-        init();
-    }
-
-    public ProxyPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public ProxyPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    private void init() {
-        setDialogLayoutResource(R.layout.preference_dialog_proxy);
-        updateSummary(Settings.getProxyType(), Settings.getProxyIp(), Settings.getProxyPort());
-    }
-
-    private String getProxyTypeText(Context context, int type) {
-        String[] array = context.getResources().getStringArray(R.array.proxy_types);
-        return array[MathUtils.clamp(type, 0, array.length - 1)];
-    }
-
-    private void updateSummary(int type, String ip, int port) {
-        if ((type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS)
-                && (TextUtils.isEmpty(ip) || !InetValidator.isValidInetPort(port))) {
-            type = EhProxySelector.TYPE_SYSTEM;
-        }
-
-        if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) {
-            Context context = getContext();
-            setSummary(context.getString(R.string.settings_advanced_proxy_summary_1,
-                    getProxyTypeText(context, type),
-                    ip,
-                    port));
-        } else {
-            Context context = getContext();
-            setSummary(context.getString(R.string.settings_advanced_proxy_summary_2,
-                    getProxyTypeText(context, type)));
-        }
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-        super.onPrepareDialogBuilder(builder);
-        builder.setPositiveButton(android.R.string.ok, null);
-    }
-
-    @Override
-    @SuppressLint("SetTextI18n")
-    protected void onDialogCreated(AlertDialog dialog) {
-        super.onDialogCreated(dialog);
-
-        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(this);
-
-        mType = (Spinner) ViewUtils.$$(dialog, R.id.type);
-        mIpInputLayout = (TextInputLayout) ViewUtils.$$(dialog, R.id.ip_input_layout);
-        mIp = (EditText) ViewUtils.$$(dialog, R.id.ip);
-        mPortInputLayout = (TextInputLayout) ViewUtils.$$(dialog, R.id.port_input_layout);
-        mPort = (EditText) ViewUtils.$$(dialog, R.id.port);
-
-        int type = Settings.getProxyType();
-        String[] array = getContext().getResources().getStringArray(R.array.proxy_types);
-        mType.setSelection(MathUtils.clamp(type, 0, array.length));
-
-        mIp.setText(Settings.getProxyIp());
-
-        String portString;
-        int port = Settings.getProxyPort();
-        if (!InetValidator.isValidInetPort(port)) {
-            portString = null;
-        } else {
-            portString = Integer.toString(port);
-        }
-        mPort.setText(portString);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-        mType = null;
-        mIpInputLayout = null;
-        mIp = null;
-        mPortInputLayout = null;
-        mPort = null;
-    }
-
-    @Override
-    public void onClick(View v) {
-        Dialog dialog = getDialog();
-        Context context = getContext();
-        if (null == dialog || null == context || null == mType ||
-                null == mIpInputLayout || null == mIp ||
-                null == mPortInputLayout || null == mPort) {
-            return;
-        }
-
-        int type = mType.getSelectedItemPosition();
-
-        String ip = mIp.getText().toString().trim();
-        if (ip.isEmpty()) {
-            if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) {
-                mIpInputLayout.setError(context.getString(R.string.text_is_empty));
-                return;
-            }
-        }
-        mIpInputLayout.setError(null);
-
-        int port;
-        String portString = mPort.getText().toString().trim();
-        if (portString.isEmpty()) {
-            if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) {
-                mPortInputLayout.setError(context.getString(R.string.text_is_empty));
-                return;
-            } else {
-                port = -1;
-            }
-        } else {
-            try {
-                port = Integer.parseInt(portString);
-            } catch (NumberFormatException e) {
-                port = -1;
-            }
-            if (!InetValidator.isValidInetPort(port)) {
-                mPortInputLayout.setError(context.getString(R.string.proxy_invalid_port));
-                return;
-            }
-        }
-        mPortInputLayout.setError(null);
-
-        Settings.putProxyType(type);
-        Settings.putProxyIp(ip);
-        Settings.putProxyPort(port);
-
-        updateSummary(type, ip, port);
-
-        EhApplication.getEhProxySelector(getContext()).updateProxy();
-
-        dialog.dismiss();
-    }
-}

app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.kt

@@ -0,0 +1,162 @@
+/*
+ * Copyright 2016 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.preference
+
+import com.google.android.material.textfield.TextInputLayout
+import android.widget.EditText
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.EhProxySelector
+import android.text.TextUtils
+import com.hippo.network.InetValidator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.DialogInterface
+import android.util.AttributeSet
+import android.view.View
+import android.widget.AutoCompleteTextView
+import androidx.appcompat.app.AlertDialog
+import com.hippo.ehviewer.EhApplication
+import com.hippo.ehviewer.Settings
+import com.hippo.preference.DialogPreference
+import com.hippo.yorozuya.MathUtils
+import com.hippo.yorozuya.ViewUtils
+import java.lang.NumberFormatException
+
+class ProxyPreference @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : DialogPreference(context, attrs), View.OnClickListener {
+    private var mType: TextInputLayout? = null
+    private var mIpInputLayout: TextInputLayout? = null
+    private var mIp: EditText? = null
+    private var mPortInputLayout: TextInputLayout? = null
+    private var mPort: EditText? = null
+    private val mArray: Array<String>
+
+    init {
+        mArray = context.resources.getStringArray(R.array.proxy_types)
+        dialogLayoutResource = R.layout.preference_dialog_proxy
+        updateSummary(Settings.getProxyType(), Settings.getProxyIp(), Settings.getProxyPort())
+    }
+
+    private fun getProxyTypeText(type: Int): String {
+        return mArray[MathUtils.clamp(type, 0, mArray.size - 1)]
+    }
+
+    private fun updateSummary(type: Int, ip: String?, port: Int) {
+        var type1 = type
+        if ((type1 == EhProxySelector.TYPE_HTTP || type1 == EhProxySelector.TYPE_SOCKS)
+            && (TextUtils.isEmpty(ip) || !InetValidator.isValidInetPort(port))
+        ) {
+            type1 = EhProxySelector.TYPE_SYSTEM
+        }
+        summary = if (type1 == EhProxySelector.TYPE_HTTP || type1 == EhProxySelector.TYPE_SOCKS) {
+            val context = context
+            context.getString(
+                R.string.settings_advanced_proxy_summary_1,
+                getProxyTypeText(type1),
+                ip,
+                port
+            )
+        } else {
+            val context = context
+            context.getString(
+                R.string.settings_advanced_proxy_summary_2,
+                getProxyTypeText(type1)
+            )
+        }
+    }
+
+    override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
+        super.onPrepareDialogBuilder(builder)
+        builder.setPositiveButton(android.R.string.ok, null)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onDialogCreated(dialog: AlertDialog) {
+        super.onDialogCreated(dialog)
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(this)
+        mType = ViewUtils.`$$`(dialog, R.id.type) as TextInputLayout
+        val array = context.resources.getStringArray(R.array.proxy_types)
+        mIpInputLayout = ViewUtils.`$$`(dialog, R.id.ip_input_layout) as TextInputLayout
+        mIp = ViewUtils.`$$`(dialog, R.id.ip) as EditText
+        mPortInputLayout = ViewUtils.`$$`(dialog, R.id.port_input_layout) as TextInputLayout
+        mPort = ViewUtils.`$$`(dialog, R.id.port) as EditText
+        val type = Settings.getProxyType()
+        (mType!!.editText as AutoCompleteTextView).setText(array[MathUtils.clamp(type, 0, array.size)], false)
+        mIp!!.setText(Settings.getProxyIp())
+        val portString: String?
+        val port = Settings.getProxyPort()
+        portString = if (!InetValidator.isValidInetPort(port)) {
+            null
+        } else {
+            port.toString()
+        }
+        mPort!!.setText(portString)
+    }
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        super.onDialogClosed(positiveResult)
+        mType = null
+        mIpInputLayout = null
+        mIp = null
+        mPortInputLayout = null
+        mPort = null
+    }
+
+    override fun onClick(v: View) {
+        val dialog = dialog
+        val context: Context = context
+        if (null == dialog || null == mType || null == mIpInputLayout || null == mIp || null == mPortInputLayout || null == mPort) {
+            return
+        }
+        val type = mArray.indexOf(mType!!.editText!!.text.toString())
+        val ip = mIp!!.text.toString().trim { it <= ' ' }
+        if (ip.isEmpty()) {
+            if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) {
+                mIpInputLayout!!.error = context.getString(R.string.text_is_empty)
+                return
+            }
+        }
+        mIpInputLayout!!.error = null
+        val port: Int
+        val portString = mPort!!.text.toString().trim { it <= ' ' }
+        if (portString.isEmpty()) {
+            if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) {
+                mPortInputLayout!!.error = context.getString(R.string.text_is_empty)
+                return
+            } else {
+                port = -1
+            }
+        } else {
+            port = try {
+                portString.toInt()
+            } catch (e: NumberFormatException) {
+                -1
+            }
+            if (!InetValidator.isValidInetPort(port)) {
+                mPortInputLayout!!.error = context.getString(R.string.proxy_invalid_port)
+                return
+            }
+        }
+        mPortInputLayout!!.error = null
+        Settings.putProxyType(type)
+        Settings.putProxyIp(ip)
+        Settings.putProxyPort(port)
+        updateSummary(type, ip, port)
+        EhApplication.getEhProxySelector(getContext()).updateProxy()
+        dialog.dismiss()
+    }
+}

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java

@@ -47,6 +47,7 @@ import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 import com.hippo.app.EditTextDialogBuilder;
 import com.hippo.ehviewer.AppConfig;
+import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhTagDatabase;
@@ -420,6 +421,9 @@ public final class MainActivity extends StageActivity
 
     @Override
     protected void onResume() {
+        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this) && EhApplication.locked) {
+            startScene(new Announcer(SecurityScene.class), true);
+        }
         super.onResume();
         setNavCheckedItem(mNavCheckedItem);
         checkClipboardUrl();

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java

@@ -21,6 +21,7 @@ import android.view.MenuItem;
 
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.hippo.ehviewer.R;
@@ -41,6 +42,7 @@ public final class SettingsActivity extends EhActivity {
         if (savedInstanceState == null) {
             getSupportFragmentManager()
                     .beginTransaction()
+                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_MATCH_ACTIVITY_OPEN)
                     .replace(R.id.fragment, new SettingsFragment())
                     .commitAllowingStateLoss();
         }

app/src/main/java/com/hippo/ehviewer/ui/fragment/AboutFragment.java

@@ -30,7 +30,7 @@ public class AboutFragment extends BasePreferenceFragment {
     private static final String KEY_CHECK_FOR_UPDATES = "check_for_updates";
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.about_settings);
         Preference author = findPreference(KEY_AUTHOR);
         author.setSummary(Html.fromHtml(getString(R.string.settings_about_author_summary).replace('$', '@')));

app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java

@@ -223,7 +223,7 @@ public class AdvancedFragment extends BasePreferenceFragment {
             });
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.advanced_settings);
 
         Preference dumpLogcat = findPreference(KEY_DUMP_LOGCAT);

app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java

@@ -22,10 +22,13 @@ import android.os.Bundle;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
+import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.ui.SettingsActivity;
-import com.takisoft.preferencex.PreferenceFragmentCompat;
 
 
 public class BasePreferenceFragment extends PreferenceFragmentCompat
@@ -52,10 +55,26 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
     }
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
 
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        String key = preference.getKey();
+        try {
+            Fragment classObj = (Fragment)Class.forName(key).newInstance();
+            requireActivity().getSupportFragmentManager()
+                    .beginTransaction()
+                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                    .replace(R.id.fragment, classObj)
+                    .addToBackStack(null)
+                    .commitAllowingStateLoss();
+        } catch (ClassNotFoundException | IllegalAccessException | java.lang.InstantiationException ignored) {
+        }
+        return true;
+    }
+
     private void setTitle(@StringRes int string) {
         requireActivity().setTitle(string);
     }

app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java

@@ -59,7 +59,7 @@ public class DownloadFragment extends BasePreferenceFragment {
             });
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.download_settings);
 
         Preference mediaScan = findPreference(Settings.KEY_MEDIA_SCAN);

app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java

@@ -31,7 +31,7 @@ import com.hippo.ehviewer.client.EhTagDatabase;
 public class EhFragment extends BasePreferenceFragment {
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.eh_settings);
 
         Preference theme = findPreference(Settings.KEY_THEME);

app/src/main/java/com/hippo/ehviewer/ui/fragment/PrivacyFragment.kt

@@ -28,7 +28,7 @@ import com.hippo.ehviewer.ui.scene.SecurityScene.Companion.isAuthenticationSuppo
  * Created by Mo10 on 2018/2/10.
  */
 class PrivacyFragment : BasePreferenceFragment() {
-    override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.privacy_settings)
     }
 

app/src/main/java/com/hippo/ehviewer/ui/fragment/ReadFragment.java

@@ -25,7 +25,7 @@ import com.hippo.ehviewer.R;
 public class ReadFragment extends BasePreferenceFragment {
 
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.read_settings);
     }
 

app/src/main/java/com/hippo/ehviewer/ui/fragment/SettingsFragment.java

@@ -21,12 +21,15 @@ package com.hippo.ehviewer.ui.fragment;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
 
 import com.hippo.ehviewer.R;
 
 public class SettingsFragment extends BasePreferenceFragment {
     @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.settings_headers);
     }
 

app/src/main/java/com/hippo/ehviewer/ui/scene/SecurityScene.kt

@@ -27,6 +27,7 @@ import androidx.biometric.auth.AuthPromptCallback
 import androidx.biometric.auth.startClass2BiometricOrCredentialAuthentication
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 
 class SecurityScene : SolidScene() {
@@ -39,7 +40,7 @@ class SecurityScene : SolidScene() {
         if (isAuthenticationSupported(requireContext()))
             startAuthentication(getString(R.string.settings_privacy_require_unlock))
         else
-            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
+            onSuccess()
     }
 
     private fun startAuthentication(
@@ -61,8 +62,15 @@ class SecurityScene : SolidScene() {
             activity: FragmentActivity?,
             result: BiometricPrompt.AuthenticationResult
         ) {
-            super.onAuthenticationSucceeded(activity, result)
-            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
+            onSuccess()
+        }
+
+        override fun onAuthenticationError(
+            activity: FragmentActivity?,
+            errorCode: Int,
+            errString: CharSequence
+        ) {
+            requireActivity().finish()
         }
     }
 
@@ -73,4 +81,11 @@ class SecurityScene : SolidScene() {
                 .canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS
         }
     }
+
+    private fun onSuccess() {
+        EhApplication.locked = false
+        if (stackIndex == 0)
+            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
+        finish()
+    }
 }

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

@@ -1,73 +0,0 @@
-/*
- * Copyright 2016 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.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.widget.ArrayAdapter;
-
-import androidx.appcompat.widget.AppCompatSpinner;
-
-import com.hippo.ehviewer.R;
-
-public class CuteSpinner extends AppCompatSpinner {
-
-    public CuteSpinner(Context context) {
-        super(context);
-        init(context, null, androidx.appcompat.R.attr.spinnerStyle);
-    }
-
-    public CuteSpinner(Context context, int mode) {
-        super(context, mode);
-        init(context, null, androidx.appcompat.R.attr.spinnerStyle);
-    }
-
-    public CuteSpinner(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs, androidx.appcompat.R.attr.spinnerStyle);
-    }
-
-    public CuteSpinner(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs, defStyleAttr);
-    }
-
-    public CuteSpinner(Context context, AttributeSet attrs, int defStyleAttr, int mode) {
-        super(context, attrs, defStyleAttr, mode);
-        init(context, attrs, defStyleAttr);
-    }
-
-    public CuteSpinner(Context context, AttributeSet attrs, int defStyleAttr, int mode, Resources.Theme popupTheme) {
-        super(context, attrs, defStyleAttr, mode, popupTheme);
-        init(context, attrs, defStyleAttr);
-    }
-
-    private void init(Context context, AttributeSet attrs, int defStyleAttr) {
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                androidx.appcompat.R.styleable.Spinner, defStyleAttr, 0);
-        final CharSequence[] entries = a.getTextArray(androidx.appcompat.R.styleable.Spinner_android_entries);
-        if (entries != null) {
-            final ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(context,
-                    R.layout.item_cute_spinner_item, entries);
-            adapter.setDropDownViewResource(androidx.appcompat.R.layout.support_simple_spinner_dropdown_item);
-            setAdapter(adapter);
-        }
-        a.recycle();
-    }
-}

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="144dp"
+    android:height="144dp"
+    android:tint="@color/red_500"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="@string/pd_alert" />
+
+</vector>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="256dp"
+    android:height="256dp"
+    android:tint="@color/brown_500"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="@string/pd_cookie" />
+
+</vector>

app/src/main/res/layout-television/scene_cookie_sign_in.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 hathlife
+  ~
+  ~ 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    app:fitsSystemWindowsInsets="top|bottom">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="80dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="32dp"
+                android:text="@string/cookie_explain"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/text_little_small"
+                app:drawableTopCompat="@drawable/v_cookie_brown_x256" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/buttonPanel"
+            style="?attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:paddingLeft="12dp"
+            android:paddingTop="4dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="4dp">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="80dp" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/ipb_member_id_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/keyline_margin"
+                android:hint="ipb_member_id"
+                android:minWidth="@dimen/single_max_width">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/ipb_member_id"
+                    tools:ignore="HardcodedText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/ipb_pass_hash_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:hint="ipb_pass_hash"
+                android:minWidth="@dimen/single_max_width">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/ipb_pass_hash"
+                    tools:ignore="HardcodedText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/igneous_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:hint="igneous"
+                android:minWidth="@dimen/single_max_width">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/igneous"
+                    tools:ignore="HardcodedText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionDone"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+                <Space
+                    android:layout_width="wrap_content"
+                    android:layout_height="64dp"
+                    android:layout_weight="1" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Button
+                android:id="@+id/ok"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:insetLeft="80dp"
+                android:insetRight="80dp"
+                android:text="@android:string/ok" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="40dp" />
+
+            <TextView
+                android:id="@+id/from_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="?selectableItemBackground"
+                android:paddingHorizontal="8dp"
+                android:text="@string/from_clipboard" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</FrameLayout>

app/src/main/res/layout-television/scene_login.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 hathlife
+  ~
+  ~ 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:fitsSystemWindowsInsets="top|bottom">
+
+
+    <LinearLayout
+        android:id="@+id/login_form"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:padding="@dimen/keyline_margin">
+
+        <LinearLayout
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="257dp"
+                android:layout_height="518dp"
+                android:layout_gravity="center_horizontal"
+                android:padding="@dimen/keyline_margin"
+                app:srcCompat="@mipmap/ic_launcher" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/buttonPanel"
+            style="?attr/buttonBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:paddingLeft="12dp"
+            android:paddingTop="100dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="4dp">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/username_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:hint="@string/username"
+                android:minWidth="@dimen/single_max_width">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:imeOptions="actionNext"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/password_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:hint="@string/password"
+                android:minWidth="@dimen/single_max_width"
+                app:passwordToggleEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:imeOptions="actionDone"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:singleLine="true" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="40dp" />
+
+            <Button
+                android:id="@+id/sign_in"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:insetLeft="80dp"
+                android:insetRight="80dp"
+                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:insetLeft="80dp"
+                android:insetRight="80dp"
+                android:text="@string/register" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="40dp" />
+
+            <TextView
+                android:id="@+id/sign_in_via_webview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="?selectableItemBackground"
+                android:paddingHorizontal="8dp"
+                android:text="@string/sign_in_via_webview" />
+
+            <TextView
+                android:id="@+id/sign_in_via_cookies"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="?selectableItemBackground"
+                android:paddingHorizontal="8dp"
+                android:text="@string/sign_in_via_cookies" />
+
+            <TextView
+                android:id="@+id/skip_signing_in"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="?selectableItemBackground"
+                android:paddingHorizontal="8dp"
+                android:text="@string/skip_signing_in" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    <FrameLayout
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:visibility="gone">
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            style="@style/ProgressView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+    </FrameLayout>
+
+</FrameLayout>

app/src/main/res/layout-television/scene_select_site.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 hathlife
+  ~
+  ~ 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:fitsSystemWindowsInsets="top|bottom">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="96dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="128dp"
+                android:paddingTop="100dp"
+                android:paddingEnd="12dp"
+                android:text="@string/select_scene"
+                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="32dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="128dp"
+                android:paddingTop="100dp"
+                android:paddingEnd="12dp"
+                android:text="@string/select_scene_explain" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
+                android:layout_weight="1" />
+
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/button_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/keyline_margin"
+                app:selectionRequired="true"
+                app:singleSelection="true">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/site_e"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="8dp"
+                    android:text="@string/site_e" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/site_ex"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="8dp"
+                    android:text="@string/site_ex" />
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="77dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/ok"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:insetLeft="80dp"
+                android:insetRight="80dp"
+                android:text="@android:string/ok" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="96dp"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</FrameLayout>

app/src/main/res/layout-television/scene_warning.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 hathlife
+  ~
+  ~ 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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="end"
+    android:orientation="vertical"
+    app:fitsSystemWindowsInsets="top|bottom">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="480dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="108dp" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="16dp"
+                android:paddingStart="128dp"
+                android:paddingTop="16dp"
+                android:paddingEnd="12dp"
+                android:text="@string/app_waring"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="20sp"
+                app:drawableTopCompat="@drawable/v_alert_red_x144" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="224dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/reject"
+                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:insetLeft="80dp"
+                android:insetRight="80dp"
+                android:insetBottom="16dp"
+                android:text="@string/reject" />
+
+            <Button
+                android:id="@+id/accept"
+                style="@style/Widget.Material3.Button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="4dp"
+                android:layout_weight="1"
+
+                android:insetLeft="80dp"
+                android:insetRight="80dp"
+                android:insetBottom="16dp"
+                android:text="@string/accept" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="176dp"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</FrameLayout>

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

@@ -21,7 +21,7 @@
     android:paddingHorizontal="?attr/dialogPreferredPadding"
     android:paddingTop="@dimen/abc_dialog_padding_top_material">
 
-    <com.hippo.widget.CuteSpinner
+    <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -39,7 +39,7 @@
                 android:layout_weight="1"
                 android:text="@string/settings_read_screen_rotation" />
 
-            <com.hippo.widget.CuteSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/screen_rotation"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                 android:layout_weight="1"
                 android:text="@string/settings_read_reading_direction" />
 
-            <com.hippo.widget.CuteSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/reading_direction"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
                 android:layout_weight="1"
                 android:text="@string/settings_read_page_scaling" />
 
-            <com.hippo.widget.CuteSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/page_scaling"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                 android:layout_weight="1"
                 android:text="@string/settings_read_start_position" />
 
-            <com.hippo.widget.CuteSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/start_position"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
                 android:layout_weight="1"
                 android:text="@string/read_theme" />
 
-            <com.hippo.widget.CuteSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/read_theme"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

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

@@ -15,6 +15,7 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -22,13 +23,20 @@
     android:paddingTop="18dp"
     android:paddingRight="?attr/dialogPreferredPadding">
 
-    <com.hippo.widget.CuteSpinner
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/type"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:entries="@array/proxy_types"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp" />
+        android:hint="@string/proxy_type_name">
+
+        <AutoCompleteTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="none"
+            app:simpleItems="@array/proxy_types" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/ip_input_layout"

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

@@ -62,33 +62,33 @@
         app:fitsSystemWindowsInsets="bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_check_all_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_play_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_pause_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_delete_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_folder_move_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton

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

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

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

@@ -51,21 +51,21 @@
         app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_magnify_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_go_to_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Primary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fabSize="mini"
             app:srcCompat="@drawable/v_refresh_dark_x24" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton

app/src/main/res/values-zh-rCN/strings.xml

@@ -732,7 +732,7 @@
     <string name="tag_vote_up">是的，这很正确</string>
     <string name="tag_vote_successfully">投票成功</string>
     <string name="from_clipboard">从剪贴板导入</string>
-    <string name="from_clipboard_error">未在剪贴板中发现 Cookeis。</string>
+    <string name="from_clipboard_error">未在剪贴板中发现 Cookies。</string>
     <string name="delete_search_history">从搜索记录中删除“%s”？</string>
     <string name="settings_advanced_dns_over_http_title">安全 DNS（DoH）</string>
     <string name="settings_advanced_dns_over_http_summary">解决某些地区的 DNS 污染问题</string>
@@ -762,4 +762,5 @@
 
     <string name="show_library_version">依赖库之版本</string>
     <string name="settings_privacy_require_unlock">需要解锁</string>
+    <string name="proxy_type_name">代理类型</string>
 </resources>

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

@@ -620,7 +620,7 @@
     <string name="settings_about_declaration" translatable="false">EhViewer</string>
     <string name="settings_about_declaration_summary">EhViewer is not affiliated with E-Hentai.org in any way</string>
     <string name="settings_about_author">Author</string>
-    <string name="settings_about_author_summary" translatable="false">&lt;del&gt;Hippo &amp;lt;ehviewersu$gmail.com&amp;gt;&lt;/del&gt;&lt;br&gt;NekoInverter &amp;lt;nekoworkshop$protonmail.com&amp;gt; &lt;br&gt;飛鳥澪</string>
+    <string name="settings_about_author_summary" translatable="false">&lt;del&gt;Hippo &amp;lt;ehviewersu$gmail.com&amp;gt;&lt;/del&gt;&lt;br&gt;NekoInverter&lt;br&gt;飛鳥澪</string>
     <string name="settings_about_telegram">Telegram</string>
     <string name="settings_about_latest_release">Latest release</string>
     <string name="settings_about_website">Website</string>
@@ -826,4 +826,5 @@
 
     <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>
 </resources>

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

@@ -30,10 +30,8 @@
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch
-        </item>
-        <item name="switchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
         <item name="filterChipStyle">@style/Widget.Material3.Chip.Filter</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.Rikka.Material3</item>
     </style>
 
     <style name="ThemeOverlay" />

app/src/main/res/xml/advanced_settings.xml

@@ -17,14 +17,14 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="save_parse_error_body"
         android:summary="@string/settings_advanced_save_parse_error_body_summary"
         android:title="@string/settings_advanced_save_parse_error_body"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="save_crash_log"
         android:summary="@string/settings_advanced_save_crash_log_summary"
@@ -72,7 +72,7 @@
         android:title="@string/settings_advanced_proxy"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="built_in_hosts_2"
         android:summary="@string/settings_advanced_built_in_hosts_summary"
@@ -80,13 +80,12 @@
         app:iconSpaceReserved="false" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.HostsFragment"
-        android:key="custom_hosts_2"
+        android:key="com.hippo.ehviewer.ui.fragment.HostsFragment"
         android:summary="@string/settings_advanced_custom_hosts_summary"
         android:title="@string/settings_advanced_custom_hosts_title"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="domain_fronting"
         android:summary="@string/settings_advanced_domain_fronting_summary"

app/src/main/res/xml/download_settings.xml

@@ -22,7 +22,7 @@
         android:title="@string/settings_download_download_location"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="media_scan"
         android:title="@string/settings_download_media_scan"
@@ -66,7 +66,7 @@
         app:entryValues="@array/image_resolution_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="download_origin_image"
         android:summary="@string/settings_download_download_origin_image_summary"

app/src/main/res/xml/eh_settings.xml

@@ -39,15 +39,13 @@
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.SignInRequiredPreference
-        android:fragment="com.hippo.ehviewer.ui.fragment.UConfigFragment"
-        android:key="u_config"
+        android:key="com.hippo.ehviewer.ui.fragment.UConfigFragment"
         android:summary="@string/settings_u_config_summary"
         android:title="@string/settings_u_config"
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.SignInRequiredPreference
-        android:fragment="com.hippo.ehviewer.ui.fragment.MyTagsFragment"
-        android:key="my_tags"
+        android:key="com.hippo.ehviewer.ui.fragment.MyTagsFragment"
         android:summary="@string/settings_my_tags_summary"
         android:title="@string/settings_my_tags"
         app:iconSpaceReserved="false" />
@@ -61,7 +59,7 @@
         android:title="@string/dark_theme"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:key="black_dark_theme"
         android:title="@string/black_dark_theme"
         app:iconSpaceReserved="false" />
@@ -111,27 +109,27 @@
         app:entryValues="@array/thumb_resolution_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="fix_thumb_url"
         android:title="@string/settings_eh_fix_thumb_url"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="show_jpn_title"
         android:summary="@string/settings_eh_show_jpn_title_summary"
         android:title="@string/settings_eh_show_jpn_title"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="show_gallery_pages"
         android:summary="@string/settings_eh_show_gallery_pages_summary"
         android:title="@string/settings_eh_show_gallery_pages"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="show_tag_translations"
         android:summary="@string/settings_eh_show_tag_translations_summary"
@@ -145,19 +143,18 @@
         app:url="@string/settings_eh_tag_translations_source_url" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.FilterFragment"
-        android:key="filter"
+        android:key="com.hippo.ehviewer.ui.fragment.FilterFragment"
         android:summary="@string/settings_eh_filter_summary"
         android:title="@string/settings_eh_filter"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="cellular_network_warning"
         android:title="@string/settings_eh_metered_network_warning"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="request_news"
         android:title="@string/settings_request_news_title"

app/src/main/res/xml/privacy_settings.xml

@@ -19,13 +19,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="require_unlock"
         android:title="@string/settings_privacy_require_unlock"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="enable_secure"
         android:title="@string/settings_privacy_secure"

app/src/main/res/xml/read_settings.xml

@@ -62,56 +62,56 @@
         app:entryValues="@array/read_theme_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="keep_screen_on"
         android:title="@string/settings_read_keep_screen_on"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="gallery_show_clock"
         android:title="@string/settings_read_show_clock"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="gallery_show_progress"
         android:title="@string/settings_read_show_progress"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="gallery_show_battery"
         android:title="@string/settings_read_show_battery"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="gallery_show_page_interval"
         android:title="@string/settings_read_show_page_interval"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="volume_page"
         android:title="@string/settings_read_volume_page"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:dependency="volume_page"
         android:key="reserve_volume_page"
         android:title="@string/settings_read_reverse_volume"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="true"
         android:key="reading_fullscreen"
         android:title="@string/settings_read_reading_fullscreen"
         app:iconSpaceReserved="false" />
 
-    <SwitchPreferenceCompat
+    <rikka.material.preference.MaterialSwitchPreference
         android:defaultValue="false"
         android:key="custom_screen_lightness"
         android:title="@string/settings_read_custom_screen_lightness"

app/src/main/res/xml/settings_headers.xml

@@ -17,32 +17,32 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.EhFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.EhFragment"
         android:icon="@drawable/v_sad_panda_primary_x24"
         android:title="@string/settings_eh" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.ReadFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.ReadFragment"
         android:icon="@drawable/v_book_open_primary_x24"
         android:title="@string/settings_read" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.DownloadFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.DownloadFragment"
         android:icon="@drawable/v_download_primary_x24"
         android:title="@string/settings_download" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.PrivacyFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.PrivacyFragment"
         android:icon="@drawable/v_sec_primary_x24"
         android:title="@string/settings_privacy" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.AdvancedFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.AdvancedFragment"
         android:icon="@drawable/v_adb_primary_x24"
         android:title="@string/settings_advanced" />
 
     <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.AboutFragment"
+        android:key="com.hippo.ehviewer.ui.fragment.AboutFragment"
         android:icon="@drawable/v_info_primary_x24"
         android:title="@string/settings_about" />
 </PreferenceScreen>

build.gradle

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

daogenerator/build.gradle

@@ -24,6 +24,6 @@ task executeDaoGenerator(type:JavaExec) {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'org.greenrobot:greendao-generator:3.3.0'
-    implementation 'org.jboss.forge.roaster:roaster-api:2.25.0.Final'
-    implementation 'org.jboss.forge.roaster:roaster-jdt:2.25.0.Final'
+    implementation 'org.jboss.forge.roaster:roaster-api:2.26.0.Final'
+    implementation 'org.jboss.forge.roaster:roaster-jdt:2.26.0.Final'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

native/build.gradle

@@ -5,7 +5,7 @@ plugins {
 android {
     compileSdkVersion 33
     buildToolsVersion "33.0.0"
-    ndkVersion "24.0.8215888"
+    ndkVersion "25.0.8775105"
 
     defaultConfig {
         minSdkVersion 26

native/src/main/jni/CMakeLists.txt

@@ -1,6 +1,18 @@
 project(ehviewer)
 cmake_minimum_required(VERSION 3.4.1)
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Oz -fvisibility=hidden -fvisibility-inlines-hidden -flto\
+           -mllvm -polly \
+           -mllvm -polly-run-dce \
+		   -mllvm -polly-run-inliner \
+           -mllvm -polly-isl-arg=--no-schedule-serialize-sccs \
+		   -mllvm -polly-ast-use-context \
+           -mllvm -polly-detect-keep-going \
+           -mllvm -polly-position=before-vectorizer \
+		   -mllvm -polly-vectorizer=stripmine \
+           -mllvm -polly-detect-profitability-min-per-loop-insts=40 \
+		   -mllvm -polly-invariant-load-hoisting")
+
 # Build liblzma
 add_subdirectory(liblzma)