Make header text and tertiary text color themeable

12 files changed, 22 insertions, 19 deletions

diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml
index 04d3d4957..4bee8049b 100644
--- a/OpenKeychain/src/main/res/drawable/section_header.xml
+++ b/OpenKeychain/src/main/res/drawable/section_header.xml
@@ -6,6 +6,6 @@
         android:height="2dp"
         android:width="1000dp" />
 
-    <solid android:color="@color/header_text" />
+    <solid android:color="?attr/colorHeaderText" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
index ffb7493f6..b3969a2bd 100644
--- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -29,7 +29,7 @@
         android:id="@+id/add_user_id_comment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/tertiary_text_light"
+        android:textColor="?attr/colorTertiaryText"
         android:singleLine="true"
         android:lines="1"
         android:maxLines="1"
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index e085fcb09..51b3c087c 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
                 android:text="@string/label_name"
-                android:textColor="@color/tertiary_text_light"
+                android:textColor="?attr/colorTertiaryText"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
                 android:text="@string/label_email"
-                android:textColor="@color/tertiary_text_light"
+                android:textColor="?attr/colorTertiaryText"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -182,4 +182,4 @@
             style="?android:attr/borderlessButtonStyle" />
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index 925b7d778..7bd919abc 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -124,4 +124,4 @@
             android:layout_marginBottom="8dp" />
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index 7f0e1e89e..e1b03f8ae 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -55,4 +55,4 @@
         android:clickable="true"
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index 773a9d416..a7b1e6a53 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:text="@string/none"
             android:layout_gravity="center_vertical"
-            android:textColor="@color/header_text" />
+            android:textColor="?attr/colorHeaderText" />
     </LinearLayout>
 
     <LinearLayout
@@ -34,4 +34,4 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
index a9e86057c..2b39cf54c 100644
--- a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
@@ -60,4 +60,4 @@
         tools:src="@drawable/status_signature_revoked_cutout_24dp"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index 1c55a1446..a9ebe43d3 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -34,7 +34,7 @@
             android:id="@+id/user_id_item_comment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/tertiary_text_light"
+            android:textColor="?attr/colorTertiaryText"
             android:text="comment"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml
index ce110418e..1755756fb 100644
--- a/OpenKeychain/src/main/res/values/attrs.xml
+++ b/OpenKeychain/src/main/res/values/attrs.xml
@@ -4,5 +4,7 @@
         <attr name="colorFab" format="color" />
         <attr name="colorFabPressed" format="color" />
         <attr name="colorEmphasis" format="color" />
+        <attr name="colorHeaderText" format="color" />
+        <attr name="colorTertiaryText" format="color" />
     </declare-styleable>
 </resources>
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index b6b46ec8c..3d9e3e1ed 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -4,11 +4,7 @@
     <color name="icons">#FFFFFF</color>
     <color name="transparent">#00FFFFFF</color>
 
-    <color name="header_text">#212121</color>
-
     <color name="bg_gray">#cecbce</color>
-    <color name="tertiary_text_light">#808080</color>
-    <color name="alert">#ffdd3333</color>
 
     <color name="holo_gray_bright">#33CCCCCC</color>
 
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index c7b326b7a..e21e3749c 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -7,7 +7,7 @@
         <item name="android:layout_marginTop">16dp</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">@color/header_text</item>
+        <item name="android:textColor">?attr/colorHeaderText</item>
         <item name="android:textSize">17sp</item>
     </style>
 
@@ -17,7 +17,7 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/header_text</item>
+        <item name="android:textColor">?attr/colorHeaderText</item>
         <item name="android:textSize">14sp</item>
     </style>
 
@@ -34,4 +34,4 @@
         <item name="android:background">?android:attr/listDivider</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 823622269..a9a12966a 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -10,6 +10,9 @@
         <item name="colorFabPressed">#1976d2</item>
 
         <item name="colorEmphasis">#2196f3</item>
+        <item name="colorHeaderText">#212121</item>
+        <item name="colorTertiaryText">#808080</item>
+
 
         <!-- remove actionbar and title, we use toolbar! -->
         <item name="windowNoTitle">true</item>
@@ -28,6 +31,8 @@
         <item name="colorFabPressed">#1976d2</item>
 
         <item name="colorEmphasis">#2196f3</item>
+        <item name="colorHeaderText">#a0a0a0</item>
+        <item name="colorTertiaryText">#808080</item>
 
         <!-- remove actionbar and title, we use toolbar! -->
         <item name="windowNoTitle">true</item>