From 7544a4d2dbc80b396e7fa845858ce870b8f885a2 Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 5 Feb 2020 01:49:30 -0800 Subject: [PATCH] Color fixing For extensions button on lower androids and highlighted tab in dark theme --- .../kanade/tachiyomi/ui/extension/ExtensionHolder.kt | 10 ++++------ app/src/main/res/layout/main_activity.xml | 4 ++-- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values-night/themes.xml | 5 +++-- app/src/main/res/values-v23/themes.xml | 3 +-- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/themes.xml | 3 +-- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt index 8792fc9e17..fb9766e258 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionHolder.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.ui.extension import android.content.res.ColorStateList -import android.graphics.Color import android.view.View import androidx.core.content.ContextCompat -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.extension.model.Extension @@ -12,6 +10,7 @@ import eu.kanade.tachiyomi.extension.model.InstallStep import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder import eu.kanade.tachiyomi.util.system.LocaleHelper +import eu.kanade.tachiyomi.util.system.getResourceColor import io.github.mthli.slice.Slice import kotlinx.android.synthetic.main.extension_card_item.* @@ -64,6 +63,7 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) : //background = VectorDrawableCompat.create(resources!!, R.drawable.button_bg_transparent, null) setTextColor(ContextCompat.getColorStateList(context, R.drawable.button_text_state)) + backgroundTintList = ContextCompat.getColorStateList(context, R.drawable.button_bg_transparent) val extension = item.extension @@ -84,14 +84,12 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) : when { extension.hasUpdate -> { isActivated = true - // backgroundTintList = ColorStateList(arrayOf(intArrayOf(0)), intArrayOf(Color - //.BLACK)) + backgroundTintList = ColorStateList.valueOf( + context.getResourceColor(R.attr.colorAccent)) setText(R.string.ext_update) } extension.isObsolete -> { // Red outline - // background = VectorDrawableCompat.create(resources, R.drawable - // .button_bg_error, null) setTextColor(ContextCompat.getColorStateList(context, R.drawable.button_bg_error)) setText(R.string.ext_obsolete) diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 688487d431..a21fd11695 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -49,8 +49,8 @@ android:theme="@style/Theme.ActionBar.Tab" android:background="?colorPrimary" app:tabRippleColor="@color/rippleColor" - app:tabIndicatorColor="?attr/tabBarIconColor" - app:tabTextColor="?attr/tabBarIconColor" + app:tabIndicatorColor="?attr/actionBarTintColor" + app:tabTextColor="?attr/actionBarTintColor" app:tabInlineLabel="true" app:tabGravity="center" app:tabMode="auto" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 9a62f310a1..328c85cec3 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -15,7 +15,7 @@ #212121 #212121 @color/md_white_1000_38 - #3399FF + @color/colorAccent @color/md_white_1000 @color/md_white_1000_70 diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 051259f364..3b46ca3e55 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -9,14 +9,15 @@ diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml index 311df89ac6..0624ba8ce3 100644 --- a/app/src/main/res/values-v23/themes.xml +++ b/app/src/main/res/values-v23/themes.xml @@ -6,9 +6,8 @@ @color/colorPrimary @color/textColorPrimary @style/ThemeOverlay.AppCompat.DayNight.ActionBar - @color/colorPrimary + @color/colorAccent @color/colorPrimaryInactive - @color/colorAccent @android:color/transparent \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bf721d3b9c..a814005124 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -32,6 +32,7 @@ @color/md_black_1000_12 #B3FFFFFF @color/material_red_accent_700 + @color/md_white_1000 @color/colorAccent #212121 diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 078be0da61..fb2563688a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -24,7 +24,7 @@ @color/divider @drawable/line_divider_light @style/CustomActionModeStyle - @color/md_white_1000 + @color/tabBarIconHighlight @color/md_white_1000_76 @@ -68,7 +68,6 @@ @color/colorPrimary @color/colorPrimaryInactive @color/md_black_1000_54 - @color/colorAccent