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

Normal elements positioning in settings

Browse Source
This commit is contained in:
Pavel
2022-09-27 14:31:10 +03:00
committed by gdlbo
parent 665516944e
commit 60afca9f4d
3 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+59 -55
View File
@@ -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);
smali/res/values-ru/strings.xml
+4 -1
View File
@@ -5366,6 +5366,7 @@
<string name="vtfaqsumm">Ответы на все ваши вопросы здесь</string>
<string name="vtsite">Наш сайт</string>
<string name="installgms">Установите Сервисы Google Play</string>
<string name="gmsname">Сервисы Google Play</string>
<string name="vtldads">Отключить рекламу</string>
<string name="vtldgads">Отключить рекламу групп</string>
<string name="vtldgadssummary">Посты с пометкой рекламы</string>
@@ -5918,7 +5919,7 @@
<string name="vkmesumm">Замена докбара и некоторых элементов на что-то похожее как в VK Мессенджере</string>
<string name="vtsettaccount">Аккаунт</string>
<string name="vtsettdarktheme">Темная тема</string>
<string name="vtsettdarktheme">Тёмная тема</string>
<string name="vtsettaboutmod">О модификации</string>
<string name="vtsettmod">Настройки мода</string>
@@ -5940,6 +5941,8 @@
<string name="vtlothersumm">Отображение верификаций</string>
<string name="vtlmultiaccsumm">Доступно аккаунтов</string>
<string name="vtlhidesumm">Скрыть подписи в настройках</string>
<string name="vtllogout">Выйти или сменить аккаунт</string>
<string name="vtlvksettings">Настройки ВКонтакте</string>
<string name="vtlssfssumm">Есть доступ</string>
<string name="checkupdates">Авто обновления</string>
smali/res/values/strings.xml
+3
View File
@@ -5500,6 +5500,7 @@ with video"</string>
<string name="vtfaqsumm">All your questions are answered here</string>
<string name="vtsite">Our site</string>
<string name="installgms">Install Google Play Services</string>
<string name="gmsname">Google Play Services</string>
<string name="vtldads">Disable ads</string>
<string name="vtldgads">Disable groups ads</string>
<string name="vtldgadssummary">Posts with ads mark</string>
@@ -6075,6 +6076,8 @@ May look like a fake leaving the online"</string>
<string name="vtlothersumm">Show verifications</string>
<string name="vtlmultiaccsumm">Available accounts</string>
<string name="vtlhidesumm">Hide settings summaries</string>
<string name="vtllogout">Logout or change account</string>
<string name="vtlvksettings">VK Settings</string>
<string name="vtlssfssumm">Have access</string>
<string name="checkupdates">Auto updates</string>