From a7fd5536f6beb21bf9dd3bd156da9fa5e6398a21 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 14 Dec 2022 17:11:29 +0300
Subject: [PATCH] fixed writebar issues

---
 app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java | 6 ------
 smali/res/layout/write_bar.xml                            | 1 +
 smali/res/layout/write_bar_i.xml                          | 1 +
 smali/res/values-v31/styles.xml                           | 4 ++--
 smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali  | 2 ++
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
index ae9275d4b..7e2416d7f 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
@@ -14,13 +14,10 @@ import android.view.Window;
 import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
 import com.vk.articles.preload.WebCachePreloader;
 import com.vk.core.drawable.RecoloredDrawable;
 import com.vk.core.preference.Preference;
@@ -29,8 +26,6 @@ import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
-
-import ru.vtosters.lite.deviceinfo.Device;
 import ru.vtosters.lite.deviceinfo.OEMDetector;
 import ru.vtosters.lite.hooks.VKUIHook;
 import ru.vtosters.lite.themes.ThemesHacks;
@@ -281,7 +276,6 @@ public class ThemesUtils {
     } // Get needed attr color
 
     public static void colorWriteBar(View view) {
-        if (!navbar() || isMonetTheme()) return;
         view.setBackgroundColor(getTabbarBackground());
     }
 
diff --git a/smali/res/layout/write_bar.xml b/smali/res/layout/write_bar.xml
index 590b0f0fd..316d64e17 100644
--- a/smali/res/layout/write_bar.xml
+++ b/smali/res/layout/write_bar.xml
@@ -96,6 +96,7 @@
         android:id="@id/write_bar_edit_area_container"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:background="?tabbar_background"
         android:focusable="true"
         android:focusableInTouchMode="true">
 
diff --git a/smali/res/layout/write_bar_i.xml b/smali/res/layout/write_bar_i.xml
index afd72e8b8..c10525830 100644
--- a/smali/res/layout/write_bar_i.xml
+++ b/smali/res/layout/write_bar_i.xml
@@ -96,6 +96,7 @@
         android:id="@id/write_bar_edit_area_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?tabbar_background"
         android:focusable="true"
         android:focusableInTouchMode="true">
 
diff --git a/smali/res/values-v31/styles.xml b/smali/res/values-v31/styles.xml
index 07a15b50e..5873bb690 100644
--- a/smali/res/values-v31/styles.xml
+++ b/smali/res/values-v31/styles.xml
@@ -725,7 +725,7 @@
         <item name="placeholder_icon_tint">@android:color/system_neutral1_100</item>
         <item name="poll_option_background">@android:color/system_neutral1_100</item>
         <item name="search_bar_background">@android:color/system_neutral1_900</item>
-        <item name="search_bar_field_background">@android:color/system_neutral1_800</item>
+        <item name="search_bar_field_background">@android:color/system_neutral1_700</item>
         <item name="search_bar_field_tint">@android:color/system_neutral1_300</item>
         <item name="search_bar_segmented_control_tint">@android:color/system_neutral1_400</item>
         <item name="segmented_control_bar_background">@android:color/system_neutral1_900</item>
@@ -985,7 +985,7 @@
         <item name="placeholder_icon_tint">@android:color/system_neutral1_100</item>
         <item name="poll_option_background">@android:color/system_neutral1_100</item>
         <item name="search_bar_background">@android:color/system_neutral1_900</item>
-        <item name="search_bar_field_background">@android:color/system_neutral1_800</item>
+        <item name="search_bar_field_background">@android:color/system_neutral1_700</item>
         <item name="search_bar_field_tint">@android:color/system_neutral1_300</item>
         <item name="search_bar_segmented_control_tint">@android:color/system_neutral1_400</item>
         <item name="segmented_control_bar_background">@android:color/system_neutral1_900</item>
diff --git a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
index 929fbfdd7..a836ac38c 100644
--- a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
+++ b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali
@@ -1328,6 +1328,8 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->colorWriteBar(Landroid/view/View;)V
+
     check-cast v0, Landroid/view/ViewGroup;
 
     iput-object v0, p0, Lcom/vtosters/lite/ui/WriteBar;->j0:Landroid/view/ViewGroup;