From 60afca9f4d2c3dc2588776d9df1fd6e2a48f398d Mon Sep 17 00:00:00 2001
From: Pavel <47494869+psamur@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:11:35 +0300
Subject: [PATCH] Normal elements positioning in settings
---
.../lite/ui/fragments/VTSettings.java | 114 +++++++++---------
smali/res/values-ru/strings.xml | 5 +-
smali/res/values/strings.xml | 3 +
3 files changed, 66 insertions(+), 56 deletions(-)
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 40b5825e7..6895d88f9 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
@@ -158,7 +158,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
int vtosterXml = getIdentifier("empty", "xml");
this.addPreferencesFromResource(vtosterXml);
- addPreferenceDrawable(this, "", getUsername(), hasVerification() ? AndroidUtils.getString("thanksfordonate") : AndroidUtils.getString("getdonate"), getDrawableFromUrl(getUserPhoto(), "ic_user_circle_outline_28", true, true), preference -> {
+ addPreferenceDrawable(this, "", getUsername(), AndroidUtils.getString("vtllogout"), getDrawableFromUrl(getUserPhoto(), "ic_user_circle_outline_28", true, true), preference -> {
try {
VKAuth.a("logout", false);
} catch (Exception ignored) {
@@ -173,6 +173,15 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
return false;
});
+ addPreference(this, "", AndroidUtils.getString("vtssfs"), ssfs, "ic_link_circle_outline_28", preference -> {
+ Context context = requireContext();
+ VKUIwrapper.setLink(SSFSUtils.getSSFSLink());
+ Intent a2 = new Navigator(VKUIwrapper.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
addPreferenceCategory(this, AndroidUtils.getString("vtsettdarktheme"));
if (Build.VERSION.SDK_INT >= 28) {
@@ -209,6 +218,8 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
}
if (!isGmsInstalled()) {
+ addPreferenceCategory(this, AndroidUtils.getString("gmsname"));
+
addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_about_outline_28", preference -> {
Context context = requireContext();
Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
@@ -274,16 +285,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
});
}
- addPreference(this, "", AndroidUtils.getString("vtssfs"), ssfs, "ic_link_circle_outline_28", preference -> {
- Context context = requireContext();
- VKUIwrapper.setLink(SSFSUtils.getSSFSLink());
- Intent a2 = new Navigator(VKUIwrapper.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
- addPreferenceCategory(this, AndroidUtils.getString("notification_settings"));
+ addPreferenceCategory(this, AndroidUtils.getString("vtlvksettings"));
addPreference(this, "", AndroidUtils.getString("sett_general"), "", "ic_settings_outline_28", preference -> {
Context context = requireContext();
@@ -329,7 +331,9 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
addPreferenceCategory(this, AndroidUtils.getString("vtsettmod"));
- if (!vkme()) {
+ if (vkme()) {
+ addPreference(this, "", AndroidUtils.getString("warning"), AndroidUtils.getString("vkme_mode_info"), "ic_about_outline_28", preference -> false);
+ } else {
addPreference(this, "", AndroidUtils.getString("vtlfeed"), feedsumm, "ic_newsfeed_outline_28", preference -> {
Context context = requireContext();
Intent a2 = new Navigator(FeedFragment.class).b(context);
@@ -337,7 +341,49 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
context.startActivity(a2);
return false;
});
+ }
+ addPreference(this, "", AndroidUtils.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(MediaFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
+ addPreference(this, "", AndroidUtils.getString("vtlmessages"), msgsumm, "ic_message_outline_28", preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(MessagesFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
+ addPreference(this, "", AndroidUtils.getString("vtltgs"), tgssumm, "ic_telegram_outline_28", preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(StickersFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
+ addPreference(this, "", AndroidUtils.getString("vtlthemes"), themessumm, "ic_write_outline_28", preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(ThemesFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
+ addPreference(this, "", AndroidUtils.getString("vtlinterface"), interfacesumm, "ic_interface_outline_28", preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(InterfaceFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return false;
+ });
+
+ if(!vkme()){
if (!isTablet()) {
addPreference(this, "", AndroidUtils.getString("dockbar_editor"), docksumm, "ic_list_outline_28", preference -> {
Context context = requireContext();
@@ -357,26 +403,8 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
});
}
}
- } else {
- addPreference(this, "", AndroidUtils.getString("warning"), AndroidUtils.getString("vkme_mode_info"), "ic_about_outline_28", preference -> false);
}
-
- addPreference(this, "", AndroidUtils.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> {
- Context context = requireContext();
- Intent a2 = new Navigator(MediaFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
- addPreference(this, "", AndroidUtils.getString("vtlmessages"), msgsumm, "ic_message_outline_28", preference -> {
- Context context = requireContext();
- Intent a2 = new Navigator(MessagesFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
+
addPreference(this, "", AndroidUtils.getString("vtlactivity"), activitysumm, "ic_write_outline_28_new_accent", preference -> {
Context context = requireContext();
Intent a2 = new Navigator(ActivityFragment.class).b(context);
@@ -385,30 +413,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
return false;
});
- addPreference(this, "", AndroidUtils.getString("vtlthemes"), themessumm, "ic_write_outline_28", preference -> {
- Context context = requireContext();
- Intent a2 = new Navigator(ThemesFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
- addPreference(this, "", AndroidUtils.getString("vtltgs"), tgssumm, "ic_telegram_outline_28", preference -> {
- Context context = requireContext();
- Intent a2 = new Navigator(StickersFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
- addPreference(this, "", AndroidUtils.getString("vtlinterface"), interfacesumm, "ic_interface_outline_28", preference -> {
- Context context = requireContext();
- Intent a2 = new Navigator(InterfaceFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return false;
- });
-
addPreference(this, "", AndroidUtils.getString("vtlproxy"), proxysumm, "ic_globe_outline_28", preference -> {
Context context = requireContext();
Intent a2 = new Navigator(ProxySettingsFragment.class).b(context);
diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index 8ff1e258c..200e29cdb 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -5366,6 +5366,7 @@
Ответы на все ваши вопросы здесь
Наш сайт
Установите Сервисы Google Play
+ Сервисы Google Play
Отключить рекламу
Отключить рекламу групп
Посты с пометкой рекламы
@@ -5918,7 +5919,7 @@
Замена докбара и некоторых элементов на что-то похожее как в VK Мессенджере
Аккаунт
- Темная тема
+ Тёмная тема
О модификации
Настройки мода
@@ -5940,6 +5941,8 @@
Отображение верификаций
Доступно аккаунтов
Скрыть подписи в настройках
+ Выйти или сменить аккаунт
+ Настройки ВКонтакте
Есть доступ
Авто обновления
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index 550d12da7..f8d983932 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -5500,6 +5500,7 @@ with video"
All your questions are answered here
Our site
Install Google Play Services
+ Google Play Services
Disable ads
Disable groups ads
Posts with ads mark
@@ -6075,6 +6076,8 @@ May look like a fake leaving the online"
Show verifications
Available accounts
Hide settings summaries
+ Logout or change account
+ VK Settings
Have access
Auto updates