From e8290e2f78524e512e10c2bf4ea88f7045ae5167 Mon Sep 17 00:00:00 2001 From: FineFindus Date: Fri, 19 May 2023 21:32:53 +0200 Subject: [PATCH] feat(settings): move reblog notificaiton to notification page --- .../android/fragments/settings/BehaviourFragment.java | 4 ---- .../android/fragments/settings/NotificationsFragment.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) 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 ea21bf8b8..7f0e00440 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 @@ -49,10 +49,6 @@ public class BehaviourFragment extends SettingsBaseFragment{ GlobalUserPreferences.confirmBeforeReblog=i.checked; GlobalUserPreferences.save(); })); - items.add(new SwitchItem(R.string.mo_swap_bookmark_with_reblog, R.drawable.ic_boost, GlobalUserPreferences.swapBookmarkWithBoostAction, i -> { - GlobalUserPreferences.swapBookmarkWithBoostAction=i.checked; - GlobalUserPreferences.save(); - })); items.add(new HeaderItem(R.string.mo_composer_behavior)); items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b-> { 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 9d7b5e93c..63058d542 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 @@ -37,6 +37,11 @@ public class NotificationsFragment extends SettingsBaseFragment { GlobalUserPreferences.uniformNotificationIcon = i.checked; GlobalUserPreferences.save(); })); + items.add(new SwitchItem(R.string.mo_swap_bookmark_with_reblog, R.drawable.ic_boost, GlobalUserPreferences.swapBookmarkWithBoostAction, i -> { + GlobalUserPreferences.swapBookmarkWithBoostAction=i.checked; + GlobalUserPreferences.save(); + })); + } }