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 d0421fb5b..4809b08f5 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
@@ -1,7 +1,6 @@
package ru.vtosters.lite.ui.fragments;
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
-import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
+import static ru.vtosters.lite.utils.AndroidUtils.*;
import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
import android.os.Build;
@@ -13,6 +12,8 @@ import com.vtosters.lite.R;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
+import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.ThemesUtils;
public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
@Override
@@ -28,11 +29,23 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
findPreference("is_likes_on_right").setOnPreferenceClickListener(new restart());
findPreference("superapp").setOnPreferenceClickListener(new restart());
+ findPreference("dateformat").setOnPreferenceChangeListener((preference, o) -> {
+ edit().putString("dateformat", o.toString()).commit();
+ restartApplicationWithTimer();
+ return true;
+ });
+
if (isTablet()) {
findPreference("menusett").setVisible(false);
findPreference("swipe").setVisible(false);
}
+ if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
+ findPreference("miniapps").setVisible(false);
+ findPreference("vkpay").setVisible(false);
+ findPreference("showmenu").setVisible(false);
+ }
+
findPreference("customrounding").setOnPreferenceClickListener(preference -> {
RoundingSeekbarDialog.dialog(getContext());
return true;
@@ -59,7 +72,7 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
return R.string.vtlinterface;
}
- public class restart implements Preference.OnPreferenceClickListener {
+ private class restart implements Preference.OnPreferenceClickListener {
@Override
public boolean onPreferenceClick(Preference preference) {
return InterfaceFragment.this.restart(preference);
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
index 01b46cc55..228a2d706 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
@@ -96,7 +96,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
deleteVideoHistoryDialog(requireContext());
return true;
});
- findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
findPreference("lastfm_auth").setOnPreferenceClickListener(preference -> {
if (isLoggedIn()) {
logout(getContext());
@@ -148,7 +147,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
new ImagineArrayAdapter.ImagineArrayAdapterItem(null, "Saucenao")
);
- var adapter = new ImagineArrayAdapter(getContext(), items);
+ var adapter = new ImagineArrayAdapter(requireContext(), items);
adapter.setSelected(getPreferences().getInt("search_engine", 0));
new VkAlertDialog.Builder(getActivity())
@@ -286,15 +285,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
return R.string.vtlmedia;
}
- private static class restart implements Preference.OnPreferenceChangeListener {
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- edit().putString("dateformat", o.toString()).commit();
- restartApplicationWithTimer();
- return false;
- }
- }
-
private class download implements Preference.OnPreferenceClickListener {
@Override // android.support.v7.preference.Preference.c
public boolean onPreferenceClick(Preference preference) {
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
index 1c1d92216..a62995957 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
@@ -39,8 +39,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
private void prefs() {
findPreference("vkme").setOnPreferenceClickListener(new MessagesFragment.restart());
findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
- findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart());
- findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp());
findPreference("autotranslate").setEnabled(!autoalltranslate());
@@ -65,11 +63,9 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
});
findPreference("vkme_notifs").setEnabled(vkme());
- findPreference("wallpapers").setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
findPreference("vkme").setIcon(R.drawable.ic_vkme_28);
if (isTablet()) {
- findPreference("alteremoji").setVisible(false);
findPreference("vkmesett").setVisible(false);
}
}
@@ -104,15 +100,4 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
return MessagesFragment.this.restart();
}
}
-
- public class openwp implements Preference.OnPreferenceClickListener {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- Context context = requireContext();
- Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
- a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(a2);
- return true;
- }
- }
}
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 494926519..5717e47e9 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
@@ -1,5 +1,6 @@
package ru.vtosters.lite.ui.fragments;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Build;
@@ -15,11 +16,15 @@ import ru.vtosters.lite.themes.ThemesCore;
import ru.vtosters.lite.themes.palettes.PalettesManager;
import ru.vtosters.lite.ui.dialogs.PalettesBottomSheetDialog;
import ru.vtosters.lite.ui.views.rarepebble.ColorPickerView;
+import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.LifecycleUtils;
import ru.vtosters.lite.utils.Preferences;
import ru.vtosters.lite.utils.ThemesUtils;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
+
public class ThemesFragment extends MaterialPreferenceToolbarFragment {
@Override
@@ -96,9 +101,25 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme() && ThemesUtils.isMilkshake());
+ var wp = findPreference("wallpapers");
+ wp.setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
+ wp.setOnPreferenceClickListener(preference -> {
+ Context context = requireContext();
+ Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
+ a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(a2);
+ return true;
+ });
+
+ findPreference("systememoji").setOnPreferenceClickListener(preference -> {
+ restart();
+ return true;
+ });
+
if(AndroidUtils.isTablet()) {
PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
dockbarSettingsPreferenceCategory.setVisible(false);
+ findPreference("alteremoji").setVisible(false);
}
}
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 33849de97..de958433d 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
@@ -37,8 +37,6 @@ import ru.vtosters.lite.utils.*;
public class VTSettings extends MaterialPreferenceToolbarFragment implements TelegramStickersService.StickersEventsListener {
public static String getValAsString(@StringRes int strRes, Boolean value) {
- if(Preferences.disableSettingsSumms()) return null;
-
if(value) {
return AndroidUtils.getString(strRes) + ": " + AndroidUtils.getString(R.string.vtlsettenabled);
}
@@ -47,8 +45,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
}
public static String getSSFSsumm() {
- if(Preferences.disableSettingsSumms()) return null;
-
if(Preferences.hasSpecialVerif())
return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifyes);
@@ -56,22 +52,16 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
}
public static String getDocksumm() {
- if(Preferences.disableSettingsSumms()) return null;
-
return AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size();
}
public static String getTGSsumm() {
- if(Preferences.disableSettingsSumms()) return null;
-
return AndroidUtils.getString(R.string.vtltgssumm) + ": " + TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()).getActivePacksListReference().size();
}
public static String getProxysumm() {
var type = AndroidUtils.getPrefsValue("proxy");
- if(Preferences.disableSettingsSumms()) return null;
-
if(type.equals("noproxy") || type.isEmpty())
type = AndroidUtils.getString(R.string.vtlsettdisabled);
@@ -79,8 +69,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
}
public static String getThemesumm() {
- if(Preferences.disableSettingsSumms()) return null;
-
String str;
String[] themeTypeName = AndroidUtils.getArray("theme_type_name");
@@ -101,8 +89,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
}
public static String getSuperappsumm() {
- if(Preferences.disableSettingsSumms()) return null;
-
return AndroidUtils.getString(R.string.elements_hidden_count) + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size();
}
@@ -279,7 +265,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
"autoupdates",
requireContext().getString(R.string.checkupdates),
"",
- R.drawable.ic_camera_switch_outline_24,
+ R.drawable.ic_bug_outline_28,
true,
(preference, o) -> {
boolean value = (boolean) o;
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index cb88567e6..b8f3e09e2 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -316,10 +316,6 @@ public class Preferences {
return false;
}
- public static boolean disableSettingsSumms() {
- return getBoolValue("disableSettingsSumms", false);
- }
-
public static boolean hasVerification() {
return isVerified(AccountManagerUtils.getUserId());
}
diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml
index 9d560f83f..af8a32ab4 100644
--- a/smali/res/xml/preferences_interface.xml
+++ b/smali/res/xml/preferences_interface.xml
@@ -1,5 +1,41 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/smali/res/xml/preferences_media.xml b/smali/res/xml/preferences_media.xml
index fc67b1212..acab6679f 100644
--- a/smali/res/xml/preferences_media.xml
+++ b/smali/res/xml/preferences_media.xml
@@ -1,28 +1,16 @@
-
-
+
+ android:key="compressPhotos"
+ android:summary="@string/sett_compress_photo_summ"
+ android:title="@string/sett_compress_photos"/>
-
+ android:key="compressVideos"
+ android:summary="@string/sett_compress_video_summ"
+ android:title="@string/sett_compress_videos"/>
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+