From 7ec7c933fca30197c7a4cb8ea3495889d522e69f Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Tue, 10 May 2022 17:23:17 +0700 Subject: [PATCH] Drop VectorChildFinder dependency --- build.gradle | 1 - lawnchair/res/drawable/ic_lens_color.xml | 35 ++++----------- lawnchair/res/drawable/ic_lens_color_1.xml | 9 ++++ lawnchair/res/drawable/ic_lens_color_2.xml | 9 ++++ lawnchair/res/drawable/ic_lens_color_3.xml | 9 ++++ lawnchair/res/drawable/ic_lens_color_4.xml | 9 ++++ lawnchair/res/drawable/ic_mic_color.xml | 30 ++++--------- lawnchair/res/drawable/ic_mic_color_1.xml | 9 ++++ lawnchair/res/drawable/ic_mic_color_2.xml | 9 ++++ lawnchair/res/drawable/ic_mic_color_3.xml | 9 ++++ lawnchair/res/drawable/ic_mic_color_4.xml | 10 +++++ lawnchair/res/drawable/ic_super_g_color.xml | 30 ++++--------- lawnchair/res/drawable/ic_super_g_color_1.xml | 9 ++++ lawnchair/res/drawable/ic_super_g_color_2.xml | 9 ++++ lawnchair/res/drawable/ic_super_g_color_4.xml | 9 ++++ lawnchair/res/values/id.xml | 5 +++ .../app/lawnchair/qsb/AssistantIconView.kt | 3 +- .../src/app/lawnchair/qsb/QsbIconUtil.kt | 44 ++++++++++++------- .../src/app/lawnchair/qsb/providers/Google.kt | 2 +- .../app/lawnchair/qsb/providers/GoogleGo.kt | 2 +- res/drawable/ic_lens_color_5.xml | 9 ++++ res/drawable/ic_super_g_color_3.xml | 9 ++++ 22 files changed, 179 insertions(+), 91 deletions(-) create mode 100644 lawnchair/res/drawable/ic_lens_color_1.xml create mode 100644 lawnchair/res/drawable/ic_lens_color_2.xml create mode 100644 lawnchair/res/drawable/ic_lens_color_3.xml create mode 100644 lawnchair/res/drawable/ic_lens_color_4.xml create mode 100644 lawnchair/res/drawable/ic_mic_color_1.xml create mode 100644 lawnchair/res/drawable/ic_mic_color_2.xml create mode 100644 lawnchair/res/drawable/ic_mic_color_3.xml create mode 100644 lawnchair/res/drawable/ic_mic_color_4.xml create mode 100644 lawnchair/res/drawable/ic_super_g_color_1.xml create mode 100644 lawnchair/res/drawable/ic_super_g_color_2.xml create mode 100644 lawnchair/res/drawable/ic_super_g_color_4.xml create mode 100644 res/drawable/ic_lens_color_5.xml create mode 100644 res/drawable/ic_super_g_color_3.xml diff --git a/build.gradle b/build.gradle index f2e517dc57..e62dad4eb4 100644 --- a/build.gradle +++ b/build.gradle @@ -367,7 +367,6 @@ dependencies { implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version" implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" implementation 'com.google.android.material:material:1.6.0' - implementation "com.github.devsideal:VectorChildFinder:1.0.0" implementation "com.github.fornewid:material-motion-compose:0.8.0-beta01" implementation 'dev.kdrag0n:colorkt:1.0.3' implementation "io.coil-kt:coil-compose:1.4.0" diff --git a/lawnchair/res/drawable/ic_lens_color.xml b/lawnchair/res/drawable/ic_lens_color.xml index 6a04970170..159c89ea9d 100644 --- a/lawnchair/res/drawable/ic_lens_color.xml +++ b/lawnchair/res/drawable/ic_lens_color.xml @@ -1,26 +1,9 @@ - - - - - - - + + + + + + + + diff --git a/lawnchair/res/drawable/ic_lens_color_1.xml b/lawnchair/res/drawable/ic_lens_color_1.xml new file mode 100644 index 0000000000..00393faef5 --- /dev/null +++ b/lawnchair/res/drawable/ic_lens_color_1.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_lens_color_2.xml b/lawnchair/res/drawable/ic_lens_color_2.xml new file mode 100644 index 0000000000..21a30df0a5 --- /dev/null +++ b/lawnchair/res/drawable/ic_lens_color_2.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_lens_color_3.xml b/lawnchair/res/drawable/ic_lens_color_3.xml new file mode 100644 index 0000000000..e7aa97ef97 --- /dev/null +++ b/lawnchair/res/drawable/ic_lens_color_3.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_lens_color_4.xml b/lawnchair/res/drawable/ic_lens_color_4.xml new file mode 100644 index 0000000000..d8ba2914fa --- /dev/null +++ b/lawnchair/res/drawable/ic_lens_color_4.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_mic_color.xml b/lawnchair/res/drawable/ic_mic_color.xml index 7c00274684..e322c36075 100644 --- a/lawnchair/res/drawable/ic_mic_color.xml +++ b/lawnchair/res/drawable/ic_mic_color.xml @@ -1,22 +1,8 @@ - - - - - - + + + + + + + diff --git a/lawnchair/res/drawable/ic_mic_color_1.xml b/lawnchair/res/drawable/ic_mic_color_1.xml new file mode 100644 index 0000000000..5942e0ecb5 --- /dev/null +++ b/lawnchair/res/drawable/ic_mic_color_1.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_mic_color_2.xml b/lawnchair/res/drawable/ic_mic_color_2.xml new file mode 100644 index 0000000000..72c4ad96e6 --- /dev/null +++ b/lawnchair/res/drawable/ic_mic_color_2.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_mic_color_3.xml b/lawnchair/res/drawable/ic_mic_color_3.xml new file mode 100644 index 0000000000..738ec97ce9 --- /dev/null +++ b/lawnchair/res/drawable/ic_mic_color_3.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_mic_color_4.xml b/lawnchair/res/drawable/ic_mic_color_4.xml new file mode 100644 index 0000000000..f458085417 --- /dev/null +++ b/lawnchair/res/drawable/ic_mic_color_4.xml @@ -0,0 +1,10 @@ + + + diff --git a/lawnchair/res/drawable/ic_super_g_color.xml b/lawnchair/res/drawable/ic_super_g_color.xml index 8afcb4b067..1385a9a117 100644 --- a/lawnchair/res/drawable/ic_super_g_color.xml +++ b/lawnchair/res/drawable/ic_super_g_color.xml @@ -1,22 +1,8 @@ - - - - - - + + + + + + + diff --git a/lawnchair/res/drawable/ic_super_g_color_1.xml b/lawnchair/res/drawable/ic_super_g_color_1.xml new file mode 100644 index 0000000000..2bbf94728a --- /dev/null +++ b/lawnchair/res/drawable/ic_super_g_color_1.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_super_g_color_2.xml b/lawnchair/res/drawable/ic_super_g_color_2.xml new file mode 100644 index 0000000000..b14587d2f3 --- /dev/null +++ b/lawnchair/res/drawable/ic_super_g_color_2.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/drawable/ic_super_g_color_4.xml b/lawnchair/res/drawable/ic_super_g_color_4.xml new file mode 100644 index 0000000000..2dca6c8df9 --- /dev/null +++ b/lawnchair/res/drawable/ic_super_g_color_4.xml @@ -0,0 +1,9 @@ + + + diff --git a/lawnchair/res/values/id.xml b/lawnchair/res/values/id.xml index 90691c8294..1b0bb47f05 100644 --- a/lawnchair/res/values/id.xml +++ b/lawnchair/res/values/id.xml @@ -22,4 +22,9 @@ + + + + + diff --git a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt index aad3887472..9070061635 100644 --- a/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt +++ b/lawnchair/src/app/lawnchair/qsb/AssistantIconView.kt @@ -7,7 +7,6 @@ import android.widget.ImageButton import androidx.core.view.isVisible import app.lawnchair.preferences2.PreferenceManager2 import com.android.launcher3.R -import com.android.launcher3.util.Themes @SuppressLint("AppCompatCustomView") class AssistantIconView(context: Context, attrs: AttributeSet?) : ImageButton(context, attrs) { @@ -27,7 +26,7 @@ class AssistantIconView(context: Context, attrs: AttributeSet?) : ImageButton(co clearColorFilter() val iconRes = if (isGoogle) R.drawable.ic_mic_color else R.drawable.ic_mic_flat - val themingMethod = if (isGoogle) ThemingMethod.THEME_BY_NAME else ThemingMethod.TINT + val themingMethod = if (isGoogle) ThemingMethod.THEME_BY_LAYER_ID else ThemingMethod.TINT setThemedIconResource( resId = iconRes, diff --git a/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt b/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt index 3b5e629ade..6f1b97f2c6 100644 --- a/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt +++ b/lawnchair/src/app/lawnchair/qsb/QsbIconUtil.kt @@ -1,29 +1,41 @@ package app.lawnchair.qsb +import android.graphics.drawable.LayerDrawable import android.widget.ImageView import androidx.annotation.DrawableRes +import androidx.core.content.res.ResourcesCompat import app.lawnchair.theme.color.ColorTokens -import com.devs.vectorchildfinder.VectorChildFinder +import com.android.launcher3.R fun ImageView.setThemedIconResource( @DrawableRes resId: Int, themed: Boolean, - method: ThemingMethod = ThemingMethod.THEME_BY_NAME + method: ThemingMethod = ThemingMethod.THEME_BY_LAYER_ID ) { - if (themed && method == ThemingMethod.THEME_BY_NAME) { - val vector = VectorChildFinder(context, resId, this) - val primary = vector.findPathByName("qsbIconTintPrimary") - val primary2 = vector.findPathByName("qsbIconTintPrimary2") - val secondary = vector.findPathByName("qsbIconTintSecondary") - val tertiary = vector.findPathByName("qsbIconTintTertiary") - val quaternary = vector.findPathByName("qsbIconTintQuaternary") + if (themed && method == ThemingMethod.THEME_BY_LAYER_ID) { + val drawable = ResourcesCompat.getDrawable(resources, resId, null)!! + if (drawable is LayerDrawable) { + drawable.mutate() + val primary = ColorTokens.QsbIconTintPrimary.resolveColor(context) + val secondary = ColorTokens.QsbIconTintSecondary.resolveColor(context) + val tertiary = ColorTokens.QsbIconTintTertiary.resolveColor(context) + val quaternary = ColorTokens.QsbIconTintQuaternary.resolveColor(context) - primary?.fillColor = ColorTokens.QsbIconTintPrimary.resolveColor(context) - primary2?.fillColor = ColorTokens.QsbIconTintPrimary.resolveColor(context) - secondary?.fillColor = ColorTokens.QsbIconTintSecondary.resolveColor(context) - tertiary?.fillColor = ColorTokens.QsbIconTintTertiary.resolveColor(context) - quaternary?.fillColor = ColorTokens.QsbIconTintQuaternary.resolveColor(context) - invalidate() + for (i in (0 until drawable.numberOfLayers)) { + val color = when (drawable.getId(i)) { + R.id.qsbIconTintPrimary -> primary + R.id.qsbIconTintSecondary -> secondary + R.id.qsbIconTintTertiary -> tertiary + R.id.qsbIconTintQuaternary -> quaternary + else -> 0 + } + if (color == 0) continue + + val layer = drawable.getDrawable(i) + layer.setTint(color) + } + } + setImageDrawable(drawable) } else { setImageResource(resId) if (themed) setColorFilter(ColorTokens.ColorAccent.resolveColor(context)) @@ -33,5 +45,5 @@ fun ImageView.setThemedIconResource( enum class ThemingMethod { TINT, - THEME_BY_NAME + THEME_BY_LAYER_ID } diff --git a/lawnchair/src/app/lawnchair/qsb/providers/Google.kt b/lawnchair/src/app/lawnchair/qsb/providers/Google.kt index 5632fd5e85..0595019912 100644 --- a/lawnchair/src/app/lawnchair/qsb/providers/Google.kt +++ b/lawnchair/src/app/lawnchair/qsb/providers/Google.kt @@ -7,7 +7,7 @@ object Google : QsbSearchProvider( id = "google", name = R.string.search_provider_google, icon = R.drawable.ic_super_g_color, - themingMethod = ThemingMethod.THEME_BY_NAME, + themingMethod = ThemingMethod.THEME_BY_LAYER_ID, packageName = "com.google.android.googlequicksearchbox", action = "android.search.action.GLOBAL_SEARCH", supportVoiceIntent = true, diff --git a/lawnchair/src/app/lawnchair/qsb/providers/GoogleGo.kt b/lawnchair/src/app/lawnchair/qsb/providers/GoogleGo.kt index 2d090d4eaa..e94e129f7d 100644 --- a/lawnchair/src/app/lawnchair/qsb/providers/GoogleGo.kt +++ b/lawnchair/src/app/lawnchair/qsb/providers/GoogleGo.kt @@ -8,7 +8,7 @@ object GoogleGo : QsbSearchProvider( id = "google_go", name = R.string.search_provider_google_go, icon = R.drawable.ic_super_g_color, - themingMethod = ThemingMethod.THEME_BY_NAME, + themingMethod = ThemingMethod.THEME_BY_LAYER_ID, packageName = "com.google.android.apps.searchlite", action = "android.search.action.GLOBAL_SEARCH", supportVoiceIntent = true, diff --git a/res/drawable/ic_lens_color_5.xml b/res/drawable/ic_lens_color_5.xml new file mode 100644 index 0000000000..aa8922eee8 --- /dev/null +++ b/res/drawable/ic_lens_color_5.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_super_g_color_3.xml b/res/drawable/ic_super_g_color_3.xml new file mode 100644 index 0000000000..5d1017ae45 --- /dev/null +++ b/res/drawable/ic_super_g_color_3.xml @@ -0,0 +1,9 @@ + + +