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 cc46175ef..8e00c4c91 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,6 +1,7 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; +import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer; import android.os.Bundle; @@ -9,6 +10,8 @@ import androidx.preference.Preference; import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; +import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog; + public class InterfaceFragment extends MaterialPreferenceToolbarFragment { @Override public void onCreate(Bundle bundle) { @@ -21,6 +24,17 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment { findPreference("stories").setOnPreferenceClickListener(new restart()); findPreference("swipe").setOnPreferenceClickListener(new restart()); findPreference("is_likes_on_right").setOnPreferenceClickListener(new restart()); + + findPreference("customrounding").setOnPreferenceClickListener(preference -> { + RoundingSeekbarDialog.dialog(getContext()); + return true; + }); + + if (getPreferences().getInt("pic_rounding", 0) == 0) { + findPreference("customrounding").setSummary("Отключено"); + } else { + findPreference("customrounding").setSummary("Размер закругления: " + getPreferences().getInt("pic_rounding", 0) + "dp"); + } } public boolean restart(Preference 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 1d4ebd78f..eb2087769 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 @@ -163,11 +163,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment { return true; }); - findPreference("customrounding").setOnPreferenceClickListener(preference -> { - RoundingSeekbarDialog.dialog(getContext()); - return true; - }); - if (isLoggedIn()) { findPreference("lastfm_auth").setSummary("Вы авторизованы как " + Scrobbler.getUserName()); } else { diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml index 22f5bf091..0e1dc570f 100644 --- a/smali/res/xml/preferences_interface.xml +++ b/smali/res/xml/preferences_interface.xml @@ -19,6 +19,9 @@ android:defaultValue="false" android:key="is_likes_on_right" android:title="Показ лайков в посте справа" /> + -