updated toolbar icons hook

app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java

@@ -1,14 +1,8 @@
 package ru.vtosters.lite.themes.hooks;
 
-import android.util.Log;
-import android.view.MenuItem;
 import android.view.View;
-
 import androidx.appcompat.widget.Toolbar;
-
 import com.vk.core.drawable.RecoloredDrawable;
-import com.vtosters.lite.R;
-
 import ru.vtosters.lite.utils.ThemesUtils;
 
 public class ToolbarHook implements BaseHook {

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java

@@ -1,46 +1,28 @@
 package ru.vtosters.lite.ui.fragments.tgstickers;
 
-import static android.widget.Toast.LENGTH_SHORT;
-import static android.widget.Toast.makeText;
-import static ru.vtosters.lite.tgs.TGPref.setTGBotKey;
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
-import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
-
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.view.Gravity;
+import android.view.*;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-
+import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
-
-import java.io.File;
-
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.ui.adapters.StickerPackAdapter;
 import ru.vtosters.lite.ui.components.StickerTouchHelperCallback;
@@ -48,6 +30,8 @@ import ru.vtosters.lite.ui.fragments.BaseToolbarFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
+import java.io.File;
+
 public class StickersFragment extends BaseToolbarFragment {
     public final static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST";
 
@@ -84,7 +68,7 @@ public class StickersFragment extends BaseToolbarFragment {
     @Override
     protected void onCreateMenu(Menu menu) {
         var item = menu.add(0, 0, 0, "");
-        item.setIcon(R.drawable.ic_settings_24)
+        item.setIcon(ThemesUtils.recolorDrawable(AndroidUtils.getGlobalContext().getDrawable(R.drawable.ic_settings_24)))
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         super.onCreateMenu(menu);
@@ -98,7 +82,7 @@ public class StickersFragment extends BaseToolbarFragment {
 
     private void openMenu(String toast) {
         if (toast != null) {
-            makeText(getContext(), toast, LENGTH_SHORT).show();
+            Toast.makeText(getContext(), toast, Toast.LENGTH_SHORT).show();
         }
         var intent = new Navigator(StickersPreferencesFragment.class, new Bundle()).b(getContext());
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -138,7 +122,7 @@ public class StickersFragment extends BaseToolbarFragment {
 
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(-2, -2);
         params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
-        params.setMargins(0, 0, 0, dp2px(12f));
+        params.setMargins(0, 0, 0, AndroidUtils.dp2px(12f));
         layout.addView(mAddStickerPack, params);
 
         return layout;
@@ -173,13 +157,13 @@ public class StickersFragment extends BaseToolbarFragment {
                 LinearLayout linearLayout = new LinearLayout(getContext());
 
                 final EditText editText = new EditText(getContext());
-                editText.setHintTextColor(getSTextAttr());
+                editText.setHintTextColor(ThemesUtils.getSTextAttr());
                 editText.setBackgroundTintList(ThemesUtils.getAccenedColorStateList());
 
                 linearLayout.addView(editText);
                 editText.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
                 ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) editText.getLayoutParams());
-                margin.setMargins(dp2px(24f), 0, dp2px(24f), 0);
+                margin.setMargins(AndroidUtils.dp2px(24f), 0, AndroidUtils.dp2px(24f), 0);
                 editText.setLayoutParams(margin);
 
                 new VkAlertDialog.Builder(getContext())
@@ -191,7 +175,7 @@ public class StickersFragment extends BaseToolbarFragment {
                             if (!pack.startsWith("https://")) {
                                 pack = "https://" + pack;
                             } else if (!pack.contains("addstickers")) {
-                                sendToast(AndroidUtils.getString("invalid_pack_link"));
+                                AndroidUtils.sendToast(AndroidUtils.getString("invalid_pack_link"));
                             }
                             pack = parsePack(pack);
                             mService.requestPackDownload(pack, new File(getContext().getFilesDir(), new File("VT-Stickers", pack).getAbsolutePath()));
@@ -231,13 +215,13 @@ public class StickersFragment extends BaseToolbarFragment {
         LinearLayout linearLayout = new LinearLayout(getContext());
 
         final EditText editText = new EditText(getContext());
-        editText.setHintTextColor(getSTextAttr());
+        editText.setHintTextColor(ThemesUtils.getSTextAttr());
         editText.setBackgroundTintList(ThemesUtils.getAccenedColorStateList());
 
         linearLayout.addView(editText);
         editText.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
         ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) editText.getLayoutParams());
-        margin.setMargins(dp2px(24f), 0, dp2px(24f), 0);
+        margin.setMargins(AndroidUtils.dp2px(24f), 0, AndroidUtils.dp2px(24f), 0);
         editText.setLayoutParams(margin);
 
         new VkAlertDialog.Builder(getContext())
@@ -245,7 +229,7 @@ public class StickersFragment extends BaseToolbarFragment {
                 .setMessage(requireContext().getString(R.string.stickersapi6))
                 .setView(linearLayout)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                    setTGBotKey(editText.getText().toString());
+                    TGPref.setTGBotKey(editText.getText().toString());
                     if (r != null) r.run();
                 })
                 .setNegativeButton(android.R.string.cancel,
@@ -277,8 +261,8 @@ public class StickersFragment extends BaseToolbarFragment {
             public void onKeyChecked(boolean ok) {
                 progressDialog.dismiss();
                 if (!ok) {
-                    makeText(context, requireContext().getString(R.string.stickersapi2), LENGTH_SHORT).show();
+                    Toast.makeText(context, requireContext().getString(R.string.stickersapi2), Toast.LENGTH_SHORT).show();
-                    setTGBotKey(null);
+                    TGPref.setTGBotKey(null);
                     return;
                 }
                 mService.setBotKey(TGPref.getTGBotKey());

smali/smali_classes2/com/vk/extensions/ViewExtKt.smali

@@ -1261,7 +1261,7 @@
 .end method
 
 .method public static final a(Landroidx/appcompat/widget/Toolbar;Lkotlin/jvm/b/Functions2;)V
-    .locals 0
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -1281,6 +1281,10 @@
 
     invoke-virtual {p0, p1}, Landroidx/appcompat/widget/Toolbar;->setOnMenuItemClickListener(Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;)V
 
+    const v1, 0x0
+
+    invoke-static {p0, v1, v1}, Lru/vtosters/lite/themes/ViewInjector;->inject(Landroid/view/View;IZ)Landroid/view/View;
+
     return-void
 .end method
 

smali/smali_classes4/com/vk/superapp/SuperAppFragment.smali

@@ -414,6 +414,7 @@
     invoke-virtual {p2, v1}, Landroidx/appcompat/widget/Toolbar;->setOnMenuItemClickListener(Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;)V
 
     const v1, 0x0
+
     invoke-static {p2, v1, v1}, Lru/vtosters/lite/themes/ViewInjector;->inject(Landroid/view/View;IZ)Landroid/view/View;
 
     .line 6

smali/smali_classes5/com/vtosters/lite/m0/ToolbarHelper.smali

@@ -5,7 +5,7 @@
 
 # direct methods
 .method public static a(Lcom/vk/core/fragments/FragmentImpl;Landroidx/appcompat/widget/Toolbar;)V
-    .locals 0
+    .locals 2
 
     .line 1
     invoke-static {p0, p1}, Lcom/vtosters/lite/m0/ToolbarHelper;->b(Lcom/vk/core/fragments/FragmentImpl;Landroidx/appcompat/widget/Toolbar;)Z
@@ -20,6 +20,10 @@
     invoke-virtual {p1, p0}, Landroidx/appcompat/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
 
     :cond_0
+    const v1, 0x0
+
+    invoke-static {p1, v1, v1}, Lru/vtosters/lite/themes/ViewInjector;->inject(Landroid/view/View;IZ)Landroid/view/View;
+
     return-void
 .end method