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

@@ -96,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'
 }
@@ -156,6 +156,14 @@ task buildAndLaunchVTL(type: Exec) {
         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/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

@@ -36,27 +36,19 @@ public final class StickerDetailsAdapter extends RecyclerView.Adapter<RecyclerVi
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        switch (i) {
-            case 0:
-                return new c(viewGroup);
-            case 1:
-                return new d(viewGroup);
-            case 2:
-                return new b(viewGroup);
-            default:
-                throw new IllegalArgumentException("Unknown viewType: " + i);
-        }
+        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);
-                break;
-            case 1:
-                ((d) viewHolder).a(this.mItems.get(H(i)));
-                break;
+        switch (getItemViewType(i)) {
+            case 0 -> ((c) viewHolder).a(this.mItem);
+            case 1 -> ((d) viewHolder).a(this.mItems.get(H(i)));
         }
     }
 

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/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

@@ -213,24 +213,12 @@ public class PhotoViewer {
         }
 
         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);
         }
     }
 

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");
@@ -132,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++) {
@@ -170,7 +167,7 @@ public class CatalogJsonInjector {
                     }
                 }
 
-                if (!useOldAppVer || noPlaylists) {
+                if ((!useOldAppVer || noPlaylists) && !isLoaded) {
                     var newBlocks = new JSONArray();
 
                     newBlocks
@@ -178,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++) {
@@ -227,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/ImBanner.java

@@ -5,6 +5,8 @@ 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;
 
@@ -69,13 +71,13 @@ public class ImBanner {
 
         if (!bool) {
             new VkAlertDialog.Builder(context)
-                    .setTitle("Внимание!")
-                    .setMessage("Разработчики клиента не несут никакой ответственности за пользовательские ссылки. Будьте внимательны!")
+                    .setTitle(R.string.warning)
+                    .setMessage(AndroidUtils.getString("custom_links_warning"))
                     .setCancelable(false)
-                    .setPositiveButton("Продолжить", (dialogInterface, i) -> {
+                    .setPositiveButton(R.string.continue_, (dialogInterface, i) -> {
                         Preferences.preferences.edit().putBoolean("linkalert", true).commit();
                     })
-                    .setNeutralButton("Отмена", (dialogInterface, i) -> {
+                    .setNeutralButton(R.string.cancel, (dialogInterface, i) -> {
                         dialogInterface.cancel();
                     })
                     .show();

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

@@ -29,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) {

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,13 +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 outgoinging_msg;
     private static int outgoinging_msg_highlight;
+    private static int darken_color;
 
     static {
         setExceptions();
@@ -34,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();
 
@@ -42,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);
@@ -59,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);
@@ -68,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);
@@ -82,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);
@@ -122,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);
@@ -146,14 +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) {
-            return outgoinging_msg;
-        } else if (attr == R.attr.im_bubble_outgoing_highlighted) {
-            return outgoinging_msg_highlight;
-        }
-
-        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) {
@@ -167,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() ?
@@ -187,4 +193,4 @@ public class ThemesCore {
     public static boolean isCachedAccents() {
         return cachedAccents;
     }
-}
+}

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/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

@@ -102,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")

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/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/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/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

@@ -63,17 +63,17 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                         AndroidUtils.edit().putString("appname", "vt").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "vt", deficon, defname);
+                        IconManager.switchComponent(appicon, "vt");
                     } else if (rgVK.isChecked()) {
                         AndroidUtils.edit().putString("appname", "standard").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "standard", deficon, defname);
+                        IconManager.switchComponent(appicon, "standard");
                     } else if (rgVKontakte.isChecked()) {
                         AndroidUtils.edit().putString("appname", "vkontakte").commit();
                         AndroidUtils.edit().putString("selectedicon", appicon).commit();
 
-                        IconManager.switchComponent(appicon, "vkontakte", deficon, defname);
+                        IconManager.switchComponent(appicon, "vkontakte");
                     }
                 }))
                 .setNegativeButton(R.string.cancel,

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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.ui.fragments;
 
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Build;
@@ -13,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 {
 
@@ -37,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();
@@ -64,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;
         });
 
@@ -96,9 +106,28 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
         findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme() && ThemesUtils.isMilkshake());
 
+        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);
         }
     }
 
@@ -112,13 +141,9 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         new VkAlertDialog.Builder(requireContext())
                 .setTitle(AndroidUtils.getString("change_accent_color"))
                 .setItems(titles, (dialog, which) -> {
-                    switch(which) {
-                        case 0:
-                            showColorPicker();
-                            break;
-                        case 1:
-                            showPalettesDialog();
-                            break;
+                    switch (which) {
+                        case 0 -> showColorPicker();
+                        case 1 -> showPalettesDialog();
                     }
                 })
                 .setNegativeButton(R.string.reset, (dialog, which) -> {
@@ -176,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,9 +13,6 @@ public class VKPayFragment extends FragmentImpl {
 
     public void start() {
         VKUIwrapper.setLink("https://vk.com/vkpay");
-        Intent intent = new Navigator(VKUIwrapper.class)
-                .b(getActivity())
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
+        NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
     }
 }

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

@@ -9,8 +9,6 @@ import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.about.AboutAppFragment;
 import com.vk.balance.BalanceFragment;
-import com.vk.core.fragments.FragmentImpl;
-import com.vk.navigation.Navigator;
 import com.vk.notifications.settings.NotificationsSettingsFragment;
 import com.vk.webapp.fragments.PrivacyFragment;
 import com.vtosters.lite.MainActivity;
@@ -28,8 +26,6 @@ import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook;
 import ru.vtosters.lite.ssfs.Utils;
 import ru.vtosters.lite.ui.PreferenceFragmentUtils;
-import ru.vtosters.lite.ui.components.DockBarEditorManager;
-import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
 import ru.vtosters.lite.utils.*;
@@ -37,8 +33,6 @@ import ru.vtosters.lite.utils.*;
 public class VTSettings extends MaterialPreferenceToolbarFragment implements TelegramStickersService.StickersEventsListener {
 
     public static String getValAsString(@StringRes int strRes, Boolean value) {
-        if(Preferences.disableSettingsSumms()) return null;
-
         if(value) {
             return AndroidUtils.getString(strRes) + ": " + AndroidUtils.getString(R.string.vtlsettenabled);
         }
@@ -47,31 +41,19 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
     }
 
     public static String getSSFSsumm() {
-        if(Preferences.disableSettingsSumms()) return null;
-
         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(Preferences.disableSettingsSumms()) return null;
-
-        return AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size();
-    }
-
     public static String getTGSsumm() {
-        if(Preferences.disableSettingsSumms()) return null;
-
         return AndroidUtils.getString(R.string.vtltgssumm) + ": " + TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()).getActivePacksListReference().size();
     }
 
     public static String getProxysumm() {
         var type = AndroidUtils.getPrefsValue("proxy");
 
-        if(Preferences.disableSettingsSumms()) return null;
-
         if(type.equals("noproxy") || type.isEmpty())
             type = AndroidUtils.getString(R.string.vtlsettdisabled);
 
@@ -79,31 +61,14 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
     }
 
     public static String getThemesumm() {
-        if(Preferences.disableSettingsSumms()) return null;
-
-        String str;
         String[] themeTypeName = AndroidUtils.getArray("theme_type_name");
 
-        switch(AndroidUtils.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(Preferences.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) {
@@ -148,6 +113,8 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
 
         this.addPreferencesFromResource(R.xml.empty);
 
+        AndroidUtils.checkLinksVerified(this.requireActivity());
+
         var accountSwitcher = PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "account_switcher",
@@ -185,7 +152,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 R.drawable.ic_link_circle_outline_28,
                 preference -> {
                     VKUIwrapper.setLink(Utils.getVKUILink());
-                    launchFragment(VKUIwrapper.class);
+                    NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
                     return false;
                 }
         );
@@ -239,7 +206,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                     "",
                     R.drawable.ic_about_outline_28,
                     preference -> {
-                        launchFragment(InstallGMSFragment.class);
+                        NavigatorUtils.switchFragment(requireContext(), InstallGMSFragment.class);
                         return false;
                     }
             );
@@ -255,7 +222,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                     "",
                     R.drawable.ic_bug_outline_28,
                     preference -> {
-                        launchFragment(SettingsDebugFragment.class);
+                        NavigatorUtils.switchFragment(requireContext(), SettingsDebugFragment.class);
                         return false;
                     }
             );
@@ -279,7 +246,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                         "autoupdates",
                         requireContext().getString(R.string.checkupdates),
                         "",
-                        R.drawable.ic_camera_switch_outline_24,
+                        R.drawable.ic_bug_outline_28,
                         true,
                         (preference, o) -> {
                             boolean value = (boolean) o;
@@ -300,7 +267,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 R.drawable.ic_user_circle_outline_28,
                 preference -> {
                     VKUIwrapper.officalLinks("account");
-                    launchFragment(VKUIwrapper.class);
+                    NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
                     return false;
                 }
         );
@@ -312,7 +279,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_privacy_outline_28,
                 preference -> {
-                    launchFragment(PrivacyFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), PrivacyFragment.class);
                     return false;
                 }
         );
@@ -324,7 +291,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_user_outline_28,
                 preference -> {
-                    launchFragment(SettingsAccountFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), SettingsAccountFragment.class);
                     return false;
                 }
         );
@@ -338,7 +305,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                     R.drawable.ic_bug_outline_28,
                     preference -> {
                         VKUIwrapper.officalLinks("bugs");
-                        launchFragment(VKUIwrapper.class);
+                        NavigatorUtils.switchFragment(requireContext(), VKUIwrapper.class);
                         return false;
                     }
             );
@@ -353,7 +320,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_settings_outline_28,
                 preference -> {
-                    launchFragment(SettingsGeneralFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), SettingsGeneralFragment.class);
                     return false;
                 }
         );
@@ -365,7 +332,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_users_outline_28,
                 preference -> {
-                    launchFragment(BlacklistFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), BlacklistFragment.class);
                     return false;
                 }
         );
@@ -377,7 +344,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_menu_notification_outline_28,
                 preference -> {
-                    launchFragment(NotificationsSettingsFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), NotificationsSettingsFragment.class);
                     return false;
                 }
         );
@@ -390,7 +357,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                     "",
                     R.drawable.ic_music_outline_28,
                     preference -> {
-                        launchFragment(MusicSubscriptionControlFragment.class);
+                        NavigatorUtils.switchFragment(requireContext(), MusicSubscriptionControlFragment.class);
                         return false;
                     }
             );
@@ -403,7 +370,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "",
                 R.drawable.ic_coins_outline_28,
                 preference -> {
-                    launchFragment(BalanceFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), BalanceFragment.class);
                     return false;
                 }
         );
@@ -427,7 +394,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                     getValAsString(R.string.vtlfeedsumm, Preferences.ads()),
                     R.drawable.ic_newsfeed_outline_28,
                     preference -> {
-                        launchFragment(FeedFragment.class);
+                        NavigatorUtils.switchFragment(requireContext(), FeedFragment.class);
                         return false;
                     }
             );
@@ -437,10 +404,10 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getPreferenceScreen(),
                 "",
                 requireContext().getString(R.string.vtlmedia),
-                getValAsString(R.string.vtlinterfacesumm, Preferences.shortinfo()),
+                getValAsString(R.string.sett_compress_photos, Preferences.getBoolValue("compressPhotos", true)),
                 R.drawable.ic_media_outline_28,
                 preference -> {
-                    launchFragment(MediaFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), MediaFragment.class);
                     return false;
                 }
         );
@@ -454,7 +421,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                         : getValAsString(R.string.vtlmsgsumm, Preferences.vkme()),
                 R.drawable.ic_message_outline_28,
                 preference -> {
-                    launchFragment(MessagesFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), MessagesFragment.class);
                     return false;
                 }
         );
@@ -466,7 +433,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getTGSsumm(),
                 R.drawable.ic_telegram_outline_28,
                 preference -> {
-                    launchFragment(StickersFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), StickersFragment.class);
                     return false;
                 }
         );
@@ -475,10 +442,10 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getPreferenceScreen(),
                 "",
                 requireContext().getString(R.string.vtlthemes),
-                getThemesumm(),
+                getValAsString(R.string.milkshake_title, ThemesUtils.isMilkshake()),
                 R.drawable.ic_write_outline_28,
                 preference -> {
-                    launchFragment(ThemesFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), ThemesFragment.class);
                     return false;
                 }
         );
@@ -490,41 +457,11 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getValAsString(R.string.showstories, Preferences.stories()),
                 R.drawable.ic_interface_outline_28,
                 preference -> {
-                    launchFragment(InterfaceFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), InterfaceFragment.class);
                     return false;
                 }
         );
 
-        if(!Preferences.vkme()) {
-            if(!AndroidUtils.isTablet()) {
-                PreferenceFragmentUtils.addPreference(
-                        getPreferenceScreen(),
-                        "",
-                        requireContext().getString(R.string.dockbar_editor),
-                        getDocksumm(),
-                        R.drawable.ic_list_outline_28,
-                        preference -> {
-                            launchFragment(DockBarEditorFragment.class);
-                            return false;
-                        }
-                );
-
-                if(Preferences.milkshake() && Preferences.superapp()) {
-                    PreferenceFragmentUtils.addPreference(
-                            getPreferenceScreen(),
-                            "",
-                            requireContext().getString(R.string.superapp_editor),
-                            getSuperappsumm(),
-                            R.drawable.ic_services_outline_28,
-                            (preference) -> {
-                                launchFragment(SuperAppEditorFragment.class);
-                                return true;
-                            }
-                    );
-                }
-            }
-        }
-
         PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "",
@@ -532,7 +469,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getValAsString(R.string.vtlactivitysumm, Preferences.offline()),
                 R.drawable.ic_write_outline_28_new_accent,
                 preference -> {
-                    launchFragment(ActivityFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), ActivityFragment.class);
                     return false;
                 }
         );
@@ -544,7 +481,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getProxysumm(),
                 R.drawable.ic_globe_outline_28,
                 preference -> {
-                    launchFragment(ProxySettingsFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), ProxySettingsFragment.class);
                     return false;
                 }
         );
@@ -556,7 +493,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 getValAsString(R.string.vtlothersumm, VTVerifications.vtverif()),
                 R.drawable.ic_more_horizontal_28,
                 preference -> {
-                    launchFragment(OtherFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), OtherFragment.class);
                     return false;
                 }
         );
@@ -570,7 +507,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 "Commit: " + About.getBuildNumber(),
                 R.drawable.ic_about_outline_28,
                 preference -> {
-                    launchFragment(AboutAppFragment.class);
+                    NavigatorUtils.switchFragment(requireContext(), AboutAppFragment.class);
                     return false;
                 }
         );
@@ -629,13 +566,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
         }
     }
 
-    private void launchFragment(Class< ? extends FragmentImpl > fragmentClz) {
-        Intent intent = new Navigator(fragmentClz)
-                .b(requireContext())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        requireContext().startActivity(intent);
-    }
-
     @Override
     public void onResume() {
         super.onResume();

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

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/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/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/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;
+                }
             }
         }
 

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

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

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

@@ -18,6 +18,7 @@ import android.os.Build;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 
+import android.util.Log;
 import com.vtosters.lite.data.Users;
 import com.vtosters.lite.fragments.SettingsListFragment;
 
@@ -35,6 +36,7 @@ public class Preferences {
 
         GmsUtils.fixGapps();
         setProxy();
+        setupFilters();
         VTVerifications.load(application);
         LifecycleUtils.registerActivities(application);
     } // VK Init
@@ -58,10 +60,6 @@ public class Preferences {
         return getGlobalContext().getSharedPreferences(filename, Context.MODE_PRIVATE);
     }
 
-    public static boolean opusmodule() {
-        return getBoolValue("opusmodule", true);
-    }
-
     public static boolean systemtheme() {
         return Build.VERSION.SDK_INT >= 28 && milkshake() && (getPreferences().getString("currsystemtheme", "system").equals("system") || getPreferences().getString("currsystemtheme", "system").isEmpty());
     }
@@ -78,10 +76,6 @@ public class Preferences {
         return getBoolValue("copyright_post", false);
     }
 
-    public static boolean default_ad_list() {
-        return getBoolValue("default_ad_list", false);
-    }
-
     public static boolean shitposting() {
         return getBoolValue("shitposting", false);
     }
@@ -144,7 +138,8 @@ public class Preferences {
     }
 
     public static boolean calls() {
-        return getBoolValue("calls", false);
+//        return getBoolValue("calls", false);
+        return true;
     }
 
     public static boolean dev() {
@@ -284,21 +279,12 @@ public class Preferences {
         return getBoolValue("voice", true);
     }
 
-    public static int getMsgCount(int orig) {
-        String customvalue = getPrefsValue("msgcount");
-        return customvalue.isEmpty() ? orig : Integer.parseInt(customvalue);
-    }
-
     public static boolean vkme_notifs() {
         return getBoolValue("vkme_notifs", false);
     }
 
-    public static boolean podcastcatalog() {
-        return getBoolValue("podcastcatalog", false);
-    }
-
     public static boolean screenshotdetect() {
-        return getBoolValue("screenshotdetect", false);
+        return getBoolValue("screenshotdetect", true);
     }
 
     public static boolean checkupdates() {
@@ -314,10 +300,6 @@ public class Preferences {
         return false;
     }
 
-    public static boolean disableSettingsSumms() {
-        return getBoolValue("disableSettingsSumms", false);
-    }
-
     public static boolean hasVerification() {
         return isVerified(AccountManagerUtils.getUserId());
     }
@@ -331,20 +313,14 @@ public class Preferences {
     }
 
     public static long getSizeForDelete() {
-        switch (getPrefsValue("clearcache")) {
-            case "100mb":
-                return 104857600L;
-            case "500mb":
-                return 524288000L;
-            case "1gb":
-                return 1073741824L;
-            case "2gb":
-                return 2147483648L;
-            case "5gb":
-                return 5368709120L;
-            default:
-                return MAX_VALUE;
-        }
+        return switch (getPrefsValue("clearcache")) {
+            case "100mb" -> 104857600L;
+            case "500mb" -> 524288000L;
+            case "1gb" -> 1073741824L;
+            case "2gb" -> 2147483648L;
+            case "5gb" -> 5368709120L;
+            default -> MAX_VALUE;
+        };
     }
 
     public static int compress(int origquality) {

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

@@ -8,7 +8,7 @@ import java.lang.reflect.Modifier;
 public class ReflectionUtils {
 
     /**
-     * Gets a class with specific name.
+     * Gets a class with a specific name.
      * Supports smali type (Lpackage/Class;)
      */
     public static Class<?> getClass(String name)

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

@@ -6,6 +6,7 @@ import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.Log;
@@ -38,15 +39,10 @@ import static ru.vtosters.lite.utils.Preferences.*;
 
 public class ThemesUtils {
     public static void applyTheme(VKTheme theme) {
-        var currentActivity = LifecycleUtils.getCurrentActivity();
-        if (currentActivity != null) {
-            try {
-                VKThemeHelper.theme(theme, currentActivity, getCenterScreenCoords());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else {
-            Log.d("ThemesUtils", "Null activity lol");
+        try {
+            VKThemeHelper.theme(theme, LifecycleUtils.getCurrentActivity(), getCenterScreenCoords());
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
@@ -65,8 +61,6 @@ public class ThemesUtils {
     public static void setTheme(VKTheme theme, Activity activity) {
         if (activity == null) {
             activity = LifecycleUtils.getCurrentActivity();
-
-            if (activity == null) return;
         }
         VKThemeHelper.theme(theme, activity, getCenterScreenCoords());
         ThemeTracker.a();
@@ -78,8 +72,6 @@ public class ThemesUtils {
     public static void setThemeFL(VKTheme theme, Activity activity, float[] fl) {
         if (activity == null) {
             activity = LifecycleUtils.getCurrentActivity();
-
-            if (activity == null) return;
         }
         VKThemeHelper.theme(theme, activity, fl);
         ThemeTracker.a();
@@ -115,7 +107,7 @@ public class ThemesUtils {
             view.setHighlightColor(ThemesUtils.getMutedAccentColor());
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                view.getTextCursorDrawable().setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN);
+                view.getTextCursorDrawable().setColorFilter(new PorterDuffColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN));
             } else if (!OEMDetector.isMIUI()) {
                 Field field = TextView.class.getDeclaredField("mCursorDrawableRes");
                 field.setAccessible(true);
@@ -139,16 +131,18 @@ public class ThemesUtils {
                     field.set(editor, drawables);
                 }
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            Log.e("ThemesUtils", "setCursorColor: ", e);
         }
     }
     @SuppressLint("DiscouragedPrivateApi")
     public static void colorHandles(TextView view) {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                view.getTextSelectHandle().setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN);
-                view.getTextSelectHandleRight().setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN);
-                view.getTextSelectHandleLeft().setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN);
+                PorterDuffColorFilter filter = new PorterDuffColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_IN);
+                view.getTextSelectHandle().setColorFilter(filter);
+                view.getTextSelectHandleRight().setColorFilter(filter);
+                view.getTextSelectHandleLeft().setColorFilter(filter);
             } else if (!OEMDetector.isMIUI()) {
                 Field editorField = TextView.class.getDeclaredField("mEditor");
 
@@ -189,12 +183,13 @@ public class ThemesUtils {
                     }
                 }
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            Log.e("ThemesUtils", "colorHandles: ", e);
         }
     }
 
     public static int getMutedColor(int color) {
-        return ColorUtils.blendARGB(color, (isDarkTheme() ? Color.BLACK : Color.WHITE), (isMilkshake() ? 0.5f : isDarkTheme() ? 0.32f : 0.2f));
+        return ColorUtils.blendARGB(color, (isDarkTheme() ? Color.BLACK : Color.WHITE), (isMilkshake() ? 0.5f : isDarkTheme() ? 0.32f : 0.1f));
     }
 
     public static void setCustomAccentColor(int newColor, boolean async) {

scripts/rclass_regenerator.sh

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

smali/AndroidManifest.xml

@@ -157,6 +157,9 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyBlTHhNGPj7ktPWrUo_d4YJs_Sn_zsISZg" />
+        <meta-data
+            android:name="com.samsung.android.icon_container.has_icon_container"
+            android:value="@bool/com_samsung_android_icon_container_has_icon_container"/>
         <meta-data
             android:name="com.google.android.geo.API_SECRET"
             android:value="yu6ZAA0OWO3kmr4es7fGtSmiyfk=" />
@@ -1620,9 +1623,6 @@
         <meta-data
             android:name="optimization_key"
             android:value="lONMnJymOutPww6aDtTpqGS77DtnW6hlwIrhgDPTGGyu+UvR7aR+nf8V4tSiVPyOZXgsTxne0umX209UUetCDGLXYcoMZLz/mNX4osYj/ACdI+6N7zFlO9+4L4vWJhlL59TKmQ3LDPyrd+InYdPl/WYwPBCBeeSMOPXVpUWEQsMH301NstEjSBZv+O0QzeuQS9/Jy94iop4kyFEtDkslfk6DyFEqeBLMA+D34UUhhsjwrwLC9FDtKJFTgSvfWbL0yT8GyNrUlsBlyRFsMUs6VvrMVJ9pft1rFEnn78jsaD8HrAWaIeq+DBjZ1KRokb2OI7U/XP14lbYMpLo4LgvfeQ==" />
-        <meta-data
-            android:name="com.samsung.android.icon_container.has_icon_container"
-            android:value="true" />
         <meta-data
             android:name="asset_statements"
             android:resource="@string/asset_statements" />

smali/res/layout/tgs_entry.xml

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

smali/res/mipmap-anydpi-v26/ic_launcher_old.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/adaptive_launcher_background_old" />
     <foreground android:drawable="@mipmap/adaptive_launcher_foreground_old" />
+    <monochrome android:drawable="@mipmap/adaptive_launcher_foreground_old" />
 </adaptive-icon>

smali/res/mipmap-anydpi-v26/mp_launcher_old.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/adaptive_launcher_background_old" />
     <foreground android:drawable="@mipmap/adaptive_launcher_foreground_old" />
+    <monochrome android:drawable="@mipmap/adaptive_launcher_foreground_old" />
 </adaptive-icon>

smali/res/values-be/arrays.xml

@@ -0,0 +1,705 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="ad_report_reasons">
+    <item>Спам</item>
+    <item>Абраза</item>
+    <item>Матэрыял для дарослых</item>
+    <item>Махлярства</item>
+    <item>Іншае</item>
+  </string-array>
+  <string-array name="address_will_be_opened">
+    <item>Адкрыецца ў панядзелак</item>
+    <item>Адкрыецца ў аўторак</item>
+    <item>Адкрыецца ў сераду</item>
+    <item>Адкрыецца ў чацвер</item>
+    <item>Адкрыецца ў пятніцу</item>
+    <item>Адкрыецца ў суботу</item>
+    <item>Адкрыецца ў нядзелю</item>
+  </string-array>
+  <string-array name="album_displayable_privacy_options">
+    <item>Усе карыстальнікі</item>
+    <item>Толькі сябры</item>
+    <item>Сябры сяброў</item>
+    <item>Толькі я</item>
+  </string-array>
+  <string-array name="album_privacy_options">
+    <item>Усе карыстальнікі</item>
+    <item>Толькі сябры</item>
+    <item>Сябры сяброў</item>
+    <item>Толькі я</item>
+    <item>Пашыраныя налады</item>
+  </string-array>
+  <string-array name="app_report_types">
+    <item>Дадатак не працуе</item>
+    <item>Шкодны дадатак</item>
+    <item>Дакучлівая рэклама</item>
+    <item>Падман ці ўвод у зман</item>
+  </string-array>
+  <string-array name="community_types">
+    <item>Мерапрыемствы</item>
+    <item>Групы</item>
+    <item>Старонкі</item>
+  </string-array>
+  <string-array name="date_ago_hrs">
+    <item>гадзіну таму</item>
+    <item>дзве гадзіны таму</item>
+    <item>тры гадзіны таму</item>
+  </string-array>
+  <string-array name="dnd_options">
+    <item>1 гадзіна</item>
+    <item>24 гадзіны</item>
+    <item>7 дзён</item>
+    <item>Назаўжды</item>
+  </string-array>
+  <string-array name="edit_bdate_visibility">
+    <item>Паказваць у профілі</item>
+    <item>Паказваць толькі дзень і месяц</item>
+    <item>Не паказваць у профілі</item>
+  </string-array>
+  <string-array name="fave_tabs">
+    <item>Людзі</item>
+    <item>Запісы</item>
+    <item>Спасылкі</item>
+    <item>Артыкулы</item>
+    <item>Падкасты</item>
+    <item>Фатаграфіі</item>
+    <item>Відэа</item>
+    <item>@string/goods</item>
+  </string-array>
+  <string-array name="group_audios_options_descriptions">
+    <item>
+    </item>
+    <item>Пры адкрытым доступе дадаваць новыя аўдыёзапісы могуць усе ўдзельнікі суполкі.</item>
+    <item>Пры абмежаваным доступе дадаваць новыя аўдыёзапісы могуць толькі рэдактары і адміністратары суполкі.</item>
+  </string-array>
+  <string-array name="group_ban_duration_options">
+    <item>Назаўжды</item>
+    <item>На год</item>
+    <item>На месяц</item>
+    <item>На тыдзень</item>
+    <item>На дзень</item>
+    <item>На гадзіну</item>
+  </string-array>
+  <string-array name="group_ban_reasons">
+    <item>Іншае</item>
+    <item>Спам</item>
+    <item>Абраза ўдзельнікаў</item>
+    <item>Нецэнзурныя выразы</item>
+    <item>Паведамленні не па тэме</item>
+  </string-array>
+  <string-array name="group_board_options_descriptions">
+    <item>
+    </item>
+    <item>Пры адкрытым доступе ствараць новыя тэмы могуць усе ўдзельнікі суполкі.</item>
+    <item>Пры абмежаваным доступе ствараць новыя тэмы могуць толькі рэдактары і адміністратары суполкі.</item>
+  </string-array>
+  <string-array name="group_docs_options_descriptions">
+    <item>
+    </item>
+    <item>Пры адкрытым доступе дадаваць новыя дакументы могуць усе ўдзельнікі суполкі.</item>
+    <item>Пры абмежаваным доступе дадаваць новыя дакументы могуць толькі рэдактары і адміністратары суполкі.</item>
+  </string-array>
+  <string-array name="group_photos_options_descriptions">
+    <item>
+    </item>
+    <item>Пры адкрытым доступе ствараць новыя альбомы могуць усе ўдзельнікі суполкі.</item>
+    <item>Пры абмежаваным доступе ствараць новыя альбомы могуць толькі рэдактары і адміністратары суполкі.</item>
+  </string-array>
+  <string-array name="group_service_options">
+    <item>Выключаны</item>
+    <item>Адкрытыя</item>
+    <item>Абмежаваныя</item>
+  </string-array>
+  <string-array name="group_videos_options_descriptions">
+    <item>
+    </item>
+    <item>Пры адкрытым доступе дадаваць новыя відэазапісы могуць усе ўдзельнікі суполкі.</item>
+    <item>Пры абмежаваным доступе дадаваць новыя відэазапісы могуць толькі рэдактары і адміністратары суполкі.</item>
+  </string-array>
+  <string-array name="group_wall_options">
+    <item>Выключана</item>
+    <item>Адкрытая</item>
+    <item>Абмежаваная</item>
+    <item>Закрытая</item>
+  </string-array>
+  <string-array name="group_wall_options_descriptions">
+    <item>
+    </item>
+    <item>На адкрытай сцяне могуць пісаць паведамленні і пакідаць каментары ўсе ўдзельнікі суполкі.</item>
+    <item>На абмежаванай сцяне можна пісаць толькі ад імя гурта, каментаваць запісы могуць усе ўдзельнікі.</item>
+    <item>На зачыненай сцяне можна пісаць толькі ад імя гурта, каментары адключаныя.</item>
+  </string-array>
+  <string-array name="group_wiki_options_descriptions">
+    <item>
+    </item>
+    <item>
+    </item>
+    <item>
+    </item>
+  </string-array>
+  <string-array name="last_seen_female_hours_ago">
+    <item>была ў сетцы гадзіну таму</item>
+    <item>была ў сетцы дзве гадзіны таму</item>
+    <item>была ў сетцы тры гадзіны таму</item>
+  </string-array>
+  <string-array name="last_seen_male_hours_ago">
+    <item>быў у сетцы гадзіну таму</item>
+    <item>быў у сетцы дзве гадзіны таму</item>
+    <item>быў у сетцы тры гадзіны таму</item>
+  </string-array>
+  <string-array name="like_menu">
+    <item>Не падабаецца</item>
+    <item>Распавесці сябрам</item>
+  </string-array>
+  <string-array name="months_full">
+    <item>студзеня</item>
+    <item>лютага</item>
+    <item>сакавіка</item>
+    <item>красавіка</item>
+    <item>траўня</item>
+    <item>чэрвеня</item>
+    <item>ліпеня</item>
+    <item>жніўня</item>
+    <item>верасня</item>
+    <item>кастрычніка</item>
+    <item>лістапада</item>
+    <item>снежня</item>
+  </string-array>
+  <string-array name="months_full_dep">
+    <item>студзеня</item>
+    <item>лютага</item>
+    <item>сакавіка</item>
+    <item>красавіка</item>
+    <item>траўня</item>
+    <item>чэрвеня</item>
+    <item>ліпеня</item>
+    <item>жніўня</item>
+    <item>верасня</item>
+    <item>кастрычніка</item>
+    <item>лістапада</item>
+    <item>снежня</item>
+  </string-array>
+  <string-array name="months_short">
+    <item>сту</item>
+    <item>лют</item>
+    <item>сак</item>
+    <item>кра</item>
+    <item>тра</item>
+    <item>чэр</item>
+    <item>ліп</item>
+    <item>жнi</item>
+    <item>вер</item>
+    <item>кас</item>
+    <item>лiс</item>
+    <item>сне</item>
+  </string-array>
+  <string-array name="newsfeed_settings_feed_type">
+    <item>Па часе публікацыі</item>
+    <item>Спачатку цікавыя</item>
+  </string-array>
+  <string-array name="ntf_accepted_f">
+    <item>прыняла Вашу заяўку ў сябры</item>
+  </string-array>
+  <string-array name="ntf_accepted_m">
+    <item>прыняў Вашу заяўку ў сябры</item>
+  </string-array>
+  <string-array name="ntf_accepted_x">
+    <item>прынялі Вашу заяўку ў сябры</item>
+  </string-array>
+  <string-array name="ntf_follow_f">
+    <item>падпісалася на Вашы абнаўленні</item>
+  </string-array>
+  <string-array name="ntf_follow_m">
+    <item>падпісаўся на Вашы абнаўленні</item>
+  </string-array>
+  <string-array name="ntf_follow_x">
+    <item>падпісаліся на Вашы абнаўленні</item>
+  </string-array>
+  <string-array name="ntf_like_f">
+    <item>ацаніла запіс</item>
+    <item>ацаніла фатаграфію</item>
+    <item>ацаніла відэазапіс</item>
+    <item>ацаніла каментар</item>
+  </string-array>
+  <string-array name="ntf_like_m">
+    <item>ацаніў запіс</item>
+    <item>ацаніў фатаграфію</item>
+    <item>ацаніў відэазапіс</item>
+    <item>ацаніў каментар</item>
+  </string-array>
+  <string-array name="ntf_like_x">
+    <item>ацанілі запіс</item>
+    <item>ацанілі фатаграфію</item>
+    <item>ацанілі відэазапіс</item>
+    <item>ацанілі каментар</item>
+  </string-array>
+  <string-array name="ntf_rt_f">
+    <item>падзялілася запісам</item>
+    <item>падзялілася фатаграфіяй</item>
+    <item>падзялілася відэазапісам</item>
+    <item>падзялілася каментаром</item>
+  </string-array>
+  <string-array name="ntf_rt_m">
+    <item>падзяліўся запісам</item>
+    <item>падзяліўся фатаграфіяй</item>
+    <item>падзяліўся відэазапісам</item>
+    <item>падзяліўся каментаром</item>
+  </string-array>
+  <string-array name="ntf_rt_x">
+    <item>падзяліліся запісам</item>
+    <item>падзяліліся фатаграфіяй</item>
+    <item>падзяліліся відэазапісам</item>
+    <item>падзяліліся каментаром</item>
+  </string-array>
+  <string-array name="personal_life_options">
+    <item>Сям\'я і дзеці</item>
+    <item>Кар\'ера і грошы</item>
+    <item>Забавы і адпачынак</item>
+    <item>Навука і даследаванні</item>
+    <item>Удасканаленне свету</item>
+    <item>Самаразвіццё</item>
+    <item>Прыгажосць і мастацтва</item>
+    <item>Слава і ўплыў</item>
+  </string-array>
+  <string-array name="personal_people_options">
+    <item>Розум і крэатыўнасць</item>
+    <item>Дабрыня і сумленнасць</item>
+    <item>Прыгажосць і здароўе</item>
+    <item>Улада і багацце</item>
+    <item>Смеласць і зацятасць</item>
+    <item>Гумар і жыццялюбства</item>
+  </string-array>
+  <string-array name="personal_politics_options">
+    <item>Камуністычныя</item>
+    <item>Сацыялістычныя</item>
+    <item>Умераныя</item>
+    <item>Ліберальныя</item>
+    <item>Кансерватыўныя</item>
+    <item>Манархічныя</item>
+    <item>Ультракансерватыўныя</item>
+    <item>Індыферэнтныя</item>
+    <item>Лібертарыянскія</item>
+  </string-array>
+  <string-array name="personal_views_options">
+    <item>Рэзка негатыўнае</item>
+    <item>Негатыўнае</item>
+    <item>Кампраміснае</item>
+    <item>Нейтральнае</item>
+    <item>Дадатнае</item>
+  </string-array>
+  <string-array name="photo_tagged_goods_menu">
+    <item>Адкрыць тавар</item>
+    <item>Выдаліць тавар</item>
+  </string-array>
+  <string-array name="poll_months_short">
+    <item>Сту</item>
+    <item>Лют</item>
+    <item>Сак</item>
+    <item>Кра</item>
+    <item>Мая</item>
+    <item>Чэр</item>
+    <item>Ліп</item>
+    <item>Аўг</item>
+    <item>Вер</item>
+    <item>Кас</item>
+    <item>Ліс</item>
+    <item>Сне</item>
+  </string-array>
+  <string-array name="post_options">
+    <item>Толькі для сяброў</item>
+    <item>Экспарт у Twitter</item>
+    <item>Экспарт у Facebook</item>
+  </string-array>
+  <string-array name="public_types">
+    <item>Месца ці невялікая кампанія</item>
+    <item>Кампанія, арганізацыя ці вэб-сайт</item>
+    <item>Вядомая асоба ці калектыў</item>
+    <item>Твор ці прадукцыя</item>
+    <item>Тып старонкі…</item>
+  </string-array>
+  <string-array name="replies_options">
+    <item>Мне падабаецца</item>
+    <item>Адказаць</item>
+  </string-array>
+  <string-array name="report_types">
+    <item>Спам</item>
+    <item>Абраза</item>
+    <item>Матэрыял для дарослых</item>
+    <item>Прапаганда наркотыкаў</item>
+    <item>Дзіцячая парнаграфія</item>
+    <item>Экстрэмізм/Гвалт</item>
+    <item>Заклік да суіцыду</item>
+  </string-array>
+  <string-array name="sett_dnd_options">
+    <item>1 гадзіна</item>
+    <item>8 гадзін</item>
+    <item>24 гадзіны</item>
+  </string-array>
+  <string-array name="sett_font_size_options">
+    <item>Самы дробны</item>
+    <item>Яшчэ менш</item>
+    <item>Менш</item>
+    <item>Звычайны</item>
+    <item>Больш</item>
+    <item>Яшчэ болей</item>
+    <item>Самы вялікі</item>
+  </string-array>
+  <string-array name="sett_friends_order">
+    <item>Па імені</item>
+    <item>Па прозвішчы</item>
+    <item>Па важнасці</item>
+  </string-array>
+  <string-array name="sett_gif_autoplay_entries">
+    <item>Заўсёды</item>
+    <item>Толькі праз Wi-Fi</item>
+    <item>Ніколі</item>
+  </string-array>
+  <string-array name="sett_img_cache_location">
+    <item>Памяць прылады</item>
+    <item>SD-карта</item>
+  </string-array>
+  <string-array name="sett_notifications_no_text_options">
+    <item>Імя і тэкст</item>
+    <item>Толькі імя</item>
+  </string-array>
+  <string-array name="sett_notifications_no_text_options_group">
+    <item>Назва суполкі і тэкст</item>
+    <item>Толькі назва суполкі</item>
+  </string-array>
+  <string-array name="sett_update_interval_items">
+    <item>30 секунд</item>
+    <item>45 секунд</item>
+    <item>1 хвіліна</item>
+    <item>2 хвіліны</item>
+    <item>3 хвіліны</item>
+    <item>5 хвілін</item>
+    <item>10 хвілін</item>
+    <item>15 хвілін</item>
+    <item>30 хвілін</item>
+    <item>1 гадзіна</item>
+    <item>2 гадзіны</item>
+    <item>Адключыць</item>
+  </string-array>
+  <string-array name="short_time">
+    <item> с</item>
+    <item>хві
+</item>
+    <item> г</item>
+    <item> д</item>
+    <item> нядз</item>
+    <item> мес</item>
+    <item> г</item>
+  </string-array>
+  <string-array name="story_months_short">
+    <item>Сту</item>
+    <item>Лют</item>
+    <item>Сак</item>
+    <item>Кра</item>
+    <item>Май</item>
+    <item>Чэр</item>
+    <item>Ліп</item>
+    <item>Жні</item>
+    <item>Вер</item>
+    <item>Кас</item>
+    <item>Ліс</item>
+    <item>Сне</item>
+  </string-array>
+  <string-array name="story_time_hours">
+    <item>нуль</item>
+    <item>гадзіна</item>
+    <item>два</item>
+    <item>тры</item>
+    <item>чатыры</item>
+    <item>пяць</item>
+    <item>шэсць</item>
+    <item>сем</item>
+    <item>восем</item>
+    <item>дзевяць</item>
+    <item>дзесяць</item>
+    <item>адзінаццаць</item>
+    <item>дванаццаць</item>
+    <item>трынаццаць</item>
+    <item>чатырнаццаць</item>
+    <item>пятнаццаць</item>
+    <item>шаснаццаць</item>
+    <item>сямнаццаць</item>
+    <item>васямнаццаць</item>
+    <item>дзевятнаццаць</item>
+    <item>дваццаць</item>
+    <item>дваццаць адзін</item>
+    <item>дваццаць два</item>
+    <item>дваццаць тры</item>
+  </string-array>
+  <string-array name="story_time_minutes">
+    <item>нуль нуль</item>
+    <item>нуль адзін</item>
+    <item>нуль два</item>
+    <item>нуль тры</item>
+    <item>нуль чатыры</item>
+    <item>нуль пяць</item>
+    <item>нуль шэсць</item>
+    <item>нуль сем</item>
+    <item>нуль восем</item>
+    <item>нуль дзевяць</item>
+    <item>дзесяць</item>
+    <item>адзінаццаць</item>
+    <item>дванаццаць</item>
+    <item>трынаццаць</item>
+    <item>чатырнаццаць</item>
+    <item>пятнаццаць</item>
+    <item>шаснаццаць</item>
+    <item>сямнаццаць</item>
+    <item>васямнаццаць</item>
+    <item>дзевятнаццаць</item>
+    <item>дваццаць</item>
+    <item>дваццаць адзін</item>
+    <item>дваццаць два</item>
+    <item>дваццаць тры</item>
+    <item>дваццаць чатыры</item>
+    <item>дваццаць пяць</item>
+    <item>дваццаць шэсць</item>
+    <item>дваццаць сем</item>
+    <item>дваццаць восем</item>
+    <item>дваццаць дзевяць</item>
+    <item>трыццаць</item>
+    <item>трыццаць адзін</item>
+    <item>трыццаць два</item>
+    <item>трыццаць тры</item>
+    <item>трыдцаць чатыры</item>
+    <item>трыццаць пяць</item>
+    <item>трыдцаць шэсць</item>
+    <item>трыццаць сем</item>
+    <item>трыццаць восем</item>
+    <item>трыццаць дзевяць</item>
+    <item>сорак</item>
+    <item>сорак адзін</item>
+    <item>сорак два</item>
+    <item>сорак тры</item>
+    <item>сорак чатыры</item>
+    <item>сорак пяць</item>
+    <item>сорак шэсць</item>
+    <item>сорак сем</item>
+    <item>сорак восем</item>
+    <item>сорак дзевяць</item>
+    <item>пяцьдзесят</item>
+    <item>пяцьдзесят адзін</item>
+    <item>пяцьдзясят два</item>
+    <item>пяцьдзесят тры</item>
+    <item>пяцьдзесят чатыры</item>
+    <item>пяцьдзесят пяць</item>
+    <item>пяцьдзесят шэсць</item>
+    <item>пяцьдзесят сем</item>
+    <item>пяцьдзясят восем</item>
+    <item>пяцьдзесят дзевяць</item>
+  </string-array>
+  <string-array name="video_search_date">
+    <item>Любая</item>
+    <item>За суткі</item>
+    <item>За тыдзень</item>
+    <item>За месяц</item>
+    <item>За год</item>
+  </string-array>
+  <string-array name="video_search_date_options">
+    <item>За любы час</item>
+    <item>За апошнія 24 гадзіны</item>
+    <item>За апошні месяц</item>
+    <item>За апошні год</item>
+  </string-array>
+  <string-array name="video_search_duration">
+    <item>Любыя</item>
+    <item>Кароткія (менш за 5 хвілін)</item>
+    <item>Доўгія (больш за 20 хвілін)</item>
+  </string-array>
+  <string-array name="video_search_length">
+    <item>Любая працягласць</item>
+    <item>Кароткія</item>
+    <item>Доўгія</item>
+  </string-array>
+  <string-array name="video_search_quality">
+    <item>Любая якасць</item>
+    <item>Толькі HD</item>
+  </string-array>
+  <string-array name="video_search_sort">
+    <item>Па даце</item>
+    <item>Па працягласці</item>
+    <item>Па рэлевантнасці</item>
+  </string-array>
+  <string-array name="video_search_sort_options">
+    <item>Па рэлевантнасці</item>
+    <item>Па даце</item>
+    <item>Па працягласці</item>
+  </string-array>
+  <string-array name="vkim_months_full_nom">
+    <item>студзень</item>
+    <item>люты</item>
+    <item>сакавік</item>
+    <item>красавік</item>
+    <item>май</item>
+    <item>чэрвень</item>
+    <item>ліпень</item>
+    <item>жнівень</item>
+    <item>верасень</item>
+    <item>кастрычнік</item>
+    <item>лістапад</item>
+    <item>снежань</item>
+  </string-array>
+  <string-array name="wall_attach_options">
+    <item>Аўдыёзапіс</item>
+    <item>Відэазапіс</item>
+    <item>Дакумент</item>
+  </string-array>
+  <string-array name="when_day_of_week">
+    <item>У панядзелак</item>
+    <item>У аўторак</item>
+    <item>Ў сераду</item>
+    <item>Ў чацвер</item>
+    <item>Ў пятніцу</item>
+    <item>У суботу</item>
+    <item>Ў нядзелю</item>
+  </string-array>
+  <string-array name="animations2">
+    <item>Без анімацыі</item>
+    <item>Fade</item>
+    <item>AndroidX</item>
+    <item>Слайд</item>
+  </string-array>
+  <string-array name="animations">
+    <item>Без анімацыі</item>
+    <item>Android Q</item>
+    <item>Fade</item>
+    <item>AndroidX</item>
+    <item>Слайд</item>
+  </string-array>
+  <string-array name="language">
+    <item>Сістэмны</item>
+    <item>Англійская</item>
+    <item>Руская</item>
+    <item>Украінскі</item>
+  </string-array>
+  <string-array name="start">
+    <item>Безумоўна</item>
+    <item>Навіны</item>
+    <item>Дыялогі</item>
+    <item>Меню</item>
+    <item>Профіль</item>
+    <item>Дакументы</item>
+    <item>Прамыя эфіры</item>
+    <item>Дні нараджэння</item>
+    <item>Групы</item>
+    <item>Музыка</item>
+    <item>Сябры</item>
+    <item>Фота</item>
+    <item>Відэа</item>
+    <item>Налады</item>
+    <item>Прыкладанні</item>
+    <item>Дыскавер</item>
+    <item>Апавяшчэнні</item>
+    <item>Пераклад сродкаў</item>
+    <item>Гульні</item>
+    <item>Закладкі</item>
+  </string-array>
+  <string-array name="proxy">
+    <item>Без проксі</item>
+    <item>zaborona.help</item>
+    <item>VikaMobile</item>
+    <item>Рандомны проксі</item>
+    <item>Іншы проксі для API</item>
+    <item>Іншы HTTP</item>
+    <item>Іншы HTTPS</item>
+    <item>Іншы SOCKS</item>
+  </string-array>
+  <string-array name="targetlang_value">
+    <item>Сістэмны</item>
+    <item>Руская</item>
+    <item>Англійская</item>
+    <item>Украінскі</item>
+    <item>Нямецкая</item>
+    <item>Французская</item>
+    <item>Казахскі</item>
+    <item>Кітайскі</item>
+  </string-array>
+  <string-array name="msgcount_value">
+    <item>Безумоўна</item>
+    <item>40 паведамленняў</item>
+    <item>50 паведамленняў</item>
+    <item>70 паведамленняў</item>
+    <item>100 паведамленняў</item>
+    <item>150 паведамленняў</item>
+    <item>200 паведамленняў</item>
+  </string-array>
+  <string-array name="darktheme_value">
+    <item>Безумоўна</item>
+    <item>Цалкам чорная</item>
+  </string-array>
+  <string-array name="lighttheme_value">
+    <item>Безумоўна</item>
+  </string-array>
+  <string-array name="newsupdate_value">
+    <item>Безумоўна</item>
+    <item>Не абнаўляць</item>
+    <item>Абнаўляць імгненна</item>
+  </string-array>
+  <string-array name="musicdefcatalog_value">
+    <item>Безумоўна</item>
+    <item>Галоўная</item>
+    <item>Мая музыка</item>
+    <item>Плэйлісты</item>
+    <item>Альбомы</item>
+    <item>Агляд</item>
+  </string-array>
+  <string-array name="undel_value">
+    <item>[Выдалена]</item>
+    <item>🗑</item>
+    <item>❌</item>
+  </string-array>
+  <string-array name="dateformat_value">
+    <item>Безумоўна</item>
+    <item>15 красавіка ў 18:42</item>
+    <item>15 красавіка ў 18:42:28</item>
+    <item>15 красавіка 2022 г. у 18:42:28</item>
+  </string-array>
+  <string-array name="wallpaper_change_dialog">
+    <item>Прывітанне</item>
+    <item>Добрай раніцы, дзень, вечар, ноч</item>
+    <item>Як ты?</item>
+    <item>Не мёртвы, і тое добра</item>
+  </string-array>
+  <string-array name="cache_cleaner">
+    <item>Ачысціць увесь кэш</item>
+    <item>Ачысціць кэш стыкераў</item>
+    <item>Ачысціць кэш малюнкаў</item>
+    <item>Ачысціць кэш відэа</item>
+    <item>Ачысціць кэш паведамленняў</item>
+    <item>Ачысціць кэш WebView</item>
+  </string-array>
+  <string-array name="filter_types">
+    <item>Адключана</item>
+    <item>Нізкае</item>
+    <item>Сярэдняе</item>
+    <item>Высокае</item>
+  </string-array>
+  <string-array name="filter_dim_types">
+    <item>Адключана</item>
+    <item>Зацямніць</item>
+    <item>Асвятліць</item>
+  </string-array>
+  <string-array name="msg_plurals">
+    <item>паведамленне</item>
+    <item>паведамлення</item>
+    <item>паведамленняў</item>
+  </string-array>
+  <string-array name="theme_type_name">
+    <item>Сістэмная</item>
+    <item>Цёмная</item>
+    <item>Светлая</item>
+  </string-array>
+  <string-array name="theme_type_name_checkbox">
+    <item>Сістэмная тэма</item>
+    <item>Цёмная тэма</item>
+    <item>Светлая тэма</item>
+  </string-array>
+  <string-array name="accent_select_type">
+    <item>Выбраць уручную</item>
+    <item>Прадусталяваныя колеры</item>
+  </string-array>
+</resources>

smali/res/values-ru/arrays.xml

@@ -632,7 +632,6 @@
     <string-array name="musicdefcatalog_value">
         <item>По умолчанию</item>
         <item>Главная</item>
-        <item>Недавно прослушанные</item>
         <item>Моя музыка</item>
         <item>Плейлисты</item>
         <item>Альбомы</item>

smali/res/values-ru/strings.xml

@@ -5466,7 +5466,7 @@
     <string name="benchapisummary">Тестирование скорости отправки запросов. Бесполезная функция для всех, кроме разработчиков ВКонтакте</string>
     <string name="cachecleaned">Кеш очищен</string>
     <string name="clearcache">Очистить весь кеш</string>
-    <string name="clearcachesum">Чистка всего ккша приложения (кроме кеша ленты)</string>
+    <string name="clearcachesum">Чистка всего кеша приложения (кроме кеша ленты)</string>
     <string name="convUsersOnline">Фикс показа онлайна в беседах</string>
     <string name="convUsersOnlinesum">"Фикс показа онлайна других пользователей в беседах (нужно только если Вы скрыли свой онлайн)
 
@@ -6194,6 +6194,8 @@
     <string name="download_dl">Скачать диалог</string>
     <string name="download_dl_error">Произошла ошибка при попытке скачать диалог</string>
 
+    <string name="dialogstats">Статистика диалога</string>
+
     <string name="saved_as">Сохранено как</string>
     <string name="settings_reset_confirm">Вы действительно хотите сбросить настройки?</string>
     <string name="system_theme_warning">У вас включена системная тема \nПри переключении темы системная тема будет отключена \n\nВы действительно хотите отключить её?</string>
@@ -6340,4 +6342,15 @@
     <string name="cannot_write">Отсутствует разрешение на запись и чтение файлов</string>
     <string name="open_bot">Открыть бота</string>
     <string name="crash_service_name">Уведомления об ошибках</string>
+    <string name="custom_links_warning">Разработчики клиента не несут никакой ответственности за пользовательские ссылки. Будьте внимательны!</string>
+    <string name="by_choice">По выбору</string>
+    <string name="data_updated">Данные обновлены</string>
+    <string name="updateverifdata_title">Обновить данные</string>
+    <string name="updateverifdata_summ">Загрузить свежие данные о верификациях и серверных функциях</string>
+    <string name="device_info">Информация об устройстве</string>
+    <string name="calls_not_available">Установите VK Мессенджер или официальный клиент ВКонтакте</string>
+    <string name="copydebuginfo_title">Скопировать информацию об устройстве</string>
+    <string name="copydebuginfo_summ">Для отправки информации об ошибке на GitHub Issues</string>
+    <string name="device_info_copied">Информация об устройстве скопирована</string>
+    <string name="app_open_by_default_settings">Для нормальной работы приложения необходимо разрешить приложению открытие ссылок по умолчанию</string>
 </resources>

smali/res/values-uk/arrays.xml

@@ -547,4 +547,149 @@
         <item>У суботу</item>
         <item>У неділю</item>
     </string-array>
+    <string-array name="animations2">
+        <item>Без анімації</item>
+        <item>Fade</item>
+        <item>AndroidX</item>
+        <item>Слайд</item>
+    </string-array>
+    <string-array name="animations">
+        <item>Без анімації</item>
+        <item>Android Q</item>
+        <item>Fade</item>
+        <item>AndroidX</item>
+        <item>Слайд</item>
+    </string-array>
+    <string-array name="language">
+        <item>Системна</item>
+        <item>Англійська</item>
+        <item>Російська</item>
+        <item>Українська</item>
+    </string-array>
+    <string-array name="start">
+        <item>За замовчуванням</item>
+        <item>Новини</item>
+        <item>Повідомлення</item>
+        <item>Меню</item>
+        <item>Профіль</item>
+        <item>Документи</item>
+        <item>Трансляції</item>
+        <item>Дні народження</item>
+        <item>Спільноти</item>
+        <item>Музика</item>
+        <item>Друзі</item>
+        <item>Фотографії</item>
+        <item>Відео</item>
+        <item>Налаштування</item>
+        <item>Міні-додатки</item>
+        <item>Дискавер</item>
+        <item>Сповіщення</item>
+        <item>Історія переказів</item>
+        <item>Ігри</item>
+        <item>Закладки</item>
+    </string-array>
+    <string-array name="proxy">
+        <item>Без проксі</item>
+        <item>zaborona.help</item>
+        <item>VikaMobile</item>
+        <item>Випадковий проксі</item>
+        <item>Сторонній проксі для API</item>
+        <item>Сторонній HTTP</item>
+        <item>Сторонній HTTPS</item>
+        <item>Сторонній SOCKS</item>
+    </string-array>
+    <string-array name="targetlang_value">
+        <item>Системна</item>
+        <item>Російська</item>
+        <item>Англійська</item>
+        <item>Українська</item>
+        <item>Німецька</item>
+        <item>Французька</item>
+        <item>Казахська</item>
+        <item>Китайська</item>
+    </string-array>
+    <string-array name="msgcount_value">
+        <item>За замовчуванням</item>
+        <item>40 повідомлень</item>
+        <item>50 повідомлень</item>
+        <item>70 повідомлень</item>
+        <item>100 повідомлень</item>
+        <item>150 повідомлень</item>
+        <item>200 повідомлень</item>
+    </string-array>
+    <string-array name="darktheme_value">
+        <item>За замовчуванням</item>
+        <item>Повністю чорна</item>
+    </string-array>
+    <string-array name="lighttheme_value">
+        <item>За замовчуванням</item>
+    </string-array>
+    <string-array name="newsupdate_value">
+        <item>За замовчуванням</item>
+        <item>Не оновлювати</item>
+        <item>Оновлювати миттєво</item>
+    </string-array>
+    <string-array name="musicdefcatalog_value">
+        <item>За замовчуванням</item>
+        <item>Головна</item>
+        <item>Моя музика</item>
+        <item>Плейлисти</item>
+        <item>Альбоми</item>
+        <item>Огляд</item>
+    </string-array>
+    <string-array name="undel_value">
+        <item>[Видалено]</item>
+        <item>🗑</item>
+        <item>❌</item>
+    </string-array>
+    <string-array name="dateformat_value">
+        <item>За замовчуванням</item>
+        <item>15 квітня в 18:42</item>
+        <item>15 квітня в 18:42:28</item>
+        <item>15 квітня 2022 в 18:42:28</item>
+    </string-array>
+    <string-array name="wallpaper_change_dialog">
+        <item>Добрий час</item>
+        <item>Добрий ранок, день, вечір, ніч</item>
+        <item>Як живеш?</item>
+        <item>Не мертвий, і те добре</item>
+    </string-array>
+    <string-array name="cache_cleaner">
+        <item>Очистити увесь кеш</item>
+        <item>Очистити кеш стікерів</item>
+        <item>Очистити кеш зображень</item>
+        <item>Очистити кеш відео</item>
+        <item>Очистити кеш повідомлень</item>
+        <item>Очистити кеш WebView</item>
+    </string-array>
+    <string-array name="filter_types">
+        <item>Відключено</item>
+        <item>Низьке</item>
+        <item>Середнє</item>
+        <item>Високе</item>
+    </string-array>
+    <string-array name="filter_dim_types">
+        <item>Відключено</item>
+        <item>Затемнити</item>
+        <item>Освітлити</item>
+    </string-array>
+    <string-array name="msg_plurals">
+        <item>повідомлення</item>
+        <item>повідомлення</item>
+        <item>повідомлень</item>
+    </string-array>
+    <string-array name="theme_type_name">
+        <item>Системна</item>
+        <item>Темна</item>
+        <item>Світла</item>
+    </string-array>
+    <string-array name="theme_type_name_checkbox">
+        <item>Системна тема</item>
+        <item>Темна тема</item>
+        <item>Світла тема</item>
+    </string-array>
+    <string-array name="accent_select_type">
+        <item>Вибрати вручну</item>
+        <item>Передвстановлені кольори</item>
+    </string-array>
 </resources>

smali/res/values-v28/styles.xml

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

smali/res/values-v31/bools.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="com_samsung_android_icon_container_has_icon_container">false</bool>
+</resources>

smali/res/values-v31/styles.xml

@@ -1314,7 +1314,7 @@
         <item name="attach_picker_tab_inactive_icon">@android:color/system_neutral1_100</item>
         <item name="attach_picker_tab_inactive_text">@android:color/system_neutral1_500</item>
         <item name="background_content">@color/black</item>
-        <item name="background_highlighted">@color/black</item>
+        <item name="background_highlighted">@color/white_alpha8</item>
         <item name="background_keyboard">@color/black</item>
         <item name="background_light">@color/black</item>
         <item name="background_page">@android:color/system_neutral1_1000</item>
@@ -1689,6 +1689,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -1846,6 +1847,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
@@ -2147,6 +2149,7 @@
         <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
         <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
         <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_ic_stats">@drawable/ic_statistics_outline_28</item>
         <item name="im_msg_avatar_margin_top">3.0dip</item>
         <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
         <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>

smali/res/values/arrays.xml

@@ -817,7 +817,6 @@
     <string-array name="musicdefcatalog_value">
         <item>Default</item>
         <item>General</item>
-        <item>Recent</item>
         <item>My music</item>
         <item>Playlists</item>
         <item>Albums</item>
@@ -826,7 +825,6 @@
     <string-array name="musicdefcatalog">
         <item>default</item>
         <item>general</item>
-        <item>recent</item>
         <item>all</item>
         <item>my_playlists</item>
         <item>albums</item>

smali/res/values/attrs.xml

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

smali/res/values/bools.xml

@@ -16,4 +16,5 @@
     <bool name="spb_default_progressiveStart_activated">false</bool>
     <bool name="spb_default_reversed">false</bool>
     <bool name="vk_is_tablet">false</bool>
+    <bool name="com_samsung_android_icon_container_has_icon_container">true</bool>
 </resources>

smali/res/values/strings.xml

@@ -6140,7 +6140,7 @@ May look like a fake leaving the online"</string>
     <string name="logfile_saved">The log file has been saved</string>
 
     <string name="menu_copy_id">Copy ID</string>
-    <string name="menu_addon_info">Addon info</string>
+    <string name="menu_addon_info">Additional info</string>
     <string name="menu_change_name">Change name</string>
     <string name="menu_copied">Copied!</string>
 
@@ -6332,6 +6332,8 @@ May look like a fake leaving the online"</string>
     <string name="download_dl">Download dialog</string>
     <string name="download_dl_error">An error occurred while trying to download the dialog</string>
 
+    <string name="dialogstats">Dialog stats</string>
+
     <string name="saved_as">Saved as</string>
     <string name="settings_reset_confirm">Are you sure you want to reset your settings?</string>
     <string name="system_theme_warning">You have the system theme enabled \nWhen you switch the theme, the system theme will be disabled \n\nAre you sure you want to disable it?</string>
@@ -6478,4 +6480,15 @@ May look like a fake leaving the online"</string>
     <string name="cannot_write">No permission to write or read files</string>
     <string name="open_bot">Open a bot</string>
     <string name="crash_service_name">Error notifications</string>
+    <string name="custom_links_warning">Developers are not responsible for user links. Be careful!</string>
+    <string name="by_choice">By choice</string>
+    <string name="data_updated">Data updated</string>
+    <string name="updateverifdata_title">Update data</string>
+    <string name="updateverifdata_summ">Load the latest data about verifications and server functions</string>
+    <string name="device_info">Device info</string>
+    <string name="calls_not_available">Install VK Messenger or official VK client</string>
+    <string name="copydebuginfo_title">Copy device info</string>
+    <string name="copydebuginfo_summ">To submit bug info to GitHub Issues</string>
+    <string name="device_info_copied">Device info copied</string>
+    <string name="app_open_by_default_settings">You need to allow the app to open links by default for the app to work properly</string>
 </resources>

smali/res/values/styles.xml

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

smali/res/xml/account_preferences.xml

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

smali/res/xml/authenticator.xml

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