dockbar and superapp editor moved

New icons in profile buttons

app/build.gradle

@@ -1,9 +1,8 @@
-import java.nio.file.Files
+import org.apache.tools.ant.taskdefs.condition.Os
+
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 import java.util.zip.ZipInputStream
-import org.apache.tools.ant.taskdefs.condition.Os
-
 
 plugins {
     id 'com.android.application'
@@ -149,6 +148,22 @@ task buildAndInstallVTL(type: Exec) {
     }
 }
 
+task buildAndLaunchVTL(type: Exec) {
+    dependsOn('buildAndInstallVTL')
+    if (Os.isFamily("unix") || Os.isFamily("mac"))
+        commandLine 'bash', '-c', 'adb shell monkey -p com.vtosters.lite -c android.intent.category.LAUNCHER 1'
+    else
+        commandLine 'adb', 'shell', 'monkey', '-p', 'com.vtosters.lite', '-c', 'android.intent.category.LAUNCHER', '1'
+}
+
+task generateRjava(type: Exec) {
+    workingDir(projectDir.parentFile)
+    if (Os.isFamily("unix") || Os.isFamily("mac"))
+        commandLine "bash", "-c", "./scripts/rclass_regenerator.sh"
+    else
+        commandLine "cmd", "/C", ".\\scripts\\rclass_regenerator.sh"
+}
+
 exportDex.dependsOn('assembleRelease')
 clean.dependsOn('cleanVersionFile')
 versionFile.dependsOn('cleanVersionFile')

app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java

@@ -1,16 +1,14 @@
 package com.aefyr.tsg.g2;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-
 import com.aefyr.tsg.g2.sql.TelegramStickersDbHelper;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersPackInfo;
+import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -19,7 +17,7 @@ import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 /**
  * Created by Aefyr on 19.05.2018.
@@ -227,6 +225,7 @@ public class TelegramStickersService {
         currentlyDownloading.add(id.toLowerCase());
         notificationsHelper.packStartedDownloading(newPack);
 
+
         grabber.enableProxy();
         grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() {
             @Override
@@ -383,7 +382,7 @@ public class TelegramStickersService {
         getPacksListReference().set(li1, p2);
     }
 
-    interface StickersEventsListener {
+    public interface StickersEventsListener {
         void onPackAdded(TelegramStickersPack pack, int atIndex);
 
         void onPackRemoved(TelegramStickersPack pack, int atIndex);

app/src/main/java/com/vk/core/util/DownloadUtils.java

@@ -191,7 +191,7 @@ public class DownloadUtils {
                     if (!file.exists()) {
                         return false;
                     }
-                    Intent intent = new Intent("android.intent.action.VIEW");
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
                     intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                     var mimeType = FileUtils.f(file);
                     var uri = FileUtils.uriFromFile(file);
@@ -222,7 +222,7 @@ public class DownloadUtils {
             var mimeType = FileUtils.f(file);
             var uri = FileUtils.uriFromFile(file);
 
-            Intent intent = new Intent("android.intent.action.VIEW");
+            Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setDataAndType(uri, mimeType);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             Log.d("DownloadUtils", "openFile: " + file.getAbsolutePath() + "| mimetype " + mimeType + "| uri " + uri);

app/src/main/java/com/vk/im/ui/components/common/DialogAction.java

@@ -36,5 +36,6 @@ public enum DialogAction {
     unpinmsg,
     ENCRYPT_SETT,
     ENCRYPT,
-    DOWNLOAD
+    DOWNLOAD,
+    STAT
 }

app/src/main/java/com/vk/stickers/details/StickerDetailsAdapter.java

@@ -0,0 +1,179 @@
+package com.vk.stickers.details;
+
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.vk.core.ui.themes.VKThemeHelper;
+import com.vk.core.util.Screen;
+import com.vk.dto.stickers.StickerItem;
+import com.vk.dto.stickers.StickerStockItem;
+import com.vk.extensions.ViewExtKt;
+import com.vk.imageloader.view.VKImageView;
+import com.vk.stickers.views.VKStickerImageView;
+import com.vtosters.lite.R;
+
+import java.util.List;
+
+public final class StickerDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private final List<StickerItem> mItems;
+
+    private final StickerStockItem mItem;
+    private boolean mIsTelegramPack = false;
+
+    public StickerDetailsAdapter(StickerStockItem stickerStockItem) {
+        this.mItem = stickerStockItem;
+        this.mItems = this.mItem.T1();
+    }
+
+    public void setTelegramPack(boolean state) {
+        mIsTelegramPack = state;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        switch (i) {
+            case 0:
+                return new c(viewGroup);
+            case 1:
+                return new d(viewGroup);
+            case 2:
+                return new b(viewGroup);
+            default:
+                throw new IllegalArgumentException("Unknown viewType: " + i);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+        switch(getItemViewType(i)) {
+            case 0:
+                ((c) viewHolder).a(this.mItem);
+                break;
+            case 1:
+                ((d) viewHolder).a(this.mItems.get(H(i)));
+                break;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mIsTelegramPack ? mItems.size() : this.mItems.size() + 2;
+    }
+
+    @Override
+    public int getItemViewType(int i) {
+        if (mIsTelegramPack) return 1;
+        if (i == 0) {
+            return 0;
+        }
+        return i == k() ? 2 : 1;
+    }
+
+    public int H(int i) {
+        return mIsTelegramPack ? i : i - j();
+    }
+
+    public boolean I(int i) {
+        return getItemViewType(i) == 1;
+    }
+
+    public int j() {
+        return 1;
+    }
+
+    public int k() {
+        return l() + 1;
+    }
+
+    public int l() {
+        return (this.mItems.size() + j()) - 1;
+    }
+
+    public int m() {
+        return 0;
+    }
+
+    public List<StickerItem> n() {
+        return this.mItems;
+    }
+
+    public boolean v() {
+        return false;
+    }
+
+    private static final class b extends RecyclerView.ViewHolder {
+        public b(ViewGroup viewGroup) {
+            super(ViewExtKt.a(viewGroup, R.layout.sticker_details_hold_to_view_item, false));
+        }
+    }
+
+    private final class c extends RecyclerView.ViewHolder {
+        private final VKImageView mImageBg;
+        private final VKImageView mPackImage;
+        private final ImageView mAnimPack;
+        private final TextView mPackTitle;
+        private final TextView mPackAuthor;
+        private final TextView mPackSubtitle;
+        private final TextView mDescription;
+
+        public c(ViewGroup viewGroup) {
+            super(LayoutInflater.from(VKThemeHelper.u()).inflate(R.layout.sticker_details_info_item, viewGroup, false));
+            this.mImageBg = this.itemView.findViewById(R.id.pack_image_bg);
+            this.mPackImage = this.itemView.findViewById(R.id.pack_image);
+            this.mAnimPack = this.itemView.findViewById(R.id.anim_pack);
+            this.mPackTitle = this.itemView.findViewById(R.id.pack_title);
+            this.mPackAuthor = this.itemView.findViewById(R.id.pack_author);
+            this.mPackSubtitle = this.itemView.findViewById(R.id.pack_subtitle);
+            this.mDescription = this.itemView.findViewById(R.id.description);
+        }
+
+        public void a(StickerStockItem stickerStockItem) {
+            this.mImageBg.a(stickerStockItem.R1());
+            this.mImageBg.getHierarchy().a().setVisible(true, true);
+            this.mImageBg.getHierarchy().a(0);
+            this.mImageBg.getHierarchy().e(new ColorDrawable(VKThemeHelper.d(R.attr.placeholder_icon_background)));
+            
+            this.mPackImage.a(stickerStockItem.h(Screen.a(68)));
+            this.mPackImage.getHierarchy().a().setVisible(true, true);
+            this.mPackImage.getHierarchy().a(0);
+            
+            if (stickerStockItem.E1()) {
+                ViewExtKt.r(this.mAnimPack);
+            } else {
+                ViewExtKt.p(this.mAnimPack);
+            }
+            
+            this.mPackTitle.setText(stickerStockItem.getTitle());
+            
+            this.mPackAuthor.setText(stickerStockItem.v1());
+            
+            ViewExtKt.p(this.mPackSubtitle);
+            
+            this.mDescription.setText(stickerStockItem.C1());
+        }
+    }
+
+    private static final class d extends RecyclerView.ViewHolder {
+        private final VKStickerImageView mImage;
+
+        public d(ViewGroup viewGroup) {
+            super(new VKStickerImageView(viewGroup.getContext()));
+            this.mImage = (VKStickerImageView) itemView;
+            this.mImage.setAspectRatio(1.0f);
+            this.mImage.setClickable(true);
+            this.mImage.getHierarchy().a().setVisible(true, true);
+            this.mImage.getHierarchy().a(0);
+            this.mImage.setContentDescription(this.mImage.getContext().getString(R.string.stickers_accessibility_sticker));
+        }
+
+        public void a(StickerItem stickerItem) {
+            this.mImage.a(stickerItem.h(Screen.a(80)));
+            this.mImage.setTag(R.id.id, stickerItem.getId());
+        }
+    }
+}

app/src/main/java/com/vtosters/lite/R.java

@@ -221,8 +221,9 @@ public final class R {
         public static final int targetlang_value = 0x7f030074; // 2130903156
         public static final int undel_value = 0x7f030075; // 2130903157
         public static final int wallpaper_change_dialog = 0x7f030076; // 2130903158
-        public static final int theme_type_name = 0x7f030077; // 2130903159
-        public static final int theme_type_name_checkbox = 0x7f030078; // 2130903160
+        public static final int accent_select_type = 0x7f030077; // 2130903159
+        public static final int theme_type_name = 0x7f030078; // 2130903160
+        public static final int theme_type_name_checkbox = 0x7f030079; // 2130903161
     }
 
     public static final class attr {
@@ -2136,6 +2137,7 @@ public final class R {
         public static final int zOrderOnTop = 0x7f040773; // 2130970483
         public static final int im_ic_msgdl = 0x7f040774; // 2130970484
         public static final int im_ic_msgreload = 0x7f040775; // 2130970485
+        public static final int im_ic_stats = 0x7f040776; // 2130970486
     }
 
     public static final class bool {
@@ -2964,6 +2966,7 @@ public final class R {
         public static final int yellow_sunflower = 0x7f060324; // 2131100452
         public static final int iclauncher = 0x7f060325; // 2131100453
         public static final int abc_color_highlight_material = 0x7f060004; // 2131099652
+        public static final int alpha05 = 0x7f060326; // 2131100454
     }
 
     public static final class dimen {
@@ -4974,6 +4977,7 @@ public final class R {
         public static final int roundmsg = 0x7f080bd3; // 2131233747
         public static final int tgs_entry_background = 0x7f080bd4; // 2131233748
         public static final int yandex = 0x7f080bd7; // 2131233751
+        public static final int checker_background = 0x7f080bd8; // 2131233752
         public static final int abc_control_background_material = 0x7f080032; // 2131230770
         public static final int ic_action_close = 0x7f080322; // 2131231522
         public static final int ic_camera_outline_28_new = 0x7f0803a0; // 2131231648
@@ -11028,6 +11032,10 @@ public final class R {
         public static final int savedmsg = 0x7f0a101e; // 2131365918
         public static final int search_photo = 0x7f0a101f; // 2131365919
         public static final int text_hex_wrapper = 0x7f0a1020; // 2131365920
+        public static final int color_preview = 0x7f0a1021; // 2131365921
+        public static final int color_name = 0x7f0a1022; // 2131365922
+        public static final int color_value = 0x7f0a1023; // 2131365923
+        public static final int color_preview_border = 0x7f0a1024; // 2131365924
     }
 
     public static final class integer {
@@ -12848,6 +12856,7 @@ public final class R {
         public static final int tgs_entry = 0x7f0d06de; // 2131560158
         public static final int wppreview = 0x7f0d06df; // 2131560159
         public static final int write_bar_i = 0x7f0d06e0; // 2131560160
+        public static final int color_picker_item = 0x7f0d06e1; // 2131560161
     }
 
     public static final class menu {
@@ -19517,17 +19526,39 @@ public final class R {
         public static final int whitelisted_filters_groups_title = 0x7f121838; // 2131892280
         public static final int why_news_not_updated_summ = 0x7f121839; // 2131892281
         public static final int why_news_not_updated_title = 0x7f12183a; // 2131892282
-        public static final int blockminiapps_summ = 0x7f12183b; // 2131892283
-        public static final int blockminiapps_title = 0x7f12183c; // 2131892284
-        public static final int current_theme = 0x7f12183d; // 2131892285
-        public static final int invalid_pack_link = 0x7f12183e; // 2131892286
-        public static final int maxquality_summ = 0x7f12183f; // 2131892287
-        public static final int maxquality_title = 0x7f121840; // 2131892288
-        public static final int newsfeed_notif_summ = 0x7f121841; // 2131892289
-        public static final int newsfeed_notif_title = 0x7f121842; // 2131892290
-        public static final int promotedstickers_title = 0x7f121843; // 2131892291
-        public static final int vkx_integration_enabled_info = 0x7f121844; // 2131892292
-        public static final int writebar_ios_title = 0x7f121845; // 2131892293
+        public static final int accent_color_summ = 0x7f12183b; // 2131892283
+        public static final int accent_color_title = 0x7f12183c; // 2131892284
+        public static final int accents = 0x7f12183d; // 2131892285
+        public static final int amoledtheme_summ = 0x7f12183e; // 2131892286
+        public static final int amoledtheme_title = 0x7f12183f; // 2131892287
+        public static final int audio_deleted_from_cache = 0x7f121840; // 2131892288
+        public static final int blockminiapps_summ = 0x7f121841; // 2131892289
+        public static final int blockminiapps_title = 0x7f121842; // 2131892290
+        public static final int businessDisabler_title = 0x7f121843; // 2131892291
+        public static final int cannot_write = 0x7f121844; // 2131892292
+        public static final int change_accent_color = 0x7f121845; // 2131892293
+        public static final int copyownlink_summ = 0x7f121846; // 2131892294
+        public static final int copyownlink_title = 0x7f121847; // 2131892295
+        public static final int crash_service_name = 0x7f121848; // 2131892296
+        public static final int current_theme = 0x7f121849; // 2131892297
+        public static final int dialogstats = 0x7f12184a; // 2131892298
+        public static final int downloading_update = 0x7f12184b; // 2131892299
+        public static final int invalid_pack_link = 0x7f12184c; // 2131892300
+        public static final int maxquality_summ = 0x7f12184d; // 2131892301
+        public static final int maxquality_title = 0x7f12184e; // 2131892302
+        public static final int monettheme_summ = 0x7f12184f; // 2131892303
+        public static final int monettheme_title = 0x7f121850; // 2131892304
+        public static final int newsfeed_notif_summ = 0x7f121851; // 2131892305
+        public static final int newsfeed_notif_title = 0x7f121852; // 2131892306
+        public static final int open_bot = 0x7f121853; // 2131892307
+        public static final int promotedstickers_title = 0x7f121854; // 2131892308
+        public static final int select_color = 0x7f121855; // 2131892309
+        public static final int select_palette = 0x7f121856; // 2131892310
+        public static final int sources = 0x7f121857; // 2131892311
+        public static final int useOldAppVer_summ = 0x7f121858; // 2131892312
+        public static final int useOldAppVer_title = 0x7f121859; // 2131892313
+        public static final int vkx_integration_enabled_info = 0x7f12185a; // 2131892314
+        public static final int writebar_ios_title = 0x7f12185b; // 2131892315
     }
 
     public static final class style {
@@ -20672,6 +20703,24 @@ public final class R {
         public static final int Base_V26_Widget_AppCompat_Toolbar = 0x7f1300a1; // 2131951777
         public static final int Base_V28_Theme_AppCompat = 0x7f1300a2; // 2131951778
         public static final int Base_V28_Theme_AppCompat_Light = 0x7f1300a3; // 2131951779
+        public static final int Vk_Theme_VkApp_amoled_monet_generated = 0x7f130475; // 2131952757
+        public static final int Vk_Theme_VkApp_amoled_monet_old_generated = 0x7f130476; // 2131952758
+        public static final int Vk_Theme_VkApp_bright_light_monet_generated = 0x7f130477; // 2131952759
+        public static final int Vk_Theme_VkApp_client_dark_monet_generated = 0x7f130478; // 2131952760
+        public static final int Vk_Theme_VkApp_client_light_monet_generated = 0x7f130479; // 2131952761
+        public static final int Vk_Theme_VkApp_space_gray_monet_generated = 0x7f13047a; // 2131952762
+        public static final int VkAmoledMonetStyle = 0x7f13047b; // 2131952763
+        public static final int VkAmoledMonetTheme = 0x7f13047c; // 2131952764
+        public static final int VkDarkMonetStyle = 0x7f13047d; // 2131952765
+        public static final int VkDarkMonetTheme = 0x7f13047e; // 2131952766
+        public static final int VkLightMonetStyle = 0x7f13047f; // 2131952767
+        public static final int VkLightMonetTheme = 0x7f130480; // 2131952768
+        public static final int VkMilkAmoledMonetStyle = 0x7f130481; // 2131952769
+        public static final int VkMilkAmoledMonetTheme = 0x7f130482; // 2131952770
+        public static final int VkMilkDarkMonetStyle = 0x7f130483; // 2131952771
+        public static final int VkMilkDarkMonetTheme = 0x7f130484; // 2131952772
+        public static final int VkMilkLightMonetStyle = 0x7f130485; // 2131952773
+        public static final int VkMilkLightMonetTheme = 0x7f130486; // 2131952774
     }
 
     public static final class xml {

app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java

@@ -1,20 +1,9 @@
 package ru.vtosters.lite.dnr;
 
-import static ru.vtosters.lite.dnr.DNRModule.hookDNR;
-import static ru.vtosters.lite.dnr.DNRModule.hookDNT;
-import static ru.vtosters.lite.dnr.DNRModule.isDnrEnabledFor;
-import static ru.vtosters.lite.dnr.DNRModule.isDntEnabledFor;
-import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
-import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
-
 import com.vk.core.network.Network;
 import com.vk.im.engine.ImEngine1;
 import com.vk.im.engine.events.OnDialogUpdateEvent;
@@ -27,13 +16,6 @@ import com.vk.im.ui.components.common.MsgAction;
 import com.vk.im.ui.components.viewcontrollers.popup.DelegateMsg;
 import com.vk.im.ui.views.dialog_actions.DialogActionsListView;
 import com.vtosters.lite.R;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -45,10 +27,22 @@ import ru.vtosters.lite.hooks.CryptImHook;
 import ru.vtosters.lite.ui.dialogs.Translate;
 import ru.vtosters.lite.utils.AndroidUtils;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import static ru.vtosters.lite.dnr.DNRModule.*;
+import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
+import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+
 public class DNRInjector {
     public static void inject(Dialog dialog, List<DialogAction> list) {
         int peerId = 0;
-
         if (dialog != null) {
             try {
                 peerId = dialog.getId();
@@ -61,6 +55,7 @@ public class DNRInjector {
             return;
         }
 
+        list.add(DialogAction.STAT);
         list.add(DialogAction.DOWNLOAD);
 
         list.add(DialogAction.pinmsg);
@@ -86,6 +81,7 @@ public class DNRInjector {
     }
 
     public static LinkedHashMap<DialogAction, Integer> injectToHashMap(LinkedHashMap<DialogAction, Integer> hashMap) {
+        hashMap.put(DialogAction.STAT, AndroidUtils.getIdentifier("dialogstats", "string"));
         hashMap.put(DialogAction.DOWNLOAD, R.string.download_dl);
 
         hashMap.put(DialogAction.DNR_ON, R.string.DNR_ON);
@@ -104,6 +100,8 @@ public class DNRInjector {
     @SuppressLint("ResourceType")
     public static List<Object> injectToList(List<Object> actions) {
         var list = new ArrayList<>(actions);
+
+        list.add(new DialogActionsListView.b.a(DialogAction.STAT, 1, R.attr.im_ic_stats, R.string.dialogstats)); // DialogAction, Int, Icon, String
         list.add(new DialogActionsListView.b.a(DialogAction.DOWNLOAD, 1, R.attr.im_ic_msgdl, R.string.download_dl)); // DialogAction, Int, Icon, String
 
         list.add(new DialogActionsListView.b.a(DialogAction.DNR_ON, 2, R.attr.im_ic_pinned_msg_hide, R.string.DNR_ON)); // DialogAction, Int, Icon, String
@@ -143,6 +141,8 @@ public class DNRInjector {
             return actions;
         }
 
+        actions.add(DialogAction.STAT);
+
         actions.add(DialogAction.DOWNLOAD);
 
         if (isDnrEnabledFor(peerId)) {
@@ -187,6 +187,11 @@ public class DNRInjector {
             forceInvalidateDialogActions(dialog);
         }
 
+        if (action == DialogAction.STAT) {
+            DNRModule.hookDialogInfo(dialog);
+            return true;
+        }
+
         if (action == DialogAction.DOWNLOAD) {
             File out = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "dialog-" + peerId + ".html");
             try {
@@ -248,6 +253,10 @@ public class DNRInjector {
             DNRModule.hookRead(dialog);
         }
 
+        if (action == DialogAction.STAT) {
+            DNRModule.hookDialogInfo(dialog);
+            return true;
+        }
         if (action == DialogAction.DOWNLOAD) {
             File out = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), peerId + "-dialog.html");
             try {

app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java

@@ -4,16 +4,31 @@ import static ru.vtosters.lite.net.Request.makeRequest;
 import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 
+import android.content.Intent;
+import android.net.Uri;
+import android.os.MessageQueue;
 import android.util.Log;
 
+import com.vk.core.util.LangUtils;
 import com.vk.im.engine.commands.messages.SetUserActivityCmd;
 import com.vk.im.engine.models.dialogs.Dialog;
 import com.vk.im.engine.models.messages.Msg;
 
 import java.util.List;
 
+import com.vk.im.ui.fragments.ChatFragment;
+import com.vk.navigation.Navigator;
+import com.vk.webapp.VkUiFragment;
+import com.vtosters.lite.general.fragments.WebViewFragment;
 import ru.vtosters.lite.dnr.helpers.DoNotReadDBHelper;
 import ru.vtosters.lite.dnr.helpers.DoNotTypeDBHelper;
+import ru.vtosters.lite.ssfs.Utils;
+import ru.vtosters.lite.ui.fragments.VKUIwrapper;
+import ru.vtosters.lite.ui.fragments.VTSettings;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.LifecycleUtils;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class DNRModule {
     public static DoNotReadDBHelper mDoNotReadDBHelper = new DoNotReadDBHelper();
@@ -63,6 +78,17 @@ public class DNRModule {
         });
     }
 
+    public static void hookDialogInfo(Dialog dialog) {
+        AndroidUtils.openWebView("https://vkscripts.ru/run/i/" +
+                AccountManagerUtils.getUserToken() +
+                "?peer_id=" +
+                dialog.getId() +
+                "&lang=" +
+                LangUtils.a() +
+                "&color=" +
+                ThemesUtils.hexx(ThemesUtils.getAccentColor()), LifecycleUtils.getCurrentActivity());
+    }
+
     public static void hookDNR(int peerId) {
         mDoNotReadDBHelper.setEnabledForPeerId(peerId, !mDoNotReadDBHelper.isEnabledForPeerId(peerId));
     }

app/src/main/java/ru/vtosters/lite/hooks/AdBlockHook.java

@@ -231,10 +231,14 @@ public class AdBlockHook {
                     continue;
                 }
 
-                if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
-                    if (dev())
-                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
-                    continue;
+                try {
+                    if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
+                        if (dev())
+                            Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
+                        continue;
+                    }
+                } catch (Exception ex) {
+                    Log.d("RepostInj", ex.getMessage());
                 }
 
                 newItems.put(list);

app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java

@@ -34,179 +34,6 @@ import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class JsonInjectors {
-    public static JSONObject profileButton(JSONObject orig) {
-        try {
-            int id = orig.getInt("id");
-
-            var newItem = new JSONArray();
-
-            if (orig.has("buttons")) {
-                newItem = orig.getJSONArray("buttons");
-            }
-
-            if (!haveDonateButton() && id == AccountManagerUtils.getUserId()) {
-                newItem.put(donateRecomm());
-            }
-
-            if (!orig.has("type") && AccountManagerUtils.isVKTester()) {
-                newItem.put(vktesters(id));
-            }
-
-            orig.put("buttons", newItem);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        return orig;
-    }
-
-    public static JSONObject donateRecomm() {
-        try {
-            var title = AndroidUtils.getString(R.string.donate_to_vtl);
-            var link = "https://vk.com/vtosters_official";
-            var text_color = "2D81E0";
-
-            var json = new JSONObject();
-            var icons = new JSONArray();
-
-            var action = new JSONObject().put("target", "internal");
-            action.put("type", "open_url"); // may be open_url, open_internal_vkui, open_game, help_hint, show_full_post, open_vkapp, show_recommendations_for_post and groups_advertisement
-            action.put("url", link);
-            json.put("action", action);
-
-            json.put("title", title);
-
-            var icon1 = new JSONObject();
-            icon1.put("url", "https://sun2-10.userapi.com/NLd_rNpGuSaBnPV6O-j5mqCGZk8BK8drAMd2LQ/5R-DEF37PFs.png");
-            icon1.put("width", "20");
-            icon1.put("height", "20");
-            icons.put(icon1);
-
-            var icon2 = new JSONObject();
-            icon2.put("url", "https://sun2-12.userapi.com/N8y9pU1meJq_eug-wB1u-HUuGyMqDfdq7A025w/A4Aio-xuLY8.png");
-            icon2.put("width", "40");
-            icon2.put("height", "40");
-            icons.put(icon2);
-
-            var icon3 = new JSONObject();
-            icon3.put("url", "https://sun2-9.userapi.com/3Hx4hff63_2Lt6wjjthJMF_3QLUswNNlQKoAXQ/oyzEu1NL9T8.png");
-            icon3.put("width", "80");
-            icon3.put("height", "80");
-            icons.put(icon3);
-
-            json.put("icons", icons);
-
-            json.put("text_color", text_color);
-
-            return json;
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public static JSONObject vktesters(int id) {
-        try {
-            var title = AndroidUtils.getString(R.string.tester_profile);
-            var text_color = "2D81E0";
-            var link = "https://" + getStatic() + "/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
-
-            var json = new JSONObject();
-            var icons = new JSONArray();
-
-            var action = new JSONObject();
-            action.put("target", "internal");
-            action.put("type", "open_internal_vkui");
-            action.put("url", link);
-            json.put("action", action);
-
-            json.put("title", title);
-
-            var icon1 = new JSONObject();
-            icon1.put("url", "https://sun2-10.userapi.com/NLd_rNpGuSaBnPV6O-j5mqCGZk8BK8drAMd2LQ/5R-DEF37PFs.png");
-            icon1.put("width", "20");
-            icon1.put("height", "20");
-            icons.put(icon1);
-
-            var icon2 = new JSONObject();
-            icon2.put("url", "https://sun2-12.userapi.com/N8y9pU1meJq_eug-wB1u-HUuGyMqDfdq7A025w/A4Aio-xuLY8.png");
-            icon2.put("width", "40");
-            icon2.put("height", "40");
-            icons.put(icon2);
-
-            var icon3 = new JSONObject();
-            icon3.put("url", "https://sun2-9.userapi.com/3Hx4hff63_2Lt6wjjthJMF_3QLUswNNlQKoAXQ/oyzEu1NL9T8.png");
-            icon3.put("width", "80");
-            icon3.put("height", "80");
-            icons.put(icon3);
-
-            json.put("icons", icons);
-
-            json.put("text_color", text_color);
-            return json;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public static JSONObject convBar(JSONObject orig) {
-        var peerid = Objects.requireNonNull(orig.optJSONObject("peer")).optInt("id");
-
-        var pic = "https://image.pngaaa.com/641/326641-middle.png"; // can be null
-        var text = AndroidUtils.getString(R.string.no_data_error);
-        var link = "https://vtosters.app"; // can be null
-        var linktitle = "Test button"; // can be null
-
-        var hasIcon = !pic.isEmpty();
-        var hasButton = !link.isEmpty();
-
-        var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
-
-        if (isVerified(peerid))
-            text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium";
-        if (isPrometheus(peerid))
-            text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium Gold Prime Pro Plus";
-        if (isDeveloper(peerid)) text = AndroidUtils.getString(R.string.i_created_poop);
-
-        if (!isVerified(peerid) || text.equals("") || peerid == AccountManagerUtils.getUserId() || peerid == 0) {
-            if (getBoolValue("convBarRecomm", false)) {
-                return null;
-            } else {
-                return orig.optJSONObject("conversation_bar");
-            }
-        }
-
-        if (!dev()) return orig.optJSONObject("conversation_bar"); // for devs only
-
-        try {
-            var json = new JSONObject();
-
-            var buttonsJson = new JSONObject();
-            buttonsJson.put("layout", "tertiary");
-            buttonsJson.put("text", linktitle);
-            buttonsJson.put("type", "link");
-            buttonsJson.put("link", link);
-
-            var buttonsjson = new JSONArray(); // max 3 buttons in array
-            if (hasButton) buttonsjson.put(buttonsJson);
-
-            json.put("name", "group_admin_welcome");
-            json.put("text", text);
-            json.put("buttons", buttonsjson);
-            if (hasIcon && isPicture) {
-                json.put("icon", pic);
-            }
-            return json;
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
     public static JSONObject menu(JSONObject orig) throws JSONException {
         var Special = orig.optJSONArray("special");
         var Main = orig.getJSONArray("main");
@@ -426,8 +253,4 @@ public class JsonInjectors {
 
         return json;
     }
-
-    public static boolean haveDonateButton() {
-        return hasVerification() || new Random().nextInt(6) != 1;
-    }
 }

app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java

@@ -11,6 +11,7 @@ import android.os.Build;
 
 import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
+import ru.vtosters.lite.ssfs.UsersList;
 import ru.vtosters.lite.ui.dialogs.DisableBattery;
 import ru.vtosters.lite.ui.dialogs.InstallGMS;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
@@ -21,6 +22,7 @@ public class MainActivityInjector {
     public static void inject(Activity activity) {
         setNeededTheme(activity);
         sendRequest();
+        UsersList.getUsersList();
         if (checkupdates()) OTADialog.checkUpdates(activity);
         VTExecutors.getIoScheduler().a(DeletedMessagesHandler::reloadMessagesList); // ioScheduler
         Start.alert(activity);

app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java

@@ -189,7 +189,7 @@ public class PhotoViewer {
     private static void searchDialog(Context context, String url) {
         if (selectedEngine() == 0) {
             var items = new String[]{
-                    "Google", "Yandex", "Bing", "TraceMoe", "Ascii2d", "Saucenao"
+                    "Yandex", "Google", "Bing", "TraceMoe", "Ascii2d", "Saucenao"
             };
 
             new VkAlertDialog.Builder(context)
@@ -207,6 +207,11 @@ public class PhotoViewer {
     }
 
     private static void searchPhoto(int i, String url) {
+        if (url == null || url.isEmpty()) {
+            Log.d("PhotoViewer", "url is null or empty");
+            return;
+        }
+
         switch (i) {
             case 1:
                 searchWithYandex(url);
@@ -230,7 +235,6 @@ public class PhotoViewer {
     }
 
     private static void searchPhoto(String url) {
-        if (url == null || url.isEmpty()) return;
         searchPhoto(selectedEngine(), url);
     }
 

app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java

@@ -45,7 +45,7 @@ public class CatalogJsonInjector {
         var useOldAppVer = getBoolValue("useOldAppVer", false);
         var isUsersCatalog = oldItems.optJSONObject(0).optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
 
-        if (oldItems != null && isUsersCatalog) {
+        if (isUsersCatalog) {
             var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
 
             if (!useOldAppVer) {
@@ -93,19 +93,6 @@ public class CatalogJsonInjector {
                     oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
                 }
 
-                var recent = fetchCatalogId("https://vk.com/audio?section=recent");
-                if (recent != null) {
-                    var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
-
-                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-                }
-
                 for (int i = 0; i < oldItems.length(); i++) {
                     var item = oldItems.optJSONObject(i);
                     var title = item.optString("title");

app/src/main/java/ru/vtosters/lite/ssfs/Handler.java

@@ -0,0 +1,39 @@
+package ru.vtosters.lite.ssfs;
+
+import android.util.Log;
+import okhttp3.Request;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+
+import java.io.IOException;
+
+public class Handler {
+    private static final String TAG = "SSFSHandler";
+
+    public static JSONObject getBanner(int id) {
+        Request request = new Request.a()
+                .b(Utils.getDomain() + "/api/getChatBanner" + "?user_id=" + id)
+                .a();
+
+        try {
+            return new JSONObject(VtOkHttpClient.getInstance().a(request).execute().a().g()).getJSONObject("response");
+        } catch (JSONException | IOException e) {
+            Log.d(TAG, e.getMessage());
+            return null;
+        }
+    }
+
+    public static String getDescription(int id) {
+        Request request = new Request.a()
+                .b(Utils.getDomain() + "/api/getServiceDescription" + "?user_id=" + id)
+                .a();
+
+        try {
+            return new JSONObject(VtOkHttpClient.getInstance().a(request).execute().a().g()).getString("response");
+        } catch (JSONException | IOException e) {
+            Log.d(TAG, e.getMessage());
+            return null;
+        }
+    }
+}

app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java

@@ -0,0 +1,86 @@
+package ru.vtosters.lite.ssfs;
+
+import android.util.Log;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.lite.utils.LifecycleUtils;
+import ru.vtosters.lite.utils.Preferences;
+
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+public class ImBanner {
+    private static final String TAG = "ImBanner";
+
+    public static JSONObject convBar(JSONObject orig) throws JSONException {
+        var user_id = orig.getJSONObject("peer").getInt("id");
+
+        if (!UsersList.hasBanner(user_id) || user_id == 0) {
+            if (getBoolValue("convBarRecomm", false)) {
+                return null;
+            } else {
+                return orig.optJSONObject("conversation_bar");
+            }
+        }
+
+        try {
+            var jsonBanner = Handler.getBanner(user_id);
+            var pic = jsonBanner.optString("picture");
+            var text = jsonBanner.getString("text");
+
+            var link = jsonBanner.optString("link");
+            var link_text = jsonBanner.optString("link_text");
+
+            var hasIcon = !pic.isEmpty();
+            var hasButton = !link.isEmpty();
+            var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
+
+            var json = new JSONObject();
+
+            var buttonsJson = new JSONObject();
+            buttonsJson.put("layout", "tertiary");
+            buttonsJson.put("text", link_text);
+            buttonsJson.put("type", "link");
+            buttonsJson.put("link", link);
+
+            var buttons = new JSONArray(); // max 3 buttons in array
+
+            if (hasButton) buttons.put(buttonsJson);
+
+            json.put("name", "group_admin_welcome");
+            json.put("text", text);
+            json.put("buttons", buttons);
+
+            if (hasIcon && isPicture) {
+                json.put("icon", pic);
+            }
+
+            return json;
+        } catch (JSONException e) {
+            Log.d(TAG, e.getMessage());
+            return null;
+        }
+    }
+
+    public static boolean showAlert() {
+        var context = LifecycleUtils.getCurrentActivity();
+        var bool = Preferences.getBoolValue("linkalert", false);
+
+        if (!bool) {
+            new VkAlertDialog.Builder(context)
+                    .setTitle("Внимание!")
+                    .setMessage("Разработчики клиента не несут никакой ответственности за пользовательские ссылки. Будьте внимательны!")
+                    .setCancelable(false)
+                    .setPositiveButton("Продолжить", (dialogInterface, i) -> {
+                        Preferences.preferences.edit().putBoolean("linkalert", true).commit();
+                    })
+                    .setNeutralButton("Отмена", (dialogInterface, i) -> {
+                        dialogInterface.cancel();
+                    })
+                    .show();
+        }
+
+        return bool;
+    }
+}

app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java

@@ -0,0 +1,98 @@
+package ru.vtosters.lite.ssfs;
+
+import android.util.Log;
+import com.vk.core.util.LangUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.VTVerifications;
+
+import java.util.HashMap;
+
+import static ru.vtosters.lite.proxy.ProxyUtils.getStatic;
+
+public class ProfileButtons {
+    private static final String TAG = "ProfileButtons";
+
+    public static JSONObject profileButton(JSONObject orig) {
+        try {
+            int id = orig.getInt("id");
+
+            var newItem = new JSONArray();
+
+            if (orig.has("buttons")) {
+                newItem = orig.getJSONArray("buttons");
+            }
+
+            if (!VTVerifications.haveDonateButton() && id == AccountManagerUtils.getUserId()) {
+                var map = new HashMap<>();
+                map.put("20", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/20.png");
+                map.put("40", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/40.png");
+                map.put("80", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/80.png");
+
+                newItem.put(generateJsonObject(
+                        AndroidUtils.getString(com.vtosters.lite.R.string.donate_to_vtl),
+                        "https://vk.com/vtosters_official",
+                        "2D81E0",
+                        "open_url",
+                        map
+                ));
+            }
+
+            if (!orig.has("type") && AccountManagerUtils.isVKTester()) {
+                var map = new HashMap<>();
+                map.put("20", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/bug_icon/20.png");
+                map.put("40", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/bug_icon/40.png");
+                map.put("80", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/bug_icon/80.png");
+
+                newItem.put(generateJsonObject(
+                        AndroidUtils.getString(com.vtosters.lite.R.string.tester_profile),
+                        "https://" + getStatic() + "/bugs?lang=" + LangUtils.a() + "#/reporter" + id,
+                        "2D81E0",
+                        "open_internal_vkui",
+                        map
+                ));
+            }
+
+            orig.put("buttons", newItem);
+        } catch (JSONException e) {
+            Log.d(TAG, e.getMessage());
+        }
+
+        return orig;
+    }
+
+    public static JSONObject generateJsonObject(String title, String link, String text_color, String url_type, HashMap<Object, Object> iconsList) {
+        try {
+            var json = new JSONObject();
+            var icons = new JSONArray();
+
+            var action = new JSONObject().put("target", "internal");
+            action.put("type", url_type); // may be open_url, open_internal_vkui, open_game, help_hint, show_full_post, open_vkapp, show_recommendations_for_post and groups_advertisement
+            action.put("url", link);
+            json.put("action", action);
+
+            json.put("title", title);
+
+            for (var entry : iconsList.entrySet()) {
+                var icon = new JSONObject();
+                icon.put("url", entry.getValue());
+                icon.put("width", entry.getKey());
+                icon.put("height", entry.getKey());
+                icons.put(icon);
+            }
+
+            json.put("icons", icons);
+
+            json.put("text_color", text_color);
+
+            return json;
+        } catch (JSONException e) {
+            Log.d(TAG, e.getMessage());
+        }
+
+        return null;
+    }
+}

app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java

@@ -0,0 +1,42 @@
+package ru.vtosters.lite.ssfs;
+
+import android.text.TextUtils;
+import android.util.Log;
+import com.vk.profile.presenter.UserPresenter;
+import com.vtosters.lite.api.ExtendedUserProfile;
+import org.json.JSONObject;
+
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserID;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+
+public class ProfileHider {
+    private static final String TAG = "ProfileHider";
+
+    public static boolean isService(Integer id) {
+        return UsersList.hasDescription(id) || id == 100 || id == 101 || id == 333;
+    }
+
+    public static void fetchInfo(ExtendedUserProfile extendedUserProfile, JSONObject jsonObject) {
+        int userID = getUserID(extendedUserProfile);
+
+        if (UsersList.hasDescription(userID)) {
+            try {
+                extendedUserProfile.z2 = Handler.getDescription(userID);
+            } catch (NullPointerException e) {
+                Log.e(TAG, "null \"profiles\" node\n" + e);
+            }
+        }
+    }
+
+    public static String getInfo(ExtendedUserProfile extendedUserProfile) {
+        int userID = getUserID(extendedUserProfile);
+        if (UsersList.hasDescription(userID)) {
+            if (!TextUtils.isEmpty(extendedUserProfile.z2)) {
+                return extendedUserProfile.z2;
+            } else {
+                return Handler.getDescription(userID);
+            }
+        }
+        return getGlobalContext().getString(UserPresenter.q0.a(userID));
+    }
+}

app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java

@@ -0,0 +1,81 @@
+package ru.vtosters.lite.ssfs;
+
+import android.util.Log;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.NetworkUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static ru.vtosters.lite.utils.Preferences.dev;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+public class UsersList {
+    private static final String TAG = "UsersList";
+    private static final List<Integer> descriptionsList = new ArrayList<>();
+    private static final List<Integer> bannersList = new ArrayList<>();
+
+    public static void getUsersList() {
+        var prefs = AndroidUtils.getGlobalContext().getSharedPreferences("vt_another_data", 0);
+
+        if ((!NetworkUtils.isNetworkConnected() || getBoolValue("isRoamingState", false)) && prefs.contains("ids")) {
+            return;
+        }
+
+        Request request = new Request.a()
+                .b(Utils.getDomain() + "/api/getUsersWithServiceDescriptionsAndBanners")
+                .a();
+
+        VtOkHttpClient.getInstance().a(request).a(new Callback() {
+            @Override
+            public void a(Call call, IOException e) {
+                Log.d(TAG, e.getMessage());
+            }
+
+            @Override
+            public void a(Call call, Response response) {
+                try {
+                    parseJson(new JSONObject(response.a().g()).getJSONObject("response"));
+                } catch (JSONException | IOException e) {
+                    Log.d(TAG, e.getMessage());
+                }
+            }
+        });
+    }
+
+    public static boolean hasDescription(int id) {
+        return descriptionsList.contains(id) && id != AccountManagerUtils.getUserId();
+    }
+
+    public static boolean hasBanner(int id) {
+        return bannersList.contains(id) && id != AccountManagerUtils.getUserId();
+    }
+
+    static void parseJson(JSONObject json) throws JSONException {
+        var idsDescription = json.getJSONArray("with_service_descriptions");
+        var idsBanner = json.getJSONArray("with_chat_banners");
+
+        if (dev()) {
+            Log.d(TAG, idsDescription.toString());
+            Log.d(TAG, idsBanner.toString());
+        }
+
+        processIds(idsBanner, bannersList);
+        processIds(idsDescription, descriptionsList);
+    }
+
+    static void processIds(JSONArray jsonIds, List<Integer> member) {
+        for (int i = 0; i < jsonIds.length(); i++)
+            member.add(jsonIds.optInt(i));
+    }
+}

app/src/main/java/ru/vtosters/lite/ssfs/Utils.java

@@ -0,0 +1,29 @@
+package ru.vtosters.lite.ssfs;
+
+import com.vk.core.network.Network;
+import ru.vtosters.lite.hooks.DateHook;
+import ru.vtosters.lite.proxy.ProxyUtils;
+import ru.vtosters.lite.utils.*;
+
+public class Utils {
+    public static String getVKUILink() {
+        return getDomain() +
+                "?token=" + AccountManagerUtils.getUserToken() +
+                "&vt_dark=" + (ThemesUtils.isDarkTheme() ? "1" : "0") +
+                "&vt_amoled=" + (ThemesUtils.isAmoledTheme() && ThemesUtils.isDarkTheme() ? "1" : "0") +
+                "&secret=" + AccountManagerUtils.getUserSecret() +
+                "&proxy=" + (ProxyUtils.isAnyProxyEnabled() ? "1" : "0") +
+                "&lang=" + DateHook.getLocale() +
+                "&vt=1" +
+                "&useragent=" + Base64Utils.encodeValue(Base64Utils.encode(Network.l.c().a())) +
+                "&vt_debug=" + (Preferences.dev() ? "1" : "0");
+    }
+
+    public static String getDomain() {
+        String string = AndroidUtils.getPrefsValue("ssfscustom");
+
+        if (!string.isEmpty()) return string;
+
+        return "https://ssfs.vtosters.app";
+    }
+}

app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java

@@ -1,10 +1,7 @@
 package ru.vtosters.lite.tgs;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-
 import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.dto.common.Attachment;
@@ -15,15 +12,15 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.attachments.PendingGraffitiAttachment;
 import com.vtosters.lite.im.AppAttachToImAttachConverter;
 import com.vtosters.lite.upload.Upload;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.util.List;
 import java.util.Stack;
 
-import ru.vtosters.lite.utils.AndroidUtils;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class TGRoot {
     public static final int N = 76820000;
@@ -101,7 +98,7 @@ public class TGRoot {
         }
     }
 
-    private static StickerStockItem toStickerPack(TelegramStickersPack p) throws JSONException {
+    public static StickerStockItem toStickerPack(TelegramStickersPack p) throws JSONException {
         JSONArray arr = new JSONArray();
 
         for (int j = 0; j < p.stickersCount; j++)

app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java

@@ -22,7 +22,8 @@ public class ThemesCore {
     public static SparseBooleanArray ACCENT_THEME_ONLY_MILK_DARK = new SparseBooleanArray();
 
     private static boolean cachedAccents = false;
-    private static int wallLightColor;
+    private static int outgoinging_msg;
+    private static int outgoinging_msg_highlight;
 
     static {
         setExceptions();
@@ -136,7 +137,8 @@ public class ThemesCore {
         themedColors.put(R.attr.im_reply_separator, accentColor);
         themedColors.put(R.attr.im_text_name, accentColor);
 
-        wallLightColor = ThemesUtils.lighten(accentColor, 0.76f);
+        outgoinging_msg = ThemesUtils.lighten(accentColor, 0.76f);
+        outgoinging_msg_highlight = ThemesUtils.lighten(accentColor, 0.5f);
 
         themedColors.put(R.attr.im_ic_send_msg, accentColor);
         themedColors.put(R.attr.im_bubble_wallpaper_outgoing, accentColor);
@@ -145,8 +147,10 @@ public class ThemesCore {
     }
 
     public static int getThemedAttr(Context context, @IdRes int attr) {
-        if (attr == R.attr.im_bubble_wallpaper_outgoing || attr == R.attr.im_bubble_outgoing || attr == R.attr.im_bubble_outgoing_highlighted) {
-            return wallLightColor;
+        if (attr == R.attr.im_bubble_wallpaper_outgoing || attr == R.attr.im_bubble_outgoing) {
+            return outgoinging_msg;
+        } else if (attr == R.attr.im_bubble_outgoing_highlighted) {
+            return outgoinging_msg_highlight;
         }
 
         return themedColors.get(attr);

app/src/main/java/ru/vtosters/lite/themes/palettes/PalettesManager.java

@@ -46,7 +46,7 @@ public class PalettesManager {
             PALETTES_DIR.mkdirs();
 
         if (Build.VERSION.SDK_INT >= 23 && !Environment.getExternalStorageDirectory().canWrite()) {
-            makeText(getGlobalContext(), "Не выдано разрешение на запись и чтение файлов", Toast.LENGTH_LONG).show();
+            makeText(getGlobalContext(), AndroidUtils.getString("cannot_write"), Toast.LENGTH_LONG).show();
             LifecycleUtils.getCurrentActivity().requestPermissions(new String[]{"android.permission.WRITE_EXTERNAL_STORAGE"}, 228);
             return;
         }

app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java

@@ -0,0 +1,340 @@
+package ru.vtosters.lite.ui;
+
+import android.graphics.drawable.Drawable;
+import android.preference.PreferenceManager;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vtosters.lite.ui.MaterialSwitchPreference;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.ImageUtils;
+import ru.vtosters.lite.utils.ThemesUtils;
+
+public class PreferenceFragmentUtils {
+
+    public static ListPreference addListPreference(
+            PreferenceScreen screen,
+            String key,
+            String def,
+            int titleRes,
+            CharSequence[] entries,
+            CharSequence[] entriesValue
+    ) {
+        return addListPreference(screen, key, def, titleRes, 0, 0, entries, entriesValue, null);
+    }
+
+    public static ListPreference addListPreference(
+            PreferenceScreen screen,
+            String key,
+            String def,
+            CharSequence title,
+            CharSequence[] entries,
+            CharSequence[] entriesValue
+    ) {
+        return addListPreference(screen, key, def, title, null, "", entries, entriesValue, null);
+    }
+
+    // change icon accent color
+    public static ListPreference addListPreference(
+            PreferenceScreen screen,
+            String key,
+            String def,
+            int titleRes,
+            int iconRes,
+            int summaryRes,
+            CharSequence[] entries,
+            CharSequence[] entriesValue,
+            Preference.OnPreferenceChangeListener listener
+    ) {
+        var icon = iconRes > 0 
+                ? ImageUtils.setTint(screen.getContext(), ContextCompat.getDrawable(screen.getContext(), iconRes)) 
+                : null;
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        var summary = summaryRes > 0
+                ? screen.getContext().getString(summaryRes)
+                : "";
+        return addListPreference(screen, key, def, title, icon, summary, entries, entriesValue, listener);
+    }
+
+    // change icon accent color
+    public static ListPreference addListPreference(
+            PreferenceScreen screen,
+            String key,
+            String def,
+            CharSequence title,
+            int iconRes,
+            CharSequence summary,
+            CharSequence[] entries,
+            CharSequence[] entriesValue,
+            Preference.OnPreferenceChangeListener listener
+    ) {
+        var icon = iconRes > 0
+                ? ImageUtils.setTint(screen.getContext(), ContextCompat.getDrawable(screen.getContext(), iconRes))
+                : null;
+        return addListPreference(screen, key, def, title, icon, summary, entries, entriesValue, listener);
+    }
+
+    public static ListPreference addListPreference(
+        PreferenceScreen screen,
+        String key,
+        String def,
+        CharSequence title,
+        @Nullable Drawable icon,
+        CharSequence summary,
+        CharSequence[] entries,
+        CharSequence[] entriesValue,
+        Preference.OnPreferenceChangeListener listener
+    ) {
+        ListPreference preference = new ListPreference(screen.getContext());
+        preference.setEntries(entries);
+        preference.setEntryValues(entriesValue);
+        preference.setSummary(summary);
+        preference.setTitle(title);
+        preference.setDialogTitle(title);
+        preference.setKey(key);
+        preference.setDefaultValue(def);
+        preference.setValue(def);
+        preference.setOnPreferenceChangeListener(listener);
+
+        if (icon != null)
+            preference.setIcon(icon);
+
+        screen.addPreference(preference);
+
+        return preference;
+    }
+
+    public static MaterialSwitchPreference addMaterialSwitchPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary,
+            boolean defValue
+    ) {
+        return addMaterialSwitchPreference(screen, key, title, summary, 0, defValue, null);
+    }
+
+    // change icon accent color
+    public static MaterialSwitchPreference addMaterialSwitchPreference(
+            PreferenceScreen screen,
+            String key,
+            int titleRes,
+            int summaryRes,
+            int iconRes,
+            boolean defValue,
+            Preference.OnPreferenceChangeListener listener
+    ) {
+        var icon = iconRes > 0
+                ? ImageUtils.setTint(screen.getContext(), ContextCompat.getDrawable(screen.getContext(), iconRes))
+                : null;
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        var summary = summaryRes > 0
+                ? screen.getContext().getString(summaryRes)
+                : "";
+        return addMaterialSwitchPreference(screen, key, title, summary, icon, defValue, listener);
+    }
+
+    // change icon accent color
+    public static MaterialSwitchPreference addMaterialSwitchPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary,
+            int iconRes,
+            boolean defValue,
+            Preference.OnPreferenceChangeListener listener
+    ) {
+        var icon = iconRes > 0 
+                ? ImageUtils.setTint(screen.getContext(), ContextCompat.getDrawable(screen.getContext(), iconRes)) 
+                : null;
+        return addMaterialSwitchPreference(screen, key, title, summary, icon, defValue, listener);
+    }
+
+    public static MaterialSwitchPreference addMaterialSwitchPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary,
+            @Nullable Drawable icon,
+            boolean defValue,
+            Preference.OnPreferenceChangeListener listener
+    ) {
+        MaterialSwitchPreference preference = new MaterialSwitchPreference(screen.getContext());
+        preference.setTitle(title);
+        preference.setSummary(summary);
+        preference.setKey(key);
+        preference.setDefaultValue(defValue);
+
+        if (icon != null)
+            preference.setIcon(icon);
+        preference.setOnPreferenceChangeListener(listener);
+
+        screen.addPreference(preference);
+
+        return preference;
+    }
+
+    public static Preference addPreference(
+            PreferenceScreen screen,
+            String key,
+            int titleRes,
+            int summaryRes
+    ) {
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        var summary = summaryRes > 0
+                ? screen.getContext().getString(summaryRes)
+                : "";
+        return addPreference(screen, key, title, summary, null, null);
+    }
+
+    public static Preference addPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary
+    ) {
+        return addPreference(screen, key, title, summary, null, null);
+    }
+
+    // change icon accent color
+    public static Preference addPreference(
+            PreferenceScreen screen,
+            String key,
+            int titleRes,
+            int summaryRes,
+            int iconRes,
+            Preference.OnPreferenceClickListener listener) {
+        var icon = iconRes > 0
+                ? ImageUtils.setTint(screen.getContext(), screen.getContext().getDrawable(iconRes))
+                : null;
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        var summary = summaryRes > 0
+                ? screen.getContext().getString(summaryRes)
+                : "";
+        return addPreference(screen, key, title, summary, icon, listener);
+    }
+
+    // change icon accent color
+    public static Preference addPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary,
+            int iconRes,
+            Preference.OnPreferenceClickListener listener) {
+        var icon = iconRes > 0
+                ? ImageUtils.setTint(screen.getContext(), screen.getContext().getDrawable(iconRes))
+                : null;
+        return addPreference(screen, key, title, summary, icon, listener);
+    }
+
+    public static Preference addPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            CharSequence summary,
+            @Nullable Drawable icon,
+            Preference.OnPreferenceClickListener listener
+    ) {
+        Preference preference = new Preference(screen.getContext());
+        preference.setSummary(summary);
+        preference.setTitle(title);
+        preference.setKey(key);
+
+        if (icon != null)
+            preference.setIcon(icon);
+        preference.setOnPreferenceClickListener(listener);
+
+        screen.addPreference(preference);
+
+        return preference;
+    }
+
+    public static PreferenceCategory addPreferenceCategory(PreferenceScreen screen, int titleRes) {
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        return addPreferenceCategory(screen, title);
+    }
+
+    public static PreferenceCategory addPreferenceCategory(PreferenceScreen screen, CharSequence title) {
+        PreferenceCategory preference = new PreferenceCategory(screen.getContext(), null);
+        preference.setTitle(title);
+        screen.addPreference(preference);
+
+        return preference;
+    }
+
+    public static Preference addEditTextPreference(
+            PreferenceScreen screen,
+            String key,
+            int titleRes,
+            onPreferenceTextValueChangeListener editTextPrefChangeListener
+    ) {
+        var title = titleRes > 0
+                ? screen.getContext().getString(titleRes)
+                : "";
+        return addEditTextPreference(screen, key, title, editTextPrefChangeListener);
+    }
+
+    public static Preference addEditTextPreference(
+            PreferenceScreen screen,
+            String key,
+            CharSequence title,
+            onPreferenceTextValueChangeListener editTextPrefChangeListener
+    ) {
+        return addPreference(screen, key, title, null, null, preference -> {
+            LinearLayout linearLayout = new LinearLayout(screen.getContext());
+
+            final EditText editText = new EditText(screen.getContext());
+            editText.setText(PreferenceManager.getDefaultSharedPreferences(screen.getContext()).getString(key, ""));
+            editText.setHint(title);
+            editText.setTextColor(ThemesUtils.getTextAttr());
+            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(AndroidUtils.dp2px(20f), 0, AndroidUtils.dp2px(20f), 0);
+            editText.setLayoutParams(margin);
+
+            new VkAlertDialog.Builder(screen.getContext())
+                    .setTitle(title)
+                    .setView(linearLayout)
+                    .setPositiveButton("OK", (dialog, which) -> {
+                        boolean change = editTextPrefChangeListener.onChanged(preference, editText.getText().toString());
+                        if (!change)
+                            return;
+
+                        PreferenceManager.getDefaultSharedPreferences(screen.getContext())
+                                .edit()
+                                .putString(key, editText.getText().toString())
+                                .apply();
+                    })
+                    .show();
+
+            return false;
+        });
+    }
+
+    public interface onPreferenceTextValueChangeListener {
+        boolean onChanged(Preference preference, String newValue);
+    }
+}

app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java

@@ -1,274 +0,0 @@
-package ru.vtosters.lite.ui;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.preference.PreferenceManager;
-import android.util.TypedValue;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-import com.vtosters.lite.ui.MaterialSwitchPreference;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.ImageUtils;
-import ru.vtosters.lite.utils.ThemesUtils;
-
-public class PreferencesUtil {
-
-    public static void addListPreference(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            String def,
-            CharSequence title,
-            CharSequence[] entries,
-            CharSequence[] entriesValue
-    ) {
-        ListPreference preference = new ListPreference(fragment.requireContext());
-        preference.setEntries(entries);
-        preference.setEntryValues(entriesValue);
-        preference.setTitle(title); // setTitle
-        preference.setDialogTitle(title); // setDialogTitle
-        preference.setKey(key); // setKey
-        preference.setDefaultValue(def); // setDefaultValue
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addListPreferenceIcon(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            String def,
-            CharSequence title,
-            int iconRes,
-            CharSequence summary,
-            CharSequence[] entries,
-            CharSequence[] entriesValue,
-            Preference.OnPreferenceChangeListener listener
-    ) {
-        ListPreference preference = new ListPreference(fragment.requireContext());
-        preference.setEntries(entries);
-        preference.setEntryValues(entriesValue);
-        preference.setSummary(summary); // setSummary
-        preference.setTitle(title); // setTitle
-        preference.setDialogTitle(title); // setDialogTitle
-        preference.setKey(key); // setKey
-        preference.setDefaultValue(def); // setDefaultValue
-        preference.setValue(def);
-        preference.setOnPreferenceChangeListener(listener);
-
-        if (iconRes != 0)
-            preference.setIcon(ImageUtils.setTint(fragment.requireContext(), getDrawable(fragment.requireContext(), iconRes))); // preference.setIcon
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addMaterialSwitchPreference(
-            MaterialPreferenceToolbarFragment materialPreferenceToolbarFragment,
-            String key,
-            CharSequence title,
-            CharSequence summary,
-            boolean defValue
-    ) {
-        MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(materialPreferenceToolbarFragment.requireContext());
-        materialSwitchPreference.setTitle(title); // setTitle
-        materialSwitchPreference.setSummary(summary); // setSummary
-        materialSwitchPreference.setKey(key); // setKey
-        materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue
-
-        materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference)
-    }
-
-//    public static void addMaterialSwitchPreference(
-//            MaterialPreferenceToolbarFragment fragment,
-//            String key,
-//            CharSequence title,
-//            CharSequence summary,
-//            int iconRes,
-//            boolean defValue,
-//            Preference.OnPreferenceChangeListener listener
-//    ) {
-//        MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(fragment.requireContext());
-//        materialSwitchPreference.setTitle(title); // setTitle
-//        materialSwitchPreference.setSummary(summary); // setSummary
-//        materialSwitchPreference.setKey(key); // setKey
-//        materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue
-//        materialSwitchPreference.setOnPreferenceChangeListener(listener); // setOnPreferenceClickListener
-//
-//        if (iconRes != 0)
-//            materialSwitchPreference.setIcon(setTint(fragment.requireContext(), Objects.requireNonNull(ContextCompat.getDrawable(fragment.requireContext(), iconRes)))); // preference.setIcon
-//
-//        fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference)
-//    }
-
-    public static void addMaterialSwitchPreference(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            CharSequence title,
-            CharSequence summary,
-            int iconRes,
-            boolean defValue,
-            Preference.OnPreferenceChangeListener listener
-    ) {
-        MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(fragment.requireContext());
-        materialSwitchPreference.setTitle(title); // setTitle
-        materialSwitchPreference.setSummary(summary); // setSummary
-        materialSwitchPreference.setKey(key); // setKey
-        materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue
-        fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference)
-
-        if (iconRes != 0)
-            materialSwitchPreference.setIcon(ImageUtils.setTint(fragment.requireContext(), getDrawable(fragment.requireContext(), iconRes))); // preference.setIcon
-        materialSwitchPreference.setOnPreferenceChangeListener(listener); // setOnPreferenceClickListener(listener)
-
-        fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreference(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            CharSequence title,
-            CharSequence summary
-    ) {
-        Preference preference = new Preference(fragment.requireContext());
-        preference.setSummary(summary); // setSummary
-        preference.setTitle(title); // setTitle
-        preference.setKey(key); // setKey
-
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreference(
-            MaterialPreferenceToolbarFragment fragment,
-            CharSequence title,
-            CharSequence summary,
-            int iconRes,
-            Preference.OnPreferenceClickListener listener
-    ) {
-        Preference preference = new Preference(fragment.requireContext());
-        preference.setSummary(summary); // setSummary
-        preference.setTitle(title); // setTitle
-
-        if (iconRes != 0)
-            preference.setIcon(ImageUtils.setTint(fragment.requireContext(), getDrawable(fragment.requireContext(), iconRes))); // preference.setIcon
-        preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener)
-
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreference(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            CharSequence title,
-            CharSequence summary,
-            int iconRes,
-            Preference.OnPreferenceClickListener listener) {
-        Preference preference = new Preference(fragment.requireContext());
-        preference.setSummary(summary); // setSummary
-        preference.setTitle(title); // setTitle
-        preference.setKey(key); // setKey
-
-        if (iconRes != 0)
-            preference.setIcon(ImageUtils.setTint(fragment.requireContext(), getDrawable(fragment.requireContext(), iconRes))); // preference.setIcon
-        preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener)
-
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreferenceDrawable(
-            MaterialPreferenceToolbarFragment fragment,
-            String key,
-            CharSequence title,
-            CharSequence summary,
-            @Nullable Drawable icon,
-            Preference.OnPreferenceClickListener listener
-    ) {
-        Preference preference = new Preference(fragment.requireContext());
-        preference.setSummary(summary); // setSummary
-        preference.setTitle(title); // setTitle
-        preference.setKey(key); // setKey
-
-        if (icon != null)
-            preference.setIcon(icon); // preference.setIcon
-        preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener)
-
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title) {
-        PreferenceCategory preference = new PreferenceCategory(fragment.requireContext(), null);
-        preference.setTitle(title); // setTitle
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title, int collapsedSize) {
-        PreferenceCategory preference = new PreferenceCategory(fragment.requireContext(), null);
-        preference.setTitle(title); // setTitle
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static void addEditTextPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, EditTextPrefChangeListener editTextPrefChangeListener) {
-        Preference preference = new Preference(fragment.requireContext());
-
-        preference.setTitle(title); // setTitle
-        preference.setKey(key);  // setKey
-        preference.setOnPreferenceClickListener(preference1 -> {
-            LinearLayout linearLayout = new LinearLayout(fragment.requireContext());
-
-            final EditText editText = new EditText(fragment.requireContext());
-            editText.setText(PreferenceManager.getDefaultSharedPreferences(fragment.requireContext()).getString(key, ""));
-            editText.setHint(title);
-            editText.setTextColor(ThemesUtils.getTextAttr());
-            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(AndroidUtils.dp2px(20f), 0, AndroidUtils.dp2px(20f), 0);
-            editText.setLayoutParams(margin);
-
-            new VkAlertDialog.Builder(fragment.getContext())
-                    .setTitle(title)
-                    .setView(linearLayout)
-                    .setPositiveButton("OK", (dialog, which) -> {
-                        boolean change = editTextPrefChangeListener.onChanged(preference, editText.getText().toString());
-                        if (!change)
-                            return;
-
-                        PreferenceManager.getDefaultSharedPreferences(fragment.requireContext())
-                                .edit()
-                                .putString(key, editText.getText().toString())
-                                .apply();
-                    })
-                    .show();
-            return false;
-        }); // preference.setOnPreferenceClickListener(listener)
-
-        fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference)
-    }
-
-    public static int getTextColor(Context ctx) {
-        TypedValue typedValue = new TypedValue();
-        ctx.getTheme().resolveAttribute(ThemesUtils.getTextAttr(), typedValue, true);
-        return typedValue.data;
-    }
-
-    public static int getSTextColor(Context ctx) {
-        TypedValue typedValue = new TypedValue();
-        ctx.getTheme().resolveAttribute(ThemesUtils.getSTextAttr(), typedValue, true);
-        return typedValue.data;
-    }
-
-    private static Drawable getDrawable(Context ctx, int drawableRes) {
-        return ContextCompat.getDrawable(ctx, drawableRes);
-    }
-
-    public interface EditTextPrefChangeListener {
-        boolean onChanged(Preference preference, Object obj);
-    }
-}

app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java

@@ -1,8 +1,5 @@
 package ru.vtosters.lite.ui.adapters;
 
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.view.Gravity;
@@ -12,20 +9,21 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.vtosters.lite.R;
+import ru.vtosters.lite.ui.components.IItemMovingListener;
+import ru.vtosters.lite.utils.LayoutUtils;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import ru.vtosters.lite.ui.components.IItemMovingListener;
-import ru.vtosters.lite.utils.ThemesUtils;
+import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
-public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.CategorizedViewHolder> implements IItemMovingListener {
+public class CategorizedAdapter< T > extends RecyclerView.Adapter< CategorizedAdapter.CategorizedViewHolder > implements IItemMovingListener {
 
     // Adapter item types
     public static final int MOVING_ITEM = -0x1;
@@ -35,18 +33,20 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
     public static final int SELECTED_STATE = -0x1;
     public static final int DISABLED_STATE = -0x2;
 
-    private final List mSelectedItems;
-    private final List mDisabledItems;
-    private final List mUnmovedItems;
+    // Data of items
+    private final List< T > mSelectedItems;
+    private final List< T > mDisabledItems;
+    private final List< T > mUnmovedItems;
     private final IViewHolderBinder mBinder;
 
+    // Min and max counts
     private int mMinSelectedItems = -1;
     private int mMaxSelectedItems = -1;
 
-    public CategorizedAdapter(List selectedItems, List disabledItems, IViewHolderBinder binder) {
+    public CategorizedAdapter(List< T > selectedItems, List< T > disabledItems, IViewHolderBinder binder) {
         this.mSelectedItems = selectedItems;
         this.mDisabledItems = disabledItems;
-        this.mUnmovedItems = new ArrayList();
+        this.mUnmovedItems = new ArrayList<>();
         this.mBinder = binder;
     }
 
@@ -55,7 +55,7 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
         this.mMaxSelectedItems = max;
     }
 
-    public void addUnmovedItem(Object item) {
+    public void addUnmovedItem(T item) {
         mUnmovedItems.add(item);
     }
 
@@ -68,31 +68,26 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
     }
 
     public boolean isUnmovedItem(int index) {
-        if (getItemViewType(index) == MOVING_ITEM) {
-            Object curr;
-            if (getTabType(index) == SELECTED_STATE) {
-                curr = mSelectedItems.get(index - 1);
-                return mUnmovedItems.contains(curr);
-            } else {
-                curr = mDisabledItems.get(index - mSelectedItems.size() - 2);
-                return mUnmovedItems.contains(curr);
-            }
-        }
-        return false;
+        return getItemViewType(index) == MOVING_ITEM
+                    && mUnmovedItems.contains(
+                            getTabType(index) == SELECTED_STATE
+                                    ? mSelectedItems.get(index - 1)
+                                    : mDisabledItems.get(index - mSelectedItems.size() - 2));
     }
 
     @NonNull
     @Override
     public CategorizedViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
         FrameLayout container = new FrameLayout(getGlobalContext());
-        container.addView(newCategoryTitle(), new FrameLayout.LayoutParams(-1, -2));
-        container.addView(newMovingItem(), new FrameLayout.LayoutParams(-1, -2));
+        container.addView(newCategoryTitle(), LayoutUtils.createFrame(-1, -2));
+        container.addView(newMovingItem(), LayoutUtils.createFrame(-1, -2));
+        container.setLayoutParams(LayoutUtils.createFrame(-1, -2));
         return new CategorizedViewHolder(container);
     }
 
     private View newMovingItem() {
-        LinearLayout container = new LinearLayout(getGlobalContext());
-        container.setTag("container");
+        var container = new LinearLayout(getGlobalContext());
+        container.setId(R.id.container);
         container.setGravity(Gravity.CENTER_VERTICAL);
         container.setOrientation(LinearLayout.HORIZONTAL);
         container.setPadding(
@@ -101,23 +96,23 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
                 dp2px(12),
                 dp2px(12)
         );
-        container.setLayoutParams(new LinearLayout.LayoutParams(-1, dp2px(48)));
+        container.setLayoutParams(LayoutUtils.createLinear(-1, dp2px(48)));
         container.setVisibility(View.INVISIBLE);
 
-        ImageView icon = new ImageView(getGlobalContext());
-        icon.setTag("icon");
+        var icon = new ImageView(getGlobalContext());
+        icon.setId(R.id.icon);
         icon.setImageTintList(ColorStateList.valueOf(ThemesUtils.getAccentColor()));
         icon.setLayoutParams(new LinearLayout.LayoutParams(
                 dp2px(24),
                 dp2px(24)));
         container.addView(icon);
 
-        TextView name = new TextView(getGlobalContext());
-        name.setTag("name");
+        var name = new TextView(getGlobalContext());
+        name.setId(R.id.name);
         name.setTextSize(16.0f);
         name.setTypeface(Typeface.DEFAULT_BOLD);
         name.setTextColor(ThemesUtils.getTextAttr());
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(-1, -2);
+        var params = LayoutUtils.createLinear(-1, -2);
         params.weight = 1;
         params.leftMargin = dp2px(16);
         container.addView(name, params);
@@ -126,13 +121,13 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
     }
 
     private View newCategoryTitle() {
-        LinearLayout container = new LinearLayout(getGlobalContext());
-        container.setTag("category_title_container");
-        container.setLayoutParams(new LinearLayout.LayoutParams(-1, -2));
+        var container = new LinearLayout(getGlobalContext());
+        container.setId(R.id.title_container);
+        container.setLayoutParams(LayoutUtils.createLinear(-1, -2));
         container.setVisibility(View.INVISIBLE);
 
-        TextView title = new TextView(getGlobalContext());
-        title.setTag("category_title");
+        var title = new TextView(getGlobalContext());
+        title.setId(R.id.title);
         title.setTextSize(13.0f);
         title.setPadding(
                 dp2px(16),
@@ -142,14 +137,14 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
         );
         title.setAllCaps(true);
         title.setTextColor(ThemesUtils.getTextAttr());
-        container.addView(title, new LinearLayout.LayoutParams(-2, -2));
+        container.addView(title, LayoutUtils.createLinear(-2, -2));
 
         return container;
     }
 
     @Override
     public void onBindViewHolder(@NonNull CategorizedViewHolder viewHolder, int i) {
-        if (getItemViewType(i) == MOVING_ITEM)
+        if(getItemViewType(i) == MOVING_ITEM)
             mBinder.bind(viewHolder, i);
         else
             viewHolder.bindCategory(i == 0);
@@ -162,57 +157,49 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
 
     @Override
     public void onItemDismiss(int index) {
-        if (getItemViewType(index) == MOVING_ITEM) {
-            Object curr;
-            if (getTabType(index) == SELECTED_STATE) {
-                curr = mSelectedItems.get(index - 1);
-                mSelectedItems.remove(curr);
-                mDisabledItems.add(0, curr);
-                notifyItemMoved(index, mSelectedItems.size() + 1);
+        if(getItemViewType(index) == MOVING_ITEM) {
+            int to;
+            if(getTabType(index) == SELECTED_STATE) {
+                mDisabledItems.add(0, mSelectedItems.remove(index - 1));
+                to = mSelectedItems.size() + 2;
             } else {
-                curr = mDisabledItems.get(index - mSelectedItems.size() - 2);
-                mDisabledItems.remove(curr);
-                mSelectedItems.add(0, curr);
-                notifyItemRemoved(index);
-                notifyItemInserted(1);
+                mSelectedItems.add(0, mDisabledItems.remove(index - mSelectedItems.size() - 2));
+                to = 1;
             }
+            notifyItemRemoved(index);
+            notifyItemInserted(to);
         }
     }
 
     @Override
     public boolean onItemMove(int fromPosition, int toPosition) {
-        if (toPosition == 0 || isUnmovedItem(toPosition))
+        if(toPosition == 0 || isUnmovedItem(toPosition))
             return false;
 
-        Object curr;
-        if (getTabType(fromPosition) == SELECTED_STATE) {
-            var min = mSelectedItems.size() == mMinSelectedItems;
-            if (getTabType(toPosition) == DISABLED_STATE && min)
-                return false;
-            curr = mSelectedItems.get(fromPosition - 1);
-            if (getItemViewType(toPosition) == CATEGORY_TITLE) {
-                if (min)
+        switch(getTabType(fromPosition)) {
+            case SELECTED_STATE:
+                if(getTabType(toPosition) == DISABLED_STATE
+                        && mSelectedItems.size() == mMinSelectedItems)
                     return false;
-                mSelectedItems.remove(fromPosition - 1);
-                mDisabledItems.add(0, curr);
-            } else {
-                Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
-            }
-        } else if (getTabType(fromPosition) == DISABLED_STATE) {
-            var max = mSelectedItems.size() == mMaxSelectedItems;
-            if (getTabType(toPosition) == SELECTED_STATE && max)
-                return false;
-            curr = mDisabledItems.get(fromPosition - mSelectedItems.size() - 2);
-            if (getItemViewType(toPosition) == CATEGORY_TITLE) {
-                if (max)
+                if(getItemViewType(toPosition) == CATEGORY_TITLE)
+                    mDisabledItems.add(0, mSelectedItems.remove(fromPosition - 1));
+                else
+                    Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
+                break;
+
+            case DISABLED_STATE:
+                if(getTabType(toPosition) == SELECTED_STATE
+                        && mSelectedItems.size() == mMaxSelectedItems)
                     return false;
-                mDisabledItems.remove(0);
-                mSelectedItems.add(curr);
-            } else {
-                Collections.swap(mDisabledItems,
-                        fromPosition - mSelectedItems.size() - 2,
-                        toPosition - mSelectedItems.size() - 2);
-            }
+                if(getItemViewType(toPosition) == CATEGORY_TITLE)
+                    mSelectedItems.add(mDisabledItems.remove(fromPosition - mSelectedItems.size() - 2));
+                else
+                    Collections.swap(
+                            mDisabledItems,
+                            fromPosition - mSelectedItems.size() - 2,
+                            toPosition - mSelectedItems.size() - 2
+                    );
+                break;
         }
 
         notifyItemMoved(fromPosition, toPosition);
@@ -235,17 +222,17 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
         public CategorizedViewHolder(View itemView) {
             super(itemView);
 
-            mMovingItemContainer = itemView.findViewWithTag("container");
-            mCategoryTitleContainer = itemView.findViewWithTag("category_title_container");
+            mMovingItemContainer = itemView.findViewById(R.id.container);
+            mCategoryTitleContainer = itemView.findViewById(R.id.title_container);
 
-            mIcon = mMovingItemContainer.findViewWithTag("icon");
-            mName = mMovingItemContainer.findViewWithTag("name");
+            mIcon = mMovingItemContainer.findViewById(R.id.icon);
+            mName = mMovingItemContainer.findViewById(R.id.name);
 
-            mCategoryTitle = mCategoryTitleContainer.findViewWithTag("category_title");
+            mCategoryTitle = mCategoryTitleContainer.findViewById(R.id.title);
         }
 
         public void bindMovingItem(int iconId, int textId) {
-            if (iconId != -1)
+            if(iconId != -1)
                 mIcon.setImageResource(iconId);
             else
                 mIcon.setVisibility(View.GONE);

app/src/main/java/ru/vtosters/lite/ui/adapters/MessagesPreviewAdapter.java

@@ -45,8 +45,7 @@ public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreview
 
         final var inflater = LayoutInflater.from(context);
 
-        final var bubbleFluidLayout = (BubbleFluidLayout) inflater
-                .inflate(R.layout.vkim_msg_list_item_msg_from_user, viewGroup, false);
+        final var bubbleFluidLayout = (BubbleFluidLayout) inflater.inflate(R.layout.vkim_msg_list_item_msg_from_user, viewGroup, false);
         bubbleFluidLayout.setPadding(0, AndroidUtils.dp2px(4), 0, 0);
         bubbleFluidLayout.setGravity(viewType);
 
@@ -61,8 +60,11 @@ public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreview
         messageBubbleView.setContentPaddingTop(AndroidUtils.dp2px(4));
         messageBubbleView.setContentPaddingRight(AndroidUtils.dp2px(4));
         messageBubbleView.setContentPaddingBottom(AndroidUtils.dp2px(0));
-        if (viewType == Gravity.END)
-            messageBubbleView.a(MsgBubbleStyle.b(false, false), MsgBubblePart.FULL, ThemesUtils.getAccentColor());
+        if (viewType == Gravity.END) {
+            messageBubbleView.a(MsgBubbleStyle.b(false, false), MsgBubblePart.FULL, ThemesUtils.isDarkTheme() ? ThemesUtils.getColorFromAttr(R.attr.im_bubble_outgoing) : ThemesUtils.lighten(ThemesUtils.getAccentColor(), 0.76f));
+        } else {
+            messageBubbleView.a(MsgBubbleStyle.b(false, false), MsgBubblePart.FULL, ThemesUtils.getColorFromAttr(R.attr.im_bubble_incoming));
+        }
         bubbleFluidLayout.setLayoutDirection(viewType);
 
         final var msgTextView = inflater.inflate(R.layout.vkim_msg_part_text, viewGroup, false);

app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java

@@ -1,11 +1,5 @@
 package ru.vtosters.lite.ui.adapters;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.AndroidUtils.getResources;
-import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
-import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
-import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
-
 import android.annotation.SuppressLint;
 import android.net.Uri;
 import android.view.LayoutInflater;
@@ -14,19 +8,32 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
+import com.vk.core.dialogs.bottomsheet.ContentSnapStrategy1;
+import com.vk.core.dialogs.bottomsheet.ModalBottomSheet;
+import com.vk.core.util.ContextExtKt;
+import com.vk.core.util.DrawableUtils;
+import com.vk.sharing.Sharing;
+import com.vk.stickers.LongtapRecyclerView;
+import com.vk.stickers.bridge.GiftData;
+import com.vk.stickers.details.StickerDetailsAdapter;
+import com.vk.stickers.details.StickerDetailsView;
 import com.vtosters.lite.R;
+import org.json.JSONException;
+import ru.vtosters.lite.tgs.TGPref;
+import ru.vtosters.lite.tgs.TGRoot;
+import ru.vtosters.lite.ui.components.IItemMovingListener;
 
 import java.io.File;
+import java.util.ArrayList;
 
-import ru.vtosters.lite.tgs.TGPref;
-import ru.vtosters.lite.ui.components.IItemMovingListener;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.getResources;
+import static ru.vtosters.lite.utils.ThemesUtils.*;
 
 public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.StickerPackViewHolder> implements IItemMovingListener {
     private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext());
@@ -95,12 +102,12 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
             super(view);
 
             mContainer = (LinearLayout) view;
-            mSwitch = view.findViewWithTag("choose_btn");
-            mStickerPreview = view.findViewWithTag("photo");
-            mUpdateButton = view.findViewWithTag("button_update");
-            mDeleteButton = view.findViewWithTag("action_delete");
-            mName = view.findViewWithTag("vkim_cancel");
-            mStickersCount = view.findViewWithTag("vkim_cancel_label_text");
+            mSwitch = view.findViewById(R.id.choose_btn);
+            mStickerPreview = view.findViewById(R.id.photo);
+            mUpdateButton = view.findViewById(R.id.button_update);
+            mDeleteButton = view.findViewById(R.id.action_delete);
+            mName = view.findViewById(R.id.vkim_cancel);
+            mStickersCount = view.findViewById(R.id.vkim_cancel_label_text);
         }
 
         @SuppressLint("SetTextI18n")
@@ -108,10 +115,11 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
             final TelegramStickersPack pack = sService.getPacksListReference().get(position);
             if (pack.state != TelegramStickersPack.DOWNLOADED) return;
 
+            File f = new File(pack.folder, "001.png");
+            var uri = Uri.parse("file://" + f.getAbsolutePath());
             try {
-                File f = new File(pack.folder, "001.png");
                 if (f.exists()) {
-                    mStickerPreview.setImageURI(Uri.parse("file://" + f.getAbsolutePath()));
+                    mStickerPreview.setImageURI(uri);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -129,7 +137,7 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
             });
             mName.setText(pack.title);
             mSwitch.setChecked(pack.enabled);
-            mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> sService.setPackEnabled(pack, isChecked, false));
+            mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> sService.setPackEnabled(pack, isChecked, true));
             mStickersCount.setText(pack.stickersCount + " " + mStickersCount.getContext().getString(R.string.stickerscount));
 
             // Color костыль
@@ -138,6 +146,35 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
 
             mName.setTextColor(color);
             mStickersCount.setTextColor(secondary);
+
+            if (pack.state == TelegramStickersPack.DOWNLOADED)
+                mContainer.setOnClickListener(v -> {
+                    try {
+                        ViewGroup root = (ViewGroup) ContextExtKt.c(v.getContext()).inflate(R.layout.sticker_details_bottom_container, null);
+                        StickerDetailsView stickersDetailsView = new StickerDetailsView(v.getContext());
+
+                        stickersDetailsView.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
+                        stickersDetailsView.a(TGRoot.toStickerPack(pack), new GiftData(new ArrayList<>(), false), root);
+
+                        var recycler = (LongtapRecyclerView) stickersDetailsView.findViewById(R.id.recycler);
+                        ((StickerDetailsAdapter) recycler.getAdapter()).setTelegramPack(true);
+
+                        var builder = new ModalBottomSheet.a(v.getContext());
+                        builder.d(pack.title);
+                        builder.d(stickersDetailsView);
+                        builder.a(DrawableUtils.a(v.getContext(), R.drawable.share_outline_28, R.color.accent_blue));
+                        builder.c(R.attr.content_tint_background);
+                        builder.b(view -> {
+                            Sharing.a(view.getContext(), "https://t.me/addstickers/" + pack.id);
+                            return null;
+                        });
+                        builder.a(new ContentSnapStrategy1(false));
+
+                        builder.a("stickers_preview");
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                });
         }
     }
 }

app/src/main/java/ru/vtosters/lite/ui/components/CrashReporter.java

@@ -21,6 +21,7 @@ import java.io.StringWriter;
 
 import ru.vtosters.lite.deviceinfo.DeviceInfoCollector;
 import ru.vtosters.lite.services.LogWriterService;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class CrashReporter {
     protected static String logString;
@@ -41,7 +42,7 @@ public class CrashReporter {
         logString = getStackTrace(th) + "\n\n" + new DeviceInfoCollector().collect().toDeviceName();
 
         if (Build.VERSION.SDK_INT >= 26) {
-            var notificationChannel = new NotificationChannel("crashes", "crash", NotificationManager.IMPORTANCE_DEFAULT);
+            var notificationChannel = new NotificationChannel("crashes", AndroidUtils.getString("crash_service_name"), NotificationManager.IMPORTANCE_DEFAULT);
             notificationChannel.enableVibration(true);
             notificationChannel.enableLights(true);
             ((NotificationManager) getGlobalContext().getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(notificationChannel);
@@ -51,7 +52,7 @@ public class CrashReporter {
         foxbinIntent.putExtra("android.intent.extra.TEXT", logString);
         foxbinIntent.setType("text/plain");
         if (!isFoxbinInstalled()) {
-            foxbinIntent = new Intent("android.intent.action.VIEW");
+            foxbinIntent = new Intent(Intent.ACTION_VIEW);
             foxbinIntent.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.f0x1d.dogbin"));
             foxbinIntent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
         }

app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java

@@ -1,15 +1,5 @@
 package ru.vtosters.lite.ui.components;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
-import static ru.vtosters.lite.utils.Preferences.milkshake;
-import static ru.vtosters.lite.utils.Preferences.superapp;
-import static ru.vtosters.lite.utils.Preferences.useNewSettings;
-import static ru.vtosters.lite.utils.Preferences.vkme;
-import static ru.vtosters.lite.utils.Preferences.vkme_notifs;
-
-import android.os.Build;
-
 import com.vk.apps.AppsFragment;
 import com.vk.discover.DiscoverFragment;
 import com.vk.fave.fragments.FaveTabFragment;
@@ -34,22 +24,31 @@ import com.vtosters.lite.fragments.t2.c.DialogsFragment;
 import com.vtosters.lite.fragments.y2.VideoCatalogFragment;
 import com.vtosters.lite.general.fragments.GamesFragment;
 import com.vtosters.lite.general.fragments.PhotosFragment;
+import ru.vtosters.lite.ui.items.DockBarTab;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import ru.vtosters.lite.ui.items.DockBarTab;
-import ru.vtosters.lite.utils.AndroidUtils;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
+import static ru.vtosters.lite.utils.Preferences.*;
 
 public class DockBarEditorManager {
     public static final int MIN_SELECTED_TABS = 3;
     public static final int MAX_SELECTED_TABS = 9;
+
+    private static final List< String > ALL_TAGS = Arrays.asList(
+            "tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile",
+            "tab_friends", "tab_groups", "tab_photos", "tab_audios", "tab_videos",
+            "tab_lives", "tab_games", "tab_liked", "tab_fave", "tab_documents",
+            "tab_payments", "tab_vk_apps", "tab_settings");
+
     private static DockBarEditorManager sInstance;
-    private final List<DockBarTab> mSelectedTabs = new ArrayList<>();
-    private final List<DockBarTab> mDisabledTabs = new ArrayList<>();
+    private final List< DockBarTab > mSelectedTabs = new ArrayList<>();
+    private final List< DockBarTab > mDisabledTabs = new ArrayList<>();
 
     public DockBarEditorManager() {
         init();
@@ -62,10 +61,10 @@ public class DockBarEditorManager {
     }
 
     private void init() {
-        if (vkme()) {
+        if(vkme()) {
             mSelectedTabs.add(getTabByTag("tab_settings"));
-            if (vkme_notifs()) {
-                if (milkshake()) {
+            if(vkme_notifs()) {
+                if(milkshake()) {
                     mSelectedTabs.add(getTabByTag("tab_feedback"));
                 } else {
                     mSelectedTabs.add(getTabByTag("tab_friends"));
@@ -78,44 +77,36 @@ public class DockBarEditorManager {
 
         checkOldConfig();
 
-        String[] selectedTabsTags = getPreferences().getString("dockbar_tabs", "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
+        var selectedTabsTags = getPreferences()
+                .getString("dockbar_tabs",
+                        "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
                 .split(",");
         parseSelectedTabs(selectedTabsTags);
     }
 
     private void checkOldConfig() {
         File config = new File(getGlobalContext().getFilesDir(), "dockbar.json");
-        if (config.exists()) config.deleteOnExit();
+        if(config.exists()) config.deleteOnExit();
     }
 
     private void parseSelectedTabs(String[] selectedTabsTags) {
-        List<String> allTags = new ArrayList<>(Arrays.asList("tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile",
-                "tab_friends", "tab_groups", "tab_photos", "tab_audios", "tab_videos", "tab_lives", "tab_games", "tab_liked",
-                "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings"));
+        var allTags = new ArrayList<>(ALL_TAGS);
 
-        for (String tag : selectedTabsTags) {
+        for(String tag : selectedTabsTags) {
             mSelectedTabs.add(getTabByTag(tag));
             allTags.remove(tag);
         }
 
-        for (String tag : allTags) {
+        for(String tag : allTags) {
             mDisabledTabs.add(getTabByTag(tag));
         }
     }
 
     public void save() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            getPreferences().edit().putString("dockbar_tabs", mSelectedTabs.stream()
-                            .map(tab -> tab.tag)
-                            .collect(Collectors.joining(",")))
-                    .commit();
-        } else {
-            StringBuilder sb = new StringBuilder();
-            for (DockBarTab tab : mSelectedTabs) {
-                sb.append(tab.tag).append(",");
-            }
-            getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
-        }
+        var sb = new StringBuilder();
+        for(DockBarTab tab : mSelectedTabs)
+            sb.append(tab.tag).append(",");
+        getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
     }
 
     public void reset() {
@@ -125,16 +116,16 @@ public class DockBarEditorManager {
                 .commit();
     }
 
-    public List<DockBarTab> getSelectedTabs() {
+    public List< DockBarTab > getSelectedTabs() {
         return mSelectedTabs;
     }
 
-    public List<DockBarTab> getDisabledTabs() {
+    public List< DockBarTab > getDisabledTabs() {
         return mDisabledTabs;
     }
 
     private DockBarTab getTabByTag(String tag) {
-        switch (tag) {
+        switch(tag) {
             case "tab_news":
                 return DockBarTab.valuesOf(
                         "tab_news",

app/src/main/java/ru/vtosters/lite/ui/components/ItemMovingCallback.java

@@ -8,9 +8,9 @@ import ru.vtosters.lite.ui.adapters.CategorizedAdapter;
 
 public class ItemMovingCallback extends ItemTouchHelper.Callback {
 
-    private final CategorizedAdapter mAdapter;
+    private final CategorizedAdapter<?> mAdapter;
 
-    public ItemMovingCallback(CategorizedAdapter adapter) {
+    public ItemMovingCallback(CategorizedAdapter<?> adapter) {
         this.mAdapter = adapter;
     }
 

app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java

@@ -1,18 +1,16 @@
 package ru.vtosters.lite.ui.components;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
-
 import android.os.Build;
-
 import com.vtosters.lite.R;
+import ru.vtosters.lite.ui.items.SuperAppItem;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import ru.vtosters.lite.ui.items.SuperAppItem;
-import ru.vtosters.lite.utils.AndroidUtils;
+import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 
 public class SuperAppEditorManager {
 
@@ -43,13 +41,9 @@ public class SuperAppEditorManager {
             mSelectedItems.add(getItemByTag(tag));
             allTags.remove(tag);
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            allTags.forEach(tag -> mDisabledItems.add(getItemByTag(tag)));
-        } else {
-            for (String tag : allTags) {
-                mDisabledItems.add(getItemByTag(tag));
-            }
-        }
+
+        for (String tag : allTags)
+            mDisabledItems.add(getItemByTag(tag));
     }
 
     public void save() {

app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java

@@ -50,7 +50,7 @@ public class OTADialog  extends ModalBottomSheetWrapper<OTADialog> implements OT
 
         container.setOrientation(LinearLayout.VERTICAL);
 
-        changelogView.setText("Изменения: \n" + changelog);
+        changelogView.setText(AndroidUtils.getString("changelog") + ": \n" + changelog);
         changelogView.setTextColor(ThemesUtils.getTextAttr());
         container.addView(changelogView, new LinearLayout.LayoutParams(-1, -2));
 

app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java

@@ -1,19 +1,17 @@
 package ru.vtosters.lite.ui.dialogs;
 
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
-
 import ru.vtosters.lite.deviceinfo.OEMDetector;
 import ru.vtosters.lite.utils.AndroidUtils;
 
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
 public class Start {
     public static void alert(final Activity activity) {
         if (Build.VERSION.SDK_INT >= 23) {
@@ -30,7 +28,7 @@ public class Start {
                     .setNeutralButton(R.string.startbtn1,
                             (dialogInterface, i) -> {
                                 edit().putBoolean("showAlert", false).apply();
-                                activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters")));
+                                activity.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://t.me/vtosters")));
                             }
                     )
                     .show();

app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java

@@ -25,6 +25,7 @@ import ru.vtosters.lite.themes.hooks.TextViewHook;
 import ru.vtosters.lite.ui.adapters.CategorizedAdapter;
 import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.components.ItemMovingCallback;
+import ru.vtosters.lite.utils.LayoutUtils;
 
 public class DockBarEditorFragment extends BaseToolbarFragment {
 
@@ -33,38 +34,40 @@ public class DockBarEditorFragment extends BaseToolbarFragment {
     public View onCreateContent(@NonNull LayoutInflater inflater, @Nullable Bundle bundle) {
         setTitle(R.string.dockbar_editor);
 
-        FrameLayout content = new FrameLayout(getContext());
+        var content = new FrameLayout(getContext());
 
-        LinearLayout container = new LinearLayout(getContext());
+        var container = new LinearLayout(getContext());
         container.setOrientation(LinearLayout.VERTICAL);
-        content.addView(container, new FrameLayout.LayoutParams(-1, -1));
+        content.addView(container, LayoutUtils.createFrame(-1, -1));
 
-        LinearLayout buttonsContainer = new LinearLayout(getContext());
+        var buttonsContainer = new LinearLayout(getContext());
         buttonsContainer.setPadding(
                 dp2px(13),
                 dp2px(10),
                 dp2px(13),
                 dp2px(10)
         );
-        container.addView(buttonsContainer, new LinearLayout.LayoutParams(-1, -2));
+        container.addView(buttonsContainer, LayoutUtils.createLinear(-1, -2));
 
-        TextView save = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
+        var manager = DockBarEditorManager.getInstance();
+
+        var save = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
         save.setText(requireContext().getString(R.string.save));
         save.setOnClickListener(v -> {
-            DockBarEditorManager.getInstance().save();
+            manager.save();
             restartApplication();
         });
 
         new TextViewHook().inject(save, 0, false);
 
-        LinearLayout.LayoutParams saveParams = new LinearLayout.LayoutParams(0, -2);
+        var saveParams = LayoutUtils.createLinear(0, -2);
         saveParams.weight = 1.0f;
         buttonsContainer.addView(save, saveParams);
 
-        View divider = new View(getContext());
-        buttonsContainer.addView(divider, new LinearLayout.LayoutParams(dp2px(10), 0));
+        var divider = new View(getContext());
+        buttonsContainer.addView(divider, LayoutUtils.createLinear(dp2px(10), 0));
 
-        TextView reset = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
+        var reset = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
         reset.setText(requireContext().getString(R.string.reset));
         reset.setOnClickListener(v -> {
             DockBarEditorManager.getInstance().reset();
@@ -73,12 +76,11 @@ public class DockBarEditorFragment extends BaseToolbarFragment {
 
         new TextViewHook().inject(reset, 0, false);
 
-        LinearLayout.LayoutParams resetParams = new LinearLayout.LayoutParams(0, -2);
+        var resetParams = LayoutUtils.createLinear(0, -2);
         resetParams.weight = 1.0f;
         buttonsContainer.addView(reset, resetParams);
 
-        DockBarEditorManager manager = DockBarEditorManager.getInstance();
-        var adapter = new CategorizedAdapter(manager.getSelectedTabs(), manager.getDisabledTabs(), (holder, pos) -> {
+        var adapter = new CategorizedAdapter<>(manager.getSelectedTabs(), manager.getDisabledTabs(), (holder, pos) -> {
             var tab = pos <= manager.getSelectedTabs().size()
                     ? manager.getSelectedTabs().get(pos - 1)
                     : manager.getDisabledTabs().get(pos - manager.getSelectedTabs().size() - 2);
@@ -90,7 +92,7 @@ public class DockBarEditorFragment extends BaseToolbarFragment {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(adapter);
         recyclerView.setHasFixedSize(true);
-        var params = new LinearLayout.LayoutParams(-1, -1);
+        var params = LayoutUtils.createLinear(-1, -1);
         params.gravity = Gravity.CENTER;
         container.addView(recyclerView, params);
 

app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java

@@ -70,14 +70,18 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
             NewsfeedListManager.callEditorPopup(getActivity());
             return true;
         });
+
         var str = getDefaultPrefs().getString("news_feed_selected_items", "");
         findPreference("newsfeedlistmanager").setSummary(
                 String.format(requireContext().getString(R.string.feed_hidden), (!TextUtils.isEmpty(str) ? str.split(",").length : 0))
         );
+
         findPreference("newsfeedlistmanager_reset").setOnPreferenceClickListener(preference -> {
             NewsfeedListManager.resetHideItems();
             return true;
         });
+
+        findPreference("feedcache").setVisible(!getPrefsValue("newsupdate").equals("no_update"));
     }
 
     private String count(String text) {

app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java

@@ -1,22 +1,5 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.ui.PreferencesUtil.addPreference;
-import static ru.vtosters.lite.ui.PreferencesUtil.addPreferenceCategory;
-import static ru.vtosters.lite.ui.PreferencesUtil.addPreferenceDrawable;
-import static ru.vtosters.lite.ui.components.IconManager.icons;
-import static ru.vtosters.lite.ui.components.IconManager.iconsValues;
-import static ru.vtosters.lite.ui.components.IconManager.sIconsPlus;
-import static ru.vtosters.lite.ui.components.IconManager.sIconsPlusNames;
-import static ru.vtosters.lite.ui.components.IconManager.switchComponent;
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-import static ru.vtosters.lite.utils.Preferences.hasVerification;
-import static ru.vtosters.lite.utils.Preferences.preferences;
-import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -26,44 +9,47 @@ import android.os.Bundle;
 import android.util.TypedValue;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.core.content.res.ResourcesCompat;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
+import ru.vtosters.lite.ui.components.IconManager;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class IconsFragment extends MaterialPreferenceToolbarFragment {
     @SuppressLint("SetTextI18n")
     public static void callSelectDialog(Context ctx, String appicon) {
-        var defname = preferences.getString("appname", "vt");
-        var deficon = preferences.getString("selectedicon", "vt");
+        var defname = Preferences.preferences.getString("appname", "vt");
+        var deficon = Preferences.preferences.getString("selectedicon", "vt");
 
         RadioGroup rg = new RadioGroup(ctx);
 
-        RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-        RadioButton rgVK = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-        RadioButton rgVKontakte = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgVK = new RadioButton(new ContextThemeWrapper(ctx, R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgVKontakte = new RadioButton(new ContextThemeWrapper(ctx, R.style.Widget_AppCompat_CompoundButton_RadioButton));
 
         rg.addView(rgDefault);
         rg.addView(rgVK);
         rg.addView(rgVKontakte);
 
-        rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
-        rgVK.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
-        rgVKontakte.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
+        rgVK.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
+        rgVKontakte.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
 
-        rg.setPadding(dp2px(18f), dp2px(12f), dp2px(18f), 0);
+        rg.setPadding(AndroidUtils.dp2px(18f), AndroidUtils.dp2px(12f), AndroidUtils.dp2px(18f), 0);
 
         rgDefault.setText("VTLite");
-        rgDefault.setTextColor(getTextAttr());
+        rgDefault.setTextColor(ThemesUtils.getTextAttr());
 
         rgVK.setText("VK");
-        rgVK.setTextColor(getTextAttr());
+        rgVK.setTextColor(ThemesUtils.getTextAttr());
 
         rgVKontakte.setText(ctx.getString(R.string.app_name_alter));
-        rgVKontakte.setTextColor(getTextAttr());
+        rgVKontakte.setTextColor(ThemesUtils.getTextAttr());
 
         rgVKontakte.setChecked(defname.contains("vkontakte"));
         rgVK.setChecked(defname.contains("standard"));
@@ -74,20 +60,20 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                 .setView(rg)
                 .setPositiveButton(R.string.vtl_confirm, ((dialog, which) -> {
                     if (rgDefault.isChecked()) {
-                        edit().putString("appname", "vt").commit();
-                        edit().putString("selectedicon", appicon).commit();
+                        AndroidUtils.edit().putString("appname", "vt").commit();
+                        AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        switchComponent(appicon, "vt", deficon, defname);
+                        IconManager.switchComponent(appicon, "vt", deficon, defname);
                     } else if (rgVK.isChecked()) {
-                        edit().putString("appname", "standard").commit();
-                        edit().putString("selectedicon", appicon).commit();
+                        AndroidUtils.edit().putString("appname", "standard").commit();
+                        AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        switchComponent(appicon, "standard", deficon, defname);
+                        IconManager.switchComponent(appicon, "standard", deficon, defname);
                     } else if (rgVKontakte.isChecked()) {
-                        edit().putString("appname", "vkontakte").commit();
-                        edit().putString("selectedicon", appicon).commit();
+                        AndroidUtils.edit().putString("appname", "vkontakte").commit();
+                        AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        switchComponent(appicon, "vkontakte", deficon, defname);
+                        IconManager.switchComponent(appicon, "vkontakte", deficon, defname);
                     }
                 }))
                 .setNegativeButton(R.string.cancel,
@@ -102,20 +88,20 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
 
         this.addPreferencesFromResource(R.xml.empty);
 
-        if (!hasVerification() && !getBoolValue("dialogrecomm", false)) {
-            addPreference(this, "", requireContext().getString(R.string.icons_warning), requireContext().getString(R.string.icons_warning_info), R.drawable.ic_about_outline_28, preference -> {
-                getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app/donate/")));
+        if (!Preferences.hasVerification() && !Preferences.getBoolValue("dialogrecomm", false)) {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", requireContext().getString(R.string.icons_warning), requireContext().getString(R.string.icons_warning_info), R.drawable.ic_about_outline_28, preference -> {
+                getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://vtosters.app/donate/")));
                 return false;
             });
         }
 
-        addPreferenceCategory(this, requireContext().getString(R.string.icons_title));
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.icons_title));
 
-        for (var i = 0; i < icons().size(); i++) {
-            if (icons().get(i) == null || iconsValues().get(i) == null) return;
+        for (var i = 0; i < IconManager.icons().size(); i++) {
+            if (IconManager.icons().get(i) == null || IconManager.iconsValues().get(i) == null) return;
 
-            String iconname = icons().get(i);
-            String icon = iconsValues().get(i);
+            String iconname = IconManager.icons().get(i);
+            String icon = IconManager.iconsValues().get(i);
 
             int iconRes;
 
@@ -124,7 +110,7 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
             } else if (icon.contains("standard")) {
                 iconRes = R.mipmap.ic_launcher_round;
             } else {
-                iconRes = getIdentifier("ic_launcher_" + icon, "mipmap");
+                iconRes = AndroidUtils.getIdentifier("ic_launcher_" + icon, "mipmap");
             }
 
             Drawable drawable = ResourcesCompat.getDrawable(getResources(), iconRes, null);
@@ -133,20 +119,20 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                 drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_bug_outline_28, null);
             }
 
-            addPreferenceDrawable(this, icon, iconname, "", drawable, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), icon, iconname, "", drawable, preference -> {
                 callSelectDialog(this.getContext(), icon);
                 return false;
             });
         }
 
-        if (!hasVerification() && !getBoolValue("dialogrecomm", false)) {
-            addPreferenceCategory(this, requireContext().getString(R.string.unavailable_icons));
+        if (!Preferences.hasVerification() && !Preferences.getBoolValue("dialogrecomm", false)) {
+            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.unavailable_icons));
 
-            for (var i = 2; i < sIconsPlusNames.size(); i++) {
-                if (sIconsPlusNames.get(i) == null || sIconsPlus.get(i) == null) return;
+            for (var i = 2; i < IconManager.sIconsPlusNames.size(); i++) {
+                if (IconManager.sIconsPlusNames.get(i) == null || IconManager.sIconsPlus.get(i) == null) return;
 
-                String iconname = sIconsPlusNames.get(i);
-                String icon = sIconsPlus.get(i);
+                String iconname = IconManager.sIconsPlusNames.get(i);
+                String icon = IconManager.sIconsPlus.get(i);
 
                 int iconRes;
 
@@ -155,7 +141,7 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                 } else if (icon.contains("standard")) {
                     iconRes = R.mipmap.ic_launcher_round;
                 } else {
-                    iconRes = getIdentifier("ic_launcher_" + icon, "mipmap");
+                    iconRes = AndroidUtils.getIdentifier("ic_launcher_" + icon, "mipmap");
                 }
 
                 Drawable drawable = ResourcesCompat.getDrawable(getResources(), iconRes, null);
@@ -164,8 +150,8 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                     drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_bug_outline_28, null);
                 }
 
-                addPreferenceDrawable(this, icon, iconname, "", drawable, preference -> {
-                    sendToast(requireContext().getString(R.string.unavailable_icon_warning));
+                PreferenceFragmentUtils.addPreference(getPreferenceScreen(), icon, iconname, "", drawable, preference -> {
+                    AndroidUtils.sendToast(requireContext().getString(R.string.unavailable_icon_warning));
                     return false;
                 });
             }

app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java

@@ -1,18 +1,24 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
-import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
+import static ru.vtosters.lite.utils.AndroidUtils.*;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.preference.Preference;
 
+import com.vk.core.fragments.FragmentImpl;
+import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -28,11 +34,31 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         findPreference("is_likes_on_right").setOnPreferenceClickListener(new restart());
         findPreference("superapp").setOnPreferenceClickListener(new restart());
 
+        findPreference("dateformat").setOnPreferenceChangeListener((preference, o) -> {
+            edit().putString("dateformat", o.toString()).commit();
+            restartApplicationWithTimer();
+            return true;
+        });
+
+        var superappeditor = findPreference("superappeditor");
+        superappeditor.setSummary(AndroidUtils.getString(R.string.elements_hidden_count) + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size());
+        superappeditor.setVisible(!Preferences.vkme() && !isTablet() && Preferences.superapp());
+        superappeditor.setOnPreferenceClickListener(preference -> {
+            switchFragment(SuperAppEditorFragment.class);
+            return true;
+        });
+
         if (isTablet()) {
             findPreference("menusett").setVisible(false);
             findPreference("swipe").setVisible(false);
         }
 
+        if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
+            findPreference("miniapps").setVisible(false);
+            findPreference("vkpay").setVisible(false);
+            findPreference("showmenu").setVisible(false);
+        }
+
         findPreference("customrounding").setOnPreferenceClickListener(preference -> {
             RoundingSeekbarDialog.dialog(getContext());
             return true;
@@ -59,10 +85,17 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         return R.string.vtlinterface;
     }
 
-    public class restart implements Preference.OnPreferenceClickListener {
+    private class restart implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
             return InterfaceFragment.this.restart(preference);
         }
     }
+
+    private void switchFragment(Class< ? extends FragmentImpl> fragmentClz) {
+        var intent = new Navigator(fragmentClz)
+                .b(requireContext())
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        requireContext().startActivity(intent);
+    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java

@@ -96,7 +96,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
             deleteVideoHistoryDialog(requireContext());
             return true;
         });
-        findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
         findPreference("lastfm_auth").setOnPreferenceClickListener(preference -> {
             if (isLoggedIn()) {
                 logout(getContext());
@@ -148,7 +147,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(null, "Saucenao")
                     );
 
-            var adapter = new ImagineArrayAdapter(getContext(), items);
+            var adapter = new ImagineArrayAdapter(requireContext(), items);
             adapter.setSelected(getPreferences().getInt("search_engine", 0));
 
             new VkAlertDialog.Builder(getActivity())
@@ -286,15 +285,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         return R.string.vtlmedia;
     }
 
-    private static class restart implements Preference.OnPreferenceChangeListener {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object o) {
-            edit().putString("dateformat", o.toString()).commit();
-            restartApplicationWithTimer();
-            return false;
-        }
-    }
-
     private class download implements Preference.OnPreferenceClickListener {
         @Override // android.support.v7.preference.Preference.c
         public boolean onPreferenceClick(Preference preference) {

app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java

@@ -39,8 +39,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     private void prefs() {
         findPreference("vkme").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
-        findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart());
-        findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp());
 
         findPreference("autotranslate").setEnabled(!autoalltranslate());
 
@@ -65,11 +63,9 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         });
 
         findPreference("vkme_notifs").setEnabled(vkme());
-        findPreference("wallpapers").setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
         findPreference("vkme").setIcon(R.drawable.ic_vkme_28);
 
         if (isTablet()) {
-            findPreference("alteremoji").setVisible(false);
             findPreference("vkmesett").setVisible(false);
         }
     }
@@ -104,15 +100,4 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
             return MessagesFragment.this.restart();
         }
     }
-
-    public class openwp implements Preference.OnPreferenceClickListener {
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            Context context = requireContext();
-            Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return true;
-        }
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java

@@ -8,9 +8,7 @@ import static ru.vtosters.lite.ui.components.BackupManager.backupSettings;
 import static ru.vtosters.lite.ui.components.BackupManager.deletePrefs;
 import static ru.vtosters.lite.ui.components.BackupManager.restoreBackup;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.*;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -58,11 +56,13 @@ import com.vtosters.lite.im.ImEngineProvider;
 import java.io.IOException;
 
 import b.h.g.m.FileUtils;
+import ru.vtosters.lite.ssfs.UsersList;
 import ru.vtosters.lite.ui.activities.VKAdminTokenActivity;
 import ru.vtosters.lite.ui.components.BackupManager;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ContactsUtils;
+import ru.vtosters.lite.utils.VTVerifications;
 
 public class OtherFragment extends MaterialPreferenceToolbarFragment {
     private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1;
@@ -116,6 +116,13 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        findPreference("updateverifdata").setOnPreferenceClickListener(preference -> {
+            UsersList.getUsersList();
+            VTVerifications.load(requireContext());
+            sendToast("Данные обновлены");
+            return true;
+        });
+
         findPreference("contacts_sync").setOnPreferenceClickListener((preference) -> {
             ContactsUtils.getContactsStatus(requireContext());
             return true;

app/src/main/java/ru/vtosters/lite/ui/fragments/SuperAppEditorFragment.java

@@ -1,9 +1,5 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
-
-import android.os.Build;
 import android.os.Bundle;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -12,16 +8,13 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.vtosters.lite.R;
-
 import ru.vtosters.lite.themes.hooks.TextViewHook;
 import ru.vtosters.lite.ui.adapters.CategorizedAdapter;
 import ru.vtosters.lite.ui.components.ItemMovingCallback;
@@ -29,6 +22,9 @@ import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.utils.LayoutUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
+import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
+import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
+
 public class SuperAppEditorFragment extends BaseToolbarFragment {
 
     @CallSuper
@@ -36,13 +32,13 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
     public View onCreateContent(@NonNull LayoutInflater inflater, @Nullable Bundle bundle) {
         setTitle(R.string.superapp_editor);
 
-        FrameLayout content = new FrameLayout(getContext());
+        var content = new FrameLayout(getContext());
 
-        LinearLayout container = new LinearLayout(getContext());
+        var container = new LinearLayout(getContext());
         container.setOrientation(LinearLayout.VERTICAL);
-        content.addView(container, new FrameLayout.LayoutParams(-1, -1));
+        content.addView(container, LayoutUtils.createFrame(-1, -1));
 
-        TextView message = new TextView(getContext());
+        var message = new TextView(getContext());
         message.setText(R.string.superapp_editor_message);
         message.setTextSize(16.0f);
         message.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
@@ -55,7 +51,7 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
         );
         container.addView(message, LayoutUtils.createLinear(-1, -2));
 
-        LinearLayout buttonsContainer = new LinearLayout(getContext());
+        var buttonsContainer = new LinearLayout(getContext());
         buttonsContainer.setPadding(
                 dp2px(13),
                 dp2px(10),
@@ -64,7 +60,7 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
         );
         container.addView(buttonsContainer, new LinearLayout.LayoutParams(-1, -2));
 
-        TextView save = new TextView(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.VKUIButton_Primary));
+        var save = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
         save.setText(R.string.save);
         save.setOnClickListener(v -> {
             SuperAppEditorManager.getInstance().save();
@@ -73,14 +69,14 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
 
         new TextViewHook().inject(save, 0, false);
 
-        LinearLayout.LayoutParams saveParams = new LinearLayout.LayoutParams(0, -2);
+        var saveParams = LayoutUtils.createLinear(0, -2);
         saveParams.weight = 1.0f;
         buttonsContainer.addView(save, saveParams);
 
-        View divider = new View(getContext());
+        var divider = new View(getContext());
         buttonsContainer.addView(divider, new LinearLayout.LayoutParams(dp2px(10), 0));
 
-        TextView reset = new TextView(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.VKUIButton_Primary));
+        var reset = new TextView(new ContextThemeWrapper(getContext(), R.style.VKUIButton_Primary));
         reset.setText(R.string.reset);
         reset.setOnClickListener(v -> {
             SuperAppEditorManager.getInstance().reset();
@@ -89,44 +85,31 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
 
         new TextViewHook().inject(reset, 0, false);
 
-        LinearLayout.LayoutParams resetParams = new LinearLayout.LayoutParams(0, -2);
+        var resetParams = LayoutUtils.createLinear(0, -2);
         resetParams.weight = 1.0f;
         buttonsContainer.addView(reset, resetParams);
 
-        SuperAppEditorManager manager = SuperAppEditorManager.getInstance();
-        var adapter = new CategorizedAdapter(manager.getSelectedTabs(), manager.getDisabledTabs(), (holder, pos) -> {
+        var manager = SuperAppEditorManager.getInstance();
+        var adapter = new CategorizedAdapter<>(manager.getSelectedTabs(), manager.getDisabledTabs(), (holder, pos) -> {
             var item = pos <= manager.getSelectedTabs().size()
                     ? manager.getSelectedTabs().get(pos - 1)
                     : manager.getDisabledTabs().get(pos - manager.getSelectedTabs().size() - 2);
             holder.bindMovingItem(item.title);
         });
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            manager.getSelectedTabs().forEach(item -> {
-                if (item.type.equals("menu"))
-                    adapter.addUnmovedItem(item);
-            });
 
-            manager.getDisabledTabs().forEach(item -> {
-                if (item.type.equals("menu"))
-                    adapter.addUnmovedItem(item);
-            });
-        } else {
-            for (var item : manager.getSelectedTabs()) {
-                if (item.type.equals("menu"))
-                    adapter.addUnmovedItem(item);
-            }
+        for(var item : manager.getSelectedTabs())
+            if(item.type.equals("menu"))
+                adapter.addUnmovedItem(item);
 
-            for (var item : manager.getDisabledTabs()) {
-                if (item.type.equals("menu"))
-                    adapter.addUnmovedItem(item);
-            }
-        }
+        for(var item : manager.getDisabledTabs())
+            if(item.type.equals("menu"))
+                adapter.addUnmovedItem(item);
 
         var recyclerView = new RecyclerView(requireContext());
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(adapter);
         recyclerView.setHasFixedSize(true);
-        var params = new LinearLayout.LayoutParams(-1, -1);
+        var params = LayoutUtils.createLinear(-1, -1);
         params.gravity = Gravity.CENTER;
         container.addView(recyclerView, params);
 

app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java

@@ -1,34 +1,17 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getEmuiVersionCode;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getMiuiUiVersionCode;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getMiuiUiVersionIncrementalCode;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getMiuiUiVersionName;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getOneUiMajorVersion;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.getOneUiMinorVersion;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.hasMiuiIncrCode;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isEMUI;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isFlyme;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUI;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isOneUi;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isSamsung;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isVivo;
-import static ru.vtosters.lite.deviceinfo.OEMDetector.isZenUI;
-import static ru.vtosters.lite.ui.PreferencesUtil.addPreference;
-import static ru.vtosters.lite.ui.PreferencesUtil.addPreferenceCategory;
-import static ru.vtosters.lite.utils.About.getBuildNumber;
-import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.Preferences.isValidSignature;
-
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.deviceinfo.OEMDetector;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
+import ru.vtosters.lite.utils.About;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.Preferences;
 
 public class SystemInfo extends MaterialPreferenceToolbarFragment {
 
@@ -37,8 +20,8 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
         super.onCreate(bundle);
         addPreferencesFromResource(R.xml.empty);
 
-        var oneUiMajorVersion = String.valueOf(getOneUiMajorVersion());
-        var oneUiMinorVersion = String.valueOf(getOneUiMinorVersion());
+        var oneUiMajorVersion = String.valueOf(OEMDetector.getOneUiMajorVersion());
+        var oneUiMinorVersion = String.valueOf(OEMDetector.getOneUiMinorVersion());
         var sdkVersion = String.valueOf(Build.VERSION.SDK_INT);
         var productName = Build.PRODUCT;
         var deviceName = Build.DEVICE;
@@ -46,145 +29,145 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
         var manufacturerName = Build.MANUFACTURER;
         var brandName = Build.BRAND;
         var modelName = Build.MODEL;
-        var miuiUiVersionName = getMiuiUiVersionName();
-        var miuiIncrementalCodeName = getMiuiUiVersionIncrementalCode();
-        var miuiUiVersionCodeName = getMiuiUiVersionCode();
-        var emuiVersionCode = getEmuiVersionCode();
+        var miuiUiVersionName = OEMDetector.getMiuiUiVersionName();
+        var miuiIncrementalCodeName = OEMDetector.getMiuiUiVersionIncrementalCode();
+        var miuiUiVersionCodeName = OEMDetector.getMiuiUiVersionCode();
+        var emuiVersionCode = OEMDetector.getEmuiVersionCode();
         var packageName = requireContext().getPackageName();
-        var commit = getBuildNumber();
+        var commit = About.getBuildNumber();
 
-        var isMiui = isMIUI();
-        var isFlyme = isFlyme();
-        var isSamsung = isSamsung();
-        var isOneUi = isOneUi();
-        var isVivo = isVivo();
-        var isZenUI = isZenUI();
-        var isEMUI = isEMUI();
-        var hasMiuiIncrCode = hasMiuiIncrCode();
+        var isMiui = OEMDetector.isMIUI();
+        var isFlyme = OEMDetector.isFlyme();
+        var isSamsung = OEMDetector.isSamsung();
+        var isOneUi = OEMDetector.isOneUi();
+        var isVivo = OEMDetector.isVivo();
+        var isZenUI = OEMDetector.isZenUI();
+        var isEMUI = OEMDetector.isEMUI();
+        var hasMiuiIncrCode = OEMDetector.hasMiuiIncrCode();
 
-        var isValidSignature = isValidSignature();
-        var isTablet = isTablet();
+        var isValidSignature = Preferences.isValidSignature();
+        var isTablet = AndroidUtils.isTablet();
 
-        addPreferenceCategory(this, "App information");
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "App information");
 
-        addPreference(this, "", "Package name", packageName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Package name", packageName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", packageName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Commit", commit, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Commit", commit, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", commit));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Valid Signature", "Value: " + isValidSignature, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Valid Signature", "Value: " + isValidSignature, 0, null);
 
-        addPreference(this, "", "isTablet", "Value: " + isTablet, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isTablet", "Value: " + isTablet, 0, null);
 
-        addPreferenceCategory(this, "System information");
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "System information");
 
-        addPreference(this, "", "SDK Version", sdkVersion, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "SDK Version", sdkVersion, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", sdkVersion));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Product Name", productName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Product Name", productName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", productName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Device Name", deviceName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Device Name", deviceName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", deviceName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Board Name", boardName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Board Name", boardName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", boardName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Manufacturer Name", manufacturerName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Manufacturer Name", manufacturerName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", manufacturerName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Brand Name", brandName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Brand Name", brandName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", brandName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreference(this, "", "Model Name", modelName, 0, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Model Name", modelName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", modelName));
-            sendToast(requireContext().getString(R.string.copied_to_clipboard));
+            AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
             return false;
         });
 
-        addPreferenceCategory(this, "OEM Information");
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "OEM Information");
 
         if (isOneUi) {
-            addPreference(this, "", "OneUiMajorVersion", oneUiMajorVersion, 0, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "OneUiMajorVersion", oneUiMajorVersion, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", oneUiMajorVersion));
-                sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                 return false;
             });
 
-            addPreference(this, "", "OneUiMinorVersion", oneUiMinorVersion, 0, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "OneUiMinorVersion", oneUiMinorVersion, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", oneUiMinorVersion));
-                sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                 return false;
             });
         } else if (isMiui) {
-            addPreference(this, "", "miuiUiVersionName", miuiUiVersionName, 0, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "miuiUiVersionName", miuiUiVersionName, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", miuiUiVersionName));
-                sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                 return false;
             });
 
-            addPreference(this, "", "miuiUiVersionCodeName", miuiUiVersionCodeName, 0, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "miuiUiVersionCodeName", miuiUiVersionCodeName, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", miuiUiVersionCodeName));
-                sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                 return false;
             });
 
             if (hasMiuiIncrCode) {
-                addPreference(this, "", "miuiIncrementalCodeName", miuiIncrementalCodeName, 0, preference -> {
+                PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "miuiIncrementalCodeName", miuiIncrementalCodeName, 0, preference -> {
                     ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", miuiIncrementalCodeName));
-                    sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                    AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                     return false;
                 });
             }
         } else if (isEMUI) {
-            addPreference(this, "", "emuiVersionCode", emuiVersionCode, 0, preference -> {
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "emuiVersionCode", emuiVersionCode, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", emuiVersionCode));
-                sendToast(requireContext().getString(R.string.copied_to_clipboard));
+                AndroidUtils.sendToast(requireContext().getString(R.string.copied_to_clipboard));
                 return false;
             });
         } else {
-            addPreference(this, "", "No info", "No information about OEM", 0, null);
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "No info", "No information about OEM", 0, null);
         }
 
-        addPreferenceCategory(this, "OEM List");
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "OEM List");
 
-        addPreference(this, "", "isOneUi", "Value: " + isOneUi, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isOneUi", "Value: " + isOneUi, 0, null);
 
-        addPreference(this, "", "isMiui", "Value: " + isMiui, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isMiui", "Value: " + isMiui, 0, null);
 
-        addPreference(this, "", "isEMUI", "Value: " + isEMUI, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isEMUI", "Value: " + isEMUI, 0, null);
 
-        addPreference(this, "", "isFlyme", "Value: " + isFlyme, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isFlyme", "Value: " + isFlyme, 0, null);
 
-        addPreference(this, "", "isSamsung", "Value: " + isSamsung, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isSamsung", "Value: " + isSamsung, 0, null);
 
-        addPreference(this, "", "isVivo", "Value: " + isVivo, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isVivo", "Value: " + isVivo, 0, null);
 
-        addPreference(this, "", "isZenUI", "Value: " + isZenUI, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isZenUI", "Value: " + isZenUI, 0, null);
     }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java

@@ -1,8 +1,8 @@
 package ru.vtosters.lite.ui.fragments;
 
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.WindowManager;
@@ -14,13 +14,18 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.palettes.PalettesManager;
+import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.dialogs.PalettesBottomSheetDialog;
 import ru.vtosters.lite.ui.views.rarepebble.ColorPickerView;
+import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
 import ru.vtosters.lite.utils.Preferences;
 import ru.vtosters.lite.utils.ThemesUtils;
 
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
+
 public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
     @Override
@@ -38,6 +43,13 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        var dockbarEditor = findPreference("dockbareditor");
+        dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
+        dockbarEditor.setOnPreferenceClickListener(preference -> {
+            switchFragment(DockBarEditorFragment.class);
+            return true;
+        });
+
         var navBarPreference = findPreference("navbar");
         navBarPreference.setOnPreferenceClickListener(preference -> {
             restart();
@@ -97,9 +109,30 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
         findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme() && ThemesUtils.isMilkshake());
 
-        if (AndroidUtils.isTablet()) {
+        var wp = findPreference("wallpapers");
+        wp.setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
+        wp.setOnPreferenceClickListener(preference -> {
+            Context context = requireContext();
+            Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
+            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(a2);
+            return true;
+        });
+
+        findPreference("systememoji").setOnPreferenceClickListener(preference -> {
+            restart();
+            return true;
+        });
+
+        if (Preferences.vkme()) {
+            findPreference("dockbareditor").setVisible(false);
+        }
+
+        if(AndroidUtils.isTablet()) {
             PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
             dockbarSettingsPreferenceCategory.setVisible(false);
+            findPreference("alteremoji").setVisible(false);
+            findPreference("dockbareditor").setVisible(false);
         }
     }
 
@@ -113,7 +146,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         new VkAlertDialog.Builder(requireContext())
                 .setTitle(AndroidUtils.getString("change_accent_color"))
                 .setItems(titles, (dialog, which) -> {
-                    switch (which) {
+                    switch(which) {
                         case 0:
                             showColorPicker();
                             break;
@@ -154,8 +187,8 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
     void showPalettesDialog() {
         final var manager = PalettesManager.getInstance();
         final var titles = new String[manager.getPalettesCount()];
-        if (titles.length > 0) {
-            for (int i = 0; i < titles.length; ++i)
+        if(titles.length > 0) {
+            for(int i = 0; i < titles.length; ++i)
                 titles[i] = manager.getPalette(i).name;
             new VkAlertDialog.Builder(requireContext())
                     .setTitle(AndroidUtils.getString("select_palette"))
@@ -178,7 +211,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         LifecycleUtils.restartApplicationWithTimer();
     }
 
-    private void switchFragment(Class<? extends FragmentImpl> fragmentClz) {
+    private void switchFragment(Class< ? extends FragmentImpl > fragmentClz) {
         var intent = new Navigator(fragmentClz)
                 .b(requireContext())
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/java/ru/vtosters/lite/ui/fragments/VKPayFragment.java

@@ -15,8 +15,9 @@ public class VKPayFragment extends FragmentImpl {
 
     public void start() {
         VKUIwrapper.setLink("https://vk.com/vkpay");
-        Intent a2 = new Navigator(VKUIwrapper.class).b(getActivity());
-        a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(a2);
+        Intent intent = new Navigator(VKUIwrapper.class)
+                .b(getActivity())
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
     }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java

@@ -1,14 +1,15 @@
 package ru.vtosters.lite.ui.fragments;
 
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.StringRes;
+import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.about.AboutAppFragment;
 import com.vk.balance.BalanceFragment;
+import com.vk.core.fragments.FragmentImpl;
 import com.vk.navigation.Navigator;
 import com.vk.notifications.settings.NotificationsSettingsFragment;
 import com.vk.webapp.fragments.PrivacyFragment;
@@ -25,30 +26,18 @@ import com.vtosters.lite.general.fragments.SettingsGeneralFragment;
 import com.vtosters.lite.ui.MaterialSwitchPreference;
 import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook;
+import ru.vtosters.lite.ssfs.Utils;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.SSFSUtils;
-import ru.vtosters.lite.utils.ThemesUtils;
+import ru.vtosters.lite.utils.*;
 
-import static ru.vtosters.lite.ui.PreferencesUtil.*;
-import static ru.vtosters.lite.utils.About.getBuildNumber;
-import static ru.vtosters.lite.utils.About.getCommitLink;
-import static ru.vtosters.lite.utils.AccountManagerUtils.*;
-import static ru.vtosters.lite.utils.AndroidUtils.*;
-import static ru.vtosters.lite.utils.GmsUtils.isGmsInstalled;
-import static ru.vtosters.lite.utils.ImageUtils.getDrawableFromUrl;
-import static ru.vtosters.lite.utils.Preferences.*;
-import static ru.vtosters.lite.utils.ThemesUtils.*;
-import static ru.vtosters.lite.utils.VTVerifications.vtverif;
+public class VTSettings extends MaterialPreferenceToolbarFragment implements TelegramStickersService.StickersEventsListener {
 
-public class VTSettings extends MaterialPreferenceToolbarFragment {
     public static String getValAsString(@StringRes int strRes, Boolean value) {
-        if (disableSettingsSumms()) return null;
-
-        if (value) {
+        if(value) {
             return AndroidUtils.getString(strRes) + ": " + AndroidUtils.getString(R.string.vtlsettenabled);
         }
 
@@ -56,44 +45,30 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
     }
 
     public static String getSSFSsumm() {
-        if (disableSettingsSumms()) return null;
-
-        if (hasSpecialVerif())
+        if(Preferences.hasSpecialVerif())
             return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifyes);
 
         return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifno);
     }
 
-    public static String getDocksumm() {
-        if (disableSettingsSumms()) return null;
-
-        return AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size();
-    }
-
     public static String getTGSsumm() {
-        if (disableSettingsSumms()) return null;
-
-        return AndroidUtils.getString(R.string.vtltgssumm) + ": " + TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()).getPacksListReference().size();
+        return AndroidUtils.getString(R.string.vtltgssumm) + ": " + TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()).getActivePacksListReference().size();
     }
 
     public static String getProxysumm() {
-        var type = getPrefsValue("proxy");
+        var type = AndroidUtils.getPrefsValue("proxy");
 
-        if (disableSettingsSumms()) return null;
-
-        if (type.equals("noproxy") || type.isEmpty())
+        if(type.equals("noproxy") || type.isEmpty())
             type = AndroidUtils.getString(R.string.vtlsettdisabled);
 
         return AndroidUtils.getString(R.string.vtlproxysumm) + ": " + type;
     }
 
     public static String getThemesumm() {
-        if (disableSettingsSumms()) return null;
-
         String str;
         String[] themeTypeName = AndroidUtils.getArray("theme_type_name");
 
-        switch (getPrefsValue("currsystemtheme")) {
+        switch(AndroidUtils.getPrefsValue("currsystemtheme")) {
             default:
             case "system":
                 str = themeTypeName[0];
@@ -109,46 +84,58 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         return AndroidUtils.getString("current_theme") + ": " + str;
     }
 
-    public static String getSuperappsumm() {
-        if (disableSettingsSumms()) return null;
-
-        return AndroidUtils.getString(R.string.elements_hidden_count) + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size();
+    private void switchTheme(boolean isDarkTheme) {
+        ThemesUtils.setTheme(isDarkTheme ? ThemesUtils.getDarkTheme() : ThemesUtils.getLightTheme(), requireActivity());
     }
 
-    private void switchTheme(boolean isDarkTheme) {
-        setTheme(isDarkTheme ? getDarkTheme() : getLightTheme(), requireActivity());
+    @Override
+    public void onPackAdded(TelegramStickersPack pack, int atIndex) {
+
+    }
+
+    @Override
+    public void onPackRemoved(TelegramStickersPack pack, int atIndex) {
+
+    }
+
+    @Override
+    public void onPackChanged(TelegramStickersPack pack, int atIndex) {
+
+    }
+
+    @Override
+    public void onPackDownloadError(TelegramStickersPack pack, Exception error) {
+
+    }
+
+    @Override
+    public void onActivePacksListChanged() {
+        findPreference("tgs_stickers").setSummary(getTGSsumm());
+    }
+
+    @Override
+    public void onInactivePacksListChanged() {
+
     }
 
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
-        var feedsumm = getValAsString(R.string.vtlfeedsumm, ads());
-        var docksumm = getDocksumm();
-        var msgsumm = isTablet() ? getValAsString(R.string.autotranslate_title, autotranslate()) : getValAsString(R.string.vtlmsgsumm, vkme());
-        var activitysumm = getValAsString(R.string.vtlactivitysumm, offline());
-        var themessumm = getValAsString(R.string.vtlthemessumm, navbar());
-        var tgssumm = getTGSsumm();
-        var superapp = getSuperappsumm();
-        var mediasumm = getValAsString(R.string.vtlinterfacesumm, shortinfo());
-        var interfacesumm = getValAsString(R.string.showstories, stories());
-        var proxysumm = getProxysumm();
-        var othersumm = getValAsString(R.string.vtlothersumm, vtverif());
-        var ssfs = getSSFSsumm();
-        var about = "Commit: " + getBuildNumber();
+        TelegramStickersService.getInstance(requireContext()).addStickersEventsListener(this);
 
         this.addPreferencesFromResource(R.xml.empty);
 
-        addPreferenceDrawable(
-                this,
+        var accountSwitcher = PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
                 "account_switcher",
-                getUsername(),
+                AccountManagerUtils.getUsername(),
                 requireContext().getString(R.string.vtllogout),
                 requireContext().getDrawable(R.drawable.ic_user_circle_outline_28),
                 preference -> {
                     try {
                         VKAuth.a("logout", false);
-                    } catch (Exception ignored) {
+                    } catch(Exception ignored) {
                     }
 
                     var intent = new Intent(requireContext(), MainActivity.class)
@@ -158,308 +145,443 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                     requireContext().startActivity(intent);
 
                     return false;
-        });
+                });
 
         VTExecutors.getIoScheduler().a(() -> {
-            var icon = getDrawableFromUrl(getUserPhoto(), 0, true, true);
-            if (icon == null) return;
+            var icon = ImageUtils.getDrawableFromUrl(AccountManagerUtils.getUserPhoto(), 0, true, true);
+            if(icon == null) return;
             requireActivity().runOnUiThread(() -> {
-                findPreference("account_switcher").setIcon(icon);
+                accountSwitcher.setIcon(icon);
             });
         });
 
-        addPreference(this, "", requireContext().getString(R.string.vtssfs), ssfs, R.drawable.ic_link_circle_outline_28, preference -> {
-            Context context = requireContext();
-            VKUIwrapper.setLink(SSFSUtils.getSSFSLink());
-            Intent a2 = new Navigator(VKUIwrapper.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtssfs),
+                getSSFSsumm(),
+                R.drawable.ic_link_circle_outline_28,
+                preference -> {
+                    VKUIwrapper.setLink(Utils.getVKUILink());
+                    launchFragment(VKUIwrapper.class);
+                    return false;
+                }
+        );
 
-        addPreferenceCategory(this, requireContext().getString(R.string.appearance_theme_use_system));
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.appearance_theme_use_system);
 
-        if (Build.VERSION.SDK_INT >= 28 && milkshake()) {
-            addListPreferenceIcon(
-                    this,
+        if(Build.VERSION.SDK_INT >= 28 && Preferences.milkshake()) {
+            PreferenceFragmentUtils.addListPreference(
+                    getPreferenceScreen(),
                     "currsystemtheme",
                     "system",
                     requireContext().getString(R.string.appearance_theme_use_system),
-                    R.drawable.ic_palette_outline_28, getThemesumm(),
+                    R.drawable.ic_palette_outline_28,
+                    getThemesumm(),
                     AndroidUtils.getArray("theme_type_name_checkbox"),
-                    new String[]{"system", "dark", "light"},
+                    new String[] { "system", "dark", "light" },
                     (preference, o) -> {
                         String value = (String) o;
-                        if (!value.equals("system")) {
+                        if(!value.equals("system")) {
                             var theme = value.equals("dark") ? ThemesUtils.getDarkTheme() : ThemesUtils.getLightTheme();
                             ThemesUtils.applyTheme(theme);
                         }
-                        edit().putString("currsystemtheme", value).commit();
+                        AndroidUtils.edit().putString("currsystemtheme", value).commit();
                         SystemThemeChangerHook.onThemeChanged(getResources().getConfiguration());
                         return true;
                     });
         } else {
-            addMaterialSwitchPreference(this, "", requireContext().getString(R.string.vtsettdarktheme), "", R.drawable.ic_palette_outline_28, isDarkTheme(), (preference, o) -> {
-                final var switchPreference = (MaterialSwitchPreference) preference;
-                final var isDarkTheme = !switchPreference.isChecked();
-                switchTheme(isDarkTheme);
-                return true;
-            });
-        }
-
-        if (!isGmsInstalled()) {
-            addPreferenceCategory(this, requireContext().getString(R.string.gmsname));
-
-            addPreference(this, "", requireContext().getString(R.string.installgms), "", R.drawable.ic_about_outline_28, preference -> {
-                Context context = requireContext();
-                Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
-                a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(a2);
-                return false;
-            });
-        }
-
-        if (devmenu()) {
-            addPreferenceCategory(this, requireContext().getString(R.string.sett_debug));
-
-            addPreference(this, "", requireContext().getString(R.string.sett_debug), "", R.drawable.ic_bug_outline_28, preference -> {
-                Context context = requireContext();
-                Intent a2 = new Navigator(SettingsDebugFragment.class).b(context);
-                a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(a2);
-                return false;
-            });
-
-            addMaterialSwitchPreference(this, "ssl", requireContext().getString(R.string.debug_developer_force_ssl), requireContext().getString(R.string.debug_developer_force_ssl_summary), R.drawable.ic_globe_outline_28, true, (preference, o) -> {
-                boolean value = (boolean) o;
-                edit().putBoolean("ssl", value).commit();
-                return true;
-            });
-
-            if (dev() && isValidSignature()) {
-                addMaterialSwitchPreference(this, "autoupdates", requireContext().getString(R.string.checkupdates), "", R.drawable.ic_camera_switch_outline_24, true, (preference, o) -> {
-                    boolean value = (boolean) o;
-                    edit().putBoolean("autoupdates", value).commit();
-                    return true;
-                });
-            }
-        }
-
-        addPreferenceCategory(this, requireContext().getString(R.string.vtsettaccount));
-
-        addPreference(this, "", requireContext().getString(R.string.vkconnect), "", R.drawable.ic_user_circle_outline_28, preference -> {
-            Context context = requireContext();
-            VKUIwrapper.officalLinks("account");
-            Intent a2 = new Navigator(VKUIwrapper.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.privacy_settings), "", R.drawable.ic_privacy_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(PrivacyFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.sett_account), "", R.drawable.ic_user_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(SettingsAccountFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        if (isVKTester()) {
-            addPreference(this, "", requireContext().getString(R.string.bugs), "", R.drawable.ic_bug_outline_28, preference -> {
-                Context context = requireContext();
-                VKUIwrapper.officalLinks("bugs");
-                Intent a2 = new Navigator(VKUIwrapper.class).b(context);
-                a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(a2);
-                return false;
-            });
-        }
-
-        addPreferenceCategory(this, requireContext().getString(R.string.vtlvksettings));
-
-        addPreference(this, "", requireContext().getString(R.string.sett_general), "", R.drawable.ic_settings_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(SettingsGeneralFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.blacklist), "", R.drawable.ic_users_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(BlacklistFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.sett_notifications), "", R.drawable.ic_menu_notification_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(NotificationsSettingsFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        if (VKAccountManager.d().isMusicSubs()) {
-            addPreference(this, "", requireContext().getString(R.string.subscription_music), "", R.drawable.ic_music_outline_28, preference -> {
-                Context context = requireContext();
-                Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).b(context);
-                a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(a2);
-                return false;
-            });
-        }
-
-        addPreference(this, "", requireContext().getString(R.string.votes), "", R.drawable.ic_coins_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(BalanceFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreferenceCategory(this, requireContext().getString(R.string.vtsettmod));
-
-        if (vkme()) {
-            addPreference(this, "", requireContext().getString(R.string.warning), requireContext().getString(R.string.vkme_mode_info), R.drawable.ic_about_outline_28, preference -> false);
-        } else {
-            addPreference(this, "", requireContext().getString(R.string.vtlfeed), feedsumm, R.drawable.ic_newsfeed_outline_28, preference -> {
-                Context context = requireContext();
-                Intent a2 = new Navigator(FeedFragment.class).b(context);
-                a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(a2);
-                return false;
-            });
-        }
-
-        addPreference(this, "", requireContext().getString(R.string.vtlmedia), mediasumm, R.drawable.ic_media_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(MediaFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.vtlmessages), msgsumm, R.drawable.ic_message_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(MessagesFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.vtltgs), tgssumm, R.drawable.ic_telegram_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(StickersFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.vtlthemes), themessumm, R.drawable.ic_write_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(ThemesFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.vtlinterface), interfacesumm, R.drawable.ic_interface_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(InterfaceFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        if (!vkme()) {
-            if (!isTablet()) {
-                addPreference(this, "", requireContext().getString(R.string.dockbar_editor), docksumm, R.drawable.ic_list_outline_28, preference -> {
-                    Context context = requireContext();
-                    Intent intent = new Navigator(DockBarEditorFragment.class).b(context);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    context.startActivity(intent);
-                    return false;
-                });
-
-                if (milkshake() && superapp()) {
-                    addPreference(this, "", requireContext().getString(R.string.superapp_editor), superapp, R.drawable.ic_services_outline_28, (preference) -> {
-                        Context context = requireContext();
-                        Intent intent = new Navigator(SuperAppEditorFragment.class).b(context);
-                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        context.startActivity(intent);
+            PreferenceFragmentUtils.addMaterialSwitchPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.vtsettdarktheme),
+                    "",
+                    R.drawable.ic_palette_outline_28,
+                    ThemesUtils.isDarkTheme(),
+                    (preference, o) -> {
+                        final var switchPreference = (MaterialSwitchPreference) preference;
+                        final var isDarkTheme = !switchPreference.isChecked();
+                        switchTheme(isDarkTheme);
                         return true;
-                    });
-                }
+                    }
+            );
+        }
+
+        if(!GmsUtils.isGmsInstalled()) {
+            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.gmsname);
+
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.installgms),
+                    "",
+                    R.drawable.ic_about_outline_28,
+                    preference -> {
+                        launchFragment(InstallGMSFragment.class);
+                        return false;
+                    }
+            );
+        }
+
+        if(Preferences.devmenu()) {
+            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.sett_debug);
+
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.sett_debug),
+                    "",
+                    R.drawable.ic_bug_outline_28,
+                    preference -> {
+                        launchFragment(SettingsDebugFragment.class);
+                        return false;
+                    }
+            );
+
+            PreferenceFragmentUtils.addMaterialSwitchPreference(
+                    getPreferenceScreen(),
+                    "ssl",
+                    requireContext().getString(R.string.debug_developer_force_ssl),
+                    requireContext().getString(R.string.debug_developer_force_ssl_summary),
+                    R.drawable.ic_globe_outline_28,
+                    true,
+                    (preference, o) -> {
+                        AndroidUtils.edit().putBoolean("ssl", (boolean) o).commit();
+                        return true;
+                    }
+            );
+
+            if(Preferences.dev() && Preferences.isValidSignature()) {
+                PreferenceFragmentUtils.addMaterialSwitchPreference(
+                        getPreferenceScreen(),
+                        "autoupdates",
+                        requireContext().getString(R.string.checkupdates),
+                        "",
+                        R.drawable.ic_bug_outline_28,
+                        true,
+                        (preference, o) -> {
+                            boolean value = (boolean) o;
+                            AndroidUtils.edit().putBoolean("autoupdates", value).commit();
+                            return true;
+                        }
+                );
             }
         }
 
-        addPreference(this, "", requireContext().getString(R.string.vtlactivity), activitysumm, R.drawable.ic_write_outline_28_new_accent, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(ActivityFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.vtsettaccount);
 
-        addPreference(this, "", requireContext().getString(R.string.vtlproxy), proxysumm, R.drawable.ic_globe_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(ProxySettingsFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vkconnect),
+                "",
+                R.drawable.ic_user_circle_outline_28,
+                preference -> {
+                    VKUIwrapper.officalLinks("account");
+                    launchFragment(VKUIwrapper.class);
+                    return false;
+                }
+        );
 
-        addPreference(this, "", requireContext().getString(R.string.vtlother), othersumm, R.drawable.ic_more_horizontal_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(OtherFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.privacy_settings),
+                "",
+                R.drawable.ic_privacy_outline_28,
+                preference -> {
+                    launchFragment(PrivacyFragment.class);
+                    return false;
+                }
+        );
 
-        addPreferenceCategory(this, requireContext().getString(R.string.vtsettaboutmod));
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.sett_account),
+                "",
+                R.drawable.ic_user_outline_28,
+                preference -> {
+                    launchFragment(SettingsAccountFragment.class);
+                    return false;
+                }
+        );
 
-        addPreference(this, "", requireContext().getString(R.string.menu_about), about, R.drawable.ic_about_outline_28, preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(AboutAppFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.opencommit), "", R.drawable.ic_link_outline_28, preference -> {
-            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse(getCommitLink())));
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.vtfaq), requireContext().getString(R.string.vtfaqsumm), R.drawable.ic_help_outline_28, preference -> {
-            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/s/vtosters_faq")));
-            return false;
-        });
-
-        addPreference(this, "", requireContext().getString(R.string.reportbug), requireContext().getString(R.string.reportbugsumm), R.drawable.ic_bug_outline_28, preference -> {
-            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/issues")));
-            return false;
-        });
-
-        if (isValidSignature()) {
-            addPreferenceCategory(this, requireContext().getString(R.string.updates));
-
-            addPreference(this, "", requireContext().getString(R.string.checkforupdates), "", R.drawable.ic_download_outline_28, preference -> {
-                OTADialog.checkUpdates(getActivity());
-                return false;
-            });
+        if(AccountManagerUtils.isVKTester()) {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.bugs),
+                    "",
+                    R.drawable.ic_bug_outline_28,
+                    preference -> {
+                        VKUIwrapper.officalLinks("bugs");
+                        launchFragment(VKUIwrapper.class);
+                        return false;
+                    }
+            );
         }
+
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtlvksettings));
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.sett_general),
+                "",
+                R.drawable.ic_settings_outline_28,
+                preference -> {
+                    launchFragment(SettingsGeneralFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.blacklist),
+                "",
+                R.drawable.ic_users_outline_28,
+                preference -> {
+                    launchFragment(BlacklistFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.sett_notifications),
+                "",
+                R.drawable.ic_menu_notification_outline_28,
+                preference -> {
+                    launchFragment(NotificationsSettingsFragment.class);
+                    return false;
+                }
+        );
+
+        if(VKAccountManager.d().isMusicSubs()) {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.subscription_music),
+                    "",
+                    R.drawable.ic_music_outline_28,
+                    preference -> {
+                        launchFragment(MusicSubscriptionControlFragment.class);
+                        return false;
+                    }
+            );
+        }
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.votes),
+                "",
+                R.drawable.ic_coins_outline_28,
+                preference -> {
+                    launchFragment(BalanceFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtsettmod));
+
+        if(Preferences.vkme()) {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.warning),
+                    requireContext().getString(R.string.vkme_mode_info),
+                    R.drawable.ic_about_outline_28,
+                    preference -> false
+            );
+        } else {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.vtlfeed),
+                    getValAsString(R.string.vtlfeedsumm, Preferences.ads()),
+                    R.drawable.ic_newsfeed_outline_28,
+                    preference -> {
+                        launchFragment(FeedFragment.class);
+                        return false;
+                    }
+            );
+        }
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlmedia),
+                getValAsString(R.string.vtlinterfacesumm, Preferences.shortinfo()),
+                R.drawable.ic_media_outline_28,
+                preference -> {
+                    launchFragment(MediaFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlmessages),
+                AndroidUtils.isTablet()
+                        ? getValAsString(R.string.autotranslate_title, Preferences.autotranslate())
+                        : getValAsString(R.string.vtlmsgsumm, Preferences.vkme()),
+                R.drawable.ic_message_outline_28,
+                preference -> {
+                    launchFragment(MessagesFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "tgs_stickers",
+                requireContext().getString(R.string.vtltgs),
+                getTGSsumm(),
+                R.drawable.ic_telegram_outline_28,
+                preference -> {
+                    launchFragment(StickersFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlthemes),
+                getThemesumm(),
+                R.drawable.ic_write_outline_28,
+                preference -> {
+                    launchFragment(ThemesFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlinterface),
+                getValAsString(R.string.showstories, Preferences.stories()),
+                R.drawable.ic_interface_outline_28,
+                preference -> {
+                    launchFragment(InterfaceFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlactivity),
+                getValAsString(R.string.vtlactivitysumm, Preferences.offline()),
+                R.drawable.ic_write_outline_28_new_accent,
+                preference -> {
+                    launchFragment(ActivityFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlproxy),
+                getProxysumm(),
+                R.drawable.ic_globe_outline_28,
+                preference -> {
+                    launchFragment(ProxySettingsFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlother),
+                getValAsString(R.string.vtlothersumm, VTVerifications.vtverif()),
+                R.drawable.ic_more_horizontal_28,
+                preference -> {
+                    launchFragment(OtherFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtsettaboutmod));
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.menu_about),
+                "Commit: " + About.getBuildNumber(),
+                R.drawable.ic_about_outline_28,
+                preference -> {
+                    launchFragment(AboutAppFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.opencommit),
+                "",
+                R.drawable.ic_link_outline_28,
+                preference -> {
+                    requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(About.getCommitLink())));
+                    return false;
+                }
+        );
+        
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtfaq),
+                requireContext().getString(R.string.vtfaqsumm),
+                R.drawable.ic_help_outline_28,
+                preference -> {
+                    requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://t.me/s/vtosters_faq")));
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.reportbug),
+                requireContext().getString(R.string.reportbugsumm),
+                R.drawable.ic_bug_outline_28,
+                preference -> {
+                    requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://github.com/vtosters/lite/issues")));
+                    return false;
+                }
+        );
+
+        if(Preferences.isValidSignature()) {
+            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.updates));
+
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.checkforupdates),
+                    "",
+                    R.drawable.ic_download_outline_28,
+                    preference -> {
+                        OTADialog.checkUpdates(getActivity());
+                        return false;
+                    }
+            );
+        }
+    }
+
+    private void launchFragment(Class< ? extends FragmentImpl > fragmentClz) {
+        Intent intent = new Navigator(fragmentClz)
+                .b(requireContext())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        requireContext().startActivity(intent);
     }
 
     @Override
@@ -471,4 +593,10 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
     public int T4() {
         return R.string.notification_settings;
     }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        TelegramStickersService.getInstance(requireContext()).removeStickersEventsListener(this);
+    }
 }

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

@@ -241,7 +241,7 @@ public class StickersFragment extends BaseToolbarFragment {
                                 .setTitle(requireContext().getString(R.string.stickersapi8))
                                 .setMessage(requireContext().getString(R.string.stickersapi9) +
                                         requireContext().getString(R.string.stickersapi10))
-                                .setNeutralButton("Открыть бота", (dl, i) -> {
+                                .setNeutralButton(AndroidUtils.getString("open_bot"), (dl, i) -> {
                                     var intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/botfather"));
                                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                     requireActivity().startActivity(intent);

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

@@ -1,15 +1,13 @@
 package ru.vtosters.lite.ui.fragments.tgstickers;
 
 import android.os.Bundle;
-
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.vk.core.util.ToastUtils;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.tgs.TGRoot;
-import ru.vtosters.lite.ui.PreferencesUtil;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 
 public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragment {
 
@@ -20,17 +18,17 @@ public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragme
         int vtosterXml = R.xml.empty;
         addPreferencesFromResource(vtosterXml);
 
-        PreferencesUtil.addPreferenceCategory(this, requireContext().getString(R.string.sprefsstickers));
-        PreferencesUtil.addPreference(this, "", requireContext().getString(R.string.sprefsdelkey), "", 0, preference -> {
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.sprefsstickers));
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", R.string.sprefsdelkey, 0, 0, preference -> {
             TGPref.setTGBotKey(null);
             ToastUtils.a(requireContext().getString(R.string.sprefsdelkey2));
             return false;
         });
 
-        PreferencesUtil.addPreferenceCategory(this, requireContext().getString(R.string.sprefsnetwork));
-        PreferencesUtil.addListPreference(this, "VTGS:CM", "0", requireContext().getString(R.string.sprefsctype), new CharSequence[]{
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.sprefsnetwork));
+        PreferenceFragmentUtils.addListPreference(getPreferenceScreen(), "VTGS:CM", "0", requireContext().getString(R.string.sprefsctype), new CharSequence[] {
                 requireContext().getString(R.string.ctypedirect), requireContext().getString(R.string.ctypesocks)
-        }, new String[]{
+        }, new String[] {
                 "0", "2"
         });
 
@@ -40,40 +38,40 @@ public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragme
             String newData = (String) o;
             TGPref.setTGConnectMethod(Integer.parseInt(newData));
             TelegramStickersGrabber.updateURLs();
-            preference.setTitle(TGRoot.getSummary()); // setTitle
+            preference.setTitle(TGRoot.getSummary());
             return true;
         });
 
-        PreferencesUtil.addPreferenceCategory(this, requireContext().getString(R.string.ssocks));
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.ssocks);
 
-        PreferencesUtil.addEditTextPreference(this, "tg_proxy_host", requireContext().getString(R.string.ssockshost), (preference, o) -> {
-            TGPref.setTGProxyIP((String) o);
+        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_host", R.string.ssockshost, (preference, o) -> {
+            TGPref.setTGProxyIP(o);
             return true;
         });
-        PreferencesUtil.addEditTextPreference(this, "tg_proxy_port", requireContext().getString(R.string.ssocksport), (preference, o) -> {
+        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_port", R.string.ssocksport, (preference, o) -> {
             try {
-                TGPref.setTGProxyPort(Integer.parseInt((String) o));
+                TGPref.setTGProxyPort(Integer.parseInt(o));
                 return true;
-            } catch (Exception e) {
+            } catch(Exception e) {
                 ToastUtils.a(requireContext().getString(R.string.ssockswport));
                 return false;
             }
         });
-        PreferencesUtil.addMaterialSwitchPreference(this, "tg_proxy_auth", requireContext().getString(R.string.ssocksauth), "", 0, false, (preference, o) -> {
+        PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "tg_proxy_auth", requireContext().getString(R.string.ssocksauth), "", 0, false, (preference, o) -> {
             boolean value = (boolean) o;
 
-            findPreference("tg_proxy_login").setEnabled(value); // findPreference("tg_proxy_login").setEnabled(value);
-            findPreference("tg_proxy_pass").setEnabled(value); // findPreference("tg_proxy_pass").setEnabled(booleanValue);
+            findPreference("tg_proxy_login").setEnabled(value);
+            findPreference("tg_proxy_pass").setEnabled(value);
 
             TGPref.setTGProxyPassEnabled(value);
             return true;
         });
-        PreferencesUtil.addEditTextPreference(this, "tg_proxy_login", requireContext().getString(R.string.ssockslogin), (preference, o) -> {
-            TGPref.setTGProxyUserPass((String) o, TGPref.getTGProxyPass());
+        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_login", R.string.ssockslogin, (preference, o) -> {
+            TGPref.setTGProxyUserPass(o, TGPref.getTGProxyPass());
             return true;
         });
-        PreferencesUtil.addEditTextPreference(this, "tg_proxy_pass", requireContext().getString(R.string.ssockspass), (preference, o) -> {
-            TGPref.setTGProxyUserPass(TGPref.getTGProxyUser(), (String) o);
+        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_pass", R.string.ssockspass, (preference, o) -> {
+            TGPref.setTGProxyUserPass(TGPref.getTGProxyUser(), o);
             return true;
         });
 

app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java

@@ -1,36 +1,28 @@
 package ru.vtosters.lite.ui.wallpapers;
 
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getDimmingSummary;
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getMosaicSummary;
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getRadiusSummary;
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaperFile;
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.removeWallpaper;
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.requestUpdateWallpaper;
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-import static ru.vtosters.lite.utils.Preferences.hasVerification;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.widget.Toast;
-
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
-
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.im.ImEngineProvider;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import ru.vtosters.lite.ui.PreferencesUtil;
-import ru.vtosters.lite.utils.AndroidUtils;
+import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.*;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+import static ru.vtosters.lite.utils.Preferences.hasVerification;
 
 public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
 
@@ -55,20 +47,20 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
 
         addPreferencesFromResource(R.xml.empty);
 
-        PreferencesUtil.addPreferenceCategory(this, requireContext().getString(R.string.vkim_settings_appearance_chat_preview_title));
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vkim_settings_appearance_chat_preview_title));
 
         mWPPreviewPref = new WallpaperPreferences(getContext());
         mWPPreviewPref.setIcon(null);
         mWPPreviewPref.setIconSpaceReserved(false);
         getPreferenceScreen().addPreference(mWPPreviewPref);
 
-        PreferencesUtil.addPreference(this, "wp_set", requireContext().getString(R.string.wallpaper_select), requireContext().getString(R.string.wallpaper_from_gallery), R.drawable.ic_picture_outline_28, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "wp_set", requireContext().getString(R.string.wallpaper_select), requireContext().getString(R.string.wallpaper_from_gallery), R.drawable.ic_picture_outline_28, preference -> {
             startActivityForResult(new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI), 1488);
             removeStickCache();
             return true;
         });
 
-        PreferencesUtil.addPreference(this, "wp_clear", requireContext().getString(R.string.wallpaper_remove), "", R.drawable.ic_delete_outline_28, preference -> {
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "wp_clear", requireContext().getString(R.string.wallpaper_remove), "", R.drawable.ic_delete_outline_28, preference -> {
             removeWallpaper();
             requestUpdateWallpaper();
             mWPPreviewPref.redraw();
@@ -76,30 +68,30 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
-        PreferencesUtil.addPreferenceCategory(this, requireContext().getString(R.string.vtlfilters));
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtlfilters));
 
         if (!hasVerification() && !getBoolValue("dialogrecomm", false)) {
-            PreferencesUtil.addPreference(this, "", requireContext().getString(R.string.filters_warning), requireContext().getString(R.string.icons_warning_info), 0, preference -> {
-                requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app/donate/")));
+            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", requireContext().getString(R.string.filters_warning), requireContext().getString(R.string.icons_warning_info), 0, preference -> {
+                requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://vtosters.app/donate/")));
                 return false;
             });
         }
 
-        PreferencesUtil.addListPreference(this, "msg_blur_radius", "disabled", requireContext().getString(R.string.filter_blur), AndroidUtils.getArray(R.array.filter_types), new String[]{
+        PreferenceFragmentUtils.addListPreference(getPreferenceScreen(), "msg_blur_radius", "disabled", requireContext().getString(R.string.filter_blur), AndroidUtils.getArray(R.array.filter_types), new String[]{
                 "disabled", "low", "med", "high"
         });
 
-        PreferencesUtil.addListPreference(this, "msg_dim", "off", requireContext().getString(R.string.filter_dim), AndroidUtils.getArray(R.array.filter_dim_types), new String[]{
+        PreferenceFragmentUtils.addListPreference(getPreferenceScreen(), "msg_dim", "off", requireContext().getString(R.string.filter_dim), AndroidUtils.getArray(R.array.filter_dim_types), new String[]{
                 "off", "dim_black", "dim_white"
         });
 
 
-        PreferencesUtil.addListPreference(this, "msg_mosaic", "disabled", requireContext().getString(R.string.filter_mosaic), AndroidUtils.getArray(R.array.filter_types), new String[]{
+        PreferenceFragmentUtils.addListPreference(getPreferenceScreen(), "msg_mosaic", "disabled", requireContext().getString(R.string.filter_mosaic), AndroidUtils.getArray(R.array.filter_types), new String[]{
                 "disabled", "low", "med", "high"
         });
 
         if (hasVerification()) {
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_monochrome", requireContext().getString(R.string.filter_monochrome), "", 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_monochrome", requireContext().getString(R.string.filter_monochrome), "", 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_monochrome", value).commit();
                 requestUpdateWallpaper();
@@ -107,7 +99,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_invert", requireContext().getString(R.string.filter_invert_colors), "", 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_invert", requireContext().getString(R.string.filter_invert_colors), "", 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_invert", value).commit();
                 requestUpdateWallpaper();
@@ -115,7 +107,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_sepia", requireContext().getString(R.string.filter_sepia), "", 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_sepia", requireContext().getString(R.string.filter_sepia), "", 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_sepia", value).commit();
                 requestUpdateWallpaper();
@@ -123,7 +115,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_emboss", requireContext().getString(R.string.filter_emboss), requireContext().getString(R.string.filter_maybe_lag), 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_emboss", requireContext().getString(R.string.filter_emboss), requireContext().getString(R.string.filter_maybe_lag), 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_emboss", value).commit();
                 requestUpdateWallpaper();
@@ -131,7 +123,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_engrave", requireContext().getString(R.string.filter_engrave), requireContext().getString(R.string.filter_maybe_lag), 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_engrave", requireContext().getString(R.string.filter_engrave), requireContext().getString(R.string.filter_maybe_lag), 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_engrave", value).commit();
                 requestUpdateWallpaper();
@@ -139,7 +131,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_flea", requireContext().getString(R.string.filter_flea), "", 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_flea", requireContext().getString(R.string.filter_flea), "", 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_flea", value).commit();
                 requestUpdateWallpaper();
@@ -147,7 +139,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            PreferencesUtil.addMaterialSwitchPreference(this, "msg_snow", requireContext().getString(R.string.filter_flea), "", 0, false, (preference, o) -> {
+            PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "msg_snow", requireContext().getString(R.string.filter_flea), "", 0, false, (preference, o) -> {
                 boolean value = (boolean) o;
                 edit().putBoolean("msg_snow", value).commit();
                 requestUpdateWallpaper();
@@ -156,7 +148,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
             });
         }
 
-        PreferencesUtil.addMaterialSwitchPreference(this, "compresswp", requireContext().getString(R.string.compress_wallpaper_title), requireContext().getString(R.string.compress_wallpaper_summ), 0, true, (preference, o) -> {
+        PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "compresswp", requireContext().getString(R.string.compress_wallpaper_title), requireContext().getString(R.string.compress_wallpaper_summ), 0, true, (preference, o) -> {
             boolean value = (boolean) o;
             edit().putBoolean("compresswp", value).commit();
             requestUpdateWallpaper();

app/src/main/java/ru/vtosters/lite/utils/AndroidUtils.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.utils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -10,6 +11,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
+import com.vk.core.util.LangUtils;
 import com.vk.core.util.Screen;
 import com.vk.core.util.ToastUtils;
 
@@ -18,6 +20,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
 import java.util.Objects;
 
+import com.vtosters.lite.general.fragments.WebViewFragment;
 import ru.vtosters.lite.hooks.DateHook;
 
 public class AndroidUtils {
@@ -133,6 +136,10 @@ public class AndroidUtils {
         ToastUtils.a(text);
     }
 
+    public static void openWebView(String url, Activity activity) {
+        new WebViewFragment.g(url).l().m().h().j().a(activity);
+    }
+
     public static String MD5(String s) {
         try {
             var md = MessageDigest.getInstance("MD5");

app/src/main/java/ru/vtosters/lite/utils/Base64Utils.java

@@ -21,7 +21,7 @@ public class Base64Utils {
 
     public static String encodeValue(String value) {
         try {
-            return URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
+            return URLEncoder.encode(value, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }

app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.*;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
 import java.net.URL;
@@ -77,7 +78,7 @@ public class ImageUtils {
         return outputBitmap;
     }
 
-    public static Drawable setTint(Context ctx, Drawable d) {
+    public static Drawable setTint(Context ctx, @NonNull Drawable d) {
         d.setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_ATOP);
         return d;
     }

app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java

@@ -63,14 +63,12 @@ public class NewsFeedFiltersUtils {
         if (getBoolValue(boolname, false)) {
             try {
                 Scanner scanner;
-                if (ctx != null) {
-                    scanner = new Scanner(ctx.getAssets().open(filename));
+                scanner = new Scanner(ctx.getAssets().open(filename));
 
-                    while (scanner.hasNextLine()) {
-                        var line = scanner.nextLine();
-                        if (!line.isEmpty())
-                            list.add(line.toLowerCase());
-                    }
+                while (scanner.hasNextLine()) {
+                    var line = scanner.nextLine();
+                    if (!line.isEmpty())
+                        list.add(line.toLowerCase());
                 }
             } catch (IOException e) {
                 Log.d("NewsFeedFiltersUtils", e.getMessage());
@@ -79,7 +77,7 @@ public class NewsFeedFiltersUtils {
     } // Get needed filter list from assets
 
     public static boolean injectFiltersReposts(JSONObject obj) throws JSONException {
-        if (getBoolValue("cringerepost", false) && obj.has("copy_history")) {
+        if (obj.has("copy_history")) {
             var copyHistoryNode = obj.optJSONArray("copy_history");
             if (copyHistoryNode != null && copyHistoryNode.length() != 0) {
                 for (int i = 0; i < copyHistoryNode.length(); i++) {
@@ -96,7 +94,7 @@ public class NewsFeedFiltersUtils {
                         return true;
                     }
 
-                    if (mFiltersLinks != null) {
+                    if (mFiltersLinks != null && getBoolValue("cringerepost", false)) {
                         for (String filter : mFiltersLinks) {
                             if (text.contains(filter)) {
                                 if (dev())
@@ -135,7 +133,6 @@ public class NewsFeedFiltersUtils {
                 }
             }
 
-
             if (mFiltersLinks != null) {
                 for (String filter : mFiltersLinks) {
                     if (copyrightLink != null && copyrightLink.contains(filter)) return true;

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -18,6 +18,7 @@ import android.os.Build;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 
+import android.util.Log;
 import com.vtosters.lite.data.Users;
 import com.vtosters.lite.fragments.SettingsListFragment;
 
@@ -35,6 +36,7 @@ public class Preferences {
 
         GmsUtils.fixGapps();
         setProxy();
+        setupFilters();
         VTVerifications.load(application);
         LifecycleUtils.registerActivities(application);
     } // VK Init
@@ -314,10 +316,6 @@ public class Preferences {
         return false;
     }
 
-    public static boolean disableSettingsSumms() {
-        return getBoolValue("disableSettingsSumms", false);
-    }
-
     public static boolean hasVerification() {
         return isVerified(AccountManagerUtils.getUserId());
     }
@@ -353,4 +351,18 @@ public class Preferences {
         }
         return origquality;
     }
+
+    public static String photoQuality(String url) {
+//        if (dev()) Log.d("PhotoQuality", url);
+
+//        if (url.contains("quality=") && !url.contains("quality=100") && !getBoolValue("compressPhotos", true)) {
+//            if (url.contains("quality=95")) {
+//                url = url.replace("quality=95", "quality=99");
+//            } else {
+//                url = url.replace("quality=96", "quality=99");
+//            }
+//        }
+
+        return url;
+    }
 }

app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java

@@ -1,63 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import android.text.TextUtils;
-import android.util.Log;
-import com.vk.profile.presenter.UserPresenter;
-import com.vtosters.lite.R;
-import com.vtosters.lite.api.ExtendedUserProfile;
-import com.vtosters.lite.fragments.messages.chat.vc.MsgSendVc;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import org.json.JSONException;
-import org.json.JSONObject;
-import ru.vtosters.lite.di.singleton.VtOkHttpClient;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserID;
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-
-public class ProfileHider {
-    private static final OkHttpClient client = VtOkHttpClient.getInstance();
-
-    public static void injectMap(HashMap<Integer, UserPresenter.a.a> hashMap) {
-        if (VTVerifications.isServiceAccount(getUserId())) {
-            hashMap.put(100, new UserPresenter.a.a(R.string.service_account_admin_100_info, R.color.service_account_admin_100, R.drawable.ic_custom_avatar_id100));
-            hashMap.put(101, new UserPresenter.a.a(R.string.service_account_admin_101_info, R.color.service_account_admin_101, R.drawable.ic_custom_avatar_id101));
-            hashMap.put(333, new UserPresenter.a.a(R.string.service_account_mobile_info, R.color.service_account_admin_333, R.drawable.ic_custom_avatar_id333)
-            );
-        }
-    }
-
-    public static void fetchInfo(ExtendedUserProfile extendedUserProfile) {
-        int userID = getUserID(extendedUserProfile.a);
-        if (VTVerifications.isServiceAccount(userID)) {
-            Request request = new Request.a()
-                    .b("https://sf.vknext.net/block_text?user_id=" + userID)
-                    .a();
-            try {
-                JSONObject payload = new JSONObject(client.a(request)
-                        .execute()
-                        .c()
-                        .a()
-                        .g());
-                String response = payload.optJSONObject(MsgSendVc.d0).optString("response");
-                if (!TextUtils.isEmpty(response))
-                    extendedUserProfile.z2 = response;
-            } catch (IOException | JSONException e) {
-                e.printStackTrace();
-            } catch (NullPointerException e) {
-                Log.e("ProfileHide", "null \"profiles\" node\n" + e);
-            }
-        }
-    }
-
-    public static String getInfo(ExtendedUserProfile extendedUserProfile) {
-        int userID = getUserID(extendedUserProfile);
-        if (VTVerifications.isServiceAccount(userID) && !TextUtils.isEmpty(extendedUserProfile.z2))
-            return extendedUserProfile.z2;
-        return getGlobalContext().getString(UserPresenter.q0.a(userID));
-    }
-}

app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java

@@ -1,48 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import com.vk.core.network.Network;
-
-import static ru.vtosters.lite.hooks.DateHook.getLocale;
-import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-import static ru.vtosters.lite.utils.Preferences.dev;
-import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
-
-public class SSFSUtils {
-    public static String getSSFSLink() {
-        return SSFSDomain() +
-                "?token=" + AccountManagerUtils.getUserToken() +
-                "&vt_dark=" + getDarkVKUI() +
-                "&vt_amoled=" + getAmoledVKUI() +
-                "&secret=" + AccountManagerUtils.getUserSecret() +
-                "&proxy=" + getUserProxy() +
-                "&lang=" + getLocale() +
-                "&vt=1" +
-                "&useragent=" + Base64Utils.encodeValue(Base64Utils.encode(Network.l.c().a())) +
-                "&vt_debug=" + isDEVModEnabled();
-    }
-
-    public static String SSFSDomain() {
-        String string = getPrefsValue("ssfscustom");
-
-        if (!string.isEmpty()) return string;
-
-        return "https://ssfs.vtosters.app";
-    }
-
-    public static String getDarkVKUI() {
-        return isDarkTheme() ? "1" : "0";
-    }
-
-    public static String getAmoledVKUI() {
-        return ThemesUtils.isAmoledTheme() && isDarkTheme() ? "1" : "0";
-    }
-
-    public static String getUserProxy() {
-        return isAnyProxyEnabled() ? "1" : "0";
-    }
-
-    public static String isDEVModEnabled() {
-        return dev() ? "1" : "0";
-    }
-}

app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java

@@ -102,7 +102,7 @@ public class ThemesUtils {
 
     public static int getAccentColor() {
         var accent = AndroidUtils.getPreferences().getInt("accent_color", getColorFromAttr(R.attr.accent));
-        return (accent == 0 || !isMilkshake()) ? isMonetTheme() ? getColorFromAttr(R.attr.accent) : getStockAccent() : accent;
+        return (accent == 0 || !isMilkshake()) || isMonetTheme() ? getColorFromAttr(R.attr.accent) : accent;
     } // Color accent
 
     public static int getMutedAccentColor() {
@@ -194,7 +194,7 @@ public class ThemesUtils {
     }
 
     public static int getMutedColor(int color) {
-        return ColorUtils.blendARGB(color, (isDarkTheme() ? Color.BLACK : Color.WHITE), (isMilkshake() ? 0.5f : 0.32f));
+        return ColorUtils.blendARGB(color, (isDarkTheme() ? Color.BLACK : Color.WHITE), (isMilkshake() ? 0.5f : isDarkTheme() ? 0.32f : 0.2f));
     }
 
     public static void setCustomAccentColor(int newColor, boolean async) {

app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+import static ru.vtosters.lite.utils.Preferences.hasVerification;
 
 import android.content.Context;
 import android.util.Log;
@@ -15,6 +16,7 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -158,4 +160,8 @@ public class VTVerifications {
     public static VerifyInfo VerifyInfo(JSONObject jSONObject) {
         return new VerifyInfo(isVerified(jSONObject), hasPrometheus(jSONObject));
     }
+
+    public static boolean haveDonateButton() {
+        return hasVerification() || new Random().nextInt(6) != 1;
+    }
 }

scripts/rclass_regenerator.sh

@@ -5,10 +5,8 @@ NC='\033[0m'
 BOLD='\033[1m'
 UNDERLINE='\033[4m'
 
-cd ../
-
 echo -e "${BOLD}${UNDERLINE}Decompile release APK...${NC}\n"
-java -jar ../scripts/apktool.jar d VTLite.apk -f -o tmp -s --use-aapt2 -p ../scripts/framework/
+java -jar ./scripts/apktool.jar d ./scripts/VTLite.apk -f -o ./scripts/tmp -s --use-aapt2 -p ./scripts/framework/
 if [ $? -eq 0 ]; then
 	echo -e "${GREEN}Успех!${NC}\n"
 else
@@ -17,7 +15,7 @@ else
 fi
 
 echo -e "${BOLD}${UNDERLINE}Regenerate R.java file...${NC}\n"
-java -jar ../scripts/rclass-generator.jar -f ../scripts/tmp/res/values/public.xml -o ../scripts/app/src/main/java/com/vtosters/lite/R.java -p com.vtosters.lite --comments
+java -jar ./scripts/rclass-generator.jar -f ./scripts/tmp/res/values/public.xml -o ./app/src/main/java/com/vtosters/lite/R.java -p com.vtosters.lite --comments
 if [ $? -eq 0 ]; then
 	echo -e "${GREEN}Успех!${NC}\n"
 else
@@ -26,7 +24,7 @@ else
 fi
 
 echo -e "${BOLD}${UNDERLINE}Clean temp dir...${NC}\n"
-rm -rf ../scripts/tmp
+rm -rf ./scripts/tmp
 if [ $? -eq 0 ]; then
 	echo -e "${GREEN}Успех!${NC}\n"
 else

smali/res/layout/tgs_entry.xml

@@ -9,9 +9,9 @@
     android:gravity="center_vertical"
     android:orientation="vertical"
     android:background="@drawable/tgs_entry_background">
-    android:tag="linearLayout5">
+
     <ImageView
-        android:tag="photo"
+        android:id="@id/photo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"/>
@@ -24,7 +24,7 @@
         android:orientation="vertical">
 
         <TextView
-            android:tag="vkim_cancel"
+            android:id="@id/vkim_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -35,7 +35,7 @@
             android:textStyle="bold" />
 
         <TextView
-            android:tag="vkim_cancel_label_text"
+            android:id="@id/vkim_cancel_label_text"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -50,12 +50,12 @@
         android:orientation="horizontal">
 
         <ImageView
-            android:tag="action_delete"
+            android:id="@id/action_delete"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
 
         <ImageView
-            android:tag="button_update"
+            android:id="@id/button_update"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
 
@@ -65,7 +65,7 @@
             android:layout_weight="1"/>
 
         <androidx.appcompat.widget.SwitchCompat
-            android:tag="choose_btn"
+            android:id="@id/choose_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </LinearLayout>

smali/res/values-ru/strings.xml

@@ -5936,7 +5936,7 @@
     <string name="vtlmsgsumm">Режим VK Мессенджера</string>
     <string name="vtlactivitysumm">Офлайн режим</string>
     <string name="vtlthemessumm">Покраска навбара</string>
-    <string name="vtltgssumm">Установлено паков</string>
+    <string name="vtltgssumm">Используется паков</string>
     <string name="vtlinterfacesumm">Округление чисел</string>
     <string name="vtlproxysumm">Тип проксирования</string>
     <string name="vtlothersumm">Отображение верификаций</string>
@@ -6194,6 +6194,8 @@
     <string name="download_dl">Скачать диалог</string>
     <string name="download_dl_error">Произошла ошибка при попытке скачать диалог</string>
 
+    <string name="dialogstats">Статистика диалога</string>
+
     <string name="saved_as">Сохранено как</string>
     <string name="settings_reset_confirm">Вы действительно хотите сбросить настройки?</string>
     <string name="system_theme_warning">У вас включена системная тема \nПри переключении темы системная тема будет отключена \n\nВы действительно хотите отключить её?</string>
@@ -6335,6 +6337,9 @@
     <string name="amoledtheme_title">AMOLED-тема</string>
     <string name="amoledtheme_summ">Полностью чёрная тема для устройств с AMOLED-экранами</string>
     <string name="monettheme_title">Monet-тема</string>
-    <string name="monettheme_summ">Динамическая покраска приложения на основе обоев телефона</string>
+    <string name="monettheme_summ">Динамическая покраска интерфейса на основе обоев телефона</string>
     <string name="accents">Акценты</string>
+    <string name="cannot_write">Отсутствует разрешение на запись и чтение файлов</string>
+    <string name="open_bot">Открыть бота</string>
+    <string name="crash_service_name">Уведомления об ошибках</string>
 </resources>

smali/res/values-v28/styles.xml

@@ -161,6 +161,7 @@
         <item name="im_ic_write_msg">@drawable/ic_add_24</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_48</item>
         <item name="im_ic_msgdl">@drawable/ic_download_24</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">1.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">6.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">6.0dip</item>
@@ -236,6 +237,7 @@
         <item name="im_ic_write_msg">@drawable/ic_add_24</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_48</item>
         <item name="im_ic_msgdl">@drawable/ic_download_24</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>

smali/res/values-v31/styles.xml

@@ -13,7 +13,7 @@
         <item name="attach_picker_tab_inactive_background">@android:color/system_neutral1_200</item>
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_400</item>
-        <item name="background_content">@android:color/system_neutral1_10</item>
+        <item name="background_content">@android:color/system_neutral1_0</item>
         <item name="background_highlighted">@color/alpha05</item>
         <item name="background_keyboard">@android:color/system_neutral1_100</item>
         <item name="background_light">@android:color/system_neutral1_50</item>
@@ -26,7 +26,7 @@
         <item name="button_commerce_foreground">@android:color/system_neutral1_10</item>
         <item name="button_commerce_foreground_disabled">#66ffffff</item>
         <item name="button_muted_background">#0c001c3d</item>
-        <item name="button_muted_background_disabled">#66f2f3f5</item>
+        <item name="button_muted_background_disabled">@android:color/system_accent2_100</item>
         <item name="button_muted_foreground">@android:color/system_accent1_500</item>
         <item name="button_muted_foreground_disabled">#665181b8</item>
         <item name="button_outline_border">@android:color/system_accent1_300</item>
@@ -110,12 +110,12 @@
         <item name="icon_outline_secondary">@android:color/system_neutral1_300</item>
         <item name="icon_secondary">@android:color/system_neutral1_300</item>
         <item name="icon_tertiary">@android:color/system_neutral1_200</item>
-        <item name="im_attach_tint">@android:color/system_accent1_400</item>
-        <item name="im_bubble_border_alternate">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_border_alternate_highlighted">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_button_background">@android:color/system_neutral1_50</item>
+        <item name="im_attach_tint">@android:color/system_accent1_500</item>
+        <item name="im_bubble_border_alternate">@android:color/system_accent1_50</item>
+        <item name="im_bubble_border_alternate_highlighted">@android:color/system_neutral1_200</item>
+        <item name="im_bubble_button_background">@android:color/system_accent2_100</item>
         <item name="im_bubble_button_background_disabled">#66f9f9f9</item>
-        <item name="im_bubble_button_background_highlighted">@color/gray_A150</item>
+        <item name="im_bubble_button_background_highlighted">@android:color/system_neutral1_200</item>
         <item name="im_bubble_button_background_highlighted_disabled">#66d7d8d9</item>
         <item name="im_bubble_button_foreground">@color/black</item>
         <item name="im_bubble_button_foreground_disabled">#66000000</item>
@@ -125,31 +125,31 @@
         <item name="im_bubble_gift_background_highlighted">@android:color/system_accent3_300</item>
         <item name="im_bubble_gift_text">@android:color/system_accent3_500</item>
         <item name="im_bubble_gift_text_secondary">@android:color/system_accent3_400</item>
-        <item name="im_bubble_incoming">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_incoming_alternate">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_incoming_alternate_highlighted">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_incoming_highlighted">@color/gray_A150</item>
+        <item name="im_bubble_incoming">@android:color/system_accent1_300</item>
+        <item name="im_bubble_incoming_alternate">@android:color/system_accent1_300</item>
+        <item name="im_bubble_incoming_alternate_highlighted">@android:color/system_accent2_200</item>
+        <item name="im_bubble_incoming_highlighted">@android:color/system_accent2_200</item>
         <item name="im_bubble_outgoing">@android:color/system_accent2_100</item>
         <item name="im_bubble_outgoing_alternate">@android:color/system_accent2_100</item>
-        <item name="im_bubble_outgoing_alternate_highlighted">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_outgoing_highlighted">@android:color/system_accent1_300</item>
-        <item name="im_bubble_wallpaper_button_background">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_wallpaper_button_background_disabled">#66f2f3f5</item>
-        <item name="im_bubble_wallpaper_button_background_highlighted">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_wallpaper_button_background_highlighted_disabled">#66e1e3e6</item>
+        <item name="im_bubble_outgoing_alternate_highlighted">@android:color/system_neutral1_300</item>
+        <item name="im_bubble_outgoing_highlighted">@android:color/system_neutral1_300</item>
+        <item name="im_bubble_wallpaper_button_background">@android:color/system_accent2_100</item>
+        <item name="im_bubble_wallpaper_button_background_disabled">@android:color/system_accent2_100</item>
+        <item name="im_bubble_wallpaper_button_background_highlighted">@android:color/system_neutral1_200</item>
+        <item name="im_bubble_wallpaper_button_background_highlighted_disabled">@android:color/system_accent2_100</item>
         <item name="im_bubble_wallpaper_button_foreground">@color/black</item>
         <item name="im_bubble_wallpaper_button_foreground_disabled">#66000000</item>
         <item name="im_bubble_wallpaper_expiring_border">@color/mint_A1_alpha12</item>
-        <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_100</item>
+        <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_0</item>
         <item name="im_bubble_wallpaper_incoming_border">?accent</item>
         <item name="im_bubble_wallpaper_incoming_highlighted">@android:color/system_neutral1_50</item>
         <item name="im_bubble_wallpaper_outgoing">@android:color/system_accent1_200</item>
         <item name="im_bubble_wallpaper_outgoing_border">?accent</item>
         <item name="im_bubble_wallpaper_outgoing_highlighted">@android:color/system_accent1_300</item>
         <item name="im_forward_line_tint">@android:color/system_accent1_600</item>
-        <item name="im_reply_separator">@android:color/system_accent1_400</item>
+        <item name="im_reply_separator">@android:color/system_accent1_500</item>
         <item name="im_service_message_text">@android:color/system_neutral1_400</item>
-        <item name="im_text_name">@android:color/system_accent1_400</item>
+        <item name="im_text_name">@android:color/system_accent1_500</item>
         <item name="im_toolbar_separator">?accent</item>
         <item name="im_toolbar_voice_msg_background">@android:color/system_neutral1_300</item>
         <item name="image_border">@android:color/system_neutral1_50</item>
@@ -273,7 +273,7 @@
         <item name="attach_picker_tab_inactive_background">@android:color/system_neutral1_50</item>
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_400</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_400</item>
-        <item name="background_content">@android:color/system_neutral1_10</item>
+        <item name="background_content">@android:color/system_neutral1_0</item>
         <item name="background_highlighted">@color/alpha05</item>
         <item name="background_keyboard">@android:color/system_neutral1_100</item>
         <item name="background_light">@android:color/system_neutral1_50</item>
@@ -373,9 +373,9 @@
         <item name="im_attach_tint">@android:color/system_accent1_500</item>
         <item name="im_bubble_border_alternate">@android:color/system_neutral1_100</item>
         <item name="im_bubble_border_alternate_highlighted">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_button_background">@android:color/system_neutral1_50</item>
+        <item name="im_bubble_button_background">@android:color/system_accent2_100</item>
         <item name="im_bubble_button_background_disabled">#66f9f9f9</item>
-        <item name="im_bubble_button_background_highlighted">@android:color/system_neutral1_50</item>
+        <item name="im_bubble_button_background_highlighted">@android:color/system_neutral1_100</item>
         <item name="im_bubble_button_background_highlighted_disabled">#66d7d8d9</item>
         <item name="im_bubble_button_foreground">@color/black</item>
         <item name="im_bubble_button_foreground_disabled">#66000000</item>
@@ -387,11 +387,11 @@
         <item name="im_bubble_gift_text_secondary">@android:color/system_accent3_400</item>
         <item name="im_bubble_incoming">@android:color/system_neutral1_50</item>
         <item name="im_bubble_incoming_alternate">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_incoming_alternate_highlighted">@android:color/system_neutral1_50</item>
-        <item name="im_bubble_incoming_highlighted">@color/gray_A150</item>
+        <item name="im_bubble_incoming_alternate_highlighted">@color/alpha05</item>
+        <item name="im_bubble_incoming_highlighted">@android:color/system_neutral1_100</item>
         <item name="im_bubble_outgoing">@android:color/system_accent2_100</item>
         <item name="im_bubble_outgoing_alternate">@android:color/system_accent2_100</item>
-        <item name="im_bubble_outgoing_alternate_highlighted">@android:color/system_neutral1_50</item>
+        <item name="im_bubble_outgoing_alternate_highlighted">@color/alpha05</item>
         <item name="im_bubble_outgoing_highlighted">@android:color/system_accent1_300</item>
         <item name="im_bubble_wallpaper_button_background">@android:color/system_neutral1_50</item>
         <item name="im_bubble_wallpaper_button_background_disabled">#66f2f3f5</item>
@@ -400,9 +400,9 @@
         <item name="im_bubble_wallpaper_button_foreground">@color/black</item>
         <item name="im_bubble_wallpaper_button_foreground_disabled">#66000000</item>
         <item name="im_bubble_wallpaper_expiring_border">@color/mint_A1_alpha12</item>
-        <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_100</item>
+        <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_10</item>
         <item name="im_bubble_wallpaper_incoming_border">?accent</item>
-        <item name="im_bubble_wallpaper_incoming_highlighted">@android:color/system_neutral1_50</item>
+        <item name="im_bubble_wallpaper_incoming_highlighted">@color/alpha05</item>
         <item name="im_bubble_wallpaper_outgoing">@android:color/system_accent1_200</item>
         <item name="im_bubble_wallpaper_outgoing_border">?accent</item>
         <item name="im_bubble_wallpaper_outgoing_highlighted">@android:color/system_accent1_300</item>
@@ -1689,6 +1689,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -1846,6 +1847,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -2147,6 +2149,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>

smali/res/values/attrs.xml

@@ -2510,4 +2510,5 @@
     <attr name="zOrderOnTop" format="boolean" />
     <attr name="im_ic_msgreload" format="reference" />
     <attr name="im_ic_msgdl" format="reference" />
+    <attr name="im_ic_stats" format="reference" />
 </resources>

smali/res/values/strings.xml

@@ -2957,7 +2957,7 @@ in group chats"</string>
     <string name="post_reposted_one_more">%1$s and %2$s more shared this</string>
     <string name="post_reposted_two">%1$s and %2$s shared this</string>
     <string name="post_reposted_two_more">%1$s, %2$s and %3$s more shared this</string>
-    <string name="post_show_full">Expand text...</string>
+    <string name="post_show_full">View all...</string>
     <string name="post_stat_menu_item">Post statistics</string>
     <string name="post_to_wall">Post to wall</string>
     <string name="post_unfix">Unpin</string>
@@ -5642,7 +5642,7 @@ Registration date:"</string>
     <string name="interfaceglobalpost">Shorten posts</string>
     <string name="interfaceglobalpostsum">"Shorten the text in posts
 
-Expand text..."</string>
+View all..."</string>
     <string name="pollresults_title">Poll results</string>
     <string name="pollresults_summ">Show results in polls without voting in them</string>
     <string name="vtl_downloads_title">Downloads</string>
@@ -6071,7 +6071,7 @@ May look like a fake leaving the online"</string>
     <string name="vtlmsgsumm">VK Messenger mode</string>
     <string name="vtlactivitysumm">Offline mode</string>
     <string name="vtlthemessumm">Navbar coloring</string>
-    <string name="vtltgssumm">Installed packs</string>
+    <string name="vtltgssumm">Activated packs</string>
     <string name="vtlinterfacesumm">Round numbers</string>
     <string name="vtlproxysumm">Proxy type</string>
     <string name="vtlothersumm">Show verifications</string>
@@ -6332,6 +6332,8 @@ May look like a fake leaving the online"</string>
     <string name="download_dl">Download dialog</string>
     <string name="download_dl_error">An error occurred while trying to download the dialog</string>
 
+    <string name="dialogstats">Dialog stats</string>
+
     <string name="saved_as">Saved as</string>
     <string name="settings_reset_confirm">Are you sure you want to reset your settings?</string>
     <string name="system_theme_warning">You have the system theme enabled \nWhen you switch the theme, the system theme will be disabled \n\nAre you sure you want to disable it?</string>
@@ -6475,4 +6477,7 @@ May look like a fake leaving the online"</string>
     <string name="monettheme_title">Monet theme</string>
     <string name="monettheme_summ">Dynamic app theme based on phone wallpaper</string>
     <string name="accents">Accents</string>
+    <string name="cannot_write">No permission to write or read files</string>
+    <string name="open_bot">Open a bot</string>
+    <string name="crash_service_name">Error notifications</string>
 </resources>

smali/res/values/styles.xml

@@ -5177,6 +5177,7 @@
         <item name="im_ic_write_msg">@drawable/ic_add_24</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_48</item>
         <item name="im_ic_msgdl">@drawable/ic_download_24</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">1.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">6.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">6.0dip</item>
@@ -6811,6 +6812,7 @@
         <item name="im_ic_write_msg">@drawable/ic_add_24</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_48</item>
         <item name="im_ic_msgdl">@drawable/ic_download_24</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -9178,6 +9180,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -9335,6 +9338,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -9494,6 +9498,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>

smali/res/xml/account_preferences.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference android:title="@string/sett_sync">
-        <intent android:action="com.vtosters.lite.SYNC_SETTINGS" />
+        <intent android:action="com.vtosters.lite.SYNC_SETTINGS"/>
     </Preference>
 </PreferenceScreen>

smali/res/xml/authenticator.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountPreferences="@xml/account_preferences"
-    android:accountType="com.vkontakte.account"
-    android:icon="@drawable/ic_launcher"
-    android:label="@string/app_name"
-    android:smallIcon="@drawable/ic_launcher" />
+                       android:accountPreferences="@xml/account_preferences"
+                       android:accountType="com.vkontakte.account"
+                       android:icon="@drawable/ic_launcher"
+                       android:label="@string/app_name"
+                       android:smallIcon="@drawable/ic_launcher"/>

smali/res/xml/contacts_custom_type.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ContactsSource xmlns:android="http://schemas.android.com/apk/res/android">
     <ContactsDataKind
-        android:detailColumn="data3"
-        android:detailSocialSummary="true"
-        android:icon="@drawable/ic_launcher"
-        android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.profile"
-        android:summaryColumn="data2" />
+            android:detailColumn="data3"
+            android:detailSocialSummary="true"
+            android:icon="@drawable/ic_launcher"
+            android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.profile"
+            android:summaryColumn="data2"/>
     <ContactsDataKind
-        android:detailColumn="data3"
-        android:detailSocialSummary="true"
-        android:icon="@drawable/ic_launcher"
-        android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.sendmsg"
-        android:summaryColumn="data2" />
+            android:detailColumn="data3"
+            android:detailSocialSummary="true"
+            android:icon="@drawable/ic_launcher"
+            android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.sendmsg"
+            android:summaryColumn="data2"/>
     <ContactsDataKind
-        android:detailColumn="data3"
-        android:detailSocialSummary="true"
-        android:icon="@drawable/ic_launcher"
-        android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.voipcall"
-        android:summaryColumn="data2" />
+            android:detailColumn="data3"
+            android:detailSocialSummary="true"
+            android:icon="@drawable/ic_launcher"
+            android:mimeType="vnd.android.cursor.item/vnd.com.vtosters.lite.voipcall"
+            android:summaryColumn="data2"/>
 </ContactsSource>

smali/res/xml/empty.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen />
+<PreferenceScreen/>

smali/res/xml/empty_pref_screen.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen />
+<PreferenceScreen/>

smali/res/xml/network_security_config.xml

@@ -2,8 +2,8 @@
 <network-security-config>
     <debug-overrides>
         <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
+            <certificates src="system"/>
+            <certificates src="user"/>
         </trust-anchors>
     </debug-overrides>
 </network-security-config>

smali/res/xml/network_security_config_debug.xml

@@ -3,29 +3,29 @@
     <debug-overrides>
         <trust-anchors>
             <!-- Trust user added CAs while debuggable only -->
-            <certificates src="user" />
-            <certificates src="system" />
+            <certificates src="user"/>
+            <certificates src="system"/>
         </trust-anchors>
     </debug-overrides>
     <base-config cleartextTrafficPermitted="true">
         <trust-anchors>
-            <certificates src="system" />
+            <certificates src="system"/>
         </trust-anchors>
     </base-config>
     <domain-config>
         <!-- Make sure your URL Server here -->
         <domain includeSubdomains="true">vk.com</domain>
         <trust-anchors>
-            <certificates src="user" />
-            <certificates src="system" />
+            <certificates src="user"/>
+            <certificates src="system"/>
         </trust-anchors>
     </domain-config>
     <domain-config>
         <!-- Make sure your URL Server here -->
         <domain includeSubdomains="true">api.vk.com</domain>
         <trust-anchors>
-            <certificates src="user" />
-            <certificates src="system" />
+            <certificates src="user"/>
+            <certificates src="system"/>
         </trust-anchors>
     </domain-config>
 </network-security-config>

smali/res/xml/notification_settings.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <Preference
-        android:key="preference_report_reuse"
-        android:summary="@string/report_reuse_text_description"
-        android:title="@string/report_reuse_text" />
+            android:key="preference_report_reuse"
+            android:summary="@string/report_reuse_text_description"
+            android:title="@string/report_reuse_text"/>
     <ListPreference
-        android:dialogTitle="@string/block_for_text"
-        android:entries="@array/libverify_block_notification_names"
-        android:entryValues="@array/libverify_block_notification_values"
-        android:key="preference_block_notifications"
-        android:summary="@string/block_notifications_description"
-        android:title="@string/block_notifications_text" />
+            android:dialogTitle="@string/block_for_text"
+            android:entries="@array/libverify_block_notification_names"
+            android:entryValues="@array/libverify_block_notification_values"
+            android:key="preference_block_notifications"
+            android:summary="@string/block_notifications_description"
+            android:title="@string/block_notifications_text"/>
     <Preference
-        android:key="preference_show_history"
-        android:summary="@string/notification_history_text_description"
-        android:title="@string/notification_history_text" />
+            android:key="preference_show_history"
+            android:summary="@string/notification_history_text_description"
+            android:title="@string/notification_history_text"/>
 </PreferenceScreen>

smali/res/xml/preferences_account.xml

@@ -2,52 +2,52 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/group_info">
         <Preference
-            android:key="phone"
-            android:persistent="false"
-            android:title="@string/phone_number" />
+                android:key="phone"
+                android:persistent="false"
+                android:title="@string/phone_number"/>
         <Preference
-            android:key="email"
-            android:persistent="false"
-            android:title="@string/email" />
+                android:key="email"
+                android:persistent="false"
+                android:title="@string/email"/>
         <Preference
-            android:key="changePassword"
-            android:persistent="false"
-            android:title="@string/change_password" />
+                android:key="changePassword"
+                android:persistent="false"
+                android:title="@string/change_password"/>
         <Preference
-            android:key="domain"
-            android:persistent="false"
-            android:title="@string/page_address" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:key="domain"
+                android:persistent="false"
+                android:title="@string/page_address"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_posts">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:entries="@array/sett_posts_default_items"
-            android:entryValues="@array/on_off"
-            android:key="onlyMyPosts"
-            android:title="@string/sett_posts_default" />
+                android:entries="@array/sett_posts_default_items"
+                android:entryValues="@array/on_off"
+                android:key="onlyMyPosts"
+                android:title="@string/sett_posts_default"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:key="enableComments"
-            android:persistent="false"
-            android:title="@string/sett_enable_comments" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:key="enableComments"
+                android:persistent="false"
+                android:title="@string/sett_enable_comments"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/community_comments_settings_block_title">
         <Preference
-            android:key="community_comments"
-            android:summary=""
-            android:title="@string/community_comments_settings_title_new" />
+                android:key="community_comments"
+                android:summary=""
+                android:title="@string/community_comments_settings_title_new"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/account_settings_comments">
         <Preference
-            android:key="comment_order"
-            android:summary=""
-            android:title="@string/account_settings_comment_order" />
+                android:key="comment_order"
+                android:summary=""
+                android:title="@string/account_settings_comment_order"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_other">
         <Preference
-            android:key="newsBanned"
-            android:summary="@string/sett_news_banned_summary"
-            android:title="@string/sett_news_banned" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:key="newsBanned"
+                android:summary="@string/sett_news_banned_summary"
+                android:title="@string/sett_news_banned"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_account_milkshake.xml

@@ -2,54 +2,54 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/group_info">
         <Preference
-            android:key="phone"
-            android:layout="@layout/preference_with_value"
-            android:persistent="false"
-            android:title="@string/phone_number" />
+                android:key="phone"
+                android:layout="@layout/preference_with_value"
+                android:persistent="false"
+                android:title="@string/phone_number"/>
         <Preference
-            android:key="email"
-            android:layout="@layout/preference_with_value"
-            android:persistent="false"
-            android:title="@string/email" />
+                android:key="email"
+                android:layout="@layout/preference_with_value"
+                android:persistent="false"
+                android:title="@string/email"/>
         <Preference
-            android:key="changePassword"
-            android:layout="@layout/preference_with_value"
-            android:persistent="false"
-            android:title="@string/change_password" />
+                android:key="changePassword"
+                android:layout="@layout/preference_with_value"
+                android:persistent="false"
+                android:title="@string/change_password"/>
         <Preference
-            android:key="domain"
-            android:layout="@layout/preference_with_value"
-            android:persistent="false"
-            android:title="@string/page_address" />
+                android:key="domain"
+                android:layout="@layout/preference_with_value"
+                android:persistent="false"
+                android:title="@string/page_address"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_posts">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:entries="@array/sett_posts_default_items"
-            android:entryValues="@array/on_off"
-            android:key="onlyMyPosts"
-            android:layout="@layout/preference_with_value"
-            android:title="@string/sett_posts_default" />
+                android:entries="@array/sett_posts_default_items"
+                android:entryValues="@array/on_off"
+                android:key="onlyMyPosts"
+                android:layout="@layout/preference_with_value"
+                android:title="@string/sett_posts_default"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:key="enableComments"
-            android:persistent="false"
-            android:title="@string/sett_enable_comments" />
+                android:key="enableComments"
+                android:persistent="false"
+                android:title="@string/sett_enable_comments"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/community_comments_settings_block_title">
         <Preference
-            android:key="community_comments"
-            android:summary=""
-            android:title="@string/community_comments_settings_title_new" />
+                android:key="community_comments"
+                android:summary=""
+                android:title="@string/community_comments_settings_title_new"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/account_settings_comments">
         <Preference
-            android:key="comment_order"
-            android:summary=""
-            android:title="@string/account_settings_comment_order" />
+                android:key="comment_order"
+                android:summary=""
+                android:title="@string/account_settings_comment_order"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_other">
         <Preference
-            android:key="newsBanned"
-            android:summary="@string/sett_news_banned_summary"
-            android:title="@string/sett_news_banned" />
+                android:key="newsBanned"
+                android:summary="@string/sett_news_banned_summary"
+                android:title="@string/sett_news_banned"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_activity.xml

@@ -2,123 +2,123 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/activity_undel">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="🗑"
-            android:dialogTitle="@string/activity_undel_dial"
-            android:entries="@array/undel_value"
-            android:entryValues="@array/undel_value"
-            android:key="undeletemsg_prefix_value"
-            android:title="@string/activity_undel_tag" />
+                android:defaultValue="🗑"
+                android:dialogTitle="@string/activity_undel_dial"
+                android:entries="@array/undel_value"
+                android:entryValues="@array/undel_value"
+                android:key="undeletemsg_prefix_value"
+                android:title="@string/activity_undel_tag"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="undeletemsg"
-            android:summary="@string/activity_undel_attachments"
-            android:title="@string/activity_undel_enable" />
+                android:defaultValue="false"
+                android:key="undeletemsg"
+                android:summary="@string/activity_undel_attachments"
+                android:title="@string/activity_undel_enable"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/online_vtl">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="offline"
-            android:summary="@string/vtlofflinesummary"
-            android:title="@string/vtloffline" />
+                android:defaultValue="false"
+                android:key="offline"
+                android:summary="@string/vtlofflinesummary"
+                android:title="@string/vtloffline"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:enabled="false"
-            android:key="setoffline"
-            android:summary="@string/vtloffline2summary"
-            android:title="@string/vtloffline2" />
+                android:defaultValue="false"
+                android:enabled="false"
+                android:key="setoffline"
+                android:summary="@string/vtloffline2summary"
+                android:title="@string/vtloffline2"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="onlineformatter"
-            android:summary="@string/onlineformatter_summ"
-            android:title="@string/onlineformatter_title" />
+                android:defaultValue="true"
+                android:key="onlineformatter"
+                android:summary="@string/onlineformatter_summ"
+                android:title="@string/onlineformatter_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/dnr">
         <Preference
-            android:enabled="false"
-            android:summary="@string/activity_dnr_summary"
-            android:title="@string/activity_what_is_it" />
+                android:enabled="false"
+                android:summary="@string/activity_dnr_summary"
+                android:title="@string/activity_what_is_it"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/activity_dnr_visual"
-            android:title="@string/warning" />
+                android:enabled="false"
+                android:summary="@string/activity_dnr_visual"
+                android:title="@string/warning"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="read_pm"
-            android:title="@string/act_pm" />
+                android:defaultValue="false"
+                android:key="read_pm"
+                android:title="@string/act_pm"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="read_conversations"
-            android:title="@string/act_cnv" />
+                android:defaultValue="false"
+                android:key="read_conversations"
+                android:title="@string/act_cnv"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="read_bot"
-            android:title="@string/act_bot" />
+                android:defaultValue="false"
+                android:key="read_bot"
+                android:title="@string/act_bot"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/dnw">
         <Preference
-            android:enabled="false"
-            android:summary="@string/activity_dnw_summary"
-            android:title="@string/activity_what_is_it" />
+                android:enabled="false"
+                android:summary="@string/activity_dnw_summary"
+                android:title="@string/activity_what_is_it"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="write_pm"
-            android:title="@string/act_pm" />
+                android:defaultValue="false"
+                android:key="write_pm"
+                android:title="@string/act_pm"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="write_conversations"
-            android:title="@string/act_cnv" />
+                android:defaultValue="false"
+                android:key="write_conversations"
+                android:title="@string/act_cnv"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="write_bot"
-            android:title="@string/act_bot" />
+                android:defaultValue="false"
+                android:key="write_bot"
+                android:title="@string/act_bot"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/stories_vtl">
         <Preference
-            android:enabled="false"
-            android:summary="@string/activity_dns_summary"
-            android:title="@string/activity_what_is_it" />
+                android:enabled="false"
+                android:summary="@string/activity_dns_summary"
+                android:title="@string/activity_what_is_it"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="read_s"
-            android:title="@string/dns" />
+                android:defaultValue="false"
+                android:key="read_s"
+                android:title="@string/dns"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/voices_vtl">
         <Preference
-            android:enabled="false"
-            android:summary="@string/disable_voice_listening_summ"
-            android:title="@string/activity_what_is_it" />
+                android:enabled="false"
+                android:summary="@string/disable_voice_listening_summ"
+                android:title="@string/activity_what_is_it"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="listen_v"
-            android:title="@string/listen_v_title" />
+                android:defaultValue="false"
+                android:key="listen_v"
+                android:title="@string/listen_v_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vkme_online_vtl">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="onlinefix"
-            android:summary="@string/onlinefix_summ"
-            android:title="@string/onlinefix_title" />
+                android:defaultValue="false"
+                android:key="onlinefix"
+                android:summary="@string/onlinefix_summ"
+                android:title="@string/onlinefix_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/privacy_vtl">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="savemsgsett"
-            android:summary="@string/savemsgsett_summ"
-            android:title="@string/savemsgsett_title" />
+                android:defaultValue="false"
+                android:key="savemsgsett"
+                android:summary="@string/savemsgsett_summ"
+                android:title="@string/savemsgsett_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="screenshotdetect"
-            android:summary="@string/screenshotdetect_summ"
-            android:title="@string/screenshotdetect_title" />
+                android:defaultValue="false"
+                android:key="screenshotdetect"
+                android:summary="@string/screenshotdetect_summ"
+                android:title="@string/screenshotdetect_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="awayphp"
-            android:summary="@string/vtlawayphpsummary"
-            android:title="@string/vtlawayphp" />
+                android:defaultValue="true"
+                android:key="awayphp"
+                android:summary="@string/vtlawayphpsummary"
+                android:title="@string/vtlawayphp"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="hideDeviceInfo"
-            android:summary="@string/hideDeviceInfo_summ"
-            android:title="@string/hideDeviceInfo_title" />
+                android:defaultValue="true"
+                android:key="hideDeviceInfo"
+                android:summary="@string/hideDeviceInfo_summ"
+                android:title="@string/hideDeviceInfo_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_advanced_notifications.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+                  xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vtosters.lite.ui.RingtonePreference
-        android:defaultValue="content://settings/system/notification_sound"
-        android:key="notifyRingtone"
-        android:title="@string/sett_notify_sound"
-        app:ringtoneType="notification"
-        app:showDefault="true" />
+            android:defaultValue="content://settings/system/notification_sound"
+            android:key="notifyRingtone"
+            android:title="@string/sett_notify_sound"
+            app:ringtoneType="notification"
+            app:showDefault="true"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyVibrate"
-        android:title="@string/sett_notify_vibrate" />
+            android:defaultValue="true"
+            android:key="notifyVibrate"
+            android:title="@string/sett_notify_vibrate"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyLED"
-        android:title="@string/sett_notify_led" />
+            android:defaultValue="true"
+            android:key="notifyLED"
+            android:title="@string/sett_notify_led"/>
     <com.vtosters.lite.ui.ColorPreference
-        android:defaultValue="-1"
-        android:key="notifyLedColor"
-        android:title="@string/sett_led_color" />
+            android:defaultValue="-1"
+            android:key="notifyLedColor"
+            android:title="@string/sett_led_color"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="false"
-        android:key="notifyHeadsUp"
-        android:title="@string/sett_heads_up_notifications" />
+            android:defaultValue="false"
+            android:key="notifyHeadsUp"
+            android:title="@string/sett_heads_up_notifications"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyShortcutBadge"
-        android:title="@string/sett_shortcut_badger" />
-    <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+            android:defaultValue="true"
+            android:key="notifyShortcutBadge"
+            android:title="@string/sett_shortcut_badger"/>
+    <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
 </PreferenceScreen>

smali/res/xml/preferences_advanced_notifications_milkshake.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+                  xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vtosters.lite.ui.RingtonePreference
-        android:defaultValue="content://settings/system/notification_sound"
-        android:key="notifyRingtone"
-        android:title="@string/sett_notify_sound"
-        app:ringtoneType="notification"
-        app:showDefault="true" />
+            android:defaultValue="content://settings/system/notification_sound"
+            android:key="notifyRingtone"
+            android:title="@string/sett_notify_sound"
+            app:ringtoneType="notification"
+            app:showDefault="true"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyVibrate"
-        android:title="@string/sett_notify_vibrate" />
+            android:defaultValue="true"
+            android:key="notifyVibrate"
+            android:title="@string/sett_notify_vibrate"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyLED"
-        android:title="@string/sett_notify_led" />
+            android:defaultValue="true"
+            android:key="notifyLED"
+            android:title="@string/sett_notify_led"/>
     <com.vtosters.lite.ui.ColorPreference
-        android:defaultValue="-1"
-        android:key="notifyLedColor"
-        android:title="@string/sett_led_color" />
+            android:defaultValue="-1"
+            android:key="notifyLedColor"
+            android:title="@string/sett_led_color"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="false"
-        android:key="notifyHeadsUp"
-        android:title="@string/sett_heads_up_notifications" />
+            android:defaultValue="false"
+            android:key="notifyHeadsUp"
+            android:title="@string/sett_heads_up_notifications"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="true"
-        android:key="notifyShortcutBadge"
-        android:title="@string/sett_shortcut_badger" />
+            android:defaultValue="true"
+            android:key="notifyShortcutBadge"
+            android:title="@string/sett_shortcut_badger"/>
 </PreferenceScreen>

smali/res/xml/preferences_debug.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="preferences_debug">
+                  android:key="preferences_debug">
     <Preference
-        android:enabled="false"
-        android:summary="@string/debug_warning_summary"
-        android:title="@string/warning" />
+            android:enabled="false"
+            android:summary="@string/debug_warning_summary"
+            android:title="@string/warning"/>
     <com.vtosters.lite.ui.MaterialSwitchPreference
-        android:defaultValue="false"
-        android:key="devmenu"
-        android:title="@string/debug_show_settings_item" />
+            android:defaultValue="false"
+            android:key="devmenu"
+            android:title="@string/debug_show_settings_item"/>
     <PreferenceCategory android:title="@string/debug_experimental">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="noanim"
-            android:dialogTitle="@string/selectfranimation"
-            android:entries="@array/animations"
-            android:entryValues="@array/animations_values"
-            android:key="anim_rtrn_type"
-            android:title="@string/franimation" />
+                android:defaultValue="noanim"
+                android:dialogTitle="@string/selectfranimation"
+                android:entries="@array/animations"
+                android:entryValues="@array/animations_values"
+                android:key="anim_rtrn_type"
+                android:title="@string/franimation"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="calls"
-            android:summary="@string/messages_interface_calls_summary"
-            android:title="@string/vtlcalls" />
+                android:defaultValue="false"
+                android:key="calls"
+                android:summary="@string/messages_interface_calls_summary"
+                android:title="@string/vtlcalls"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="podcastcatalog"
-            android:title="@string/podcastcatalog_title" />
+                android:defaultValue="false"
+                android:key="podcastcatalog"
+                android:title="@string/podcastcatalog_title"/>
         <!-- <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="opusmodule"
@@ -38,229 +38,229 @@
             android:key="lang_value"
             android:title="@string/debug_experimental_language" /> -->
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="useNewSettings"
-            android:title="@string/useNewSettings_title" />
+                android:defaultValue="true"
+                android:key="useNewSettings"
+                android:title="@string/useNewSettings_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="promotedstickers"
-            android:title="@string/promotedstickers_title" />
+                android:defaultValue="true"
+                android:key="promotedstickers"
+                android:title="@string/promotedstickers_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vk_fix_music_other">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="new_music_downloading_way"
-            android:title="@string/new_music_downloading_way_title" />
+                android:defaultValue="false"
+                android:key="new_music_downloading_way"
+                android:title="@string/new_music_downloading_way_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/debug_developer_functions">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="dev"
-            android:summary="@string/debug_developer_mode_summary"
-            android:title="@string/debug_developer_mode" />
+                android:defaultValue="false"
+                android:key="dev"
+                android:summary="@string/debug_developer_mode_summary"
+                android:title="@string/debug_developer_mode"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="ssl"
-            android:summary="@string/debug_developer_force_ssl_summary"
-            android:title="@string/debug_developer_force_ssl" />
+                android:defaultValue="true"
+                android:key="ssl"
+                android:summary="@string/debug_developer_force_ssl_summary"
+                android:title="@string/debug_developer_force_ssl"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="isMusicRestricted"
-            android:summary="@string/debug_developer_is_music_restricted_summary"
-            android:title="@string/debug_developer_is_music_restricted" />
+                android:defaultValue="true"
+                android:key="isMusicRestricted"
+                android:summary="@string/debug_developer_is_music_restricted_summary"
+                android:title="@string/debug_developer_is_music_restricted"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="hasMusicSubscription"
-            android:summary="@string/debug_developer_has_music_subscription_summary"
-            android:title="@string/debug_developer_has_music_subscription" />
+                android:defaultValue="true"
+                android:key="hasMusicSubscription"
+                android:summary="@string/debug_developer_has_music_subscription_summary"
+                android:title="@string/debug_developer_has_music_subscription"/>
         <EditTextPreference
-            android:defaultValue="https://vtsf.vknext.net"
-            android:key="ssfscustom"
-            android:title="@string/debug_developer_ssfs_custom" />
+                android:defaultValue="https://vtsf.vknext.net"
+                android:key="ssfscustom"
+                android:title="@string/debug_developer_ssfs_custom"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="domains"
-        android:title="@string/debug_domains">
+            android:key="domains"
+            android:title="@string/debug_domains">
         <Preference
-            android:defaultValue="api.vk.com"
-            android:key="apiHost"
-            android:title="@string/debug_domains_api" />
+                android:defaultValue="api.vk.com"
+                android:key="apiHost"
+                android:title="@string/debug_domains_api"/>
         <Preference
-            android:defaultValue="oauth.vk.com"
-            android:key="oauthHost"
-            android:title="@string/debug_domains_oauth" />
+                android:defaultValue="oauth.vk.com"
+                android:key="oauthHost"
+                android:title="@string/debug_domains_oauth"/>
         <Preference
-            android:defaultValue="static.vk.com"
-            android:key="vkUiHostUri"
-            android:title="VK UI host uri" />
+                android:defaultValue="static.vk.com"
+                android:key="vkUiHostUri"
+                android:title="VK UI host uri"/>
         <Preference
-            android:defaultValue="vk.com/spa"
-            android:key="spaUri"
-            android:title="VK UI SPA uri" />
+                android:defaultValue="vk.com/spa"
+                android:key="spaUri"
+                android:title="VK UI SPA uri"/>
         <Preference
-            android:defaultValue="m.vk.com"
-            android:key="awayPhpDomain"
-            android:title="@string/debug_domains_awayphp" />
+                android:defaultValue="m.vk.com"
+                android:key="awayPhpDomain"
+                android:title="@string/debug_domains_awayphp"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="network"
-        android:title="@string/debug_network">
+            android:key="network"
+            android:title="@string/debug_network">
         <Preference
-            android:defaultValue="cronet_quic"
-            android:key="__dbg_network_executor"
-            android:title="Network: Executor" />
+                android:defaultValue="cronet_quic"
+                android:key="__dbg_network_executor"
+                android:title="Network: Executor"/>
         <Preference
-            android:key="__dbg_network_clear_internal_state"
-            android:title="Network: Clear internal state" />
+                android:key="__dbg_network_clear_internal_state"
+                android:title="Network: Clear internal state"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_network_netlog_write"
-            android:title="Network: NetLog: write" />
+                android:defaultValue="false"
+                android:key="__dbg_network_netlog_write"
+                android:title="Network: NetLog: write"/>
         <Preference
-            android:defaultValue="false"
-            android:key="__dbg_network_netlog_clear"
-            android:title="Network: NetLog: clear" />
+                android:defaultValue="false"
+                android:key="__dbg_network_netlog_clear"
+                android:title="Network: NetLog: clear"/>
         <Preference
-            android:defaultValue="false"
-            android:key="__dbg_network_netlog_send"
-            android:summary="Compress &amp; send"
-            android:title="Network: NetLog: send" />
+                android:defaultValue="false"
+                android:key="__dbg_network_netlog_send"
+                android:summary="Compress &amp; send"
+                android:title="Network: NetLog: send"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="logging"
-        android:title="@string/debug_logging">
+            android:key="logging"
+            android:title="@string/debug_logging">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_api"
-            android:title="@string/debug_logging_api" />
+                android:defaultValue="false"
+                android:key="__dbg_api"
+                android:title="@string/debug_logging_api"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_force_send"
-            android:title="@string/debug_logging_force_stats_sending" />
+                android:defaultValue="false"
+                android:key="__dbg_force_send"
+                android:title="@string/debug_logging_force_stats_sending"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_webview"
-            android:title="@string/debug_logging_webview" />
+                android:defaultValue="false"
+                android:key="__dbg_webview"
+                android:title="@string/debug_logging_webview"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_view_post_time_overlay"
-            android:summary="@string/debug_logging_visualise_viewposttime_summary"
-            android:title="@string/debug_logging_visualise_viewposttime" />
+                android:defaultValue="false"
+                android:key="__dbg_view_post_time_overlay"
+                android:summary="@string/debug_logging_visualise_viewposttime_summary"
+                android:title="@string/debug_logging_visualise_viewposttime"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_allow_requests_breakpoints"
-            android:summary="@string/debug_logging_breakpoints_summary"
-            android:title="@string/debug_logging_breakpoints" />
+                android:defaultValue="false"
+                android:key="__dbg_allow_requests_breakpoints"
+                android:summary="@string/debug_logging_breakpoints_summary"
+                android:title="@string/debug_logging_breakpoints"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_apply_spaces"
-            android:summary="@string/debug_logging_apply_spaces_summary"
-            android:title="@string/debug_logging_apply_spaces" />
+                android:defaultValue="false"
+                android:key="__dbg_apply_spaces"
+                android:summary="@string/debug_logging_apply_spaces_summary"
+                android:title="@string/debug_logging_apply_spaces"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_mem_leak"
-            android:title="@string/debug_logging_memleak" />
+                android:defaultValue="false"
+                android:key="__dbg_mem_leak"
+                android:title="@string/debug_logging_memleak"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_api_errors"
-            android:title="@string/debug_logging_api_errors" />
+                android:defaultValue="false"
+                android:key="__dbg_api_errors"
+                android:title="@string/debug_logging_api_errors"/>
         <Preference
-            android:key="__dbg_log_to_file"
-            android:summary="@string/debug_logging_file_summary"
-            android:title="@string/debug_logging_file" />
+                android:key="__dbg_log_to_file"
+                android:summary="@string/debug_logging_file_summary"
+                android:title="@string/debug_logging_file"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="cache"
-        android:title="@string/debug_cache">
+            android:key="cache"
+            android:title="@string/debug_cache">
         <Preference
-            android:key="clearTrustedHash"
-            android:title="@string/debug_cache_trusted_hash" />
+                android:key="clearTrustedHash"
+                android:title="@string/debug_cache_trusted_hash"/>
         <Preference
-            android:key="clearWebViewCache"
-            android:title="@string/debug_cache_webview" />
+                android:key="clearWebViewCache"
+                android:title="@string/debug_cache_webview"/>
         <Preference
-            android:key="clearVkPayTokenForQrPayments"
-            android:title="@string/debug_cache_vkpay_token" />
+                android:key="clearVkPayTokenForQrPayments"
+                android:title="@string/debug_cache_vkpay_token"/>
         <Preference
-            android:key="clearStickersCache"
-            android:title="@string/debug_cache_stickers" />
+                android:key="clearStickersCache"
+                android:title="@string/debug_cache_stickers"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="system"
-        android:title="@string/debug_system">
+            android:key="system"
+            android:title="@string/debug_system">
         <EditTextPreference
-            android:key="__dbg_lang_override"
-            android:title="@string/debug_system_language" />
+                android:key="__dbg_lang_override"
+                android:title="@string/debug_system_language"/>
         <Preference
-            android:key="__dbg_terminate"
-            android:title="@string/debug_system_terminate" />
+                android:key="__dbg_terminate"
+                android:title="@string/debug_system_terminate"/>
         <Preference
-            android:key="__dbg_re_register_firebase"
-            android:title="@string/debug_system_fcm" />
+                android:key="__dbg_re_register_firebase"
+                android:title="@string/debug_system_fcm"/>
         <Preference
-            android:key="__dbg_copy_firebase_token"
-            android:title="@string/debug_system_fcm_copy_token" />
+                android:key="__dbg_copy_firebase_token"
+                android:title="@string/debug_system_fcm_copy_token"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="stories"
-        android:title="@string/stories">
+            android:key="stories"
+            android:title="@string/stories">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_clickable_sticker_border"
-            android:title="@string/debug_clickable_sticker_border_title" />
+                android:defaultValue="false"
+                android:key="__dbg_clickable_sticker_border"
+                android:title="@string/debug_clickable_sticker_border_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_stories_create_sticker_border"
-            android:title="@string/debug_create_sticker_border_title" />
+                android:defaultValue="false"
+                android:key="__dbg_stories_create_sticker_border"
+                android:title="@string/debug_create_sticker_border_title"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="tests"
-        android:title="@string/debug_tests">
+            android:key="tests"
+            android:title="@string/debug_tests">
         <Preference
-            android:key="__dbg_test_bday"
-            android:title="@string/debug_tests_bd" />
+                android:key="__dbg_test_bday"
+                android:title="@string/debug_tests_bd"/>
         <Preference
-            android:key="__dbg_test_validation"
-            android:title="@string/debug_tests_validation" />
+                android:key="__dbg_test_validation"
+                android:title="@string/debug_tests_validation"/>
         <Preference
-            android:key="__dbg_test_captcha"
-            android:title="@string/debug_tests_captcha" />
+                android:key="__dbg_test_captcha"
+                android:title="@string/debug_tests_captcha"/>
         <Preference
-            android:key="__dbg_test_crash"
-            android:title="@string/debug_tests_crash" />
+                android:key="__dbg_test_crash"
+                android:title="@string/debug_tests_crash"/>
         <EditTextPreference
-            android:defaultValue="https://static.vk.com/demo"
-            android:key="__dbg_spa_uri"
-            android:title="@string/debug_tests_spa_uri" />
+                android:defaultValue="https://static.vk.com/demo"
+                android:key="__dbg_spa_uri"
+                android:title="@string/debug_tests_spa_uri"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_test_tooltip"
-            android:title="@string/debug_tests_tooltip" />
+                android:defaultValue="false"
+                android:key="__dbg_test_tooltip"
+                android:title="@string/debug_tests_tooltip"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="bugtracker"
-        android:title="@string/bugs">
+            android:key="bugtracker"
+            android:title="@string/bugs">
         <Preference
-            android:key="__dbg_app_versions_list"
-            android:title="@string/debug_app_versions_list_title" />
+                android:key="__dbg_app_versions_list"
+                android:title="@string/debug_app_versions_list_title"/>
         <Preference
-            android:key="__dbg_drop_bugtracker_token"
-            android:title="@string/debug_drop_bugtracker_token_title" />
+                android:key="__dbg_drop_bugtracker_token"
+                android:title="@string/debug_drop_bugtracker_token_title"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="others"
-        android:title="@string/debug_other">
+            android:key="others"
+            android:title="@string/debug_other">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_no_ads"
-            android:title="@string/debug_no_ads_title" />
+                android:defaultValue="false"
+                android:key="__dbg_no_ads"
+                android:title="@string/debug_no_ads_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_proxy_enable"
-            android:title="@string/debug_proxy_enable_title" />
+                android:defaultValue="false"
+                android:key="__dbg_proxy_enable"
+                android:title="@string/debug_proxy_enable_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="__dbg_use_libverify_for_auth"
-            android:title="@string/debug_use_libverify_for_auth_title" />
+                android:defaultValue="true"
+                android:key="__dbg_use_libverify_for_auth"
+                android:title="@string/debug_use_libverify_for_auth_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_feed.xml

@@ -2,141 +2,141 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/vtad">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="__dbg_no_ads"
-            android:summary="@string/feed_ads_regular_summary"
-            android:title="@string/vtldads" />
+                android:defaultValue="true"
+                android:key="__dbg_no_ads"
+                android:summary="@string/feed_ads_regular_summary"
+                android:title="@string/vtldads"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="adsgroup"
-            android:summary="@string/vtldgadssummary"
-            android:title="@string/vtldgads" />
+                android:defaultValue="true"
+                android:key="adsgroup"
+                android:summary="@string/vtldgadssummary"
+                android:title="@string/vtldgads"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="adsstories"
-            android:summary="@string/feed_ads_stories_summary"
-            android:title="@string/vtldas" />
+                android:defaultValue="true"
+                android:key="adsstories"
+                android:summary="@string/feed_ads_stories_summary"
+                android:title="@string/vtldas"/>
         <Preference
-            android:key="whitelisted_ad_groups"
-            android:title="@string/whitelisted_ad_groups_title" />
+                android:key="whitelisted_ad_groups"
+                android:title="@string/whitelisted_ad_groups_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlrecommend">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="friendsrecomm"
-            android:summary="@string/feed_recommendations_friends_summary"
-            android:title="@string/vtlrecommendfriend" />
+                android:defaultValue="false"
+                android:key="friendsrecomm"
+                android:summary="@string/feed_recommendations_friends_summary"
+                android:title="@string/vtlrecommendfriend"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="authorsrecomm"
-            android:summary="@string/feed_recommendations_authors_summary"
-            android:title="@string/vtlrecommendauthor" />
+                android:defaultValue="false"
+                android:key="authorsrecomm"
+                android:summary="@string/feed_recommendations_authors_summary"
+                android:title="@string/vtlrecommendauthor"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="postsrecomm"
-            android:summary="@string/feed_recommendations_friends_reacted_summary"
-            android:title="@string/vtlrecommendfriendpost" />
+                android:defaultValue="false"
+                android:key="postsrecomm"
+                android:summary="@string/feed_recommendations_friends_reacted_summary"
+                android:title="@string/vtlrecommendfriendpost"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="captions"
-            android:summary="@string/vtlrecommendmarksummary"
-            android:title="@string/vtlrecommendmark" />
+                android:defaultValue="false"
+                android:key="captions"
+                android:summary="@string/vtlrecommendmarksummary"
+                android:title="@string/vtlrecommendmark"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlfilters">
         <Preference
-            android:enabled="false"
-            android:summary="@string/vtlhtmfsummary"
-            android:title="@string/vtlhtmf" />
+                android:enabled="false"
+                android:summary="@string/vtlhtmfsummary"
+                android:title="@string/vtlhtmf"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="spamfilters"
-            android:title="@string/vtlownfilter" />
+                android:defaultValue=""
+                android:key="spamfilters"
+                android:title="@string/vtlownfilter"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="default_ad_list"
-            android:summary="@string/vtlsfiltersummary"
-            android:title="@string/vtlsfilter" />
+                android:defaultValue="false"
+                android:key="default_ad_list"
+                android:summary="@string/vtlsfiltersummary"
+                android:title="@string/vtlsfilter"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="shortlinkfilter"
-            android:summary="@string/vtlsfiltershortsummary"
-            android:title="@string/vtlsfiltershort" />
+                android:defaultValue="false"
+                android:key="shortlinkfilter"
+                android:summary="@string/vtlsfiltershortsummary"
+                android:title="@string/vtlsfiltershort"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="refsfilter"
-            android:summary="@string/vtlsfilterrefssummary"
-            android:title="@string/vtlsfilterrefs" />
+                android:defaultValue="false"
+                android:key="refsfilter"
+                android:summary="@string/vtlsfilterrefssummary"
+                android:title="@string/vtlsfilterrefs"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="shitposting"
-            android:summary="@string/shitpostingsummary"
-            android:title="@string/shitposting" />
+                android:defaultValue="false"
+                android:key="shitposting"
+                android:summary="@string/shitpostingsummary"
+                android:title="@string/shitposting"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="cringerepost"
-            android:summary="@string/cringerepost_summ"
-            android:title="@string/cringerepost_title" />
+                android:defaultValue="false"
+                android:key="cringerepost"
+                android:summary="@string/cringerepost_summ"
+                android:title="@string/cringerepost_title"/>
         <Preference
-            android:key="whitelisted_filters_groups"
-            android:title="@string/whitelisted_filters_groups_title" />
+                android:key="whitelisted_filters_groups"
+                android:title="@string/whitelisted_filters_groups_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/sources">
         <EditTextPreference
-            android:defaultValue=""
-            android:key="sourcenamefilter"
-            android:title="@string/vtlsourcenamefilter" />
+                android:defaultValue=""
+                android:key="sourcenamefilter"
+                android:title="@string/vtlsourcenamefilter"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="linkfilter"
-            android:title="@string/vtllinkfilter" />
+                android:defaultValue=""
+                android:key="linkfilter"
+                android:title="@string/vtllinkfilter"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="cringecopyright"
-            android:summary="@string/cringecopyright_summ"
-            android:title="@string/cringecopyright_title" />
+                android:defaultValue="false"
+                android:key="cringecopyright"
+                android:summary="@string/cringecopyright_summ"
+                android:title="@string/cringecopyright_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="copyright_post"
-            android:summary="@string/feed_ads_sources_summary"
-            android:title="@string/feed_ads_sources" />
+                android:defaultValue="false"
+                android:key="copyright_post"
+                android:summary="@string/feed_ads_sources_summary"
+                android:title="@string/feed_ads_sources"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlfeedwork">
         <Preference
-            android:key="officialnewssett"
-            android:summary="@string/officialnewssett_summary"
-            android:title="@string/officialnewssett" />
+                android:key="officialnewssett"
+                android:summary="@string/officialnewssett_summary"
+                android:title="@string/officialnewssett"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/why_news_not_updated_summ"
-            android:title="@string/why_news_not_updated_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="blockminiapps"
-            android:summary="@string/blockminiapps_summ"
-            android:title="@string/blockminiapps_title" />
+                android:enabled="false"
+                android:summary="@string/why_news_not_updated_summ"
+                android:title="@string/why_news_not_updated_title"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/feed_other_update_dialog_title"
-            android:entries="@array/newsupdate_value"
-            android:entryValues="@array/newsupdate"
-            android:key="newsupdate"
-            android:title="@string/feed_other_update" />
+                android:defaultValue="default"
+                android:dialogTitle="@string/feed_other_update_dialog_title"
+                android:entries="@array/newsupdate_value"
+                android:entryValues="@array/newsupdate"
+                android:key="newsupdate"
+                android:title="@string/feed_other_update"/>
         <Preference
-            android:key="newsfeedlistmanager"
-            android:summary="@string/newsfeedlistmanager_summ"
-            android:title="@string/newsfeedlistmanager_title" />
+                android:key="newsfeedlistmanager"
+                android:summary="@string/newsfeedlistmanager_summ"
+                android:title="@string/newsfeedlistmanager_title"/>
         <Preference
-            android:key="newsfeedlistmanager_reset"
-            android:title="@string/newsfeedlistmanager_reset_title" />
+                android:key="newsfeedlistmanager_reset"
+                android:title="@string/newsfeedlistmanager_reset_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="force_disable_psm"
-            android:summary="@string/force_disable_psm_summ"
-            android:title="@string/force_disable_psm_title" />
+                android:defaultValue="false"
+                android:key="force_disable_psm"
+                android:summary="@string/force_disable_psm_summ"
+                android:title="@string/force_disable_psm_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="feedcache"
-            android:summary="@string/feed_other_cache_summary"
-            android:title="@string/vtlfeedcache" />
+                android:defaultValue="true"
+                android:key="feedcache"
+                android:summary="@string/feed_other_cache_summary"
+                android:title="@string/vtlfeedcache"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="blockminiapps"
+                android:summary="@string/blockminiapps_summ"
+                android:title="@string/blockminiapps_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_general.xml

@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto">
+                  xmlns:custom="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:key="app"
-        android:title="@string/sett_app">
+            android:key="app"
+            android:title="@string/sett_app">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="firstname"
-            android:dialogTitle="@string/sett_flist_sort"
-            android:entries="@array/sett_friends_order"
-            android:entryValues="@array/sett_friends_order_v"
-            android:key="friendsOrderNew"
-            android:textColor="?text_secondary"
-            android:title="@string/sett_flist_sort" />
+                android:defaultValue="firstname"
+                android:dialogTitle="@string/sett_flist_sort"
+                android:entries="@array/sett_friends_order"
+                android:entryValues="@array/sett_friends_order_v"
+                android:key="friendsOrderNew"
+                android:textColor="?text_secondary"
+                android:title="@string/sett_flist_sort"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="0"
-            android:dialogTitle="@string/sett_font_size"
-            android:entries="@array/sett_font_size_options"
-            android:entryValues="@array/sett_font_size_values"
-            android:key="fontSize"
-            android:title="@string/sett_font_size" />
+                android:defaultValue="0"
+                android:dialogTitle="@string/sett_font_size"
+                android:entries="@array/sett_font_size_options"
+                android:entryValues="@array/sett_font_size_values"
+                android:key="fontSize"
+                android:title="@string/sett_font_size"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="sendByEnter"
-            android:summary="@string/sett_send_by_enter_summary"
-            android:title="@string/sett_send_by_enter" />
+                android:defaultValue="false"
+                android:key="sendByEnter"
+                android:summary="@string/sett_send_by_enter_summary"
+                android:title="@string/sett_send_by_enter"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="useChromeCustomTabs"
-            android:summary="@string/sett_chrome_custom_tabs_summary"
-            android:title="@string/sett_chrome_custom_tabs" />
+                android:defaultValue="true"
+                android:key="useChromeCustomTabs"
+                android:summary="@string/sett_chrome_custom_tabs_summary"
+                android:title="@string/sett_chrome_custom_tabs"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="trackInstalledApps"
-            android:summary="@string/sett_mytracker_location_crap_summary"
-            android:title="@string/sett_mytracker_apps" />
+                android:defaultValue="true"
+                android:key="trackInstalledApps"
+                android:summary="@string/sett_mytracker_location_crap_summary"
+                android:title="@string/sett_mytracker_apps"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="isRoamingState"
-            android:summary="@string/sett_roaming_state_submit"
-            android:title="@string/sett_roaming_state" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:defaultValue="false"
+                android:key="isRoamingState"
+                android:summary="@string/sett_roaming_state_submit"
+                android:title="@string/sett_roaming_state"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="multimedia"
-        android:title="@string/sett_media">
+            android:key="multimedia"
+            android:title="@string/sett_media">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="saveProcessedImage"
-            android:title="@string/sett_save_processed_image"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="saveProcessedImage"
+                android:title="@string/sett_save_processed_image"
+                custom:singleLine="false"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="showMusicSuggestNotification"
-            android:title="@string/sett_show_music_suggestion_notification"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="showMusicSuggestNotification"
+                android:title="@string/sett_show_music_suggestion_notification"
+                custom:singleLine="false"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="prefetchAudioMsg"
-            android:title="@string/vkim_settings_prefetch_audiomsg"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="prefetchAudioMsg"
+                android:title="@string/vkim_settings_prefetch_audiomsg"
+                custom:singleLine="false"/>
         <ListPreference
-            android:defaultValue="always"
-            android:entries="@array/sett_gif_autoplay_entries"
-            android:entryValues="@array/sett_gif_autoplay_entry_values"
-            android:key="gif_autoplay"
-            android:summary="%s"
-            android:title="@string/sett_gif_autoplay_title" />
+                android:defaultValue="always"
+                android:entries="@array/sett_gif_autoplay_entries"
+                android:entryValues="@array/sett_gif_autoplay_entry_values"
+                android:key="gif_autoplay"
+                android:summary="%s"
+                android:title="@string/sett_gif_autoplay_title"/>
         <ListPreference
-            android:defaultValue="always"
-            android:entries="@array/sett_gif_autoplay_entries"
-            android:entryValues="@array/sett_gif_autoplay_entry_values"
-            android:key="video_autoplay"
-            android:summary="%s"
-            android:title="@string/sett_video_autoplay_title" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:defaultValue="always"
+                android:entries="@array/sett_gif_autoplay_entries"
+                android:entryValues="@array/sett_gif_autoplay_entry_values"
+                android:key="video_autoplay"
+                android:summary="%s"
+                android:title="@string/sett_video_autoplay_title"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="cache"
-        android:title="@string/sett_cache">
+            android:key="cache"
+            android:title="@string/sett_cache">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="enableAudioCache"
-            android:title="@string/sett_enable_audio_cache" />
+                android:defaultValue="true"
+                android:key="enableAudioCache"
+                android:title="@string/sett_enable_audio_cache"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue=""
-            android:dialogTitle="@string/sett_cache_location"
-            android:key="audioCacheLocation"
-            android:title="@string/sett_cache_location" />
+                android:defaultValue=""
+                android:dialogTitle="@string/sett_cache_location"
+                android:key="audioCacheLocation"
+                android:title="@string/sett_cache_location"/>
         <Preference
-            android:key="downloadAudio"
-            android:title="@string/cache_my_music" />
+                android:key="downloadAudio"
+                android:title="@string/cache_my_music"/>
         <Preference
-            android:key="clearAudioCache"
-            android:summary=""
-            android:title="@string/sett_clear_audio_cache" />
+                android:key="clearAudioCache"
+                android:summary=""
+                android:title="@string/sett_clear_audio_cache"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/where_is_cache_settings_summ"
-            android:title="@string/where_is_cache_settings" />
-        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
+                android:enabled="false"
+                android:summary="@string/where_is_cache_settings_summ"
+                android:title="@string/where_is_cache_settings"/>
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_general_milkshake.xml

@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto">
+                  xmlns:custom="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:key="app"
-        android:title="@string/sett_app">
+            android:key="app"
+            android:title="@string/sett_app">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="firstname"
-            android:dialogTitle="@string/sett_flist_sort"
-            android:entries="@array/sett_friends_order"
-            android:entryValues="@array/sett_friends_order_v"
-            android:key="friendsOrderNew"
-            android:layout="@layout/preference_with_value"
-            android:textColor="?text_secondary"
-            android:title="@string/sett_flist_sort" />
+                android:defaultValue="firstname"
+                android:dialogTitle="@string/sett_flist_sort"
+                android:entries="@array/sett_friends_order"
+                android:entryValues="@array/sett_friends_order_v"
+                android:key="friendsOrderNew"
+                android:layout="@layout/preference_with_value"
+                android:textColor="?text_secondary"
+                android:title="@string/sett_flist_sort"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="0"
-            android:dialogTitle="@string/sett_font_size"
-            android:entries="@array/sett_font_size_options"
-            android:entryValues="@array/sett_font_size_values"
-            android:key="fontSize"
-            android:layout="@layout/preference_with_value"
-            android:title="@string/sett_font_size" />
+                android:defaultValue="0"
+                android:dialogTitle="@string/sett_font_size"
+                android:entries="@array/sett_font_size_options"
+                android:entryValues="@array/sett_font_size_values"
+                android:key="fontSize"
+                android:layout="@layout/preference_with_value"
+                android:title="@string/sett_font_size"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="sendByEnter"
-            android:summary="@string/sett_send_by_enter_summary"
-            android:title="@string/sett_send_by_enter" />
+                android:defaultValue="false"
+                android:key="sendByEnter"
+                android:summary="@string/sett_send_by_enter_summary"
+                android:title="@string/sett_send_by_enter"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="useChromeCustomTabs"
-            android:summary="@string/sett_chrome_custom_tabs_summary"
-            android:title="@string/sett_chrome_custom_tabs" />
+                android:defaultValue="true"
+                android:key="useChromeCustomTabs"
+                android:summary="@string/sett_chrome_custom_tabs_summary"
+                android:title="@string/sett_chrome_custom_tabs"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="trackInstalledApps"
-            android:summary="@string/sett_mytracker_location_crap_summary"
-            android:title="@string/sett_mytracker_apps" />
+                android:defaultValue="true"
+                android:key="trackInstalledApps"
+                android:summary="@string/sett_mytracker_location_crap_summary"
+                android:title="@string/sett_mytracker_apps"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="isRoamingState"
-            android:summary="@string/sett_roaming_state_submit"
-            android:title="@string/sett_roaming_state" />
+                android:defaultValue="false"
+                android:key="isRoamingState"
+                android:summary="@string/sett_roaming_state_submit"
+                android:title="@string/sett_roaming_state"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="multimedia"
-        android:title="@string/sett_media">
+            android:key="multimedia"
+            android:title="@string/sett_media">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="saveProcessedImage"
-            android:title="@string/sett_save_processed_image"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="saveProcessedImage"
+                android:title="@string/sett_save_processed_image"
+                custom:singleLine="false"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="showMusicSuggestNotification"
-            android:title="@string/sett_show_music_suggestion_notification"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="showMusicSuggestNotification"
+                android:title="@string/sett_show_music_suggestion_notification"
+                custom:singleLine="false"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="prefetchAudioMsg"
-            android:title="@string/vkim_settings_prefetch_audiomsg"
-            custom:singleLine="false" />
+                android:defaultValue="true"
+                android:key="prefetchAudioMsg"
+                android:title="@string/vkim_settings_prefetch_audiomsg"
+                custom:singleLine="false"/>
         <ListPreference
-            android:defaultValue="always"
-            android:entries="@array/sett_gif_autoplay_entries"
-            android:entryValues="@array/sett_gif_autoplay_entry_values"
-            android:key="gif_autoplay"
-            android:summary="%s"
-            android:title="@string/sett_gif_autoplay_title" />
+                android:defaultValue="always"
+                android:entries="@array/sett_gif_autoplay_entries"
+                android:entryValues="@array/sett_gif_autoplay_entry_values"
+                android:key="gif_autoplay"
+                android:summary="%s"
+                android:title="@string/sett_gif_autoplay_title"/>
         <ListPreference
-            android:defaultValue="always"
-            android:entries="@array/sett_gif_autoplay_entries"
-            android:entryValues="@array/sett_gif_autoplay_entry_values"
-            android:key="video_autoplay"
-            android:summary="%s"
-            android:title="@string/sett_video_autoplay_title" />
+                android:defaultValue="always"
+                android:entries="@array/sett_gif_autoplay_entries"
+                android:entryValues="@array/sett_gif_autoplay_entry_values"
+                android:key="video_autoplay"
+                android:summary="%s"
+                android:title="@string/sett_video_autoplay_title"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="cache"
-        android:title="@string/sett_cache">
+            android:key="cache"
+            android:title="@string/sett_cache">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="enableAudioCache"
-            android:title="@string/sett_enable_audio_cache" />
+                android:defaultValue="true"
+                android:key="enableAudioCache"
+                android:title="@string/sett_enable_audio_cache"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue=""
-            android:dialogTitle="@string/sett_cache_location"
-            android:key="audioCacheLocation"
-            android:title="@string/sett_cache_location" />
+                android:defaultValue=""
+                android:dialogTitle="@string/sett_cache_location"
+                android:key="audioCacheLocation"
+                android:title="@string/sett_cache_location"/>
         <Preference
-            android:key="downloadAudio"
-            android:title="@string/cache_my_music" />
+                android:key="downloadAudio"
+                android:title="@string/cache_my_music"/>
         <Preference
-            android:key="clearAudioCache"
-            android:summary=""
-            android:title="@string/sett_clear_audio_cache" />
+                android:key="clearAudioCache"
+                android:summary=""
+                android:title="@string/sett_clear_audio_cache"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/where_is_cache_settings_summ"
-            android:title="@string/where_is_cache_settings" />
+                android:enabled="false"
+                android:summary="@string/where_is_cache_settings_summ"
+                android:title="@string/where_is_cache_settings"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_gms.xml

@@ -2,42 +2,42 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/gms_about">
         <Preference
-            android:enabled="false"
-            android:summary="@string/gms_what_is_summ"
-            android:title="@string/gms_what_is_title" />
+                android:enabled="false"
+                android:summary="@string/gms_what_is_summ"
+                android:title="@string/gms_what_is_title"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/gms_why_need_summ"
-            android:title="@string/gms_why_need_title" />
+                android:enabled="false"
+                android:summary="@string/gms_why_need_summ"
+                android:title="@string/gms_why_need_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/gms_how_to_download">
         <Preference
-            android:enabled="false"
-            android:summary="@string/gms_what_to_do_then_summ"
-            android:title="@string/gms_what_to_do_then" />
+                android:enabled="false"
+                android:summary="@string/gms_what_to_do_then_summ"
+                android:title="@string/gms_what_to_do_then"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/gms_what_is_microg_summ"
-            android:title="@string/gms_what_is_microg" />
+                android:enabled="false"
+                android:summary="@string/gms_what_is_microg_summ"
+                android:title="@string/gms_what_is_microg"/>
         <Preference
-            android:persistent="false"
-            android:title="@string/gms_microg_site">
+                android:persistent="false"
+                android:title="@string/gms_microg_site">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://microg.org/" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://microg.org/"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:title="@string/gms_download_microg">
+                android:persistent="false"
+                android:title="@string/gms_download_microg">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://microg.org/download.html" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://microg.org/download.html"/>
         </Preference>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/gms_what_to_do_next">
         <Preference
-            android:enabled="false"
-            android:summary="@string/gms_what_to_do_after_microg_summ"
-            android:title="@string/gms_what_to_do_after_microg_title" />
+                android:enabled="false"
+                android:summary="@string/gms_what_to_do_after_microg_summ"
+                android:title="@string/gms_what_to_do_after_microg_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_interface.xml

@@ -1,82 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/interfacenewsfeed">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="stories"
-            android:summary="@string/showstoriessum"
-            android:title="@string/showstories" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="swipe"
-            android:title="@string/interfacenewsfeedswipe" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="whatsnew"
-            android:summary="@string/whatsnew_summ"
-            android:title="@string/whatsnew_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="is_likes_on_right"
-            android:title="@string/right_likes" />
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceglobal">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/interfacestartfrsum"
-            android:entries="@array/start"
-            android:entryValues="@array/start_values"
-            android:key="start_values"
-            android:title="@string/interfacestartfr" />
+                android:defaultValue="default"
+                android:dialogTitle="@string/dateformat"
+                android:entries="@array/dateformat_value"
+                android:entryValues="@array/dateformat"
+                android:key="dateformat"
+                android:title="@string/interfaceglobaldates"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="shortinfo"
+                android:summary="@string/interfaceglobalnumsum"
+                android:title="@string/interfaceglobalnum"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="shortpost"
+                android:summary="@string/interfaceglobalpostsum"
+                android:title="@string/interfaceglobalpost"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="noanim"
-            android:dialogTitle="@string/selectfranimation"
-            android:entries="@array/animations2"
-            android:entryValues="@array/animations_values2"
-            android:key="anim_rtrn_type"
-            android:title="@string/franimation" />
+                android:defaultValue="default"
+                android:dialogTitle="@string/interfacestartfrsum"
+                android:entries="@array/start"
+                android:entryValues="@array/start_values"
+                android:key="start_values"
+                android:title="@string/interfacestartfr"/>
+        <com.vtosters.lite.ui.SummaryListPreference
+                android:defaultValue="noanim"
+                android:dialogTitle="@string/selectfranimation"
+                android:entries="@array/animations2"
+                android:entryValues="@array/animations_values2"
+                android:key="anim_rtrn_type"
+                android:title="@string/franimation"/>
         <Preference
-            android:key="customrounding"
-            android:title="@string/customrounding_title" />
+                android:key="customrounding"
+                android:title="@string/customrounding_title"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/interfacenewsfeed">
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="stories"
+                android:summary="@string/showstoriessum"
+                android:title="@string/showstories"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="swipe"
+                android:title="@string/interfacenewsfeedswipe"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="whatsnew"
+                android:summary="@string/whatsnew_summ"
+                android:title="@string/whatsnew_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="is_likes_on_right"
+                android:title="@string/right_likes"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfacevideo">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="postsredesign"
-            android:summary="@string/postsredesign_summ"
-            android:title="@string/postsredesign_title" />
+                android:defaultValue="true"
+                android:key="postsredesign"
+                android:summary="@string/postsredesign_summ"
+                android:title="@string/postsredesign_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/menu" android:key="menusett">
+        <Preference
+                android:key="superappeditor"
+                android:title="@string/superapp_editor"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="miniapps"
-            android:summary="@string/miniapps_summ"
-            android:title="@string/miniapps_title" />
+                android:defaultValue="true"
+                android:key="miniapps"
+                android:summary="@string/miniapps_summ"
+                android:title="@string/miniapps_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="vkpay"
-            android:summary="@string/show_vkpay_summ"
-            android:title="@string/show_vkpay_title" />
+                android:defaultValue="true"
+                android:key="vkpay"
+                android:summary="@string/show_vkpay_summ"
+                android:title="@string/show_vkpay_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="superapp"
-            android:summary="@string/show_superapps_summ"
-            android:title="@string/show_superapps_title" />
+                android:defaultValue="true"
+                android:key="superapp"
+                android:summary="@string/show_superapps_summ"
+                android:title="@string/show_superapps_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="showmenu"
-            android:summary="@string/menucuttersum"
-            android:title="@string/menucutter" />
+                android:defaultValue="false"
+                android:key="showmenu"
+                android:summary="@string/menucuttersum"
+                android:title="@string/menucutter"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="friendsblock"
-            android:summary="@string/friendsblock_summ"
-            android:title="@string/friendsblock_title" />
+                android:defaultValue="false"
+                android:key="pollresults"
+                android:summary="@string/pollresults_summ"
+                android:title="@string/pollresults_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="disableSettingsSumms"
-            android:title="@string/vtlhidesumm" />
+                android:defaultValue="false"
+                android:key="friendsblock"
+                android:summary="@string/friendsblock_summ"
+                android:title="@string/friendsblock_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_media.xml

@@ -1,121 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/interfaceglobal">
-        <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/dateformat"
-            android:entries="@array/dateformat_value"
-            android:entryValues="@array/dateformat"
-            android:key="dateformat"
-            android:title="@string/interfaceglobaldates" />
+    <PreferenceCategory android:title="@string/sett_media">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="shortinfo"
-            android:summary="@string/interfaceglobalnumsum"
-            android:title="@string/interfaceglobalnum" />
+                android:defaultValue="true"
+                android:key="compressPhotos"
+                android:summary="@string/sett_compress_photo_summ"
+                android:title="@string/sett_compress_photos"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="shortpost"
-            android:summary="@string/interfaceglobalpostsum"
-            android:title="@string/interfaceglobalpost" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="pollresults"
-            android:summary="@string/pollresults_summ"
-            android:title="@string/pollresults_title" />
+                android:defaultValue="true"
+                android:key="compressVideos"
+                android:summary="@string/sett_compress_video_summ"
+                android:title="@string/sett_compress_videos"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_music_settings">
         <Preference
-            android:key="cached_tracks"
-            android:title="@string/cached_tracks_title"/>
+                android:key="cached_tracks"
+                android:title="@string/cached_tracks_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="autocache"
-            android:summary="@string/autocache_summ"
-            android:title="@string/autocache_title" />
+                android:defaultValue="false"
+                android:key="autocache"
+                android:summary="@string/autocache_summ"
+                android:title="@string/autocache_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="useOldAppVer"
-            android:summary="@string/useOldAppVer_summ"
-            android:title="@string/useOldAppVer_title" />
+                android:defaultValue="false"
+                android:key="useOldAppVer"
+                android:summary="@string/useOldAppVer_summ"
+                android:title="@string/useOldAppVer_title"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/musicdefcatalog_dialogTitle"
-            android:entries="@array/musicdefcatalog_value"
-            android:entryValues="@array/musicdefcatalog"
-            android:key="musicdefcatalog"
-            android:title="@string/musicdefcatalog_title" />
+                android:defaultValue="default"
+                android:dialogTitle="@string/musicdefcatalog_dialogTitle"
+                android:entries="@array/musicdefcatalog_value"
+                android:entryValues="@array/musicdefcatalog"
+                android:key="musicdefcatalog"
+                android:title="@string/musicdefcatalog_title"/>
         <Preference
-            android:key="audio_download"
-            android:title="@string/audio_download_title"/>
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/sett_media">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="compressPhotos"
-            android:summary="@string/sett_compress_photo_summ"
-            android:title="@string/sett_compress_photos" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="compressVideos"
-            android:summary="@string/sett_compress_video_summ"
-            android:title="@string/sett_compress_videos" />
+                android:key="audio_download"
+                android:title="@string/audio_download_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="Last.fm">
         <Preference
-            android:key="lastfm_auth"
-            android:summary="@string/lastfm_auth_summ"
-            android:title="@string/lastfm_auth_title" />
+                android:key="lastfm_auth"
+                android:summary="@string/lastfm_auth_summ"
+                android:title="@string/lastfm_auth_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="lastfm_enabled"
-            android:summary="@string/lastfm_enabled_summ"
-            android:title="@string/lastfm_enabled_title" />
+                android:defaultValue="false"
+                android:key="lastfm_enabled"
+                android:summary="@string/lastfm_enabled_summ"
+                android:title="@string/lastfm_enabled_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_video_settings">
         <Preference
-            android:key="download_video"
-            android:title="@string/vtl_download_video_title" />
+                android:key="download_video"
+                android:title="@string/vtl_download_video_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="isEnableExternalOpening"
-            android:summary="@string/interfacevideoextsum"
-            android:title="@string/interfacevideoext" />
+                android:defaultValue="false"
+                android:key="isEnableExternalOpening"
+                android:summary="@string/interfacevideoextsum"
+                android:title="@string/interfacevideoext"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="maxquality"
-            android:summary="@string/maxquality_summ"
-            android:title="@string/maxquality_title" />
+                android:defaultValue="false"
+                android:key="maxquality"
+                android:summary="@string/maxquality_summ"
+                android:title="@string/maxquality_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="__dbg_disable_video_feed"
-            android:summary="@string/interfacevideorecsum"
-            android:title="@string/interfacevideorec" />
+                android:defaultValue="false"
+                android:key="__dbg_disable_video_feed"
+                android:summary="@string/interfacevideorecsum"
+                android:title="@string/interfacevideorec"/>
         <Preference
-            android:key="clearvideohistory"
-            android:summary="@string/clearvideohistory_summ"
-            android:title="@string/clearvideohistory_title" />
+                android:key="clearvideohistory"
+                android:summary="@string/clearvideohistory_summ"
+                android:title="@string/clearvideohistory_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_photo_settings">
         <Preference
-            android:key="select_photo_search_engine"
-            android:title="@string/photo_search_engine_title" />
+                android:key="select_photo_search_engine"
+                android:title="@string/photo_search_engine_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vkx_title" android:key="vkx_sett">
         <Preference
-            android:enabled="false"
-            android:summary="@string/vkx_why_summary"
-            android:title="@string/vkx_why" />
+                android:enabled="false"
+                android:summary="@string/vkx_why_summary"
+                android:title="@string/vkx_why"/>
         <Preference
-            android:persistent="false"
-            android:title="@string/vkx_download">
+                android:persistent="false"
+                android:title="@string/vkx_download">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://vkx.app" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://vkx.app"/>
         </Preference>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="libvkx_integration"
-            android:title="@string/vkx_integration" />
+                android:defaultValue="false"
+                android:key="libvkx_integration"
+                android:title="@string/vkx_integration"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_messages.xml

@@ -1,85 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/vtlinterfacemsg">
-        <Preference
-            android:key="wallpapers"
-            android:title="@string/wallpapers_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="voice"
-            android:summary="@string/vtlvoicesummary"
-            android:title="@string/vtlvoice" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="convBarRecomm"
-            android:summary="@string/convBarRecomm_summ"
-            android:title="@string/convBarRecomm_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="wbios"
-            android:title="@string/writebar_ios_title"/>
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/vk_messenger" android:key="vkmesett">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="vkme"
-            android:summary="@string/vkmesumm"
-            android:title="@string/vkme" />
+                android:defaultValue="false"
+                android:key="vkme"
+                android:summary="@string/vkmesumm"
+                android:title="@string/vkme"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="vkme_notifs"
-            android:title="@string/vkme_notifs" />
+                android:defaultValue="false"
+                android:key="vkme_notifs"
+                android:title="@string/vkme_notifs"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtlinterfacemsg">
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="true"
+                android:key="voice"
+                android:summary="@string/vtlvoicesummary"
+                android:title="@string/vtlvoice"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="convBarRecomm"
+                android:summary="@string/convBarRecomm_summ"
+                android:title="@string/convBarRecomm_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="wbios"
+                android:title="@string/writebar_ios_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/translator_title">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="system"
-            android:dialogTitle="@string/translator_choose_language"
-            android:entries="@array/targetlang_value"
-            android:entryValues="@array/targetlang"
-            android:key="lang_target"
-            android:title="@string/translator_translate_language" />
+                android:defaultValue="system"
+                android:dialogTitle="@string/translator_choose_language"
+                android:entries="@array/targetlang_value"
+                android:entryValues="@array/targetlang"
+                android:key="lang_target"
+                android:title="@string/translator_translate_language"/>
         <Preference
-            android:key="lang_service"
-            android:title="@string/translator_translate_service" />
+                android:key="lang_service"
+                android:title="@string/translator_translate_service"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="autotranslate"
-            android:summary="@string/autotranslate_summ"
-            android:title="@string/autotranslate_title" />
+                android:defaultValue="false"
+                android:key="autotranslate"
+                android:summary="@string/autotranslate_summ"
+                android:title="@string/autotranslate_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="autoalltranslate"
-            android:summary="@string/autoalltranslate_summ"
-            android:title="@string/autoalltranslate_title" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/interfaceemoji">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="alteremoji"
-            android:summary="@string/alteremojisum"
-            android:title="@string/alteremoji" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="systememoji"
-            android:summary="@string/systememojisum"
-            android:title="@string/systememoji" />
+                android:defaultValue="false"
+                android:key="autoalltranslate"
+                android:summary="@string/autoalltranslate_summ"
+                android:title="@string/autoalltranslate_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="businessDisabler"
-            android:title="@string/businessDisabler_title" />
+                android:defaultValue="false"
+                android:key="businessDisabler"
+                android:title="@string/businessDisabler_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="sendByEnter"
-            android:summary="@string/sett_send_by_enter_summary"
-            android:title="@string/sett_send_by_enter" />
+                android:defaultValue="false"
+                android:key="sendByEnter"
+                android:summary="@string/sett_send_by_enter_summary"
+                android:title="@string/sett_send_by_enter"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="30"
-            android:dialogTitle="@string/messages_other_choose_count"
-            android:entries="@array/msgcount_value"
-            android:entryValues="@array/msgcount"
-            android:key="msgcount"
-            android:title="@string/messages_other_download_first" />
+                android:defaultValue="30"
+                android:dialogTitle="@string/messages_other_choose_count"
+                android:entries="@array/msgcount_value"
+                android:entryValues="@array/msgcount"
+                android:key="msgcount"
+                android:title="@string/messages_other_download_first"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_newsfeed.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.vtosters.lite.ui.SummaryListPreference
-        android:defaultValue="order"
-        android:dialogTitle="@string/newsfeed_settings_order"
-        android:entries="@array/newsfeed_settings_feed_type"
-        android:entryValues="@array/newsfeed_settings_feed_type_v"
-        android:key="newsfeed_order"
-        android:textColor="?text_secondary"
-        android:title="@string/newsfeed_settings_order" />
+            android:defaultValue="order"
+            android:dialogTitle="@string/newsfeed_settings_order"
+            android:entries="@array/newsfeed_settings_feed_type"
+            android:entryValues="@array/newsfeed_settings_feed_type_v"
+            android:key="newsfeed_order"
+            android:textColor="?text_secondary"
+            android:title="@string/newsfeed_settings_order"/>
     <Preference
-        android:key="new_posts"
-        android:summary="@string/newsfeed_settings_new_posts_hint"
-        android:title="@string/newsfeed_settings_new_posts" />
+            android:key="new_posts"
+            android:summary="@string/newsfeed_settings_new_posts_hint"
+            android:title="@string/newsfeed_settings_new_posts"/>
     <Preference
-        android:key="hide_from_news"
-        android:summary="@string/newsfeed_settings_hide_from_news_hint"
-        android:title="@string/newsfeed_settings_hide_from_news" />
+            android:key="hide_from_news"
+            android:summary="@string/newsfeed_settings_hide_from_news_hint"
+            android:title="@string/newsfeed_settings_hide_from_news"/>
     <Preference
-        android:key="hide_from_stories"
-        android:summary="@string/newsfeed_settings_hide_from_stories_hint"
-        android:title="@string/newsfeed_settings_hide_from_stories" />
+            android:key="hide_from_stories"
+            android:summary="@string/newsfeed_settings_hide_from_stories_hint"
+            android:title="@string/newsfeed_settings_hide_from_stories"/>
 </PreferenceScreen>

smali/res/xml/preferences_other.xml

@@ -2,82 +2,86 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/contact_sync_title">
         <Preference
-            android:key="contacts_sync"
-            android:title="@string/contact_sync_title" />
+                android:key="contacts_sync"
+                android:title="@string/contact_sync_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_fix_app">
         <Preference
-            android:key="firebasefix"
-            android:summary="@string/firebasefixsum"
-            android:title="@string/firebasefix" />
+                android:key="firebasefix"
+                android:summary="@string/firebasefixsum"
+                android:title="@string/firebasefix"/>
         <Preference
-            android:key="clearcache"
-            android:title="@string/clearcache_other_title" />
+                android:key="clearcache"
+                android:title="@string/clearcache_other_title"/>
         <Preference
-            android:key="autoclearcache"
-            android:title="@string/autoclearcache" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vtsystem">
-        <Preference
-            android:key="applicationrestart"
-            android:title="@string/applicationrestart" />
-        <Preference
-            android:key="applicationstop"
-            android:title="@string/killappbtn" />
-        <Preference
-            android:key="tokencopy"
-            android:title="@string/copytokenbtn" />
-        <Preference
-            android:key="deviceinfo"
-            android:title="Device info" />
-        <Preference
-            android:key="vk_admin_token"
-            android:title="@string/vk_admin_token_title" />
-    </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vtl_other_backups_title">
-        <Preference
-            android:key="saveonlines"
-            android:summary="@string/saveonlines_summ"
-            android:title="@string/saveonlines_title" />
-        <Preference
-            android:key="deleteprefs"
-            android:summary="@string/other_reset_settings_summary"
-            android:title="@string/other_reset_settings" />
-        <Preference
-            android:key="saveprefs"
-            android:title="@string/saveprefs_title" />
-        <Preference
-            android:key="restoreprefs"
-            android:title="@string/restoreprefs_title" />
+                android:key="autoclearcache"
+                android:title="@string/autoclearcache"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtverify">
         <Preference
-            android:enabled="false"
-            android:summary="@string/vtverifyinfosum"
-            android:title="@string/vtverifyinfo" />
+                android:enabled="false"
+                android:summary="@string/vtverifyinfosum"
+                android:title="@string/vtverifyinfo"/>
         <Preference
-            android:persistent="false"
-            android:summary="vtosters.app/donate"
-            android:title="@string/getvtverify">
+                android:persistent="false"
+                android:summary="vtosters.app/donate"
+                android:title="@string/getvtverify">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://vtosters.app/donate" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://vtosters.app/donate"/>
         </Preference>
         <Preference
-            android:key="copyownlink"
-            android:summary="@string/copyownlink_summ"
-            android:title="@string/copyownlink_title" />
+                android:key="updateverifdata"
+                android:summary="Загрузить свежие данные о верификациях и серверных функций"
+                android:title="Обновить данные"/>
+        <Preference
+                android:key="copyownlink"
+                android:summary="@string/copyownlink_summ"
+                android:title="@string/copyownlink_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="VT_Verification"
-            android:title="@string/showvtverify" />
+                android:defaultValue="true"
+                android:key="VT_Verification"
+                android:title="@string/showvtverify"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="VT_Fire"
-            android:title="@string/showvtfire" />
+                android:defaultValue="true"
+                android:key="VT_Fire"
+                android:title="@string/showvtfire"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="dialogrecomm"
-            android:title="@string/dialogrecomm" />
+                android:defaultValue="false"
+                android:key="dialogrecomm"
+                android:title="@string/dialogrecomm"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtsystem">
+        <Preference
+                android:key="applicationrestart"
+                android:title="@string/applicationrestart"/>
+        <Preference
+                android:key="applicationstop"
+                android:title="@string/killappbtn"/>
+        <Preference
+                android:key="tokencopy"
+                android:title="@string/copytokenbtn"/>
+        <Preference
+                android:key="deviceinfo"
+                android:title="Device info"/>
+        <Preference
+                android:key="vk_admin_token"
+                android:title="@string/vk_admin_token_title"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtl_other_backups_title">
+        <Preference
+                android:key="saveonlines"
+                android:summary="@string/saveonlines_summ"
+                android:title="@string/saveonlines_title"/>
+        <Preference
+                android:key="deleteprefs"
+                android:summary="@string/other_reset_settings_summary"
+                android:title="@string/other_reset_settings"/>
+        <Preference
+                android:key="saveprefs"
+                android:title="@string/saveprefs_title"/>
+        <Preference
+                android:key="restoreprefs"
+                android:title="@string/restoreprefs_title"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_proxy.xml

@@ -2,144 +2,144 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/vtlproxy">
         <Preference
-            android:enabled="false"
-            android:summary="@string/proxyimpinfosum"
-            android:title="@string/warning" />
+                android:enabled="false"
+                android:summary="@string/proxyimpinfosum"
+                android:title="@string/warning"/>
         <Preference
-            android:enabled="false"
-            android:summary="@string/denial_of_responsibility_proxy_summ"
-            android:title="@string/denial_of_responsibility_proxy" />
+                android:enabled="false"
+                android:summary="@string/denial_of_responsibility_proxy_summ"
+                android:title="@string/denial_of_responsibility_proxy"/>
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="noproxy"
-            android:dialogTitle="@string/useproxysum"
-            android:entries="@array/proxy"
-            android:entryValues="@array/proxy_value"
-            android:key="proxy"
-            android:title="@string/useproxy" />
+                android:defaultValue="noproxy"
+                android:dialogTitle="@string/useproxysum"
+                android:entries="@array/proxy"
+                android:entryValues="@array/proxy_value"
+                android:key="proxy"
+                android:title="@string/useproxy"/>
         <Preference
-            android:key="random_proxy"
-            android:summary="@string/proxy_setup_summ"
-            android:title="@string/proxy_setup_title" />
+                android:key="random_proxy"
+                android:summary="@string/proxy_setup_summ"
+                android:title="@string/proxy_setup_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/proxyadvsettings">
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyapi"
-            android:title="@string/proxyapi" />
+                android:defaultValue=""
+                android:key="proxyapi"
+                android:title="@string/proxyapi"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyoauth"
-            android:title="@string/proxyoauth" />
+                android:defaultValue=""
+                android:key="proxyoauth"
+                android:title="@string/proxyoauth"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxystatic"
-            android:title="@string/proxystatic" />
+                android:defaultValue=""
+                android:key="proxystatic"
+                android:title="@string/proxystatic"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/proxyhttp">
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyHostHTTP"
-            android:title="@string/proxydomain" />
+                android:defaultValue=""
+                android:key="proxyHostHTTP"
+                android:title="@string/proxydomain"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyPortHTTP"
-            android:title="@string/proxyport" />
+                android:defaultValue=""
+                android:key="proxyPortHTTP"
+                android:title="@string/proxyport"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyUserHTTP"
-            android:summary="@string/proxy_if"
-            android:title="@string/proxy_login_title" />
+                android:defaultValue=""
+                android:key="proxyUserHTTP"
+                android:summary="@string/proxy_if"
+                android:title="@string/proxy_login_title"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyPassHTTP"
-            android:summary="@string/proxy_if"
-            android:title="@string/proxy_password_title" />
+                android:defaultValue=""
+                android:key="proxyPassHTTP"
+                android:summary="@string/proxy_if"
+                android:title="@string/proxy_password_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/proxyhttps">
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyHostHTTPS"
-            android:title="@string/proxydomain" />
+                android:defaultValue=""
+                android:key="proxyHostHTTPS"
+                android:title="@string/proxydomain"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyPortHTTPS"
-            android:title="@string/proxyport" />
+                android:defaultValue=""
+                android:key="proxyPortHTTPS"
+                android:title="@string/proxyport"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyUserHTTPS"
-            android:summary="@string/proxy_if"
-            android:title="@string/proxy_login_title" />
+                android:defaultValue=""
+                android:key="proxyUserHTTPS"
+                android:summary="@string/proxy_if"
+                android:title="@string/proxy_login_title"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyPassHTTPS"
-            android:summary="@string/proxy_if"
-            android:title="@string/proxy_password_title" />
+                android:defaultValue=""
+                android:key="proxyPassHTTPS"
+                android:summary="@string/proxy_if"
+                android:title="@string/proxy_password_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/proxysocks">
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyHostSocks"
-            android:title="@string/proxydomain" />
+                android:defaultValue=""
+                android:key="proxyHostSocks"
+                android:title="@string/proxydomain"/>
         <EditTextPreference
-            android:defaultValue=""
-            android:key="proxyPortSocks"
-            android:title="@string/proxyport" />
+                android:defaultValue=""
+                android:key="proxyPortSocks"
+                android:title="@string/proxyport"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/proxyowners">
         <Preference
-            android:persistent="false"
-            android:title="Hookzof Socks">
+                android:persistent="false"
+                android:title="Hookzof Socks">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/hookzof/socks5_list" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/hookzof/socks5_list"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:title="Jetkai Socks/Https/Http">
+                android:persistent="false"
+                android:title="Jetkai Socks/Https/Http">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/jetkai/proxy-list" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/jetkai/proxy-list"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:title="TheSpeedX Socks/Http">
+                android:persistent="false"
+                android:title="TheSpeedX Socks/Http">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/TheSpeedX/PROXY-List" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/TheSpeedX/PROXY-List"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:title="Roosterkid Socks">
+                android:persistent="false"
+                android:title="Roosterkid Socks">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/roosterkid/openproxylist" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/roosterkid/openproxylist"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:summary="@string/proxydonate"
-            android:title="zaborona">
+                android:persistent="false"
+                android:summary="@string/proxydonate"
+                android:title="zaborona">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://zaborona.help/donate.html" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://zaborona.help/donate.html"/>
         </Preference>
         <Preference
-            android:persistent="false"
-            android:summary="Vika Donate"
-            android:title="Vika Mobile proxy">
+                android:persistent="false"
+                android:summary="Vika Donate"
+                android:title="Vika Mobile proxy">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="http://vikamobile.ru/donate.php" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="http://vikamobile.ru/donate.php"/>
         </Preference>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="altervika"
-            android:title="@string/altervika_title" />
+                android:defaultValue="false"
+                android:key="altervika"
+                android:title="@string/altervika_title"/>
         <Preference
-            android:persistent="false"
-            android:title="@string/proxyownersxtrsources">
+                android:persistent="false"
+                android:title="@string/proxyownersxtrsources">
             <intent
-                android:action="android.intent.action.VIEW"
-                android:data="https://github.com/vtosters/vk-proxy" />
+                    android:action="android.intent.action.VIEW"
+                    android:data="https://github.com/vtosters/vk-proxy"/>
         </Preference>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_tgs.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen />
+<PreferenceScreen/>

smali/res/xml/preferences_themes.xml

@@ -3,64 +3,84 @@
     <PreferenceCategory android:title="@string/accents"
                         android:key="accentprefs">
         <Preference
-            android:key="accent_color"
-            android:summary="@string/accent_color_summ"
-            android:icon="@drawable/bg_accent_circle"
-            android:title="@string/accent_color_title" />
+                android:key="accent_color"
+                android:summary="@string/accent_color_summ"
+                android:icon="@drawable/bg_accent_circle"
+                android:title="@string/accent_color_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlthemes">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="milkshake"
-            android:summary="@string/milkshake_summ"
-            android:title="@string/milkshake_title" />
+                android:defaultValue="true"
+                android:key="milkshake"
+                android:summary="@string/milkshake_summ"
+                android:title="@string/milkshake_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="amoledtheme"
-            android:summary="@string/amoledtheme_summ"
-            android:title="@string/amoledtheme_title" />
+                android:defaultValue="false"
+                android:key="amoledtheme"
+                android:summary="@string/amoledtheme_summ"
+                android:title="@string/amoledtheme_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="monettheme"
-            android:summary="@string/monettheme_summ"
-            android:title="@string/monettheme_title" />
+                android:defaultValue="false"
+                android:key="monettheme"
+                android:summary="@string/monettheme_summ"
+                android:title="@string/monettheme_title"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtlmessages">
+        <Preference
+                android:key="wallpapers"
+                android:title="@string/wallpapers_title"/>
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/interfaceemoji">
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="alteremoji"
+                android:summary="@string/alteremojisum"
+                android:title="@string/alteremoji"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="systememoji"
+                android:summary="@string/systememojisum"
+                android:title="@string/systememoji"/>
     </PreferenceCategory>
     <PreferenceCategory
-        android:key="dockbarsett"
-        android:title="@string/vtl_settings_dockbar_title">
+            android:key="dockbarsett"
+            android:title="@string/vtl_settings_dockbar_title">
+        <Preference
+                android:key="dockbareditor"
+                android:title="@string/dockbar_editor"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="dockbar_tab_titles"
-            android:title="@string/dockbar_tab_titles" />
+                android:defaultValue="true"
+                android:key="dockbar_tab_titles"
+                android:title="@string/dockbar_tab_titles"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="dockbar_accent"
-            android:title="@string/dockbar_accent_title" />
+                android:defaultValue="true"
+                android:key="dockbar_accent"
+                android:title="@string/dockbar_accent_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="dockcounter"
-            android:summary="@string/docknumberssum"
-            android:title="@string/docknumbers" />
+                android:defaultValue="true"
+                android:key="dockcounter"
+                android:summary="@string/docknumberssum"
+                android:title="@string/docknumbers"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="newsfeed_notif"
-            android:summary="@string/newsfeed_notif_summ"
-            android:title="@string/newsfeed_notif_title" />
+                android:defaultValue="true"
+                android:key="newsfeed_notif"
+                android:summary="@string/newsfeed_notif_summ"
+                android:title="@string/newsfeed_notif_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
         <Preference
-            android:key="iconmanager"
-            android:summary="@string/iconmanager_summ"
-            android:title="@string/iconmanager_title" />
+                android:key="iconmanager"
+                android:summary="@string/iconmanager_summ"
+                android:title="@string/iconmanager_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="navbar"
-            android:summary="@string/appearance_other_color_navbar_summary"
-            android:title="@string/vtlnavbar" />
+                android:defaultValue="true"
+                android:key="navbar"
+                android:summary="@string/appearance_other_color_navbar_summary"
+                android:title="@string/vtlnavbar"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="VKUI_INJ"
-            android:summary="@string/appearance_other_color_webview_summary"
-            android:title="@string/vkuiinj" />
+                android:defaultValue="true"
+                android:key="VKUI_INJ"
+                android:summary="@string/appearance_other_color_webview_summary"
+                android:title="@string/vkuiinj"/>
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/provider_paths.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
     <files-path
-        name="internal"
-        path="." />
+            name="internal"
+            path="."/>
     <external-path
-        name="external_storage"
-        path="." />
+            name="external_storage"
+            path="."/>
 </paths>

smali/res/xml/splits0.xml

@@ -3,233 +3,233 @@
     <module name="">
         <language>
             <entry
-                key="af"
-                split="" />
+                    key="af"
+                    split=""/>
             <entry
-                key="am"
-                split="" />
+                    key="am"
+                    split=""/>
             <entry
-                key="ar"
-                split="" />
+                    key="ar"
+                    split=""/>
             <entry
-                key="as"
-                split="" />
+                    key="as"
+                    split=""/>
             <entry
-                key="az"
-                split="" />
+                    key="az"
+                    split=""/>
             <entry
-                key="be"
-                split="" />
+                    key="be"
+                    split=""/>
             <entry
-                key="bg"
-                split="" />
+                    key="bg"
+                    split=""/>
             <entry
-                key="bn"
-                split="" />
+                    key="bn"
+                    split=""/>
             <entry
-                key="bs"
-                split="" />
+                    key="bs"
+                    split=""/>
             <entry
-                key="ca"
-                split="" />
+                    key="ca"
+                    split=""/>
             <entry
-                key="cs"
-                split="" />
+                    key="cs"
+                    split=""/>
             <entry
-                key="da"
-                split="" />
+                    key="da"
+                    split=""/>
             <entry
-                key="de"
-                split="" />
+                    key="de"
+                    split=""/>
             <entry
-                key="el"
-                split="" />
+                    key="el"
+                    split=""/>
             <entry
-                key="en"
-                split="" />
+                    key="en"
+                    split=""/>
             <entry
-                key="es"
-                split="" />
+                    key="es"
+                    split=""/>
             <entry
-                key="et"
-                split="" />
+                    key="et"
+                    split=""/>
             <entry
-                key="eu"
-                split="" />
+                    key="eu"
+                    split=""/>
             <entry
-                key="fa"
-                split="" />
+                    key="fa"
+                    split=""/>
             <entry
-                key="fi"
-                split="" />
+                    key="fi"
+                    split=""/>
             <entry
-                key="fr"
-                split="" />
+                    key="fr"
+                    split=""/>
             <entry
-                key="gl"
-                split="" />
+                    key="gl"
+                    split=""/>
             <entry
-                key="gu"
-                split="" />
+                    key="gu"
+                    split=""/>
             <entry
-                key="hi"
-                split="" />
+                    key="hi"
+                    split=""/>
             <entry
-                key="hr"
-                split="" />
+                    key="hr"
+                    split=""/>
             <entry
-                key="hu"
-                split="" />
+                    key="hu"
+                    split=""/>
             <entry
-                key="hy"
-                split="" />
+                    key="hy"
+                    split=""/>
             <entry
-                key="in"
-                split="" />
+                    key="in"
+                    split=""/>
             <entry
-                key="is"
-                split="" />
+                    key="is"
+                    split=""/>
             <entry
-                key="it"
-                split="" />
+                    key="it"
+                    split=""/>
             <entry
-                key="iw"
-                split="" />
+                    key="iw"
+                    split=""/>
             <entry
-                key="ja"
-                split="" />
+                    key="ja"
+                    split=""/>
             <entry
-                key="ka"
-                split="" />
+                    key="ka"
+                    split=""/>
             <entry
-                key="kk"
-                split="" />
+                    key="kk"
+                    split=""/>
             <entry
-                key="km"
-                split="" />
+                    key="km"
+                    split=""/>
             <entry
-                key="kn"
-                split="" />
+                    key="kn"
+                    split=""/>
             <entry
-                key="ko"
-                split="" />
+                    key="ko"
+                    split=""/>
             <entry
-                key="ky"
-                split="" />
+                    key="ky"
+                    split=""/>
             <entry
-                key="kz"
-                split="" />
+                    key="kz"
+                    split=""/>
             <entry
-                key="lo"
-                split="" />
+                    key="lo"
+                    split=""/>
             <entry
-                key="lt"
-                split="" />
+                    key="lt"
+                    split=""/>
             <entry
-                key="lv"
-                split="" />
+                    key="lv"
+                    split=""/>
             <entry
-                key="mk"
-                split="" />
+                    key="mk"
+                    split=""/>
             <entry
-                key="ml"
-                split="" />
+                    key="ml"
+                    split=""/>
             <entry
-                key="mn"
-                split="" />
+                    key="mn"
+                    split=""/>
             <entry
-                key="mr"
-                split="" />
+                    key="mr"
+                    split=""/>
             <entry
-                key="ms"
-                split="" />
+                    key="ms"
+                    split=""/>
             <entry
-                key="my"
-                split="" />
+                    key="my"
+                    split=""/>
             <entry
-                key="nb"
-                split="" />
+                    key="nb"
+                    split=""/>
             <entry
-                key="ne"
-                split="" />
+                    key="ne"
+                    split=""/>
             <entry
-                key="nl"
-                split="" />
+                    key="nl"
+                    split=""/>
             <entry
-                key="no"
-                split="" />
+                    key="no"
+                    split=""/>
             <entry
-                key="or"
-                split="" />
+                    key="or"
+                    split=""/>
             <entry
-                key="pa"
-                split="" />
+                    key="pa"
+                    split=""/>
             <entry
-                key="pl"
-                split="" />
+                    key="pl"
+                    split=""/>
             <entry
-                key="pt"
-                split="" />
+                    key="pt"
+                    split=""/>
             <entry
-                key="ro"
-                split="" />
+                    key="ro"
+                    split=""/>
             <entry
-                key="ru"
-                split="" />
+                    key="ru"
+                    split=""/>
             <entry
-                key="si"
-                split="" />
+                    key="si"
+                    split=""/>
             <entry
-                key="sk"
-                split="" />
+                    key="sk"
+                    split=""/>
             <entry
-                key="sl"
-                split="" />
+                    key="sl"
+                    split=""/>
             <entry
-                key="sq"
-                split="" />
+                    key="sq"
+                    split=""/>
             <entry
-                key="sr"
-                split="" />
+                    key="sr"
+                    split=""/>
             <entry
-                key="sv"
-                split="" />
+                    key="sv"
+                    split=""/>
             <entry
-                key="sw"
-                split="" />
+                    key="sw"
+                    split=""/>
             <entry
-                key="ta"
-                split="" />
+                    key="ta"
+                    split=""/>
             <entry
-                key="te"
-                split="" />
+                    key="te"
+                    split=""/>
             <entry
-                key="th"
-                split="" />
+                    key="th"
+                    split=""/>
             <entry
-                key="tl"
-                split="" />
+                    key="tl"
+                    split=""/>
             <entry
-                key="tr"
-                split="" />
+                    key="tr"
+                    split=""/>
             <entry
-                key="uk"
-                split="" />
+                    key="uk"
+                    split=""/>
             <entry
-                key="ur"
-                split="" />
+                    key="ur"
+                    split=""/>
             <entry
-                key="uz"
-                split="" />
+                    key="uz"
+                    split=""/>
             <entry
-                key="vi"
-                split="" />
+                    key="vi"
+                    split=""/>
             <entry
-                key="zh"
-                split="" />
+                    key="zh"
+                    split=""/>
             <entry
-                key="zu"
-                split="" />
+                    key="zu"
+                    split=""/>
         </language>
     </module>
 </splits>

smali/res/xml/sync_contacts.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="com.vkontakte.account"
-    android:contentAuthority="com.android.contacts"
-    android:supportsUploading="false"
-    android:userVisible="true" />
+              android:accountType="com.vkontakte.account"
+              android:contentAuthority="com.android.contacts"
+              android:supportsUploading="false"
+              android:userVisible="true"/>