From 113f62954f69145ea0076c3408f3d50ab58ddac2 Mon Sep 17 00:00:00 2001 From: LooKeR Date: Sat, 13 Nov 2021 11:29:23 +0530 Subject: [PATCH] Improve: MaterialTextView takes care of TextColor --- src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt | 2 -- src/main/res/layout/link_item.xml | 3 --- src/main/res/layout/permissions_item.xml | 1 - src/main/res/layout/preference_item.xml | 2 -- src/main/res/layout/product_header_item.xml | 2 -- src/main/res/layout/product_item.xml | 2 -- src/main/res/layout/release_info.xml | 4 ---- src/main/res/layout/release_item.xml | 2 -- src/main/res/layout/repository_item.xml | 1 - src/main/res/layout/section_item.xml | 2 -- src/main/res/layout/tabs_toolbar.xml | 1 - src/main/res/layout/title_text_item.xml | 2 -- 12 files changed, 24 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt index 7da59050..94bc6149 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt @@ -385,7 +385,6 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int) itemView as MaterialTextView itemView.typeface = TypefaceExtra.medium itemView.setTextSizeScaled(14) - itemView.setTextColor(itemView.context.getColorFromAttr(android.R.attr.textColor)) itemView.background = ResourcesCompat.getDrawable( itemView.resources, @@ -414,7 +413,6 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int) init { itemView as MaterialTextView itemView.setTextSizeScaled(15) - itemView.setTextColor(itemView.context.getColorFromAttr(android.R.attr.textColor)) itemView.resources.sizeScaled(16).let { itemView.setPadding(it, it, it, it) } itemView.movementMethod = ClickableMovementMethod itemView.layoutParams = RecyclerView.LayoutParams( diff --git a/src/main/res/layout/link_item.xml b/src/main/res/layout/link_item.xml index d3e7885b..19813eba 100644 --- a/src/main/res/layout/link_item.xml +++ b/src/main/res/layout/link_item.xml @@ -14,7 +14,6 @@ android:layout_height="24dp" android:layout_gravity="center" android:scaleType="centerInside" - android:tint="?android:attr/textColor" android:tintMode="src_in" tools:ignore="ContentDescription" /> @@ -30,7 +29,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> diff --git a/src/main/res/layout/permissions_item.xml b/src/main/res/layout/permissions_item.xml index b7662d28..da9169bd 100644 --- a/src/main/res/layout/permissions_item.xml +++ b/src/main/res/layout/permissions_item.xml @@ -26,7 +26,6 @@ android:layout_weight="1" android:paddingTop="16dp" android:paddingBottom="16dp" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> diff --git a/src/main/res/layout/preference_item.xml b/src/main/res/layout/preference_item.xml index e43718e1..c2271596 100644 --- a/src/main/res/layout/preference_item.xml +++ b/src/main/res/layout/preference_item.xml @@ -17,14 +17,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> diff --git a/src/main/res/layout/product_header_item.xml b/src/main/res/layout/product_header_item.xml index b51c4393..dadad0fe 100644 --- a/src/main/res/layout/product_header_item.xml +++ b/src/main/res/layout/product_header_item.xml @@ -36,7 +36,6 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-medium" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="17sp" /> diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml index d5009618..b91fe2e7 100644 --- a/src/main/res/layout/product_item.xml +++ b/src/main/res/layout/product_item.xml @@ -39,7 +39,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> diff --git a/src/main/res/layout/release_info.xml b/src/main/res/layout/release_info.xml index fa22fd3d..b0af3c17 100644 --- a/src/main/res/layout/release_info.xml +++ b/src/main/res/layout/release_info.xml @@ -31,7 +31,6 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:singleLine="true" - android:textColor="?android:textColor" android:textSize="16sp" /> @@ -63,7 +62,6 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> @@ -95,7 +93,6 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:singleLine="true" - android:textColor="?android:textColor" android:textSize="16sp" /> @@ -136,7 +133,6 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:singleLine="true" - android:textColor="?android:textColor" android:textSize="12sp" /> diff --git a/src/main/res/layout/release_item.xml b/src/main/res/layout/release_item.xml index c21c6c6d..aec3a255 100644 --- a/src/main/res/layout/release_item.xml +++ b/src/main/res/layout/release_item.xml @@ -33,7 +33,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" tools:ignore="InefficientWeight" /> @@ -64,7 +63,6 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="14sp" /> diff --git a/src/main/res/layout/repository_item.xml b/src/main/res/layout/repository_item.xml index 2fdfffd5..9625f8cb 100644 --- a/src/main/res/layout/repository_item.xml +++ b/src/main/res/layout/repository_item.xml @@ -13,7 +13,6 @@ android:layout_marginStart="16dp" android:layout_weight="1" android:singleLine="true" - android:textColor="?android:attr/textColor" android:textSize="16sp" /> diff --git a/src/main/res/layout/tabs_toolbar.xml b/src/main/res/layout/tabs_toolbar.xml index c55bb1e3..b74aec7e 100644 --- a/src/main/res/layout/tabs_toolbar.xml +++ b/src/main/res/layout/tabs_toolbar.xml @@ -34,7 +34,6 @@ android:layout_marginStart="20dp" android:layout_weight="1" android:gravity="center_vertical" - android:textColor="?android:attr/textColor" android:textSize="16sp" />