From 39d7812b61830f19afb76af63ffdb1e111c44511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=91=E5=85=89=E9=95=BF=E9=A2=88=E9=B9=BF?= <64970244+mikofe@users.noreply.github.com> Date: Mon, 26 Sep 2022 21:36:42 +0800 Subject: [PATCH] Use the new MaterialSwitch component (#473) --- app/build.gradle | 4 +++ .../res/color/material_switch_track_tint.xml | 26 +++++++++++++++++++ .../preference_widget_materialswitch.xml | 24 +++++++++++++++++ app/src/main/res/values/styles.xml | 7 +++++ dependencies.gradle | 2 +- 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/color/material_switch_track_tint.xml create mode 100644 app/src/main/res/layout/preference_widget_materialswitch.xml diff --git a/app/build.gradle b/app/build.gradle index 1885666ad..c383a655d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -89,6 +89,10 @@ android { } } +configurations.all { + exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx' +} + kapt { arguments { arg ('eventBusIndex', 'com.itsaky.androidide.events.AppEventsIndex') diff --git a/app/src/main/res/color/material_switch_track_tint.xml b/app/src/main/res/color/material_switch_track_tint.xml new file mode 100644 index 000000000..bdae09a35 --- /dev/null +++ b/app/src/main/res/color/material_switch_track_tint.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/app/src/main/res/layout/preference_widget_materialswitch.xml b/app/src/main/res/layout/preference_widget_materialswitch.xml new file mode 100644 index 000000000..d3c8029b4 --- /dev/null +++ b/app/src/main/res/layout/preference_widget_materialswitch.xml @@ -0,0 +1,24 @@ + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 535231625..f2aa864ab 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,6 +4,8 @@ @style/AppTheme.Toolbar.OverflowButton @color/primaryColor @color/primaryDarkColor + @color/secondaryDarkColor + @color/secondaryColor @color/secondaryColor @color/surfaceColor @color/secondaryColor @@ -22,6 +24,7 @@ @color/secondaryTextColor @color/content_background @font/josefin_sans + @style/AppTheme.SwitchPreference + + diff --git a/dependencies.gradle b/dependencies.gradle index b3e82e7ba..66ffc7fa6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -50,7 +50,7 @@ ext { ] google = [ - material : 'com.google.android.material:material:1.6.1', + material : 'com.google.android.material:material:1.7.0-rc01', gson : 'com.google.code.gson:gson:2.9.1', guava : 'com.google.guava:guava:31.1-android', guava_jre : 'com.google.guava:guava:31.1-jre',