From 2751b804fe0fded9c032813eedd9b30617edbce4 Mon Sep 17 00:00:00 2001 From: FineFindus Date: Sun, 23 Apr 2023 12:33:03 +0200 Subject: [PATCH] refactor: move behaviour settings to behaviour page --- .../ic_fluent_chat_settings_24_regular.xml | 9 +++ .../fragments/settings/BehaviourFragment.java | 57 +++++++++++++++++++ .../settings/SettingsMainFragment.java | 1 + 3 files changed, 67 insertions(+) create mode 100644 mastodon/src/github/res/drawable/ic_fluent_chat_settings_24_regular.xml create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java diff --git a/mastodon/src/github/res/drawable/ic_fluent_chat_settings_24_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_chat_settings_24_regular.xml new file mode 100644 index 000000000..703f8f901 --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_chat_settings_24_regular.xml @@ -0,0 +1,9 @@ + + + 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 new file mode 100644 index 000000000..768e9cb34 --- /dev/null +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java @@ -0,0 +1,57 @@ +package org.joinmastodon.android.fragments.settings; + +import org.joinmastodon.android.GlobalUserPreferences; +import org.joinmastodon.android.R; + +import java.util.ArrayList; + +public class BehaviourFragment extends SettingsBaseFragment{ + @Override + public void addItems(ArrayList items) { + items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{ + GlobalUserPreferences.playGifs=i.checked; + GlobalUserPreferences.save(); + })); + items.add(new SwitchItem(R.string.settings_custom_tabs, R.drawable.ic_fluent_link_24_regular, GlobalUserPreferences.useCustomTabs, i->{ + GlobalUserPreferences.useCustomTabs=i.checked; + 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->{ + GlobalUserPreferences.enableFabAutoHide =i.checked; + GlobalUserPreferences.save(); + needAppRestart=true; + })); + items.add(new SwitchItem(R.string.mo_load_remote_followers, 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->{ + GlobalUserPreferences.showInteractionCounts=i.checked; + GlobalUserPreferences.save(); + })); + items.add(new SwitchItem(R.string.sk_settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{ + GlobalUserPreferences.alwaysExpandContentWarnings=i.checked; + GlobalUserPreferences.save(); + })); + +// 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->{ + GlobalUserPreferences.disableSwipe=i.checked; + GlobalUserPreferences.save(); + needAppRestart=true; + })); + items.add(new SwitchItem(R.string.mo_disable_double_tap_to_swipe_between_tabs, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, GlobalUserPreferences.disableDoubleTapToSwipe, i->{ + GlobalUserPreferences.disableDoubleTapToSwipe=i.checked; + GlobalUserPreferences.save(); + needAppRestart=true; + })); + items.add(new SwitchItem(R.string.sk_settings_confirm_before_reblog, R.drawable.ic_fluent_checkmark_circle_24_regular, GlobalUserPreferences.confirmBeforeReblog, i->{ + 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(); + })); + } +} diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java index 4e2a1f256..db9398a4f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java @@ -8,5 +8,6 @@ public class SettingsMainFragment extends SettingsBaseFragment{ @Override public void addItems(ArrayList items) { items.add(new SettingsCategoryItem(R.string.settings_theme, SettingsAppearanceFragment.class, R.drawable.ic_fluent_color_24_regular)); + items.add(new SettingsCategoryItem(R.string.settings_behavior, BehaviourFragment.class, R.drawable.ic_fluent_chat_settings_24_regular)); } }