From 7e26901cb63f1dd09aa7dd9a091876854cf3e528 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 5 Sep 2022 12:20:57 +0530
Subject: [PATCH 1/2] Change app icon to our custom icon

---
 res/drawable/ic_launcher_background.xml |  28 +++---
 res/drawable/ic_launcher_foreground.xml | 118 ++++++++++++++++++------
 res/mipmap-anydpi/ic_launcher.xml       |  25 +++--
 3 files changed, 122 insertions(+), 49 deletions(-)

diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 8bb038e44..46be0492a 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
@@ -10,14 +21,5 @@
     android:viewportHeight="108">
   <path
       android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#2A3232"/>
-  <path
-      android:pathData="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L49.958,54.17C49.973,54.186 49.989,54.201 50.006,54.217C50.002,54.145 50,54.073 50,54C50,51.953 51.537,50.266 53.52,50.028C53.502,50.015 53.484,50.002 53.465,49.989L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L54.501,49.942C54.466,49.967 54.432,49.993 54.399,50.02C56.421,50.22 58,51.925 58,54C58,54.1 57.996,54.2 57.989,54.298C58.021,54.27 58.052,54.241 58.083,54.211L75.374,37.464C75.779,37.071 75.812,36.433 75.449,36.002Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M54,54m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#98A7A7"/>
+      android:fillColor="#225180"/>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 5f494b6ee..bcb861172 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,39 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M54,79L54,54"
-        android:strokeWidth="2"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFD250"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
-        android:fillColor="#F09F38"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M54,80C68.36,80 80,68.36 80,54C80,39.64 68.36,28 54,28C39.64,28 28,39.64 28,54C28,68.36 39.64,80 54,80Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="52.96"
+          android:endX="54"
+          android:endY="106.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M52.74,35.27H52.21V31.74L51.14,32.13V31.65L52.66,31.08H52.74V35.27Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M57.03,35.27H54.29V34.89L55.74,33.28C55.95,33.04 56.1,32.84 56.18,32.69C56.26,32.54 56.3,32.38 56.3,32.22C56.3,32 56.24,31.82 56.1,31.68C55.97,31.55 55.8,31.48 55.58,31.48C55.31,31.48 55.11,31.55 54.96,31.7C54.82,31.85 54.74,32.06 54.74,32.33H54.21C54.21,31.94 54.34,31.63 54.58,31.4C54.83,31.16 55.16,31.04 55.58,31.04C55.96,31.04 56.27,31.14 56.5,31.35C56.72,31.55 56.83,31.82 56.83,32.16C56.83,32.57 56.57,33.06 56.05,33.62L54.93,34.84H57.03V35.27Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M42.42,38.12H41.89V34.58L40.82,34.97V34.49L42.34,33.92H42.42V38.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M45.71,38.12H45.18V34.58L44.11,34.97V34.49L45.63,33.92H45.71V38.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M34.64,45.84H34.11V42.3L33.04,42.7V42.21L34.56,41.64H34.64V45.84Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M38.81,44.06C38.81,44.68 38.71,45.14 38.5,45.44C38.28,45.74 37.95,45.89 37.5,45.89C37.06,45.89 36.73,45.75 36.51,45.45C36.3,45.16 36.19,44.71 36.18,44.13V43.42C36.18,42.81 36.29,42.35 36.5,42.05C36.71,41.76 37.04,41.61 37.5,41.61C37.94,41.61 38.27,41.75 38.49,42.04C38.7,42.33 38.81,42.77 38.81,43.37V44.06ZM38.28,43.33C38.28,42.88 38.22,42.56 38.09,42.35C37.97,42.15 37.77,42.04 37.5,42.04C37.22,42.04 37.03,42.14 36.9,42.35C36.78,42.55 36.71,42.87 36.71,43.29V44.14C36.71,44.59 36.77,44.92 36.9,45.14C37.04,45.35 37.24,45.46 37.5,45.46C37.76,45.46 37.96,45.36 38.08,45.16C38.21,44.95 38.28,44.64 38.28,44.2V43.33Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M33.89,54.14C33.78,54.27 33.64,54.38 33.49,54.46C33.34,54.54 33.17,54.58 32.99,54.58C32.74,54.58 32.53,54.52 32.36,54.4C32.18,54.29 32.04,54.12 31.94,53.91C31.85,53.69 31.8,53.45 31.8,53.19C31.8,52.91 31.85,52.66 31.95,52.44C32.06,52.21 32.21,52.04 32.41,51.93C32.6,51.81 32.83,51.75 33.09,51.75C33.5,51.75 33.83,51.9 34.06,52.21C34.3,52.52 34.42,52.94 34.42,53.47V53.63C34.42,54.44 34.26,55.03 33.94,55.41C33.62,55.78 33.13,55.97 32.49,55.98H32.38V55.53H32.5C32.93,55.53 33.27,55.41 33.5,55.19C33.74,54.97 33.87,54.62 33.89,54.14ZM33.07,54.14C33.25,54.14 33.41,54.09 33.56,53.98C33.71,53.87 33.82,53.74 33.89,53.58V53.36C33.89,53.02 33.82,52.73 33.66,52.52C33.51,52.3 33.32,52.19 33.09,52.19C32.86,52.19 32.67,52.28 32.53,52.46C32.39,52.64 32.32,52.87 32.32,53.16C32.32,53.45 32.39,53.68 32.52,53.87C32.66,54.05 32.84,54.14 33.07,54.14Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M37.1,63.19C37.1,63.39 37.05,63.58 36.94,63.74C36.83,63.9 36.68,64.03 36.49,64.12C36.71,64.22 36.88,64.35 37.01,64.53C37.14,64.71 37.2,64.91 37.2,65.14C37.2,65.5 37.08,65.79 36.83,66C36.59,66.22 36.27,66.33 35.88,66.33C35.47,66.33 35.15,66.22 34.91,66C34.67,65.79 34.55,65.5 34.55,65.14C34.55,64.92 34.61,64.71 34.73,64.53C34.86,64.35 35.03,64.21 35.24,64.12C35.06,64.03 34.91,63.9 34.81,63.74C34.7,63.58 34.65,63.39 34.65,63.19C34.65,62.83 34.76,62.55 34.98,62.35C35.21,62.14 35.51,62.04 35.88,62.04C36.24,62.04 36.54,62.14 36.76,62.35C36.99,62.55 37.1,62.83 37.1,63.19ZM36.67,65.13C36.67,64.9 36.6,64.71 36.45,64.56C36.3,64.41 36.11,64.34 35.87,64.34C35.63,64.34 35.44,64.41 35.29,64.56C35.15,64.7 35.08,64.89 35.08,65.13C35.08,65.37 35.15,65.55 35.29,65.69C35.43,65.83 35.62,65.89 35.88,65.89C36.12,65.89 36.32,65.83 36.46,65.69C36.6,65.55 36.67,65.37 36.67,65.13ZM35.88,62.47C35.67,62.47 35.5,62.54 35.37,62.67C35.24,62.8 35.18,62.97 35.18,63.19C35.18,63.41 35.24,63.58 35.37,63.71C35.49,63.84 35.66,63.9 35.88,63.9C36.09,63.9 36.26,63.84 36.38,63.71C36.51,63.58 36.57,63.41 36.57,63.19C36.57,62.98 36.51,62.81 36.38,62.68C36.24,62.54 36.08,62.47 35.88,62.47Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M45.12,70.33L43.4,74.21H42.84L44.56,70.47H42.3V70.04H45.12V70.33Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M54.9,72.66V73.11H54.8C54.39,73.12 54.06,73.24 53.81,73.48C53.57,73.71 53.43,74.05 53.39,74.48C53.61,74.22 53.91,74.1 54.29,74.1C54.65,74.1 54.94,74.23 55.16,74.48C55.38,74.74 55.48,75.07 55.48,75.47C55.48,75.9 55.37,76.25 55.13,76.51C54.9,76.76 54.59,76.89 54.19,76.89C53.79,76.89 53.47,76.74 53.22,76.43C52.97,76.13 52.85,75.73 52.85,75.25V75.04C52.85,74.28 53.01,73.69 53.34,73.28C53.67,72.88 54.16,72.67 54.8,72.66H54.9ZM54.2,74.54C54.02,74.54 53.85,74.59 53.7,74.7C53.55,74.81 53.44,74.95 53.38,75.11V75.31C53.38,75.65 53.46,75.93 53.61,76.14C53.77,76.35 53.96,76.45 54.19,76.45C54.43,76.45 54.62,76.37 54.75,76.19C54.89,76.01 54.96,75.78 54.96,75.5C54.96,75.21 54.89,74.98 54.75,74.81C54.61,74.63 54.43,74.54 54.2,74.54Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M63.21,72.12L63.42,70.04H65.56V70.53H63.87L63.74,71.66C63.95,71.54 64.18,71.48 64.44,71.48C64.82,71.48 65.12,71.61 65.35,71.86C65.57,72.11 65.68,72.45 65.68,72.88C65.68,73.31 65.57,73.65 65.33,73.9C65.1,74.14 64.78,74.27 64.36,74.27C63.99,74.27 63.69,74.16 63.46,73.96C63.23,73.75 63.09,73.47 63.06,73.11H63.56C63.59,73.35 63.68,73.53 63.82,73.65C63.95,73.77 64.14,73.83 64.36,73.83C64.61,73.83 64.8,73.75 64.94,73.58C65.08,73.41 65.15,73.18 65.15,72.88C65.15,72.61 65.08,72.38 64.92,72.21C64.77,72.04 64.57,71.96 64.32,71.96C64.09,71.96 63.91,72.01 63.77,72.11L63.63,72.23L63.21,72.12Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M73.04,64.87H73.62V65.3H73.04V66.27H72.51V65.3H70.61V64.99L72.48,62.1H73.04V64.87ZM71.21,64.87H72.51V62.82L72.45,62.94L71.21,64.87Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M74.04,53.63H74.44C74.69,53.63 74.89,53.56 75.03,53.44C75.17,53.31 75.25,53.13 75.25,52.92C75.25,52.43 75,52.18 74.52,52.18C74.29,52.18 74.1,52.25 73.97,52.38C73.83,52.51 73.76,52.68 73.76,52.9H73.23C73.23,52.57 73.35,52.29 73.59,52.08C73.84,51.86 74.14,51.75 74.52,51.75C74.91,51.75 75.22,51.85 75.44,52.06C75.66,52.27 75.78,52.56 75.78,52.93C75.78,53.11 75.72,53.29 75.6,53.46C75.48,53.63 75.32,53.75 75.12,53.84C75.35,53.91 75.53,54.03 75.65,54.2C75.78,54.37 75.84,54.57 75.84,54.81C75.84,55.19 75.72,55.48 75.47,55.7C75.23,55.92 74.91,56.03 74.52,56.03C74.13,56.03 73.81,55.93 73.56,55.72C73.32,55.5 73.19,55.22 73.19,54.88H73.73C73.73,55.1 73.8,55.27 73.94,55.4C74.09,55.54 74.28,55.6 74.52,55.6C74.77,55.6 74.97,55.53 75.11,55.4C75.24,55.27 75.31,55.08 75.31,54.82C75.31,54.58 75.23,54.4 75.09,54.27C74.94,54.14 74.72,54.07 74.44,54.07H74.04V53.63Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M73.54,45.84H70.81V45.45L72.25,43.85C72.47,43.61 72.61,43.41 72.69,43.26C72.77,43.11 72.82,42.95 72.82,42.79C72.82,42.57 72.75,42.39 72.62,42.25C72.49,42.11 72.31,42.04 72.09,42.04C71.83,42.04 71.62,42.12 71.47,42.27C71.33,42.42 71.26,42.63 71.26,42.89H70.73C70.73,42.51 70.85,42.2 71.1,41.96C71.34,41.72 71.68,41.61 72.09,41.61C72.48,41.61 72.79,41.71 73.01,41.91C73.24,42.12 73.35,42.39 73.35,42.72C73.35,43.13 73.09,43.62 72.56,44.19L71.45,45.4H73.54V45.84Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M64.71,37.9H64.17V34.37L63.11,34.76V34.28L64.62,33.71H64.71V37.9Z"
+      android:fillColor="#333333"/>
+  <path
+      android:pathData="M66.58,41.04L53.32,54.3"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#333333"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M68.66,68.74L53.38,53.46"
+      android:fillColor="#00000000"
+      android:strokeColor="#F83E54"/>
+  <path
+      android:pathData="M53.97,53.93H42.26"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#333333"/>
 </vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index 3d90bc5c3..18e000c2d 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground> 
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
-- 
GitLab


From cac0f19d79ac783700482b0798cf66d60adc1a0e Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 15 Sep 2022 19:15:36 +0530
Subject: [PATCH 2/2] Theme app according to our palette

---
 Android.bp                                    |  5 +++--
 res/color/checkbox_color.xml                  | 21 +++++++++++++++++++
 res/drawable/digit_background.xml             |  2 +-
 res/drawable/ic_caret_down.xml                |  2 +-
 res/drawable/ic_caret_up.xml                  |  2 +-
 res/drawable/popup_background.xml             |  2 +-
 res/layout-land/desk_clock.xml                |  4 ++--
 res/layout-land/desk_clock_old.xml            |  4 ++--
 res/layout/city_list_item.xml                 |  3 ++-
 res/layout/collapsing_toolbar_base_layout.xml |  2 +-
 res/layout/desk_clock.xml                     |  4 ++--
 res/layout/timer_setup_digits.xml             |  2 --
 res/values/colors.xml                         | 18 ++++++++--------
 res/values/dimens.xml                         |  2 ++
 res/values/styles.xml                         | 14 ++++++-------
 res/values/themes.xml                         |  7 +++++--
 16 files changed, 60 insertions(+), 34 deletions(-)
 create mode 100644 res/color/checkbox_color.xml

diff --git a/Android.bp b/Android.bp
index a8271b54a..13874b85d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,7 +33,7 @@ android_app {
         "androidx.collection_collection",
         "androidx.arch.core_core-common",
         "androidx.lifecycle_lifecycle-common",
-        "com.google.android.material_material",
+        
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.percentlayout_percentlayout",
         "androidx.transition_transition",
@@ -43,7 +43,8 @@ android_app {
         "androidx.appcompat_appcompat",
         "androidx.gridlayout_gridlayout",
         "androidx.recyclerview_recyclerview",
-        "androidx-constraintlayout_constraintlayout"
+        "androidx-constraintlayout_constraintlayout",
+        "elib",
     ],
     required: [
         "com.android.deskclock_whitelist"
diff --git a/res/color/checkbox_color.xml b/res/color/checkbox_color.xml
new file mode 100644
index 000000000..852841877
--- /dev/null
+++ b/res/color/checkbox_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/e_alpha_base_dark" android:alpha="0.38" />
+    <item android:state_checked="false" android:color="@color/e_alpha_base_dark" android:alpha="0.6" />
+    <item android:color="@color/e_accent_dark" />
+</selector>
diff --git a/res/drawable/digit_background.xml b/res/drawable/digit_background.xml
index 95d91de47..f276dad82 100644
--- a/res/drawable/digit_background.xml
+++ b/res/drawable/digit_background.xml
@@ -3,5 +3,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-    <solid android:color="@color/default_background_lighter" />
+    <solid android:color="@android:color/transparent" />
 </shape>
diff --git a/res/drawable/ic_caret_down.xml b/res/drawable/ic_caret_down.xml
index e802999d0..d67f14911 100644
--- a/res/drawable/ic_caret_down.xml
+++ b/res/drawable/ic_caret_down.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/ic_caret_up.xml b/res/drawable/ic_caret_up.xml
index d0ad7eed7..3833435ac 100644
--- a/res/drawable/ic_caret_up.xml
+++ b/res/drawable/ic_caret_up.xml
@@ -22,7 +22,7 @@
         android:bottom="8dp">
         <shape android:shape="oval" >
             <size android:height="20dp" android:width="20dp" />
-            <solid android:color="@color/system_neutral2_500" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml
index 66ef3597c..9582aacd3 100644
--- a/res/drawable/popup_background.xml
+++ b/res/drawable/popup_background.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
 
     <corners android:radius="28dp" />
-    <solid android:color="@color/system_neutral2_700" />
+    <solid android:color="@color/e_floating_background_dark" />
 </shape>
diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml
index 03f6ba72f..c1b53a7ff 100644
--- a/res/layout-land/desk_clock.xml
+++ b/res/layout-land/desk_clock.xml
@@ -97,7 +97,7 @@
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
                 app:borderWidth="0dp"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -125,7 +125,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="72dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         app:menu="@menu/bottom_navigation_menu"
         app:itemIconTint="@color/tab_tint_color"
         app:itemTextColor="@color/tab_tint_color"
diff --git a/res/layout-land/desk_clock_old.xml b/res/layout-land/desk_clock_old.xml
index 6f98ce555..22e9050c1 100644
--- a/res/layout-land/desk_clock_old.xml
+++ b/res/layout-land/desk_clock_old.xml
@@ -93,7 +93,7 @@
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
                 app:borderWidth="0dp"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -119,7 +119,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="72dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         app:menu="@menu/bottom_navigation_menu"
         app:itemIconTint="@color/tab_tint_color"
         app:itemTextColor="@color/tab_tint_color"
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 520ab328d..d79725180 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -34,7 +34,8 @@
         android:id="@+id/city_onoff"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:clickable="false" />
+        android:clickable="false"
+        android:buttonTint="@color/checkbox_color" />
     <TextView
         android:id="@+id/city_name"
         android:layout_width="0dip"
diff --git a/res/layout/collapsing_toolbar_base_layout.xml b/res/layout/collapsing_toolbar_base_layout.xml
index b07c5f074..4ac6ca717 100644
--- a/res/layout/collapsing_toolbar_base_layout.xml
+++ b/res/layout/collapsing_toolbar_base_layout.xml
@@ -39,7 +39,7 @@
             android:clipToPadding="false"
             app:forceApplySystemWindowInsetTop="true"
             app:extraMultilineHeightEnabled="true"
-            app:contentScrim="@android:color/system_neutral1_700"
+            app:contentScrim="@color/e_action_bar_dark"
             app:maxLines="3"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
             app:scrimAnimationDuration="50"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index 7cad679b3..1a6c03b07 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -92,7 +92,7 @@
                 android:layout_gravity="center"
                 android:layout_margin="@dimen/fab_margin"
                 android:contentDescription="@null"
-                app:fabCustomSize="@dimen/fab_height"
+                app:fabCustomSize="@dimen/fab_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
         android:id="@+id/bottom_view"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:background="@color/secondary_color"
+        android:background="@color/e_action_bar_dark"
         android:paddingTop="12dp"
         android:paddingBottom="16dp"
         app:menu="@menu/bottom_navigation_menu"
diff --git a/res/layout/timer_setup_digits.xml b/res/layout/timer_setup_digits.xml
index b0aae45da..d2c2f2ba6 100644
--- a/res/layout/timer_setup_digits.xml
+++ b/res/layout/timer_setup_digits.xml
@@ -186,8 +186,6 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_margin="4dp"
-            android:backgroundTint="@color/accent_color2"
-            android:textColor="@color/secondary_color"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toEndOf="@id/column_1_right"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 91ca13873..9986a95d3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,30 +33,30 @@
 
     <color name="clock_gray">#B3FFFFFF</color>
 
-    <color name="default_background">@android:color/system_neutral1_900</color>
+    <color name="default_background">@color/e_background_dark</color>
 
     <!-- shadowColor for widget text -->
     <color name="widget_shadow_color">#000000</color>
 
-    <color name="accent_color">@android:color/system_accent3_200</color>
-    <color name="accent_color2">@android:color/system_accent2_200</color>
-    <color name="secondary_color">@android:color/system_neutral1_800</color>
-    <color name="default_background_lighter">@android:color/system_neutral2_800</color>
+    <color name="accent_color">@color/e_accent_dark</color>
+    <color name="accent_color2">@color/e_accent_dark</color>
+    <color name="secondary_color">@color/e_floating_background_dark</color>
+    <color name="default_background_lighter">@color/e_floating_background_dark</color>
 
     <!-- Material next state on color-->
-    <color name="state_on_color">@color/accent_100</color>
+    <color name="state_on_color">@color/e_switch_thumb_on</color>
 
     <!-- Material next thumb disable color-->
     <color name="thumb_disabled_color">@color/black</color>
 
     <!-- Material next thumb off color-->
-    <color name="thumb_off_color">@color/default_background</color>
+    <color name="thumb_off_color">@color/e_switch_thumb_off</color>
 
     <!-- Material next track on color-->
-    <color name="track_on_color">@color/accent_color</color>
+    <color name="track_on_color">@color/e_switch_track_on</color>
 
     <!-- Material next track off color-->
-    <color name="track_off_color">@color/system_neutral2_500</color>
+    <color name="track_off_color">@color/e_switch_track_off</color>
 
     <color name="system_neutral2_100">@android:color/system_neutral2_100</color>
     <color name="system_neutral2_300">@android:color/system_neutral2_300</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 856ef8241..335b3a9cd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -140,4 +140,6 @@
     <dimen name="alarm_clock_expanded_vertical_margin">8dp</dimen>
 
     <dimen name="settings_padding">4dp</dimen>
+
+    <dimen name="fab_size">72dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7ae54c97c..5f2d30846 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,7 +101,8 @@
         <item name="displayOptions">showTitle|homeAsUp</item>
     </style>
 
-    <style name="Widget.ActionBar.NoTitle">
+    <style name="Widget.ActionBar.NoTitle" parent="Widget.AppCompat.ActionBar">
+        <item name="background">@color/e_action_bar_dark</item>
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="displayOptions">homeAsUp</item>
     </style>
@@ -127,8 +128,8 @@
 
     <style name="Widget.TimePicker" parent="android:Widget.Material.TimePicker">
         <item name="android:background">@color/default_background</item>
-        <item name="android:headerBackground">@color/system_neutral2_700</item>
-        <item name="android:numbersBackgroundColor">@color/system_neutral2_700</item>
+        <item name="android:headerBackground">@color/e_action_bar_dark</item>
+        <item name="android:numbersBackgroundColor">@color/e_floating_background_dark</item>
         <item name="android:numbersSelectorColor">?attr/colorAccent</item>
     </style>
 
@@ -144,10 +145,9 @@
     <style name="DeskClock.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
         <item name="android:switchMinWidth">52dp</item>
         <item name="android:minHeight">@dimen/touch_target_min_size</item>
-        <item name="android:track">@drawable/switch_track</item>
-        <item name="track">@drawable/switch_track</item>
-        <item name="android:thumb">@drawable/switch_thumb</item>
-        <item name="thumbTint">@color/default_background</item>
+        <item name="android:track">@drawable/e_switch_track</item>
+        <item name="track">@drawable/e_switch_track</item>
+        <item name="android:thumb">@drawable/e_switch_thumb</item>
     </style>
 
     <style name="DeskClock.SwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 08921baec..954d9b61b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,7 +19,7 @@
 
     <style name="Theme.DeskClock" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorBackgroundFloating">?attr/colorBackgroundFloating</item>
-        <item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
         <item name="popupTheme">@style/ThemeOverlay.Popup</item>
 
         <item name="android:timePickerStyle">@style/Widget.TimePicker</item>
@@ -55,11 +55,14 @@
         <item name="switchPreferenceCompatStyle">@style/DeskClock.SwitchPreferenceCompat</item>
     </style>
 
-    <style name="Theme.DeskClock.CitySelection">
+    <style name="Theme.DeskClock.CitySelection" parent="Theme.AppCompat.NoActionBar">
         <!-- Attributes from androidx.appcompat.appcompat -->
         <item name="actionBarStyle">@style/Widget.ActionBar.NoTitle</item>
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
+        <item name="colorAccent">@color/e_accent_dark</item>
+        <item name="android:statusBarColor">@color/e_action_bar_dark</item>
+        <item name="android:navigationBarColor">@color/e_action_bar_dark</item>
     </style>
 
     <style name="ThemeOverlay.Control.Accent" parent="ThemeOverlay.AppCompat">
-- 
GitLab