From c7f18e434f6fe1f4e89688629775d18fddbf6b7d Mon Sep 17 00:00:00 2001
From: aliveoutside <53598473+aliveoutside@users.noreply.github.com>
Date: Tue, 21 Jun 2022 23:13:12 +0300
Subject: [PATCH] fix materialfragment

---
 .../java/ru/vtosters/lite/ui/activities/APKInstallActivity.java | 1 +
 .../java/ru/vtosters/lite/ui/fragments/ActivityFragment.java    | 2 +-
 .../main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java   | 2 +-
 .../java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java  | 2 +-
 .../java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java   | 2 +-
 .../java/ru/vtosters/lite/ui/fragments/MessagesFragment.java    | 2 +-
 .../main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java  | 2 +-
 .../main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java  | 2 +-
 .../ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java    | 2 +-
 .../main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java | 2 +-
 .../ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java  | 2 +-
 .../vtosters/lite/ui/fragments/tgstickers/StickersFragment.java | 2 +-
 .../ui/fragments/tgstickers/StickersPreferencesFragment.java    | 2 +-
 .../java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java  | 2 +-
 14 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/ui/activities/APKInstallActivity.java b/app/src/main/java/ru/vtosters/lite/ui/activities/APKInstallActivity.java
index aceb5aa10..f024a22d7 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/activities/APKInstallActivity.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/activities/APKInstallActivity.java
@@ -1,5 +1,6 @@
 package ru.vtosters.lite.ui.activities;
 
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
index 2085161e7..c7fa2e96f 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments;
 import android.os.Bundle;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class ActivityFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
index 5b604f517..658721dea 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.Preference;
 import com.vk.navigation.Navigator;
 import com.vk.newsfeed.NewsfeedSettingsFragment;
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class FeedFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
index 09bb788bc..c8ad73b0c 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments;
 import android.os.Bundle;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class InstallGMSFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
index 98c7eded1..309f278ee 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
@@ -7,7 +7,7 @@ import android.os.Bundle;
 import androidx.preference.Preference;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
index a73e84258..cc88cbaa4 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
@@ -10,7 +10,7 @@ import android.os.Bundle;
 import androidx.preference.Preference;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java
index 8cf8263aa..d0a119831 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java
@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments;
 import android.os.Bundle;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class MusicFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
index 42bc4d622..0152172c7 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
@@ -24,7 +24,7 @@ import com.vk.imageloader.VKImageLoader;
 import com.vk.pushes.PushSubscriber;
 import com.vtosters.lite.R;
 import com.vtosters.lite.auth.VKAccountManager;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.im.ImEngineProvider;
 
 import b.h.g.m.FileUtils;
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
index b60c8c949..a1b48117a 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments;
 import android.os.Bundle;
 
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment {
     @Override
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
index 2d2478fe8..5d5171ba8 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
@@ -9,7 +9,7 @@ import androidx.preference.Preference;
 
 import com.vk.core.util.ToastUtils;
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import ru.vtosters.lite.utils.Globals;
 
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
index d7f048863..522cd64fd 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java
@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.vk.core.fragments.FragmentImpl.a;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import me.grishka.appkit.fragments.ToolbarFragment;
 import ru.vtosters.lite.utils.Globals;
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
index 892a67fcd..90c4f6553 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
@@ -46,7 +46,7 @@ import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import java.io.File;
 
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java
index f15697713..81a525a88 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java
@@ -6,7 +6,7 @@ import android.os.Bundle;
 
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.vk.core.util.ToastUtils;
-import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
+import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.tgs.TGRoot;
diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
index 1670507e5..257418d0e 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java
@@ -71,7 +71,7 @@ public class ModalBottomSheetWrapper {
             String text,
             Runnable callback
     ) {
-        builder.b(text, kostil -> callback.run());
+        builder.a(text, kostil -> callback.run());
         return this;
     }