From 22137c266e79e83d3d6187b9991756abbe8bf9cb Mon Sep 17 00:00:00 2001 From: LoveSy Date: Wed, 22 Jun 2022 22:49:42 +0800 Subject: [PATCH] Update deps (#2002) --- app/build.gradle.kts | 10 +++++----- .../manager/ui/fragment/SettingsFragment.java | 12 ++++++------ app/src/main/res/xml/prefs.xml | 14 +++++++------- build.gradle.kts | 2 +- external/dobby | 2 +- gradle.properties | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c0bf6f2d..d58bbb78 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -141,8 +141,8 @@ dependencies { annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion") implementation("androidx.activity:activity:1.4.0") implementation("androidx.browser:browser:1.4.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.3") - implementation("androidx.core:core:1.7.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.core:core:1.8.0") implementation("androidx.fragment:fragment:1.4.1") implementation("androidx.navigation:navigation-fragment:$navVersion") implementation("androidx.navigation:navigation-ui:$navVersion") @@ -150,7 +150,7 @@ dependencies { implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("com.github.bumptech.glide:glide:$glideVersion") - implementation("com.google.android.material:material:1.6.0-beta01") + implementation("com.google.android.material:material:1.6.1") implementation("com.google.code.gson:gson:2.9.0") implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0")) implementation("com.squareup.okhttp3:okhttp") @@ -159,8 +159,8 @@ dependencies { implementation("dev.rikka.rikkax.appcompat:appcompat:1.4.1") implementation("dev.rikka.rikkax.core:core:1.4.0") implementation("dev.rikka.rikkax.insets:insets:1.2.0") - implementation("dev.rikka.rikkax.material:material:2.3.0") - implementation("dev.rikka.rikkax.material:material-preference:1.0.0") + implementation("dev.rikka.rikkax.material:material:2.4.0") + implementation("dev.rikka.rikkax.material:material-preference:2.0.0") implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3") implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1") implementation("dev.rikka.rikkax.widget:borderview:1.1.0") diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java index 3d078b83..c3e341e7 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java @@ -36,7 +36,7 @@ import androidx.annotation.Nullable; import androidx.core.text.HtmlCompat; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.SwitchPreference; +import rikka.material.preference.MaterialSwitchPreference; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.color.DynamicColors; @@ -144,7 +144,7 @@ public class SettingsFragment extends BaseFragment { addPreferencesFromResource(R.xml.prefs); boolean installed = ConfigManager.isBinderAlive(); - SwitchPreference prefVerboseLogs = findPreference("disable_verbose_log"); + MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log"); if (prefVerboseLogs != null) { prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed); prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled()); @@ -152,7 +152,7 @@ public class SettingsFragment extends BaseFragment { ConfigManager.setVerboseLogEnabled(!(boolean) newValue)); } - SwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate"); + MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate"); if (prefDexObfuscate != null) { prefDexObfuscate.setEnabled(installed); prefDexObfuscate.setChecked(!installed || ConfigManager.isDexObfuscateEnabled()); @@ -163,7 +163,7 @@ public class SettingsFragment extends BaseFragment { }); } - SwitchPreference prefEnableShortcut = findPreference("enable_auto_add_shortcut"); + MaterialSwitchPreference prefEnableShortcut = findPreference("enable_auto_add_shortcut"); if (prefEnableShortcut != null) { prefEnableShortcut.setEnabled(installed); prefEnableShortcut.setVisible(!App.isParasitic()); @@ -249,7 +249,7 @@ public class SettingsFragment extends BaseFragment { }); } - SwitchPreference prefShowHiddenIcons = findPreference("show_hidden_icon_apps_enabled"); + MaterialSwitchPreference prefShowHiddenIcons = findPreference("show_hidden_icon_apps_enabled"); if (prefShowHiddenIcons != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (ConfigManager.isBinderAlive()) { prefShowHiddenIcons.setEnabled(true); @@ -260,7 +260,7 @@ public class SettingsFragment extends BaseFragment { requireActivity().getContentResolver(), "show_hidden_icon_apps_enabled", 1) != 0); } - SwitchPreference prefFollowSystemAccent = findPreference("follow_system_accent"); + MaterialSwitchPreference prefFollowSystemAccent = findPreference("follow_system_accent"); if (prefFollowSystemAccent != null && DynamicColors.isDynamicColorAvailable()) { if (primary_color != null) { primary_color.setVisible(!prefFollowSystemAccent.isChecked()); diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index df35db72..0ed5c15b 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -22,7 +22,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - - -