From 682ed1c8c591ae99232cca7f6ce4e112c0df34fb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 21 Jun 2022 23:05:33 +0300 Subject: [PATCH] fixed imports and Themes.java --- .../main/java/ru/vtosters/lite/tgs/TGRoot.java | 4 ++-- .../vtosters/lite/ui/fragments/VTSettings.java | 6 +++--- .../ui/fragments/dockbar/DockBarManager.java | 16 +++++++--------- .../java/ru/vtosters/lite/utils/Newsfeed.java | 4 ++-- .../main/java/ru/vtosters/lite/utils/Themes.java | 7 ++++++- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java index 7a93213bb..aa4cab112 100644 --- a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java +++ b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java @@ -41,7 +41,7 @@ public class TGRoot { } public static Attachment processSticker(StickerItem item) { - int id = item.b(); + int id = item.getId(); if (id < N) return null; int index = (id - N) / 120; @@ -144,7 +144,7 @@ public class TGRoot { } public static Attach modifyStickerIM(int i, StickerItem stickerItem, String str) { - if (stickerItem.b() < 76820000) { + if (stickerItem.getId() < 76820000) { return AppAttachToImAttachConverter.a.a(i, stickerItem, str); } return AppAttachToImAttachConverter.a.a(processSticker(stickerItem)); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 1e83f3636..133d18bca 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -40,12 +40,12 @@ import com.vk.notifications.settings.NotificationsSettingsFragment; import com.vk.webapp.fragments.BugtrackerFragment; import com.vk.webapp.fragments.PrivacyFragment; import com.vtosters.lite.auth.VKAccountManager; -import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; -import com.vtosters.lite.fragments.SettingsAccountFragment; -import com.vtosters.lite.fragments.SettingsGeneralFragment; import com.vtosters.lite.fragments.money.music.control.subscription.MusicSubscriptionControlFragment; import com.vtosters.lite.fragments.n2.SettingsDebugFragment; import com.vtosters.lite.fragments.w2.BlacklistFragment; +import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; +import com.vtosters.lite.general.fragments.SettingsAccountFragment; +import com.vtosters.lite.general.fragments.SettingsGeneralFragment; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java index ec8fb6f0e..555140a63 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java @@ -18,17 +18,17 @@ import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; import com.vk.search.fragment.GroupsSearchFragment; -import com.vtosters.lite.fragments.GamesFragment; -import com.vtosters.lite.fragments.PhotosFragment; +import com.vtosters.lite.R; import com.vtosters.lite.fragments.ProfileFragment; import com.vtosters.lite.fragments.friends.FriendsFragment; import com.vtosters.lite.fragments.gifts.BirthdaysFragment; import com.vtosters.lite.fragments.lives.LivesPostListFragment; import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; - import com.vtosters.lite.fragments.t2.c.DialogsFragment; import com.vtosters.lite.fragments.y2.VideosFragment; +import com.vtosters.lite.general.fragments.GamesFragment; +import com.vtosters.lite.general.fragments.PhotosFragment; import org.json.JSONArray; import org.json.JSONException; @@ -46,8 +46,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.vtosters.lite.R; - public class DockBarManager { public static final int MIN_SELECTED_TABS_LIMIT = 3; public static final int MAX_SELECTED_TABS_LIMIT = 9; @@ -229,7 +227,7 @@ public class DockBarManager { Collections.swap(list, i, i - 1); } } - adapter.b(fromPosition, toPosition);// notifyItemMoved + adapter.notifyItemMoved(fromPosition, toPosition);// notifyItemMoved } public void swapAndMigrate(DockBarAdapter adapter, int fromPosition, int toPosition) { @@ -262,7 +260,7 @@ public class DockBarManager { mDisabledTabs.remove(tab); mSelectedTabs.add(tab); } - adapter.b(fromPosition, toPosition);// notifyItemMoved + adapter.notifyItemMoved(fromPosition, toPosition);// notifyItemMoved } public void move(DockBarAdapter adapter, int index) { @@ -277,8 +275,8 @@ public class DockBarManager { Collections.swap(mDisabledTabs, i, i - 1); } - adapter.e_(index); // notifyItemRemoved - adapter.d_(getItemCount() - mDisabledTabs.size()); // notifyItemInserted + adapter.notifyItemRemoved(index); // notifyItemRemoved + adapter.notifyItemInserted(getItemCount() - mDisabledTabs.size()); // notifyItemInserted } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index ba805f402..08b4c34c3 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -27,8 +27,6 @@ import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; import com.vk.search.fragment.GroupsSearchFragment; -import com.vtosters.lite.fragments.GamesFragment; -import com.vtosters.lite.fragments.PhotosFragment; import com.vtosters.lite.fragments.ProfileFragment; import com.vtosters.lite.fragments.friends.FriendsFragment; import com.vtosters.lite.fragments.gifts.BirthdaysFragment; @@ -37,6 +35,8 @@ import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; import com.vtosters.lite.fragments.t2.c.DialogsFragment; import com.vtosters.lite.fragments.y2.VideosFragment; +import com.vtosters.lite.general.fragments.GamesFragment; +import com.vtosters.lite.general.fragments.PhotosFragment; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index c7fbe1dc1..a5e474c89 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -38,6 +38,7 @@ import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; import com.vtosters.lite.data.ThemeTracker; +import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.List; @@ -61,7 +62,11 @@ public class Themes { } public static void setSelectedTheme(Activity paramActivity, VKTheme theme) { - invokeThemeChanging(paramActivity, theme); + try { + invokeMethod(VKThemeHelper.class, "a", VKThemeHelper.k, paramActivity, theme, getCenterScreenCoords()); + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + e.printStackTrace(); + } } public static int getAccentColor() {