100% themed colours

diff --git a/app/src/main/res/layout/profile_detail.xml b/app/src/main/res/layout/profile_detail.xml
index 7cf60be51ebf618e77401e1172ea73baade41c3e..3c192f6d74dd10bc2f587a59049112983c91f050 100644 (file)
--- a/app/src/main/res/layout/profile_detail.xml
+++ b/app/src/main/res/layout/profile_detail.xml
@@ -87,13 +87,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@color/error_background"
+                android:background="?colorError"
                 android:padding="@dimen/activity_vertical_margin"
                 android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textColor="?colorOnError"
                     android:text="@string/insecure_scheme_with_auth" />
             </LinearLayout>
 

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1fb4add32903363714ab603955ce31b0007f4dfb..b537aadb5c3ca3c2272717f8c4630369a3deae5b 100644 (file)
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,14 +17,4 @@
   -->
 
 <resources>
-    <color name="colorPrimary">#935FF2</color>
-    <color name="colorPrimaryDark">#3e148c</color>
-    <color name="colorAccent">#653BD0</color>
-    <color name="table_row_dark_bg">#286c33d4</color>
-    <color name="table_row_light_bg">#28ddcbff</color>
-    <color name="header_border">#804a148c</color>
-    <color name="error_background">#FFE1E2</color>
-    <color name="errorTextColor">#CD1609</color>
-    <color name="backgroundColor">#EEEEEE</color>
-    <color name="backgroundColorTransparent">#00eeeeee</color>
 </resources>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cf5497ad2c72db5b07d92b75c45b057131e16136..28486aec7f8ce9344a853f56aa4cb01ba3f616bb 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,7 +28,7 @@
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">#935FF2</item>
         <item name="colorPrimaryTransparent">#00935FF2</item>
-        <item name="colorOnPrimary">?android:attr/colorBackground</item>
+        <item name="colorOnPrimary">@android:color/white</item>
         <item name="colorPrimaryDark">#653BD0</item>
         <item name="colorAccent">#653BD0</item>
         <item name="drawer_background">?android:attr/popupBackground</item>
@@ -36,10 +36,11 @@
         <item name="table_row_light_bg">#28ddcbff</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="textColor">#757575</item>
-        <item name="errorTextColor">@color/errorTextColor</item>
-        <item name="colorOnSecondary">?android:attr/colorBackground</item>
+        <item name="textColor">#707070</item>
+        <item name="colorOnSecondary">@android:color/white</item>
         <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense</item>
+        <item name="colorError">#FFE1E2</item>
+        <item name="colorOnError">#CD1609</item>
         <item name="floatingActionButtonStyle">@style/myFabStyle</item>
     </style>