From 762daa183364160f49c1a3f978fce09bf31e3bd3 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Sat, 18 Sep 2021 23:20:05 +0600
Subject: [PATCH 1/3] 3642-Q-Dark-mode_implementation

issue: https://gitlab.e.foundation/e/backlog/-/issues/3642
---
 .../call_redirection_button_ripple_effect.xml |  2 +-
 .../call_redirection_dialog_background.xml    |  2 +-
 res/drawable/ic_back_arrow.xml                |  1 +
 res/drawable/ic_message.xml                   |  1 +
 res/drawable/ic_phone.xml                     |  1 +
 res/values-night-v27/styles.xml               | 32 ++++++++++
 res/values-night/styles.xml                   | 41 ------------
 res/values-v27/styles.xml                     | 32 ++++++++++
 res/values/colors.xml                         | 19 +++---
 res/values/styles.xml                         | 63 +++++++++++++------
 10 files changed, 123 insertions(+), 71 deletions(-)
 create mode 100644 res/values-night-v27/styles.xml
 delete mode 100644 res/values-night/styles.xml
 create mode 100644 res/values-v27/styles.xml

diff --git a/res/drawable/call_redirection_button_ripple_effect.xml b/res/drawable/call_redirection_button_ripple_effect.xml
index 7fa7e7094..2dff241d0 100644
--- a/res/drawable/call_redirection_button_ripple_effect.xml
+++ b/res/drawable/call_redirection_button_ripple_effect.xml
@@ -18,7 +18,7 @@
         android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape>
-            <solid android:color="@android:color/white"/>
+            <solid android:color="@color/background_color"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/res/drawable/call_redirection_dialog_background.xml b/res/drawable/call_redirection_dialog_background.xml
index 71277fd47..91768a2cf 100644
--- a/res/drawable/call_redirection_dialog_background.xml
+++ b/res/drawable/call_redirection_dialog_background.xml
@@ -15,6 +15,6 @@
   ~ limitations under the License
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white"/>
+    <solid android:color="@color/background_color"/>
     <corners android:radius="15dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml
index 07b3cb0b0..668365de8 100644
--- a/res/drawable/ic_back_arrow.xml
+++ b/res/drawable/ic_back_arrow.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_arrow_back_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/drawable/ic_message.xml b/res/drawable/ic_message.xml
index ae32073cd..b5b0d89e8 100644
--- a/res/drawable/ic_message.xml
+++ b/res/drawable/ic_message.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_message_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/drawable/ic_phone.xml b/res/drawable/ic_phone.xml
index 15c2a486c..7144230fc 100644
--- a/res/drawable/ic_phone.xml
+++ b/res/drawable/ic_phone.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_phone_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml
new file mode 100644
index 000000000..af670fad6
--- /dev/null
+++ b/res/values-night-v27/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+    <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
deleted file mode 100644
index da3130484..000000000
--- a/res/values-night/styles.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-
-<resources>
-
-    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
-        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.Material.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:colorAccent">@color/theme_color</item>
-        <item name="android:listDivider">@null</item>
-    </style>
-
-</resources>
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
new file mode 100644
index 000000000..29a50c56e
--- /dev/null
+++ b/res/values-v27/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+    <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3986d4882..29198ee95 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,19 +17,20 @@
 <resources>
     <!--follows the dialer theme color-->
     <color name="theme_color">@lineageos.platform:color/color_default_accent</color>
-    <color name="background_color">#fafafa</color>
+    <color name="background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
 
     <!--Use the one consistence with dialer-->
-    <color name="blocked_numbers_divider_color">#d8d8d8</color>
-    <color name="blocked_numbers_primary_text_color">#202124</color>
-    <color name="blocked_numbers_secondary_text_color">#5f6368</color>
+    <color name="blocked_numbers_divider_color">@lineageos.platform:color/color_default_divider</color>
+    <color name="blocked_numbers_primary_text_color">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="blocked_numbers_secondary_text_color">@lineageos.platform:color/color_default_secondary_text</color>
 
     <!--follows dialer color-->
-    <color name="notification_action_answer">#097138</color>
-    <color name="notification_action_decline">#A52714</color>
+    <color name="notification_action_answer">@lineageos.platform:color/color_default_green1</color>
+    <color name="notification_action_decline">@lineageos.platform:color/color_default_red1</color>
 
-    <color name="call_redirection_dialog_icon_tint_color">#4089F4</color>
-    <color name="call_redirection_dialog_text_color">#212121</color>
-    <color name="call_redirection_dialog_view_divider_color">#B8B8B8</color>
+    <color name="call_redirection_dialog_icon_tint_color">@color/theme_color</color>
+    <color name="call_redirection_dialog_text_color">@color/blocked_numbers_primary_text_color</color>
+    <color name="call_redirection_dialog_view_divider_color">@color/blocked_numbers_divider_color</color>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 187086b08..1adf30908 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-     <style name="Theme.Telecomm.Transparent" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
+    <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+    </style>
+
+    <style name="Theme.Telecomm.Transparent.Base" parent="Theme.AppCompat.DayNight">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -24,37 +26,58 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="colorAccent">@color/theme_color</item>
+        <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
     </style>
 
-   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
+    <style name="Theme.Telecom.DialerSettings.Base" parent="Theme.AppCompat.DayNight">
+        <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="colorAccent">@color/theme_color</item>
+        <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
     </style>
 
-    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
+    <style name="Theme.Telecom.BlockedNumbers.Base" parent="Theme.AppCompat.DayNight">
+        <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="colorAccent">@color/theme_color</item>
         <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
         <item name="android:listDivider">@null</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
     </style>
 
     <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">
-        <item name="android:background">@color/background_color</item>
+        <item name="android:background">@color/primary_dark</item>
         <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>
         <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>
         <!-- Empty icon -->
@@ -64,6 +87,8 @@
     <style name="TelecomDialerSettingsActionOverflowButtonStyle"
             parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">
         <item name="android:src">@drawable/ic_more_vert_24dp</item>
+        <item name="tint">@color/theme_color</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">
-- 
GitLab


From e3ff568c60981765ae112ac6ca44addc4492e5df Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 28 Sep 2021 22:18:18 +0600
Subject: [PATCH 2/3] revert back base parent style

---
 res/values/styles.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1adf30908..8aa8e63be 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,7 +18,7 @@
     <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
     </style>
 
-    <style name="Theme.Telecomm.Transparent.Base" parent="Theme.AppCompat.DayNight">
+    <style name="Theme.Telecomm.Transparent.Base" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -37,7 +37,7 @@
     <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
     </style>
 
-    <style name="Theme.Telecom.DialerSettings.Base" parent="Theme.AppCompat.DayNight">
+    <style name="Theme.Telecom.DialerSettings.Base" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
@@ -58,7 +58,7 @@
     <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
     </style>
 
-    <style name="Theme.Telecom.BlockedNumbers.Base" parent="Theme.AppCompat.DayNight">
+    <style name="Theme.Telecom.BlockedNumbers.Base" parent="@android:style/Theme.DeviceDefault.Light">
         <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:colorPrimaryDark">@color/primary_dark</item>
-- 
GitLab


From ae8368ade35bea54dbba43d6483ad63e67e7e3ad Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Wed, 29 Sep 2021 21:57:44 +0600
Subject: [PATCH 3/3] set base parent style according to mode

---
 res/values-night/styles.xml | 20 ++++++++++++++++++++
 res/values/styles.xml       |  9 ++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 res/values-night/styles.xml

diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
new file mode 100644
index 000000000..2d90d7e99
--- /dev/null
+++ b/res/values-night/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<resources>
+    <style name="BaseAppTheme" parent="@android:style/Theme.DeviceDefault">
+    </style>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8aa8e63be..645af0683 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,10 +15,13 @@
 -->
 
 <resources>
+    <style name="BaseAppTheme" parent="@android:style/Theme.DeviceDefault.Light">
+    </style>
+
     <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
     </style>
 
-    <style name="Theme.Telecomm.Transparent.Base" parent="@android:style/Theme.DeviceDefault.Light">
+    <style name="Theme.Telecomm.Transparent.Base" parent="BaseAppTheme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -37,7 +40,7 @@
     <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
     </style>
 
-    <style name="Theme.Telecom.DialerSettings.Base" parent="@android:style/Theme.DeviceDefault.Light">
+    <style name="Theme.Telecom.DialerSettings.Base" parent="BaseAppTheme">
         <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
@@ -58,7 +61,7 @@
     <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
     </style>
 
-    <style name="Theme.Telecom.BlockedNumbers.Base" parent="@android:style/Theme.DeviceDefault.Light">
+    <style name="Theme.Telecom.BlockedNumbers.Base" parent="BaseAppTheme">
         <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:colorPrimaryDark">@color/primary_dark</item>
-- 
GitLab