From 4e188503a2fa46485ae5bc93007e2a4a4d98ae1d Mon Sep 17 00:00:00 2001 From: FineFindus Date: Thu, 18 May 2023 22:42:55 +0200 Subject: [PATCH] feat(settings): add summary to ambiguous settings --- .../android/fragments/settings/AccountFragment.java | 6 ++---- .../fragments/settings/AppearanceFragment.java | 8 ++++---- .../fragments/settings/BehaviourFragment.java | 12 ++++++------ .../fragments/settings/NotificationsFragment.java | 2 +- mastodon/src/main/res/values/strings_mo.xml | 12 ++++++++++++ 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java index fdbe31369..a627fc136 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java @@ -52,7 +52,7 @@ public class AccountFragment extends SettingsBaseFragment{ if (!TextUtils.isEmpty(getInstance().version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, getInstance().version))); items.add(new HeaderItem(R.string.sk_instance_features)); - items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{ + items.add(new SwitchItem(R.string.sk_settings_support_local_only, R.string.sk_settings_local_only_explanation, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{ glitchModeItem.enabled = i.checked; if (i.checked) { GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID); @@ -65,8 +65,7 @@ public class AccountFragment extends SettingsBaseFragment{ if (list.findViewHolderForAdapterPosition(items.indexOf(glitchModeItem)) instanceof SwitchViewHolder svh) svh.rebind(); GlobalUserPreferences.save(); })); - items.add(new SmallTextItem(getString(R.string.sk_settings_local_only_explanation))); - items.add(glitchModeItem = new SwitchItem(R.string.sk_settings_glitch_instance, 0, GlobalUserPreferences.accountsInGlitchMode.contains(accountID), i->{ + items.add(glitchModeItem = new SwitchItem(R.string.sk_settings_glitch_instance, R.string.sk_settings_glitch_mode_explanation, 0, GlobalUserPreferences.accountsInGlitchMode.contains(accountID), i->{ if (i.checked) { GlobalUserPreferences.accountsInGlitchMode.add(accountID); } else { @@ -75,7 +74,6 @@ public class AccountFragment extends SettingsBaseFragment{ GlobalUserPreferences.save(); })); glitchModeItem.enabled = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID); - items.add(new SmallTextItem(getString(R.string.sk_settings_glitch_mode_explanation))); boolean translationAvailable = getInstance().v2 != null && getInstance().v2.configuration.translation != null && getInstance().v2.configuration.translation.enabled; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java index 62968cece..43ea614ce 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java @@ -10,7 +10,7 @@ import org.joinmastodon.android.R; import java.util.ArrayList; -public class SettingsAppearanceFragment extends SettingsBaseFragment { +public class AppearanceFragment extends SettingsBaseFragment { @Override public void addItems(ArrayList items) { @@ -35,17 +35,17 @@ public class SettingsAppearanceFragment extends SettingsBaseFragment { case NORD -> R.string.mo_color_palette_nord; }); })); - items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged)); + items.add(new SwitchItem(R.string.theme_true_black, R.string.mo_setting_true_black_summary, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged)); items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i -> { GlobalUserPreferences.disableMarquee = i.checked; GlobalUserPreferences.save(); needAppRestart = true; })); - items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i -> { + items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.string.mo_setting_uniform_summary, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i -> { GlobalUserPreferences.uniformNotificationIcon = i.checked; GlobalUserPreferences.save(); })); - items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i -> { + items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.string.mo_setting_reduced_motion_summary, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i -> { GlobalUserPreferences.reduceMotion = i.checked; GlobalUserPreferences.save(); needAppRestart = true; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java index 8b9633904..ab1573637 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java @@ -18,7 +18,7 @@ public class BehaviourFragment extends SettingsBaseFragment{ @Override public void addItems(ArrayList items) { items.add(new HeaderItem(R.string.settings_behavior)); - items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{ + items.add(new SwitchItem(R.string.settings_gif, R.string.mo_setting_play_gif_summary, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{ GlobalUserPreferences.playGifs=i.checked; GlobalUserPreferences.save(); })); @@ -31,11 +31,11 @@ public class BehaviourFragment extends SettingsBaseFragment{ GlobalUserPreferences.save(); needAppRestart=true; })); - items.add(new SwitchItem(R.string.mo_load_remote_followers, R.drawable.ic_fluent_people_24_regular, GlobalUserPreferences.loadRemoteAccountFollowers, i -> { + items.add(new SwitchItem(R.string.mo_load_remote_followers, R.string.mo_setting_remote_follower_summary, R.drawable.ic_fluent_people_24_regular, GlobalUserPreferences.loadRemoteAccountFollowers, i -> { GlobalUserPreferences.loadRemoteAccountFollowers=i.checked; GlobalUserPreferences.save(); })); - items.add(new SwitchItem(R.string.sk_settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{ + items.add(new SwitchItem(R.string.sk_settings_show_interaction_counts, R.string.mo_setting_interaction_count_summary, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{ GlobalUserPreferences.showInteractionCounts=i.checked; GlobalUserPreferences.save(); })); @@ -45,7 +45,7 @@ public class BehaviourFragment extends SettingsBaseFragment{ })); // items.add(new SwitchItem(R.string.sk_settings_show_differentiated_notification_icons, R.drawable.ic_ntf_logo, GlobalUserPreferences.showUniformPushNoticationIcons, this::onNotificationStyleChanged)); - items.add(new SwitchItem(R.string.sk_tabs_disable_swipe, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{ + items.add(new SwitchItem(R.string.sk_tabs_disable_swipe, R.string.mo_setting_disable_swipe_summary, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{ GlobalUserPreferences.disableSwipe=i.checked; GlobalUserPreferences.save(); needAppRestart=true; @@ -98,11 +98,11 @@ public class BehaviourFragment extends SettingsBaseFragment{ } }); })); - items.add(new SwitchItem(R.string.mo_relocate_publish_button, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{ + items.add(new SwitchItem(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{ GlobalUserPreferences.relocatePublishButton=i.checked; GlobalUserPreferences.save(); })); - items.add(new SwitchItem(R.string.mo_change_default_reply_visibility_to_unlisted, R.drawable.ic_fluent_lock_open_24_regular, GlobalUserPreferences.defaultToUnlistedReplies, i->{ + items.add(new SwitchItem(R.string.mo_change_default_reply_visibility_to_unlisted, R.string.mo_setting_default_reply_privacy_summary, R.drawable.ic_fluent_lock_open_24_regular, GlobalUserPreferences.defaultToUnlistedReplies, i->{ GlobalUserPreferences.defaultToUnlistedReplies=i.checked; GlobalUserPreferences.save(); })); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java index 6904ac153..21fb9e30c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java @@ -23,7 +23,7 @@ public class NotificationsFragment extends SettingsBaseFragment { items.add(new SwitchItem(R.string.sk_notify_poll_results, R.drawable.ic_fluent_poll_24_regular, pushSubscription.alerts.poll, i -> onNotificationsChanged(PushNotification.Type.POLL, i.checked), switchEnabled)); items.add(new HeaderItem(R.string.mo_miscellaneous_settings)); - items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{ + items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{ GlobalUserPreferences.enableDeleteNotifications=i.checked; GlobalUserPreferences.save(); needAppRestart=true; diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml index 8319c7c38..a55eafb82 100644 --- a/mastodon/src/main/res/values/strings_mo.xml +++ b/mastodon/src/main/res/values/strings_mo.xml @@ -69,4 +69,16 @@ Moderated servers Silenced Blocked + + + Might save your power on AMOLED displays + Disables the ellipsized title scrolling + Use the app icon for all notifications + Disable animations of interactions + Automatically play GIFs in avatars and emoji + Show followers from other instances + Move the publish button to the bottom bar + Replies will be opted out of discovery features by default + Show how many people interacted with a post in the timeline + Swipe to change viewed timeline \ No newline at end of file