From 3cf798b1324e504918440fb6bfb2c6cc858e1f15 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 19 Oct 2021 22:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt | 4 ++-- app/src/main/java/io/legado/app/utils/DrawableUtils.kt | 2 +- app/src/main/java/io/legado/app/utils/MenuExtensions.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index 5f4dc404c..fcd1bc500 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -217,7 +217,7 @@ class ReadRssActivity : VMBaseActivity starMenuItem?.setIcon(R.drawable.ic_star_border) starMenuItem?.setTitle(R.string.out_favorites) } - starMenuItem?.icon?.setTint(primaryTextColor) + starMenuItem?.icon?.setTintMutate(primaryTextColor) } override fun upTtsMenu(isPlaying: Boolean) { @@ -229,7 +229,7 @@ class ReadRssActivity : VMBaseActivity ttsMenuItem?.setIcon(R.drawable.ic_volume_up) ttsMenuItem?.setTitle(R.string.read_aloud) } - ttsMenuItem?.icon?.setTint(primaryTextColor) + ttsMenuItem?.icon?.setTintMutate(primaryTextColor) } } diff --git a/app/src/main/java/io/legado/app/utils/DrawableUtils.kt b/app/src/main/java/io/legado/app/utils/DrawableUtils.kt index 4ddb2e417..e8e37d5b5 100644 --- a/app/src/main/java/io/legado/app/utils/DrawableUtils.kt +++ b/app/src/main/java/io/legado/app/utils/DrawableUtils.kt @@ -42,7 +42,7 @@ fun Drawable.setTintList( DrawableCompat.setTintList(wrappedDrawable, tint) } -fun Drawable.setTint( +fun Drawable.setTintMutate( @ColorInt tint: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.SRC_ATOP ) { diff --git a/app/src/main/java/io/legado/app/utils/MenuExtensions.kt b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt index e08c94d9c..d325ecdea 100644 --- a/app/src/main/java/io/legado/app/utils/MenuExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/MenuExtensions.kt @@ -22,7 +22,7 @@ fun Menu.applyTint(context: Context, theme: Theme = Theme.Auto): Menu = this.let menu.forEach { item -> (item as MenuItemImpl).let { impl -> //overflow:展开的item - impl.icon.setTint( + impl.icon?.setTintMutate( if (impl.requiresOverflow()) defaultTextColor else tintColor ) } @@ -44,7 +44,7 @@ fun Menu.applyOpenTint(context: Context) { if (menuItems is ArrayList<*>) { for (menuItem in menuItems) { if (menuItem is MenuItem) { - menuItem.icon.setTint(defaultTextColor) + menuItem.icon?.setTintMutate(defaultTextColor) } } }