From 240792eef2c61aff26f8db503dc801b458a77403 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sun, 10 Oct 2021 01:43:20 +0600
Subject: [PATCH 1/4] 3918-P-UI_revamp

issue: https://gitlab.e.foundation/e/backlog/-/issues/3918
---
 Android.mk                                    |  2 ++
 res/drawable/ic_arrow_back.xml                | 10 ++++++++
 res/drawable/ic_foreground.xml                |  2 +-
 res/drawable/ic_menu_refresh.xml              |  2 +-
 res/drawable/ic_pause.xml                     |  2 +-
 res/drawable/ic_system_update.xml             |  2 +-
 res/layout/preferences_dialog.xml             |  5 +++-
 res/layout/update_item_view.xml               |  1 +
 res/mipmap-anydpi/ic_launcher.xml             |  2 +-
 res/values-night/colors.xml                   |  7 ------
 res/values/colors.xml                         | 13 ++++++-----
 res/values/styles.xml                         | 23 ++++++++++++++++---
 .../lineageos/updater/UpdatesActivity.java    |  8 ++++++-
 13 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 res/drawable/ic_arrow_back.xml
 delete mode 100644 res/values-night/colors.xml

diff --git a/Android.mk b/Android.mk
index df2b1f56..4abc70e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v7-preference \
     android-support-v7-recyclerview
 
+LOCAL_STATIC_JAVA_LIBRARIES += org.lineageos.platform.sdk
+
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res
 
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
new file mode 100644
index 00000000..5847a590
--- /dev/null
+++ b/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/theme_accent"
+        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 a4badaf3..a2fa90ac 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="#FAFAFA"
+            android:fillColor="@color/theme_accent"
             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 05a578d5..3b47058a 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/inverted"
+        android:fillColor="@color/theme_accent"
         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 3b2d509c..620beef0 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="#FF000000"
+        android:fillColor="@color/theme_accent"
         android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
 </vector>
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index ecaaabbb..3daa577c 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/inverted"
+        android:fillColor="@color/theme_accent"
         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/preferences_dialog.xml b/res/layout/preferences_dialog.xml
index e30c1172..5e784820 100644
--- a/res/layout/preferences_dialog.xml
+++ b/res/layout/preferences_dialog.xml
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/menu_auto_updates_check"
-            android:textColor="@color/inverted"
+            android:textColor="@color/theme_primary_text"
             android:textSize="16sp" />
 
         <Spinner
@@ -35,6 +35,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:text="@string/menu_auto_delete_updates"
+        android:textColor="@color/theme_primary_text"
         android:textSize="16sp" />
 
     <Switch
@@ -43,6 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:text="@string/menu_mobile_data_warning"
+        android:textColor="@color/theme_primary_text"
         android:textSize="16sp" />
 
     <Switch
@@ -51,5 +53,6 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:text="@string/menu_ab_perf_mode"
+        android:textColor="@color/theme_primary_text"
         android:textSize="16sp" />
 </LinearLayout>
diff --git a/res/layout/update_item_view.xml b/res/layout/update_item_view.xml
index ddcf3268..6fef17e2 100644
--- a/res/layout/update_item_view.xml
+++ b/res/layout/update_item_view.xml
@@ -82,6 +82,7 @@
         <Button
             android:id="@id/update_action"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:textColor="@color/theme_accent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp"
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b0e9bde1..a1fe9f8b 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/ic_background"/>
+    <background android:drawable="@color/theme_background"/>
     <foreground android:drawable="@drawable/ic_foreground"/>
 </adaptive-icon>
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index 907f2549..00000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="theme_primary">#212121</color>
-    <color name="theme_primary_dark">#1c1c1c</color>
-
-    <color name="inverted">#f5f5f5</color>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a91c286a..9b0b700f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="theme_primary">#f5f5f5</color>
-    <color name="theme_primary_dark">#e0e0e0</color>
-    <color name="theme_accent">#007fff</color>
-
-    <color name="inverted">#212121</color>
-    <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>
+    <color name="theme_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
+    <color name="theme_background">@lineageos.platform:color/color_default_background</color>
+    <color name="theme_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="theme_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e87f58c0..766dad87 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,23 +4,29 @@
         <item name="colorPrimary">@color/theme_primary</item>
         <item name="colorPrimaryDark">@color/theme_primary_dark</item>
         <item name="colorAccent">@color/theme_accent</item>
+        <item name="android:textColorPrimary">@color/theme_primary_text</item>
+        <item name="android:textColorSecondary">@color/theme_secondary_text</item>
+        <item name="actionOverflowButtonStyle">@style/customOverFlow</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
+        <item name="android:navigationBarColor">@color/theme_primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/theme_primary_dark</item>
+        <item name="android:statusBarColor">@color/theme_primary_dark</item>
+        <item name="snackbarStyle">@style/snackbar_style</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" />
 
     <style name="TextAppearanceInverted" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/inverted</item>
+        <item name="android:textColor">@color/theme_primary_text</item>
     </style>
     <style name="TextAppearanceTransparent" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@android:color/transparent</item>
@@ -31,4 +37,15 @@
         <item name="android:dropDownVerticalOffset">8dp</item>
         <item name="android:dropDownHorizontalOffset">-16dp</item>
     </style>
+
+    <style name="customOverFlow">
+        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
+        <item name="tint">@color/theme_accent</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+    </style>
+
+    <style name="snackbar_style" parent="Widget.Design.Snackbar">
+        <item name="android:background">@color/theme_primary_dark</item>
+    </style>
 </resources>
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index e56d02af..c07c16f8 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -49,6 +49,8 @@ import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+
 import org.json.JSONException;
 import org.lineageos.updater.controller.UpdaterController;
 import org.lineageos.updater.controller.UpdaterService;
@@ -384,7 +386,11 @@ public class UpdatesActivity extends UpdatesListActivity {
 
     @Override
     public void showSnackbar(int stringId, int duration) {
-        Snackbar.make(findViewById(R.id.main_container), stringId, duration).show();
+        Snackbar snackbar = Snackbar.make(findViewById(R.id.main_container), stringId, duration);
+        View baseView = snackbar.getView();
+        TextView textView = baseView.findViewById(R.id.snackbar_text);
+        textView.setTextColor(ContextCompat.getColor(this, R.color.theme_primary_text));
+        snackbar.show();
     }
 
     private void refreshAnimationStart() {
-- 
GitLab


From 257ef92bf57d1e516f9c8c7d2e50ad47adb268fa Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sun, 10 Oct 2021 01:57:02 +0600
Subject: [PATCH 2/4] fix snackBar style issue

---
 res/values/styles.xml                          | 5 -----
 src/org/lineageos/updater/UpdatesActivity.java | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 766dad87..829aa0f7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -14,7 +14,6 @@
         <item name="android:navigationBarColor">@color/theme_primary_dark</item>
         <item name="android:navigationBarDividerColor">@color/theme_primary_dark</item>
         <item name="android:statusBarColor">@color/theme_primary_dark</item>
-        <item name="snackbarStyle">@style/snackbar_style</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -44,8 +43,4 @@
         <item name="android:paddingRight">10dp</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
-
-    <style name="snackbar_style" parent="Widget.Design.Snackbar">
-        <item name="android:background">@color/theme_primary_dark</item>
-    </style>
 </resources>
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index c07c16f8..d770c935 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -388,6 +388,7 @@ public class UpdatesActivity extends UpdatesListActivity {
     public void showSnackbar(int stringId, int duration) {
         Snackbar snackbar = Snackbar.make(findViewById(R.id.main_container), stringId, duration);
         View baseView = snackbar.getView();
+        baseView.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_primary_dark));
         TextView textView = baseView.findViewById(R.id.snackbar_text);
         textView.setTextColor(ContextCompat.getColor(this, R.color.theme_primary_text));
         snackbar.show();
-- 
GitLab


From 96578f25cc0afb6e0046a806f1694f22825a086c Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sun, 10 Oct 2021 02:26:09 +0600
Subject: [PATCH 3/4] fix snackBar style issue

---
 src/org/lineageos/updater/UpdatesActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index d770c935..a6e35f81 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -30,6 +30,7 @@ import android.os.IBinder;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.PreferenceManager;
-- 
GitLab


From f0fddf60f211f82fa47daa2cc0aedc028cdbf261 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sun, 10 Oct 2021 02:26:50 +0600
Subject: [PATCH 4/4] fix snackBar style issue

---
 src/org/lineageos/updater/UpdatesActivity.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index a6e35f81..b7e64173 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -50,8 +50,6 @@ import android.widget.Spinner;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import androidx.core.content.ContextCompat;
-
 import org.json.JSONException;
 import org.lineageos.updater.controller.UpdaterController;
 import org.lineageos.updater.controller.UpdaterService;
-- 
GitLab