From 63ad9260787dd23f90a4fc3ee4664349a5b6a258 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Mon, 11 Apr 2022 14:24:50 +0300
Subject: [PATCH] Improved coloring

---
 smali/res/menu/fave_change_tags_menu.xml |  2 +-
 smali/res/menu/fave_tab_menu.xml         |  2 +-
 smali/res/menu/good.xml                  |  6 ++--
 smali/res/menu/left_menu.xml             | 40 ++++++++++++------------
 smali/res/menu/market.xml                |  2 +-
 smali/res/menu/price_filter.xml          |  2 +-
 smali/res/menu/replies.xml               |  2 +-
 smali/res/menu/search.xml                |  2 +-
 smali/res/menu/videos.xml                |  8 ++---
 9 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/smali/res/menu/fave_change_tags_menu.xml b/smali/res/menu/fave_change_tags_menu.xml
index 1f97009c2..5de7a2089 100644
--- a/smali/res/menu/fave_change_tags_menu.xml
+++ b/smali/res/menu/fave_change_tags_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?accent" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?text_primary" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/fave_tab_menu.xml b/smali/res/menu/fave_tab_menu.xml
index 98c137498..ffc98d380 100644
--- a/smali/res/menu/fave_tab_menu.xml
+++ b/smali/res/menu/fave_tab_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?accent" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?text_primary" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/good.xml b/smali/res/menu/good.xml
index 1ded489a1..6d4814f58 100644
--- a/smali/res/menu/good.xml
+++ b/smali/res/menu/good.xml
@@ -2,7 +2,7 @@
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_market_28" android:id="@id/menu_cart" android:title="@string/market_cart" app:showAsAction="always" />
-    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?toolbarIconsColor" />
-    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?toolbarIconsColor" />
-    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?toolbarIconsColor" />
+    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?text_primary" />
+    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?text_primary" />
+    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?text_primary" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/left_menu.xml b/smali/res/menu/left_menu.xml
index 70329b828..624a1ecc2 100644
--- a/smali/res/menu/left_menu.xml
+++ b/smali/res/menu/left_menu.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="@color/leftmenu_icon" />
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="@color/leftmenu_icon" />
+    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?text_primary" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/market.xml b/smali/res/menu/market.xml
index f132400df..4f1ce1fd4 100644
--- a/smali/res/menu/market.xml
+++ b/smali/res/menu/market.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?toolbarIconsColor" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/price_filter.xml b/smali/res/menu/price_filter.xml
index e63157739..ac862e357 100644
--- a/smali/res/menu/price_filter.xml
+++ b/smali/res/menu/price_filter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?toolbarIconsColor" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/replies.xml b/smali/res/menu/replies.xml
index 41b12c901..3405d7261 100644
--- a/smali/res/menu/replies.xml
+++ b/smali/res/menu/replies.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?toolbarIconsColor" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/search.xml b/smali/res/menu/search.xml
index 9887ba867..f3df73a8e 100644
--- a/smali/res/menu/search.xml
+++ b/smali/res/menu/search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?toolbarIconsColor" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?text_primary" />
 </menu>
\ No newline at end of file
diff --git a/smali/res/menu/videos.xml b/smali/res/menu/videos.xml
index f4f4c5581..7a8b64bce 100644
--- a/smali/res/menu/videos.xml
+++ b/smali/res/menu/videos.xml
@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always" app:showAsAction="always">
         <menu>
-            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="@color/leftmenu_icon" />
-            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="@color/leftmenu_icon" />
-            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="@color/leftmenu_icon" />
-            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="@color/leftmenu_icon" />
+            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?text_primary" />
+            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?text_primary" />
+            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?text_primary" />
+            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?text_primary" />
         </menu>
     </item>
 </menu>
\ No newline at end of file