From 9cc136bfdac89f45ad129e824e743f983c0a6c19 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 19 Jun 2022 02:06:47 +0300 Subject: [PATCH 1/2] fixes --- .../ru/vtosters/lite/ui/PreferencesUtil.java | 91 ++++++++++--------- .../StickersPreferencesFragment.java | 4 +- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java index 2fab213a0..45b41cb4f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java +++ b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java @@ -19,6 +19,7 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.preference.ListPreference; +import androidx.preference.PreferenceCategory; import com.vk.core.preference.Preference; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; @@ -36,12 +37,12 @@ public class PreferencesUtil { public static void addListPreference(MaterialPreferenceToolbarFragment fragment, String key, String def, CharSequence title, CharSequence[] entries, CharSequence[] entriesValue) { ListPreference preference = new ListPreference(getContext()); preference.setEntries(entries); - preference.b(entriesValue); - preference.c(title); // setTitle - preference.a(title); // setDialogTitle - preference.d(key); // setKey - preference.b(def); // setDefaultValue - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + preference.setEntries(entriesValue); + preference.setTitle(title); // setTitle + preference.setDialogTitle(title); // setDialogTitle + preference.setKey(key); // setKey + preference.setDefaultValue(def); // setDefaultValue + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addListPreferenceIcon(MaterialPreferenceToolbarFragment fragment, String key, String def, CharSequence title, String icon, CharSequence summary, CharSequence[] entries, CharSequence[] entriesValue) { @@ -49,52 +50,52 @@ public class PreferencesUtil { preference.setEntries(entries); preference.setEntries(entriesValue); preference.setSummary(summary); // setSummary - preference.c(title); // setTitle - preference.a(title); // setDialogTitle - preference.d(key); // setKey - preference.b(def); // setDefaultValue + preference.setTitle(title); // setTitle + preference.setDialogTitle(title); // setDialogTitle + preference.setKey(key); // setKey + preference.setDefaultValue(def); // setDefaultValue if (icon != null) - preference.a(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + preference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon + fragment.getPreferenceScreen().d(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment materialPreferenceToolbarFragment, String key, CharSequence title, CharSequence summary, boolean defValue) { MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext()); - materialSwitchPreference.c(title); // setTitle - materialSwitchPreference.b(summary); // setSummary - materialSwitchPreference.d(key); // setKey - materialSwitchPreference.b(Boolean.valueOf(defValue)); // setDefaultValue + materialSwitchPreference.setTitle(title); // setTitle + materialSwitchPreference.setSummary(summary); // setSummary + materialSwitchPreference.setKey(key); // setKey + materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue - materialPreferenceToolbarFragment.ay().d(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference) + materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference) } public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, int icon, boolean defValue, Preference.b listener) { MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext()); - materialSwitchPreference.c(title); // setTitle - materialSwitchPreference.b(summary); // setSummary - materialSwitchPreference.d(key); // setKey - materialSwitchPreference.b(Boolean.valueOf(defValue)); // setDefaultValue - materialSwitchPreference.a(listener); // setOnPreferenceClickListener + materialSwitchPreference.setTitle(title); // setTitle + materialSwitchPreference.setSummary(summary); // setSummary + materialSwitchPreference.setKey(key); // setKey + materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue + materialSwitchPreference.setOnPreferenceClickListener(listener); // setOnPreferenceClickListener if (icon != 1) - materialSwitchPreference.a(setTint(getContext(), ContextCompat.getDrawable(getContext(), icon))); // preference.setIcon + materialSwitchPreference.setIcon(setTint(getContext(), ContextCompat.getDrawable(getContext(), icon))); // preference.setIcon - fragment.ay().d(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, String icon, boolean defValue, Preference.b listener) { MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext()); - materialSwitchPreference.c(title); // setTitle - materialSwitchPreference.b(summary); // setSummary - materialSwitchPreference.d(key); // setKey - materialSwitchPreference.b(Boolean.valueOf(defValue)); // setDefaultValue - fragment.ay().d(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference) + materialSwitchPreference.setTitle(title); // setTitle + materialSwitchPreference.setSummary(summary); // setSummary + materialSwitchPreference.setKey(key); // setKey + materialSwitchPreference.setDefaultValue(defValue); // setDefaultValue + fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference) if (icon != null) - materialSwitchPreference.a(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon - materialSwitchPreference.a(listener); // setOnPreferenceClickListener(listener) + materialSwitchPreference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon + materialSwitchPreference.setOnPreferenceClickListener(listener); // setOnPreferenceClickListener(listener) - fragment.ay().d(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary) { @@ -103,7 +104,7 @@ public class PreferencesUtil { preference.c(title); // setTitle preference.d(key); // setKey - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreference(MaterialPreferenceToolbarFragment fragment, CharSequence title, CharSequence summary, @Nullable String icon, Preference.c listener) { @@ -115,7 +116,7 @@ public class PreferencesUtil { preference.a(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon preference.a(listener); // preference.setOnPreferenceClickListener(listener) - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable String icon, Preference.c listener) { @@ -125,10 +126,10 @@ public class PreferencesUtil { preference.d(key); // setKey if (icon != null) - preference.a(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon + preference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon preference.a(listener); // preference.setOnPreferenceClickListener(listener) - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreferenceDrawable(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable Drawable icon, Preference.c listener) { @@ -141,27 +142,27 @@ public class PreferencesUtil { preference.a(icon); // preference.setIcon preference.a(listener); // preference.setOnPreferenceClickListener(listener) - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title) { PreferenceCategory preference = new PreferenceCategory(getContext(), null); - preference.c(title); // setTitle - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + preference.setTitle(title); // setTitle + fragment.getPreferenceScreen().addPreference()preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title, int collapsedSize) { PreferenceCategory preference = new PreferenceCategory(getContext(), null); - preference.c(title); // setTitle - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + preference.setTitle(title); // setTitle + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addEditTextPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, EditTextPrefChangeListener editTextPrefChangeListener) { Preference preference = new Preference(getContext()); - preference.c(title); // setTitle - preference.d(key); // setKey - preference.a(preference1 -> { + preference.setTitle(title); // setTitle + preference.setKey(key); // setKey + preference.setOnPreferenceClickListener(preference1 -> { LinearLayout linearLayout = new LinearLayout(getContext()); final EditText editText = new EditText(getContext()); @@ -197,7 +198,7 @@ public class PreferencesUtil { return false; }); // preference.setOnPreferenceClickListener(listener) - fragment.ay().d(preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static int getTextColor(Context ctx) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java index cbff34e0c..890217f86 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java @@ -63,8 +63,8 @@ public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragme PreferencesUtil.addMaterialSwitchPreference(this, "tg_proxy_auth", getString("ssocksauth"), "", null, false, (preference, o) -> { boolean value = (boolean) o; - a("tg_proxy_login").a(value); // findPreference("tg_proxy_login").setEnabled(value); - a("tg_proxy_pass").a(value); // findPreference("tg_proxy_pass").setEnabled(booleanValue); + findPreference("tg_proxy_login").setEnabled(value); // findPreference("tg_proxy_login").setEnabled(value); + findPreference("tg_proxy_pass").setEnabled(value); // findPreference("tg_proxy_pass").setEnabled(booleanValue); TGPref.setTGProxyPassEnabled(value); return true; From 7deb1bba584871805ac43fccc7da52871dfbb5b1 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 19 Jun 2022 02:13:23 +0300 Subject: [PATCH 2/2] fixes --- .../ru/vtosters/lite/ui/PreferencesUtil.java | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java index 45b41cb4f..c70b26e0a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java +++ b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java @@ -19,12 +19,14 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.preference.ListPreference; +import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.vk.core.preference.Preference; import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import com.vtosters.lite.ui.MaterialSwitchPreference; +import java.util.Objects; + import ru.vtosters.lite.utils.Themes; public class PreferencesUtil { @@ -69,7 +71,7 @@ public class PreferencesUtil { materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(materialSwitchPreference); // materialPreferenceToolbarFragment.getPreferenceScreen().addPreference(preference) } - public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, int icon, boolean defValue, Preference.b listener) { + public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, int icon, boolean defValue, Preference.OnPreferenceClickListener listener) { MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext()); materialSwitchPreference.setTitle(title); // setTitle materialSwitchPreference.setSummary(summary); // setSummary @@ -78,12 +80,12 @@ public class PreferencesUtil { materialSwitchPreference.setOnPreferenceClickListener(listener); // setOnPreferenceClickListener if (icon != 1) - materialSwitchPreference.setIcon(setTint(getContext(), ContextCompat.getDrawable(getContext(), icon))); // preference.setIcon + materialSwitchPreference.setIcon(setTint(getContext(), Objects.requireNonNull(ContextCompat.getDrawable(getContext(), icon)))); // preference.setIcon fragment.getPreferenceScreen().addPreference(materialSwitchPreference); // fragment.getPreferenceScreen().addPreference(preference) } - public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, String icon, boolean defValue, Preference.b listener) { + public static void addMaterialSwitchPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, String icon, boolean defValue, Preference.OnPreferenceClickListener listener) { MaterialSwitchPreference materialSwitchPreference = new MaterialSwitchPreference(getContext()); materialSwitchPreference.setTitle(title); // setTitle materialSwitchPreference.setSummary(summary); // setSummary @@ -100,47 +102,47 @@ public class PreferencesUtil { public static void addPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary) { Preference preference = new Preference(getContext()); - preference.b(summary); // setSummary - preference.c(title); // setTitle - preference.d(key); // setKey + preference.setSummary(summary); // setSummary + preference.setTitle(title); // setTitle + preference.setKey(key); // setKey fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } - public static void addPreference(MaterialPreferenceToolbarFragment fragment, CharSequence title, CharSequence summary, @Nullable String icon, Preference.c listener) { + public static void addPreference(MaterialPreferenceToolbarFragment fragment, CharSequence title, CharSequence summary, @Nullable String icon, Preference.OnPreferenceClickListener listener) { Preference preference = new Preference(getContext()); - preference.b(summary); // setSummary - preference.c(title); // setTitle - - if (icon != null) - preference.a(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon - preference.a(listener); // preference.setOnPreferenceClickListener(listener) - - fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) - } - - public static void addPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable String icon, Preference.c listener) { - Preference preference = new Preference(getContext()); - preference.b(summary); // setSummary - preference.c(title); // setTitle - preference.d(key); // setKey + preference.setSummary(summary); // setSummary + preference.setTitle(title); // setTitle if (icon != null) preference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon - preference.a(listener); // preference.setOnPreferenceClickListener(listener) + preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener) fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } - public static void addPreferenceDrawable(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable Drawable icon, Preference.c listener) { + public static void addPreference(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable String icon, Preference.OnPreferenceClickListener listener) { Preference preference = new Preference(getContext()); - preference.b(summary); // setSummary - preference.c(title); // setTitle - preference.d(key); // setKey + preference.setSummary(summary); // setSummary + preference.setTitle(title); // setTitle + preference.setKey(key); // setKey if (icon != null) - preference.a(icon); // preference.setIcon - preference.a(listener); // preference.setOnPreferenceClickListener(listener) + preference.setIcon(setTint(getContext(), getDrawable(getContext(), icon))); // preference.setIcon + preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener) + + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) + } + + public static void addPreferenceDrawable(MaterialPreferenceToolbarFragment fragment, String key, CharSequence title, CharSequence summary, @Nullable Drawable icon, Preference.OnPreferenceClickListener listener) { + Preference preference = new Preference(getContext()); + preference.setSummary(summary); // setSummary + preference.setTitle(title); // setTitle + preference.setKey(key); // setKey + + if (icon != null) + preference.setIcon(icon); // preference.setIcon + preference.setOnPreferenceClickListener(listener); // preference.setOnPreferenceClickListener(listener) fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } @@ -148,7 +150,7 @@ public class PreferencesUtil { public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title) { PreferenceCategory preference = new PreferenceCategory(getContext(), null); preference.setTitle(title); // setTitle - fragment.getPreferenceScreen().addPreference()preference); // fragment.getPreferenceScreen().addPreference(preference) + fragment.getPreferenceScreen().addPreference(preference); // fragment.getPreferenceScreen().addPreference(preference) } public static void addPreferenceCategory(MaterialPreferenceToolbarFragment fragment, CharSequence title, int collapsedSize) {