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

some settings refactoring

Browse Source
This commit is contained in:
gdlbo
2023-01-06 16:25:58 +03:00
parent 14f9f6dcf8
commit 26e59629aa
10 changed files with 115 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+16 -3
View File
@@ -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);
app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+1 -11
View File
@@ -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) {
app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
-15
View File
@@ -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;
}
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+21
View File
@@ -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);
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+1 -15
View File
@@ -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;
app/src/main/java/ru/vtosters/lite/utils/Preferences.java
-4
View File
@@ -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());
}
smali/res/xml/preferences_interface.xml
+41 -23
View File
@@ -1,5 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/interfaceglobal">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/dateformat"
android:entries="@array/dateformat_value"
android:entryValues="@array/dateformat"
android:key="dateformat"
android:title="@string/interfaceglobaldates"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="shortinfo"
android:summary="@string/interfaceglobalnumsum"
android:title="@string/interfaceglobalnum"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="shortpost"
android:summary="@string/interfaceglobalpostsum"
android:title="@string/interfaceglobalpost"/>
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/interfacestartfrsum"
android:entries="@array/start"
android:entryValues="@array/start_values"
android:key="start_values"
android:title="@string/interfacestartfr"/>
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="noanim"
android:dialogTitle="@string/selectfranimation"
android:entries="@array/animations2"
android:entryValues="@array/animations_values2"
android:key="anim_rtrn_type"
android:title="@string/franimation"/>
<Preference
android:key="customrounding"
android:title="@string/customrounding_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfacenewsfeed">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
@@ -20,25 +56,6 @@
android:key="is_likes_on_right"
android:title="@string/right_likes"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfaceglobal">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/interfacestartfrsum"
android:entries="@array/start"
android:entryValues="@array/start_values"
android:key="start_values"
android:title="@string/interfacestartfr"/>
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="noanim"
android:dialogTitle="@string/selectfranimation"
android:entries="@array/animations2"
android:entryValues="@array/animations_values2"
android:key="anim_rtrn_type"
android:title="@string/franimation"/>
<Preference
android:key="customrounding"
android:title="@string/customrounding_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfacevideo">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
@@ -69,14 +86,15 @@
android:title="@string/menucutter"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlother">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="pollresults"
android:summary="@string/pollresults_summ"
android:title="@string/pollresults_title"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="friendsblock"
android:summary="@string/friendsblock_summ"
android:title="@string/friendsblock_title"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="disableSettingsSumms"
android:title="@string/vtlhidesumm"/>
</PreferenceCategory>
</PreferenceScreen>
smali/res/xml/preferences_media.xml
+7 -31
View File
@@ -1,28 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/interfaceglobal">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="default"
android:dialogTitle="@string/dateformat"
android:entries="@array/dateformat_value"
android:entryValues="@array/dateformat"
android:key="dateformat"
android:title="@string/interfaceglobaldates"/>
<PreferenceCategory android:title="@string/sett_media">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="shortinfo"
android:summary="@string/interfaceglobalnumsum"
android:title="@string/interfaceglobalnum"/>
android:key="compressPhotos"
android:summary="@string/sett_compress_photo_summ"
android:title="@string/sett_compress_photos"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="shortpost"
android:summary="@string/interfaceglobalpostsum"
android:title="@string/interfaceglobalpost"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="pollresults"
android:summary="@string/pollresults_summ"
android:title="@string/pollresults_title"/>
android:key="compressVideos"
android:summary="@string/sett_compress_video_summ"
android:title="@string/sett_compress_videos"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtl_music_settings">
<Preference
@@ -49,18 +37,6 @@
android:key="audio_download"
android:title="@string/audio_download_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/sett_media">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="compressPhotos"
android:summary="@string/sett_compress_photo_summ"
android:title="@string/sett_compress_photos"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="compressVideos"
android:summary="@string/sett_compress_video_summ"
android:title="@string/sett_compress_videos"/>
</PreferenceCategory>
<PreferenceCategory android:title="Last.fm">
<Preference
android:key="lastfm_auth"
smali/res/xml/preferences_messages.xml
+11 -26
View File
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/vk_messenger" android:key="vkmesett">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="vkme"
android:summary="@string/vkmesumm"
android:title="@string/vkme"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="vkme_notifs"
android:title="@string/vkme_notifs"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlinterfacemsg">
<Preference
android:key="wallpapers"
android:title="@string/wallpapers_title"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="true"
android:key="voice"
@@ -19,17 +27,6 @@
android:key="wbios"
android:title="@string/writebar_ios_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vk_messenger" android:key="vkmesett">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="vkme"
android:summary="@string/vkmesumm"
android:title="@string/vkme"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="vkme_notifs"
android:title="@string/vkme_notifs"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/translator_title">
<com.vtosters.lite.ui.SummaryListPreference
android:defaultValue="system"
@@ -52,18 +49,6 @@
android:summary="@string/autoalltranslate_summ"
android:title="@string/autoalltranslate_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfaceemoji">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="alteremoji"
android:summary="@string/alteremojisum"
android:title="@string/alteremoji"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="systememoji"
android:summary="@string/systememojisum"
android:title="@string/systememoji"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlother">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
smali/res/xml/preferences_themes.xml
+17
View File
@@ -25,6 +25,23 @@
android:summary="@string/monettheme_summ"
android:title="@string/monettheme_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/vtlmessages">
<Preference
android:key="wallpapers"
android:title="@string/wallpapers_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/interfaceemoji">
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="alteremoji"
android:summary="@string/alteremojisum"
android:title="@string/alteremoji"/>
<com.vtosters.lite.ui.MaterialSwitchPreference
android:defaultValue="false"
android:key="systememoji"
android:summary="@string/systememojisum"
android:title="@string/systememoji"/>
</PreferenceCategory>
<PreferenceCategory
android:key="dockbarsett"
android:title="@string/vtl_settings_dockbar_title">