owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(settings): move uniform icon to notifications page

Browse Source
This commit is contained in:
FineFindus
2023-05-19 20:23:00 +02:00
parent de4e7c1822
commit a71dc7f481
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java
View File

@@ -41,10 +41,6 @@ public class AppearanceFragment extends SettingsBaseFragment {
GlobalUserPreferences.save(); GlobalUserPreferences.save();
needAppRestart = true; needAppRestart = true;
})); }));
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.string.mo_setting_reduced_motion_summary, 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.reduceMotion = i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();

6
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java
View File

@@ -10,6 +10,7 @@ import java.util.ArrayList;
public class NotificationsFragment extends SettingsBaseFragment { public class NotificationsFragment extends SettingsBaseFragment {
@Override @Override
public void addItems(ArrayList<Item> items) { public void addItems(ArrayList<Item> items) {
items.add(new HeaderItem(R.string.mo_notification_audience_settings));
items.add(notificationPolicyItem = new NotificationPolicyItem()); items.add(notificationPolicyItem = new NotificationPolicyItem());
PushSubscription pushSubscription = getPushSubscription(); PushSubscription pushSubscription = getPushSubscription();
boolean switchEnabled = pushSubscription.policy != PushSubscription.Policy.NONE; boolean switchEnabled = pushSubscription.policy != PushSubscription.Policy.NONE;
@@ -32,7 +33,10 @@ public class NotificationsFragment extends SettingsBaseFragment {
GlobalUserPreferences.keepOnlyLatestNotification=i.checked; GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
})); }));
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();
}));
} }
} }

4
mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
View File

@@ -172,8 +172,8 @@ public class SettingsFragment extends MastodonToolbarFragment {
GlobalUserPreferences.useCustomTabs=i.checked; GlobalUserPreferences.useCustomTabs=i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
})); }));
items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.enableFabAutoHide, i->{ items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
GlobalUserPreferences.enableFabAutoHide =i.checked; GlobalUserPreferences.autoHideFab =i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
needAppRestart=true; needAppRestart=true;
})); }));

3
mastodon/src/main/res/values/strings_mo.xml
View File

@@ -81,4 +81,7 @@
<string name="mo_setting_default_reply_privacy_summary">Replies will be opted out of discovery features by default</string> <string name="mo_setting_default_reply_privacy_summary">Replies will be opted out of discovery features by default</string>
<string name="mo_setting_interaction_count_summary">Show how many people interacted with a post in the timeline</string> <string name="mo_setting_interaction_count_summary">Show how many people interacted with a post in the timeline</string>
<string name="mo_setting_disable_swipe_summary">Swipe to change viewed timeline</string> <string name="mo_setting_disable_swipe_summary">Swipe to change viewed timeline</string>
<!-- Settings -->
<string name="mo_notification_audience_settings">Notification Audience</string>
</resources> </resources>