From af7fe3e813a304c833a3b85efb0a874f004265bf Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Fri, 14 Oct 2022 15:08:04 +0530
Subject: [PATCH] Integrate elib

---
 app/build.gradle.kts                          |  3 ++
 .../main/res/drawable/btn_rounded_corner.xml  |  2 +-
 .../res/drawable/folder_title_text_cursor.xml |  2 +-
 app/src/main/res/drawable/folder_window.xml   |  2 +-
 .../res/drawable/ic_cancel_white_24dp.xml     |  2 +-
 app/src/main/res/layout/activity_widgets.xml  |  4 +-
 app/src/main/res/layout/widgets_page.xml      |  2 +-
 app/src/main/res/values/attrs.xml             |  1 -
 app/src/main/res/values/colors.xml            | 16 ++++----
 app/src/main/res/values/styles.xml            | 41 +++++++++++++++----
 gradle/libs.versions.toml                     |  1 +
 settings.gradle.kts                           |  1 +
 12 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dc737110d2..4cd51a270f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -181,4 +181,7 @@ dependencies {
     // Testing dependencies
     testImplementation(libs.bundles.testing.unit)
     testImplementation(libs.bundles.testing.android)
+
+    // elib
+    implementation(libs.elib)
 }
diff --git a/app/src/main/res/drawable/btn_rounded_corner.xml b/app/src/main/res/drawable/btn_rounded_corner.xml
index 010eb10ff8..22f860b6cf 100644
--- a/app/src/main/res/drawable/btn_rounded_corner.xml
+++ b/app/src/main/res/drawable/btn_rounded_corner.xml
@@ -4,7 +4,7 @@
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <corners android:radius="20dp"/>
-            <solid android:color="#80FFFFFF" />
+            <solid android:color="@color/e_launcher_search_background" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/folder_title_text_cursor.xml b/app/src/main/res/drawable/folder_title_text_cursor.xml
index dc9df35ea5..dacc295f6c 100644
--- a/app/src/main/res/drawable/folder_title_text_cursor.xml
+++ b/app/src/main/res/drawable/folder_title_text_cursor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <size android:width="2dp"/>
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="@color/colorAccent" />
 </shape>
diff --git a/app/src/main/res/drawable/folder_window.xml b/app/src/main/res/drawable/folder_window.xml
index 475540dd9d..67f3d50cda 100755
--- a/app/src/main/res/drawable/folder_window.xml
+++ b/app/src/main/res/drawable/folder_window.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#4D606060"/>
+    <solid android:color="@color/widget_background_color"/>
     <corners android:radius="12dp"/>
 
 </shape>
diff --git a/app/src/main/res/drawable/ic_cancel_white_24dp.xml b/app/src/main/res/drawable/ic_cancel_white_24dp.xml
index e5edeabe17..bdd25aa672 100755
--- a/app/src/main/res/drawable/ic_cancel_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_cancel_white_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#99000000"
+<vector android:height="24dp" android:tint="@color/on_surface_medium_emphasis"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
diff --git a/app/src/main/res/layout/activity_widgets.xml b/app/src/main/res/layout/activity_widgets.xml
index 1f04dec632..92d0c7ea24 100644
--- a/app/src/main/res/layout/activity_widgets.xml
+++ b/app/src/main/res/layout/activity_widgets.xml
@@ -22,9 +22,9 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="32dp"
-            android:backgroundTint="#ff38D874"
+            android:backgroundTint="@color/colorAccent"
             android:text="@string/add_widget"
-            android:textColor="#fff"
+            android:textColor="@color/e_background_light"
             android:textSize="16sp" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/widgets_page.xml b/app/src/main/res/layout/widgets_page.xml
index 34f5daa0bf..55fa21ff06 100755
--- a/app/src/main/res/layout/widgets_page.xml
+++ b/app/src/main/res/layout/widgets_page.xml
@@ -57,7 +57,7 @@
                     android:stateListAnimator="@null"
                     android:fontFamily="sans-serif-medium"
                     android:textAllCaps="false"
-                    android:textColor="#BD000000"
+                    android:textColor="@color/on_surface_high_emphasis"
                     android:text="@string/edit" />
             </foundation.e.blisslauncher.core.customviews.BlurLayout>
         </foundation.e.blisslauncher.core.customviews.InsettableLinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 37ef505895..8ed965e7c8 100755
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -25,7 +25,6 @@
         <!-- numHotseatIcons defaults to numColumns, if not specified -->
         <attr name="numHotseatIcons" format="integer" />
 
-        <attr name="iconSize" format="float" />
         <attr name="iconTextSize" format="float" />
         <!-- hotseatIconSize defaults to iconSize, if not specified -->
         <attr name="hotseatIconSize" format="float" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b114818a86..09815dfd60 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">@color/e_accent_light</color>
 
     <color name="app_label_color">#ffffff</color>
     <color name="dockColor">#4D000000</color>
@@ -23,15 +23,15 @@
     <color name="list_selector_focused">#cc33b5e5</color>
     <color name="list_selector_activated">#4d33b5e5</color>
     <color name="white">#FFFFFF</color>
-    <color name="color_blue">#0088ED</color>
+    <color name="color_blue">@color/colorAccent</color>
 
-    <color name="widget_background_color">#4d666666</color>
-    <color name="search_widget_background_color">#a1f0f0f0</color>
+    <color name="widget_background_color">@color/e_launcher_widget_background</color>
+    <color name="search_widget_background_color">@color/e_launcher_search_background</color>
 
-    <color name="on_surface_high_emphasis">#de000000</color>
-    <color name="on_surface_medium_emphasis">#99000000</color>
-    <color name="folder_preview_background_color">#4dcbcbcb</color>
+    <color name="on_surface_high_emphasis">@color/e_primary_text_color_dark</color>
+    <color name="on_surface_medium_emphasis">@color/e_secondary_text_color_dark</color>
+    <color name="folder_preview_background_color">#1A202020</color>
     <color name="dock_background_color">#26ffffff</color>
 
-    <color name="accent_color">#0086FF</color>
+    <color name="accent_color">@color/colorAccent</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b4be6d1924..664806fd25 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,10 +3,24 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/colorAccent</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_light</item>
+        <item name="android:statusBarColor">@color/e_action_bar_light</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:actionBarStyle">@style/ActionBar</item>
+        <item name="android:windowBackground">@color/e_background_light</item>
+        <item name="android:switchStyle">@style/Switch</item>
+    </style>
+    <style name="ActionBar" parent="android:Widget.Material.ActionBar.Solid">
+        <item name="android:background">@color/e_action_bar_light</item>
+        <item name="android:titleTextStyle">@style/ActionBar.Title</item>
+    </style>
+     <style name="ActionBar.Title" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/e_primary_text_color_light</item>
     </style>
-
     <style name="BaseHomeScreenTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowActivityTransitions">true</item>
         <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
@@ -23,13 +37,15 @@
 
     <style name="HomeScreenTheme" parent="BaseHomeScreenTheme">
         <item name="isWorkspaceDarkText">false</item>
-        <item name="workspaceTextColor">@color/app_label_color</item>
+        <item name="workspaceTextColor">@color/on_surface_high_emphasis</item>
         <item name="dotOnColor">@color/dot_on_color</item>
         <item name="dotOffColor">@color/dot_off_color</item>
-        <item name="widgetPrimaryTextColor">#DEFFFFFF</item>
-        <item name="widgetSecondaryTextColor">#99FFFFFF</item>
+        <item name="widgetPrimaryTextColor">@color/on_surface_high_emphasis</item>
+        <item name="widgetSecondaryTextColor">@color/on_surface_medium_emphasis</item>
         <item name="widgetSettingsIconColor">?widgetPrimaryTextColor</item>
-        <item name="widgetSearchIconColor">#DEFFFFFF</item>
+        <item name="widgetSearchIconColor">@color/on_surface_high_emphasis</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 
     <style name="HomeScreenTheme.DarkText" parent="BaseHomeScreenTheme">
@@ -41,6 +57,8 @@
         <item name="widgetSecondaryTextColor">#61000000</item>
         <item name="widgetSettingsIconColor">#61000000</item>
         <item name="widgetSearchIconColor">#BD000000</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 
     <style name="label_shadow">
@@ -67,7 +85,12 @@
     </style>
 
     <style name="SearchBar">
-        <item name="android:colorAccent">#DE000000</item>
-        <item name="android:colorControlActivated">#DE000000</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:colorControlActivated">@color/colorAccent</item>
+    </style>
+    <style name="Switch" parent="android:Widget.Material.CompoundButton.Switch">
+        <item name="android:track">@drawable/e_switch_track</item>
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
+
     </style>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0c239eca93..a523f7a174 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -61,6 +61,7 @@ robolectric = "org.robolectric:robolectric:4.3"
 tools-desugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 timber = "com.jakewharton.timber:timber:4.7.1"
 restriction-bypass = "com.github.ChickenHook:RestrictionBypass:2.2"
+elib = "foundation.e:elib:0.0.1-alpha11"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 026c826e3d..c1b4a10b40 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,6 +18,7 @@ dependencyResolutionManagement {
         maven("https://maven.fabric.io/public")
         mavenCentral()
         jcenter()
+        maven("https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven")
         maven("https://jitpack.io")
     }
 }
-- 
GitLab