y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto refactor imports

Browse Source
This commit is contained in:
gdlbo
2023-07-01 16:42:33 +03:00
parent 81752895ab
commit 526c9a607a
17 changed files with 123 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/hooks/GcmHook.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class GcmHook {
private static final String agent = String.format("Android-GCM/1.5 (%s %s)", Build.MODEL, Build.MODEL);
private static KeyPair pair;
private static int rid = 0;
static {
genNewKey();
}
app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java
+3 -1
View File
@@ -6,7 +6,9 @@ import androidx.recyclerview.widget.RecyclerView;
import com.vk.core.preference.Preference;
import com.vk.discover.DiscoverItemDecorator;
import java.util.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import static java.lang.Long.MAX_VALUE;
import static ru.vtosters.hooks.other.Preferences.*;
app/src/main/java/ru/vtosters/hooks/RenameHook.java
-2
View File
@@ -1,9 +1,7 @@
package ru.vtosters.hooks;
import androidx.core.util.Pair;
import org.json.JSONException;
import org.json.JSONObject;
import ru.vtosters.lite.utils.RenameTool;
public class RenameHook {
public static void injectIntoJson(JSONObject obj) throws JSONException {
app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java
-2
View File
@@ -16,12 +16,10 @@ import android.webkit.WebView;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.ColorUtils;
import com.vk.articles.preload.WebCachePreloader;
import com.vk.core.drawable.RecoloredDrawable;
import com.vk.core.preference.Preference;
import com.vk.core.ui.themes.MilkshakeHelper;
import com.vk.core.ui.themes.VKTheme;
import com.vk.core.ui.themes.VKThemeHelper;
app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java
-1
View File
@@ -1,7 +1,6 @@
package ru.vtosters.hooks.ssfs;
import com.vk.core.dialogs.alert.VkAlertDialog;
import org.json.JSONException;
import org.json.JSONObject;
import ru.vtosters.hooks.other.Preferences;
import ru.vtosters.lite.ssfs.ImBanner;
app/src/main/java/ru/vtosters/lite/music/TransportStream.java
+1 -1
View File
@@ -4,8 +4,8 @@ import android.text.TextUtils;
public class TransportStream {
private String mKeyUri;
private final String mMediaSegmentUri;
private String mKeyUri;
private String mMediaSegmentName;
public TransportStream(String baseURI, String mediaSegmentName) {
app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java
+1 -2
View File
@@ -15,10 +15,9 @@ public class VKM3UParser {
//Playlist types
static public int PLAYLIST_TYPE_VOD = 0;
static public int PLAYLIST_TYPE_EVENT = 1;
private final String mData;
//region Extended M3U global extensions
public List<TransportStream> mTransportStreams = new ArrayList<>();
private final String mData;
/**
* @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.1.2">EXT-X-VERSION</a>
**/
app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java
+1 -1
View File
@@ -19,8 +19,8 @@ import ru.vtosters.lite.utils.AndroidUtils;
import java.io.IOException;
import static ru.vtosters.hooks.DateHook.getLocale;
import static ru.vtosters.hooks.other.Preferences.getBoolValue;
import static ru.vtosters.hooks.GroupsCatalogInjector.injectIntoCatalog;
import static ru.vtosters.hooks.other.Preferences.getBoolValue;
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;
app/src/main/java/ru/vtosters/lite/themes/utils/ArscEditor.java
+22 -27
View File
@@ -1,29 +1,25 @@
package ru.vtosters.lite.themes.utils;
import com.google.devrel.gmscore.tools.apk.arsc.*;
import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceFile;
import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceValue;
import com.google.devrel.gmscore.tools.apk.arsc.ResourceTableChunk;
public class ArscEditor {
public static void changeColors(BinaryResourceFile arsc,int[] colorIds,int color) {
for(var chunk:arsc.getChunks())
{
final var resTableChunk=(ResourceTableChunk)chunk;
for(var packageChunk:resTableChunk.getPackages())
{
for(var typeChunk:packageChunk.getTypeChunks("color"))
{
for(var entry:typeChunk.getEntries().entrySet())
{
final var value=entry.getValue();
if(value.isComplex())continue;
final var binValue=value.value();
if(!isColorResourceValue(binValue))continue;
final var resId=packageChunk.getId()<<24|typeChunk.getId()<<16|entry.getKey();
for(var colodId:colorIds)
{
if(resId==colodId)
{
binValue.data=color;
public static void changeColors(BinaryResourceFile arsc, int[] colorIds, int color) {
for (var chunk : arsc.getChunks()) {
final var resTableChunk = (ResourceTableChunk) chunk;
for (var packageChunk : resTableChunk.getPackages()) {
for (var typeChunk : packageChunk.getTypeChunks("color")) {
for (var entry : typeChunk.getEntries().entrySet()) {
final var value = entry.getValue();
if (value.isComplex()) continue;
final var binValue = value.value();
if (!isColorResourceValue(binValue)) continue;
final var resId = packageChunk.getId() << 24 | typeChunk.getId() << 16 | entry.getKey();
for (var colodId : colorIds) {
if (resId == colodId) {
binValue.data = color;
break;
}
}
@@ -33,11 +29,10 @@ public class ArscEditor {
}
}
private static boolean isColorResourceValue(BinaryResourceValue value)
{
return value.type==BinaryResourceValue.Type.INT_COLOR_ARGB8
||value.type==BinaryResourceValue.Type.INT_COLOR_RGB8
||value.type==BinaryResourceValue.Type.INT_COLOR_ARGB4
||value.type==BinaryResourceValue.Type.INT_COLOR_RGB4;
private static boolean isColorResourceValue(BinaryResourceValue value) {
return value.type == BinaryResourceValue.Type.INT_COLOR_ARGB8
|| value.type == BinaryResourceValue.Type.INT_COLOR_RGB8
|| value.type == BinaryResourceValue.Type.INT_COLOR_ARGB4
|| value.type == BinaryResourceValue.Type.INT_COLOR_RGB4;
}
}
app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java
+11 -15
View File
@@ -36,7 +36,7 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
private final List<T> mSelectedItems;
private final List<T> mDisabledItems;
private final List<T> mUnmovedItems;
final private List< T > mExceptions=new ArrayList<>();
final private List<T> mExceptions = new ArrayList<>();
private final IViewHolderBinder mBinder;
// Min and max counts
@@ -50,8 +50,7 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
this.mBinder = binder;
}
public void setExceptions(T... exceptions)
{
public void setExceptions(T... exceptions) {
mExceptions.clear();
mExceptions.addAll(Arrays.asList(exceptions));
}
@@ -183,21 +182,18 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
return false;
switch (getTabType(fromPosition)) {
case SELECTED_STATE -> {
if((getTabType(toPosition) == DISABLED_STATE
if ((getTabType(toPosition) == DISABLED_STATE
&& mSelectedItems.size() == mMinSelectedItems))
return false;
if (getItemViewType(toPosition) == CATEGORY_TITLE)
{
if(mExceptions.size()>0)
{
int q=0;
for(var ex:mExceptions)
if(mSelectedItems.contains(ex))++q;
if(q==1)return false;
if (getItemViewType(toPosition) == CATEGORY_TITLE) {
if (mExceptions.size() > 0) {
int q = 0;
for (var ex : mExceptions)
if (mSelectedItems.contains(ex)) ++q;
if (q == 1) return false;
}
mDisabledItems.add(0,mSelectedItems.remove(fromPosition-1));
}
else Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
mDisabledItems.add(0, mSelectedItems.remove(fromPosition - 1));
} else Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
}
case DISABLED_STATE -> {
if (getTabType(toPosition) == SELECTED_STATE
app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java
+64 -64
View File
@@ -59,70 +59,6 @@ public class DockBarEditorManager {
: sInstance;
}
private void init() {
if (vkme()) {
mSelectedTabs.add(getTabByTag("tab_settings"));
if (vkme_notifs()) {
if (milkshake()) {
mSelectedTabs.add(getTabByTag("tab_feedback"));
} else {
mSelectedTabs.add(getTabByTag("tab_friends"));
}
}
mSelectedTabs.add(getTabByTag("tab_messages"));
mSelectedTabs.add(getTabByTag("tab_profile"));
return;
}
checkOldConfig();
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();
}
private void parseSelectedTabs(String[] selectedTabsTags) {
var allTags = new ArrayList<>(ALL_TAGS);
for (String tag : selectedTabsTags) {
mSelectedTabs.add(getTabByTag(tag));
allTags.remove(tag);
}
for (String tag : allTags) {
mDisabledTabs.add(getTabByTag(tag));
}
}
public void save() {
var sb = new StringBuilder();
for (DockBarTab tab : mSelectedTabs)
sb.append(tab.tag).append(",");
getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
}
public void reset() {
Preferences.getPreferences()
.edit()
.putString("dockbar_tabs", "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
.commit();
}
public List<DockBarTab> getSelectedTabs() {
return mSelectedTabs;
}
public List<DockBarTab> getDisabledTabs() {
return mDisabledTabs;
}
public static DockBarTab getTabByTag(String tag) {
return switch (tag) {
case "tab_news" -> DockBarTab.valuesOf(
@@ -235,4 +171,68 @@ public class DockBarEditorManager {
useNewSettings());
};
}
private void init() {
if (vkme()) {
mSelectedTabs.add(getTabByTag("tab_settings"));
if (vkme_notifs()) {
if (milkshake()) {
mSelectedTabs.add(getTabByTag("tab_feedback"));
} else {
mSelectedTabs.add(getTabByTag("tab_friends"));
}
}
mSelectedTabs.add(getTabByTag("tab_messages"));
mSelectedTabs.add(getTabByTag("tab_profile"));
return;
}
checkOldConfig();
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();
}
private void parseSelectedTabs(String[] selectedTabsTags) {
var allTags = new ArrayList<>(ALL_TAGS);
for (String tag : selectedTabsTags) {
mSelectedTabs.add(getTabByTag(tag));
allTags.remove(tag);
}
for (String tag : allTags) {
mDisabledTabs.add(getTabByTag(tag));
}
}
public void save() {
var sb = new StringBuilder();
for (DockBarTab tab : mSelectedTabs)
sb.append(tab.tag).append(",");
getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
}
public void reset() {
Preferences.getPreferences()
.edit()
.putString("dockbar_tabs", "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
.commit();
}
public List<DockBarTab> getSelectedTabs() {
return mSelectedTabs;
}
public List<DockBarTab> getDisabledTabs() {
return mDisabledTabs;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/DataSettingsFragment.java
+12 -6
View File
@@ -168,12 +168,18 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
var pref = Preferences.getPreferences().getString("autoclearcache", "Default");
switch (pref) {
case "Default" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_disabled));
case "100mb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_100mb));
case "500mb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_500mb));
case "1gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_1gb));
case "2gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_2gb));
case "5gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_5gb));
case "Default" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_disabled));
case "100mb" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_100mb));
case "500mb" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_500mb));
case "1gb" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_1gb));
case "2gb" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_2gb));
case "5gb" ->
findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_5gb));
}
PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("accounts"));
app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
-20
View File
@@ -1,35 +1,16 @@
package ru.vtosters.lite.ui.fragments;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.*;
import android.os.Bundle;
import android.util.TypedValue;
import android.webkit.WebView;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.Toast;
import androidx.appcompat.view.ContextThemeWrapper;
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;
import com.vk.im.engine.ImEngine1;
import com.vk.im.engine.ImEngineExt;
import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
import com.vk.imageloader.VKImageLoader;
import com.vk.media.player.cache.AutoPlayCacheHolder;
import com.vk.mediastore.MediaStorage;
import com.vk.pushes.PushSubscriber;
import com.vk.stickers.Stickers;
import com.vtosters.lite.R;
import com.vtosters.lite.auth.VKAccountManager;
import com.vtosters.lite.im.ImEngineProvider;
import ru.vtosters.hooks.GmsHook;
import ru.vtosters.hooks.SwitchHook;
import ru.vtosters.hooks.other.Preferences;
import ru.vtosters.hooks.other.ThemesUtils;
import ru.vtosters.lite.deviceinfo.DeviceInfoCollector;
import ru.vtosters.lite.ssfs.UsersList;
import ru.vtosters.lite.ui.activities.VKAdminTokenActivity;
@@ -148,7 +129,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
}
private void copyText(String src) {
var manager = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE);
manager.setPrimaryClip(ClipData.newPlainText("MBH-ST", src));
app/src/main/java/ru/vtosters/lite/ui/items/DockBarTab.java
+3 -5
View File
@@ -2,8 +2,7 @@ package ru.vtosters.lite.ui.items;
import com.vk.core.fragments.FragmentImpl;
public class DockBarTab
{
public class DockBarTab {
public String tag;
public int iconID;
@@ -34,8 +33,7 @@ public class DockBarTab
}
@Override
public boolean equals(Object arg)
{
return this.id==((DockBarTab)arg).id;
public boolean equals(Object arg) {
return this.id == ((DockBarTab) arg).id;
}
}
app/src/main/java/ru/vtosters/lite/ui/items/SuperAppItem.java
+4 -8
View File
@@ -1,9 +1,6 @@
package ru.vtosters.lite.ui.items;
import ru.vtosters.lite.ui.adapters.CategorizedAdapter;
public class SuperAppItem
{
public class SuperAppItem {
public String type;
public String title;
@@ -18,9 +15,8 @@ public class SuperAppItem
}
@Override
public boolean equals(Object arg)
{
var item=(SuperAppItem)arg;
return this.type.equals(item.type)&&this.title.equals(item.title);
public boolean equals(Object arg) {
var item = (SuperAppItem) arg;
return this.type.equals(item.type) && this.title.equals(item.title);
}
}
app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java
-1
View File
@@ -18,7 +18,6 @@ import ru.vtosters.hooks.other.Preferences;
import ru.vtosters.lite.foaf.FoafBase;
import ru.vtosters.lite.utils.AccountManagerUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.RenameTool;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java
-4
View File
@@ -5,12 +5,8 @@ import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.View;
import android.widget.ImageView;
import com.vk.im.engine.h;
import com.vtosters.lite.R;
import ru.vtosters.hooks.other.Preferences;
import ru.vtosters.hooks.other.ThemesUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import vigo.sdk.Log;