From c6200e2fb5b41848ffc76ddb5d0d5b9e9825bd42 Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 25 Mar 2021 01:09:34 +0530
Subject: [PATCH] Fix theming issue related to accent color

Change-Id: I5c65865a76e513825c8c138fca67cc99650dc9cb
---
 res/drawable/quantum_ic_add_vd_theme_24.xml   |  2 +-
 res/drawable/quantum_ic_close_vd_theme_24.xml |  2 +-
 res/drawable/quantum_ic_menu_vd_theme_24.xml  |  2 +-
 .../quantum_ic_search_vd_theme_24.xml         |  2 +-
 res/layout/contact_list_filter_item.xml       |  2 +-
 res/layout/search_bar_expanded.xml            |  3 +-
 res/menu/people_options.xml                   |  4 +-
 res/menu/search_menu.xml                      |  4 +-
 res/values-v27/styles.xml                     |  8 +--
 res/values/colors.xml                         |  4 +-
 res/values/styles.xml                         | 55 +++++++------------
 11 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml
index 3ceffde2d9..627fc48c4e 100644
--- a/res/drawable/quantum_ic_add_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_add_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml
index 955f791248..3809f5c35c 100644
--- a/res/drawable/quantum_ic_close_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_close_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml
index fdb88f3b93..5b5d7b76eb 100644
--- a/res/drawable/quantum_ic_menu_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
 </vector>
diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml
index 6e9da640e2..03dcbaa98b 100644
--- a/res/drawable/quantum_ic_search_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_search_vd_theme_24.xml
@@ -21,6 +21,6 @@
         android:viewportHeight="24.0"
         android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@color/color_default_blue1"
+        android:fillColor="#FFFFFF"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml
index 637b2246ab..81981e4ca5 100644
--- a/res/layout/contact_list_filter_item.xml
+++ b/res/layout/contact_list_filter_item.xml
@@ -61,7 +61,7 @@
     </LinearLayout>
 
     <RadioButton
-        android:buttonTint="@color/color_default_blue1"
+        android:buttonTint="@color/accent"
         android:id="@+id/radioButton"
         android:clickable="false"
         android:layout_width="wrap_content"
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 58294a3b3c..bb2f579c67 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -28,7 +28,7 @@
         android:layout_height="@dimen/search_box_icon_size"
         android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
-        android:tint="@color/color_default_blue1"
+        android:tint="@color/accent"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
          />
@@ -43,7 +43,6 @@
         android:fontFamily="@string/search_font_family"
         android:textColor="@color/searchbox_text_color"
         android:textColorHint="@color/searchbox_hint_text_color"
-        android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
         android:background="@null"
         android:inputType="textFilter"
         android:singleLine="true"
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 86be2d61c2..5da3cb05f8 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -17,11 +17,11 @@
     xmlns:contacts="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/tools">
     <item
-        app:itemIconTint="@color/color_default_blue1"
+        app:itemIconTint="@color/accent"
         android:id="@+id/menu_search"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
-        app:iconTint="@color/color_default_blue1"
+        app:iconTint="@color/accent"
         contacts:showAsAction="ifRoom" />
 
     <item
diff --git a/res/menu/search_menu.xml b/res/menu/search_menu.xml
index c715c16ad4..a530cc34bc 100644
--- a/res/menu/search_menu.xml
+++ b/res/menu/search_menu.xml
@@ -17,9 +17,9 @@
     xmlns:contacts="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/tools">
     <item
-        app:itemIconTint="@color/color_default_blue1"
+        app:itemIconTint="@color/accent"
         android:id="@+id/menu_search"
-        app:iconTint="@color/color_default_blue1"
+        app:iconTint="@color/accent"
         android:icon="@drawable/quantum_ic_search_vd_theme_24"
         android:title="@string/hint_findContacts"
         contacts:showAsAction="always" />
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index 3cd5eaf678..de7db7e4e5 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -12,7 +12,7 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -67,7 +67,7 @@
     </style>
 
     <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -91,8 +91,8 @@
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
         <item name="colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/accent</item>        
+        <item name="colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e65417da11..11a0991866 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,7 +32,7 @@
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">@color/color_default_blue1</color>
+    <color name="action_bar_button_text_color">@color/accent</color>
     <color name="action_bar_button_menu_color">#ffffff</color>
 
     <color name="actionbar_background_color">@color/primary_color</color>
@@ -43,7 +43,7 @@
 
  <!--   <color name="primary_color_dark">#1c3aa9</color>
     <color name="primary_color">#2a56c6</color>-->
- <color name="primary_color_dark">@lineageos.platform:color/color_default_foreground</color>
+    <color name="primary_color_dark">@lineageos.platform:color/color_default_foreground</color>
     <color name="primary_color">@lineageos.platform:color/color_default_foreground</color>
 
     <color name="group_primary_color_dark">#546E7A</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ea3386efa3..762daad0c5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,19 +20,7 @@
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>
         <item name="colorButtonNormal">@color/background_primary</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="android:editTextStyle">@style/myEditText</item>
     </style>
-    <style name="myEditText" parent="@android:style/Widget.Holo.Light.EditText">
-        <item name="android:textCursorDrawable">@color/color_default_blue1</item>
-        <item name="android:colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="colorControlNormal">@color/color_default_secondary_text</item>
-        <item name="android:colorControlActivated">@color/color_default_blue1</item>
-        <item name="colorControlActivated">@color/color_default_blue1</item>
-        <item name="android:colorControlHighlight">@color/color_default_blue1</item>
-        <item name="colorControlHighlight">@color/color_default_blue1</item>
-    </style>
-
 
     <style name="Theme.QuickContact" parent="@style/PeopleTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -44,7 +32,7 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
         <!-- We need to use a light ripple behind ActionBar items in order for them to
              be visible when using some of the darker ActionBar tints -->
         <item name="android:actionBarItemBackground">
@@ -69,7 +57,7 @@
         <item name="android:windowLightStatusBar" tools:targetApi="27">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -118,7 +106,7 @@
     </style>
 
     <style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -127,7 +115,7 @@
         <item name="android:listSelector">?android:attr/listChoiceBackgroundIndicator</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:navigationBarColor">@android:color/black</item>
         <!--Theme.AppCompat.Light.DarkActionBar-->
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
@@ -151,8 +139,8 @@
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="android:colorPrimary">@color/primary_color</item>
         <item name="colorPrimary">@color/primary_color</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:colorAccent">@color/accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
@@ -211,8 +199,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@color/color_default_blue1</item>
-        <item name="android:color">@color/color_default_blue1</item>
+        <item name="color">@color/accent</item>
+        <item name="android:color">@color/accent</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -256,7 +244,7 @@
         <item name="titleTextAppearance">@style/ContactsActionBarTitleTextAppCompat</item>
         <!--<item name="android:textColorSecondary">@color/color_default_primary_text</item>-->
         <item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="LightToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
@@ -278,7 +266,7 @@
     <style name="ContactsActionBarTitleText"
         parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
         <item name="android:textSize">20dp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
@@ -287,7 +275,7 @@
     </style>
 
     <style name="ContactsActionBarTitleTextBlack" parent="@style/ContactsActionBarTitleTextAppCompat">
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
     </style>
 
     <!-- Action bar overflow menu icon. -->
@@ -299,7 +287,7 @@
 
     <!-- Toolbar navigation button. -->
     <style name="ContactToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
-        <item name="android:tint">@color/color_default_blue1</item>
+        <item name="android:tint">@color/accent</item>
     </style>
 
     <style name="ContactPickerTheme" parent="PeopleActivityTheme">
@@ -310,12 +298,11 @@
 
     </style>
 
-
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
-        <item name="android:colorControlNormal">@color/color_default_blue1</item>
-        <item name="android:textColorSecondary">@color/color_default_blue1</item>
+        <item name="android:colorControlNormal">@color/accent</item>
+        <item name="android:textColorSecondary">@color/accent</item>
 
     </style>
 
@@ -334,7 +321,7 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
@@ -377,13 +364,13 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
 
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/color_default_blue1</item>
-        <item name="colorAccent">@color/color_default_blue1</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -435,7 +422,7 @@
     <!-- Button style for main contacts no account empty view. -->
     <style name="NoAccountViewButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -443,7 +430,7 @@
     <!-- Add contacts button style for empty states. -->
     <style name="AddContactsButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAllCaps">true</item>
     </style>
@@ -500,7 +487,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
      make margin between the button and screen edge 16dp -->
     <style name="FilterActionButtonStyle" parent="@android:Widget.ActionButton">
         <item name="android:minWidth">@dimen/contact_filter_action_button_width</item>
-        <item name="android:textColor">@color/color_default_blue1</item>
+        <item name="android:textColor">@color/accent</item>
 
     </style>
 
-- 
GitLab