Adjust card wrapper background color

5 files changed, 10 insertions, 7 deletions

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 71df4675b..7ae0ab74d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,7 @@
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_card_wrapper"
     android:fitsSystemWindows="true">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -129,7 +130,7 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/simple_filter"
                     android:padding="12dp"
-                    android:tint="@color/accent"
+                    android:tint="?attr/colorAccent"
                     android:tooltipText="@string/simple_filter"
                     android:translationX="6dp"
                     app:srcCompat="@drawable/ic_filter_list_white_24dp"
@@ -143,7 +144,7 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/action_archived_cards"
                     android:padding="12dp"
-                    android:tint="@color/accent"
+                    android:tint="?attr/colorAccent"
                     android:tooltipText="@string/action_archived_cards"
                     android:translationX="12dp"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index c3a727b71..c0457f5e4 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -148,7 +148,7 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/label_menu"
                     android:padding="@dimen/spacer_1hx"
-                    android:tint="@color/accent"
+                    android:tint="?attr/colorAccent"
                     app:srcCompat="@drawable/ic_menu" />
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 9769f681d..754e989fe 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -22,7 +22,7 @@
             android:id="@+id/parentBorder"
             android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:background="@color/primary" />
+            android:background="?attr/colorPrimary" />
 
         <TextView
             android:id="@+id/parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 9c71bfbcf..e04f238c2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="primary">#121212</color>
-    <color name="accent">#ffffff</color>
+    <color name="accent">@android:color/white</color>
     <color name="fg_secondary">#666</color>
     <color name="bg_highlighted">#2a2a2a</color>
     <color name="bg_info_box">#222222</color>
     <color name="bg_card">#2a2a2a</color>
+    <color name="bg_card_wrapper">@android:color/black</color>
 
     <color name="widget_background">#cc212121</color>
     <color name="widget_foreground">#ccf5f5f5</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7badd377d..120fcac27 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#ffffff</color>
+    <color name="primary">@android:color/white</color>
     <color name="accent">#000000</color>
     <color name="defaultBrand">#0082C9</color>
     <color name="toolbarEditTextHighlightColor">#55ffffff</color>
@@ -11,7 +11,8 @@
     <color name="bg_highlighted">#eee</color>
     <color name="grey600">#757575</color>
     <color name="bg_info_box">#dddddd</color>
-    <color name="bg_card">#ffffff</color>
+    <color name="bg_card">@android:color/white</color>
+    <color name="bg_card_wrapper">#fafafa</color>
 
     <color name="dark_fg_primary">#e5e5e5</color>