finished app compat themeing

7 files changed, 12 insertions, 28 deletions

diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 55cd7dd53..af1dcd271 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -31,7 +31,7 @@
                     android:layout_height="wrap_content"
                     app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                     app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="?attr/color_text_secondary">
+                    app:passwordToggleTint="?android:textColorSecondary">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/current_password"
@@ -48,7 +48,7 @@
                     android:layout_height="wrap_content"
                     app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                     app:passwordToggleEnabled="true"
-                    app:passwordToggleTint="?attr/color_text_secondary">
+                    app:passwordToggleTint="?android:textColorSecondary">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/new_password"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 4075476f9..88797b14a 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -112,7 +112,6 @@
                             android:layout_marginBottom="4dp"
                             android:layout_marginTop="4dp"
                             android:gravity="center_horizontal"
-                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             android:textStyle="italic" />
 
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 687db3cea..90dd1b194 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -73,7 +73,7 @@
                             android:layout_height="wrap_content"
                             app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
                             app:passwordToggleEnabled="true"
-                            app:passwordToggleTint="?attr/color_text_secondary">
+                            app:passwordToggleTint="?android:textColorSecondary">
 
                             <android.support.design.widget.TextInputEditText
                                 android:id="@+id/account_password"
@@ -646,15 +646,13 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/cancel"
-                android:textColor="?attr/color_text_primary" />
+                android:text="@string/cancel" />
 
             <View
                 android:layout_width="1dp"
                 android:layout_height="fill_parent"
                 android:layout_marginBottom="7dp"
-                android:layout_marginTop="7dp"
-                android:background="?attr/color_text_primary" />
+                android:layout_marginTop="7dp" />
 
             <Button
                 android:id="@+id/save_button"
@@ -663,8 +661,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:enabled="false"
-                android:text="@string/save"
-                android:textColor="?attr/color_text_primary" />
+                android:text="@string/save" />
         </LinearLayout>
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 1df224831..e0b33929d 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -82,8 +82,7 @@
                     android:layout_marginTop="8dp"
                     android:minLines="3"
                     android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                    android:textColor="?attr/color_text_primary" />
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
@@ -103,15 +102,13 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:text="@string/cancel" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="match_parent"
             android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="?attr/color_text_primary" />
+            android:layout_marginTop="7dp" />
 
         <Button
             android:id="@+id/publish_button"
@@ -120,8 +117,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:enabled="false"
-            android:text="@string/publish"
-            android:textColor="?attr/color_text_primary" />
+            android:text="@string/publish" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 7f84491e0..f52d0fe99 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -110,8 +110,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/cancel"
-                android:textColor="?attr/color_text_primary" />
+                android:text="@string/cancel" />
 
             <View
                 android:layout_width="1dp"
@@ -127,8 +126,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:enabled="true"
-                android:text="@string/done"
-                android:textColor="?attr/color_text_secondary" />
+                android:text="@string/done" />
         </LinearLayout>
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index f9bdae03a..4707136cb 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -11,9 +11,6 @@
     <attr name="color_background_primary" format="reference|color" />
     <attr name="color_warning" format="reference|color"/>
 
-    <attr name="color_text_primary" format="reference|color" />
-    <attr name="color_text_secondary" format="reference|color" />
-
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 4db3ae107..8a7113b16 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -6,9 +6,6 @@
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
 
-        <item name="color_text_primary">@color/black87</item>
-        <item name="color_text_secondary">@color/black54</item>
-
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>