From 5c47d2afade672d13a484ed912e4026fe2746877 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sun, 12 Dec 2021 23:58:10 +0600
Subject: [PATCH] 4376-P-Update_icon_colors

issue: https://gitlab.e.foundation/e/backlog/-/issues/4376
---
 res/drawable/ic_arrow_back.xml                         |  2 +-
 res/drawable/ic_foreground.xml                         |  2 +-
 res/drawable/ic_menu_refresh.xml                       |  2 +-
 res/drawable/ic_pause.xml                              |  2 +-
 res/drawable/ic_play.xml                               | 10 ++++++++++
 res/drawable/ic_system_update.xml                      |  2 +-
 res/layout/activity_updates.xml                        |  4 +++-
 res/mipmap-anydpi/ic_launcher.xml                      |  2 +-
 res/values/colors.xml                                  |  2 ++
 res/values/styles.xml                                  |  2 +-
 .../lineageos/updater/controller/UpdaterService.java   |  4 ++--
 11 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 res/drawable/ic_play.xml

diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 5847a590..5e98449d 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/theme_accent"
+        android:fillColor="@color/theme_primary_text"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_foreground.xml b/res/drawable/ic_foreground.xml
index a2fa90ac..a4badaf3 100644
--- a/res/drawable/ic_foreground.xml
+++ b/res/drawable/ic_foreground.xml
@@ -6,7 +6,7 @@
     <group android:translateX="24.363636"
             android:translateY="24.363636">
         <path
-            android:fillColor="@color/theme_accent"
+            android:fillColor="#FAFAFA"
             android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
     </group>
 </vector>
diff --git a/res/drawable/ic_menu_refresh.xml b/res/drawable/ic_menu_refresh.xml
index 3b47058a..9923bfb2 100644
--- a/res/drawable/ic_menu_refresh.xml
+++ b/res/drawable/ic_menu_refresh.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/theme_accent"
+        android:fillColor="@color/theme_primary_text"
         android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
 </vector>
diff --git a/res/drawable/ic_pause.xml b/res/drawable/ic_pause.xml
index 620beef0..3d75a6e1 100644
--- a/res/drawable/ic_pause.xml
+++ b/res/drawable/ic_pause.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/theme_accent"
+        android:fillColor="@color/theme_primary_text"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/res/drawable/ic_play.xml b/res/drawable/ic_play.xml
new file mode 100644
index 00000000..755f49b4
--- /dev/null
+++ b/res/drawable/ic_play.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/theme_primary_text"
+      android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index 3daa577c..80fdbefd 100644
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -5,6 +5,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/theme_accent"
+        android:fillColor="@color/theme_primary_text"
         android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
 </vector>
diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml
index 16f65baf..18677597 100644
--- a/res/layout/activity_updates.xml
+++ b/res/layout/activity_updates.xml
@@ -20,7 +20,7 @@
             android:layout_height="match_parent"
             android:theme="@style/AppTheme.AppBarOverlay"
             app:collapsedTitleTextAppearance="@style/TextAppearanceInverted"
-            app:contentScrim="?attr/colorPrimary"
+            app:contentScrim="?attr/colorPrimaryDark"
             app:expandedTitleTextAppearance="@style/TextAppearanceTransparent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
@@ -80,6 +80,7 @@
         android:id="@+id/no_new_updates_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/theme_background"
         android:padding="46dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -95,6 +96,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/theme_background"
         android:clipToPadding="false"
         android:paddingBottom="5dp"
         android:scrollbars="vertical"
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index a1fe9f8b..b0e9bde1 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/theme_background"/>
+    <background android:drawable="@color/ic_background"/>
     <foreground android:drawable="@drawable/ic_foreground"/>
 </adaptive-icon>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9b0b700f..7829d587 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="ic_background">#333333</color>
+
     <color name="theme_primary">@lineageos.platform:color/color_default_primary</color>
     <color name="theme_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="theme_accent">@lineageos.platform:color/color_default_accent</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 829aa0f7..c07bd198 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,7 +39,7 @@
 
     <style name="customOverFlow">
         <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
-        <item name="tint">@color/theme_accent</item>
+        <item name="tint">@color/theme_primary_text</item>
         <item name="android:paddingRight">10dp</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 5a024eb6..606bb20c 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -292,7 +292,7 @@ public class UpdaterService extends Service {
                 mNotificationStyle.bigText(text);
                 mNotificationBuilder.setStyle(mNotificationStyle);
                 mNotificationBuilder.setSmallIcon(R.drawable.ic_pause);
-                mNotificationBuilder.addAction(android.R.drawable.ic_media_play,
+                mNotificationBuilder.addAction(R.drawable.ic_play,
                         getString(R.string.resume_button),
                         getResumePendingIntent(update.getDownloadId()));
                 mNotificationBuilder.setTicker(text);
@@ -430,7 +430,7 @@ public class UpdaterService extends Service {
                 mNotificationStyle.bigText(text);
                 mNotificationBuilder.setStyle(mNotificationStyle);
                 mNotificationBuilder.setSmallIcon(R.drawable.ic_pause);
-                mNotificationBuilder.addAction(android.R.drawable.ic_media_play,
+                mNotificationBuilder.addAction(R.drawable.ic_play,
                         getString(R.string.resume_button),
                         getResumeInstallationPendingIntent());
                 mNotificationBuilder.setTicker(text);
-- 
GitLab