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

fix settings

Browse Source
This commit is contained in:
aliveoutside
2022-06-19 05:49:10 +03:00
parent b1ce420393
commit 3cae6da5d7
12 changed files with 160 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vk/core/ui/themes/VKTheme.java
-27
View File
@@ -1,27 +0,0 @@
package com.vk.core.ui.themes;
import ru.vtosters.lite.R;
import ru.vtosters.lite.utils.Themes;
public enum VKTheme {
DEFAULT_LIGHT(0, R.g.BaseStyle),
DARK(1, R.g.BaseDarkStyle),
AMOLED(2, Themes.getAmoledTheme());
private final long id;
private final int themeResId;
VKTheme(long j, int i) {
this.id = j;
this.themeResId = i;
}
public final long a() {
return this.id;
}
public final int b() {
return this.themeResId;
}
}
app/src/main/java/com/vk/im/ui/themes/ImTheme.java
-33
View File
@@ -1,33 +0,0 @@
package com.vk.im.ui.themes;
import static com.vk.im.ui.R.m.VkIm_Theme_VkApp_Dark;
import static com.vk.im.ui.R.m.VkIm_Theme_VkApp_Light;
import static com.vk.im.ui.R.m.VkIm_Theme_VkMe_Dark;
import static com.vk.im.ui.R.m.VkIm_Theme_VkMe_Light;
import ru.vtosters.lite.utils.Themes;
public enum ImTheme {
VKAPP_LIGHT(0, VkIm_Theme_VkApp_Light),
VKAPP_DARK(3, VkIm_Theme_VkApp_Dark),
VKME_LIGHT(1, VkIm_Theme_VkMe_Light),
VKME_DARK(2, VkIm_Theme_VkMe_Dark),
VKME_AMOLED(5, Themes.getAmoledMeTheme()),
VKAPP_AMOLED(4, Themes.getAmoledImTheme());
private final int id;
private final int themeResId;
ImTheme(int i, int i2) {
this.id = i;
this.themeResId = i2;
}
public final int a() {
return this.id;
}
public final int b() {
return this.themeResId;
}
}
app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java
+4 -4
View File
@@ -71,13 +71,13 @@ public class PreferencesUtil {
materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference)
}
public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, int icon, boolean defValue, Preference.OnPreferenceClickListener listener) {
public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, int icon, boolean defValue, Preference.OnPreferenceChangeListener listener) {
MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext());
materialSwitchPreference.setTitle(title); // setTitle
materialSwitchPreference.setSummary(summary); // setSummary
materialSwitchPreference.setKey(key); // setKey
materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue
materialSwitchPreference.setOnPreferenceClickListener(listener); // setOnPreferenceClickListener
materialSwitchPreference.setOnPreferenceChangeListener(listener); // setOnPreferenceClickListener
if (icon != 1)
materialSwitchPreference.setIcon(setTint(getContext(), Objects.requireNonNull(ContextCompat.getDrawable(getContext(), icon)))); // preference.setIcon
@@ -85,7 +85,7 @@ public class PreferencesUtil {
fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference)
}
public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, String icon, boolean defValue, Preference.OnPreferenceClickListener listener) {
public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, String icon, boolean defValue, Preference.OnPreferenceChangeListener listener) {
MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext());
materialSwitchPreference.setTitle(title); // setTitle
materialSwitchPreference.setSummary(summary); // setSummary
@@ -95,7 +95,7 @@ public class PreferencesUtil {
if (icon != null)
materialSwitchPreference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon
materialSwitchPreference.setOnPreferenceClickListener(listener); // setOnPreferenceClickListener(listener)
materialSwitchPreference.setOnPreferenceChangeListener(listener); // setOnPreferenceClickListener(listener)
fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference)
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java
-1
View File
@@ -3,7 +3,6 @@ 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 {
app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
+6 -5
View File
@@ -4,7 +4,8 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.vk.core.preference.Preference;
import androidx.preference.Preference;
import com.vk.navigation.Navigator;
import com.vk.newsfeed.NewsfeedSettingsFragment;
import com.vtosters.lite.R;
@@ -19,17 +20,17 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
}
private void prefs() {
a("officialnewssett").a(new openofficialsett());
findPreference("officialnewssett").setOnPreferenceClickListener(new openofficialsett());
}
public static class openofficialsett implements Preference.c {
public class openofficialsett implements Preference.OnPreferenceClickListener {
openofficialsett() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
Context context = getContext();
Intent a2 = new Navigator(NewsfeedSettingsFragment.class).a(context);
Intent a2 = new Navigator(NewsfeedSettingsFragment.class).b(context);
context.startActivity(a2);
return true;
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java
-1
View File
@@ -3,7 +3,6 @@ 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 {
app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+12 -11
View File
@@ -4,7 +4,8 @@ import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.os.Bundle;
import com.vk.core.preference.Preference;
import androidx.preference.Preference;
import com.vtosters.lite.R;
import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
@@ -17,25 +18,25 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
}
private void prefs() {
a("newfeed").a(new restart());
a("dateformat").a(new restart());
a("stories").a(new restart());
a("swipe").a(new restart());
a("dockcounter").a(new restart());
findPreference("newfeed").setOnPreferenceClickListener(new restart());
findPreference("dateformat").setOnPreferenceClickListener(new restart());
findPreference("stories").setOnPreferenceClickListener(new restart());
findPreference("swipe").setOnPreferenceClickListener(new restart());
findPreference("dockcounter").setOnPreferenceClickListener(new restart());
}
public boolean restart(Preference preference, Object obj) {
public boolean restart(Preference preference) {
restartApplicationWithTimer();
return true;
}
public class restart implements Preference.b {
public class restart implements Preference.OnPreferenceClickListener {
restart() {
}
@Override // android.support.v7.preference.Preference.b
public boolean a(Preference preference, Object obj) {
return InterfaceFragment.this.restart(preference, obj);
@Override
public boolean onPreferenceClick(Preference preference) {
return InterfaceFragment.this.restart(preference);
}
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+42 -43
View File
@@ -15,10 +15,10 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import androidx.preference.Preference;
import com.vk.audio.AudioMessageUtils;
import com.vk.auth.api.VKAccount;
import com.vk.core.preference.Preference;
import com.vk.core.util.AppContextHolder;
import com.vk.core.util.ToastUtils;
import com.vk.imageloader.VKImageLoader;
import com.vk.pushes.PushSubscriber;
@@ -28,7 +28,7 @@ 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;
import ru.vtosters.lite.utils.Globals;
public class OtherFragment extends MaterialPreferenceToolbarFragment {
@@ -40,141 +40,140 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
}
private void prefs() {
a("firebasefix").a(new a());
a("applicationstop").a(new b());
a("tokencopy").a(new c());
a("applicationrestart").a(new d());
a("clearcache").a(new e());
a("stickfix").a(new f());
a("deleteprefs").a(new deleteprefs());
findPreference("firebasefix").setOnPreferenceClickListener(new a());
findPreference("applicationstop").setOnPreferenceClickListener(new b());
findPreference("tokencopy").setOnPreferenceClickListener(new c());
findPreference("applicationrestart").setOnPreferenceClickListener(new d());
findPreference("clearcache").setOnPreferenceClickListener(new e());
findPreference("stickfix").setOnPreferenceClickListener(new f());
findPreference("deleteprefs").setOnPreferenceClickListener(new deleteprefs());
// a("saveprefs").a((Preference.c) new saveprefs());
// a("restoreprefs").a((Preference.c) new restoreprefs());
}
static class c implements Preference.c {
class c implements Preference.OnPreferenceClickListener {
c() {
}
public static void copy(Context context, String str) {
public void copy(Context context, String str) {
((ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", str));
makeText(context, getString("copybtn"), LENGTH_SHORT).show();
ToastUtils.a(getString("tokenwarning"));
makeText(context, Globals.getString("copybtn"), LENGTH_SHORT).show();
ToastUtils.a(Globals.getString("tokenwarning"));
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
copy(getContext(), getUserToken());
return true;
}
}
public static class e implements Preference.c {
public class e implements Preference.OnPreferenceClickListener {
e() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE);
SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
prefs.edit().clear().commit();
prefs2.edit().clear().commit();
VKImageLoader.b();
VKImageLoader.e();
ImEngineProvider.a().h();
AudioMessageUtils.j();
FileUtils.l();
deleteCache();
ToastUtils.a(getString("cachecleaned"));
ToastUtils.a(Globals.getString("cachecleaned"));
return true;
}
}
public static class b implements Preference.c {
public class b implements Preference.OnPreferenceClickListener {
b() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
System.exit(0);
return true;
}
}
public static class d implements Preference.c {
public static class d implements Preference.OnPreferenceClickListener {
d() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
restartApplication();
return true;
}
}
public class a implements Preference.c {
public class a implements Preference.OnPreferenceClickListener {
a() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
VKAccount b = VKAccountManager.b();
PushSubscriber.a.a(b.b(), b.c());
ToastUtils.a(getString("fcmtokenrem"));
AppContextHolder.a.getSharedPreferences("gcm", 0).edit().clear().apply();
OtherFragment.this.aB().postDelayed(() -> {
PushSubscriber.a.a(true);
ToastUtils.a(getString("fcmtokenget"));
ToastUtils.a(getString("fcmtokenfixed"));
public boolean onPreferenceClick(Preference preference) {
VKAccount b = VKAccountManager.d();
PushSubscriber.e.a();
ToastUtils.a(Globals.getString("fcmtokenrem"));
Globals.getContext().getSharedPreferences("gcm", 0).edit().clear().apply();
OtherFragment.this.getListView().postDelayed(() -> {
PushSubscriber.e.a(true);
ToastUtils.a(Globals.getString("fcmtokenget"));
ToastUtils.a(Globals.getString("fcmtokenfixed"));
}, 1000);
return true;
}
}
public static class f implements Preference.c {
public class f implements Preference.OnPreferenceClickListener {
f() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
SharedPreferences prefs = getContext().getSharedPreferences("stickers", Context.MODE_PRIVATE);
SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
prefs.edit().clear().commit();
prefs2.edit().clear().commit();
deleteCache();
ToastUtils.a(getString("cachecleaned"));
ToastUtils.a(Globals.getString("cachecleaned"));
return true;
}
}
public static class deleteprefs implements Preference.c {
public class deleteprefs implements Preference.OnPreferenceClickListener {
deleteprefs() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
deletePrefs();
restartApplication();
return true;
}
}
public static class saveprefs implements Preference.c {
public class saveprefs implements Preference.OnPreferenceClickListener {
saveprefs() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
backupSettings();
return true;
}
}
public static class restoreprefs implements Preference.c {
public class restoreprefs implements Preference.OnPreferenceClickListener {
restoreprefs() {
}
@Override // android.support.v7.preference.Preference.c
public boolean a(Preference preference) {
public boolean onPreferenceClick(Preference preference) {
restoreBackup();
return true;
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+15 -12
View File
@@ -5,11 +5,14 @@ import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.os.Bundle;
import com.vk.core.preference.Preference;
import androidx.preference.Preference;
import com.vk.core.util.ToastUtils;
import com.vtosters.lite.R;
import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
import ru.vtosters.lite.utils.Globals;
public class ThemesFragment extends MaterialPreferenceToolbarFragment {
@@ -29,28 +32,28 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
componentSwitcher("VTIconVK", false);
}
ToastUtils.a(getString("iconapplying"));
ToastUtils.a(Globals.getString("iconapplying"));
return true;
}
private void prefs() {
a("iconvk").a(new a());
a("darktheme").a(new restart());
a("lighttheme").a(new restart());
a("navbar").a(new restart());
findPreference("iconvk").setOnPreferenceChangeListener(new a());
findPreference("darktheme").setOnPreferenceClickListener(new restart());
findPreference("lighttheme").setOnPreferenceClickListener(new restart());
findPreference("navbar").setOnPreferenceClickListener(new restart());
}
public static class restart implements Preference.b {
@Override // android.support.v7.preference.Preference.b
public boolean a(Preference preference, Object obj) {
public static class restart implements Preference.OnPreferenceClickListener {
@Override
public boolean onPreferenceClick(Preference preference) {
restartApplicationWithTimer();
return true;
}
}
public class a implements Preference.b {
@Override // android.support.v7.preference.Preference.b
public boolean a(Preference preference, Object obj) {
public class a implements Preference.OnPreferenceChangeListener {
@Override
public boolean onPreferenceChange(Preference preference, Object obj) {
return ThemesFragment.this.apply(preference, obj);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+79 -79
View File
@@ -58,7 +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;
import ru.vtosters.lite.utils.Globals;
public class VTSettings extends MaterialPreferenceToolbarFragment {
@@ -91,22 +91,22 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
if (vkme()) {
PreferencesUtil.addPreferenceDrawable(this, "", name, id, drawableFromUrl(avatarUrl), preference -> {
Context context = getContext();
Intent a2 = new Navigator(MultiAccountFragment.class).a(context);
Intent a2 = new Navigator(MultiAccountFragment.class).b(context);
context.startActivity(a2);
return false;
});
} else {
PreferencesUtil.addPreference(this, "", getString("accounts"), multiaccsumm, "ic_user_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("accounts"), multiaccsumm, "ic_user_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(MultiAccountFragment.class).a(context);
Intent a2 = new Navigator(MultiAccountFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreferenceCategory(this, getString("vtsettdarktheme"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettdarktheme"));
}
PreferencesUtil.addMaterialSwitchPreference(this, "isdark", getString("vtsettdarktheme"), "", "ic_palette_24", false, (preference, o) -> {
PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", "ic_palette_24", false, (preference, o) -> {
boolean value = (boolean) o;
if(value){
@@ -117,14 +117,14 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
edit().putBoolean("isdark", value).commit();
setTheme(this.p());
setTheme(this.getActivity());
restartApplicationWithTimer();
return true;
});
if (Build.VERSION.SDK_INT >= 28) {
PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", getString("appearance_theme_use_system"), getString("appearance_theme_use_system_summary"), "ic_recent_24", true, (preference, o) -> {
PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), "ic_recent_24", true, (preference, o) -> {
boolean value = (boolean) o;
edit().putBoolean("systemtheme", value).commit();
@@ -134,224 +134,224 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
}
if (!isGmsInstalled()) {
PreferencesUtil.addPreference(this, "", getString("installgms"), "", "ic_alert", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("installgms"), "", "ic_alert", preference -> {
Context context = getContext();
Intent a2 = new Navigator(InstallGMSFragment.class).a(context);
Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
context.startActivity(a2);
return false;
});
}
if(devmenu()){
PreferencesUtil.addPreferenceCategory(this, getString("sett_debug"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("sett_debug"));
PreferencesUtil.addPreference(this, "", getString("sett_debug"), "", "ic_bug_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("sett_debug"), "", "ic_bug_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(SettingsDebugFragment.class).a(context);
Intent a2 = new Navigator(SettingsDebugFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addMaterialSwitchPreference(this, "ssl", getString("debug_developer_force_ssl"), getString("debug_developer_force_ssl_summary"), "ic_globe_24", true, (preference, o) -> {
PreferencesUtil.addMaterialSwitchPreference(this, "ssl", Globals.getString("debug_developer_force_ssl"), Globals.getString("debug_developer_force_ssl_summary"), "ic_globe_24", true, (preference, o) -> {
boolean value = (boolean) o;
edit().putBoolean("ssl", value).commit();
return true;
});
}
PreferencesUtil.addPreferenceCategory(this, getString("vtsettaccount"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaccount"));
PreferencesUtil.addPreference(this, "", getString("vkconnect"), "", "ic_tags_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vkconnect"), "", "ic_tags_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(VKConnect.class).a(context);
Intent a2 = new Navigator(VKConnect.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("privacy_settings"), "", "ic_privacy_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("privacy_settings"), "", "ic_privacy_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(PrivacyFragment.class).a(context);
Intent a2 = new Navigator(PrivacyFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("sett_account"), "", "ic_user_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("sett_account"), "", "ic_user_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(SettingsAccountFragment.class).a(context);
Intent a2 = new Navigator(SettingsAccountFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("bugs"), "", "ic_bug_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("bugs"), "", "ic_bug_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(Bugs.class).a(context);
Intent a2 = new Navigator(Bugs.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtssfs"), ssfs, "ic_link_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtssfs"), ssfs, "ic_link_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(SSFS.class).a(context);
Intent a2 = new Navigator(SSFS.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreferenceCategory(this, getString("notification_settings"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("notification_settings"));
PreferencesUtil.addPreference(this, "", getString("sett_general"), "", "ic_settings_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("sett_general"), "", "ic_settings_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(SettingsGeneralFragment.class).a(context);
Intent a2 = new Navigator(SettingsGeneralFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("blacklist"), "", "ic_users_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("blacklist"), "", "ic_users_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(BlacklistFragment.class).a(context);
Intent a2 = new Navigator(BlacklistFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("sett_notifications"), "", "ic_notification_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("sett_notifications"), "", "ic_notification_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(NotificationsSettingsFragment.class).a(context);
Intent a2 = new Navigator(NotificationsSettingsFragment.class).b(context);
context.startActivity(a2);
return false;
});
if (VKAccountManager.b().isRealMusicSubs()) {
PreferencesUtil.addPreference(this, "", getString("subscription_music"), "", "ic_music_24", preference -> {
if (VKAccountManager.d().isMusicSubs()) {
PreferencesUtil.addPreference(this, "", Globals.getString("subscription_music"), "", "ic_music_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).a(context);
Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).b(context);
context.startActivity(a2);
return false;
});
}
if (VKAccountManager.b().ar()) {
PreferencesUtil.addPreference(this, "", getString("identity_title"), "", "ic_services_24", preference -> {
if (VKAccountManager.d().N0()) {
PreferencesUtil.addPreference(this, "", Globals.getString("identity_title"), "", "ic_services_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(IdentityListFragment.class).a(context);
Intent a2 = new Navigator(IdentityListFragment.class).b(context);
context.startActivity(a2);
return false;
});
}
PreferencesUtil.addPreferenceCategory(this, getString("vtsettmod"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettmod"));
if (!vkme()) {
PreferencesUtil.addPreference(this, "", getString("vtlfeed"), feedsumm, "ic_newsfeed_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlfeed"), feedsumm, "ic_newsfeed_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(FeedFragment.class).a(context);
Intent a2 = new Navigator(FeedFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("dockbar_editor"), docksumm, "ic_list_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("dockbar_editor"), docksumm, "ic_list_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(DockBarFragment.class).a(context);
Intent a2 = new Navigator(DockBarFragment.class).b(context);
context.startActivity(a2);
return false;
});
if (isValidSignature())
PreferencesUtil.addPreference(this, "", getString("vtlmusic"), musicsumm, "ic_music_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlmusic"), musicsumm, "ic_music_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(MusicFragment.class).a(context);
Intent a2 = new Navigator(MusicFragment.class).b(context);
context.startActivity(a2);
return false;
});
}
PreferencesUtil.addPreference(this, "", getString("vtlmessages"), msgsumm, "ic_message_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, "ic_message_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(MessagesFragment.class).a(context);
Intent a2 = new Navigator(MessagesFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtlactivity"), activitysumm, "ic_write_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlactivity"), activitysumm, "ic_write_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(ActivityFragment.class).a(context);
Intent a2 = new Navigator(ActivityFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtlthemes"), themessumm, "ic_palette_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlthemes"), themessumm, "ic_palette_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(ThemesFragment.class).a(context);
Intent a2 = new Navigator(ThemesFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtltgs"), tgssumm, "ic_telegram", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtltgs"), tgssumm, "ic_telegram", preference -> {
Context context = getContext();
Intent a2 = new Navigator(StickersFragment.class).a(context);
Intent a2 = new Navigator(StickersFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtlinterface"), interfacesumm, "ic_interface", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlinterface"), interfacesumm, "ic_interface", preference -> {
Context context = getContext();
Intent a2 = new Navigator(InterfaceFragment.class).a(context);
Intent a2 = new Navigator(InterfaceFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtlproxy"), proxysumm, "ic_globe_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, "ic_globe_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(ProxySettingsFragment.class).a(context);
Intent a2 = new Navigator(ProxySettingsFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", getString("autoclearcache"), "ic_delete_24", getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size), new CharSequence[]{
getString("autoclearcachedisabled"), "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"
PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", Globals.getString("autoclearcache"), "ic_delete_24", Globals.getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size), new CharSequence[]{
Globals.getString("autoclearcachedisabled"), "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"
}, new String[]{
"Default", "100mb", "500mb", "1gb", "2gb", "5gb"
});
PreferencesUtil.addPreference(this, "", getString("vtlother"), othersumm, "ic_more_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtlother"), othersumm, "ic_more_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(OtherFragment.class).a(context);
Intent a2 = new Navigator(OtherFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreferenceCategory(this, getString("vtsettaboutmod"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaboutmod"));
PreferencesUtil.addPreference(this, "", getString("menu_about"), about, "ic_about_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("menu_about"), about, "ic_about_24", preference -> {
Context context = getContext();
Intent a2 = new Navigator(AboutAppFragment.class).a(context);
Intent a2 = new Navigator(AboutAppFragment.class).b(context);
context.startActivity(a2);
return false;
});
PreferencesUtil.addPreference(this, "", getString("opencommit"), "", "ic_link_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("opencommit"), "", "ic_link_24", preference -> {
getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse(getCommitLink())));
return false;
});
PreferencesUtil.addPreference(this, "", getString("vtfaq"), getString("vtfaqsumm"), "ic_help_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("vtfaq"), Globals.getString("vtfaqsumm"), "ic_help_24", preference -> {
getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/s/vtosters_faq")));
return false;
});
PreferencesUtil.addPreference(this, "", getString("reportbug"), getString("reportbugsumm"), "ic_bug_24", preference -> {
PreferencesUtil.addPreference(this, "", Globals.getString("reportbug"), Globals.getString("reportbugsumm"), "ic_bug_24", preference -> {
getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/issues")));
return false;
});
if (isValidSignature()) {
PreferencesUtil.addPreferenceCategory(this, getString("updates"));
PreferencesUtil.addPreferenceCategory(this, Globals.getString("updates"));
PreferencesUtil.addPreference(this, "", getString("checkforupdates"), "", "ic_download_24", preference -> {
OTADialog.checkUpdates(p());
PreferencesUtil.addPreference(this, "", Globals.getString("checkforupdates"), "", "ic_download_24", preference -> {
OTADialog.checkUpdates(getActivity());
return false;
});
PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", getString("checkupdates"), "", "ic_recent_24", true, (preference, o) -> {
PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", Globals.getString("checkupdates"), "", "ic_recent_24", true, (preference, o) -> {
boolean value = (boolean) o;
edit().putBoolean("checkupdates", value).commit();
@@ -365,40 +365,40 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
if(disableSettingsSumms()) return "";
if (value){
return getString(stringid) + ": " + getString("vtlsettenabled");
return Globals.getString(stringid) + ": " + Globals.getString("vtlsettenabled");
}
return getString(stringid) + ": " + getString("vtlsettdisabled");
return Globals.getString(stringid) + ": " + Globals.getString("vtlsettdisabled");
}
public static String getSSFSsumm() {
if(disableSettingsSumms()) return "";
if(hasSpecialVerif()) return getString("vtlssfssumm") + ": " + getString("vtlsettverifyes");
if(hasSpecialVerif()) return Globals.getString("vtlssfssumm") + ": " + Globals.getString("vtlsettverifyes");
return getString("vtlssfssumm") + ": " + getString("vtlsettverifno");
return Globals.getString("vtlssfssumm") + ": " + Globals.getString("vtlsettverifno");
}
public static String getDocksumm() {
if(disableSettingsSumms()) return "";
return getString("vtldocksumm") + ": " + DockBarManager.getInstance().getTabCount();
return Globals.getString("vtldocksumm") + ": " + DockBarManager.getInstance().getTabCount();
}
public static String getTGSsumm() {
if(disableSettingsSumms()) return "";
return getString("vtltgssumm") + ": " + TelegramStickersService.getInstance(getContext()).getPacksListReference().size();
return Globals.getString("vtltgssumm") + ": " + TelegramStickersService.getInstance(Globals.getContext()).getPacksListReference().size();
}
public static String getMultiAccsumm() {
if(disableSettingsSumms() || workingAccounts() <= 1) return "";
return getString("vtlmultiaccsumm") + ": " + workingAccounts();
return Globals.getString("vtlmultiaccsumm") + ": " + workingAccounts();
}
@Override
public int aq() {
public int T4() {
return getIdentifier("notification_settings", "string");
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java
+1
View File
@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.vk.core.fragments.FragmentImpl.a;
import me.grishka.appkit.fragments.ToolbarFragment;
app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java
+1
View File
@@ -6,6 +6,7 @@ import android.os.Bundle;
import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
import com.vk.core.util.ToastUtils;
import com.vtosters.lite.fragments.MaterialPreferenceFragment.a;
import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
import ru.vtosters.lite.tgs.TGPref;