From f834d46dc6ec2c85ec69a6a5acf17a85b6e94d9d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 29 Jul 2019 15:52:37 -0500
Subject: [PATCH] Update location picker and purchase text styles

---
 .../main/res/layout/activity_location_picker.xml   | 11 ++++++-----
 app/src/main/res/layout/dialog_purchase.xml        | 14 +++++++-------
 app/src/main/res/layout/row_place.xml              | 10 +++++-----
 app/src/main/res/values/styles.xml                 |  4 +++-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml
index 630e313ae..1cb777da0 100644
--- a/app/src/main/res/layout/activity_location_picker.xml
+++ b/app/src/main/res/layout/activity_location_picker.xml
@@ -144,7 +144,8 @@
             android:gravity="start|center_vertical"
             android:text="@string/pick_this_location"
             android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance"/>
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textColor="@color/text_primary"/>
 
           <TextView
             android:id="@+id/choose_recent_location"
@@ -158,9 +159,8 @@
             android:gravity="start"
             android:text="@string/or_choose_a_location"
             android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="14sp"/>
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+            android:textColor="@color/text_primary"/>
 
         </RelativeLayout>
 
@@ -208,7 +208,8 @@
           android:gravity="start"
           android:text="@android:string/search_go"
           android:textAlignment="viewStart"
-          android:textAppearance="@style/TextAppearance"/>
+          android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+          android:textColor="@color/text_primary"/>
 
       </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/dialog_purchase.xml b/app/src/main/res/layout/dialog_purchase.xml
index e5c29aacd..0a95e9c7e 100644
--- a/app/src/main/res/layout/dialog_purchase.xml
+++ b/app/src/main/res/layout/dialog_purchase.xml
@@ -10,23 +10,23 @@
     android:orientation="vertical">
 
     <TextView
-      style="@style/TextAppearance.AppCompat.Body1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/pro_description"/>
+      android:text="@string/pro_description"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"/>
 
     <TextView
-      style="@style/TextAppearance.AppCompat.Body1"
-      android:paddingTop="@dimen/keyline_first"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/pro_subscribe_now"/>
+      android:paddingTop="@dimen/keyline_first"
+      android:text="@string/pro_subscribe_now"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"/>
 
     <TextView
       android:id="@+id/feature_list"
-      style="@style/TextAppearance.AppCompat.Body1"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"/>
 
   </LinearLayout>
 
diff --git a/app/src/main/res/layout/row_place.xml b/app/src/main/res/layout/row_place.xml
index 672c04c6b..1f1fe752d 100644
--- a/app/src/main/res/layout/row_place.xml
+++ b/app/src/main/res/layout/row_place.xml
@@ -31,9 +31,9 @@
     android:paddingEnd="@dimen/keyline_first"
     android:paddingLeft="@dimen/keyline_first"
     android:paddingRight="@dimen/keyline_first"
-    android:visibility="gone"
     android:src="@drawable/ic_outline_delete_24px"
-    android:tint="@color/icon_tint"/>
+    android:tint="@color/icon_tint"
+    android:visibility="gone"/>
 
   <TextView
     android:id="@+id/name"
@@ -51,7 +51,7 @@
     android:gravity="start|top"
     android:maxLines="2"
     android:textAlignment="viewStart"
-    android:textSize="16sp"/>
+    android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"/>
 
   <TextView
     android:id="@+id/address"
@@ -68,8 +68,8 @@
     android:paddingRight="@dimen/keyline_first"
     android:ellipsize="end"
     android:maxLines="2"
-    android:textColor="?android:textColorSecondary"
-    android:visibility="gone"/>
+    android:visibility="gone"
+    android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"/>
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5717f48d4..ef55f3e93 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -67,7 +67,9 @@
 
   <!--================================================== General == -->
 
-  <style name="TextAppearance" parent="android:TextAppearance"/>
+  <style name="TextAppearance" parent="android:TextAppearance">
+    <item name="android:textColor">@color/text_primary</item>
+  </style>
 
   <!--=============================================== MainActivity == -->