diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java index 0e0141d2e..925f4a773 100644 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java +++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java @@ -6,14 +6,13 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.content.Context; import android.os.RemoteException; -import com.vk.core.b.PackageManagerHelper; import com.vk.dto.music.MusicTrack; -import com.vk.music.PlayerRefer; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import b.h.g.g.PackageManagerHelper; import bruhcollective.itaysonlab.libvkx.ILibVkxService; public class LibVKXClient { diff --git a/app/src/main/java/com/vk/core/ui/themes/VKTheme.java b/app/src/main/java/com/vk/core/ui/themes/VKTheme.java index ef3c65423..6d3449611 100644 --- a/app/src/main/java/com/vk/core/ui/themes/VKTheme.java +++ b/app/src/main/java/com/vk/core/ui/themes/VKTheme.java @@ -1,7 +1,7 @@ package com.vk.core.ui.themes; -import com.vk.s.R; +import ru.vtosters.lite.R; import ru.vtosters.lite.utils.Themes; public enum VKTheme { diff --git a/app/src/main/java/okhttp3/Request.java b/app/src/main/java/okhttp3/Request.java index e5b855bf3..5fea059fd 100644 --- a/app/src/main/java/okhttp3/Request.java +++ b/app/src/main/java/okhttp3/Request.java @@ -7,8 +7,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import okhttp3.internal.Util; -import okhttp3.internal.b.HttpMethod; +import okhttp3.f0.Util; +import okhttp3.f0.f.HttpMethod; + public final class Request { final HttpUrl a; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java index 674684466..4f1b12a85 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java @@ -10,10 +10,9 @@ import android.content.IntentFilter; import android.net.Uri; import android.os.Environment; -import com.vk.core.f.FileUtils; - import java.io.File; +import b.h.g.m.FileUtils; import ru.vtosters.lite.ui.activities.APKInstallActivity; import ru.vtosters.lite.utils.Globals; diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java index 1064ab36c..b6d19e5bb 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -9,7 +9,6 @@ import static ru.vtosters.lite.utils.Proxy.proxy; import android.app.ProgressDialog; import android.content.Context; -import android.support.v7.app.AlertDialog; import androidx.exifinterface.media.ExifInterface; diff --git a/app/src/main/java/ru/vtosters/lite/provider/VKFileProvider.java b/app/src/main/java/ru/vtosters/lite/provider/VKFileProvider.java index 5aa237a2d..b02df0422 100644 --- a/app/src/main/java/ru/vtosters/lite/provider/VKFileProvider.java +++ b/app/src/main/java/ru/vtosters/lite/provider/VKFileProvider.java @@ -1,6 +1,7 @@ package ru.vtosters.lite.provider; -import android.support.v4.content.FileProvider; + +import androidx.core.content.FileProvider; public final class VKFileProvider extends FileProvider { } diff --git a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java index 12dc88dd0..2fab213a0 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java +++ b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java @@ -10,9 +10,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.preference.PreferenceManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; import android.util.TypedValue; import android.view.ViewGroup; import android.widget.EditText; @@ -21,7 +18,9 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; +import androidx.preference.ListPreference; +import com.vk.core.preference.Preference; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import com.vtosters.lite.ui.MaterialSwitchPreference; @@ -36,7 +35,7 @@ public class PreferencesUtil { public static void addListPreference(MaterialPreferenceToolbarFragment fragment, String key, String def, CharSequence title, CharSequence[] entries, CharSequence[] entriesValue) { ListPreference preference = new ListPreference(getContext()); - preference.a(entries); + preference.setEntries(entries); preference.b(entriesValue); preference.c(title); // setTitle preference.a(title); // setDialogTitle @@ -47,9 +46,9 @@ public class PreferencesUtil { public static void addListPreferenceIcon(MaterialPreferenceToolbarFragment fragment, String key, String def, CharSequence title, String icon, CharSequence summary, CharSequence[] entries, CharSequence[] entriesValue) { ListPreference preference = new ListPreference(getContext()); - preference.a(entries); - preference.b(entriesValue); - preference.b(summary); // setSummary + preference.setEntries(entries); + preference.setEntries(entriesValue); + preference.setSummary(summary); // setSummary preference.c(title); // setTitle preference.a(title); // setDialogTitle preference.d(key); // setKey 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 5fddc903e..aceb5aa10 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 @@ -6,9 +6,10 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.support.v7.app.AppCompatActivity; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + public class APKInstallActivity extends AppCompatActivity { public static final int REQUEST_INSTALL_PERMISSION = 1; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java index a66990c0e..e337e3a8e 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java @@ -9,7 +9,6 @@ import android.app.AlertDialog; import android.content.Intent; import com.vk.navigation.Navigator; -import com.vk.webapp.VKConnect; public class VKIDProtection { public static void alert(final Activity activity) { 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 d53d61ab9..c6b70870e 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,6 +3,7 @@ package ru.vtosters.lite.ui.fragments; import android.os.Bundle; import com.vtosters.lite.R; +import com.vtosters.lite.fragments.MaterialPreferenceFragment.a; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; public class ActivityFragment extends MaterialPreferenceToolbarFragment { 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 740ab4ee6..789eeb160 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 @@ -1,12 +1,10 @@ package ru.vtosters.lite.ui.fragments; -import static ru.vtosters.lite.utils.Globals.getContext; - import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v7.preference.Preference; +import com.vk.core.preference.Preference; import com.vk.navigation.Navigator; import com.vk.newsfeed.NewsfeedSettingsFragment; import com.vtosters.lite.R; 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 e27a718d7..c3af8f479 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,6 +3,7 @@ package ru.vtosters.lite.ui.fragments; import android.os.Bundle; import com.vtosters.lite.R; +import com.vtosters.lite.fragments.MaterialPreferenceFragment.a; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; public class InstallGMSFragment extends MaterialPreferenceToolbarFragment { 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 510fb92d1..3cf9b10e4 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 @@ -3,8 +3,8 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import android.os.Bundle; -import android.support.v7.preference.Preference; +import com.vk.core.preference.Preference; import com.vtosters.lite.R; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; 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 74d929477..c401e3691 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 @@ -1,15 +1,15 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.CacheUtils.deleteCache; -import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; +import com.vk.core.preference.Preference; import com.vtosters.lite.R; +import com.vtosters.lite.fragments.MaterialPreferenceFragment.a; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; public class MessagesFragment extends MaterialPreferenceToolbarFragment { 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 6502797af..4d880b15c 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 @@ -3,8 +3,6 @@ package ru.vtosters.lite.ui.fragments; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; import static ru.vtosters.lite.utils.CacheUtils.deleteCache; -import static ru.vtosters.lite.utils.Globals.getContext; -import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.getUserToken; import static ru.vtosters.lite.utils.Globals.restartApplication; import static ru.vtosters.lite.utils.SettBackup.backupSettings; @@ -16,11 +14,10 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; import com.vk.audio.AudioMessageUtils; import com.vk.auth.api.VKAccount; -import com.vk.core.f.FileUtils; +import com.vk.core.preference.Preference; import com.vk.core.util.AppContextHolder; import com.vk.core.util.ToastUtils; import com.vk.imageloader.VKImageLoader; @@ -30,6 +27,9 @@ import com.vtosters.lite.auth.VKAccountManager; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import com.vtosters.lite.im.ImEngineProvider; +import b.h.g.m.FileUtils; +import ru.vtosters.lite.ui.fragments.OtherFragment.a; + public class OtherFragment 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 2c912f155..f78c8eb02 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 @@ -1,16 +1,16 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.Globals.componentSwitcher; -import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; import android.os.Bundle; -import android.support.v7.preference.Preference; +import com.vk.core.preference.Preference; import com.vk.core.util.ToastUtils; import com.vtosters.lite.R; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; + public class ThemesFragment extends MaterialPreferenceToolbarFragment { @Override 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 5eac7d96b..a4406ad49 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 @@ -10,10 +10,8 @@ import static ru.vtosters.lite.utils.About.getCommitLink; import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin; import static ru.vtosters.lite.utils.Globals.drawableFromUrl; import static ru.vtosters.lite.utils.Globals.edit; -import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; -import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.getUserId; import static ru.vtosters.lite.utils.Globals.isGmsInstalled; import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer; @@ -44,17 +42,14 @@ import com.vk.about.AboutAppFragment; import com.vk.identity.fragments.IdentityListFragment; import com.vk.navigation.Navigator; import com.vk.notifications.settings.NotificationsSettingsFragment; -import com.vk.webapp.Bugs; -import com.vk.webapp.PrivacyFragment; -import com.vk.webapp.SSFS; -import com.vk.webapp.VKConnect; +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.SettingsDebugFragment; import com.vtosters.lite.fragments.SettingsGeneralFragment; -import com.vtosters.lite.fragments.k.BlacklistFragment; 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 ru.vtosters.lite.ui.PreferencesUtil; import ru.vtosters.lite.ui.dialogs.OTADialog; @@ -63,6 +58,7 @@ import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager; import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountFragment; import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment; import ru.vtosters.lite.utils.CacheUtils; +import ru.vtosters.lite.utils.SSFS; public class VTSettings extends MaterialPreferenceToolbarFragment { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java index 574c8f005..b10330885 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java @@ -5,7 +5,6 @@ import static ru.vtosters.lite.utils.Globals.getContext; import android.content.res.ColorStateList; import android.graphics.Typeface; -import android.support.v7.widget.RecyclerView; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; @@ -13,6 +12,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import java.util.List; import ru.vtosters.lite.utils.Themes; @@ -28,7 +29,7 @@ public class DockBarAdapter extends RecyclerView.a private final DockBarManager mDockBarManager = DockBarManager.getInstance(); @Override - public RecyclerView.x b(ViewGroup parent, int viewType) { + public RecyclerView.a b(ViewGroup parent, int viewType) { if (viewType == GROUP_TITLE_TYPE) { return new GroupViewHolder(createGroupTitle()); } else { 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 3c1184074..a72815135 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 @@ -1,13 +1,9 @@ package ru.vtosters.lite.ui.fragments.dockbar; import static ru.vtosters.lite.utils.Globals.convertDpToPixel; -import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Globals.restartApplication; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.a.ItemTouchHelper; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +12,12 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.vk.core.fragments.FragmentImpl.a; + import me.grishka.appkit.fragments.ToolbarFragment; public class DockBarFragment extends ToolbarFragment { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java index 4dde9b060..e0edd2f10 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java @@ -10,7 +10,7 @@ import android.view.Menu; import android.view.MenuItem; import com.vk.apps.AppsFragment; -import com.vk.core.d.RecoloredDrawable; +import com.vk.core.drawable.RecoloredDrawable; import com.vk.core.fragments.FragmentImpl; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView; 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 49356a331..f7c283ed7 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 @@ -11,24 +11,21 @@ import static ru.vtosters.lite.utils.Preferences.vkme_notifs; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFragment; import com.vk.fave.fragments.FaveTabFragment; -import com.vk.feedlikes.fragments.FeedLikesFragment; +import com.vk.feedlikes.d.FeedLikesFragment; import com.vk.menu.MenuFragment; -import com.vk.music.fragment.MusicFragment; import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; -import com.vtosters.lite.R; import com.vtosters.lite.fragments.GamesFragment; import com.vtosters.lite.fragments.PhotosFragment; import com.vtosters.lite.fragments.ProfileFragment; -import com.vtosters.lite.fragments.d.DocumentsViewFragment; -import com.vtosters.lite.fragments.f.FriendsFragment; -import com.vtosters.lite.fragments.g.BirthdaysFragment; -import com.vtosters.lite.fragments.h.GroupsFragment; +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.m.VideosFragment; -import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment; 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 org.json.JSONArray; import org.json.JSONException; @@ -46,6 +43,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import ru.vtosters.lite.R; + public class DockBarManager { public static final int MIN_SELECTED_TABS_LIMIT = 3; public static final int MAX_SELECTED_TABS_LIMIT = 9; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java index c4f5d2724..e259b6191 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/ItemTouchHelperCallback.java @@ -2,8 +2,9 @@ package ru.vtosters.lite.ui.fragments.dockbar; import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.a.ItemTouchHelper; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + public class ItemTouchHelperCallback extends ItemTouchHelper.a { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java index 8acfe5e24..c40b13fdc 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java @@ -13,7 +13,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -21,9 +20,10 @@ import android.widget.ImageButton; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.vk.audio.AudioMessageUtils; import com.vk.auth.api.VKAccount; -import com.vk.core.f.FileUtils; import com.vk.core.util.AppContextHolder; import com.vk.imageloader.VKImageLoader; import com.vk.imageloader.view.VKCircleImageView; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java index b0a979269..5fef4bb85 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java @@ -1,15 +1,15 @@ package ru.vtosters.lite.ui.fragments.multiaccount; -import static ru.vtosters.lite.utils.Globals.getString; - import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + + import me.grishka.appkit.fragments.ToolbarFragment; public class MultiAccountFragment extends ToolbarFragment { 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 450bf3732..a56e22c8b 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 @@ -3,10 +3,7 @@ package ru.vtosters.lite.ui.fragments.tgstickers; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; import static ru.vtosters.lite.utils.Globals.convertDpToPixel; -import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getIdentifier; -import static ru.vtosters.lite.utils.Globals.getResources; -import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Themes.getAccentColor; import static ru.vtosters.lite.utils.Themes.getSTextAttr; import static ru.vtosters.lite.utils.Themes.getTabbarBackground; @@ -23,8 +20,6 @@ import android.content.res.ColorStateList; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.widget.SwitchCompat; import android.view.Gravity; import android.view.LayoutInflater; import android.view.Menu; @@ -40,6 +35,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.widget.SwitchCompat; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; @@ -47,6 +43,8 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.vk.core.fragments.FragmentImpl.a; import com.vk.navigation.Navigator; import com.vtosters.lite.R; 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 79614bd14..cbff34e0c 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 @@ -1,7 +1,6 @@ package ru.vtosters.lite.ui.fragments.tgstickers; import static ru.vtosters.lite.utils.Globals.getIdentifier; -import static ru.vtosters.lite.utils.Globals.getString; import android.os.Bundle; diff --git a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java b/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java index f5fd673e3..79dcd66f0 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java @@ -6,18 +6,17 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.content.ContentValues; import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.text.TextUtils; import com.vk.im.engine.events.OnMsgUpdateEvent; -import com.vk.im.engine.internal.longpoll.a.MsgDeleteLpTask; -import com.vk.im.engine.internal.storage.CacheEnvironment; +import com.vk.im.engine.internal.longpoll.tasks.MsgDeleteLpTask; +import com.vk.im.engine.internal.storage.StorageManager; import com.vk.im.engine.models.messages.Msg; import com.vk.im.engine.models.messages.MsgFromUser; import com.vk.im.engine.models.messages.NestedMsg; -import com.vk.libsqliteext.CustomSqliteExtensions; - -import org.sqlite.database.sqlite.SQLiteDatabase; +import com.vk.libsqliteext.CustomSqliteExtensionsKt; import java.util.ArrayList; import java.util.List; @@ -38,8 +37,8 @@ public class DeletedMessagesHandler { sDeletedMessagesList = new ArrayList<>(sVTDatabase.loadAllMessages()); } - public static void grabVKDatabase(CacheEnvironment storageEnvironment) { - sVKSQLiteDatabase = storageEnvironment.b(); + public static void grabVKDatabase(StorageManager storageEnvironment) { + sVKSQLiteDatabase = storageEnvironment.j(); } public static boolean hook() { @@ -107,7 +106,7 @@ public class DeletedMessagesHandler { public static Cursor getMessageFromDatabaseById(int messageId) { String query = "SELECT * FROM messages WHERE vk_id = " + messageId; - Cursor c = CustomSqliteExtensions.a(sVKSQLiteDatabase, query); + Cursor c = CustomSqliteExtensionsKt.a(sVKSQLiteDatabase, query); if (!c.moveToFirst()) return null; return c; } diff --git a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java index 8eed4bc15..daf21361b 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java +++ b/app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java @@ -4,7 +4,8 @@ import static ru.vtosters.lite.utils.Globals.getIdentifier; import static ru.vtosters.lite.utils.Globals.getPrefsValue; import android.content.res.Resources; -import android.support.v4.app.FragmentTransaction; + +import androidx.fragment.app.FragmentTransaction; public class FragAnimationKit { // Q diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 9005b1fb4..a615f756c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -35,8 +35,8 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.StringRes; +import com.vk.dto.user.UserProfile; import com.vk.navigation.Navigator; -import com.vtosters.lite.UserProfile; import com.vtosters.lite.VKActivity; import com.vtosters.lite.api.ExtendedUserProfile; import com.vtosters.lite.auth.VKAccountManager; 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 5b9e157c9..9a027f0a0 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -29,14 +29,13 @@ import com.vk.notifications.NotificationsContainerFragment; import com.vtosters.lite.fragments.GamesFragment; import com.vtosters.lite.fragments.PhotosFragment; import com.vtosters.lite.fragments.ProfileFragment; -import com.vtosters.lite.fragments.d.DocumentsViewFragment; -import com.vtosters.lite.fragments.f.FriendsFragment; -import com.vtosters.lite.fragments.g.BirthdaysFragment; -import com.vtosters.lite.fragments.h.GroupsFragment; +import com.vtosters.lite.fragments.friends.FriendsFragment; +import com.vtosters.lite.fragments.gifts.BirthdaysFragment; import com.vtosters.lite.fragments.lives.LivesTabsFragment; -import com.vtosters.lite.fragments.m.VideosFragment; -import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment; 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 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 9871fbf62..44e66e9a5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -27,18 +27,16 @@ import android.content.res.Configuration; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.v7.widget.Toolbar; import android.view.View; import android.view.Window; import android.widget.ImageButton; import androidx.core.graphics.ColorUtils; -import com.vk.core.d.RecoloredDrawable; +import com.vk.core.drawable.RecoloredDrawable; import com.vk.core.ui.themes.VKTheme; import com.vk.core.ui.themes.VKThemeHelper; import com.vk.im.ui.themes.ImTheme; -import com.vk.im.ui.themes.ImThemeHelper; import com.vtosters.lite.R; import java.util.Arrays; @@ -50,8 +48,7 @@ public class Themes { ); public static void applyTheme(VKTheme theme, ImTheme imtheme) { - VKThemeHelper.b.a(theme); // VKThemeHelper.b.a(VKTheme value) VK Theme apply - ImThemeHelper.b.a(imtheme); // ImThemeHelper.b.a(ImTheme value) VK Theme Msg apply + // TODO } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing) public static void setTheme(Activity activity) {