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

fixed settings opening

Browse Source
This commit is contained in:
gdlbo
2022-06-22 14:47:26 +03:00
parent 42856485fc
commit 7c808f608f
21 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java
-3
View File
@@ -4,7 +4,6 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.util.Base64;
import android.util.Log;
import android.widget.Toast;
@@ -20,7 +19,6 @@ import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import okhttp3.CacheControl;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.MediaType;
@@ -28,7 +26,6 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import ru.vtosters.lite.utils.Globals;
public class VTVerifications {
public static final HashMap<Integer, Boolean> sServiceAccountsMap = new HashMap<>();
app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
+3 -1
View File
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import android.os.Bundle;
import com.vtosters.lite.R;
@@ -9,6 +11,6 @@ public class ActivityFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_activity);
addPreferencesFromResource(getIdentifier("preferences_activity", "xml"));
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
+3 -1
View File
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -15,7 +17,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_feed);
addPreferencesFromResource(getIdentifier("preferences_feed", "xml"));
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
+3 -1
View File
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import android.os.Bundle;
import com.vtosters.lite.R;
@@ -9,6 +11,6 @@ public class InstallGMSFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_gms);
addPreferencesFromResource(getIdentifier("preferences_gms", "xml"));
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+2 -1
View File
@@ -1,5 +1,6 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.os.Bundle;
@@ -13,7 +14,7 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_interface);
addPreferencesFromResource(getIdentifier("preferences_interface", "xml"));
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+2 -1
View File
@@ -1,6 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.CacheUtils.deleteCache;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.content.Context;
@@ -16,7 +17,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_messages);
addPreferencesFromResource(getIdentifier("preferences_messages", "xml"));
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java
+3 -1
View File
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import android.os.Bundle;
import com.vtosters.lite.R;
@@ -9,6 +11,6 @@ public class MusicFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_music);
addPreferencesFromResource(getIdentifier("preferences_music", "xml"));
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+2 -1
View File
@@ -3,6 +3,7 @@ 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.getIdentifier;
import static ru.vtosters.lite.utils.Globals.getUserToken;
import static ru.vtosters.lite.utils.Globals.restartApplication;
import static ru.vtosters.lite.utils.SettBackup.backupSettings;
@@ -35,7 +36,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_other);
addPreferencesFromResource(getIdentifier("preferences_other", "xml"));
prefs();
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java
+3 -1
View File
@@ -1,5 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import android.os.Bundle;
import com.vtosters.lite.R;
@@ -9,6 +11,6 @@ public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_proxy);
addPreferencesFromResource(getIdentifier("preferences_proxy", "xml"));
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+3 -2
View File
@@ -1,6 +1,7 @@
package ru.vtosters.lite.ui.fragments;
import static ru.vtosters.lite.utils.Globals.componentSwitcher;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.os.Bundle;
@@ -19,12 +20,12 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
addPreferencesFromResource(R.xml.preferences_themes);
addPreferencesFromResource(getIdentifier("preferences_themes", "xml"));
prefs();
}
public boolean apply(Preference preference, Object obj) {
if (((Boolean) obj).booleanValue()) {
if ((Boolean) obj) {
componentSwitcher("VTIconDefault", false);
componentSwitcher("VTIconVK", true);
} else {
app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java
+5 -5
View File
@@ -129,7 +129,7 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment {
super.onCreateOptionsMenu(menu, menuInflater);
MenuItem add = menu.add(0, 0, 0, "");
add.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
add.setIcon(getResources().getDrawable(com.vtosters.lite.R.drawable.ic_settings_24));
add.setIcon(getResources().getDrawable(getIdentifier("ic_settings_24", "drawable")));
}
@@ -221,7 +221,7 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment {
recycler.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
fab = new FloatingActionButton(container.getContext());
fab.setImageResource(R.drawable.ic_add_24);
fab.setImageResource(getIdentifier("ic_add_24", "drawable"));
fab.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
fab.setOnClickListener(v2 -> fabClick());
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT);
@@ -344,19 +344,19 @@ public class StickersFragment extends MaterialPreferenceToolbarFragment {
if (f.exists()) {
holder.stickerImage.setImageURI(Uri.parse("file://" + f.getAbsolutePath()));
} else {
holder.stickerImage.setImageDrawable(getResources().getDrawable(R.drawable.icon_vk_104));
holder.stickerImage.setImageDrawable(getResources().getDrawable(getIdentifier("icon_vk_104", "drawable")));
}
} catch (Exception e) {
e.printStackTrace();
}
holder.updateButton.setImageDrawable(recolorDrawable(getResources().getDrawable(R.drawable.ic_camera_switch_48)));
holder.updateButton.setImageDrawable(recolorDrawable(getResources().getDrawable(getIdentifier("ic_camera_switch_48", "drawable"))));
holder.updateButton.setOnClickListener(listener -> {
stickersService.setBotKey(TGPref.getTGBotKey());
stickersService.requestPackDownload(pack.id, new File(getContext().getFilesDir(), new File("VT-Stickers", pack.id).getAbsolutePath()));
});
holder.deleteButton.setImageDrawable(recolorDrawable(getResources().getDrawable(R.drawable.vkim_ic_msg_delete)));
holder.deleteButton.setImageDrawable(recolorDrawable(getResources().getDrawable(getIdentifier("vkim_ic_msg_delete", "drawable"))));
holder.deleteButton.setOnClickListener(listener -> {
stickersService.deletePack(pack);
notifyItemRemoved(position);
smali/assets/version.properties
+4 -4
View File
@@ -1,12 +1,12 @@
VERSION_BUILD=8a7763c
VERSION_BUILD=fb8252e
VERSION_BRANCH=vtl-remaster
VERSION_BASE=
VERSION_BRANCHID=vtl-remaster
VERSION_BRANCHTYPE=vtl-remaster
VERSION_COMMIT=8a7763c356be1153c0bde11673714e7a671e9e14
VERSION_COMMIT=fb8252eebe32850caeac8a25e2273ce785c37f31
VERSION_GRADLE=
VERSION_DISPLAY=vtl-remaster-8a7763c-dirty
VERSION_FULL=vtl-remaster-8a7763c-dirty
VERSION_DISPLAY=vtl-remaster-fb8252e-dirty
VERSION_FULL=vtl-remaster-fb8252e-dirty
VERSION_SCM=git
VERSION_TAG=
VERSION_LAST_TAG=v0.2.9-beta2
smali/res/xml/preferences_activity.xml
-5
View File
@@ -13,7 +13,6 @@
android:key="undeletemsg"
android:summary="@string/activity_undel_attachments"
android:title="@string/activity_undel_enable" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/online_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -26,7 +25,6 @@
android:key="setoffline"
android:summary="@string/vtloffline2summary"
android:title="@string/vtloffline2" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/dnr">
<Preference
@@ -49,7 +47,6 @@
android:defaultValue="false"
android:key="read_bot"
android:title="@string/act_bot" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/dnw">
<Preference
@@ -68,7 +65,6 @@
android:defaultValue="false"
android:key="write_bot"
android:title="@string/act_bot" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/stories_vtl">
<Preference
@@ -79,7 +75,6 @@
android:defaultValue="true"
android:key="dns"
android:title="@string/dns" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/privacy_vtl">
<com.vtosters.lite.ui.MaterialSwitchPreference
smali/res/xml/preferences_feed.xml
-3
View File
@@ -26,7 +26,6 @@
android:key="copyright_post"
android:summary="@string/feed_ads_sources_summary"
android:title="@string/feed_ads_sources" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlfilters">
<Preference
@@ -57,7 +56,6 @@
android:key="shitposting"
android:summary="@string/shitpostingsummary"
android:title="@string/shitposting" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlrecommend">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -80,7 +78,6 @@
android:key="captions"
android:summary="@string/vtlrecommendmarksummary"
android:title="@string/vtlrecommendmark" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlfeedwork">
<Preference
smali/res/xml/preferences_gms.xml
-2
View File
@@ -9,7 +9,6 @@
android:enabled="false"
android:summary="GMS необходим для работы уведомлений, для работы музыки и ещё очень многих компонентов приложения"
android:title="Зачем мне нужен GMS для VTosters?" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="Как скачать?">
<Preference
@@ -34,7 +33,6 @@
android:action="android.intent.action.VIEW"
android:data="https://microg.org" />
</Preference>
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="Что делать дальше?">
<Preference
smali/res/xml/preferences_interface.xml
-3
View File
@@ -15,7 +15,6 @@
android:defaultValue="true"
android:key="swipe"
android:title="@string/interfacenewsfeedswipe" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfaceglobal">
<com.vtosters.lite.ui.SummaryListPreference
@@ -49,7 +48,6 @@
android:key="shortpost"
android:summary="@string/interfaceglobalpostsum"
android:title="@string/interfaceglobalpost" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfacevideo">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -62,7 +60,6 @@
android:key="__dbg_disable_video_feed"
android:summary="@string/interfacevideorecsum"
android:title="@string/interfacevideorec" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlother">
<com.vtosters.lite.ui.MaterialSwitchPreference
smali/res/xml/preferences_messages.xml
-4
View File
@@ -10,7 +10,6 @@
android:defaultValue="false"
android:key="roundedmsgs"
android:title="@string/roundedmsgs" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/sett_media">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -21,7 +20,6 @@
android:defaultValue="true"
android:key="compressVideos"
android:title="@string/sett_compress_videos" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="VK Me">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -33,7 +31,6 @@
android:defaultValue="false"
android:key="vkme_notifs"
android:title="@string/vkme_notifs" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfaceemoji">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -51,7 +48,6 @@
android:key="isBGStickersEnabled"
android:summary="@string/BGStickerssum"
android:title="@string/BGStickers" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlother">
<com.vtosters.lite.ui.SummaryListPreference
smali/res/xml/preferences_music.xml
-1
View File
@@ -16,7 +16,6 @@
android:defaultValue="false"
android:key="libvkx_integration"
android:title="@string/vkx_integration" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vk_fix_music_other">
<com.vtosters.lite.ui.MaterialSwitchPreference
smali/res/xml/preferences_other.xml
-3
View File
@@ -17,7 +17,6 @@
android:defaultValue="true"
android:key="color_grishka"
android:title="@string/other_fix_dynamic_colors" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtsystem">
<Preference
@@ -33,7 +32,6 @@
<Preference
android:key="tokencopy"
android:title="@string/copytokenbtn" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<!-- <PreferenceCategory android:title="Backup system">
<Preference
@@ -45,7 +43,6 @@
<Preference
android:key="restoreprefs"
android:title="Restore prefs" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory> -->
<PreferenceCategory android:title="@string/vtverify">
<Preference
smali/res/xml/preferences_proxy.xml
+1 -6
View File
@@ -12,7 +12,7 @@
android:entryValues="@array/proxy_value"
android:key="proxy"
android:title="@string/useproxy" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
<com.vtosters.lite..MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxyadvsettings">
<EditTextPreference
@@ -27,7 +27,6 @@
android:defaultValue=""
android:key="proxystatic"
android:title="@string/proxystatic" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxyhttp">
<EditTextPreference
@@ -48,7 +47,6 @@
android:key="proxyPassHTTP"
android:summary="@string/proxy_if"
android:title="@string/proxy_password_title" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxyhttps">
<EditTextPreference
@@ -69,7 +67,6 @@
android:key="proxyPassHTTPS"
android:summary="@string/proxy_if"
android:title="@string/proxy_password_title" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxysocks">
<EditTextPreference
@@ -80,7 +77,6 @@
android:defaultValue=""
android:key="proxyPortSocks"
android:title="@string/proxyport" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxyowners">
<Preference
@@ -105,7 +101,6 @@
android:action="android.intent.action.VIEW"
android:data="https://github.com/xtrafrancyz/vk-proxy" />
</Preference>
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
<Preference
android:persistent="false"
android:summary="@string/proxyownerszbr"
smali/res/xml/preferences_themes.xml
-2
View File
@@ -24,7 +24,6 @@
android:key="oldicons"
android:summary="@string/interface_global_old_icons_summary"
android:title="@string/interface_global_old_icons" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vticon">
<com.vtosters.lite.ui.MaterialSwitchPreference
@@ -32,7 +31,6 @@
android:key="iconvk"
android:summary="@string/vticonsummary"
android:title="@string/vticonbtn" />
<com.vtosters.lite.ui.MaterialSectionDividerPreference />
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlother">
<com.vtosters.lite.ui.MaterialSwitchPreference