Merge branch 'epic34-s-app_redesign' into 'main'

Integrate elib

See merge request e/os/advanced-privacy!92

3 files changed, 16 insertions, 17 deletions

diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml
index eaebce1..41f034e 100644
--- a/app/src/main/res/layout/topbar.xml
+++ b/app/src/main/res/layout/topbar.xml
@@ -32,6 +32,6 @@
         android:layout_height="?android:attr/actionBarSize"
         android:layout_width="match_parent"
         tools:layout_height="56dp"
-        app:navigationIcon="@drawable/ic_back_24dp"
+        app:navigationIcon="@drawable/e_ic_back"
         />
 </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index bbf2357..6c1d53c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -17,6 +17,5 @@
   -->
 
 <resources>
-    <color name="iconInvertedColor">#FFFFFF</color>
     <color name="green_valid">#169659</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8a18288..cf59b6d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--themable -->
-    <color name="primary">@lineageos.platform:color/color_default_primary</color>
-    <color name="accent">@lineageos.platform:color/color_default_accent</color>
+    <color name="primary">@color/e_action_bar</color>
+    <color name="accent">@color/e_accent</color>
 
-    <color name="primary_text">@lineageos.platform:color/color_default_primary_text</color>
-    <color name="secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="primary_text">@color/e_primary_text_color</color>
+    <color name="secondary_text">@color/e_secondary_text_color</color>
 
-    <color name="background">@lineageos.platform:color/color_default_background</color>
-    <color name="iconInvertedColor">#000000</color>
+    <color name="background">@color/e_background</color>
+    <color name="iconInvertedColor">@color/e_alpha_base</color>
 
     <!-- Custom -->
     <color name="dark_color">#263238</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="grey_overlay">#66FFFFFF</color>
+    <color name="grey_overlay">@color/e_disabled_color</color>
     <color name="green_valid">#28C97C</color>
     <color name="red_off">#F8432E</color>
     <color name="blue_unselected">#AADCFE</color> <!-- used in combination with accent color ! -->
-    <color name="divider">#14212121</color>
+    <color name="divider">@color/e_background_overlay</color>
 
     <!-- Widget -->
-    <color name="on_surface_high_emphasis">#DEFFFFFF</color>
-    <color name="on_primary_medium_emphasis">#BDFFFFFF</color>
-    <color name="on_primary_high_emphasis">#FFFFFF</color>
-    <color name="on_primary_disabled">#61FFFFFF</color>
+    <color name="on_surface_high_emphasis">@color/e_primary_text_color_dark</color>
+    <color name="on_primary_medium_emphasis">@color/e_secondary_text_color_dark</color>
+    <color name="on_primary_high_emphasis">@color/e_primary_text_color_dark</color>
+    <color name="on_primary_disabled">@color/e_disabled_color_dark</color>
 
-    <color name="widget_background">#4D666666</color>
+    <color name="widget_background">@color/e_launcher_widget_background</color>
 
     <color name="launcher_icon_background">#2CCF69</color>
 
-    <color name="on_surface_medium_emphasis_light">#99000000</color>
-    <color name="on_surface_disabled_light">#61000000</color>
+    <color name="on_surface_medium_emphasis_light">@color/e_secondary_text_color_dark</color>
+    <color name="on_surface_disabled_light">@color/e_disabled_color_dark</color>
 </resources>
\ No newline at end of file