From 929e481b3de0ba4a629af2539059725227d06a39 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 17 Jul 2022 15:21:06 +0300
Subject: [PATCH] fixed stickers dialog

---
 .../ui/fragments/dockbar/DockBarInjector.java | 38 +++++++++++++++++++
 .../tgstickers/StickersFragment.java          |  6 ---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java
index 6a79abd42..aa848b03e 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java
@@ -12,6 +12,7 @@ import static com.vtosters.lite.R.id.tab_messages;
 import static com.vtosters.lite.R.id.tab_news;
 import static ru.vtosters.lite.utils.Globals.getResources;
 
+import android.annotation.SuppressLint;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -21,7 +22,10 @@ import android.view.MenuItem;
 import com.vk.apps.AppsFragment;
 import com.vk.core.drawable.RecoloredDrawable;
 import com.vk.core.fragments.FragmentImpl;
+import com.vk.core.ui.themes.MilkshakeHelper;
+import com.vk.core.util.StringUtils;
 import com.vk.navigation.right.RightMenu;
+import com.vtosters.lite.MenuCountersState;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView;
 
@@ -38,6 +42,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import ru.vtosters.lite.utils.Preferences;
+
 public class DockBarInjector{
     private static final DockBarManager sManager = DockBarManager.getInstance();
 
@@ -155,6 +161,38 @@ public class DockBarInjector{
         }
     }
 
+    public static void setCounter(int tabId, BottomNavigationView navigationView){
+        navigationView.a(tabId, counters(tabId, navigationView));
+    }
+
+    private static CharSequence counters(int tabId, BottomNavigationView navigationView){
+        if (!Preferences.dockcounter()) return null;
+
+        int val = 0;
+
+        val = MenuCountersState.g(); // friends ?????? menu_friends
+        val = MenuCountersState.j(); // messages
+        val = MenuCountersState.k() * (-1); // notifications
+        val = MenuCountersState.b(); // NewsfeedMarkDiscoverBadgeViewed
+        val = MenuCountersState.c(); // fave
+        val = MenuCountersState.a(); // games
+        val = MenuCountersState.h(); // groups
+        val = MenuCountersState.l(); // photos
+        val = MenuCountersState.m(); // support
+        val = MenuCountersState.n(); // videos
+        val = MenuCountersState.o(); // vk_pay
+        val = MenuCountersState.e(); // new friends
+        val = MenuCountersState.f(); // suggested friends
+
+        if (val > 0) {
+            return StringUtils.a(val);
+        }
+        if (val >= 0) {
+            return null;
+        }
+        return "";
+    }
+
     public static JSONArray injectMenuJSON(JSONArray arr){
         List<String> arrayList = new ArrayList(Arrays.asList(
                 "news",
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
index 6ee70f100..056bd2e80 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
@@ -171,12 +171,6 @@ public class StickersFragment extends BaseToolbarFragment{
                 editText.setHintTextColor(PreferencesUtil.getSTextColor(getContext()));
                 editText.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
 
-                // Костыль для китката
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    editText.setBackgroundTintList(ColorStateList.valueOf(PreferencesUtil.getTextColor(getContext())));
-                } else {
-                    ViewCompat.setBackgroundTintList(editText, ColorStateList.valueOf(PreferencesUtil.getTextColor(getContext())));
-                }
                 linearLayout.addView(editText);
                 editText.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
                 ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) editText.getLayoutParams());