From c17d05743b196dec11128f9be0d00fb82a71cf0d Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 17 May 2020 22:17:09 +0300
Subject: [PATCH] more themed colors usage

---
 app/src/main/res/drawable-anydpi-v21/fade_down_white.xml | 7 ++++---
 app/src/main/res/layout/fragment_new_transaction.xml     | 2 +-
 app/src/main/res/layout/main_app_layout.xml              | 2 +-
 app/src/main/res/layout/transaction_list_row.xml         | 4 ++--
 app/src/main/res/values/colors.xml                       | 1 -
 app/src/main/res/values/styles.xml                       | 5 +++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/drawable-anydpi-v21/fade_down_white.xml b/app/src/main/res/drawable-anydpi-v21/fade_down_white.xml
index 7b541263..fb22e0c1 100644
--- a/app/src/main/res/drawable-anydpi-v21/fade_down_white.xml
+++ b/app/src/main/res/drawable-anydpi-v21/fade_down_white.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2019 Damyan Ivanov.
+  ~ Copyright © 2020 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
@@ -17,8 +17,9 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:endColor="@color/backgroundColor"
-        android:startColor="@color/backgroundColorTransparent"
+        android:endColor="?android:attr/colorBackground"
+        android:startColor="@android:color/transparent"
+        android:type="linear"
         android:angle="270"
         />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_new_transaction.xml b/app/src/main/res/layout/fragment_new_transaction.xml
index 4ec6e4b8..73e58459 100644
--- a/app/src/main/res/layout/fragment_new_transaction.xml
+++ b/app/src/main/res/layout/fragment_new_transaction.xml
@@ -65,7 +65,7 @@
         android:layout_marginEnd="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
         android:padding="@dimen/fab_margin"
-        android:tint="@android:color/white"
+        android:tint="?android:attr/colorBackground"
         android:visibility="visible"
         app:backgroundTint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/main_app_layout.xml b/app/src/main/res/layout/main_app_layout.xml
index 4b778d64..47d2df68 100644
--- a/app/src/main/res/layout/main_app_layout.xml
+++ b/app/src/main/res/layout/main_app_layout.xml
@@ -21,7 +21,7 @@
     android:id="@+id/main_app_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundColor"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical"
     android:theme="@style/AppTheme.AppBarOverlay"
     tools:context=".ui.activity.MainActivity">
diff --git a/app/src/main/res/layout/transaction_list_row.xml b/app/src/main/res/layout/transaction_list_row.xml
index ca1c0fa0..6b7d15a5 100644
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -109,7 +109,7 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:text="---------"
-            android:textColor="@android:color/white"
+            android:textColor="?android:attr/colorBackground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             tools:ignore="HardcodedText" />
@@ -122,7 +122,7 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:text="--.--.----"
-            android:textColor="@android:color/white"
+            android:textColor="?android:attr/colorBackground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="HardcodedText" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 72b93528..1fb4add3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,7 +20,6 @@
     <color name="colorPrimary">#935FF2</color>
     <color name="colorPrimaryDark">#3e148c</color>
     <color name="colorAccent">#653BD0</color>
-    <color name="drawer_background">#ffffffff</color>
     <color name="table_row_dark_bg">#286c33d4</color>
     <color name="table_row_light_bg">#28ddcbff</color>
     <color name="header_border">#804a148c</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cf076fb1..64b7f91f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,8 +23,9 @@
     <!-- target primary color: #935FF2 -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorPrimary">#935FF2</item>
+        <item name="colorOnPrimary">?android:attr/colorBackground</item>
         <item name="colorAccent">#653BD0</item>
-        <item name="drawer_background">#ffffffff</item>
+        <item name="drawer_background">?android:attr/popupBackground</item>
         <item name="table_row_dark_bg">#286c33d4</item>
         <item name="table_row_light_bg">#28ddcbff</item>
         <item name="windowActionBar">false</item>
@@ -614,7 +615,7 @@
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
 
     <style name="nav_button">
         <item name="android:layout_width">match_parent</item>
-- 
2.39.2