From f5bf212c76ac9517a96998800bfd10ffa7a74697 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sun, 11 Aug 2019 20:33:13 +0200 Subject: [PATCH] Apply text color directly from theme attr --- .../moez/QKSMS/common/util/TextViewStyler.kt | 20 +++------- .../src/main/res/layout/changelog_dialog.xml | 5 +-- .../main/res/layout/changelog_list_item.xml | 5 +-- .../main/res/layout/chip_input_list_item.xml | 5 +-- .../src/main/res/layout/compose_activity.xml | 9 ++--- .../src/main/res/layout/contact_chip.xml | 9 ++--- .../src/main/res/layout/contact_list_item.xml | 9 ++--- .../res/layout/contact_number_list_item.xml | 5 +-- .../src/main/res/layout/drawer_view.xml | 37 +++++++++---------- .../main/res/layout/main_permission_hint.xml | 7 ++-- .../main/res/layout/message_list_item_in.xml | 15 ++++---- .../main/res/layout/message_list_item_out.xml | 17 ++++----- .../src/main/res/layout/qkreply_activity.xml | 5 +-- .../main/res/layout/qksms_plus_activity.xml | 33 ++++++++--------- .../main/res/layout/scheduled_activity.xml | 15 ++++---- .../src/main/res/layout/search_list_item.xml | 10 ++--- .../src/main/res/layout/theme_picker_hsv.xml | 9 ++--- presentation/src/main/res/values/attrs.xml | 11 ++---- presentation/src/main/res/values/styles.xml | 10 ++--- 19 files changed, 104 insertions(+), 132 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt index 4ad25a18..cd701a30 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt @@ -27,7 +27,6 @@ import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR import com.moez.QKSMS.common.util.extensions.getColorCompat -import com.moez.QKSMS.common.util.extensions.resolveThemeColor import com.moez.QKSMS.common.widget.QkEditText import com.moez.QKSMS.common.widget.QkTextView import com.moez.QKSMS.util.Preferences @@ -40,13 +39,10 @@ class TextViewStyler @Inject constructor( ) { companion object { - const val COLOR_PRIMARY = 0 - const val COLOR_SECONDARY = 1 - const val COLOR_TERTIARY = 2 - const val COLOR_PRIMARY_ON_THEME = 3 - const val COLOR_SECONDARY_ON_THEME = 4 - const val COLOR_TERTIARY_ON_THEME = 5 - const val COLOR_THEME = 6 + const val COLOR_THEME = 0 + const val COLOR_PRIMARY_ON_THEME = 1 + const val COLOR_SECONDARY_ON_THEME = 2 + const val COLOR_TERTIARY_ON_THEME = 3 const val SIZE_PRIMARY = 0 const val SIZE_SECONDARY = 1 @@ -75,9 +71,6 @@ class TextViewStyler @Inject constructor( else -> return } setTextColor(when (colorAttr) { - COLOR_PRIMARY -> context.getColorCompat(R.color.textPrimary) - COLOR_SECONDARY -> context.getColorCompat(R.color.textSecondary) - COLOR_TERTIARY -> context.getColorCompat(R.color.textTertiary) COLOR_PRIMARY_ON_THEME -> context.getColorCompat(R.color.textPrimaryDark) COLOR_SECONDARY_ON_THEME -> context.getColorCompat(R.color.textSecondaryDark) COLOR_TERTIARY_ON_THEME -> context.getColorCompat(R.color.textTertiaryDark) @@ -125,13 +118,10 @@ class TextViewStyler @Inject constructor( } setTextColor(when (colorAttr) { - COLOR_PRIMARY -> context.resolveThemeColor(android.R.attr.textColorPrimary) - COLOR_SECONDARY -> context.resolveThemeColor(android.R.attr.textColorSecondary) - COLOR_TERTIARY -> context.resolveThemeColor(android.R.attr.textColorTertiary) + COLOR_THEME -> colors.theme().theme COLOR_PRIMARY_ON_THEME -> colors.theme().textPrimary COLOR_SECONDARY_ON_THEME -> colors.theme().textSecondary COLOR_TERTIARY_ON_THEME -> colors.theme().textTertiary - COLOR_THEME -> colors.theme().theme else -> currentTextColor }) diff --git a/presentation/src/main/res/layout/changelog_dialog.xml b/presentation/src/main/res/layout/changelog_dialog.xml index d0c4e556..1d24f5bb 100644 --- a/presentation/src/main/res/layout/changelog_dialog.xml +++ b/presentation/src/main/res/layout/changelog_dialog.xml @@ -1,5 +1,4 @@ - - - @@ -45,8 +44,8 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="8dp" android:layout_marginRight="12dp" + android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" - app:textColor="primary" app:textSize="secondary" tools:text="Moez Bhatti" /> diff --git a/presentation/src/main/res/layout/contact_list_item.xml b/presentation/src/main/res/layout/contact_list_item.xml index 2e0d7ded..bc6703d2 100644 --- a/presentation/src/main/res/layout/contact_list_item.xml +++ b/presentation/src/main/res/layout/contact_list_item.xml @@ -1,5 +1,4 @@ - -