From 51c94d73340d6e369da84e98687fa12781922473 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 7 Mar 2023 12:49:33 +0300
Subject: [PATCH] some fixes
---
.../lite/ui/fragments/InterfaceFragment.java | 16 ++++++++++++----
.../lite/ui/fragments/ThemesFragment.java | 12 ------------
smali/res/values-be/strings.xml | 2 +-
smali/res/values-ru/strings.xml | 2 +-
smali/res/values-uk/strings.xml | 2 +-
smali/res/values/strings.xml | 2 +-
smali/res/xml/preferences_interface.xml | 3 +++
smali/res/xml/preferences_themes.xml | 3 ---
8 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
index a5623c565..01d7a3408 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
@@ -4,6 +4,7 @@ import android.os.Build;
import android.os.Bundle;
import com.vtosters.lite.R;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.ui.components.DockBarEditorManager;
import ru.vtosters.lite.ui.components.SuperAppEditorManager;
import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
import ru.vtosters.lite.utils.AndroidUtils;
@@ -63,6 +64,17 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
findPreference("swipe").setVisible(false);
}
+ if (Preferences.vkme() || isTablet()) {
+ findPreference("dockbareditor").setVisible(false);
+ }
+
+ var dockbarEditor = findPreference("dockbareditor");
+ dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
+ dockbarEditor.setOnPreferenceClickListener(preference -> {
+ NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
+ return true;
+ });
+
if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
findPreference("miniapps").setVisible(false);
@@ -74,10 +86,6 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
return true;
});
- if (Build.VERSION.SDK_INT >= 33) {
- findPreference("anim_rtrn_type").setVisible(false);
- }
-
if (Preferences.getPreferences().getInt("pic_rounding", 0) == 0) {
findPreference("customrounding").setSummary(requireContext().getString(R.string.disabled));
} else {
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
index 4099fd57f..5b07d8f3d 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
@@ -43,13 +43,6 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
findPreference("systememoji").setSummary(getGlobalContext().getString(R.string.systememojisum) + " \uD83D\uDE00\uD83D\uDE01\uD83E\uDD11\uD83E\uDD75\uD83D\uDC4D");
- var dockbarEditor = findPreference("dockbareditor");
- dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
- dockbarEditor.setOnPreferenceClickListener(preference -> {
- NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
- return true;
- });
-
var invalidateThemeCache = findPreference("invalidate_theme_cache");
if(ThemesUtils.getReservedAccent() != Color.TRANSPARENT)
invalidateThemeCache.setOnPreferenceClickListener(preference -> {
@@ -130,15 +123,10 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
return true;
});
- if (Preferences.vkme()) {
- findPreference("dockbareditor").setVisible(false);
- }
-
if(AndroidUtils.isTablet()) {
PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
dockbarSettingsPreferenceCategory.setVisible(false);
findPreference("alteremoji").setVisible(false);
- findPreference("dockbareditor").setVisible(false);
}
}
diff --git a/smali/res/values-be/strings.xml b/smali/res/values-be/strings.xml
index 220d12c49..51af14d29 100644
--- a/smali/res/values-be/strings.xml
+++ b/smali/res/values-be/strings.xml
@@ -5881,7 +5881,7 @@ QR-код"
Дадзенае відэа немагчыма спампаваць
Круглыя паведамленні
Абярыце тып паказу дат
- Анімацыя фрагментаў (бэта)
+ Анімацыя фрагментаў
Абярыце анімацыю фрагментаў
Рэжым VK Месенджара
Замена докбара і некаторых элементаў на нешта падобнае як у VK Месенджэры
diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index bffe2ea0d..14ff42e79 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -5917,7 +5917,7 @@
Выберите тип показа дат
- Анимация фрагментов (бета)
+ Анимация фрагментов
Выберите анимацию фрагментов
Режим VK Мессенджера
diff --git a/smali/res/values-uk/strings.xml b/smali/res/values-uk/strings.xml
index d0878d3e9..596288050 100644
--- a/smali/res/values-uk/strings.xml
+++ b/smali/res/values-uk/strings.xml
@@ -5843,7 +5843,7 @@
Виберіть тип показу дат
- Анімація фрагментів (бета)
+ Анімація фрагментів
Виберіть анімацію фрагментів
Режим VK Месенджера
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index 43510cc9b..aafbca9a8 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -6052,7 +6052,7 @@ May look like a fake leaving the online"
Select the date display type
- Fragment animation (beta)
+ Fragment animation
Select fragment animation
VK Messenger mode
diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml
index fa14b5d76..05352f011 100644
--- a/smali/res/xml/preferences_interface.xml
+++ b/smali/res/xml/preferences_interface.xml
@@ -35,6 +35,9 @@
+
-