From f89dcc5dd62dd377d03f99182df4239531d49c7a Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 26 Jul 2019 11:08:48 -0500 Subject: [PATCH] Use android:textColorSecondary reference --- .../java/com/todoroo/astrid/notes/CommentsController.java | 4 +--- app/src/main/res/layout/activity_location_picker.xml | 2 +- app/src/main/res/layout/location_row.xml | 3 +-- app/src/main/res/layout/row_attribution.xml | 2 +- app/src/main/res/layout/row_place.xml | 2 +- app/src/main/res/layout/task_adapter_row_body.xml | 6 +++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java index 7ab0d05ba..2917b82e9 100644 --- a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java +++ b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.notes; -import static androidx.core.content.ContextCompat.getColor; import static org.tasks.files.ImageHelper.sampleBitmap; import android.app.Activity; @@ -87,8 +86,7 @@ public class CommentsController { if (items.size() > commentItems) { Button loadMore = new Button(activity); - loadMore.setText(R.string.TEA_load_more); - loadMore.setTextColor(getColor(activity, R.color.text_secondary)); + loadMore.setHint(R.string.TEA_load_more); loadMore.setBackgroundColor(Color.alpha(0)); loadMore.setOnClickListener( v -> { diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml index df5ce8d41..50b0da60b 100644 --- a/app/src/main/res/layout/activity_location_picker.xml +++ b/app/src/main/res/layout/activity_location_picker.xml @@ -161,7 +161,7 @@ android:text="@string/or_choose_a_location" android:textAlignment="viewStart" android:textAppearance="@style/TextAppearance" - android:textColor="@color/text_secondary" + android:textColor="?android:textColorSecondary" android:textSize="14sp"/> diff --git a/app/src/main/res/layout/location_row.xml b/app/src/main/res/layout/location_row.xml index 2a873420c..03d7aa2eb 100644 --- a/app/src/main/res/layout/location_row.xml +++ b/app/src/main/res/layout/location_row.xml @@ -32,8 +32,7 @@ android:focusable="true" android:gravity="start" android:hint="@string/add_location" - android:textAlignment="viewStart" - android:textColorHint="@color/text_secondary"/> + android:textAlignment="viewStart"/> diff --git a/app/src/main/res/layout/row_place.xml b/app/src/main/res/layout/row_place.xml index 561c240c7..62366d0f1 100644 --- a/app/src/main/res/layout/row_place.xml +++ b/app/src/main/res/layout/row_place.xml @@ -69,7 +69,7 @@ android:paddingRight="@dimen/keyline_first" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_secondary" + android:textColor="?android:textColorSecondary" android:visibility="gone"/> diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml index 46a8c0e1a..3fddfaab1 100644 --- a/app/src/main/res/layout/task_adapter_row_body.xml +++ b/app/src/main/res/layout/task_adapter_row_body.xml @@ -88,7 +88,7 @@ android:gravity="start" android:maxLines="2" android:textAlignment="viewStart" - android:textColor="@color/text_secondary" + android:textColor="?android:textColorSecondary" android:textSize="@dimen/task_edit_text_size" android:visibility="gone"/> @@ -101,12 +101,12 @@ android:layout_marginLeft="@dimen/keyline_content_inset" android:layout_marginRight="@dimen/keyline_first" android:layout_gravity="center_vertical|end" - android:textColor="@color/text_secondary" + android:textColor="?android:textColorSecondary" android:visibility="gone" app:chipBackgroundColor="?attr/asContentBackground" app:chipIcon="@drawable/ic_outline_place_24px" app:chipIconTint="@color/icon_tint" - app:chipStrokeColor="@color/text_secondary" + app:chipStrokeColor="?android:textColorSecondary" app:chipStrokeWidth="@dimen/chip_stroke" app:iconEndPadding="0dp" app:iconStartPadding="@dimen/chip_text_padding"