Update deps (#2002)

This commit is contained in:
LoveSy 2022-06-22 22:49:42 +08:00 committed by GitHub
parent 89c0431a7a
commit 22137c266e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 21 deletions

View File

@ -141,8 +141,8 @@ dependencies {
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion") annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
implementation("androidx.activity:activity:1.4.0") implementation("androidx.activity:activity:1.4.0")
implementation("androidx.browser:browser:1.4.0") implementation("androidx.browser:browser:1.4.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.core:core:1.7.0") implementation("androidx.core:core:1.8.0")
implementation("androidx.fragment:fragment:1.4.1") implementation("androidx.fragment:fragment:1.4.1")
implementation("androidx.navigation:navigation-fragment:$navVersion") implementation("androidx.navigation:navigation-fragment:$navVersion")
implementation("androidx.navigation:navigation-ui:$navVersion") implementation("androidx.navigation:navigation-ui:$navVersion")
@ -150,7 +150,7 @@ dependencies {
implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
implementation("com.github.bumptech.glide:glide:$glideVersion") 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("com.google.code.gson:gson:2.9.0")
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0")) implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
implementation("com.squareup.okhttp3:okhttp") implementation("com.squareup.okhttp3:okhttp")
@ -159,8 +159,8 @@ dependencies {
implementation("dev.rikka.rikkax.appcompat:appcompat:1.4.1") implementation("dev.rikka.rikkax.appcompat:appcompat:1.4.1")
implementation("dev.rikka.rikkax.core:core:1.4.0") implementation("dev.rikka.rikkax.core:core:1.4.0")
implementation("dev.rikka.rikkax.insets:insets:1.2.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:2.4.0")
implementation("dev.rikka.rikkax.material:material-preference:1.0.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.preference:simplemenu-preference:1.0.3")
implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1") implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
implementation("dev.rikka.rikkax.widget:borderview:1.1.0") implementation("dev.rikka.rikkax.widget:borderview:1.1.0")

View File

@ -36,7 +36,7 @@ import androidx.annotation.Nullable;
import androidx.core.text.HtmlCompat; import androidx.core.text.HtmlCompat;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.SwitchPreference; import rikka.material.preference.MaterialSwitchPreference;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.color.DynamicColors; import com.google.android.material.color.DynamicColors;
@ -144,7 +144,7 @@ public class SettingsFragment extends BaseFragment {
addPreferencesFromResource(R.xml.prefs); addPreferencesFromResource(R.xml.prefs);
boolean installed = ConfigManager.isBinderAlive(); boolean installed = ConfigManager.isBinderAlive();
SwitchPreference prefVerboseLogs = findPreference("disable_verbose_log"); MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log");
if (prefVerboseLogs != null) { if (prefVerboseLogs != null) {
prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed); prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed);
prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled()); prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled());
@ -152,7 +152,7 @@ public class SettingsFragment extends BaseFragment {
ConfigManager.setVerboseLogEnabled(!(boolean) newValue)); ConfigManager.setVerboseLogEnabled(!(boolean) newValue));
} }
SwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate"); MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate");
if (prefDexObfuscate != null) { if (prefDexObfuscate != null) {
prefDexObfuscate.setEnabled(installed); prefDexObfuscate.setEnabled(installed);
prefDexObfuscate.setChecked(!installed || ConfigManager.isDexObfuscateEnabled()); 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) { if (prefEnableShortcut != null) {
prefEnableShortcut.setEnabled(installed); prefEnableShortcut.setEnabled(installed);
prefEnableShortcut.setVisible(!App.isParasitic()); 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 (prefShowHiddenIcons != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (ConfigManager.isBinderAlive()) { if (ConfigManager.isBinderAlive()) {
prefShowHiddenIcons.setEnabled(true); prefShowHiddenIcons.setEnabled(true);
@ -260,7 +260,7 @@ public class SettingsFragment extends BaseFragment {
requireActivity().getContentResolver(), "show_hidden_icon_apps_enabled", 1) != 0); 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 (prefFollowSystemAccent != null && DynamicColors.isDynamicColorAvailable()) {
if (primary_color != null) { if (primary_color != null) {
primary_color.setVisible(!prefFollowSystemAccent.isChecked()); primary_color.setVisible(!prefFollowSystemAccent.isChecked());

View File

@ -22,7 +22,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/group_network"> <PreferenceCategory android:title="@string/group_network">
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:icon="@drawable/ic_outline_dns_24" android:icon="@drawable/ic_outline_dns_24"
android:key="doh" android:key="doh"
@ -53,7 +53,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/settings_group_theme"> <PreferenceCategory android:title="@string/settings_group_theme">
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:icon="@drawable/ic_outline_palette_24" android:icon="@drawable/ic_outline_palette_24"
android:key="follow_system_accent" android:key="follow_system_accent"
@ -75,7 +75,7 @@
android:key="dark_theme" android:key="dark_theme"
android:summary="%s" android:summary="%s"
android:title="@string/dark_theme" /> android:title="@string/dark_theme" />
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:icon="@drawable/ic_outline_invert_colors_24" android:icon="@drawable/ic_outline_invert_colors_24"
android:key="black_dark_theme" android:key="black_dark_theme"
android:summary="@string/pure_black_dark_theme_summary" android:summary="@string/pure_black_dark_theme_summary"
@ -83,14 +83,14 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/settings_group_framework"> <PreferenceCategory android:title="@string/settings_group_framework">
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:icon="@drawable/ic_outline_assignment_24" android:icon="@drawable/ic_outline_assignment_24"
android:key="disable_verbose_log" android:key="disable_verbose_log"
android:persistent="false" android:persistent="false"
android:title="@string/pref_title_disable_verbose_log" /> android:title="@string/pref_title_disable_verbose_log" />
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:icon="@drawable/ic_outline_shield_24" android:icon="@drawable/ic_outline_shield_24"
android:key="enable_dex_obfuscate" android:key="enable_dex_obfuscate"
@ -104,7 +104,7 @@
android:summary="@string/create_shortcut_summary" android:summary="@string/create_shortcut_summary"
android:title="@string/create_shortcut" /> android:title="@string/create_shortcut" />
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:icon="@drawable/ic_outline_add_to_home_screen_24" android:icon="@drawable/ic_outline_add_to_home_screen_24"
android:key="enable_auto_add_shortcut" android:key="enable_auto_add_shortcut"
@ -141,7 +141,7 @@
android:key="settings_group_system" android:key="settings_group_system"
android:title="@string/settings_group_system" android:title="@string/settings_group_system"
app:isPreferenceVisible="@bool/show_system_settings"> app:isPreferenceVisible="@bool/show_system_settings">
<SwitchPreference <rikka.material.preference.MaterialSwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:enabled="false" android:enabled="false"
android:icon="@drawable/ic_outline_android_24" android:icon="@drawable/ic_outline_android_24"

View File

@ -53,7 +53,7 @@ val verCode by extra(commitCount + 4200)
val verName by extra("1.8.3") val verName by extra("1.8.3")
val androidTargetSdkVersion by extra(33) val androidTargetSdkVersion by extra(33)
val androidMinSdkVersion by extra(27) val androidMinSdkVersion by extra(27)
val androidBuildToolsVersion by extra("33.0.0") val androidBuildToolsVersion by extra("32.0.0")
val androidCompileSdkVersion by extra(33) val androidCompileSdkVersion by extra(33)
val androidCompileNdkVersion by extra("24.0.8215888") val androidCompileNdkVersion by extra("24.0.8215888")
val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidSourceCompatibility by extra(JavaVersion.VERSION_11)

2
external/dobby vendored

@ -1 +1 @@
Subproject commit d0d1f0009e85b1abefea9fb298b74ec0ee03fd01 Subproject commit 62e419eaa342eb4c4c5893e6a6a4417ca7d252fa

View File

@ -19,4 +19,4 @@ android.enableR8.fullMode=true
android.useAndroidX=true android.useAndroidX=true
agpVersion=7.2.1 agpVersion=7.2.1
navVersion=2.5.0-alpha04 navVersion=2.5.0-rc02