From 561d5675f7e2d2902601d94db2d5bae9a85798c4 Mon Sep 17 00:00:00 2001
From: krlvm <51774833+krlvm@users.noreply.github.com>
Date: Mon, 29 Mar 2021 21:35:00 +0300
Subject: [PATCH] Fix Downloader colors

---
 app/src/main/res/layout/mission_item.xml       |  6 ++++--
 .../main/res/layout/mission_item_linear.xml    |  6 ++++--
 app/src/main/res/layout/missions_header.xml    |  6 ------
 app/src/main/res/values/attrs.xml              |  1 +
 app/src/main/res/values/styles.xml             |  1 +
 app/src/main/res/values/styles_misc.xml        | 18 +++++-------------
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout/mission_item.xml b/app/src/main/res/layout/mission_item.xml
index cc8bb0b90..fa04e92eb 100644
--- a/app/src/main/res/layout/mission_item.xml
+++ b/app/src/main/res/layout/mission_item.xml
@@ -39,7 +39,8 @@
                 android:layout_marginRight="1dp"
                 android:contentDescription="TODO"
                 android:scaleType="center"
-                app:srcCompat="@drawable/ic_more_vert" />
+                app:srcCompat="@drawable/ic_more_vert"
+                app:tint="?attr/actionColor" />
 
         </RelativeLayout>
 
@@ -52,7 +53,8 @@
             android:contentDescription="TODO"
             android:gravity="center"
             android:padding="10dp"
-            android:scaleType="fitXY" />
+            android:scaleType="fitXY"
+            app:tint="?attr/actionColor" />
 
         <TextView
             android:id="@+id/item_name"
diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml
index b3fa2be53..ceb819e7f 100644
--- a/app/src/main/res/layout/mission_item_linear.xml
+++ b/app/src/main/res/layout/mission_item_linear.xml
@@ -18,7 +18,8 @@
             android:contentDescription="TODO"
             android:gravity="center"
             android:padding="15dp"
-            android:scaleType="fitXY" />
+            android:scaleType="fitXY"
+            app:tint="?attr/actionColor" />
 
         <TextView
             android:id="@+id/item_name"
@@ -71,7 +72,8 @@
             android:layout_marginRight="4dp"
             android:contentDescription="TODO"
             android:scaleType="centerInside"
-            app:srcCompat="@drawable/ic_more_vert" />
+            app:srcCompat="@drawable/ic_more_vert"
+            app:tint="?attr/actionColor" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/missions_header.xml b/app/src/main/res/layout/missions_header.xml
index 45c8b95b8..840986251 100644
--- a/app/src/main/res/layout/missions_header.xml
+++ b/app/src/main/res/layout/missions_header.xml
@@ -10,7 +10,6 @@
     android:layout_marginRight="8dp"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/item_name"
         android:layout_width="wrap_content"
@@ -21,9 +20,4 @@
         android:textSize="16sp"
         android:textStyle="bold" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:background="@color/black_settings_accent_color" />
-
 </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d349cb96f..80572e14e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,6 +11,7 @@
     <attr name="focused_selector" format="reference" />
     <attr name="dashed_border" format="reference" />
 
+    <attr name="actionColor" format="color" />
     <attr name="separator_color" format="color" />
     <attr name="contrast_background_color" format="color" />
     <attr name="windowBackground" format="color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7c3e0c9b4..cc3105152 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
 
     <!-- Base Theme -->
     <style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="actionColor">@color/white</item>
         <item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
         <item name="toolbarSearchColor">@color/white</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
diff --git a/app/src/main/res/values/styles_misc.xml b/app/src/main/res/values/styles_misc.xml
index 3f18c7ce9..c3b7b1aa1 100644
--- a/app/src/main/res/values/styles_misc.xml
+++ b/app/src/main/res/values/styles_misc.xml
@@ -61,17 +61,17 @@
     </style>
 
     <style name="FloatingActionButtonTheme" parent="Widget.Design.FloatingActionButton">
-        <item name="tint">@color/white</item>
+        <item name="tint">?attr/actionColor</item>
     </style>
 
     <style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
     <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:textColorSecondary">@android:color/white</item>
-        <item name="tint">@color/white</item>
-        <item name="iconTint">@color/white</item>
+        <item name="android:textColorPrimary">?attr/actionColor</item>
+        <item name="android:textColorSecondary">?attr/actionColor</item>
+        <item name="tint">?attr/actionColor</item>
+        <item name="iconTint">?attr/actionColor</item>
     </style>
     <style name="ContrastToolbarTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
@@ -82,18 +82,10 @@
         <item name="toolbarSearchColor">@color/contrastColor</item>
     </style>
 
-    <style name="WhiteAccentTheme">
-        <item name="colorAccent">@color/white</item>
-    </style>
-
     <style name="WhiteTintTheme">
         <item name="tint">@color/white</item>
         <item name="iconTint">@color/white</item>
     </style>
-    <style name="DarkTintTheme">
-        <item name="tint">@color/black</item>
-        <item name="iconTint">@color/black</item>
-    </style>
     <style name="ContrastTintTheme">
         <item name="tint">@color/contrastColor</item>
         <item name="iconTint">@color/contrastColor</item>