From f8c397e57f08aeacdefcfb7b0d0b9eb1f9919be0 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sat, 11 Jun 2022 22:45:55 +0300
Subject: [PATCH] fixes

---
 .../main/java/ru/vtosters/lite/utils/Themes.java |  1 -
 smali/res/drawable/bg_modern_search_im_new.xml   |  2 +-
 smali/res/layout/music_search_input_stub.xml     |  2 +-
 smali/res/layout/music_user_music1.xml           |  2 +-
 smali/res/layout/toolbar_search_expanded.xml     |  2 +-
 smali/res/layout/view_modern_search.xml          | 16 ++++++++--------
 smali/res/values-v21/styles.xml                  |  2 +-
 smali/res/values/styles.xml                      | 13 ++++++-------
 .../b/a/ParentSupportFragmentManager.smali       |  6 ++----
 9 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index 8dee98a2d..21c4f9bee 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -1,7 +1,6 @@
 package ru.vtosters.lite.utils;
 
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static ru.vtosters.lite.utils.Globals.getContext;
 import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getResources;
diff --git a/smali/res/drawable/bg_modern_search_im_new.xml b/smali/res/drawable/bg_modern_search_im_new.xml
index 58f73005d..355b2d4ee 100644
--- a/smali/res/drawable/bg_modern_search_im_new.xml
+++ b/smali/res/drawable/bg_modern_search_im_new.xml
@@ -2,5 +2,5 @@
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8.0dip" />
-    <solid android:color="#10000c1a" />
+    <solid android:color="?background_content" />
 </shape>
\ No newline at end of file
diff --git a/smali/res/layout/music_search_input_stub.xml b/smali/res/layout/music_search_input_stub.xml
index 8544ad03a..3656a0583 100644
--- a/smali/res/layout/music_search_input_stub.xml
+++ b/smali/res/layout/music_search_input_stub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textColorHint="?header_text"
+<TextView android:textColorHint="?text_primary"
     android:gravity="center_vertical"
     android:paddingLeft="60.0dip"
     android:paddingRight="56.0dip"
diff --git a/smali/res/layout/music_user_music1.xml b/smali/res/layout/music_user_music1.xml
index 7fb6d2939..6d269706c 100644
--- a/smali/res/layout/music_user_music1.xml
+++ b/smali/res/layout/music_user_music1.xml
@@ -32,7 +32,7 @@
                 android:layout_height="fill_parent"
                 android:src="@drawable/ic_back_24"
                 android:scaleType="centerInside"
-                android:tint="?header_text"
+                android:tint="?text_primary"
                 android:contentDescription="@string/music_talkback_go_back"
                 android:layout_marginStart="8.0dip"
                 style="@style/ActionButton.Gray" />
diff --git a/smali/res/layout/toolbar_search_expanded.xml b/smali/res/layout/toolbar_search_expanded.xml
index bfc30268f..c2af7f237 100644
--- a/smali/res/layout/toolbar_search_expanded.xml
+++ b/smali/res/layout/toolbar_search_expanded.xml
@@ -9,7 +9,7 @@
 
     <EditText
         android:textSize="16.0dip"
-        android:textColorHint="?header_text"
+        android:textColorHint="?text_primary"
         android:id="@id/search_input"
         android:background="@null"
         android:paddingRight="16.0dip"
diff --git a/smali/res/layout/view_modern_search.xml b/smali/res/layout/view_modern_search.xml
index c8e883447..8e1f5a448 100644
--- a/smali/res/layout/view_modern_search.xml
+++ b/smali/res/layout/view_modern_search.xml
@@ -6,7 +6,7 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:id="@id/search_box"
-        android:background="@drawable/bg_modern_search"
+        android:background="@drawable/bg_modern_search_im_new"
         android:backgroundTint="?background_content"
         android:focusable="true"
         android:focusableInTouchMode="true"
@@ -21,12 +21,12 @@
             android:layout_height="48.0dip"
             android:src="@drawable/ic_back_24"
             android:scaleType="centerInside"
-            android:tint="?header_text" />
+            android:tint="?text_primary" />
 
         <com.vk.core.view.NoMenuEditText
             android:textSize="16.0dip"
-            android:textColor="?header_text"
-            android:textColorHint="?header_text_secondary"
+            android:textColor="?text_primary"
+            android:textColorHint="?text_secondary"
             android:gravity="center_vertical"
             android:id="@id/query"
             android:background="@null"
@@ -42,8 +42,8 @@
 
         <TextView
             android:textSize="16.0dip"
-            android:textColor="?header_text"
-            android:textColorHint="?header_text_secondary"
+            android:textColor="?text_primary"
+            android:textColorHint="?text_secondary"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:id="@id/query_static"
@@ -65,7 +65,7 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_search_params_24"
             android:scaleType="centerInside"
-            android:tint="?header_text" />
+            android:tint="?text_primary" />
 
         <ImageView
             android:layout_gravity="center_vertical"
@@ -75,6 +75,6 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_cancel_24"
             android:scaleType="centerInside"
-            android:tint="?header_text" />
+            android:tint="?text_primary" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml
index fe4eb8894..ca658aede 100644
--- a/smali/res/values-v21/styles.xml
+++ b/smali/res/values-v21/styles.xml
@@ -61,7 +61,7 @@
 
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?header_text</item>
+        <item name="android:textColor">?text_primary</item>
     </style>
 
     <style name="Base.TextAppearance.AppCompat" parent="@android:style/TextAppearance.Material" />
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 4795e3ade..a5ecfe305 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -61,8 +61,8 @@
     </style>
 
     <style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">?header_text</item>
-        <item name="android:textColorSecondary">?header_text_secondary</item>
+        <item name="android:textColorPrimary">?text_primary</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
         <item name="colorAccent">?accent</item>
         <item name="colorPrimary">?background_content</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
@@ -72,13 +72,13 @@
 
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?header_text</item>
+        <item name="android:textColor">?text_primary</item>
     </style>
 
     <style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
 
     <style name="ActionButton.Blue" parent="@style/ActionButton">
-        <item name="android:tint">?header_text</item>
+        <item name="android:tint">?text_primary</item>
     </style>
 
     <style name="ActionButton.Gray" parent="@style/ActionButton">
@@ -86,7 +86,7 @@
     </style>
 
     <style name="ActionButton.White" parent="@style/ActionButton">
-        <item name="android:tint">?header_text</item>
+        <item name="android:tint">?text_primary</item>
     </style>
 
     <style name="ActionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -6349,8 +6349,7 @@
     </style>
 
     <style name="VkIm.Theme.Search.VkApp" parent="@style/VkIm.Theme.Search">
-        <item name="search_bg">@drawable/bg_modern_search</item>
-        <item name="android:tint">?background_content</item>
+        <item name="search_bg">@drawable/bg_modern_search_im_new</item>
     </style>
 
     <style name="VkIm.Theme.Search.VkMe" parent="@style/VkIm.Theme.Search">
diff --git a/smali/smali_classes5/com/vk/core/fragments/b/a/ParentSupportFragmentManager.smali b/smali/smali_classes5/com/vk/core/fragments/b/a/ParentSupportFragmentManager.smali
index 5c8e84e87..80a90f371 100644
--- a/smali/smali_classes5/com/vk/core/fragments/b/a/ParentSupportFragmentManager.smali
+++ b/smali/smali_classes5/com/vk/core/fragments/b/a/ParentSupportFragmentManager.smali
@@ -196,15 +196,13 @@
     .line 78
     iget-object v0, p0, Lcom/vk/core/fragments/b/a/ParentSupportFragmentManager;->c:Landroid/support/v4/app/FragmentTransaction;
 
-    invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroid/support/v4/app/FragmentTransaction;)V
-
-    return-void
-
     if-eqz v0, :cond_0
 
     invoke-virtual {v0, p1, p2}, Landroid/support/v4/app/FragmentTransaction;->a(II)Landroid/support/v4/app/FragmentTransaction;
 
     :cond_0
+    invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroid/support/v4/app/FragmentTransaction;)V
+
     return-void
 .end method