From 65548c95a252daea7e99e16a9913da8406dbd09e Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 10 Apr 2021 16:13:01 -0400 Subject: [PATCH] More updates to theme color logic Using attr in more places --- .../java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt | 2 +- .../java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt | 5 +++-- app/src/main/res/layout/categories_item.xml | 4 ++-- app/src/main/res/layout/chapters_item.xml | 6 +++--- app/src/main/res/layout/main_activity.xml | 1 + app/src/main/res/values/colors.xml | 2 -- app/src/main/res/values/styles.xml | 6 +++--- app/src/main/res/values/themes.xml | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt index cb3239fa23..405df98b6b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt @@ -63,7 +63,7 @@ class CategoryHolder(view: View, val adapter: CategoryAdapter) : BaseFlexibleVie binding.editText.setText("") binding.editText.hint = binding.title.text } else { - binding.title.setTextColor(ContextCompat.getColor(itemView.context, R.color.textColorPrimary)) + binding.title.setTextColor(itemView.context.getResourceColor(android.R.attr.textColorPrimary)) regularDrawable = ContextCompat.getDrawable( itemView.context, R.drawable diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt index e3a85446c1..6e29a03a9f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt @@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.ui.manga.chapter.ChapterItem import eu.kanade.tachiyomi.util.system.contextCompatColor import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.dpToPxEnd +import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.timeSpanFromNow class ChapterUtil { @@ -85,9 +86,9 @@ class ChapterUtil { private fun readColor(context: Context): Int = context.contextCompatColor(R.color.read_chapter) - private fun unreadColor(context: Context): Int = context.contextCompatColor(R.color.unread_chapter) + private fun unreadColor(context: Context): Int = context.getResourceColor(android.R.attr.textColorPrimary) - private fun bookmarkedColor(context: Context): Int = context.contextCompatColor(R.color.bookmarked_chapter) + private fun bookmarkedColor(context: Context): Int = context.getResourceColor(android.R.attr.colorAccent) private val volumeRegex = Regex("""(vol|volume)\.? *([0-9]+)?""", RegexOption.IGNORE_CASE) private val seasonRegex = Regex("""(Season |S)([0-9]+)?""") diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml index ee092b6ce0..13f4e903ae 100644 --- a/app/src/main/res/layout/categories_item.xml +++ b/app/src/main/res/layout/categories_item.xml @@ -53,7 +53,7 @@ android:inputType="textCapSentences" android:maxLines="1" android:singleLine="true" - android:textColor="@color/textColorPrimary" + android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintTop_toTopOf="@id/title" @@ -69,7 +69,7 @@ android:layout_marginStart="3dp" android:inputType="none" android:maxLines="1" - android:textColor="@color/textColorPrimary" + android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@id/edit_button" app:layout_constraintStart_toEndOf="@id/image" diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml index 6a10d153c0..5e774d111f 100644 --- a/app/src/main/res/layout/chapters_item.xml +++ b/app/src/main/res/layout/chapters_item.xml @@ -22,7 +22,7 @@ android:id="@+id/read" android:layout_width="24dp" android:layout_height="24dp" - android:tint="@color/md_white_1000" + app:tint="@color/md_white_1000" android:layout_gravity="end|center" android:layout_marginEnd="21dp" android:src="@drawable/ic_read_24dp" /> @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - android:background="@color/colorAccent" + android:background="?colorAccent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -46,7 +46,7 @@ android:layout_height="24dp" android:layout_gravity="start|center" android:layout_marginStart="21dp" - android:tint="@color/md_white_1000" + app:tint="@color/md_white_1000" android:src="@drawable/ic_bookmark_24dp" /> diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 8febb40794..f60614665d 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -34,6 +34,7 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3ca47ffe5a..9e6507afdb 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,8 +14,6 @@ #404040 @color/text_color_hint - @color/textColorPrimary - @color/colorAccent @color/colorAccent @color/md_white_1000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b924147580..81bb7c99a7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -53,7 +53,7 @@