Version bump

* No hardcode primary color anymore

app/build.gradle

@@ -35,11 +35,11 @@ android {
     }
 
     defaultConfig {
-        applicationId "io.github.nekoinverter.ehviewer"
+        applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 32
-        versionCode 114523
-        versionName "1.7.27.3"
+        versionCode 114525
+        versionName "1.7.27.5"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -100,8 +100,8 @@ tasks.withType(JavaCompile) {
 
 dependencies {
     implementation 'androidx.activity:activity:1.4.0'
-    implementation "androidx.activity:activity-compose:1.4.0"
-    implementation 'androidx.biometric:biometric:1.1.0'
+    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
     implementation 'androidx.browser:browser:1.4.0'
     implementation 'androidx.core:core:1.7.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'

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

@@ -86,7 +86,7 @@ public class Settings {
      ****** Advanced
      ********************/
     public static final String KEY_SAVE_PARSE_ERROR_BODY = "save_parse_error_body";
-    public static final String KEY_SECURITY = "security";
+    public static final String KEY_SECURITY = "require_unlock";
     public static final String DEFAULT_SECURITY = "";
     public static final String KEY_ENABLE_FINGERPRINT = "enable_fingerprint";
     public static final String KEY_READ_CACHE_SIZE = "read_cache_size";
@@ -1028,22 +1028,18 @@ public class Settings {
         return getBoolean(KEY_SAVE_CRASH_LOG, DEFAULT_SAVE_CRASH_LOG);
     }
 
-    public static String getSecurity() {
-        return getString(KEY_SECURITY, DEFAULT_SECURITY);
+    public static boolean getSecurity() {
+        return getBoolean(KEY_SECURITY, false);
     }
 
-    public static void putSecurity(String value) {
-        putString(KEY_SECURITY, value);
+    public static void putSecurity(boolean value) {
+        putBoolean(KEY_SECURITY, value);
     }
 
     public static boolean getEnableFingerprint() {
         return getBoolean(KEY_ENABLE_FINGERPRINT, true);
     }
 
-    public static void putEnableFingerprint(boolean value) {
-        putBoolean(KEY_ENABLE_FINGERPRINT, value);
-    }
-
     public static int getReadCacheSize() {
         return getIntFromStr(KEY_READ_CACHE_SIZE, DEFAULT_READ_CACHE_SIZE);
     }

app/src/main/java/com/hippo/ehviewer/download/DownloadService.java

@@ -29,7 +29,6 @@ import androidx.annotation.Nullable;
 import androidx.core.app.NotificationChannelCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
-import androidx.core.content.ContextCompat;
 
 import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
@@ -224,8 +223,6 @@ public class DownloadService extends Service implements DownloadManager.Download
                 .setOngoing(true)
                 .setAutoCancel(false)
                 .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
-                .setColorized(true)
                 .addAction(R.drawable.v_pause_x24, getString(R.string.stat_download_action_stop_all), piStopAll)
                 .setShowWhen(false)
                 .setChannelId(CHANNEL_ID);
@@ -254,7 +251,6 @@ public class DownloadService extends Service implements DownloadManager.Download
         mDownloadedBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID)
                 .setSmallIcon(android.R.drawable.stat_sys_download_done)
                 .setContentTitle(getString(R.string.stat_download_done_title))
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
                 .setDeleteIntent(piClear)
                 .setOngoing(false)
                 .setAutoCancel(true)
@@ -273,7 +269,6 @@ public class DownloadService extends Service implements DownloadManager.Download
                 .setContentText(getString(R.string.stat_509_alert_title))
                 .setContentText(getString(R.string.stat_509_alert_text))
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
-                .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
                 .setAutoCancel(true)
                 .setOngoing(false)
                 .setCategory(NotificationCompat.CATEGORY_ERROR);

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

@@ -49,7 +49,6 @@ import android.webkit.MimeTypeMap;
 import android.widget.FrameLayout;
 import android.widget.SeekBar;
 import android.widget.Spinner;
-import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -261,6 +260,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         mGalleryInfo = intent.getParcelableExtra(KEY_GALLERY_INFO);
         mPage = intent.getIntExtra(KEY_PAGE, -1);
         buildProvider();
+    }
+
+    private void onRestore(@NonNull Bundle savedInstanceState) {
+        mAction = savedInstanceState.getString(KEY_ACTION);
+        mFilename = savedInstanceState.getString(KEY_FILENAME);
+        mUri = savedInstanceState.getParcelable(KEY_URI);
+        mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO);
+        mPage = savedInstanceState.getInt(KEY_PAGE, -1);
+        mCurrentIndex = savedInstanceState.getInt(KEY_CURRENT_INDEX);
+        buildProvider();
     }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
             new ActivityResultContracts.RequestPermission(),
             result -> {
@@ -272,16 +281,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                 mSavingPage = -1;
             });
 
-    private void onRestore(@NonNull Bundle savedInstanceState) {
-        mAction = savedInstanceState.getString(KEY_ACTION);
-        mFilename = savedInstanceState.getString(KEY_FILENAME);
-        mUri = savedInstanceState.getParcelable(KEY_URI);
-        mGalleryInfo = savedInstanceState.getParcelable(KEY_GALLERY_INFO);
-        mPage = savedInstanceState.getInt(KEY_PAGE, -1);
-        mCurrentIndex = savedInstanceState.getInt(KEY_CURRENT_INDEX);
-        buildProvider();
-    }
-
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);

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

@@ -28,7 +28,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
@@ -143,7 +142,7 @@ public final class MainActivity extends StageActivity
     @NonNull
     @Override
     protected Announcer getLaunchAnnouncer() {
-        if (!TextUtils.isEmpty(Settings.getSecurity())) {
+        if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
             return new Announcer(SecurityScene.class);
         } else if (Settings.getShowWarning()) {
             return new Announcer(WarningScene.class);
@@ -161,7 +160,7 @@ public final class MainActivity extends StageActivity
     // Sometimes scene can't show directly
     private Announcer processAnnouncer(Announcer announcer) {
         if (0 == getSceneCount()) {
-            if (!TextUtils.isEmpty(Settings.getSecurity())) {
+            if (Settings.getSecurity() && SecurityScene.Companion.isAuthenticationSupported(this)) {
                 Bundle newArgs = new Bundle();
                 newArgs.putString(SecurityScene.KEY_TARGET_SCENE, announcer.getClazz().getName());
                 newArgs.putBundle(SecurityScene.KEY_TARGET_ARGS, announcer.getArgs());

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

@@ -1,37 +0,0 @@
-package com.hippo.ehviewer.ui.fragment;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import androidx.annotation.Nullable;
-import androidx.preference.Preference;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-
-/**
- * Created by Mo10 on 2018/2/10.
- */
-
-public class PrivacyFragment extends BasePreferenceFragment {
-    private static final String KEY_PATTERN_PROTECTION = "pattern_protection";
-
-    @Override
-    public void onCreatePreferencesFix(@Nullable Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.privacy_settings);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        Preference patternProtection = findPreference(KEY_PATTERN_PROTECTION);
-        patternProtection.setSummary(TextUtils.isEmpty(Settings.getSecurity()) ?
-                R.string.settings_privacy_pattern_protection_not_set :
-                R.string.settings_privacy_pattern_protection_set);
-    }
-
-    @Override
-    public int getFragmentTitle() {
-        return R.string.settings_privacy;
-    }
-}

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

@@ -0,0 +1,29 @@
+package com.hippo.ehviewer.ui.fragment
+
+import android.os.Bundle
+import androidx.preference.SwitchPreferenceCompat
+import com.hippo.ehviewer.R
+import com.hippo.ehviewer.Settings
+import com.hippo.ehviewer.ui.scene.SecurityScene.Companion.isAuthenticationSupported
+
+/**
+ * Created by Mo10 on 2018/2/10.
+ */
+class PrivacyFragment : BasePreferenceFragment() {
+    override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
+        addPreferencesFromResource(R.xml.privacy_settings)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (!isAuthenticationSupported(requireContext())) {
+            Settings.putSecurity(false)
+            findPreference<SwitchPreferenceCompat>("require_unlock")?.isEnabled = false
+            findPreference<SwitchPreferenceCompat>("require_unlock")?.isChecked = false
+        }
+    }
+
+    override fun getFragmentTitle(): Int {
+        return R.string.settings_privacy
+    }
+}

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

@@ -1,87 +0,0 @@
-package com.hippo.ehviewer.ui.fragment;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.biometric.BiometricManager;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.widget.lockpattern.LockPatternUtils;
-import com.hippo.widget.lockpattern.LockPatternView;
-import com.hippo.yorozuya.ViewUtils;
-
-public class SetSecurityFragment extends BaseFragment implements View.OnClickListener {
-
-    @Nullable
-    private LockPatternView mPatternView;
-    @Nullable
-    private View mCancel;
-    @Nullable
-    private View mSet;
-    @Nullable
-    private CheckBox mFingerprint;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.activity_set_security, container, false);
-
-        mPatternView = (LockPatternView) ViewUtils.$$(view, R.id.pattern_view);
-        mCancel = ViewUtils.$$(view, R.id.cancel);
-        mSet = ViewUtils.$$(view, R.id.set);
-        mFingerprint = (CheckBox) ViewUtils.$$(view, R.id.fingerprint_checkbox);
-
-        String pattern = Settings.getSecurity();
-        if (!TextUtils.isEmpty(pattern)) {
-            mPatternView.setPattern(LockPatternView.DisplayMode.Correct,
-                    LockPatternUtils.stringToPattern(pattern));
-        }
-
-        if (BiometricManager.from(requireContext()).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS) {
-            mFingerprint.setVisibility(View.VISIBLE);
-            mFingerprint.setChecked(Settings.getEnableFingerprint());
-        }
-
-        mCancel.setOnClickListener(this);
-        mSet.setOnClickListener(this);
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        mPatternView = null;
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v == mCancel) {
-            requireActivity().onBackPressed();
-        } else if (v == mSet) {
-            if (null != mPatternView && null != mFingerprint) {
-                String security;
-                if (mPatternView.getCellSize() <= 1) {
-                    security = "";
-                } else {
-                    security = mPatternView.getPatternString();
-                }
-                Settings.putSecurity(security);
-                Settings.putEnableFingerprint(mFingerprint.getVisibility() == View.VISIBLE &&
-                        mFingerprint.isChecked() && !security.isEmpty());
-            }
-            requireActivity().onBackPressed();
-        }
-    }
-
-    @Override
-    public int getFragmentTitle() {
-        return R.string.set_pattern_protection;
-    }
-}

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

@@ -468,7 +468,6 @@ public class DownloadsScene extends ToolbarScene
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_download_labels_title),
                                 getString(R.string.guide_download_labels_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override

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

@@ -68,6 +68,7 @@ import com.hippo.ehviewer.client.data.FavListUrlBuilder;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.client.parser.FavoritesParser;
 import com.hippo.ehviewer.ui.CommonOperations;
+import com.hippo.ehviewer.ui.EhActivity;
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.ehviewer.ui.annotation.DrawerLifeCircle;
 import com.hippo.ehviewer.ui.annotation.ViewLifeCircle;
@@ -290,7 +291,13 @@ public class FavoritesScene extends BaseScene implements
         updateSearchBar();
         mSearchBarMover = new SearchBarMover(this, mSearchBar, mRecyclerView);
 
-        mActionFabDrawable = new AddDeleteDrawable(context, resources.getColor(R.color.primary_drawable_dark));
+        int colorID;
+        if (EhActivity.isNightMode(context.getResources().getConfiguration())) {
+            colorID = resources.getColor(android.R.color.white, getTheme());
+        } else {
+            colorID = resources.getColor(android.R.color.black, getTheme());
+        }
+        mActionFabDrawable = new AddDeleteDrawable(context, colorID);
         mFabLayout.getPrimaryFab().setImageDrawable(mActionFabDrawable);
         mFabLayout.setExpanded(false, false);
         mFabLayout.setAutoCancel(true);
@@ -334,7 +341,6 @@ public class FavoritesScene extends BaseScene implements
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_collections_title),
                                 getString(R.string.guide_collections_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override

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

@@ -96,6 +96,7 @@ import com.hippo.ehviewer.dao.DownloadLabel;
 import com.hippo.ehviewer.dao.QuickSearch;
 import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.ehviewer.ui.CommonOperations;
+import com.hippo.ehviewer.ui.EhActivity;
 import com.hippo.ehviewer.ui.GalleryActivity;
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter;
@@ -613,7 +614,13 @@ public final class GalleryListScene extends BaseScene
         mFabLayout.setOnExpandListener(this);
         addAboveSnackView(mFabLayout);
 
-        mActionFabDrawable = new AddDeleteDrawable(context, resources.getColor(R.color.primary_drawable_dark));
+        int colorID;
+        if (EhActivity.isNightMode(context.getResources().getConfiguration())) {
+            colorID = resources.getColor(android.R.color.white, getTheme());
+        } else {
+            colorID = resources.getColor(android.R.color.black, getTheme());
+        }
+        mActionFabDrawable = new AddDeleteDrawable(context, colorID);
         mFabLayout.getPrimaryFab().setImageDrawable(mActionFabDrawable);
 
         mSearchFab.setOnClickListener(this);
@@ -657,7 +664,6 @@ public final class GalleryListScene extends BaseScene
                 TapTarget.forBounds(bounds,
                                 getString(R.string.guide_quick_search_title),
                                 getString(R.string.guide_quick_search_text))
-                        .outerCircleColor(R.color.colorPrimary)
                         .transparentTarget(true),
                 new TapTargetView.Listener() {
                     @Override

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

@@ -1,193 +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.ui.scene;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.biometric.BiometricManager;
-import androidx.biometric.BiometricPrompt;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.Settings;
-import com.hippo.ehviewer.ui.MainActivity;
-import com.hippo.widget.lockpattern.LockPatternUtils;
-import com.hippo.widget.lockpattern.LockPatternView;
-import com.hippo.yorozuya.ObjectUtils;
-import com.hippo.yorozuya.ViewUtils;
-
-import java.util.List;
-import java.util.concurrent.Executors;
-
-public class SecurityScene extends SolidScene implements
-        LockPatternView.OnPatternListener {
-
-    private static final int MAX_RETRY_TIMES = 5;
-    private static final String KEY_RETRY_TIMES = "retry_times";
-
-    @Nullable
-    private LockPatternView mPatternView;
-
-    private SensorManager mSensorManager;
-    private Sensor mAccelerometer;
-    private BiometricPrompt.PromptInfo promptInfo;
-    private BiometricPrompt biometricPrompt;
-    private boolean canAuthenticate = false;
-
-    private int mRetryTimes;
-
-    @Override
-    public boolean needShowLeftDrawer() {
-        return false;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Context context = requireContext();
-        mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        if (null != mSensorManager) {
-            mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        }
-
-        if (null == savedInstanceState) {
-            mRetryTimes = MAX_RETRY_TIMES;
-        } else {
-            mRetryTimes = savedInstanceState.getInt(KEY_RETRY_TIMES);
-        }
-
-        canAuthenticate = Settings.getEnableFingerprint() &&
-                BiometricManager.from(requireContext()).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS;
-        biometricPrompt = new BiometricPrompt(this, Executors.newSingleThreadExecutor(), new BiometricPrompt.AuthenticationCallback() {
-            @Override
-            public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-                super.onAuthenticationError(errorCode, errString);
-            }
-
-            @Override
-            public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
-                startSceneForCheckStep(CHECK_STEP_SECURITY, getArguments());
-                finish();
-            }
-
-            @Override
-            public void onAuthenticationFailed() {
-                super.onAuthenticationFailed();
-            }
-        });
-        promptInfo = new BiometricPrompt.PromptInfo.Builder()
-                .setTitle(getString(R.string.app_name))
-                .setNegativeButtonText(getString(android.R.string.cancel))
-                .setConfirmationRequired(false)
-                .build();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        mSensorManager = null;
-        mAccelerometer = null;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (canAuthenticate) {
-            startBiometricPrompt();
-        }
-    }
-
-    private void startBiometricPrompt() {
-        biometricPrompt.authenticate(promptInfo);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(KEY_RETRY_TIMES, mRetryTimes);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.scene_security, container, false);
-        if (canAuthenticate) {
-            view.setOnClickListener(v -> startBiometricPrompt());
-        }
-
-        mPatternView = (LockPatternView) ViewUtils.$$(view, R.id.pattern_view);
-        mPatternView.setOnPatternListener(this);
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        mPatternView = null;
-    }
-
-    @Override
-    public void onPatternStart() {
-    }
-
-    @Override
-    public void onPatternCleared() {
-    }
-
-    @Override
-    public void onPatternCellAdded(List<LockPatternView.Cell> pattern) {
-    }
-
-    @Override
-    public void onPatternDetected(List<LockPatternView.Cell> pattern) {
-        MainActivity activity = getMainActivity();
-        if (null == activity || null == mPatternView) {
-            return;
-        }
-
-        String enteredPatter = LockPatternUtils.patternToString(pattern);
-        String targetPatter = Settings.getSecurity();
-
-        if (ObjectUtils.equal(enteredPatter, targetPatter)) {
-            startSceneForCheckStep(CHECK_STEP_SECURITY, getArguments());
-            finish();
-        } else {
-            mPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
-            mRetryTimes--;
-            if (mRetryTimes <= 0) {
-                finish();
-            }
-        }
-    }
-}

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

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2022 tarsin norbin
+ *
+ * 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.ui.scene
+
+import android.content.Context
+import android.os.Bundle
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.biometric.BiometricPrompt
+import androidx.biometric.auth.AuthPromptCallback
+import androidx.biometric.auth.startClass2BiometricOrCredentialAuthentication
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.FragmentActivity
+import com.hippo.ehviewer.R
+
+class SecurityScene : SolidScene() {
+    override fun needShowLeftDrawer(): Boolean {
+        return false
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (isAuthenticationSupported(requireContext()))
+            startAuthentication(getString(R.string.settings_privacy_require_unlock))
+        else
+            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
+    }
+
+    private fun startAuthentication(
+        title: String,
+        subtitle: String? = null,
+        confirmationRequired: Boolean = true,
+    ) {
+        startClass2BiometricOrCredentialAuthentication(
+            title = title,
+            subtitle = subtitle,
+            confirmationRequired = confirmationRequired,
+            executor = ContextCompat.getMainExecutor(requireContext()),
+            callback = AuthenticationCallback()
+        )
+    }
+
+    inner class AuthenticationCallback : AuthPromptCallback() {
+        override fun onAuthenticationSucceeded(
+            activity: FragmentActivity?,
+            result: BiometricPrompt.AuthenticationResult
+        ) {
+            super.onAuthenticationSucceeded(activity, result)
+            startSceneForCheckStep(CHECK_STEP_SECURITY, arguments)
+        }
+    }
+
+    companion object {
+        fun isAuthenticationSupported(context: Context): Boolean {
+            val authenticators = BiometricManager.Authenticators.BIOMETRIC_WEAK or DEVICE_CREDENTIAL
+            return BiometricManager.from(context)
+                .canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS
+        }
+    }
+}

app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt

@@ -32,7 +32,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.switchmaterial.SwitchMaterial
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.hippo.easyrecyclerview.EasyRecyclerView
@@ -59,7 +58,7 @@ class SearchLayout @JvmOverloads constructor(
     private var mNormalView: View
     private var mNormalSearchMode: RadioGridGroup
     private var mNormalSearchModeHelp: ImageView
-    private var mEnableAdvanceSwitch: SwitchMaterial
+    private var mEnableAdvanceSwitch: CheckBox
     private var mAdvanceView: View
     private var mTableAdvanceSearch: AdvanceSearchTable
     private var mImageView: ImageSearchLayout
@@ -99,6 +98,11 @@ class SearchLayout @JvmOverloads constructor(
             mChip.setText(mPair.second)
             mChip.idt = mPair.first
             mChip.isChecked = NumberUtils.int2boolean(mPair.first and mCategoryStored)
+            mChip.setOnLongClickListener {
+                mCategoryGroup.clearCheck()
+                mChip.isChecked = true
+                true
+            }
             mCategoryGroup.addView(mChip)
         }
         mCategoryGroup.setOnCheckedStateChangeListener { _, checkedIds ->
@@ -113,8 +117,6 @@ class SearchLayout @JvmOverloads constructor(
         mEnableAdvanceSwitch = mNormalView.findViewById(R.id.search_enable_advance)
         mNormalSearchModeHelp.setOnClickListener(this)
         mEnableAdvanceSwitch.setOnCheckedChangeListener(this)
-        mEnableAdvanceSwitch.switchPadding =
-            resources.getDimensionPixelSize(R.dimen.switch_padding)
         // Create advance view
         mAdvanceView = mInflater.inflate(R.layout.search_advance, null)
         mTableAdvanceSearch = mAdvanceView.findViewById(R.id.search_advance_search_table)

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

@@ -43,9 +43,14 @@ public class BatteryView extends AppCompatTextView {
     private BatteryDrawable mDrawable;
     private boolean mAttached = false;
     private boolean mIsChargerWorking = false;
+
     public BatteryView(Context context) {
         super(context);
         init();
+    }
+
+    public BatteryView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
     }    private final Runnable mCharger = new Runnable() {
 
         private int level = 0;
@@ -61,10 +66,6 @@ public class BatteryView extends AppCompatTextView {
         }
     };
 
-    public BatteryView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
     public BatteryView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
@@ -101,6 +102,24 @@ public class BatteryView extends AppCompatTextView {
             getHandler().post(mCharger);
             mIsChargerWorking = true;
         }
+    }
+
+    private void stopCharger() {
+        if (mIsChargerWorking) {
+            getHandler().removeCallbacks(mCharger);
+            mIsChargerWorking = false;
+        }
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (!mAttached) {
+            mAttached = true;
+
+            registerReceiver();
+        }
     }    private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
 
         @Override
@@ -132,24 +151,6 @@ public class BatteryView extends AppCompatTextView {
         }
     };
 
-    private void stopCharger() {
-        if (mIsChargerWorking) {
-            getHandler().removeCallbacks(mCharger);
-            mIsChargerWorking = false;
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        if (!mAttached) {
-            mAttached = true;
-
-            registerReceiver();
-        }
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();

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

@@ -66,8 +66,13 @@ public class TextClock extends AppCompatTextView {
             onTimeChanged();
         }
     };
+
     public TextClock(Context context) {
         this(context, null);
+    }
+
+    public TextClock(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
     }    private final Runnable mTicker = new Runnable() {
         @Override
         public void run() {
@@ -80,10 +85,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    public TextClock(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
     public TextClock(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
@@ -98,6 +99,18 @@ public class TextClock extends AppCompatTextView {
         createTime(mTimeZone);
         // Wait until onAttachedToWindow() to handle the ticker
         chooseFormat(false);
+    }
+
+    private void createTime(String timeZone) {
+        if (timeZone != null) {
+            mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
+        } else {
+            mTime = Calendar.getInstance();
+        }
+    }
+
+    public CharSequence getFormat12Hour() {
+        return mFormat12;
     }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange) {
@@ -112,18 +125,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    private void createTime(String timeZone) {
-        if (timeZone != null) {
-            mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
-        } else {
-            mTime = Calendar.getInstance();
-        }
-    }
-
-    public CharSequence getFormat12Hour() {
-        return mFormat12;
-    }
-
     public void setFormat12Hour(CharSequence format) {
         mFormat12 = format;
 

app/src/main/java/com/hippo/widget/lockpattern/LockPatternUtils.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * 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.lockpattern;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utilities for the lock pattern and its settings.
- */
-public class LockPatternUtils {
-
-    /**
-     * Deserialize a pattern.
-     *
-     * @param string The pattern serialized with {@link #patternToString}
-     * @return The pattern.
-     */
-    public static List<LockPatternView.Cell> stringToPattern(String string) {
-        List<LockPatternView.Cell> result = new ArrayList<>();
-
-        final byte[] bytes = string.getBytes();
-        for (byte b : bytes) {
-            result.add(LockPatternView.Cell.of(b / 3, b % 3));
-        }
-        return result;
-    }
-
-    /**
-     * Serialize a pattern.
-     *
-     * @param pattern The pattern.
-     * @return The pattern in string form.
-     */
-    public static String patternToString(List<LockPatternView.Cell> pattern) {
-        if (pattern == null) {
-            return "";
-        }
-        final int patternSize = pattern.size();
-
-        byte[] res = new byte[patternSize];
-        for (int i = 0; i < patternSize; i++) {
-            LockPatternView.Cell cell = pattern.get(i);
-            res[i] = (byte) (cell.getRow() * 3 + cell.getColumn());
-        }
-        return new String(res);
-    }
-
-}

app/src/main/res/drawable-v25/ic_shortcut_start.xml

@@ -6,10 +6,10 @@
     android:viewportHeight="48">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/shortcut_bg"
+        android:fillColor="@android:color/white"
         android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/black"
         android:pathData="M20,17V31L31,24Z" />
 </vector>

app/src/main/res/drawable-v25/ic_shortcut_stop.xml

@@ -6,10 +6,10 @@
     android:viewportHeight="48">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/shortcut_bg"
+        android:fillColor="@android:color/white"
         android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/black"
         android:pathData="m18,31h4L22,17h-4zM26,17v14h4L30,17Z" />
 </vector>

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

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

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <selector
-            android:enterFadeDuration="@android:integer/config_shortAnimTime"
-            android:exitFadeDuration="@android:integer/config_shortAnimTime">
-            <item android:state_checked="true">
-                <color android:color="@color/check_text_view_mask" />
-            </item>
-        </selector>
-    </item>
-    <item android:drawable="?android:attr/selectableItemBackground" />
-</layer-list>

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

@@ -1,47 +0,0 @@
-<?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="64dp"
-    android:height="64dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/teal_500"
-        android:pathData="M0,12a12,12 0 1,0 24,0a12,12 0 1,0 -24,0" />
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M16.5,9.9L16.1,9.6L19.1,5.9C19.2,5.8,19.4,5.8,19.5,5.9L19.5,5.9C19.6,6,19.6,6.2,19.5,6.3L16.5,9.9Z" />
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M9.1,8.8L8.6,9.1L6.2,5C6.1,4.9,6.2,4.7,6.3,4.6L6.3,4.6C6.4,4.5,6.6,4.6,6.7,4.7L9.1,8.8Z" />
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M1.8,14.6L22.1,16.4C21.4,11.3,17.6,7.9,12.6,7.5C7.8,7,3.4,9.7,1.8,14.6Z" />
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M15.4,11.9a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0" />
-
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M7.1,11.2a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0" />
-
-</vector>

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

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9s9,-4.03 9,-9c0,-0.46 -0.04,-0.92 -0.1,-1.36c-0.98,1.37 -2.58,2.26 -4.4,2.26c-2.98,0 -5.4,-2.42 -5.4,-5.4c0,-1.81 0.89,-3.42 2.26,-4.4C12.92,3.04 12.46,3 12,3L12,3z" />
-</vector>

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

@@ -5,6 +5,6 @@
     android:viewportHeight="108">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="m42,68h8V40H42ZM58,40v28h8V40Z" />
 </vector>

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

@@ -5,6 +5,6 @@
     android:viewportHeight="108">
     <path
         android:fillAlpha="1"
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="@android:color/white"
         android:pathData="M46,40V68L68,54Z" />
 </vector>

app/src/main/res/layout-land/activity_set_security.xml

@@ -1,92 +0,0 @@
-<?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.
-  -->
-
-<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:baselineAligned="true"
-    android:orientation="horizontal"
-    android:paddingHorizontal="@dimen/keyline_margin"
-    app:fitsSystemWindowsInsets="bottom">
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
-            android:gravity="center"
-            android:padding="@dimen/keyline_margin"
-            android:text="@string/set_pattern_protection_tip"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-        <androidx.appcompat.widget.AppCompatCheckBox
-            android:id="@+id/fingerprint_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="20dp"
-            android:text="@string/enable_biometric"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/buttonPanel"
-            style="?attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:clipToPadding="false"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingTop="4dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="4dp">
-
-            <Button
-                android:id="@+id/set"
-                style="@style/Widget.MaterialComponents.Button"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/set" />
-
-            <Button
-                android:id="@+id/cancel"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@android:string/cancel" />
-
-        </LinearLayout>
-    </FrameLayout>
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-        <com.hippo.widget.lockpattern.LockPatternView
-            android:id="@+id/pattern_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </FrameLayout>
-</LinearLayout>

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

@@ -11,13 +11,12 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

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

@@ -1,95 +0,0 @@
-<?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.
-  -->
-
-<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"
-    android:paddingHorizontal="@dimen/keyline_margin"
-    app:fitsSystemWindowsInsets="bottom">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="@dimen/keyline_margin"
-        android:text="@string/set_pattern_protection_tip"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="32dp"
-            app:maxHeight="320dp"
-            app:maxWidth="320dp">
-
-            <com.hippo.widget.lockpattern.LockPatternView
-                android:id="@+id/pattern_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </com.hippo.widget.MaxSizeContainer>
-    </FrameLayout>
-
-    <androidx.appcompat.widget.AppCompatCheckBox
-        android:id="@+id/fingerprint_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="20dp"
-        android:text="@string/enable_biometric"
-        android:visibility="gone" />
-
-    <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="horizontal"
-        android:paddingLeft="12dp"
-        android:paddingTop="4dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="20dp">
-
-        <Button
-            android:id="@+id/cancel"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_weight="1"
-            android:text="@android:string/cancel" />
-
-        <Button
-            android:id="@+id/set"
-            style="@style/Widget.MaterialComponents.Button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_weight="1"
-            android:text="@string/set" />
-
-    </LinearLayout>
-</LinearLayout>

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

@@ -105,8 +105,7 @@
                 android:paddingTop="16dp"
                 android:paddingRight="12dp"
                 android:paddingBottom="16dp"
-                app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24"
-                app:tint="@color/primary_drawable_black" />
+                app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24" />
 
         </RelativeLayout>
 

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

@@ -19,8 +19,7 @@
     style="@style/Widget.Material3.CardView.Elevated"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="2dp"
-    android:background="?selectableItemBackground"
+    android:layout_margin="4dp"
     android:checkable="true"
     android:clickable="true"
     android:focusable="true">
@@ -61,7 +60,7 @@
             style="@style/CardMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/title"
+            android:layout_above="@id/rating"
             android:layout_alignStart="@id/title"
             android:layout_marginTop="2dp" />
 
@@ -86,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_above="@id/category"
             android:layout_alignStart="@id/title"
-            android:layout_marginBottom="4dp" />
+            android:layout_marginBottom="2dp" />
 
         <TextView
             android:id="@+id/posted"

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

@@ -1,38 +0,0 @@
-<?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.
-  -->
-
-<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"
-    app:fitsSystemWindowsInsets="top|bottom">
-
-    <com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="32dp"
-        app:maxHeight="360dp"
-        app:maxWidth="320dp">
-
-        <com.hippo.widget.lockpattern.LockPatternView
-            android:id="@+id/pattern_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-
-    </com.hippo.widget.MaxSizeContainer>
-</FrameLayout>

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

@@ -89,7 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/search_enable_advance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/values-night/colors.xml

@@ -15,18 +15,8 @@
   -->
 
 <resources>
-
-    <color name="primary_drawable">#ffffffff</color>
-
     <!-- divider -->
     <color name="divider">#20ffffff</color>
 
-    <!-- shadow -->
-
-    <!-- Gallery Activity -->
-
     <!-- Lock pattern view -->
-    <color name="lock_pattern_view_regular_color">#8affffff</color>
-
-    <!--Shortcut background-->
 </resources>

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

@@ -519,7 +519,6 @@
     <string name="settings_about_declaration" translatable="false">EhViewer</string>
     <string name="settings_about_declaration_summary">EhViewer ไม่มีความแตกต่างจากตัวเว็บ E-Hentai.org แต่อย่างใด</string>
     <string name="settings_about_author">นักพัฒนา</string>
-    <string name="settings_about_author_summary" translatable="false">Hippo &lt;ehviewersu$gmail.com&gt;</string>
     <string name="settings_about_telegram">Telegram</string>
     <string name="settings_about_website">เว็บไซต์</string>
     <string name="settings_about_source">ซอร์สโค้ด</string>

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

@@ -761,4 +761,5 @@
     <string name="open_by_default">默认打开</string>
 
     <string name="show_library_version">依赖库之版本</string>
+    <string name="settings_privacy_require_unlock">需要解锁</string>
 </resources>

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

@@ -15,12 +15,9 @@
   -->
 
 <resources>
-    <color name="primary_drawable">#8a000000</color>
-    <color name="primary_drawable_dark">#ffffffff</color>
     <color name="primary_drawable_black">#ccffffff</color>
     <color name="secondary_drawable_black">#3dffffff</color>
     <color name="red_500">#fff44336</color>
-    <color name="teal_500">#ff009688</color>
     <color name="purple_a700">#ffaa00ff</color>
     <color name="cyan_600">#ff00acc1</color>
     <color name="light_green_600">#ff7cb342</color>
@@ -28,7 +25,6 @@
     <color name="deep_orange_400">#ffff7043</color>
     <color name="grey_500">#ff9e9e9e</color>
     <color name="brown_500">#ff795548</color>
-    <color name="colorPrimary">@color/teal_500</color>
     <color name="loading_indicator_red">#ffe53935</color>
     <color name="loading_indicator_purple">@color/purple_a700</color>
     <color name="loading_indicator_blue">#ff1d87e4</color>
@@ -36,28 +32,17 @@
     <color name="loading_indicator_green">@color/light_green_600</color>
     <color name="loading_indicator_yellow">@color/yellow_800</color>
     <color name="loading_indicator_orange">@color/deep_orange_400</color>
-    <color name="check_text_view_mask">#4a000000</color>
 
     <!-- Red -->
-    <color name="doujinshi">#fff44336</color>
     <!-- Orange -->
-    <color name="manga">#ffff9800</color>
     <!-- Yellow 700 -->
-    <color name="artist_cg">#ffFbc02d</color>
     <!-- Green -->
-    <color name="game_cg">#ff4caf50</color>
     <!-- Light Green -->
-    <color name="western">#ff8bc34a</color>
     <!-- Blue -->
-    <color name="non_h">#ff2196f3</color>
     <!-- Indigo -->
-    <color name="image_set">#ff3f51b5</color>
     <!-- Purple -->
-    <color name="cosplay">#ff9c27b0</color>
     <!-- Deep Purple 300 -->
-    <color name="asian_porn">#ff9575cd</color>
     <!-- Pink 300 -->
-    <color name="misc">#fff06292</color>
 
     <!-- divider -->
     <color name="divider">#20000000</color>
@@ -68,9 +53,6 @@
     <!-- Gallery Activity -->
 
     <!-- Lock pattern view -->
-    <color name="lock_pattern_view_regular_color">#8a000000</color>
-    <color name="lock_pattern_view_success_color">@color/colorPrimary</color>
-    <color name="lock_pattern_view_error_color">@color/red_500</color>
 
     <!--Shortcut background-->
     <color name="shortcut_bg">#F5F5F5</color>

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

@@ -82,8 +82,6 @@
     <dimen name="add_thickness">2dp</dimen>
 
     <!-- CategoryTable -->
-    <dimen name="category_table_item_height">40dp</dimen>
-    <dimen name="category_table_item_margin">4dp</dimen>
 
     <!-- AdvanceSearchTable -->
     <dimen name="advance_search_table_item_margin">4dp</dimen>
@@ -97,7 +95,6 @@
     <dimen name="image_search_max_size">240dp</dimen>
 
     <!-- Switch padding -->
-    <dimen name="switch_padding">8dp</dimen>
 
     <!-- FabLayout -->
     <dimen name="fab_layout_primary_margin">24dp</dimen>
@@ -120,9 +117,6 @@
     <dimen name="gallery_guide_divider_width">3dp</dimen>
 
     <!-- Lock pattern view -->
-    <dimen name="lock_pattern_dot_line_width">3dp</dimen>
-    <dimen name="lock_pattern_dot_size">12dp</dimen>
-    <dimen name="lock_pattern_dot_size_activated">28dp</dimen>
 
     <!-- Custom preference -->
 

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

@@ -17,6 +17,5 @@
 
     <drawable name="transparent">@android:color/transparent</drawable>
     <drawable name="tile_background_activated">#7f9c27b0</drawable>
-    <drawable name="sadpanda_low_poly">@color/colorPrimary</drawable>
 
 </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;</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_telegram">Telegram</string>
     <string name="settings_about_latest_release">Latest release</string>
     <string name="settings_about_website">Website</string>
@@ -825,4 +825,5 @@
     <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>
 </resources>

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

@@ -19,7 +19,6 @@
     <style name="AppTheme" parent="Base.AppTheme" />
 
     <!-- TextAppearance -->
-    <style name="TextAppearance" parent="TextAppearance.Material3.TitleMedium" />
 
     <!-- Progress View -->
     <style name="ProgressView">
@@ -28,38 +27,19 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
-    <style name="TextAppearance.CardTitle">
-        <item name="android:textSize">@dimen/text_little_small</item>
-    </style>
-
     <style name="CardTitle">
-        <item name="android:textAppearance">@style/TextAppearance.CardTitle</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.TitleSmall</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
-        <item name="android:lineSpacingExtra">0sp</item>
-    </style>
-
-    <style name="TextAppearance.CardMessage">
-        <item name="android:textSize">@dimen/text_small</item>
     </style>
 
     <style name="CardMessage">
-        <item name="android:textAppearance">@style/TextAppearance.CardMessage</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.BodyMedium</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
         <item name="android:maxLines">1</item>
     </style>
 
-    <!-- CategoryText -->
-    <style name="CategoryText">
-        <item name="android:textAppearance">@style/TextAppearance.Material3.ActionBar.Subtitle
-        </item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:gravity">center</item>
-        <item name="android:minHeight">@dimen/category_table_item_height</item>
-        <item name="android:foreground">@drawable/check_text_view_foreground</item>
-    </style>
-
     <style name="TextAppearance.CategoryTitle" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textStyle">bold</item>
     </style>
@@ -71,15 +51,6 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
-    <style name="ButtonInCard">
-        <item name="android:textAppearance">@style/TextAppearance.Material3.LabelLarge</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:gravity">center</item>
-        <item name="android:minHeight">48dp</item>
-        <item name="android:minWidth">88dp</item>
-        <item name="android:padding">8dp</item>
-    </style>
-
     <style name="Slider">
         <item name="thickness">2dp</item>
         <item name="radius">6dp</item>

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

@@ -21,10 +21,8 @@
     <!-- ========== -->
 
     <style name="Base.AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
-        <item name="colorControlActivated">@color/colorPrimary</item>
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider</item>
-        <item name="colorControlNormal">@color/primary_drawable</item>
         <item name="drawableColorSecondary">@color/material_dynamic_secondary50</item>
         <item name="drawableColorThemePrimary">@color/material_dynamic_primary50</item>
         <item name="guideBackgroundColor">@color/material_dynamic_neutral80</item>
@@ -45,7 +43,6 @@
         <item name="android:colorBackground">@android:color/black</item>
         <item name="toolbarColor">@android:color/black</item>
         <item name="dividerColor">@color/divider_black</item>
-        <item name="colorControlNormal">@color/primary_drawable_black</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_black</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
         <item name="guideBackgroundColor">#e5000000</item>

app/src/main/res/xml-v25/shortcuts.xml

@@ -11,7 +11,7 @@
         <intent
             android:action="start_all"
             android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
-            android:targetPackage="io.github.nekoinverter.ehviewer" />
+            android:targetPackage="moe.tarsin.ehviewer" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
@@ -25,7 +25,7 @@
         <intent
             android:action="stop_all"
             android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
-            android:targetPackage="io.github.nekoinverter.ehviewer" />
+            android:targetPackage="moe.tarsin.ehviewer" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 

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

@@ -2,10 +2,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <Preference
-        android:fragment="com.hippo.ehviewer.ui.fragment.SetSecurityFragment"
-        android:key="pattern_protection"
-        android:title="@string/settings_privacy_pattern_protection_title"
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="require_unlock"
+        android:title="@string/settings_privacy_require_unlock"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat

native/build.gradle

@@ -14,7 +14,7 @@ android {
 
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_STL=c++_shared'
+                arguments '-DANDROID_STL=none'
             }
         }
 

native/src/main/jni/fuse_archive.h

@@ -1,8 +0,0 @@
-//
-// Created by tarsin on 2022/5/24.
-//
-
-#ifndef EHVIEWER_FUSE_ARCHIVE_H
-#define EHVIEWER_FUSE_ARCHIVE_H
-
-#endif //EHVIEWER_FUSE_ARCHIVE_H