From 624ea72b316a255e395f7ed385e8715476b7f928 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 20 Jan 2021 19:08:04 +0530 Subject: [PATCH 1/8] Update setting icon from /e/sdk --- src/com/android/contacts/drawer/DrawerAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index b8516592a4..a93240b242 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -137,7 +137,7 @@ public class DrawerAdapter extends BaseAdapter { // Misc Items mMiscItems.add(new DividerItem()); mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings, - R.drawable.quantum_ic_settings_vd_theme_24)); + lineageos.platform.R.drawable.ic_settings)); if (HelpUtils.isHelpAndFeedbackAvailable()) { mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help, R.drawable.quantum_ic_help_vd_theme_24)); -- GitLab From d2da2a03c4b17530f56dc9c2ada1a176274794ad Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 20 Jan 2021 21:02:50 +0530 Subject: [PATCH 2/8] Update icons color --- res/layout/drawer_item.xml | 1 + src/com/android/contacts/drawer/DrawerAdapter.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index f7621a35d3..77b9fec5d1 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,6 +20,7 @@ style="@style/DrawerItemStyle"> diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index a93240b242..f7f8105a42 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -391,6 +391,8 @@ public class DrawerAdapter extends BaseAdapter { textView.setText(item.text); final ImageView iconView = (ImageView) result.findViewById(R.id.icon); iconView.setImageResource(item.icon); + iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_secondary_text)); + result.setId(item.id); updateSelectedStatus(textView, iconView, false); return result; -- GitLab From 3d7828c161ae38def92b1446dbd88be396c919fa Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 20 Jan 2021 21:13:21 +0530 Subject: [PATCH 3/8] Update icons color --- res/values/colors.xml | 1 + src/com/android/contacts/drawer/DrawerAdapter.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 67c37e2a52..941399728c 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -55,6 +55,7 @@ @lineageos.platform:color/color_default_background @lineageos.platform:color/color_default_blue1 @lineageos.platform:color/color_default_gray2 + @lineageos.platform:color/color_default_light_grey @lineageos.platform:color/color_default_accent diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index f7f8105a42..5fa1ce2c66 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -391,7 +391,7 @@ public class DrawerAdapter extends BaseAdapter { textView.setText(item.text); final ImageView iconView = (ImageView) result.findViewById(R.id.icon); iconView.setImageResource(item.icon); - iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_secondary_text)); + iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey)); result.setId(item.id); updateSelectedStatus(textView, iconView, false); -- GitLab From 65f36e7cf4babbe1d9efe13c7a5b84e3412675ff Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 21 Jan 2021 12:06:56 +0530 Subject: [PATCH 4/8] Update setting color --- src/com/android/contacts/drawer/DrawerAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index 5fa1ce2c66..d22dc57cba 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -391,8 +391,8 @@ public class DrawerAdapter extends BaseAdapter { textView.setText(item.text); final ImageView iconView = (ImageView) result.findViewById(R.id.icon); iconView.setImageResource(item.icon); - iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey)); - + //iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey)); + iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey), android.graphics.PorterDuff.Mode.MULTIPLY); result.setId(item.id); updateSelectedStatus(textView, iconView, false); return result; -- GitLab From 7be7ff320ba9ca458236784bea8002f191b15738 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 21 Jan 2021 13:00:54 +0530 Subject: [PATCH 5/8] Update setting color using xml file --- res/layout/drawer_item.xml | 2 +- res/layout/drawer_primary_item.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index 77b9fec5d1..8a277d2071 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerItemStyle"> diff --git a/res/layout/drawer_primary_item.xml b/res/layout/drawer_primary_item.xml index cc7bf262cc..82e968be30 100644 --- a/res/layout/drawer_primary_item.xml +++ b/res/layout/drawer_primary_item.xml @@ -20,6 +20,7 @@ style="@style/DrawerPrimaryItemStyle"> -- GitLab From 0b6e37ac783ede9b61bb4b8d1f947baa9c258819 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 21 Jan 2021 15:26:24 +0530 Subject: [PATCH 6/8] Update setting color using xml file --- res/layout/drawer_item.xml | 2 +- res/layout/drawer_primary_item.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index 8a277d2071..bff26c71fb 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerItemStyle"> diff --git a/res/layout/drawer_primary_item.xml b/res/layout/drawer_primary_item.xml index 82e968be30..f20bd06ff4 100644 --- a/res/layout/drawer_primary_item.xml +++ b/res/layout/drawer_primary_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerPrimaryItemStyle"> -- GitLab From 1fa49ffceedb20ab341b9e341ac24e0bdd095332 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 21 Jan 2021 15:39:52 +0530 Subject: [PATCH 7/8] Update setting color using xml file : remove bug --- res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/values/colors.xml b/res/values/colors.xml index 941399728c..e65417da11 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -55,6 +55,7 @@ @lineageos.platform:color/color_default_background @lineageos.platform:color/color_default_blue1 @lineageos.platform:color/color_default_gray2 + @lineageos.platform:color/color_default_gray1 @lineageos.platform:color/color_default_light_grey -- GitLab From 7d80cda9be9bd7811e4ecd5e52a71eeb256debbe Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 21 Jan 2021 16:38:21 +0530 Subject: [PATCH 8/8] Update setting color using xml file --- res/layout/drawer_item.xml | 2 +- res/layout/drawer_primary_item.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/layout/drawer_item.xml b/res/layout/drawer_item.xml index bff26c71fb..1bb6c7faee 100644 --- a/res/layout/drawer_item.xml +++ b/res/layout/drawer_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerItemStyle"> diff --git a/res/layout/drawer_primary_item.xml b/res/layout/drawer_primary_item.xml index f20bd06ff4..bafe2aa7de 100644 --- a/res/layout/drawer_primary_item.xml +++ b/res/layout/drawer_primary_item.xml @@ -20,7 +20,7 @@ style="@style/DrawerPrimaryItemStyle"> -- GitLab