From fa607a78562f9c9edefa550ed120f3d82a14dd83 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 12 May 2018 12:32:33 +0200
Subject: [PATCH] Some more dark mode theming fixes

---
 app/src/main/res/layout/activity_edit_profile.xml |  2 --
 app/src/main/res/layout/card_keyprofile.xml       |  3 +--
 app/src/main/res/values/styles.xml                | 15 ++-------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index d3bd9805..145c1b34 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -34,7 +34,6 @@
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/background"
             android:orientation="vertical"
             android:stretchColumns="1"
             android:layout_marginEnd="35dp">
@@ -111,7 +110,6 @@
             <TableLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="?attr/background"
                     android:orientation="vertical"
                     android:stretchColumns="1"
                     android:layout_marginEnd="35dp">
diff --git a/app/src/main/res/layout/card_keyprofile.xml b/app/src/main/res/layout/card_keyprofile.xml
index dd456b11..95217412 100644
--- a/app/src/main/res/layout/card_keyprofile.xml
+++ b/app/src/main/res/layout/card_keyprofile.xml
@@ -102,7 +102,6 @@
         android:padding="0dp"
         android:layout_margin="0dp"
         android:layout_width="match_parent"
-        android:background="?attr/background"
         android:layout_height="match_parent">
 
         <ProgressBar
@@ -114,4 +113,4 @@
             android:layout_weight="1"/>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2bf07a99..ddc464e9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,19 +17,14 @@
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:windowBackground">@color/background</item>
-        <item name="android:textColorPrimary">@color/primary_text</item>
-        <item name="android:textColorSecondary">@color/secondary_text</item>
-
         <item name="primaryText">@color/primary_text</item>
         <item name="secondaryText">@color/secondary_text</item>
-        <item name="background">@color/background</item>
         <item name="cardBackground">@color/card_background</item>
         <item name="codePrimaryText">@color/code_primary_text</item>
-
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="background">@color/background</item>
 
         <item name="swirl_ridgeColor">@color/colorSwirlPrimary</item>
         <item name="swirl_errorColor">@color/colorSwirlError</item>
@@ -51,20 +46,14 @@
     </style>
 
     <style name="AppTheme.Dark" parent="Theme.AppCompat">
-        <item name="android:windowBackground">@color/background_dark</item>
-        <item name="android:textColorPrimary">@color/primary_text_dark</item>
-        <item name="android:textColorSecondary">@color/secondary_text_dark</item>
-
         <item name="primaryText">@color/primary_text_dark</item>
         <item name="secondaryText">@color/secondary_text_dark</item>
-        <item name="background">@color/background_dark</item>
         <item name="cardBackground">@color/card_background_dark</item>
         <item name="codePrimaryText">@color/code_primary_text_dark</item>
-
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorHint">@color/secondary_text</item>
+        <item name="background">@color/background_dark</item>
 
         <item name="swirl_ridgeColor">@color/colorSwirlPrimaryDark</item>
         <item name="swirl_errorColor">@color/colorSwirlErrorDark</item>