From c50663fb0ee04a2e4724b30883e32326d2559a13 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 27 Sep 2022 17:26:28 +0530
Subject: [PATCH] Theme app according to our palette

---
 app/build.gradle                              |  1 +
 .../main/res/drawable/widget_background.xml   |  2 +-
 app/src/main/res/layout/activity_accounts.xml |  2 +-
 app/src/main/res/values-night/bools.xml       |  4 ---
 app/src/main/res/values-night/colors.xml      | 11 -------
 app/src/main/res/values/bools.xml             |  4 ---
 app/src/main/res/values/colors.xml            | 30 +++++++++----------
 app/src/main/res/values/style.xml             |  8 ++---
 settings.gradle                               |  1 +
 9 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/res/values-night/bools.xml
 delete mode 100644 app/src/main/res/values-night/colors.xml
 delete mode 100644 app/src/main/res/values/bools.xml

diff --git a/app/build.gradle b/app/build.gradle
index f41a5016..be6b5805 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -90,6 +90,7 @@ dependencies {
     implementation "androidx.work:work-runtime:2.7.1"
     implementation 'androidx.test:core:1.4.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
diff --git a/app/src/main/res/drawable/widget_background.xml b/app/src/main/res/drawable/widget_background.xml
index 52e4825e..33f8c8ad 100644
--- a/app/src/main/res/drawable/widget_background.xml
+++ b/app/src/main/res/drawable/widget_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#4D666666"/>
+    <solid android:color="@color/widget_background"/>
     <corners android:radius="15dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 2cf82845..1de0b968 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_back" />
+        app:navigationIcon="@drawable/e_ic_back" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/header"
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
deleted file mode 100644
index f1d802ee..00000000
--- a/app/src/main/res/values-night/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="isDay">false</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index b427f4fe..00000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#272727</color>
-    <color name="colorPrimaryDark">#272727</color>
-    <color name="colorAccent">#5DB2FF</color>
-    <color name="textColorPrimary">#DEFFFFFF</color>
-    <color name="textColorSecondary">#99FFFFFF</color>
-    <color name="textColorTertiary">#61FFFFFF</color>
-    <color name="background">#121212</color>
-    <color name="divider">#2F2F2F</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
deleted file mode 100644
index 537716fa..00000000
--- a/app/src/main/res/values/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="isDay">true</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bae92f3d..41e5cc12 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FFFFFF</color>
-    <color name="colorPrimaryDark">#FFFFFF</color>
-    <color name="colorAccent">#0086FF</color>
-    <color name="textColorPrimary">#DE000000</color>
-    <color name="textColorSecondary">#99000000</color>
-    <color name="textColorTertiary">#61000000</color>
-    <color name="divider">#DCDCDC</color>
-    <color name="background">#FAFAFA</color>
+    <color name="colorPrimary">@color/e_action_bar</color>
+    <color name="colorPrimaryDark">@color/e_action_bar</color>
+    <color name="colorAccent">@color/e_accent</color>
+    <color name="textColorPrimary">@color/e_primary_text_color</color>
+    <color name="textColorSecondary">@color/e_secondary_text_color</color>
+    <color name="textColorTertiary">@color/e_disabled_color</color>
+    <color name="divider">@color/e_background_overlay</color>
+    <color name="background">@color/e_background</color>
     <color name="colorFail">#FF0000</color>
     <color name="colorSuccess">#46CF23</color>
     <color name="ic_eelo_background">#FFFBFB</color>
@@ -15,12 +15,12 @@
     <color name="disable_thumb_grey">#1c000000</color>
     <color name="disable_foreground_grey">#42221f1f</color>
 
-    <color name="widget_background">#33000000</color>
-    <color name="widget_text_color">#99FFFFFF</color>
-    <color name="widget_text_color2">#DEFFFFFF</color>
-    <color name="widget_text_color3">#61FFFFFF</color>
-    <color name="widget_progressBar">#5DB2FF</color>
+    <color name="widget_background">@color/e_launcher_widget_background</color>
+    <color name="widget_text_color">@color/e_secondary_text_color_dark</color>
+    <color name="widget_text_color2">@color/e_primary_text_color_dark</color>
+    <color name="widget_text_color3">@color/e_disabled_color_dark</color>
+    <color name="widget_progressBar">@color/e_accent_dark</color>
 
-    <color name="widget_text_color_light">#61000000</color>
-    <color name="widget_text_color2_light">#99000000</color>
+    <color name="widget_text_color_light">@color/e_disabled_color_light</color>
+    <color name="widget_text_color2_light">@color/e_secondary_text_color_light</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 0bcf0a0e..906c04d5 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -8,10 +8,10 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorControlNormal">@color/colorAccent</item>
-        <item name="android:colorControlNormal">@color/colorAccent</item>
-        <item name="android:windowLightStatusBar">@bool/isDay</item>
-        <item name="android:windowLightNavigationBar">@bool/isDay</item>
+        <item name="colorControlNormal">@color/textColorPrimary</item>
+        <item name="android:colorControlNormal">@color/textColorPrimary</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
         <item name="android:windowBackground">@color/background</item>
     </style>
 
diff --git a/settings.gradle b/settings.gradle
index a18c791d..35988f79 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,6 +11,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
     }
 }
 rootProject.name = "eDrive"
-- 
GitLab