toolbar fixes

smali/res/values-v31/styles.xml

@@ -117,9 +117,9 @@
         <item name="im_bubble_button_background_disabled">#66313233</item>
         <item name="im_bubble_button_foreground">@android:color/system_accent1_50</item>
         <item name="im_bubble_button_foreground_disabled">#66e1e3e6</item>
-        <item name="im_bubble_gift_background">@color/gold_300</item>
-        <item name="im_bubble_gift_text">@color/gold_100</item>
-        <item name="im_bubble_gift_text_secondary">@color/gold_150</item>
+        <item name="im_bubble_gift_background">@android:color/system_accent1_50</item>
+        <item name="im_bubble_gift_text">?text_primary</item>
+        <item name="im_bubble_gift_text_secondary">?text_secondary</item>
         <item name="im_bubble_incoming">@android:color/system_neutral1_900</item>
         <item name="im_bubble_incoming_alternate">@android:color/system_neutral1_900</item>
         <item name="im_bubble_incoming_alternate_highlighted">@android:color/system_neutral2_200

smali/smali/android/support/v7/widget/ToolbarWidgetWrapper.smali

@@ -542,6 +542,10 @@
     iget-object v1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->q:Landroid/graphics/drawable/Drawable;
 
     :goto_0
+    invoke-static {v1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
     invoke-virtual {v0, v1}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     goto :goto_1

smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali

@@ -2651,6 +2651,10 @@
 
     check-cast v0, Landroid/graphics/drawable/Drawable;
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
     invoke-virtual {p1, v0}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     :goto_0

smali/smali_classes2/android/support/v7/widget/Toolbar.smali

@@ -5556,6 +5556,31 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
+    invoke-virtual {p0, p1}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
+
+    return-void
+.end method
+
+.method public setNavigationIconAcent(I)V
+    .locals 1
+
+    .line 939
+    invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    invoke-static {v0, p1}, Landroid/support/v7/c/a/AppCompatResources;->b(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
     invoke-virtual {p0, p1}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     return-void
@@ -5629,7 +5654,7 @@
 
     if-eqz v3, :cond_228
 
-    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
@@ -5680,6 +5705,10 @@
     .line 1017
     iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->e:Landroid/support/v7/widget/ActionMenuView;
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
     invoke-virtual {v0, p1}, Landroid/support/v7/widget/ActionMenuView;->setOverflowIcon(Landroid/graphics/drawable/Drawable;)V
 
     return-void

smali/smali_classes2/com/vk/extensions/a/ToolbarExt.smali

@@ -191,6 +191,10 @@
 
     invoke-static {p2, p3}, Landroid/support/v4/a/a/DrawableCompat;->a(Landroid/graphics/drawable/Drawable;I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
     .line 53
     invoke-virtual {p0, p1}, Landroid/support/v7/widget/Toolbar;->setOverflowIcon(Landroid/graphics/drawable/Drawable;)V
 

smali/smali_classes3/com/vtosters/lite/fragments/WebViewFragment.smali

@@ -568,6 +568,10 @@
 
     invoke-static {v1, v2}, Landroid/support/v4/a/a/DrawableCompat;->a(Landroid/graphics/drawable/Drawable;I)V
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
     .line 627
     invoke-virtual {v0, v1}, Landroid/support/v7/widget/Toolbar;->setOverflowIcon(Landroid/graphics/drawable/Drawable;)V
 

smali/smali_classes3/com/vtosters/lite/fragments/money/MoneySelectCardFragment.smali

@@ -586,6 +586,10 @@
 
     check-cast v0, Landroid/graphics/drawable/Drawable;
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
     invoke-virtual {p2, v0}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     const v0, 0x7f11062b

smali/smali_classes4/android/support/v7/widget/ActionMenuView.smali

@@ -2318,6 +2318,10 @@
     .line 554
     iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->g:Landroid/support/v7/widget/ActionMenuPresenter;
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p1
+
     invoke-virtual {v0, p1}, Landroid/support/v7/widget/ActionMenuPresenter;->a(Landroid/graphics/drawable/Drawable;)V
 
     return-void

smali/smali_classes4/com/vk/components/ComponentsFragment.smali

@@ -85,6 +85,10 @@
 
     move-result-object v1
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
     invoke-virtual {v0, v1}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     .line 49

smali/smali_classes4/com/vk/menu/MenuFragment.smali

@@ -873,7 +873,7 @@
     const v3, 0x7f0803e3
 
     .line 333
-    invoke-virtual {p3, v3}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(I)V
+    invoke-virtual {p3, v3}, Landroid/support/v7/widget/Toolbar;->setNavigationIconAcent(I)V
 
     .line 334
     invoke-virtual {p3}, Landroid/support/v7/widget/Toolbar;->getMenu()Landroid/view/Menu;

smali/smali_classes5/com/vk/music/artists/MusicArtistHeaderContainer.smali

@@ -153,6 +153,10 @@
 
     move-result-object v1
 
+    invoke-static {v1}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v1
+
     invoke-virtual {v0, v1}, Landroid/support/v7/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     .line 54

smali/smali_classes5/com/vk/profile/ui/community/CommunityParallax.smali

@@ -145,6 +145,10 @@
 
     move-result-object p5
 
+    invoke-static {p5}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p5
+
     invoke-virtual {p5}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
     move-result-object p5
@@ -247,6 +251,10 @@
 
     check-cast p2, Landroid/graphics/drawable/Drawable;
 
+    invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p2
+
     invoke-virtual {p1, p2}, Landroid/support/v7/widget/Toolbar;->setOverflowIcon(Landroid/graphics/drawable/Drawable;)V
 
     .line 88

smali/smali_classes5/com/vtosters/lite/fragments/ProfileFragment.smali

@@ -2499,6 +2499,10 @@
 
     aget-object p2, p2, v1
 
+    invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->recolorDrawableToolbar(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+
+    move-result-object p2
+
     invoke-virtual {p1, p2}, Landroid/support/v7/widget/Toolbar;->setOverflowIcon(Landroid/graphics/drawable/Drawable;)V
 
     .line 215