fix artists catalog

Co-authored-by: saoq <wfmfe@ya.ru>

.github/ISSUE_TEMPLATE/bug-report.md

@@ -19,9 +19,6 @@ assignees: ''
 
 **Скриншот ошибки**
 
-**Информация об устройстве:**
- - Устройство: Samsung Galaxy J1 Mini
- - OS: Android 9 | OneUi 3.0
- - Коммит: fa12e8f (В О Приложении написана версия коммита)
+**Скопируйте сюда информацию об устройстве нажав на кнопку "Скопировать информацию об устройстве" в Настройках -> Другое и удалите этот текст**
 
 **Дополнительная информация о баге или мыслях почему оно может происходить (если есть)**

.github/workflows/build.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 14
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '14'
           distribution: 'adopt'
           
       - uses: actions/checkout@v3

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'
@@ -97,8 +96,8 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_14
+        targetCompatibility JavaVersion.VERSION_14
     }
     namespace 'ru.vtosters.lite'
 }
@@ -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/im/ui/components/viewcontrollers/msg_list/adapter/MsgPartHolderBindArgs.java

@@ -0,0 +1,72 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.vk.im.ui.components.viewcontrollers.msg_list.adapter;
+
+import android.util.SparseIntArray;
+import androidx.annotation.ColorInt;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import com.vk.im.engine.j.StickersAnimationLoader;
+import com.vk.im.engine.models.ImExperimentsProvider;
+import com.vk.im.engine.models.Member;
+import com.vk.im.engine.models.ProfilesSimpleInfo;
+import com.vk.im.engine.models.attaches.Attach;
+import com.vk.im.engine.models.messages.Msg;
+import com.vk.im.engine.models.messages.NestedMsg;
+import com.vk.im.ui.media.audio.AudioTrack;
+import com.vk.im.ui.q.h.VideoAutoPlayer;
+import com.vk.im.ui.views.span.OnSpanClickListener;
+import com.vk.im.ui.views.span.OnSpanLongPressListener;
+import com.vk.im.ui.views.sticker.StickerAnimationState;
+import java.util.List;
+
+@MainThread
+public class MsgPartHolderBindArgs {
+    public SparseIntArray A;
+    public AudioTrack B;
+    public AudioMsgInfo C;
+    public StickerAnimationState D;
+    public StickersAnimationLoader E;
+    @Nullable
+    public OnSpanClickListener F;
+    @Nullable
+    public OnSpanLongPressListener G;
+    @Nullable
+    public MsgListAdapterCallback H;
+    @Nullable
+    public VideoAutoPlayer I;
+    public Msg a;
+    public NestedMsg b;
+    public CharSequence c;
+    public Attach d;
+    public List<Attach> e;
+    public boolean f;
+    public int g;
+    public int h;
+    public int i;
+    public int j;
+    public int k;
+    @ColorInt
+    public int l;
+    public Member m;
+    public ProfilesSimpleInfo n;
+    public ImExperimentsProvider o;
+    public int p;
+    public int q;
+    public int r;
+    public boolean s;
+    public boolean t;
+    public boolean u;
+    public boolean v;
+    public boolean w;
+    public boolean x;
+    public boolean y;
+    public boolean isSelected;
+    public SparseIntArray z;
+
+    public MsgPartHolderBindArgs() {
+    }
+}

app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/VhBindArgs.java

@@ -0,0 +1,547 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.vk.im.ui.components.viewcontrollers.msg_list.adapter;
+
+import android.util.SparseIntArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.vk.core.network.TimeProvider;
+import com.vk.im.engine.j.StickersAnimationLoader;
+import com.vk.im.engine.models.ImBgSyncState;
+import com.vk.im.engine.models.ImExperimentsProvider;
+import com.vk.im.engine.models.Member;
+import com.vk.im.engine.models.ProfilesSimpleInfo;
+import com.vk.im.engine.models.attaches.AttachAudioMsg;
+import com.vk.im.engine.models.dialogs.Dialog;
+import com.vk.im.engine.models.dialogs.DialogTheme;
+import com.vk.im.engine.models.messages.Msg;
+import com.vk.im.engine.models.messages.MsgFromUser;
+import com.vk.im.engine.models.messages.MsgIdType;
+import com.vk.im.engine.models.messages.MsgSyncState;
+import com.vk.im.engine.models.messages.WithUserContent;
+import com.vk.im.engine.utils.collection.IntSet;
+import com.vk.im.ui.components.viewcontrollers.msg_list.entry.AdapterEntry;
+import com.vk.im.ui.media.audio.AudioTrack;
+import com.vk.im.ui.q.h.VideoAutoPlayer;
+import com.vk.im.ui.views.span.OnSpanClickListener;
+import com.vk.im.ui.views.span.OnSpanLongPressListener;
+import com.vk.im.ui.views.sticker.StickerAnimationState;
+
+public class VhBindArgs {
+    public MsgListAdapterCallback A;
+    @Nullable
+    public VideoAutoPlayer B = null;
+    @Nullable
+    public MsgIdType C = null;
+    public int D = -1;
+    public AdapterEntry a;
+    public AdapterEntry b;
+    public AdapterEntry c;
+    public int d;
+    @Nullable
+    public Dialog e;
+    @NonNull
+    public DialogTheme f;
+    public Member g;
+    public ProfilesSimpleInfo h;
+    public int i;
+    public boolean j;
+    public boolean k;
+    public boolean l;
+    public long m;
+    public ImExperimentsProvider n;
+    public ImBgSyncState o;
+    public int p;
+    public boolean q;
+    public IntSet r;
+    public SparseIntArray s;
+    public SparseIntArray t;
+    public AudioTrack u;
+    public AudioMsgInfo v;
+    public StickerAnimationState w;
+    public StickersAnimationLoader x;
+    @Nullable
+    public OnSpanClickListener y;
+    @Nullable
+    public OnSpanLongPressListener z;
+
+    public VhBindArgs() {
+    }
+
+    private long K() {
+        Msg var1 = this.b.c;
+        return var1 == null ? Long.MAX_VALUE : TimeProvider.f.b() - var1.getTime();
+    }
+
+    private boolean L() {
+        boolean var1;
+        if (this.K() <= this.m && !TimeProvider.f.c()) {
+            var1 = false;
+        } else {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public boolean A() {
+        AdapterEntry var1 = this.a;
+        boolean var2 = false;
+        boolean var3 = var2;
+        if (var1 != null) {
+            if (var1.d()) {
+                var3 = var2;
+            } else {
+                Msg var4 = this.a.c;
+                Msg var5 = this.b.c;
+                var3 = var2;
+                if (var4.W() == var5.W()) {
+                    var3 = var2;
+                    if (var4.e0() == var5.e0()) {
+                        var3 = true;
+                    }
+                }
+            }
+        }
+
+        return var3;
+    }
+
+    public boolean B() {
+        AdapterEntry var1 = this.a;
+        boolean var2;
+        if (var1 != null && var1.c()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean C() {
+        AdapterEntry var1 = this.a;
+        boolean var2;
+        if (var1 != null && var1.c() && this.a.c.getLocalId() == this.b.c.getLocalId()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean D() {
+        AdapterEntry var1 = this.a;
+        boolean var2;
+        if (var1 != null && var1.a == 83) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean E() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).i2()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean F() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).F0()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean G() {
+        AdapterEntry var1 = this.b;
+        boolean var2;
+        if (var1 != null && var1.a == 51) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public int H() {
+        return this.b.i;
+    }
+
+    public boolean I() {
+        long var1 = this.K();
+        long var3 = this.m;
+        boolean var5;
+        if (var1 > var3 && var1 < var3 * 2L) {
+            var5 = true;
+        } else {
+            var5 = false;
+        }
+
+        return var5;
+    }
+
+    public boolean J() {
+        Msg var1 = this.b.c;
+        boolean var2 = false;
+        if (var1 == null) {
+            return false;
+        } else if (!(var1 instanceof MsgFromUser)) {
+            return false;
+        } else {
+            MsgFromUser var7 = (MsgFromUser)var1;
+            Msg var3 = this.a.c;
+            boolean var4;
+            if (var3 != null && var3.d() == MsgSyncState.DONE) {
+                var4 = true;
+            } else {
+                var4 = false;
+            }
+
+            boolean var5;
+            if (this.o == ImBgSyncState.CONNECTED) {
+                var5 = true;
+            } else {
+                var5 = false;
+            }
+
+            boolean var6 = var2;
+            if (!var7.H0()) {
+                var6 = var2;
+                if (var5) {
+                    var6 = var2;
+                    if (!this.L()) {
+                        var6 = var2;
+                        if (var4) {
+                            var6 = true;
+                        }
+                    }
+                }
+            }
+
+            return var6;
+        }
+    }
+
+    public int a() {
+        boolean var1 = this.h();
+        byte var2 = 0;
+        int var3 = var2;
+        if (var1) {
+            AttachAudioMsg var4 = (AttachAudioMsg)((MsgFromUser)this.b.c).c(AttachAudioMsg.class, false);
+            var3 = var2;
+            if (var4 != null) {
+                var3 = var4.f();
+            }
+        }
+
+        return var3;
+    }
+
+    public int b() {
+        Msg var1 = this.b.c;
+        int var2;
+        if (var1 != null) {
+            var2 = var1.B1();
+        } else {
+            var2 = 0;
+        }
+
+        return var2;
+    }
+
+    public boolean c() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).I0()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean d() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof WithUserContent && ((WithUserContent)var1).D0() != null) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean e() {
+        boolean var1;
+        if (this.b.i > 0) {
+            var1 = true;
+        } else {
+            var1 = false;
+        }
+
+        return var1;
+    }
+
+    public boolean f() {
+        AdapterEntry var1 = this.b;
+        boolean var2;
+        if (var1 != null) {
+            Msg var3 = var1.c;
+            if (var3 != null && var3.P1()) {
+                var2 = true;
+                return var2;
+            }
+        }
+
+        var2 = false;
+        return var2;
+    }
+
+    public boolean g() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).G0()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean h() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).Z1()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean i() {
+        boolean var1;
+        if (this.j && !this.u() && !this.l()) {
+            var1 = true;
+        } else {
+            var1 = false;
+        }
+
+        return var1;
+    }
+
+    public boolean j() {
+        boolean var1;
+        if (!this.j || this.u() || this.B() && this.A() && !this.a.c.H1()) {
+            var1 = false;
+        } else {
+            var1 = true;
+        }
+
+        return var1;
+    }
+
+    public boolean k() {
+        Dialog var1 = this.e;
+        boolean var2;
+        if (var1 != null && var1.U1()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean l() {
+        Dialog var1 = this.e;
+        boolean var2;
+        if (var1 != null && var1.V1()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean m() {
+        Dialog var1 = this.e;
+        boolean var2;
+        if (var1 != null && var1.W1()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean n() {
+        int var1 = this.b.a;
+        return var1 == 52 || var1 == 53 || var1 == 56 || var1 == 57 || var1 == 70 || var1 == 77 || var1 == 85 || var1 == 94 || var1 == 95;
+    }
+
+    public boolean o() {
+        AdapterEntry var1 = this.b;
+        boolean var2;
+        if (var1 != null && var1.a == 101) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean p() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 != null && var1.G1()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean q() {
+        AdapterEntry var1 = this.b;
+        boolean var3;
+        if (var1 != null) {
+            int var2 = var1.a;
+            if (var2 == 59 || var2 == 58 || var2 == 61 || var2 == 60) {
+                var3 = true;
+                return var3;
+            }
+        }
+
+        var3 = false;
+        return var3;
+    }
+
+    public boolean r() {
+        Msg var1 = this.b.c;
+        boolean var2;
+        if (var1 instanceof MsgFromUser && ((MsgFromUser)var1).e2()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean s() {
+        if(this.C != null)
+            return switch (this.C) {
+                case LOCAL_ID -> this.D == this.b.c.getLocalId();
+                case VK_ID -> this.D == this.b.c.C1();
+            };
+        return false;
+    }
+
+    public boolean t() {
+        AdapterEntry var1 = this.b;
+        boolean var2;
+        if (var1 != null) {
+            Msg var3 = var1.c;
+            if (var3 != null && !var3.b(this.g)) {
+                var2 = true;
+                return var2;
+            }
+        }
+
+        var2 = false;
+        return var2;
+    }
+
+    public boolean u() {
+        Msg var1 = this.b.c;
+        if (var1 != null) {
+            return var1.b(this.g);
+        } else {
+            throw new RuntimeException();
+        }
+    }
+
+    public boolean v() {
+        IntSet var1 = this.r;
+        boolean var2;
+        if (var1 != null && var1.a(this.b.c.getLocalId())) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean w() {
+        return this.z() ^ true;
+    }
+
+    public boolean x() {
+        AdapterEntry var1 = this.c;
+        boolean var2;
+        if (var1 != null && var1.a == 100) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean y() {
+        AdapterEntry var1 = this.c;
+        boolean var2;
+        if (var1 != null && var1.a == 96) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean z() {
+        AdapterEntry var1 = this.c;
+        boolean var2;
+        if (var1 != null && var1.c() && this.c.c.getLocalId() == this.b.c.getLocalId()) {
+            var2 = true;
+        } else {
+            var2 = false;
+        }
+
+        return var2;
+    }
+
+    public boolean isSelected() {
+        return this.b != null && this.b.c != null && this.r.a(this.b.c.getLocalId());
+    }
+}

app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartCallHolder.java

@@ -0,0 +1,176 @@
+package com.vk.im.ui.components.viewcontrollers.msg_list.adapter.msgparts;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.vk.core.util.DurationFormatter;
+import com.vk.im.engine.models.CallState;
+import com.vk.im.engine.models.Member;
+import com.vk.im.engine.models.attaches.Attach;
+import com.vk.im.engine.models.attaches.AttachCall;
+import com.vk.im.engine.models.dialogs.BubbleColors;
+import com.vk.im.engine.models.messages.Msg;
+import com.vk.im.ui.components.viewcontrollers.msg_list.adapter.MsgPartHolderBase;
+import com.vk.im.ui.components.viewcontrollers.msg_list.adapter.MsgPartHolderBindArgs;
+import com.vk.im.ui.components.viewcontrollers.msg_list.adapter.utils.MsgTimeFormatter;
+import com.vk.im.ui.j;
+import com.vk.im.ui.m;
+import com.vk.im.ui.n;
+import com.vk.im.ui.views.msg.MsgPartIconTwoRowView;
+import com.vtosters.lite.R;
+import kotlin.TypeCastException;
+import kotlin.jvm.internal.Intrinsics;
+import ru.vtosters.lite.hooks.CallsHook;
+
+public final class MsgPartCallHolder extends MsgPartHolderBase<AttachCall> {
+    public static final a I = new a();
+    private final Context C;
+    private final DurationFormatter D;
+    private final StringBuilder E;
+    private final MsgTimeFormatter F;
+    private final StringBuilder G;
+    private final MsgPartIconTwoRowView H;
+
+    private boolean incoming;
+
+
+    public MsgPartCallHolder(MsgPartIconTwoRowView var1) {
+        this.H = var1;
+        this.C = this.H.getContext();
+        Context var2 = this.H.getContext();
+        Intrinsics.a(var2, "view.context");
+        this.D = new DurationFormatter(var2);
+        this.E = new StringBuilder();
+        this.F = MsgTimeFormatter.f;
+        this.G = new StringBuilder();
+    }
+
+    private final void a(Msg var1) {
+        this.G.setLength(0);
+        MsgTimeFormatter var2 = this.F;
+        Context var3 = this.C;
+        Intrinsics.a(var3, "context");
+        var2.a(var1, var3, this.G);
+        this.H.setTimeText(this.G);
+    }
+
+    private final void a(boolean var1) {
+        MsgPartIconTwoRowView var2 = this.H;
+        int var3;
+        if (var1) {
+            var3 = R.drawable.vkim_ic_attach_video_call;
+        } else {
+            var3 = R.drawable.vkim_ic_attach_call;
+        }
+
+        var2.setIcon(var3);
+    }
+
+    private final void a(boolean var1, AttachCall var2) {
+        boolean var3 = !var1;
+        if (var2.h() == CallState.ERROR) {
+            this.H.setSubtitleText(m.vkim_msg_list_call_error);
+            this.H.setSubtitleTextAppearance(n.VkIm_MsgPart_Call_Failure);
+        } else if (var2.h() == CallState.DONE) {
+            this.E.setLength(0);
+            this.D.a(var2.a(), this.E);
+            this.H.setSubtitleText(this.E);
+            this.H.setSubtitleTextAppearance(n.VkIm_MsgPart_Call_Duration);
+        } else if (var1) {
+            this.H.setSubtitleText(m.vkim_msg_list_call_missed);
+            this.H.setSubtitleTextAppearance(n.VkIm_MsgPart_Call_Failure);
+        } else if (var2.h() == CallState.CANCELLED) {
+            this.H.setSubtitleText(m.vkim_msg_list_call_cancelled);
+            this.H.setSubtitleTextAppearance(n.VkIm_MsgPart_Call_Failure);
+        } else if (var2.h() == CallState.DECLINED) {
+            this.H.setSubtitleText(m.vkim_msg_list_call_declined);
+            this.H.setSubtitleTextAppearance(n.VkIm_MsgPart_Call_Failure);
+        }
+
+    }
+
+    private void b(boolean var1) {
+        incoming = var1;
+        if (incoming) {
+            this.H.setTitleText(m.vkim_msg_list_call_incoming);
+        } else {
+            this.H.setTitleText(m.vkim_msg_list_call_outgoing);
+        }
+    }
+
+    private void c() {
+        this.H.setTimeText(null);
+    }
+
+    private void c(MsgPartHolderBindArgs var1) {
+        super.f = var1.H;
+        super.g = var1.a;
+        super.h = var1.b;
+        Attach var2 = var1.d;
+        if (var2 != null) {
+            super.B = (AttachCall) var2;
+        } else {
+            throw new TypeCastException("null cannot be cast to non-null type com.vk.im.engine.models.attaches.AttachCall");
+        }
+    }
+
+    protected View b(LayoutInflater var1, ViewGroup var2) {
+        this.H.setOnClickListener(var11 -> {
+            if (incoming) {
+                CallsHook.forwardToVkOffApps(C, super.B.f().getId());
+            } else {
+                CallsHook.forwardToVkOffApps(C, super.B.g().getId());
+            }
+        });
+        return this.H;
+    }
+
+    protected void b(BubbleColors var1) {
+        this.a(this.H, var1);
+    }
+
+    protected void b(MsgPartHolderBindArgs var1) {
+        Msg var2 = var1.a;
+        if (var2 != null) {
+            Attach var3 = var1.d;
+            if (var3 != null) {
+                AttachCall var4 = (AttachCall) var3;
+                Member var5 = var4.f();
+                Member var8 = var1.m;
+                Intrinsics.a(var8, "bindArgs.currentMember");
+                boolean var6 = var5.e(var8);
+                boolean var7 = var4.i();
+                this.c(var1);
+                this.b(var6);
+                this.a(var6, var4);
+                this.a(var7);
+                if (var1.f) {
+                    this.a(var2);
+                } else {
+                    this.c();
+                }
+
+            } else {
+                throw new TypeCastException("null cannot be cast to non-null type com.vk.im.engine.models.attaches.AttachCall");
+            }
+        } else {
+            Intrinsics.a();
+            throw null;
+        }
+    }
+
+    public static final class a {
+        private a() {
+        }
+
+        public MsgPartCallHolder a(LayoutInflater var1, ViewGroup var2) {
+            View var3 = var1.inflate(j.vkim_msg_part_call, var2, false);
+            if (var3 != null) {
+                return new MsgPartCallHolder((MsgPartIconTwoRowView) var3);
+            } else {
+                throw new TypeCastException("null cannot be cast to non-null type com.vk.im.ui.views.msg.MsgPartIconTwoRowView");
+            }
+        }
+    }
+}

app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartTextHolder.java

@@ -0,0 +1,48 @@
+package com.vk.im.ui.components.viewcontrollers.msg_list.adapter.msgparts;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import com.vk.im.engine.models.attaches.Attach;
+import com.vk.im.engine.models.dialogs.BubbleColors;
+import com.vk.im.ui.components.viewcontrollers.msg_list.adapter.MsgPartHolderBase;
+import com.vk.im.ui.components.viewcontrollers.msg_list.adapter.MsgPartHolderBindArgs;
+import com.vk.im.ui.views.msg.MsgPartTextView;
+import com.vk.im.ui.views.msg.WithTime;
+import com.vtosters.lite.R;
+
+public class MsgPartTextHolder extends MsgPartHolderBase<Attach> {
+    private FrameLayout mContainer;
+    private MsgPartTextView mTextPart;
+
+    @Override
+    protected View b(LayoutInflater inflater, ViewGroup parent) {
+        mTextPart = (MsgPartTextView) inflater.inflate(R.layout.vkim_msg_part_text, parent, false);
+        mTextPart.setOnClickListener(view -> {
+            MsgPartTextHolder.this.f.a(MsgPartTextHolder.this.g.getLocalId());
+        });
+        mTextPart.setOnLongClickListener(view -> {
+            if(!mTextPart.isTextSelectable()) MsgPartTextHolder.this.f.b(MsgPartTextHolder.this.g.getLocalId());
+            return false;
+        });
+
+        return mTextPart;
+    }
+
+    @Override
+    protected void b(BubbleColors colors) {
+        mTextPart.setTimeTextColor(colors.h);
+        mTextPart.setLinkTextColor(colors.d);
+        mTextPart.setTextColor(colors.f);
+    }
+
+    @Override
+    protected void b(MsgPartHolderBindArgs bindArgs) {
+        mTextPart.setOnSpanClickListener(bindArgs.F);
+        mTextPart.setOnSpanLongPressListener(bindArgs.G);
+        mTextPart.setText(bindArgs.c);
+        mTextPart.setTextIsSelectable(bindArgs.isSelected);
+        a(bindArgs, (WithTime) mTextPart);
+    }
+}

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

@@ -0,0 +1,171 @@
+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) {
+        return switch (i) {
+            case 0 -> new c(viewGroup);
+            case 1 -> new d(viewGroup);
+            case 2 -> 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);
+            case 1 -> ((d) viewHolder).a(this.mItems.get(H(i)));
+        }
+    }
+
+    @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 {
@@ -2155,6 +2157,7 @@ public final class R {
         public static final int spb_default_progressiveStart_activated = 0x7f05000d; // 2131034125
         public static final int spb_default_reversed = 0x7f05000e; // 2131034126
         public static final int vk_is_tablet = 0x7f05000f; // 2131034127
+        public static final int com_samsung_android_icon_container_has_icon_container = 0x7f050010; // 2131034128
     }
 
     public static final class color {
@@ -2964,6 +2967,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 +4978,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 +11033,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 +12857,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 +19527,50 @@ 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 app_open_by_default_settings = 0x7f121840; // 2131892288
+        public static final int audio_deleted_from_cache = 0x7f121841; // 2131892289
+        public static final int blockminiapps_summ = 0x7f121842; // 2131892290
+        public static final int blockminiapps_title = 0x7f121843; // 2131892291
+        public static final int businessDisabler_title = 0x7f121844; // 2131892292
+        public static final int by_choice = 0x7f121845; // 2131892293
+        public static final int calls_not_available = 0x7f121846; // 2131892294
+        public static final int cannot_write = 0x7f121847; // 2131892295
+        public static final int change_accent_color = 0x7f121848; // 2131892296
+        public static final int copydebuginfo_summ = 0x7f121849; // 2131892297
+        public static final int copydebuginfo_title = 0x7f12184a; // 2131892298
+        public static final int copyownlink_summ = 0x7f12184b; // 2131892299
+        public static final int copyownlink_title = 0x7f12184c; // 2131892300
+        public static final int crash_service_name = 0x7f12184d; // 2131892301
+        public static final int current_theme = 0x7f12184e; // 2131892302
+        public static final int custom_links_warning = 0x7f12184f; // 2131892303
+        public static final int data_updated = 0x7f121850; // 2131892304
+        public static final int device_info = 0x7f121851; // 2131892305
+        public static final int device_info_copied = 0x7f121852; // 2131892306
+        public static final int dialogstats = 0x7f121853; // 2131892307
+        public static final int downloading_update = 0x7f121854; // 2131892308
+        public static final int invalid_pack_link = 0x7f121855; // 2131892309
+        public static final int maxquality_summ = 0x7f121856; // 2131892310
+        public static final int maxquality_title = 0x7f121857; // 2131892311
+        public static final int monettheme_summ = 0x7f121858; // 2131892312
+        public static final int monettheme_title = 0x7f121859; // 2131892313
+        public static final int newsfeed_notif_summ = 0x7f12185a; // 2131892314
+        public static final int newsfeed_notif_title = 0x7f12185b; // 2131892315
+        public static final int open_bot = 0x7f12185c; // 2131892316
+        public static final int promotedstickers_title = 0x7f12185d; // 2131892317
+        public static final int select_color = 0x7f12185e; // 2131892318
+        public static final int select_palette = 0x7f12185f; // 2131892319
+        public static final int sources = 0x7f121860; // 2131892320
+        public static final int updateverifdata_summ = 0x7f121861; // 2131892321
+        public static final int updateverifdata_title = 0x7f121862; // 2131892322
+        public static final int useOldAppVer_summ = 0x7f121863; // 2131892323
+        public static final int useOldAppVer_title = 0x7f121864; // 2131892324
+        public static final int vkx_integration_enabled_info = 0x7f121865; // 2131892325
+        public static final int writebar_ios_title = 0x7f121866; // 2131892326
     }
 
     public static final class style {
@@ -20672,6 +20715,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/deviceinfo/Device.java

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.deviceinfo;
 
+import ru.vtosters.lite.utils.AndroidUtils;
+
 import static ru.vtosters.lite.deviceinfo.OEMDetector.hasMiuiIncrCode;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isEMUI;
 import static ru.vtosters.lite.deviceinfo.OEMDetector.isMIUI;
@@ -101,4 +103,20 @@ public class Device {
                 + (isEMUI() ? "', EmuiVersion='" + this.EmuiVersion : "")
                 + "', modelName='" + this.modelName + "'";
     }
+
+    public String forLogging() {
+        return "**" + AndroidUtils.getString("device_info") + ":** " + "\n\n"
+                + "- Commit: " + getBuildNumber() + "\n"
+                + "- Android SDK: " + this.sdkVersion + "\n"
+                + "- Product: " + this.productName + "\n"
+                + "- Device: " + this.deviceName + "\n"
+                + "- Board: " + this.boardName + "\n"
+                + "- Manufacturer: " + this.manufacturerName + "\n"
+                + "- Brand: " + this.brandName + "\n"
+                + "- Model: " + this.modelName
+                + (isMIUI() ? "- Miui Version Code: " + this.MiuiUiVersionCode + "\n" + "- Miui Version Name: " + this.MiuiUiVersionName + "\n" : "")
+                + (isSamsung() ? "- OneUi Major Version: " + this.OneUiMajorVersion + "\n" + "- OneUi Minor Version: " + this.OneUiMinorVersion + "\n" : "")
+                + (hasMiuiIncrCode() ? "- Miui Version Incremental Code: " + this.MiuiIncrementalCode + "\n" : "")
+                + (isEMUI() ? "- Emui Version: " + this.EmuiVersion : "");
+    }
 }

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 {
@@ -309,27 +318,14 @@ public class DNRInjector {
 
         if (msg instanceof MsgFromUser) {
             var text = ((MsgFromUser) msg).f();
-            var fullMsg = ((MsgFromUser) msg).j2(); // text + reply
-            var reply = fullMsg.substring(text.length() + 1);
-
             var isTextExist = !text.isEmpty() && !text.equals(" ");
-            var isReplyExist = !reply.isEmpty() && !reply.equals(" ");
-
-
-            if (isReplyExist) {
-                reply = decryptMessage(reply, peerId);
-            }
 
             if (isTextExist) {
                 text = decryptMessage(text, peerId);
             }
 
             if (action == MsgAction.valueOf("TRANSLATE")) {
-                if (isTextExist && isReplyExist) {
-                    Translate.showTranslatedText(context, text + "\n\n" + context.getString(R.string.translator_reply) + "\n" + reply);
-                } else if (isReplyExist) {
-                    Translate.showTranslatedText(context, context.getString(R.string.translator_reply) + "\n" + reply);
-                } else if (isTextExist) {
+                if (isTextExist) {
                     Translate.showTranslatedText(context, text);
                 } else {
                     sendToast(context.getString(R.string.translator_no_text));

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/downloaders/messages/HtmlDialogDownloaderFormatProvider.java

@@ -180,32 +180,28 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
         StringBuilder htmlAction = new StringBuilder("<p class=\"chat-action\">");
 
         switch (type) {
-            case "chat_photo_update":
-                htmlAction.append(AndroidUtils.getString(R.string.chat_export_avatar_update));
-                break;
-            case "chat_photo_remove":
-                htmlAction.append(AndroidUtils.getString(R.string.chat_export_avatar_remove));
-                break;
-            case "chat_create":
+            case "chat_photo_update" -> htmlAction.append(AndroidUtils.getString(R.string.chat_export_avatar_update));
+            case "chat_photo_remove" -> htmlAction.append(AndroidUtils.getString(R.string.chat_export_avatar_remove));
+            case "chat_create" -> {
                 htmlAction.append(AndroidUtils.getString(R.string.chat_export_chat_created));
                 var name = action.optString("text");
                 if (!name.isEmpty())
                     htmlAction.append(" \"").append(name).append("\"");
-                break;
-            case "chat_title_update":
+            }
+            case "chat_title_update" -> {
                 var newName = action.optString("text");
                 htmlAction.append(AndroidUtils.getString(R.string.chat_export_name_changed));
                 if (!newName.isEmpty())
                     htmlAction.append(" ")
-                              .append(AndroidUtils.getString(R.string.chat_export_to))
-                              .append(" \"")
-                              .append(newName)
-                              .append("\"");
-                break;
-            case "chat_invite_user":
+                            .append(AndroidUtils.getString(R.string.chat_export_to))
+                            .append(" \"")
+                            .append(newName)
+                            .append("\"");
+            }
+            case "chat_invite_user" -> {
                 var newMemberId = action.optInt("member_id");
                 htmlAction.append(AndroidUtils.getString(R.string.chat_export_user_added))
-                          .append(" ");
+                        .append(" ");
                 if (newMemberId != 0) {
                     int id;
                     String endpoint;
@@ -217,14 +213,14 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
                         endpoint = "club" + -newMemberId;
                     }
                     htmlAction.append(AndroidUtils.getString(id))
-                              .append(" <a href=\"https://" + Constants.VK_DOMAIN + "/")
-                              .append(endpoint)
-                              .append("\" class=\"msg-attach-link\">@")
-                              .append(endpoint)
-                              .append("</a>");
+                            .append(" <a href=\"https://" + Constants.VK_DOMAIN + "/")
+                            .append(endpoint)
+                            .append("\" class=\"msg-attach-link\">@")
+                            .append(endpoint)
+                            .append("</a>");
                 }
-                break;
-            case "chat_kick_user":
+            }
+            case "chat_kick_user" -> {
                 var removedMemberId = action.optInt("member_id");
                 htmlAction.append(AndroidUtils.getString(R.string.chat_export_user_kicked))
                         .append(" ");
@@ -245,27 +241,19 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
                             .append(endpoint)
                             .append("</a>");
                 }
-                break;
-            case "chat_pin_message":
+            }
+            case "chat_pin_message" -> {
                 var message = action.optString("message");
                 htmlAction.append(AndroidUtils.getString(R.string.chat_export_msg_pinned));
                 if (!message.isEmpty()) htmlAction.append(" \"").append(message).append("\"");
-                break;
-            case "chat_unpin_message":
-                htmlAction.append(AndroidUtils.getString(R.string.chat_export_msg_unpinned));
-                break;
-            case "chat_invite_user_by_link":
-                htmlAction.append(AndroidUtils.getString(R.string.chat_export_join_by_link));
-                break;
-            case "chat_screenshot":
-                htmlAction.append(AndroidUtils.getString(R.string.chat_export_chat_screenshot));
-                break;
-            case "custom":
-                htmlAction.append(action.optString("message"));
-                break;
-            default:
-                htmlAction.append(AndroidUtils.getString(R.string.vkim_msg_unsupported)).append(" (").append(type).append(")");
-                break;
+            }
+            case "chat_unpin_message" -> htmlAction.append(AndroidUtils.getString(R.string.chat_export_msg_unpinned));
+            case "chat_invite_user_by_link" ->
+                    htmlAction.append(AndroidUtils.getString(R.string.chat_export_join_by_link));
+            case "chat_screenshot" -> htmlAction.append(AndroidUtils.getString(R.string.chat_export_chat_screenshot));
+            case "custom" -> htmlAction.append(action.optString("message"));
+            default ->
+                    htmlAction.append(AndroidUtils.getString(R.string.vkim_msg_unsupported)).append(" (").append(type).append(")");
         }
 
         return htmlAction.append("</p>").toString();
@@ -281,150 +269,129 @@ public class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatPr
             if (item == null) continue;
 
             switch (type) { // market_album is not supported
-                case "photo":
+                case "photo" -> {
                     var sizes = item.getJSONArray("sizes");
                     rs.append("<a href=\"")
-                      .append(sizes.getJSONObject(sizes.length() - 1).getString("url"))
-                      .append("\" class=\"msg-attach-link\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_photo))
-                      .append("</a>");
-                    break;
-                case "doc":
-                    rs.append("<a href=\"")
-                      .append(item.getString("url"))
-                      .append("\" class=\"msg-attach-link\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_doc))
-                      .append("</a>");
-                    break;
-                case "link":
-                    rs.append("<a href=\"")
-                      .append(item.getString("url"))
-                      .append("\" class=\"msg-attach-link\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_link))
-                      .append("</a>");
-                    break;
-                case "wall":
-                    rs.append("<a href=\"https://" + Constants.VK_DOMAIN + "/wall")
-                      .append(item.optString("to_id", item.optString("owner_id")))
-                      .append("_").append(item.getString("id"))
-                      .append("\" class=\"msg-attach-link\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_wallpost))
-                      .append("</a>");
-                    break;
-                case "sticker":
-                    rs.append("<img style=\"width:128px;height:128px;\" src=\"")
-                      .append(item.getJSONArray("images")
-                                  .getJSONObject(1)
-                                  .getString("url"))
-                      .append("\"/>");
-                    break;
-                case "audio_message":
-                    rs.append("<a href=\"")
-                      .append(item.optString("link_mp3"))
-                      .append("\" class=\"msg-attach-link\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_audiomsg))
-                      .append("</a>");
-                    break;
-                case "audio":
-                    rs.append(AndroidUtils.getString(R.string.chat_export_type_audio))
-                      .append(" (")
-                      .append(item.optString("artist"))
-                      .append(" — ")
-                      .append(item.optString("title"))
-                      .append(")");
-                    break;
-                case "video":
-                    rs.append(AndroidUtils.getString(R.string.chat_export_type_video))
-                      .append(" (")
-                      .append(MessagesDownloader.getVideoHtml(item.optJSONObject("files")))
-                      .append(")");
-                    break;
-                case "wall_reply":
+                            .append(sizes.getJSONObject(sizes.length() - 1).getString("url"))
+                            .append("\" class=\"msg-attach-link\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_photo))
+                            .append("</a>");
+                }
+                case "doc" -> rs.append("<a href=\"")
+                        .append(item.getString("url"))
+                        .append("\" class=\"msg-attach-link\">")
+                        .append(AndroidUtils.getString(R.string.chat_export_type_doc))
+                        .append("</a>");
+                case "link" -> rs.append("<a href=\"")
+                        .append(item.getString("url"))
+                        .append("\" class=\"msg-attach-link\">")
+                        .append(AndroidUtils.getString(R.string.chat_export_type_link))
+                        .append("</a>");
+                case "wall" -> rs.append("<a href=\"https://" + Constants.VK_DOMAIN + "/wall")
+                        .append(item.optString("to_id", item.optString("owner_id")))
+                        .append("_").append(item.getString("id"))
+                        .append("\" class=\"msg-attach-link\">")
+                        .append(AndroidUtils.getString(R.string.chat_export_type_wallpost))
+                        .append("</a>");
+                case "sticker" -> rs.append("<img style=\"width:128px;height:128px;\" src=\"")
+                        .append(item.getJSONArray("images")
+                                .getJSONObject(1)
+                                .getString("url"))
+                        .append("\"/>");
+                case "audio_message" -> rs.append("<a href=\"")
+                        .append(item.optString("link_mp3"))
+                        .append("\" class=\"msg-attach-link\">")
+                        .append(AndroidUtils.getString(R.string.chat_export_type_audiomsg))
+                        .append("</a>");
+                case "audio" -> rs.append(AndroidUtils.getString(R.string.chat_export_type_audio))
+                        .append(" (")
+                        .append(item.optString("artist"))
+                        .append(" — ")
+                        .append(item.optString("title"))
+                        .append(")");
+                case "video" -> rs.append(AndroidUtils.getString(R.string.chat_export_type_video))
+                        .append(" (")
+                        .append(MessagesDownloader.getVideoHtml(item.optJSONObject("files")))
+                        .append(")");
+                case "wall_reply" -> {
                     var link = String.format("https://" + Constants.VK_DOMAIN + "/wall%s_%s?reply=%s",
-                                      item.optString("owner_id"),
-                                      item.optString("post_id"),
-                                      item.optString("id"));
+                            item.optString("owner_id"),
+                            item.optString("post_id"),
+                            item.optString("id"));
                     rs.append("<a class=\"msg-attach-link\" href=\"")
-                      .append(link).append("\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_wallreply))
-                      .append("</a>");
-                    break;
-                case "story":
+                            .append(link).append("\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_wallreply))
+                            .append("</a>");
+                }
+                case "story" -> {
                     var story_link = String.format("https://" + Constants.VK_DOMAIN + "/story%s_%s",
-                                            item.optString("owner_id"),
-                                            item.optString("id"));
+                            item.optString("owner_id"),
+                            item.optString("id"));
                     rs.append("<a class=\"msg-attach-link\" href=\"")
-                      .append(story_link)
-                      .append("\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_story))
-                      .append("</a>");
-                    break;
-                case "podcast":
+                            .append(story_link)
+                            .append("\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_story))
+                            .append("</a>");
+                }
+                case "podcast" -> {
                     var podcast_link = String.format("https://" + Constants.VK_DOMAIN + "/podcast%s_%s",
-                                              item.optString("owner_id"),
-                                              item.optString("id"));
+                            item.optString("owner_id"),
+                            item.optString("id"));
                     rs.append("<a class=\"msg-attach-link\" href=\"")
-                      .append(podcast_link)
-                      .append("\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_podcast))
-                      .append("</a>");
-                    break;
-                case "gift":
-                    rs.append("<img src=\"")
-                      .append(item.optString("thumb_96"))
-                      .append("\"/>");
-                    break;
-                case "mini_app":
+                            .append(podcast_link)
+                            .append("\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_podcast))
+                            .append("</a>");
+                }
+                case "gift" -> rs.append("<img src=\"")
+                        .append(item.optString("thumb_96"))
+                        .append("\"/>");
+                case "mini_app" -> {
                     var app = item.optJSONObject("app");
-
                     if (app != null) {
                         var miniapp_link = String.format("https://" + Constants.VK_DOMAIN + "/app%s", app.optString("id"));
                         rs.append("<a class=\"msg-attach-link\" href=\"")
-                          .append(miniapp_link)
-                          .append("\">")
-                          .append(AndroidUtils.getString(R.string.chat_export_type_miniapp))
-                          .append("</a>");
+                                .append(miniapp_link)
+                                .append("\">")
+                                .append(AndroidUtils.getString(R.string.chat_export_type_miniapp))
+                                .append("</a>");
                         break;
                     }
-
                     rs.append(AndroidUtils.getString(R.string.chat_export_error));
-                    break;
-                case "audio_playlist":
+                }
+                case "audio_playlist" -> {
                     var playlist_link = String.format("https://" + Constants.VK_DOMAIN + "/music/album/%s_%s_%s",
-                                                item.optString("owner_id"),
-                                                item.optString("id"),
-                                                item.optString("access_key"));
+                            item.optString("owner_id"),
+                            item.optString("id"),
+                            item.optString("access_key"));
                     rs.append("<a class=\"msg-attach-link\" href=\"")
-                      .append(playlist_link)
-                      .append("\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_playlist))
-                      .append(" (")
-                      .append(item.optString("title"))
-                      .append(")</a>");
-                    break;
-                case "poll":
-                    rs.append(AndroidUtils.getString(item.optBoolean("anonymous") ? R.string.chat_export_poll_anon : R.string.chat_export_poll_publ))
-                      .append(" ")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_poll))
-                      .append(" ")
-                      .append(MessagesDownloader.getPollHtml(item));
-                    break;
-                case "market":
+                            .append(playlist_link)
+                            .append("\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_playlist))
+                            .append(" (")
+                            .append(item.optString("title"))
+                            .append(")</a>");
+                }
+                case "poll" ->
+                        rs.append(AndroidUtils.getString(item.optBoolean("anonymous") ? R.string.chat_export_poll_anon : R.string.chat_export_poll_publ))
+                                .append(" ")
+                                .append(AndroidUtils.getString(R.string.chat_export_type_poll))
+                                .append(" ")
+                                .append(MessagesDownloader.getPollHtml(item));
+                case "market" -> {
                     var market_item_link = String.format("https://" + Constants.VK_DOMAIN + "/market%s_%s",
-                                                  item.optString("owner_id"),
-                                                  item.optString("id"));
+                            item.optString("owner_id"),
+                            item.optString("id"));
                     rs.append("<a class=\"msg-attach-link\" href=\"")
-                      .append(market_item_link)
-                      .append("\">")
-                      .append(AndroidUtils.getString(R.string.chat_export_type_market))
-                      .append("</a>");
-                    break;
-                default:
-                    rs.append(AndroidUtils.getString(R.string.vkim_msg_unsupported))
-                      .append(" (")
-                      .append(type)
-                      .append(")");
-                    break;
+                            .append(market_item_link)
+                            .append("\">")
+                            .append(AndroidUtils.getString(R.string.chat_export_type_market))
+                            .append("</a>");
+                }
+                default -> rs.append(AndroidUtils.getString(R.string.vkim_msg_unsupported))
+                        .append(" (")
+                        .append(type)
+                        .append(")");
             }
 
             rs.append(" ");

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -149,8 +149,8 @@ public class FoafBase {
                     .setPositiveButton(android.R.string.ok, null)
                     .show());
         } catch (Exception e) {
-            e.printStackTrace();
             LifecycleUtils.getCurrentActivity().runOnUiThread(() -> makeText(getGlobalContext(), context.getString(R.string.foaferr), LENGTH_SHORT).show());
+            e.printStackTrace();
         }
     }
 

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);
@@ -273,41 +277,9 @@ public class AdBlockHook {
             }
         }
 
-        if (!json.has("items")) return json;
-
-        var items = json.optJSONArray("items");
-        if (items != null) {
-            for (int i = 0; i < items.length(); i++) {
-                var item = items.optJSONObject(i);
-                if (item != null) {
-                    parseStoriesItem(item);
-                }
-            }
-        }
-
         return json;
     }
 
-    private static void parseStoriesItem(JSONObject item) throws JSONException {
-        var stories = item.optJSONArray("stories");
-        var newStories = new JSONArray();
-
-        if (stories == null) return;
-
-        for (int j = 0; j < stories.length(); j++) {
-            var story = stories.optJSONObject(j);
-
-            if (!story.optBoolean("is_ads") && !story.optBoolean("is_promo")) {
-                newStories.put(story);
-            } else {
-                if (dev())
-                    Log.d("StoriesAds", "Fetched ad, owner id " + story.optString("owner_id") + ", caption " + story.optString("caption"));
-            }
-        }
-
-        item.put("stories", newStories);
-    }
-
     public static Boolean isAds(JSONObject list, String type) throws JSONException {
         if (list == null || type == null || !ads()) return false;
 

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

@@ -0,0 +1,67 @@
+package ru.vtosters.lite.hooks;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.view.View;
+import android.widget.Toast;
+import com.vk.im.engine.models.dialogs.Dialog;
+import com.vtosters.lite.api.ExtendedUserProfile;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.LifecycleUtils;
+
+import static android.widget.Toast.LENGTH_SHORT;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+
+public class CallsHook {
+    public static void forwardToVkOffApps(View view, ExtendedUserProfile p) {
+        call(view.getContext(), AccountManagerUtils.getUserID(p));
+    }
+
+    public static void forwardToVkOffApps(View view, Dialog dl) {
+        call(view.getContext(), dl.getId());
+    }
+
+    public static void forwardToVkOffApps(Context ctx, int userId) {
+        call(ctx, userId);
+    }
+
+    public static void call(Context ctx, int id) {
+        // FIXME: add com.vk.calls, right now it doesn't support intent
+        var vkim = checkPackage("com.vk.im");
+        var vk = checkPackage("com.vkontakte.android");
+        var callsAvailable = vkim || vk;
+
+        if (!callsAvailable) {
+            Toast.makeText(LifecycleUtils.getCurrentActivity(), AndroidUtils.getString("calls_not_available"), LENGTH_SHORT).show();
+
+            try {
+                var action = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.vkontakte.android"));
+                action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                ctx.startActivity(action);
+            } catch (android.content.ActivityNotFoundException e) {
+                var action = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.vkontakte.android"));
+                action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                ctx.startActivity(action);
+            }
+
+            return;
+        }
+
+        var link = "https://vk.com/call?id=" + id;
+        var startCall = new Intent(Intent.ACTION_VIEW, Uri.parse(link)).setPackage(vk ? "com.vkontakte.android" : "com.vk.im");
+        startCall.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        ctx.startActivity(startCall);
+    }
+
+    private static Boolean checkPackage(String packageName) {
+        try {
+            var pm = getGlobalContext().getPackageManager();
+            return pm.getApplicationInfo(packageName, 0).enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+}

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

@@ -59,11 +59,6 @@ public class CryptImHook {
         IMProcessor finalEnabled = enabled;
         Activity ctx = getCurrentActivity();
 
-        if (ctx == null) {
-            sendToast(AndroidUtils.getString(R.string.app_activities_error));
-            return;
-        }
-
         new VkAlertDialog.Builder(ctx)
                 .setTitle(AndroidUtils.getString(R.string.encryption_sett))
                 .setSingleChoiceItems(titles, enabledPosition, (dialog, which) -> {
@@ -111,11 +106,6 @@ public class CryptImHook {
 
         Context ctx = getCurrentActivity();
 
-        if (ctx == null) {
-            sendToast(ctx.getString(R.string.app_activities_error));
-            return;
-        }
-
         LinearLayout linearLayout = new LinearLayout(ctx);
 
         final EditText editText = new EditText(ctx);

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

@@ -19,14 +19,11 @@ public class DateHook {
     }
 
     public static String getDateFormat() {
-        switch (getPrefsValue("dateformat")) {
-            case "noyear":
-                return AndroidUtils.getString(R.string.fulltime2);
-            case "full":
-                return AndroidUtils.getString(R.string.fulltime);
-            default:
-                return AndroidUtils.getString(R.string.fulltime3);
-        }
+        return switch (getPrefsValue("dateformat")) {
+            case "noyear" -> AndroidUtils.getString(R.string.fulltime2);
+            case "full" -> AndroidUtils.getString(R.string.fulltime);
+            default -> AndroidUtils.getString(R.string.fulltime3);
+        };
     }
 
     @SuppressLint("SimpleDateFormat")

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

@@ -191,36 +191,24 @@ public class DockBarInjector {
 
         int val = 0;
         switch (tabId) {
-            case tab_messages:
-                val = MenuCountersState.j();
-                break;
-            case menu_groups:
-                val = MenuCountersState.h();
-                break;
-            case menu_fave:
-                val = MenuCountersState.c();
-                break;
-            case menu_games:
-                val = MenuCountersState.a();
-                break;
-            case menu_photos:
-                val = MenuCountersState.l();
-                break;
-            case menu_videos:
-                val = MenuCountersState.n();
-                break;
-            case tab_feedback:
+            case tab_messages -> val = MenuCountersState.j();
+            case menu_groups -> val = MenuCountersState.h();
+            case menu_fave -> val = MenuCountersState.c();
+            case menu_games -> val = MenuCountersState.a();
+            case menu_photos -> val = MenuCountersState.l();
+            case menu_videos -> val = MenuCountersState.n();
+            case tab_feedback -> {
                 if (milkshake())
                     val = MenuCountersState.k();
-                break;
-            case tab_news:
+            }
+            case tab_news -> {
                 if (milkshake() && getBoolValue("newsfeed_notif", true))
                     val = MenuCountersState.k();
-                break;
-            case menu_friends:
+            }
+            case menu_friends -> {
                 if (!milkshake())
                     val = MenuCountersState.k();
-                break;
+            }
         }
 //
 //        val = MenuCountersState.g(); // friends ?????? menu_friends

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/MessagesHook.java

@@ -99,19 +99,13 @@ public class MessagesHook {
     }
 
     private static int expireTime() {
-        switch (bombCount) {
-            case "15s":
-                return 15;
-            case "1m":
-                return 60;
-            case "5m":
-                return 300;
-            case "1h":
-                return 3600;
-            case "24h":
-                return 86400;
-            default:
-                return 0;
-        }
+        return switch (bombCount) {
+            case "15s" -> 15;
+            case "1m" -> 60;
+            case "5m" -> 300;
+            case "1h" -> 3600;
+            case "24h" -> 86400;
+            default -> 0;
+        };
     }
 }

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

@@ -29,14 +29,12 @@ public class NewsfeedHook {
         if (vkme()) {
             return MAX_VALUE;
         }
-        switch (getPrefsValue("newsupdate")) {
-            case "no_update":
-                return MAX_VALUE;
-            case "imd_update":
-                return 10000L;
-            default:
-                return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L);
-        }
+        return switch (getPrefsValue("newsupdate")) {
+            case "no_update" -> MAX_VALUE;
+            case "imd_update" -> 10000L;
+            default ->
+                    Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L);
+        };
     }
 
     public static List hideElement(ArrayList list) {

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

@@ -29,117 +29,61 @@ public class OnlineFormatterHook {
     public static String getAppName(int appid) {  // thanks to egormetlitsky (vk mp3 mod) for helping with online ids
         if (appid <= 3 || !getBoolValue("onlineformatter", true)) return null;
 
-        switch (appid) {
-            case 2274003:
-                return "Android";
-            case 6328039:
-            case 6328868:
-            case 6820516:
-                return "VK mp3 mod";
-            case 5910839:
-                return "DarkVK";
-            case 3140623:
-                return "iPhone";
-            case 3087106:
-                return "iPhone (Dev)";
-            case 3682744:
-                return "iPad";
-            case 4083558:
-            case 5316500:
-                return "VFeed (iPhone)";
-            case 4385266:
-                return "VFeed Pro (iPhone)";
-            case 3502557:
-            case 3502561:
-                return "Windows Phone";
-            case 3697615:
-                return "Windows";
-            case 2685278:
-                return "Kate Mobile";
-            case 3469984:
-                return "Lynt";
-            case 6121396:
-                return "VK Admin (Android)";
-            case 5776857:
-                return "VK Admin (iPhone)";
-            case 5027722:
-                return "VK Messenger (Desktop)";
-            case 6146827:
-                return AndroidUtils.getString(R.string.vk_messenger) + " (Android)"; // VK Мессенджер (Android)
-            case 6482950:
-                return AndroidUtils.getString(R.string.vk_messenger) + " (iPhone)"; // VK Мессенджер (iPhone)
-            case 6481715:
-                return AndroidUtils.getString(R.string.vk_messenger) + " Dev (iPhone)"; // VK Мессенджер Dev (iPhone)
-            case 7799655:
-                return AndroidUtils.getString(R.string.vk_mail_online); // VK Почта
-            case 7598572:
-                return AndroidUtils.getString(R.string.sferum_online) + " (Android)"; // Сферум (Android)
-            case 7571751:
-                return AndroidUtils.getString(R.string.sferum_online) + " (iPhone)"; // Сферум (iPhone)
-            case 7556576:
-                return AndroidUtils.getString(R.string.sferum_online); // Сферум
-            case 7497650:
-                return "VK ID";
-            case 8094476:
-                return AndroidUtils.getString(R.string.vk_calls_online) + " (Android)"; // VK Звонки (Android)
-            case 8093730:
-                return AndroidUtils.getString(R.string.vk_calls_online) + " (iPhone)"; // VK Звонки (iPhone)
-            case 7793118:
-                return AndroidUtils.getString(R.string.vk_calls_online) + " (Desktop)"; // VK Звонки (Desktop)
-            case 6767438:
-                return AndroidUtils.getString(R.string.vk_music_online) + " (Android)"; // VK Музыка (Android)
-            case 8113297:
-                return AndroidUtils.getString(R.string.vk_clips_online) + " (Android)"; // VK Клипы (Android)
-            case 8106428:
-                return AndroidUtils.getString(R.string.vk_clips_online) + " (iPhone)"; // VK Клипы (iPhone)
-            case 5044491:
-                return "Candy";
-            case 8114066:
-                return AndroidUtils.getString(R.string.vk_video_online); // VK Видео
-            case 4894723:
-                return "Phoenix Lite";
-            case 4994316:
-                return "Phoenix for VK";
-            case 3032107:
-                return "Vika";
-            case 3698024:
-                return "Instagram";
-            case 4580399:
-                return "Snapster (Android)";
-            case 4986954:
-                return "Snapster (iPhone)";
-            case 3900098:
-            case 5353544:
-                return "Домофон";
-            case 5462895:
-                return "Fast Messenger";
-            case 6964679:
-                return "Fast";
-            case 6030003:
-                return "Juno Messenger";
-            case 5955265:
-                return "VK Mobile";
-            case 6614620:
-                return "Laney";
-            case 5632485:
-                return "SpaceVK";
-            case 6287487:
-                return "vk.com";
-            case 4542624:
-                return "Black VK";
-            case 3917910:
-                return "Miranda NG (bridge)";
-            case 8043814:
-                return "Quise";
-            case 7221936:
-                return "Вечный Online";
-            case 6892935:
-                return "VK Helper";
-            case 6248661:
-                return "MemeVoices for VK";
-            default:
-                return getAppNameFromOnline(appid);
-        }
+        return switch (appid) {
+            case 2274003 -> "Android";
+            case 6328039, 6328868, 6820516 -> "VK mp3 mod";
+            case 5910839 -> "DarkVK";
+            case 3140623 -> "iPhone";
+            case 3087106 -> "iPhone (Dev)";
+            case 3682744 -> "iPad";
+            case 4083558, 5316500 -> "VFeed (iPhone)";
+            case 4385266 -> "VFeed Pro (iPhone)";
+            case 3502557, 3502561 -> "Windows Phone";
+            case 3697615 -> "Windows";
+            case 2685278 -> "Kate Mobile";
+            case 3469984 -> "Lynt";
+            case 6121396 -> "VK Admin (Android)";
+            case 5776857 -> "VK Admin (iPhone)";
+            case 5027722 -> "VK Messenger (Desktop)";
+            case 6146827 -> AndroidUtils.getString(R.string.vk_messenger) + " (Android)"; // VK Мессенджер (Android)
+            case 6482950 -> AndroidUtils.getString(R.string.vk_messenger) + " (iPhone)"; // VK Мессенджер (iPhone)
+            case 6481715 ->
+                    AndroidUtils.getString(R.string.vk_messenger) + " Dev (iPhone)"; // VK Мессенджер Dev (iPhone)
+            case 7799655 -> AndroidUtils.getString(R.string.vk_mail_online); // VK Почта
+            case 7598572 -> AndroidUtils.getString(R.string.sferum_online) + " (Android)"; // Сферум (Android)
+            case 7571751 -> AndroidUtils.getString(R.string.sferum_online) + " (iPhone)"; // Сферум (iPhone)
+            case 7556576 -> AndroidUtils.getString(R.string.sferum_online); // Сферум
+            case 7497650 -> "VK ID";
+            case 8094476 -> AndroidUtils.getString(R.string.vk_calls_online) + " (Android)"; // VK Звонки (Android)
+            case 8093730 -> AndroidUtils.getString(R.string.vk_calls_online) + " (iPhone)"; // VK Звонки (iPhone)
+            case 7793118 -> AndroidUtils.getString(R.string.vk_calls_online) + " (Desktop)"; // VK Звонки (Desktop)
+            case 6767438 -> AndroidUtils.getString(R.string.vk_music_online) + " (Android)"; // VK Музыка (Android)
+            case 8113297 -> AndroidUtils.getString(R.string.vk_clips_online) + " (Android)"; // VK Клипы (Android)
+            case 8106428 -> AndroidUtils.getString(R.string.vk_clips_online) + " (iPhone)"; // VK Клипы (iPhone)
+            case 5044491 -> "Candy";
+            case 8114066 -> AndroidUtils.getString(R.string.vk_video_online); // VK Видео
+            case 4894723 -> "Phoenix Lite";
+            case 4994316 -> "Phoenix for VK";
+            case 3032107 -> "Vika";
+            case 3698024 -> "Instagram";
+            case 4580399 -> "Snapster (Android)";
+            case 4986954 -> "Snapster (iPhone)";
+            case 3900098, 5353544 -> "Домофон";
+            case 5462895 -> "Fast Messenger";
+            case 6964679 -> "Fast";
+            case 6030003 -> "Juno Messenger";
+            case 5955265 -> "VK Mobile";
+            case 6614620 -> "Laney";
+            case 5632485 -> "SpaceVK";
+            case 6287487 -> "vk.com";
+            case 4542624 -> "Black VK";
+            case 3917910 -> "Miranda NG (bridge)";
+            case 8043814 -> "Quise";
+            case 7221936 -> "Вечный Online";
+            case 6892935 -> "VK Helper";
+            case 6248661 -> "MemeVoices for VK";
+            default -> getAppNameFromOnline(appid);
+        };
 
     }
 

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,30 +207,22 @@ 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);
-                break;
-            case 2:
-                searchWithGoogle(url);
-                break;
-            case 3:
-                searchWithBing(url);
-                break;
-            case 4:
-                searchWithTraceMoe(url);
-                break;
-            case 5:
-                searchWithAscii2d(url);
-                break;
-            case 6:
-                searchWithSaucenao(url);
-                break;
+            case 1 -> searchWithYandex(url);
+            case 2 -> searchWithGoogle(url);
+            case 3 -> searchWithBing(url);
+            case 4 -> searchWithTraceMoe(url);
+            case 5 -> searchWithAscii2d(url);
+            case 6 -> searchWithSaucenao(url);
         }
     }
 
     private static void searchPhoto(String url) {
-        if (url == null || url.isEmpty()) return;
         searchPhoto(selectedEngine(), url);
     }
 

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

@@ -24,6 +24,7 @@ import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 
 import ru.vtosters.lite.ui.fragments.ProxySettingsFragment;
+import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class ProxyHook {
     public static void hookAuth(View v) {
@@ -89,12 +90,9 @@ public class ProxyHook {
                         restartApplication();
                     }
                 }))
-                .setNeutralButton(ctx.getString(R.string.proxy_settings), ((dialog, which) -> {
-                    var intent = new Navigator(ProxySettingsFragment.class)
-                            .b(ctx)
-                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    ctx.startActivity(intent);
-                }))
+                .setNeutralButton(ctx.getString(R.string.proxy_settings), (dialog, which) -> {
+                    NavigatorUtils.switchFragment(ctx, ProxySettingsFragment.class);
+                })
                 .show();
     }
 }

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

@@ -35,47 +35,28 @@ public class StartFragmentHook {
         if (vkme()) {
             return DialogsFragment.class;
         }
-        switch (getPrefsValue("start_values")) {
-            case "newsfeed":
-                return milkshake() ? HomeFragment.class : NewsfeedFragment.class;
-            case "messenger":
-                return DialogsFragment.class;
-            case "groups":
-                return milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class;
-            case "music":
-                return MusicCatalogFragment1.class;
-            case "friends":
-                return FriendsFragment.class;
-            case "photos":
-                return PhotosFragment.class;
-            case "videos":
-                return VideoCatalogFragment.class;
-            case "settings":
-                return useNewSettings();
-            case "apps":
-                return AppsFragment.class;
-            case "discover":
-                return DiscoverFragment.class;
-            case "notifications":
-                return NotificationsContainerFragment.class;
-            case "money":
-                return MoneyTransfersFragment.class;
-            case "games":
-                return GamesFragment.class;
-            case "liked":
-                return FaveTabFragment.class;
-            case "menu":
-                return milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : MenuFragment.class;
-            case "profile":
-                return ProfileFragment.class;
-            case "lives":
-                return LivesTabsFragment.class;
-            case "docs":
-                return DocumentsViewFragment.class;
-            case "brtd":
-                return BirthdaysFragment.class;
-            default:
-                return getInstance().getSelectedTabs().get(0).fragmentClass;
-        }
+        return switch (getPrefsValue("start_values")) {
+            case "newsfeed" -> milkshake() ? HomeFragment.class : NewsfeedFragment.class;
+            case "messenger" -> DialogsFragment.class;
+            case "groups" -> milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class;
+            case "music" -> MusicCatalogFragment1.class;
+            case "friends" -> FriendsFragment.class;
+            case "photos" -> PhotosFragment.class;
+            case "videos" -> VideoCatalogFragment.class;
+            case "settings" -> useNewSettings();
+            case "apps" -> AppsFragment.class;
+            case "discover" -> DiscoverFragment.class;
+            case "notifications" -> NotificationsContainerFragment.class;
+            case "money" -> MoneyTransfersFragment.class;
+            case "games" -> GamesFragment.class;
+            case "liked" -> FaveTabFragment.class;
+            case "menu" ->
+                    milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : MenuFragment.class;
+            case "profile" -> ProfileFragment.class;
+            case "lives" -> LivesTabsFragment.class;
+            case "docs" -> DocumentsViewFragment.class;
+            case "brtd" -> BirthdaysFragment.class;
+            default -> getInstance().getSelectedTabs().get(0).fragmentClass;
+        };
     }
 }

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

@@ -12,134 +12,25 @@ import com.vk.toggle.Features;
 
 public class TogglesHook {
     public static boolean shouldPatch(Features.Type feature) {
-        switch (feature) {
-            case AB_IM_LONGPOLL_MSG_BATCHING:
-            case AB_IM_VIEW_POOL:
-            case AB_MULTI_GIFTS:
-            case AB_NEWS_VIDEO_LAYOUT_TEXT:
-            case AB_STICKERS_DISCOVER:
-            case AB_GIFTS_FROM_KEYBOARD:
-            case FEATURE_FEED_DEFAULT_LIST_ALWAYS:
-            case EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT:
-            case FEATURE_MILKSHAKE_DISCOVER_IN_MENU:
-            case FEATURE_DISCOVER_CATEGORIES:
-            case FEATURE_FAVE_PERF_IMPROVE:
-            case FEATURE_GROUP_ADMIN_MESSAGES:
-            case FEATURE_GROUP_MSG_PUSH_PARAM:
-            case FEATURE_IMAGE_QUALITY_UPGRADE:
-            case FEATURE_IM_AUDIO_MSG_TRANSCRIPT:
-            case FEATURE_IM_CASPER_MSGS:
-            case FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME:
-            case FEATURE_IM_GIF_AUTOPLAY:
-            case FEATURE_IM_MR_IN_VKAPP:
-            case FEATURE_MEMORIES_ENABLED:
-            case FEATURE_MENU_GAMES_CAROUSEL:
-            case FEATURE_MILKSHAKE:
-            case FEATURE_MILKSHAKE_CHANGE_FEED_BY_TIMEOUT:
-            case FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK:
-            case FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP:
-            case FEATURE_ML_BRANDS:
-            case FEATURE_ML_FEATURES:
-            case FEATURE_ML_MODELS_LOADING:
-            case FEATURE_MONEY_TRANSFERS_VKPAY:
-            case FEATURE_MUSIC_ARTIST_CATALOG:
-            case FEATURE_MUSIC_NEW_CATALOG:
-            case FEATURE_NARRATIVE_SNIPPET_TYPE:
-            case FEATURE_NEWS_GAMES_IN_DISCOVER:
-            case FEATURE_NEWS_HEADER_SCROLL:
-            case FEATURE_NEW_FORMAT_SHOW_WPB:
-            case FEATURE_PODCASTS_PAGE:
-            case FEATURE_QR_CREATE_QR:
-            case FEATURE_QR_DYNAMIC_FRAME:
-            case FEATURE_QR_SCAN_FROM_PHOTO:
-            case FEATURE_QR_VISION_DECODER:
-            case FEATURE_QUEUE_COUNTERS:
-            case FEATURE_REEF:
-            case FEATURE_ROAMING_AUTOPLAY:
-            case FEATURE_SHARE_MSGS_ON_INVITE:
-            case FEATURE_STICKERS_BOT_LINK:
-            case FEATURE_STICKERS_NEW_CATALOG:
-            case FEATURE_STORIES_AVATAR:
-            case FEATURE_STORIES_FEED_TYPE:
-            case FEATURE_STORIES_SHOW_ALWAYS:
-            case FEATURE_STORY_ANSWER_PUBLIC:
-            case FEATURE_STORY_APP_STICKER:
-            case FEATURE_STORY_ARCHIVE:
-            case FEATURE_STORY_ARCHIVE_POST:
-            case FEATURE_STORY_BAKGROUND_ALL:
-            case FEATURE_STORY_BOX:
-            case FEATURE_STORY_CADRE:
-            case FEATURE_STORY_CAMERA_TOOLTIP:
-            case FEATURE_STORY_EDITOR_GALLERY:
-            case FEATURE_STORY_EDITOR_TYPE:
-            case FEATURE_STORY_ENDLESS_VIDEO:
-            case FEATURE_STORY_FAST_REACTIONS:
-            case FEATURE_STORY_GIF:
-            case FEATURE_STORY_GROUPED:
-            case FEATURE_STORY_HIGH_QUALITY:
-            case FEATURE_STORY_MASKS_FRONTAL:
-            case FEATURE_STORY_MENTION_ICON:
-            case FEATURE_STORY_MODERN_PUBLISH:
-            case FEATURE_STORY_MUSIC_EDITOR:
-            case FEATURE_STORY_MUSIC_REPLIES:
-            case FEATURE_STORY_MUSIC_REPLIES_2:
-            case FEATURE_STORY_NEW_FRAME:
-            case FEATURE_STORY_ONE_TIME:
-            case FEATURE_STORY_PHOTO_SHARING:
-            case FEATURE_STORY_PHOTO_STICKER:
-            case FEATURE_STORY_POLLS:
-            case FEATURE_STORY_POST_REPOST:
-            case FEATURE_STORY_PRELOADING:
-            case FEATURE_STORY_QUESTION:
-            case FEATURE_STORY_QUESTION_STYLE:
-            case FEATURE_STORY_RLOTTIE:
-            case FEATURE_STORY_RLOTTIE_CACHE:
-            case FEATURE_STORY_SAVE_DEFAULT_ON:
-            case FEATURE_STORY_SEND_DIALOG_LIST:
-            case FEATURE_STORY_STICKER_PACK:
-            case FEATURE_STORY_TIME:
-            case FEATURE_STORY_VIEWER_CAMERA:
-            case FEATURE_STORY_VOICE_ANSWER:
-            case FEATURE_STORY_WITH_CONTEXT:
-            case FEATURE_SUPERAPP_MENU:
-            case FEATURE_TRAFFIC_SAVER:
-            case FEATURE_VKPAY_WIDGET:
-            case FEATURE_VKUI_INTERNAL_TO_MINI_APPS:
-            case FEATURE_VKUI_TOKEN_CACHE:
-            case FEATURE_VK_APPS_SEARCH:
-            case FEATURE_VOTES_BALANCE:
-            case FEATURE_WEBVIEW_TOKEN_ACTIVE:
-            case FEATURE_MILKSHAKE_FORCE_DISABLED:
-            case FEATURE_MILKSHAKE_ACTIVATION_DISABLED:
-            case EXPERIMENT_NEWS_DISABLE_CACHE:
-                return true;
-            default:
-                return false;
-        }
+        return switch (feature) {
+            case AB_IM_LONGPOLL_MSG_BATCHING, FEATURE_MOZJPEG, AB_IM_VIEW_POOL, AB_MULTI_GIFTS, AB_NEWS_VIDEO_LAYOUT_TEXT, AB_STICKERS_DISCOVER, AB_GIFTS_FROM_KEYBOARD, FEATURE_FEED_DEFAULT_LIST_ALWAYS, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_MILKSHAKE_DISCOVER_IN_MENU, FEATURE_DISCOVER_CATEGORIES, FEATURE_FAVE_PERF_IMPROVE, FEATURE_GROUP_ADMIN_MESSAGES, FEATURE_GROUP_MSG_PUSH_PARAM, FEATURE_IMAGE_QUALITY_UPGRADE, FEATURE_IM_AUDIO_MSG_TRANSCRIPT, FEATURE_IM_CASPER_MSGS, FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME, FEATURE_IM_GIF_AUTOPLAY, FEATURE_IM_MR_IN_VKAPP, FEATURE_MEMORIES_ENABLED, FEATURE_MENU_GAMES_CAROUSEL, FEATURE_MILKSHAKE, FEATURE_MILKSHAKE_CHANGE_FEED_BY_TIMEOUT, FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK, FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP, FEATURE_ML_BRANDS, FEATURE_ML_FEATURES, FEATURE_ML_MODELS_LOADING, FEATURE_MONEY_TRANSFERS_VKPAY, FEATURE_MUSIC_ARTIST_CATALOG, FEATURE_MUSIC_NEW_CATALOG, FEATURE_NARRATIVE_SNIPPET_TYPE, FEATURE_NEWS_GAMES_IN_DISCOVER, FEATURE_NEWS_HEADER_SCROLL, FEATURE_NEW_FORMAT_SHOW_WPB, FEATURE_PODCASTS_PAGE, FEATURE_QR_CREATE_QR, FEATURE_QR_DYNAMIC_FRAME, FEATURE_QR_SCAN_FROM_PHOTO, FEATURE_QR_VISION_DECODER, FEATURE_QUEUE_COUNTERS, FEATURE_REEF, FEATURE_ROAMING_AUTOPLAY, FEATURE_SHARE_MSGS_ON_INVITE, FEATURE_STICKERS_BOT_LINK, FEATURE_STICKERS_NEW_CATALOG, FEATURE_STORIES_AVATAR, FEATURE_STORIES_FEED_TYPE, FEATURE_STORIES_SHOW_ALWAYS, FEATURE_STORY_ANSWER_PUBLIC, FEATURE_STORY_APP_STICKER, FEATURE_STORY_ARCHIVE, FEATURE_STORY_ARCHIVE_POST, FEATURE_STORY_BAKGROUND_ALL, FEATURE_STORY_BOX, FEATURE_STORY_CADRE, FEATURE_STORY_CAMERA_TOOLTIP, FEATURE_STORY_EDITOR_GALLERY, FEATURE_STORY_EDITOR_TYPE, FEATURE_STORY_ENDLESS_VIDEO, FEATURE_STORY_FAST_REACTIONS, FEATURE_STORY_GIF, FEATURE_STORY_GROUPED, FEATURE_STORY_HIGH_QUALITY, FEATURE_STORY_MASKS_FRONTAL, FEATURE_STORY_MENTION_ICON, FEATURE_STORY_MODERN_PUBLISH, FEATURE_STORY_MUSIC_EDITOR, FEATURE_STORY_MUSIC_REPLIES, FEATURE_STORY_MUSIC_REPLIES_2, FEATURE_STORY_NEW_FRAME, FEATURE_STORY_ONE_TIME, FEATURE_STORY_PHOTO_SHARING, FEATURE_STORY_PHOTO_STICKER, FEATURE_STORY_POLLS, FEATURE_STORY_POST_REPOST, FEATURE_STORY_PRELOADING, FEATURE_STORY_QUESTION, FEATURE_STORY_QUESTION_STYLE, FEATURE_STORY_RLOTTIE, FEATURE_STORY_RLOTTIE_CACHE, FEATURE_STORY_SAVE_DEFAULT_ON, FEATURE_STORY_SEND_DIALOG_LIST, FEATURE_STORY_STICKER_PACK, FEATURE_STORY_TIME, FEATURE_STORY_VIEWER_CAMERA, FEATURE_STORY_VOICE_ANSWER, FEATURE_STORY_WITH_CONTEXT, FEATURE_SUPERAPP_MENU, FEATURE_TRAFFIC_SAVER, FEATURE_VKPAY_WIDGET, FEATURE_VKUI_INTERNAL_TO_MINI_APPS, FEATURE_VKUI_TOKEN_CACHE, FEATURE_VK_APPS_SEARCH, FEATURE_VOTES_BALANCE, FEATURE_WEBVIEW_TOKEN_ACTIVE, FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED, EXPERIMENT_NEWS_DISABLE_CACHE ->
+                    true;
+            default -> false;
+        };
     }
 
     public static boolean redirect(Features.Type feature) {
-        switch (feature) {
-            case EXPERIMENT_NEWS_DISABLE_CACHE:
-                return !feedcache();
-            case FEATURE_SUPERAPP_MENU:
-                return superapp();
-            case FEATURE_MILKSHAKE:
-                return milkshake();
-            case FEATURE_MILKSHAKE_FORCE_DISABLED:
-            case FEATURE_MILKSHAKE_ACTIVATION_DISABLED:
-                return !milkshake();
-            case AB_NEWS_VIDEO_LAYOUT_TEXT:
-            case FEATURE_COMPACT_REPOST:
-            case EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT:
-                return postsredesign();
-            case FEATURE_IMAGE_QUALITY_UPGRADE:
-                return !getBoolValue("compressPhotos", true);
-            case FEATURE_MENU_GAMES_CAROUSEL:
-                return miniapps();
-            default:
-                return true;
-        }
+        return switch (feature) {
+            case EXPERIMENT_NEWS_DISABLE_CACHE -> !feedcache();
+            case FEATURE_SUPERAPP_MENU -> superapp();
+            case FEATURE_MILKSHAKE -> milkshake();
+            case FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED -> !milkshake();
+            case AB_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_COMPACT_REPOST, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT ->
+                    postsredesign();
+            case FEATURE_IMAGE_QUALITY_UPGRADE -> !getBoolValue("compressPhotos", true);
+            case FEATURE_MENU_GAMES_CAROUSEL -> miniapps();
+            default -> true;
+        };
     }
 
     public static FeatureManager.b redirectStrings(Features.Type feature) {

app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.music;
 
+import android.util.Log;
 import com.vk.dto.music.MusicTrack;
 
 import java.io.File;
@@ -33,6 +34,12 @@ public class M3UDownloader implements ITrackDownloader {
     }
 
     public void downloadTrack(MusicTrack track, File outDir, Callback callback, boolean cache) {
+        if (track.D.isEmpty()) {
+            Log.d("TrackDownloader", "link error: " + track.y1() + ", title: " + M3UDownloader.getTitle(track));
+            callback.onFailure();
+            return;
+        }
+
         var request = new Request.a().b(track.D).a();
         try {
             var response = client.a(request).execute().a().g();
@@ -60,16 +67,7 @@ public class M3UDownloader implements ITrackDownloader {
         tsesDir.mkdirs();
         var resultTs = new File(tsesDir, "result.ts");
 
-        String title = null;
-
-        if (track.f != null) {
-            title = track.f;
-            if (!track.g.isEmpty()) {
-                title += " (" + track.g + ")";
-            }
-        }
-
-        var fileName = IOUtils.getValidFileName((cache ? "track" : track.C + " - " + title) + ".mp3");
+        var fileName = IOUtils.getValidFileName((cache ? "track" : track.C + " - " + getTitle(track)) + ".mp3");
         var resultMp3 = new File(outDir, fileName);
 
         callback.onProgress(5);
@@ -109,6 +107,19 @@ public class M3UDownloader implements ITrackDownloader {
         }).thenRun(() -> IOUtils.deleteRecursive(tsesDir)).thenRun(callback::onSuccess);
     }
 
+    public static String getTitle(MusicTrack track) {
+        String title = null;
+
+        if (track.f != null) {
+            title = track.f;
+            if (!track.g.isEmpty()) {
+                title += " (" + track.g + ")";
+            }
+        }
+
+        return title;
+    }
+
     // Initialization-on-demand
     private static class Holder {
         private static final M3UDownloader INSTANCE = new M3UDownloader();

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

@@ -1,37 +1,32 @@
 package ru.vtosters.lite.music.catalog.inject;
 
-import static ru.vtosters.lite.hooks.DateHook.getLocale;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
-import static ru.vtosters.lite.utils.Preferences.dev;
-import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-
 import android.util.Log;
-
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.core.network.Network;
 import com.vk.core.util.DeviceIdProvider;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
+import java.io.IOException;
+
+import static ru.vtosters.lite.hooks.DateHook.getLocale;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.*;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
+import static ru.vtosters.lite.utils.Preferences.dev;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
 public class CatalogJsonInjector {
     private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
+    private static boolean isLoaded;
 
     public static JSONObject music(JSONObject json) throws JSONException {
         var catalog = json.optJSONObject("catalog");
@@ -45,7 +40,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 +88,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");
@@ -145,6 +127,8 @@ public class CatalogJsonInjector {
                             .put(getCatalogPlaylist())
                             .put(getCatalogSeparator());
 
+                    isLoaded = false;
+
                     Log.d("VKMusic", "added cache catalog playlist");
 
                     for (int i = 0; i < blocks.length(); i++) {
@@ -183,7 +167,7 @@ public class CatalogJsonInjector {
                     }
                 }
 
-                if (!useOldAppVer || noPlaylists) {
+                if ((!useOldAppVer || noPlaylists) && !isLoaded) {
                     var newBlocks = new JSONArray();
 
                     newBlocks
@@ -191,6 +175,8 @@ public class CatalogJsonInjector {
                             .put(getCatalogPlaylist())
                             .put(getCatalogSeparator());
 
+                    isLoaded = true;
+
                     Log.d("catalogInjector", "added cache catalog playlist");
 
                     for (int i = 0; i < blocks.length(); i++) {
@@ -240,29 +226,46 @@ public class CatalogJsonInjector {
             }
         }
 
-        var section = json.optJSONObject("section");
-        if (section != null) {
-            var blocks = section.optJSONArray("blocks");
-            if (blocks != null) {
-                for (int i = 0; i < blocks.length(); i++) {
-                    var block = blocks.optJSONObject(i);
-                    var layout = block.optJSONObject("layout");
-                    if (layout != null) {
-                        var name = layout.optString("name");
-                        if (name.equals("header_extended")) {
-                            if (layout.has("top_title")) blocks.remove(i);
-                            try {
-                                layout.put("name", "header");
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
+        try {
+            fixHeaders(json.getJSONObject("section"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return catalogInjector(json);
+    }
+
+    public static JSONObject fixArtists(JSONObject json) {
+
+        try {
+            fixHeaders(json.getJSONObject("catalog").getJSONArray("sections").getJSONObject(0));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return json;
+    }
+
+    public static void fixHeaders(JSONObject json) {
+        var blocks = json.optJSONArray("blocks");
+
+        if (blocks != null) {
+            for (int i = 0; i < blocks.length(); i++) {
+                var block = blocks.optJSONObject(i);
+                var layout = block.optJSONObject("layout");
+                if (layout != null) {
+                    var name = layout.optString("name");
+                    if (name.equals("header_extended")) {
+                        if (layout.has("top_title")) blocks.remove(i);
+                        try {
+                            layout.put("name", "header");
+                        } catch (JSONException e) {
+                            e.printStackTrace();
                         }
                     }
                 }
             }
         }
-
-        return catalogInjector(json);
     }
 
     private static JSONObject fetchCatalogId(String section) {

app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java

@@ -16,6 +16,12 @@ import ru.vtosters.lite.music.interfaces.ITrackDownloader;
 
 public class TrackDownloader {
     public static void downloadTrack(MusicTrack track, String path, Callback callback) {
+        if (track.D.isEmpty()) {
+            Log.d("TrackDownloader", "link error: " + track.y1() + ", title: " + M3UDownloader.getTitle(track));
+            callback.onFailure();
+            return;
+        }
+
         download(track, path, callback, M3UDownloader.getInstance(), false);
     }
 
@@ -23,6 +29,10 @@ public class TrackDownloader {
         if (CacheDatabaseDelegate.isCached(track.y1())) {
             callback.onSuccess();
             return;
+        } else if (track.D.isEmpty()) {
+            Log.d("TrackDownloader", "link error: " + track.y1() + ", title: " + M3UDownloader.getTitle(track));
+            callback.onFailure();
+            return;
         }
 
         var path = FileCacheImplementation.getTrackFolder(LibVKXClient.asId(track)).getAbsolutePath();

app/src/main/java/ru/vtosters/lite/net/NetClient.java

@@ -45,27 +45,14 @@ public class NetClient {
         private PasswordAuthentication auth;
 
         public Builder connectTimeout(long l, TimeUnit unit) {
-            int m;
-            switch (unit) {
-                case SECONDS:
-                    m = 1000;
-                    break;
-                case MILLISECONDS:
-                    m = 1;
-                    break;
-                case HOURS:
-                    m = 1000 * 60 * 60;
-                    break;
-                case DAYS:
-                    m = 1000 * 60 * 60 * 24;
-                    break;
-                case MINUTES:
-                    m = 1000 * 60;
-                    break;
-                default:
-                    m = 1;
-                    break;
-            }
+            int m = switch (unit) {
+                case SECONDS -> 1000;
+                case MILLISECONDS -> 1;
+                case HOURS -> 1000 * 60 * 60;
+                case DAYS -> 1000 * 60 * 60 * 24;
+                case MINUTES -> 1000 * 60;
+                default -> 1;
+            };
             timeout = l * m;
             return this;
         }

app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java

@@ -134,24 +134,12 @@ public class ProxyUtils {
 
     public static void setProxy() throws IOException {
         switch (getPrefsValue("proxy")) {
-            case "zaborona":
-                Zaborona.loadProxy();
-                break;
-            case "randomproxy":
-                RandomProxy.loadProxy();
-                break;
-            case "socks":
-                CustomSocks.loadProxy();
-                break;
-            case "http":
-                CustomHttp.loadProxy();
-                break;
-            case "https":
-                CustomHttps.loadProxy();
-                break;
-            default:
-                resetProxy();
-                break;
+            case "zaborona" -> Zaborona.loadProxy();
+            case "randomproxy" -> RandomProxy.loadProxy();
+            case "socks" -> CustomSocks.loadProxy();
+            case "http" -> CustomHttp.loadProxy();
+            case "https" -> CustomHttps.loadProxy();
+            default -> resetProxy();
         }
     }
 

app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java

@@ -19,24 +19,23 @@ public class RandomProxy {
 
     public static void loadProxy() throws IOException {
         if (host.isEmpty()) {
-            getProxy();
-            loadProxy();
+            if (getProxy()) loadProxy();
             return;
         }
 
         switch (type) {
-            case "socks":
+            case "socks" -> {
                 System.setProperty("socksProxyHost", host.split(":")[0]);
                 System.setProperty("socksProxyPort", host.split(":")[1]);
-                break;
-            case "http":
+            }
+            case "http" -> {
                 System.setProperty("http.proxyHost", host.split(":")[0]);
                 System.setProperty("http.proxyPort", host.split(":")[1]);
-                break;
-            case "https":
+            }
+            case "https" -> {
                 System.setProperty("https.proxyHost", host.split(":")[0]);
                 System.setProperty("https.proxyPort", host.split(":")[1]);
-                break;
+            }
         }
     }
 
@@ -51,34 +50,20 @@ public class RandomProxy {
         edit().putString("proxy", "randomproxy").commit();
     }
 
-    public static void getProxy() throws IOException {
+    public static boolean getProxy() throws IOException {
         var random = new java.util.Random();
-        var randomInt = random.nextInt(7);
+        var randomInt = random.nextInt(8);
         switch (randomInt) {
-            case 0:
-                Hookzof.loadProxy();
-                break;
-            case 1:
-                TheSpeedX.loadProxy();
-                break;
-            case 2:
-                Jetkai.loadProxy();
-                break;
-            case 3:
-                Roosterkid.loadProxy();
-                break;
-            case 4:
-                ru.vtosters.lite.proxy.http.Jetkai.loadProxy();
-                break;
-            case 5:
-                ru.vtosters.lite.proxy.http.TheSpeedX.loadProxy();
-                break;
-            case 6:
-                ru.vtosters.lite.proxy.https.Jetkai.loadProxy();
-                break;
-            case 7:
-                ru.vtosters.lite.proxy.https.Roosterkid.loadProxy();
-                break;
+            case 0 -> Hookzof.loadProxy();
+            case 1 -> TheSpeedX.loadProxy();
+            case 2 -> Jetkai.loadProxy();
+            case 3 -> Roosterkid.loadProxy();
+            case 4 -> ru.vtosters.lite.proxy.http.Jetkai.loadProxy();
+            case 5 -> ru.vtosters.lite.proxy.http.TheSpeedX.loadProxy();
+            case 6 -> ru.vtosters.lite.proxy.https.Jetkai.loadProxy();
+            case 7 -> ru.vtosters.lite.proxy.https.Roosterkid.loadProxy();
         }
+
+        return true;
     }
 }

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,88 @@
+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 com.vtosters.lite.R;
+import ru.vtosters.lite.utils.AndroidUtils;
+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(R.string.warning)
+                    .setMessage(AndroidUtils.getString("custom_links_warning"))
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.continue_, (dialogInterface, i) -> {
+                        Preferences.preferences.edit().putBoolean("linkalert", true).commit();
+                    })
+                    .setNeutralButton(R.string.cancel, (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;
@@ -32,14 +29,11 @@ public class TGRoot {
     private static final String TAG = "TGRoot";
 
     public static String getSummary() {
-        switch (TGPref.getTGConnectMethod()) {
-            case 0:
-                return AndroidUtils.getString(R.string.ctypedirect);
-            case 2:
-                return AndroidUtils.getString(R.string.ctypesocks);
-            default:
-                return AndroidUtils.getString(R.string.ctypedisabled);
-        }
+        return switch (TGPref.getTGConnectMethod()) {
+            case 0 -> AndroidUtils.getString(R.string.ctypedirect);
+            case 2 -> AndroidUtils.getString(R.string.ctypesocks);
+            default -> AndroidUtils.getString(R.string.ctypedisabled);
+        };
     }
 
     public static Attachment processSticker(StickerItem item) {
@@ -101,7 +95,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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.themes;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
@@ -17,12 +18,14 @@ public class ThemesCore {
     public static SparseBooleanArray ACCENT_THEME_ONLY_LIGHT = new SparseBooleanArray();
     public static SparseBooleanArray ACCENT_THEME_ONLY_DARK = new SparseBooleanArray();
     public static SparseBooleanArray ACCENT_THEME_ONLY_NOMILK_LIGHT = new SparseBooleanArray();
-    public static SparseBooleanArray ACCENT_THEME_ONLY_NOMILK = new SparseBooleanArray();
+    public static SparseBooleanArray ACCENT_THEME_ONLY_NOMILK_DARK = new SparseBooleanArray();
     public static SparseBooleanArray ACCENT_THEME_ONLY_MILK_LIGHT = new SparseBooleanArray();
     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;
+    private static int darken_color;
 
     static {
         setExceptions();
@@ -33,7 +36,7 @@ public class ThemesCore {
         ACCENT_THEME_ONLY_LIGHT.clear();
         ACCENT_THEME_ONLY_DARK.clear();
         ACCENT_THEME_ONLY_NOMILK_LIGHT.clear();
-        ACCENT_THEME_ONLY_NOMILK.clear();
+        ACCENT_THEME_ONLY_NOMILK_DARK.clear();
         ACCENT_THEME_ONLY_MILK_LIGHT.clear();
         ACCENT_THEME_ONLY_MILK_DARK.clear();
 
@@ -41,6 +44,9 @@ public class ThemesCore {
         ACCENT_THEME_ONLY_LIGHT.put(R.attr.attach_picker_tab_active_text, false);
         ACCENT_THEME_ONLY_LIGHT.put(R.attr.newsfeed_action_color, false);
 
+        ACCENT_THEME_ONLY_MILK_LIGHT.put(R.attr.newsfeed_post_title_color, false);
+        ACCENT_THEME_ONLY_DARK.put(R.attr.newsfeed_post_title_color, false);
+
         ACCENT_THEME_ONLY_MILK_LIGHT.put(R.attr.header_background, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.header_background, false);
         ACCENT_THEME_ONLY_MILK_LIGHT.put(R.attr.header_alternate_background, false);
@@ -58,7 +64,7 @@ public class ThemesCore {
 
         ACCENT_THEME_ONLY_MILK_LIGHT.put(R.attr.im_dropdown_arrow_tint, false);
 
-        ACCENT_THEME_ONLY_NOMILK.put(R.attr.im_dropdown_icon_color, false);
+        ACCENT_THEME_ONLY_NOMILK_DARK.put(R.attr.im_dropdown_icon_color, false);
 
         ACCENT_THEME_ONLY_DARK.put(R.attr.icon_name, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.text_name, false);
@@ -67,7 +73,6 @@ public class ThemesCore {
         ACCENT_THEME_ONLY_DARK.put(R.attr.button_tertiary_foreground, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.button_muted_foreground, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.button_outline_border, false);
-        ACCENT_THEME_ONLY_DARK.put(R.attr.newsfeed_post_title_color, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.counter_primary_background, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.action_sheet_action_foreground, false);
         ACCENT_THEME_ONLY_DARK.put(R.attr.im_bubble_wallpaper_outgoing, false);
@@ -81,7 +86,6 @@ public class ThemesCore {
         cachedAccents = true;
         themedColors.clear();
 
-        themedColors.put(R.attr.text_link, accentColor);
         themedColors.put(R.attr.accent, accentColor);
         themedColors.put(R.attr.newsfeed_dropdown_color, accentColor);
         themedColors.put(R.attr.icon_name, accentColor);
@@ -121,7 +125,10 @@ public class ThemesCore {
         themedColors.put(R.attr.im_attach_tint, accentColor);
         themedColors.put(R.attr.im_forward_line_tint, accentColor);
         themedColors.put(R.attr.link_alternate, accentColor);
-        themedColors.put(R.attr.newsfeed_post_title_color, accentColor);
+
+        darken_color = ThemesUtils.darken(accentColor, 0.15f);
+        themedColors.put(R.attr.newsfeed_post_title_color, darken_color);
+        themedColors.put(R.attr.text_link, accentColor);
 
         themedColors.put(R.attr.attach_picker_tab_active_background, accentColor);
         themedColors.put(R.attr.attach_picker_tab_active_text, accentColor);
@@ -136,7 +143,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);
@@ -144,12 +152,14 @@ public class ThemesCore {
         themedColors.put(R.attr.im_bubble_outgoing_highlighted, accentColor);
     }
 
+    @SuppressLint("NonConstantResourceId")
     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;
-        }
-
-        return themedColors.get(attr);
+        return switch (attr) {
+            case R.attr.im_bubble_wallpaper_outgoing, R.attr.im_bubble_outgoing -> outgoinging_msg;
+            case R.attr.im_bubble_outgoing_highlighted -> outgoinging_msg_highlight;
+            case R.attr.newsfeed_post_title_color -> darken_color;
+            default -> themedColors.get(attr);
+        };
     }
 
     public static boolean hasThemedAttr(Context context, int attrID) {
@@ -163,7 +173,7 @@ public class ThemesCore {
                 return (themedColors.get(attrID) != 0 && ACCENT_THEME_ONLY_DARK.get(attrID, true) && (
                         ThemesUtils.isMilkshake() ?
                         ACCENT_THEME_ONLY_MILK_DARK.get(attrID, true) :
-                        ACCENT_THEME_ONLY_NOMILK.get(attrID, true)));
+                        ACCENT_THEME_ONLY_NOMILK_DARK.get(attrID, true)));
             } else {
                 return (themedColors.get(attrID) != 0 && ACCENT_THEME_ONLY_LIGHT.get(attrID, true) && (
                         ThemesUtils.isMilkshake() ?
@@ -183,4 +193,4 @@ public class ThemesCore {
     public static boolean isCachedAccents() {
         return cachedAccents;
     }
-}
+}

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/translators/BaseTranslator.java

@@ -32,15 +32,12 @@ public abstract class BaseTranslator {
     }
 
     public static BaseTranslator getInstance() {
-        switch (AndroidUtils.getPreferences().getInt("translator", 0)) {
-            case YANDEX:
-                return YandexTranslator.getInstance();
-            case GOOGLE:
-                return GoogleTranslator.getInstance();
-            case DEEPL:
-                return DeepLTranslator.getInstance();
-        }
-        return null;
+        return switch (AndroidUtils.getPreferences().getInt("translator", 0)) {
+            case YANDEX -> YandexTranslator.getInstance();
+            case GOOGLE -> GoogleTranslator.getInstance();
+            case DEEPL -> DeepLTranslator.getInstance();
+            default -> null;
+        };
     }
 
     @NonNull

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,56 +157,47 @@ 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);
+                if (getItemViewType(toPosition) == CATEGORY_TITLE)
+                    mDisabledItems.add(0, mSelectedItems.remove(fromPosition - 1));
+                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)
+            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
+                    );
             }
         }
 
@@ -235,17 +221,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/BackupManager.java

@@ -39,8 +39,8 @@ public class BackupManager {
 
     public static void deletePrefs() {
         getPrefs().edit().clear().commit();
-        File file = new File(new File(getGlobalContext().getFilesDir().getParent(), "shared_prefs"), "com.vtosters.lite_preferences");
-        file.delete();
+        new File(new File(getGlobalContext().getFilesDir().getParent(), "shared_prefs"), "com.vtosters.lite_preferences").delete();
+        new File(new File(getGlobalContext().getFilesDir().getParent(), "shared_prefs"), "null").delete();
     }
 
     public static void backupOnlines() throws IOException {

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,143 +116,124 @@ 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) {
-            case "tab_news":
-                return DockBarTab.valuesOf(
-                        "tab_news",
-                        R.drawable.ic_menu_newsfeed_outline_28,
-                        R.string.newsfeed,
-                        R.id.tab_news,
-                        milkshake() ? HomeFragment.class : NewsfeedFragment.class);
-            case "tab_superapps":
-                return DockBarTab.valuesOf(
-                        "tab_superapps",
-                        milkshake() ? R.drawable.ic_services_outline_28 : R.drawable.ic_menu_search_outline_28,
-                        milkshake() ? R.string.super_app_title : R.string.search,
-                        R.id.tab_discover,
-                        milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : DiscoverFragment.class);
-            case "tab_messages":
-                return DockBarTab.valuesOf(
-                        "tab_messages",
-                        R.drawable.ic_message_outline_28,
-                        R.string.messages,
-                        R.id.tab_messages,
-                        DialogsFragment.class);
-            case "tab_feedback":
-                return DockBarTab.valuesOf(
-                        "tab_feedback",
-                        !milkshake() ? R.drawable.ic_users_outline_28 : R.drawable.ic_menu_notification_outline_28,
-                        !milkshake() ? R.string.friends : R.string.not_notifications,
-                        R.id.tab_feedback,
-                        !milkshake() ? FriendsFragment.class : NotificationsContainerFragment.class);
-            case "tab_profile":
-                return DockBarTab.valuesOf(
-                        "tab_profile",
-                        milkshake() ? R.drawable.ic_user_circle_outline_28 : R.drawable.ic_menu_more_outline_28,
-                        milkshake() ? R.string.profile : R.string.menu,
-                        R.id.tab_menu,
-                        milkshake() ? ProfileFragment.class : MenuFragment.class);
-            case "tab_friends":
-                return DockBarTab.valuesOf(
-                        "tab_friends",
-                        milkshake() ? R.drawable.ic_users_outline_28 : R.drawable.ic_menu_notification_outline_28,
-                        milkshake() ? R.string.friends : R.string.not_notifications,
-                        R.id.menu_friends,
-                        milkshake() ? FriendsCatalogFragment.class : NotificationsContainerFragment.class);
-            case "tab_groups":
-                return DockBarTab.valuesOf(
-                        "tab_groups",
-                        R.drawable.users_3_outline_28,
-                        R.string.groups,
-                        R.id.menu_groups,
-                        milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class);
-            case "tab_photos":
-                return DockBarTab.valuesOf(
-                        "tab_photos",
-                        R.drawable.ic_camera_outline_28,
-                        R.string.photos,
-                        R.id.menu_photos,
-                        PhotosFragment.class);
-            case "tab_audios":
-                return DockBarTab.valuesOf(
-                        "tab_audios",
-                        R.drawable.ic_music_outline_28,
-                        R.string.music,
-                        R.id.menu_audios,
-                        MusicCatalogFragment1.class);
-            case "tab_videos":
-                return DockBarTab.valuesOf(
-                        "tab_videos",
-                        R.drawable.ic_video_outline_28,
-                        R.string.videos,
-                        R.id.menu_videos,
-                        VideoCatalogFragment.class);
-            case "tab_lives":
-                return DockBarTab.valuesOf(
-                        "tab_lives",
-                        R.drawable.ic_live_outline_28,
-                        R.string.sett_live,
-                        R.id.menu_lives,
-                        LivesTabsFragment.class);
-            case "tab_games":
-                return DockBarTab.valuesOf(
-                        "tab_games",
-                        R.drawable.ic_games_outline_36,
-                        R.string.games,
-                        R.id.menu_games,
-                        GamesFragment.class);
-            case "tab_liked":
-                return DockBarTab.valuesOf(
-                        "tab_liked",
-                        R.drawable.ic_like_outline_28,
-                        R.string.sett_likes,
-                        R.id.menu_feed_likes,
-                        FeedLikesFragment.class);
-            case "tab_fave":
-                return DockBarTab.valuesOf(
-                        "tab_fave",
-                        R.drawable.ic_favorite_outline_28,
-                        R.string.fave_title,
-                        R.id.menu_fave,
-                        FaveTabFragment.class);
-            case "tab_documents":
-                return DockBarTab.valuesOf(
-                        "tab_documents",
-                        R.drawable.ic_document_outline_28,
-                        R.string.docs,
-                        R.id.menu_documents,
-                        DocumentsViewFragment.class);
-            case "tab_payments":
-                return DockBarTab.valuesOf(
-                        "tab_payments",
-                        R.drawable.ic_money_transfer_outline_28,
-                        R.string.money_transfer_money,
-                        R.id.menu_payments,
-                        MoneyTransfersFragment.class);
-            case "tab_vk_apps":
-                return DockBarTab.valuesOf(
-                        "tab_vk_apps",
-                        R.drawable.ic_services_outline_28,
-                        R.string.menu_apps,
-                        R.id.menu_vk_apps,
-                        AppsFragment.class);
-            case "tab_settings":
-            default:
-                return DockBarTab.valuesOf(
-                        "tab_settings",
-                        R.drawable.ic_settings_outline_28,
-                        R.string.menu_settings,
-                        R.id.menu_settings,
-                        useNewSettings());
-        }
+        return switch (tag) {
+            case "tab_news" -> DockBarTab.valuesOf(
+                    "tab_news",
+                    R.drawable.ic_menu_newsfeed_outline_28,
+                    R.string.newsfeed,
+                    R.id.tab_news,
+                    milkshake() ? HomeFragment.class : NewsfeedFragment.class);
+            case "tab_superapps" -> DockBarTab.valuesOf(
+                    "tab_superapps",
+                    milkshake() ? R.drawable.ic_services_outline_28 : R.drawable.ic_menu_search_outline_28,
+                    milkshake() ? R.string.super_app_title : R.string.search,
+                    R.id.tab_discover,
+                    milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : DiscoverFragment.class);
+            case "tab_messages" -> DockBarTab.valuesOf(
+                    "tab_messages",
+                    R.drawable.ic_message_outline_28,
+                    R.string.messages,
+                    R.id.tab_messages,
+                    DialogsFragment.class);
+            case "tab_feedback" -> DockBarTab.valuesOf(
+                    "tab_feedback",
+                    !milkshake() ? R.drawable.ic_users_outline_28 : R.drawable.ic_menu_notification_outline_28,
+                    !milkshake() ? R.string.friends : R.string.not_notifications,
+                    R.id.tab_feedback,
+                    !milkshake() ? FriendsFragment.class : NotificationsContainerFragment.class);
+            case "tab_profile" -> DockBarTab.valuesOf(
+                    "tab_profile",
+                    milkshake() ? R.drawable.ic_user_circle_outline_28 : R.drawable.ic_menu_more_outline_28,
+                    milkshake() ? R.string.profile : R.string.menu,
+                    R.id.tab_menu,
+                    milkshake() ? ProfileFragment.class : MenuFragment.class);
+            case "tab_friends" -> DockBarTab.valuesOf(
+                    "tab_friends",
+                    milkshake() ? R.drawable.ic_users_outline_28 : R.drawable.ic_menu_notification_outline_28,
+                    milkshake() ? R.string.friends : R.string.not_notifications,
+                    R.id.menu_friends,
+                    milkshake() ? FriendsCatalogFragment.class : NotificationsContainerFragment.class);
+            case "tab_groups" -> DockBarTab.valuesOf(
+                    "tab_groups",
+                    R.drawable.users_3_outline_28,
+                    R.string.groups,
+                    R.id.menu_groups,
+                    milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class);
+            case "tab_photos" -> DockBarTab.valuesOf(
+                    "tab_photos",
+                    R.drawable.ic_camera_outline_28,
+                    R.string.photos,
+                    R.id.menu_photos,
+                    PhotosFragment.class);
+            case "tab_audios" -> DockBarTab.valuesOf(
+                    "tab_audios",
+                    R.drawable.ic_music_outline_28,
+                    R.string.music,
+                    R.id.menu_audios,
+                    MusicCatalogFragment1.class);
+            case "tab_videos" -> DockBarTab.valuesOf(
+                    "tab_videos",
+                    R.drawable.ic_video_outline_28,
+                    R.string.videos,
+                    R.id.menu_videos,
+                    VideoCatalogFragment.class);
+            case "tab_lives" -> DockBarTab.valuesOf(
+                    "tab_lives",
+                    R.drawable.ic_live_outline_28,
+                    R.string.sett_live,
+                    R.id.menu_lives,
+                    LivesTabsFragment.class);
+            case "tab_games" -> DockBarTab.valuesOf(
+                    "tab_games",
+                    R.drawable.ic_games_outline_36,
+                    R.string.games,
+                    R.id.menu_games,
+                    GamesFragment.class);
+            case "tab_liked" -> DockBarTab.valuesOf(
+                    "tab_liked",
+                    R.drawable.ic_like_outline_28,
+                    R.string.sett_likes,
+                    R.id.menu_feed_likes,
+                    FeedLikesFragment.class);
+            case "tab_fave" -> DockBarTab.valuesOf(
+                    "tab_fave",
+                    R.drawable.ic_favorite_outline_28,
+                    R.string.fave_title,
+                    R.id.menu_fave,
+                    FaveTabFragment.class);
+            case "tab_documents" -> DockBarTab.valuesOf(
+                    "tab_documents",
+                    R.drawable.ic_document_outline_28,
+                    R.string.docs,
+                    R.id.menu_documents,
+                    DocumentsViewFragment.class);
+            case "tab_payments" -> DockBarTab.valuesOf(
+                    "tab_payments",
+                    R.drawable.ic_money_transfer_outline_28,
+                    R.string.money_transfer_money,
+                    R.id.menu_payments,
+                    MoneyTransfersFragment.class);
+            case "tab_vk_apps" -> DockBarTab.valuesOf(
+                    "tab_vk_apps",
+                    R.drawable.ic_services_outline_28,
+                    R.string.menu_apps,
+                    R.id.menu_vk_apps,
+                    AppsFragment.class);
+            default -> DockBarTab.valuesOf(
+                    "tab_settings",
+                    R.drawable.ic_settings_outline_28,
+                    R.string.menu_settings,
+                    R.id.menu_settings,
+                    useNewSettings());
+        };
     }
 }

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

@@ -35,44 +35,32 @@ public class FragAnimationKit {
     public static void setAnimations(FragmentTransaction transaction) {
         if (transaction != null && !getPrefsValue("anim_rtrn_type").equals("noanim")) {
             switch (getPrefsValue("anim_rtrn_type")) {
-                case "q":
-                    transaction.setCustomAnimations(
-                            actOpenEnter,
-                            actOpenExit,
-                            actCloseEnter,
-                            actCloseExit
-                    );
-                    break;
-                case "slide":
-                    transaction.setCustomAnimations(
-                            SactOpenEnter,
-                            SactOpenExit,
-                            SactCloseEnter,
-                            SactCloseExit
-                    );
-                    break;
-                case "system":
-                    transaction.setCustomAnimations(
-                            SSactOpenEnter,
-                            SSactOpenExit,
-                            SSactCloseEnter,
-                            SSactCloseExit
-                    );
-                    break;
-                case "frag_enter":
-                    transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-                    break;
-                case "frag_fade":
-                    transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-                    break;
-                case "system_task":
-                    transaction.setCustomAnimations(
-                            SSTactOpenEnter,
-                            SSTactOpenExit,
-                            SSTactCloseEnter,
-                            SSTactCloseExit
-                    );
-                    break;
+                case "q" -> transaction.setCustomAnimations(
+                        actOpenEnter,
+                        actOpenExit,
+                        actCloseEnter,
+                        actCloseExit
+                );
+                case "slide" -> transaction.setCustomAnimations(
+                        SactOpenEnter,
+                        SactOpenExit,
+                        SactCloseEnter,
+                        SactCloseExit
+                );
+                case "system" -> transaction.setCustomAnimations(
+                        SSactOpenEnter,
+                        SSactOpenExit,
+                        SSactCloseEnter,
+                        SSactCloseExit
+                );
+                case "frag_enter" -> transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+                case "frag_fade" -> transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+                case "system_task" -> transaction.setCustomAnimations(
+                        SSTactOpenEnter,
+                        SSTactOpenExit,
+                        SSTactCloseEnter,
+                        SSTactCloseExit
+                );
             }
         }
     }

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

@@ -46,27 +46,18 @@ public class IconManager {
         return Preferences.hasVerification() && Preferences.isValidSignature() ? sIconsPlus : sIcons; // delete later sdk check
     }
 
-    public static void switchComponent(String icon, String appName, String oldIcon, String oldAppName) {
+    public static void switchComponent(String icon, String appName) {
 
         // def value for standard icon
         var iconIndex = 1;
         // def value for standard label
         var labelIndex = 1;
 
-        var oldIconIndex = -1;
-
-        var oldLabelIndex = -1;
-
         Log.d("IconManager", "iconSwitcher: icon = " + icon + ", appname = " + appName);
 
         List<String> iconsList = (Preferences.hasVerification() && Preferences.isValidSignature()) ? sIconsPlus : sIcons;
         List<String> labelsList = sLabels;
 
-        if (oldIcon != null && oldAppName != null) {
-            oldIconIndex = iconsList.indexOf(oldIcon);
-            oldLabelIndex = labelsList.indexOf(oldAppName);
-        }
-
         // check if icon is exist
         if (iconsList.contains(icon))
             // get icon index
@@ -81,14 +72,14 @@ public class IconManager {
 
         main: for (int i = 0; i < iconsList.size(); i++) {
             for (int o = 0; o < labelsList.size(); o++) {
-                if (isComponentEnabled("id" + i + "" + o)) {
-                    currentState = i + "" + o;
+                if (isComponentEnabled("id" + i + o)) {
+                    currentState = i + String.valueOf(o);
                     break main;
                 }
             }
         }
 
-        String newState = iconIndex + "" + labelIndex;
+        String newState = iconIndex + String.valueOf(labelIndex);
 
         // check if current component is equal to custom value or if custom value is not exist
         if (currentState.equals(newState))

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() {
@@ -87,37 +81,22 @@ public class SuperAppEditorManager {
     }
 
     private SuperAppItem getItemByTag(String tag) {
-        switch (tag) {
-            case "menu":
-                return SuperAppItem.valuesOf("menu", AndroidUtils.getString(R.string.superapp_menu));
-            case "miniapps":
-                return SuperAppItem.valuesOf("miniapps", AndroidUtils.getString(R.string.superapp_miniapps));
-            case "vkpay_slim":
-                return SuperAppItem.valuesOf("vkpay_slim", AndroidUtils.getString(R.string.superapp_vkpay));
-            case "greeting":
-                return SuperAppItem.valuesOf("greeting", AndroidUtils.getString(R.string.superapp_greeting));
-            case "promo":
-                return SuperAppItem.valuesOf("promo", AndroidUtils.getString(R.string.superapp_miniapps_promo));
-            case "holiday":
-                return SuperAppItem.valuesOf("holiday", AndroidUtils.getString(R.string.superapp_holiday));
-            case "weather":
-                return SuperAppItem.valuesOf("weather", AndroidUtils.getString(R.string.superapp_weather));
-            case "sport":
-                return SuperAppItem.valuesOf("sport", AndroidUtils.getString(R.string.superapp_sport));
-            case "games":
-                return SuperAppItem.valuesOf("games", AndroidUtils.getString(R.string.superapp_games));
-            case "informer":
-                return SuperAppItem.valuesOf("informer", AndroidUtils.getString(R.string.superapp_informer));
-            case "food":
-                return SuperAppItem.valuesOf("food", AndroidUtils.getString(R.string.superapp_food));
-            case "event":
-                return SuperAppItem.valuesOf("event", AndroidUtils.getString(R.string.superapp_event));
-            case "music":
-                return SuperAppItem.valuesOf("music", AndroidUtils.getString(R.string.superapp_music));
-            case "vk_run":
-                return SuperAppItem.valuesOf("vk_run", AndroidUtils.getString(R.string.superapp_vk_run));
-            default:
-                return null;
-        }
+        return switch (tag) {
+            case "menu" -> SuperAppItem.valuesOf("menu", AndroidUtils.getString(R.string.superapp_menu));
+            case "miniapps" -> SuperAppItem.valuesOf("miniapps", AndroidUtils.getString(R.string.superapp_miniapps));
+            case "vkpay_slim" -> SuperAppItem.valuesOf("vkpay_slim", AndroidUtils.getString(R.string.superapp_vkpay));
+            case "greeting" -> SuperAppItem.valuesOf("greeting", AndroidUtils.getString(R.string.superapp_greeting));
+            case "promo" -> SuperAppItem.valuesOf("promo", AndroidUtils.getString(R.string.superapp_miniapps_promo));
+            case "holiday" -> SuperAppItem.valuesOf("holiday", AndroidUtils.getString(R.string.superapp_holiday));
+            case "weather" -> SuperAppItem.valuesOf("weather", AndroidUtils.getString(R.string.superapp_weather));
+            case "sport" -> SuperAppItem.valuesOf("sport", AndroidUtils.getString(R.string.superapp_sport));
+            case "games" -> SuperAppItem.valuesOf("games", AndroidUtils.getString(R.string.superapp_games));
+            case "informer" -> SuperAppItem.valuesOf("informer", AndroidUtils.getString(R.string.superapp_informer));
+            case "food" -> SuperAppItem.valuesOf("food", AndroidUtils.getString(R.string.superapp_food));
+            case "event" -> SuperAppItem.valuesOf("event", AndroidUtils.getString(R.string.superapp_event));
+            case "music" -> SuperAppItem.valuesOf("music", AndroidUtils.getString(R.string.superapp_music));
+            case "vk_run" -> SuperAppItem.valuesOf("vk_run", AndroidUtils.getString(R.string.superapp_vk_run));
+            default -> null;
+        };
     }
 }

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

@@ -12,6 +12,7 @@ import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 
 import ru.vtosters.lite.ui.fragments.InstallGMSFragment;
+import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class InstallGMS {
     public static void alert(final Activity activity) {
@@ -25,10 +26,7 @@ public class InstallGMS {
                     )
                     .setNeutralButton(activity.getString(R.string.gmsissuebtn2), (dialogInterface, i) -> {
                         edit().putBoolean("showAlertGms", false).apply();
-                        var intent = new Navigator(InstallGMSFragment.class)
-                                .b(activity)
-                                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        activity.startActivity(intent);
+                        NavigatorUtils.switchFragment(activity, InstallGMSFragment.class);
                     })
                     .show();
         }

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

@@ -66,24 +66,12 @@ public class MessageSettings {
         five.setTextColor(getTextAttr());
 
         switch (bombCount) {
-            case "15s":
-                one.setChecked(true);
-                break;
-            case "1m":
-                two.setChecked(true);
-                break;
-            case "5m":
-                three.setChecked(true);
-                break;
-            case "1h":
-                four.setChecked(true);
-                break;
-            case "24h":
-                five.setChecked(true);
-                break;
-            default:
-                zero.setChecked(true);
-                break;
+            case "15s" -> one.setChecked(true);
+            case "1m" -> two.setChecked(true);
+            case "5m" -> three.setChecked(true);
+            case "1h" -> four.setChecked(true);
+            case "24h" -> five.setChecked(true);
+            default -> zero.setChecked(true);
         }
 
         @SuppressLint("UseSwitchCompatOrMaterialCode")

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/ServerDialog.java

@@ -94,7 +94,7 @@ public class ServerDialog {
         showAlert = true;
 
         var activity = LifecycleUtils.getCurrentActivity();
-        if (activity != null && getBoolValue(key, true) && showForNotVerified() && showAlert) {
+        if (getBoolValue(key, true) && showForNotVerified() && showAlert) {
             activity.runOnUiThread(() -> {
                 new VkAlertDialog.Builder(activity)
                         .setTitle(title)

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/dialogs/VKIDProtection.java

@@ -13,6 +13,7 @@ import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 
 import ru.vtosters.lite.ui.fragments.VKUIwrapper;
+import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class VKIDProtection {
     public static void alert(final Activity activity) {
@@ -29,9 +30,7 @@ public class VKIDProtection {
                             isAnyProxyEnabled()
                                     ? "https://id.vk.com/account"
                                     : "https://" + getApi() + "/_/id.vk.com/account");
-                    var intent = new Navigator(VKUIwrapper.class).b(activity)
-                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    activity.startActivity(intent);
+                    NavigatorUtils.switchFragment(activity, VKUIwrapper.class);
                 })
                 .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

@@ -1,26 +1,23 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;
-import static ru.vtosters.lite.utils.Preferences.copyright_post;
-
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-
 import androidx.preference.Preference;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.navigation.Navigator;
 import com.vk.newsfeed.NewsfeedSettingsFragment;
+import com.vk.newsfeed.controllers.NewsfeedController;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
+import com.vtosters.lite.ui.SummaryListPreference;
 import ru.vtosters.lite.ui.components.NewsfeedListManager;
+import ru.vtosters.lite.utils.NavigatorUtils;
+import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
+import ru.vtosters.lite.utils.Preferences;
+
+import java.util.Objects;
+
+import static ru.vtosters.lite.utils.AndroidUtils.*;
 
 public class FeedFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -31,25 +28,37 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
     }
 
     private void prefs() {
-        findPreference("officialnewssett").setOnPreferenceClickListener(new openofficialsett());
-        findPreference("cringecopyright").setEnabled(!copyright_post());
+        findPreference("officialnewssett").setOnPreferenceClickListener(preference -> {
+            NavigatorUtils.switchFragment(requireContext(), NewsfeedSettingsFragment.class);
+            return true;
+        });
+        findPreference("cringecopyright").setEnabled(!Preferences.copyright_post());
+
+        var findPreference = (SummaryListPreference) findPreference("newsfeed_order");
+        findPreference.setValue(NewsfeedController.e.k() ? "top" : "recent");
+        findPreference.setOnPreferenceChangeListener((preference, o) -> {
+            NewsfeedController.e.a(0);
+            NewsfeedController.e.a((Boolean) Objects.equals(o, "top"));
+            NewsfeedController.e.b(true);
+            return true;
+        });
 
         findPreference("spamfilters").setSummary(count(getPrefsValue("spamfilters")));
         findPreference("sourcenamefilter").setSummary(count(getPrefsValue("sourcenamefilter")));
         findPreference("linkfilter").setSummary(count(getPrefsValue("linkfilter")));
 
         findPreference("spamfilters").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
         findPreference("sourcenamefilter").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
         findPreference("linkfilter").setOnPreferenceClickListener(preference -> {
-            setupFilters();
+            NewsFeedFiltersUtils.setupFilters();
             return true;
         });
 
@@ -70,14 +79,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) {
@@ -99,7 +112,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
                 .setPositiveButton(requireContext().getString(R.string.yes), (dialogInterface, i) -> {
                     edit().remove(key).apply();
                     sendToast(requireContext().getString(R.string.elements_deleted_success));
-                    setupFilters();
+                    NewsFeedFiltersUtils.setupFilters();
                 })
                 .setNegativeButton(requireContext().getString(R.string.cancel),
                         (dialogInterface, i) -> dialogInterface.dismiss())
@@ -127,8 +140,8 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        findPreference("cringecopyright").setEnabled(!copyright_post());
-        setupFilters();
+        findPreference("cringecopyright").setEnabled(!Preferences.copyright_post());
+        NewsFeedFiltersUtils.setupFilters();
         return super.onPreferenceTreeClick(preference);
     }
 
@@ -136,15 +149,4 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
     public int T4() {
         return R.string.vtlfeed;
     }
-
-    public class openofficialsett implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            Context context = requireContext();
-            Intent a2 = new Navigator(NewsfeedSettingsFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
-            return true;
-        }
-    }
 }

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");
                     } 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");
                     } 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");
                     }
                 }))
                 .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,18 @@
 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.LifecycleUtils.restartApplicationWithTimer;
-
 import android.os.Build;
 import android.os.Bundle;
-
-import androidx.preference.Preference;
-
 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.NavigatorUtils;
+import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.ThemesUtils;
+
+import static ru.vtosters.lite.utils.AndroidUtils.*;
+import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -23,16 +23,52 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     }
 
     private void prefs() {
-        findPreference("stories").setOnPreferenceClickListener(new restart());
-        findPreference("swipe").setOnPreferenceClickListener(new restart());
-        findPreference("is_likes_on_right").setOnPreferenceClickListener(new restart());
-        findPreference("superapp").setOnPreferenceClickListener(new restart());
+        findPreference("stories").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+
+            return true;
+        });
+        findPreference("swipe").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+
+            return true;
+        });
+        findPreference("is_likes_on_right").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+
+            return true;
+        });
+        findPreference("superapp").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+
+            return true;
+        });
+
+        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 -> {
+            NavigatorUtils.switchFragment(requireContext(), SuperAppEditorFragment.class);
+            return true;
+        });
 
         if (isTablet()) {
             findPreference("menusett").setVisible(false);
             findPreference("swipe").setVisible(false);
         }
 
+        if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
+            findPreference("miniapps").setVisible(false);
+
+            findPreference("showmenu").setVisible(false);
+        }
+
         findPreference("customrounding").setOnPreferenceClickListener(preference -> {
             RoundingSeekbarDialog.dialog(getContext());
             return true;
@@ -49,20 +85,8 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    public boolean restart(Preference preference) {
-        restartApplicationWithTimer();
-        return true;
-    }
-
     @Override
     public int T4() {
         return R.string.vtlinterface;
     }
-
-    public class restart implements Preference.OnPreferenceClickListener {
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            return InterfaceFragment.this.restart(preference);
-        }
-    }
 }

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

@@ -91,12 +91,15 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
     }
 
     private void prefs() {
-        findPreference("download_video").setOnPreferenceClickListener(new MediaFragment.download());
+        findPreference("download_video").setOnPreferenceClickListener(preference -> {
+            download(requireContext());
+
+            return true;
+        });
         findPreference("clearvideohistory").setOnPreferenceClickListener(preference -> {
             deleteVideoHistoryDialog(requireContext());
             return true;
         });
-        findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
         findPreference("lastfm_auth").setOnPreferenceClickListener(preference -> {
             if (isLoggedIn()) {
                 logout(getContext());
@@ -139,7 +142,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
 
         findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
             var items = Arrays.asList(
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(null, "По выбору"),
+                    new ImagineArrayAdapter.ImagineArrayAdapterItem(null, AndroidUtils.getString("by_choice")),
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.yandex, "Yandex"),
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.google, "Google"),
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.microsoft, "Bing"),
@@ -148,7 +151,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())
@@ -285,21 +288,4 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
     public int T4() {
         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) {
-            download(getActivity());
-            return true;
-        }
-    }
 }

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

@@ -1,31 +1,20 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import androidx.preference.Preference;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vtosters.lite.R;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
+
+import java.util.Arrays;
+
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 import static ru.vtosters.lite.utils.Preferences.autoalltranslate;
 import static ru.vtosters.lite.utils.Preferences.vkme;
-import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import androidx.preference.Preference;
-
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.navigation.Navigator;
-import com.vk.stickers.Stickers;
-import com.vtosters.lite.R;
-import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
-import java.util.Arrays;
-
-import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
-import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
 
 public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -37,10 +26,16 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
 
     @SuppressLint("UseCompatLoadingForDrawables")
     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("vkme").setOnPreferenceClickListener(preference -> {
+            restart();
+
+            return true;
+        });
+        findPreference("vkme_notifs").setOnPreferenceClickListener(preference -> {
+            restart();
+
+            return true;
+        });
 
         findPreference("autotranslate").setEnabled(!autoalltranslate());
 
@@ -65,11 +60,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);
         }
     }
@@ -90,29 +83,4 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     public int T4() {
         return R.string.vtlmessages;
     }
-
-    public class restart implements Preference.OnPreferenceClickListener {
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            return MessagesFragment.this.restart();
-        }
-    }
-
-    public class clearCache implements Preference.OnPreferenceClickListener {
-        @Override
-        public boolean onPreferenceClick(Preference preference) {
-            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

@@ -1,42 +1,16 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static android.widget.Toast.LENGTH_LONG;
-import static android.widget.Toast.LENGTH_SHORT;
-import static android.widget.Toast.makeText;
-import static ru.vtosters.lite.ui.components.BackupManager.backupOnlines;
-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.LifecycleUtils.restartApplication;
-import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
-import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.*;
 import android.os.Bundle;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import android.widget.ArrayAdapter;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
+import android.widget.*;
 import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.preference.Preference;
-
+import b.h.g.m.FileUtils;
 import com.vk.auth.api.VKAccount;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.util.ToastUtils;
@@ -54,15 +28,22 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.auth.VKAccountManager;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.im.ImEngineProvider;
+import ru.vtosters.lite.deviceinfo.DeviceInfoCollector;
+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.*;
 
 import java.io.IOException;
 
-import b.h.g.m.FileUtils;
-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 static android.widget.Toast.LENGTH_LONG;
+import static android.widget.Toast.LENGTH_SHORT;
+import static ru.vtosters.lite.ui.components.BackupManager.*;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
+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;
 
 public class OtherFragment extends MaterialPreferenceToolbarFragment {
     private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1;
@@ -82,32 +63,63 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             if (resultCode == Activity.RESULT_OK) {
                 String token = data.getStringExtra("token");
                 AndroidUtils.getPreferences().edit().putString("vk_admin_token", token).apply();
-                Log.d("VkAdminToken", token);
                 Toast.makeText(getContext(), requireContext().getString(R.string.token_saved), LENGTH_SHORT).show();
             }
         }
     }
 
     private void prefs() {
-        findPreference("firebasefix").setOnPreferenceClickListener(new a());
-        findPreference("applicationstop").setOnPreferenceClickListener(new b());
-        findPreference("tokencopy").setOnPreferenceClickListener(new c());
-        findPreference("applicationrestart").setOnPreferenceClickListener(new d());
+        findPreference("firebasefix").setOnPreferenceClickListener(preference -> {
+            VKAccount b = VKAccountManager.d();
+            PushSubscriber.e.a();
+            ToastUtils.a(requireContext().getString(R.string.fcmtokenrem));
+            AndroidUtils.getGlobalContext().getSharedPreferences("gcm", 0).edit().clear().apply();
+            OtherFragment.this.getListView().postDelayed(() -> {
+                PushSubscriber.e.a(true);
+
+                ToastUtils.a(requireContext().getString(R.string.fcmtokenget));
+                ToastUtils.a(requireContext().getString(R.string.fcmtokenfixed));
+            }, 1000);
+            return true;
+        });
+
+        findPreference("applicationstop").setOnPreferenceClickListener(preference -> {
+            System.exit(0);
+            return true;
+        });
+
+        findPreference("tokencopy").setOnPreferenceClickListener(preference -> {
+            copyText(getUserToken());
+
+            Toast.makeText(requireContext(), requireContext().getString(R.string.copybtn), LENGTH_SHORT).show();
+            ToastUtils.a(requireContext().getString(R.string.tokenwarning));
+            return true;
+        });
+
+        findPreference("copydebuginfo").setOnPreferenceClickListener(preference -> {
+            copyText(new DeviceInfoCollector().collect().forLogging());
+            Toast.makeText(requireContext(), AndroidUtils.getString("device_info_copied"), LENGTH_SHORT).show();
+            return true;
+        });
+
+        findPreference("applicationrestart").setOnPreferenceClickListener(preference -> {
+            restartApplication();
+            return true;
+        });
+
         findPreference("clearcache").setOnPreferenceClickListener(preference -> {
             cacheCleanDialog();
             return true;
         });
+
         findPreference("copyownlink").setOnPreferenceClickListener(preference -> {
-            ((ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", "https://vk.com/id" + AccountManagerUtils.getUserId()));
+            copyText("https://vk.com/id" + AccountManagerUtils.getUserId());
             ToastUtils.a(requireContext().getString(R.string.link_copied));
             return true;
         });
 
         findPreference("deviceinfo").setOnPreferenceClickListener(preference -> {
-            Context context = requireContext();
-            Intent a2 = new Navigator(SystemInfo.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
+            NavigatorUtils.switchFragment(requireContext(), SystemInfo.class);
             return true;
         });
 
@@ -116,31 +128,26 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("contacts_sync").setOnPreferenceClickListener((preference) -> {
-            ContactsUtils.getContactsStatus(requireContext());
+        findPreference("dialogrecomm").setVisible(!Preferences.hasVerification());
+
+        findPreference("updateverifdata").setOnPreferenceClickListener(preference -> {
+            UsersList.getUsersList();
+            VTVerifications.load(requireContext());
+            sendToast(AndroidUtils.getString("data_updated"));
             return true;
         });
 
         var pref = getDefaultPrefs().getString("autoclearcache", "Default");
         switch (pref) {
-            case "Default":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_disabled));
-                break;
-            case "100mb":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_100mb));
-                break;
-            case "500mb":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_500mb));
-                break;
-            case "1gb":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_1gb));
-                break;
-            case "2gb":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_2gb));
-                break;
-            case "5gb":
-                findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_5gb));
-                break;
+            case "Default" ->
+                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_disabled));
+            case "100mb" ->
+                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_100mb));
+            case "500mb" ->
+                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_500mb));
+            case "1gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_1gb));
+            case "2gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_2gb));
+            case "5gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_5gb));
         }
 
         findPreference("deleteprefs").setOnPreferenceClickListener(preference -> {
@@ -148,16 +155,52 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("saveonlines").setOnPreferenceClickListener(new onlines());
+        findPreference("saveonlines").setOnPreferenceClickListener(preference -> {
+            try {
+                backupOnlines();
+            } catch (IOException e) {
+                Toast.makeText(getContext(), requireContext().getString(R.string.no_data_to_backup), LENGTH_SHORT).show();
+            }
 
-        findPreference("saveprefs").setOnPreferenceClickListener(new saveprefs());
-        findPreference("restoreprefs").setOnPreferenceClickListener(new restoreprefs());
+            return true;
+        });
+
+        findPreference("saveprefs").setOnPreferenceClickListener(preference -> {
+            backupSettings();
+
+            return false;
+        });
+        findPreference("restoreprefs").setOnPreferenceClickListener(preference -> {
+            var arr = BackupManager.getBackupsNames();
+            var adapter = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, arr) {
+                @Override
+                public View getView(int position, View convertView, ViewGroup parent) {
+                    TextView textView = (TextView) super.getView(position, convertView, parent);
+                    textView.setTextColor(getTextAttr());
+                    return textView;
+                }
+            };
+            new VkAlertDialog.Builder(getContext())
+                    .setTitle(requireContext().getString(R.string.select_backup))
+                    .setAdapter(adapter, (dialog, which) -> {
+                        try {
+                            restoreBackup(arr[which]);
+                            restartApplicationWithTimer();
+                            Toast.makeText(getContext(), requireContext().getString(R.string.backup_success), LENGTH_LONG).show();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            Toast.makeText(getContext(), requireContext().getString(R.string.backup_error), LENGTH_LONG).show();
+                        }
+                    })
+                    .show();
+
+            return true;
+        });
 
         var vkAdminTokenPref = findPreference("vk_admin_token");
         vkAdminTokenPref.setVisible(AndroidUtils.getDefaultPrefs().getBoolean("new_music_downloading_way", false));
         if (vkAdminTokenPref.isVisible()) {
             vkAdminTokenPref.setOnPreferenceClickListener(preference -> {
-
                 startActivityForResult(new Intent(getContext(), VKAdminTokenActivity.class), VK_ADMIN_TOKEN_REQUEST_CODE);
 
                 return true;
@@ -209,7 +252,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 .setTitle(requireContext().getString(R.string.select_which_clean))
                 .setItems(AndroidUtils.getArray(R.array.cache_cleaner), (dialog, which) -> {
                     switch (which) {
-                        case 0: {
+                        case 0 -> {
                             SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
                             prefs2.edit().clear().commit();
                             clearWebViewCache();
@@ -222,30 +265,26 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                             ImEngineExt.a(ImEngine1.a());
                             AutoPlayCacheHolder.d.a();
                             MediaStorage.a();
-                            break;
                         }
-                        case 1: {
+                        case 1 -> {
                             SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
                             prefs2.edit().clear().commit();
                             Stickers.l.c();
-                            break;
                         }
-                        case 2:
+                        case 2 -> {
                             VKImageLoader.e();
                             ImEngineExt.a(ImEngine1.a());
-                            break;
-                        case 3:
+                        }
+                        case 3 -> {
                             AutoPlayCacheHolder.d.a();
                             MediaStorage.a();
-                            break;
-                        case 4:
+                        }
+                        case 4 -> {
                             ImEngineProvider.b().a();
                             ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
                             ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-                            break;
-                        case 5:
-                            clearWebViewCache();
-                            break;
+                        }
+                        case 5 -> clearWebViewCache();
                     }
                     Toast.makeText(getContext(), requireContext().getString(R.string.cache_cleaned), LENGTH_SHORT).show();
                 })
@@ -269,115 +308,13 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 .show();
     }
 
+    private void copyText(String src) {
+        var manager = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE);
+        manager.setPrimaryClip(ClipData.newPlainText("MBH-ST", src));
+    }
+
     @Override
     public int T4() {
         return R.string.vtlother;
     }
-
-    public static class d implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            restartApplication();
-            return true;
-        }
-    }
-
-    public static class b implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            System.exit(0);
-            return true;
-        }
-    }
-
-    public static class saveprefs implements Preference.OnPreferenceClickListener {
-        saveprefs() {
-        }
-
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            backupSettings();
-            return true;
-        }
-    }
-
-    public class onlines implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            try {
-                backupOnlines();
-            } catch (IOException e) {
-                Toast.makeText(getContext(), requireContext().getString(R.string.no_data_to_backup), LENGTH_SHORT).show();
-            }
-            return true;
-        }
-    }
-
-    class c implements Preference.OnPreferenceClickListener {
-        public void copy(Context context, String str) {
-            ((ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", str));
-            makeText(context, requireContext().getString(R.string.copybtn), LENGTH_SHORT).show();
-            ToastUtils.a(requireContext().getString(R.string.tokenwarning));
-        }
-
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            copy(getContext(), getUserToken());
-            return true;
-        }
-    }
-
-    public class a implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            VKAccount b = VKAccountManager.d();
-            PushSubscriber.e.a();
-            ToastUtils.a(requireContext().getString(R.string.fcmtokenrem));
-            AndroidUtils.getGlobalContext().getSharedPreferences("gcm", 0).edit().clear().apply();
-            OtherFragment.this.getListView().postDelayed(() -> {
-                PushSubscriber.e.a(true);
-
-                Context ctx;
-
-                try {
-                    ctx = requireContext();
-                } catch (Exception unused) {
-                    ctx = getGlobalContext();
-                }
-
-                ToastUtils.a(ctx.getString(R.string.fcmtokenget));
-                ToastUtils.a(ctx.getString(R.string.fcmtokenfixed));
-            }, 1000);
-            return true;
-        }
-    }
-
-    public class restoreprefs implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            var arr = BackupManager.getBackupsNames();
-            var adapter = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, arr) {
-                @Override
-                public View getView(int position, View convertView, ViewGroup parent) {
-                    TextView textView = (TextView) super.getView(position, convertView, parent);
-                    textView.setTextColor(getTextAttr());
-                    return textView;
-                }
-            };
-            new VkAlertDialog.Builder(getContext())
-                    .setTitle(requireContext().getString(R.string.select_backup))
-                    .setAdapter(adapter, (dialog, which) -> {
-                        try {
-                            restoreBackup(arr[which]);
-                            restartApplicationWithTimer();
-                            Toast.makeText(getContext(), requireContext().getString(R.string.backup_success), LENGTH_LONG).show();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            Toast.makeText(getContext(), requireContext().getString(R.string.backup_error), LENGTH_LONG).show();
-                        }
-                    })
-                    .show();
-            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,12 +14,14 @@ 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.utils.AndroidUtils;
-import ru.vtosters.lite.utils.LifecycleUtils;
-import ru.vtosters.lite.utils.Preferences;
-import ru.vtosters.lite.utils.ThemesUtils;
+import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
+import ru.vtosters.lite.utils.*;
+
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
 
 public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
@@ -38,6 +40,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 -> {
+            NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
+            return true;
+        });
+
         var navBarPreference = findPreference("navbar");
         navBarPreference.setOnPreferenceClickListener(preference -> {
             restart();
@@ -65,7 +74,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
         var iconManagerPreference = findPreference("iconmanager");
         iconManagerPreference.setOnPreferenceClickListener(preference -> {
-            switchFragment(IconsFragment.class);
+            NavigatorUtils.switchFragment(requireContext(), IconsFragment.class);
             return true;
         });
 
@@ -97,9 +106,28 @@ 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 -> {
+            NavigatorUtils.switchFragment(requireContext(), WallpaperMenuFragment.class);
+
+            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);
         }
     }
 
@@ -114,12 +142,8 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
                 .setTitle(AndroidUtils.getString("change_accent_color"))
                 .setItems(titles, (dialog, which) -> {
                     switch (which) {
-                        case 0:
-                            showColorPicker();
-                            break;
-                        case 1:
-                            showPalettesDialog();
-                            break;
+                        case 0 -> showColorPicker();
+                        case 1 -> showPalettesDialog();
                     }
                 })
                 .setNegativeButton(R.string.reset, (dialog, which) -> {
@@ -154,8 +178,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"))
@@ -177,11 +201,4 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
     void restart() {
         LifecycleUtils.restartApplicationWithTimer();
     }
-
-    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/VKPayFragment.java

@@ -1,10 +1,8 @@
 package ru.vtosters.lite.ui.fragments;
 
-import android.content.Intent;
 import android.os.Bundle;
-
 import com.vk.core.fragments.FragmentImpl;
-import com.vk.navigation.Navigator;
+import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class VKPayFragment extends FragmentImpl {
     @Override
@@ -15,8 +13,6 @@ 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);
+        NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
     }
 }

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

@@ -1,15 +1,14 @@
 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.navigation.Navigator;
 import com.vk.notifications.settings.NotificationsSettingsFragment;
 import com.vk.webapp.fragments.PrivacyFragment;
 import com.vtosters.lite.MainActivity;
@@ -25,30 +24,16 @@ 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.ui.components.DockBarEditorManager;
-import ru.vtosters.lite.ui.components.SuperAppEditorManager;
+import ru.vtosters.lite.ssfs.Utils;
+import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 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,99 +41,90 @@ 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")) {
-            default:
-            case "system":
-                str = themeTypeName[0];
-                break;
-            case "dark":
-                str = themeTypeName[1];
-                break;
-            case "light":
-                str = themeTypeName[2];
-                break;
-        }
-
-        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();
+        return AndroidUtils.getString("current_theme") + ": " + switch (AndroidUtils.getPrefsValue("currsystemtheme")) {
+            case "system" -> themeTypeName[0];
+            case "dark" -> themeTypeName[1];
+            case "light" -> themeTypeName[2];
+            default -> ThemesUtils.isDarkTheme() ? themeTypeName[1] : themeTypeName[2];
+        };
     }
 
     private void switchTheme(boolean isDarkTheme) {
-        setTheme(isDarkTheme ? getDarkTheme() : getLightTheme(), requireActivity());
+        ThemesUtils.setTheme(isDarkTheme ? ThemesUtils.getDarkTheme() : ThemesUtils.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,
+        AndroidUtils.checkLinksVerified(this.requireActivity());
+
+        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,307 +134,435 @@ 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());
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                        NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                        NavigatorUtils.switchFragment(requireContext(), 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");
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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;
-        });
+        if(AccountManagerUtils.isVKTester()) {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.bugs),
+                    "",
+                    R.drawable.ic_bug_outline_28,
+                    preference -> {
+                        VKUIwrapper.officalLinks("bugs");
+                        NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
+                        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;
-        });
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.vtlvksettings));
 
-        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;
-        });
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.sett_general),
+                "",
+                R.drawable.ic_settings_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), SettingsGeneralFragment.class);
+                    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;
-        });
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.blacklist),
+                "",
+                R.drawable.ic_users_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), BlacklistFragment.class);
+                    return false;
+                }
+        );
 
-        if (isValidSignature()) {
-            addPreferenceCategory(this, requireContext().getString(R.string.updates));
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.sett_notifications),
+                "",
+                R.drawable.ic_menu_notification_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), NotificationsSettingsFragment.class);
+                    return false;
+                }
+        );
 
-            addPreference(this, "", requireContext().getString(R.string.checkforupdates), "", R.drawable.ic_download_outline_28, preference -> {
-                OTADialog.checkUpdates(getActivity());
-                return false;
-            });
+        if(VKAccountManager.d().isMusicSubs()) {
+            PreferenceFragmentUtils.addPreference(
+                    getPreferenceScreen(),
+                    "",
+                    requireContext().getString(R.string.subscription_music),
+                    "",
+                    R.drawable.ic_music_outline_28,
+                    preference -> {
+                        NavigatorUtils.switchFragment(requireContext(), MusicSubscriptionControlFragment.class);
+                        return false;
+                    }
+            );
+        }
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.votes),
+                "",
+                R.drawable.ic_coins_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                        NavigatorUtils.switchFragment(requireContext(), FeedFragment.class);
+                        return false;
+                    }
+            );
+        }
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlmedia),
+                getValAsString(R.string.sett_compress_photos, Preferences.getBoolValue("compressPhotos", true)),
+                R.drawable.ic_media_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), MessagesFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "tgs_stickers",
+                requireContext().getString(R.string.vtltgs),
+                getTGSsumm(),
+                R.drawable.ic_telegram_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), StickersFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlthemes),
+                getValAsString(R.string.milkshake_title, ThemesUtils.isMilkshake()),
+                R.drawable.ic_write_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), ActivityFragment.class);
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                requireContext().getString(R.string.vtlproxy),
+                getProxysumm(),
+                R.drawable.ic_globe_outline_28,
+                preference -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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 -> {
+                    NavigatorUtils.switchFragment(requireContext(), 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;
+                    }
+            );
         }
     }
 
@@ -471,4 +575,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

@@ -29,6 +29,7 @@ import ru.vtosters.lite.ui.adapters.StickerPackAdapter;
 import ru.vtosters.lite.ui.components.StickerTouchHelperCallback;
 import ru.vtosters.lite.ui.fragments.BaseToolbarFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.NavigatorUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
 import java.io.File;
@@ -85,9 +86,7 @@ public class StickersFragment extends BaseToolbarFragment {
         if (toast != null) {
             Toast.makeText(requireContext(), toast, Toast.LENGTH_SHORT).show();
         }
-        var intent = new Navigator(StickersPreferencesFragment.class, new Bundle()).b(requireContext());
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        super.requireContext().startActivity(intent);
+        NavigatorUtils.switchFragment(requireContext(), StickersPreferencesFragment.class);
     }
 
     @Override
@@ -241,7 +240,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/views/rarepebble/HueSatView.java

@@ -98,15 +98,17 @@ public class HueSatView extends SquareView implements ColorObserver {
     public boolean onTouchEvent(MotionEvent event) {
         int action = event.getActionMasked();
         switch (action) {
-            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_DOWN -> {
                 boolean withinPicker = clamp(pointer, event.getX(), event.getY(), true);
                 if (withinPicker) update();
                 return withinPicker;
-            case MotionEvent.ACTION_MOVE:
+            }
+            case MotionEvent.ACTION_MOVE -> {
                 clamp(pointer, event.getX(), event.getY(), false);
                 update();
                 getParent().requestDisallowInterceptTouchEvent(true);
                 return true;
+            }
         }
         return super.onTouchEvent(event);
     }

app/src/main/java/ru/vtosters/lite/ui/views/rarepebble/SliderViewBase.java

@@ -67,14 +67,14 @@ public abstract class SliderViewBase extends View {
     public boolean onTouchEvent(MotionEvent event) {
         int action = event.getActionMasked();
         switch (action) {
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_MOVE:
+            case MotionEvent.ACTION_DOWN, MotionEvent.ACTION_MOVE -> {
                 currentPos = valueForTouchPos(event.getX(), event.getY());
                 optimisePointerColor();
                 notifyListener(currentPos);
                 invalidate();
                 getParent().requestDisallowInterceptTouchEvent(true);
                 return true;
+            }
         }
         return super.onTouchEvent(event);
     }

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

@@ -85,14 +85,11 @@ public class ImageFilters {
 
     private static int getRadius() {
         String radius = getPreferences().getString("msg_blur_radius", "disabled");
-        switch (radius) {
-            case "low":
-                return 8;
-            case "med":
-                return 14;
-            default:
-                return 20;
-        }
+        return switch (radius) {
+            case "low" -> 8;
+            case "med" -> 14;
+            default -> 20;
+        };
     }
 
     public static Drawable getBlurredWallpaper(Drawable orig, int radius) {
@@ -125,14 +122,9 @@ public class ImageFilters {
         String radius = getPreferences().getString("msg_mosaic", "disabled");
 
         switch (radius) {
-            case "high":
-                scale = 25;
-                break;
-            case "med":
-                scale = 50;
-                break;
-            case "low":
-                scale = 75;
+            case "high" -> scale = 25;
+            case "med" -> scale = 50;
+            case "low" -> scale = 75;
         }
 
         Bitmap temp = Bitmap.createScaledBitmap(instance, scale, scale, false);

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/ui/wallpapers/WallpapersHooks.java

@@ -138,42 +138,31 @@ public class WallpapersHooks {
 
     public static String getRadiusSummary() {
         String radius = getPreferences().getString("msg_blur_radius", "disabled");
-        switch (radius) {
-            case "low":
-                return AndroidUtils.getString(R.string.wallpapers_low);
-            case "med":
-                return AndroidUtils.getString(R.string.wallpapers_med);
-            case "high":
-                return AndroidUtils.getString(R.string.wallpapers_high);
-            default:
-                return AndroidUtils.getString(R.string.wallpapers_disabled);
-        }
+        return switch (radius) {
+            case "low" -> AndroidUtils.getString(R.string.wallpapers_low);
+            case "med" -> AndroidUtils.getString(R.string.wallpapers_med);
+            case "high" -> AndroidUtils.getString(R.string.wallpapers_high);
+            default -> AndroidUtils.getString(R.string.wallpapers_disabled);
+        };
     }
 
     public static String getDimmingSummary() {
         String radius = getPreferences().getString("msg_dim", "disabled");
-        switch (radius) {
-            case "dim_black":
-                return AndroidUtils.getString(R.string.wallpapers_dim_black);
-            case "dim_white":
-                return AndroidUtils.getString(R.string.wallpapers_dim_white);
-            default:
-                return AndroidUtils.getString(R.string.wallpapers_disabled);
-        }
+        return switch (radius) {
+            case "dim_black" -> AndroidUtils.getString(R.string.wallpapers_dim_black);
+            case "dim_white" -> AndroidUtils.getString(R.string.wallpapers_dim_white);
+            default -> AndroidUtils.getString(R.string.wallpapers_disabled);
+        };
     }
 
     public static String getMosaicSummary() {
         String radius = getPreferences().getString("msg_mosaic", "disabled");
-        switch (radius) {
-            case "low":
-                return AndroidUtils.getString(R.string.wallpapers_low);
-            case "med":
-                return AndroidUtils.getString(R.string.wallpapers_med);
-            case "high":
-                return AndroidUtils.getString(R.string.wallpapers_high);
-            default:
-                return AndroidUtils.getString(R.string.wallpapers_disabled);
-        }
+        return switch (radius) {
+            case "low" -> AndroidUtils.getString(R.string.wallpapers_low);
+            case "med" -> AndroidUtils.getString(R.string.wallpapers_med);
+            case "high" -> AndroidUtils.getString(R.string.wallpapers_high);
+            default -> AndroidUtils.getString(R.string.wallpapers_disabled);
+        };
     }
 
 

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

@@ -38,8 +38,9 @@ public class About {
     }
 
     public static String getBuild(Context context, String name) {
-        try {
-            Scanner scanner = new Scanner(context.getAssets().open(name));
+        try (
+            Scanner scanner = new Scanner(context.getAssets().open(name))
+        ) {
             while (scanner.hasNextLine()) {
                 String line = scanner.findInLine("VERSION_BUILD=.+");
                 if (line != null)

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

@@ -1,24 +1,33 @@
 package ru.vtosters.lite.utils;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.pm.verify.domain.DomainVerificationManager;
+import android.content.pm.verify.domain.DomainVerificationUserState;
 import android.content.res.Resources;
+import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.util.Screen;
 import com.vk.core.util.ToastUtils;
+import com.vtosters.lite.general.fragments.WebViewFragment;
+import ru.vtosters.lite.hooks.DateHook;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 
-import ru.vtosters.lite.hooks.DateHook;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 
 public class AndroidUtils {
 
@@ -51,7 +60,7 @@ public class AndroidUtils {
         } catch (Exception e) {
             Log.d("GlobalContext", "Error while fetching context via refl");
         }
-        return Objects.requireNonNull(LifecycleUtils.getCurrentActivity());
+        return LifecycleUtils.getCurrentActivity();
     } // Getting the global context through reflection to use context on application initialization
 
     public static Resources getResources() {
@@ -133,6 +142,58 @@ 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 void checkLinksVerified(Activity activity) {
+        if (Build.VERSION.SDK_INT < 31) return;
+
+        DomainVerificationManager manager = activity.getSystemService(DomainVerificationManager.class);
+        DomainVerificationUserState userState;
+
+        try {
+            userState = manager.getDomainVerificationUserState(getPackageName());
+        } catch (PackageManager.NameNotFoundException ignore) {
+            return;
+        }
+
+        boolean hasUnverified = false;
+
+        Map<String, Integer> hostToStateMap = userState.getHostToStateMap();
+
+        if (hostToStateMap.containsKey("vk.com")) {
+            Integer stateValue = hostToStateMap.get("vk.com");
+            hasUnverified = stateValue != null && stateValue != DomainVerificationUserState.DOMAIN_STATE_VERIFIED && stateValue != DomainVerificationUserState.DOMAIN_STATE_SELECTED;
+        }
+
+        if (hasUnverified) {
+            if (getBoolValue("showUnverifDialog", true)) {
+                new VkAlertDialog.Builder(activity)
+                        .setTitle(com.vtosters.lite.R.string.warning)
+                        .setMessage(AndroidUtils.getString("app_open_by_default_settings"))
+                        .setCancelable(false)
+                        .setPositiveButton(com.vtosters.lite.R.string.social_graph_skip,
+                                (dialogInterface, i) -> edit().putBoolean("showUnverifDialog", false).apply()
+                        )
+                        .setNeutralButton(com.vtosters.lite.R.string.open_settings,
+                                (dialogInterface, i) -> {
+                                    try {
+                                        Intent intent = new Intent(Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS, Uri.parse("package:" + getPackageName()));
+                                        activity.startActivity(intent);
+                                    } catch (Throwable t1) {
+                                        try {
+                                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:" + getPackageName()));
+                                            activity.startActivity(intent);
+                                        } catch (Throwable ignored) {}
+                                    }
+                        }
+                        )
+                        .show();
+            }
+        }
+    }
+
     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/ContactsUtils.java

@@ -1,107 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import static androidx.core.app.ActivityCompat.requestPermissions;
-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 static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.SyncResult;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.os.StrictMode;
-import android.util.Log;
-
-import androidx.core.content.ContextCompat;
-
-import com.vk.auth.VKAuthUtils;
-import com.vk.contacts.ContactsSyncAdapterService;
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.core.network.Network;
-import com.vtosters.lite.R;
-import com.vtosters.lite.auth.VKAccountManager;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import okhttp3.Headers;
-import okhttp3.OkHttpClient;
-
-public class ContactsUtils {
-    public static void setContactsSync(boolean enabled) {
-        makeRequest("https://" + getApi() + "/method/account.setInfo?" + "name=im_user_name_type&value=" + (enabled ? "contact" : "vk") + "&https=1&v=5.153&access_token=" + getUserToken(),
-                response -> {
-                    try {
-                        JSONObject mainJson = new JSONObject(response);
-                        Log.d("ContactsUtils", "Result: " + mainJson + ", enabled sync: " + enabled);
-                    } catch (JSONException e) {
-                        Log.d("ContactsUtils", e.getMessage());
-                        sendToast(AndroidUtils.getString(R.string.contact_sync_error));
-                    }
-                });
-    }
-
-    public static void uploadContacts(Activity ctx) {
-        try {
-            if (ContextCompat.checkSelfPermission(ctx, Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
-                sendToast(ctx.getString(R.string.contact_permission_toast));
-                requestPermissions(LifecycleUtils.getCurrentActivity(), new String[]{Manifest.permission.READ_CONTACTS}, 11111);
-                sendToast(ctx.getString(R.string.contact_permission_toast));
-                requestPermissions(ctx, new String[]{Manifest.permission.READ_CONTACTS}, 11111);
-            } else {
-                var account = VKAuthUtils.a.a(VKAccountManager.d().Z());
-                ContactsSyncAdapterService.c(ctx, account, new Bundle(), new SyncResult());
-            }
-        } catch (Exception e) {
-            Log.d("ContactsUtils", e.getMessage());
-        }
-    }
-
-    public static void getContactsStatus(Context ctx) {
-        final ProgressDialog progressDialog = new ProgressDialog(ctx);
-        progressDialog.setMessage(ctx.getString(R.string.contact_info_loading));
-        progressDialog.show();
-
-        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-        StrictMode.setThreadPolicy(policy);
-
-        var request = new okhttp3.Request.a()
-                .b("https://" + getApi() + "/method/execute?https=1&v=5.153&code=return%20API.account.getInfo().settings%5B44%5D.value%3B&access_token=" + getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
-                .a();
-
-        try {
-            var response = new OkHttpClient().a(request).execute().a().g();
-            progressDialog.cancel();
-
-            try {
-                String resp = new JSONObject(response).optString("response");
-
-                Log.d("ContactsUtils", new JSONObject(response).toString());
-
-                boolean enabledsync = resp.equals("contact");
-
-                new VkAlertDialog.Builder(ctx)
-                        .setTitle(R.string.contact_sync_title)
-                        .setMessage(ctx.getString(R.string.contact_sync_state) + ": " + ctx.getString(enabledsync ? R.string.contact_sync_enabled : R.string.contact_sync_disabled))
-                        .setCancelable(true)
-                        .setPositiveButton(!enabledsync ? R.string.enable : R.string.proxy_disable,
-                                (dialog, which) -> setContactsSync(!enabledsync)
-                        )
-//                        .setNegativeButton("Импортировать контакты",
-//                            (dialog, which) -> uploadContacts(ctx))
-                        .show();
-            } catch (JSONException e) {
-                Log.d("ContactsUtils", e.getMessage());
-            }
-        } catch (IOException e) {
-            Log.d("ContactsUtils", e.getMessage());
-        }
-    }
-}

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

@@ -97,7 +97,7 @@ public class IOUtils {
 
     public static void copyFile(InputStream is, File target) throws IOException {
         var parent = target.getParentFile();
-        if (!parent.exists())
+        if (!(parent != null ? parent.exists() : false))
             parent.getParentFile().mkdirs();
         writeToFile(target, readAllBytes(is));
     }

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/LifecycleUtils.java

@@ -8,7 +8,9 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 
+import com.vk.core.fragments.FragmentImpl;
 import com.vk.navigation.Navigator;
+import com.vtosters.lite.MainActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +55,7 @@ public class LifecycleUtils {
     }
 
     public static Activity getCurrentActivity() {
-        return activities.size() > 0 ? activities.get(activities.size() - 1) : null;
+        return activities.size() > 0 ? activities.get(activities.size() - 1) : new MainActivity();
     }
 
     public static void restartApplication() {
@@ -71,15 +73,4 @@ public class LifecycleUtils {
         Handler handler = new Handler();
         handler.postDelayed(LifecycleUtils::restartApplication, 500);
     }
-
-    public static void restartApplicationInto(Class Class) {
-        Context ctx = AndroidUtils.getGlobalContext();
-
-        Intent intent = new Navigator(Class).b(ctx);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        Intent mainIntent = Intent.makeRestartActivityTask(intent.getComponent());
-        ctx.startActivity(mainIntent);
-
-        Runtime.getRuntime().exit(0);
-    }
 }

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

@@ -0,0 +1,16 @@
+package ru.vtosters.lite.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import com.vk.core.fragments.FragmentImpl;
+import com.vk.navigation.Navigator;
+
+public class NavigatorUtils {
+
+    public static void switchFragment(Context context, Class< ? extends FragmentImpl > fragmentClz) {
+        var intent = new Navigator(fragmentClz)
+                .b(context)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+}

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

@@ -42,16 +42,9 @@ public class NetworkUtils {
 
         if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
             switch (info.getSubtype()) {
-                case TelephonyManager.NETWORK_TYPE_1xRTT:
-                case TelephonyManager.NETWORK_TYPE_EDGE:
-                case TelephonyManager.NETWORK_TYPE_CDMA:
-                case TelephonyManager.NETWORK_TYPE_EVDO_0:
-                case TelephonyManager.NETWORK_TYPE_EVDO_A:
-                case TelephonyManager.NETWORK_TYPE_GPRS:
-                case TelephonyManager.NETWORK_TYPE_HSDPA:
-                case TelephonyManager.NETWORK_TYPE_UMTS:
-                case TelephonyManager.NETWORK_TYPE_EHRPD:
+                case TelephonyManager.NETWORK_TYPE_1xRTT, TelephonyManager.NETWORK_TYPE_EDGE, TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_EVDO_0, TelephonyManager.NETWORK_TYPE_EVDO_A, TelephonyManager.NETWORK_TYPE_GPRS, TelephonyManager.NETWORK_TYPE_HSDPA, TelephonyManager.NETWORK_TYPE_UMTS, TelephonyManager.NETWORK_TYPE_EHRPD -> {
                     return true;
+                }
             }
         }