From 5657df8db212aa926971cebca73230295af172a7 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 21 Apr 2023 18:34:00 +0200
Subject: [PATCH 01/45] feat: move Settingsfragment to settings folder

---
 .../joinmastodon/android/fragments/HomeTabFragment.java   | 2 +-
 .../fragments/onboarding/AccountActivationFragment.java   | 3 +--
 .../fragments/{ => settings}/SettingsFragment.java        | 8 +++-----
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename mastodon/src/main/java/org/joinmastodon/android/fragments/{ => settings}/SettingsFragment.java (99%)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index fd1a199ce..4e0a09659 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import static org.joinmastodon.android.GlobalUserPreferences.reduceMotion;
-import static org.joinmastodon.android.GlobalUserPreferences.showNewPostsButton;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -48,6 +47,7 @@ import org.joinmastodon.android.events.HashtagUpdatedEvent;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
+import org.joinmastodon.android.fragments.settings.SettingsFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
index 7a20eaa68..d30a93db3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
@@ -23,8 +23,7 @@ import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.HomeFragment;
-import org.joinmastodon.android.fragments.SettingsFragment;
+import org.joinmastodon.android.fragments.settings.SettingsFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
similarity index 99%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
index 5285c8e0d..639261ea1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
@@ -1,4 +1,4 @@
-package org.joinmastodon.android.fragments;
+package org.joinmastodon.android.fragments.settings;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -12,7 +12,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.LruCache;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -46,7 +45,6 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.PushNotificationReceiver;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
@@ -55,6 +53,7 @@ import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
+import org.joinmastodon.android.fragments.MastodonToolbarFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Instance;
@@ -68,7 +67,6 @@ import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -85,7 +83,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class SettingsFragment extends MastodonToolbarFragment{
+public class SettingsFragment extends MastodonToolbarFragment {
 	private View view;
 	private UsableRecyclerView list;
 	private ArrayList<Item> items=new ArrayList<>();

From dc9e977d40e977396f6200d7d6609ccf66093807 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 21 Apr 2023 21:17:20 +0200
Subject: [PATCH 02/45] refactor: add abstract settingsbase fragment

---
 .../settings/SettingsBaseFragment.java        | 415 ++++++++++++++++++
 1 file changed, 415 insertions(+)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
new file mode 100644
index 000000000..f00bdd2fb
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -0,0 +1,415 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.annotation.SuppressLint;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.DomainManager;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.DomainDisplay;
+import org.joinmastodon.android.fragments.MastodonToolbarFragment;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.function.Consumer;
+
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public abstract class SettingsBaseFragment extends MastodonToolbarFragment implements DomainDisplay {
+	protected View view;
+	private UsableRecyclerView list;
+	private ArrayList<Item> items=new ArrayList<>();
+	private String accountID;
+
+	public abstract void addItems(ArrayList<Item> items);
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
+		setTitle(R.string.settings);
+
+		accountID=getArguments().getString("account");
+		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
+		DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
+
+		addItems(items);
+	}
+
+	@Override
+	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+		list=new UsableRecyclerView(getActivity());
+		list.setLayoutManager(new LinearLayoutManager(getActivity()));
+		list.setAdapter(new SettingsAdapter());
+		list.setBackgroundColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorBackground));
+		list.setPadding(0, V.dp(16), 0, V.dp(12));
+		list.setClipToPadding(false);
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				// Add 32dp gaps between sections
+				RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
+				if((holder instanceof HeaderViewHolder || holder instanceof FooterViewHolder) && holder.getAbsoluteAdapterPosition()>1)
+					outRect.top=V.dp(32);
+			}
+		});
+		return list;
+	}
+
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
+			list.setPadding(0, V.dp(16), 0, V.dp(12)+insets.getSystemWindowInsetBottom());
+			insets=insets.inset(0, 0, 0, insets.getSystemWindowInsetBottom());
+		}
+		super.onApplyWindowInsets(insets);
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		this.view = view;
+	}
+
+
+	private static abstract class Item{
+		public abstract int getViewType();
+	}
+
+	private class HeaderItem extends Item{
+		private String text;
+
+		public HeaderItem(@StringRes int text){
+			this.text=getString(text);
+		}
+
+		public HeaderItem(String text){
+			this.text=text;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.HEADER.ordinal();
+		}
+	}
+
+	private class SwitchItem extends Item{
+		private String text;
+		private int icon;
+		private boolean checked;
+		private Consumer<SwitchItem> onChanged;
+		private boolean enabled=true;
+
+		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
+			this.text=getString(text);
+			this.icon=icon;
+			this.checked=checked;
+			this.onChanged=onChanged;
+		}
+
+		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
+			this.text=getString(text);
+			this.icon=icon;
+			this.checked=checked;
+			this.onChanged=onChanged;
+			this.enabled=enabled;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.SWITCH.ordinal();
+		}
+	}
+
+	public class ButtonItem extends Item{
+		private int text;
+		private int icon;
+		private Consumer<Button> buttonConsumer;
+
+		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
+			this.text = text;
+			this.icon = icon;
+			this.buttonConsumer = buttonConsumer;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.BUTTON.ordinal();
+		}
+	}
+
+	private class SmallTextItem extends Item {
+		private String text;
+
+		public SmallTextItem(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public int getViewType() {
+			return Type.SMALL_TEXT.ordinal();
+		}
+	}
+
+	private class TextItem extends Item{
+		private String text;
+		private String secondaryText;
+		private Runnable onClick;
+		private boolean loading;
+		private int icon;
+
+		public TextItem(@StringRes int text, Runnable onClick) {
+			this(text, null, onClick, false, 0);
+		}
+
+		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
+			this(text, null, onClick, false, icon);
+		}
+
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
+			this(text, secondaryText, onClick, false, icon);
+		}
+
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
+			this.text=getString(text);
+			this.onClick=onClick;
+			this.loading=loading;
+			this.icon=icon;
+			this.secondaryText = secondaryText;
+		}
+
+		public TextItem(String text, Runnable onClick){
+			this.text=text;
+			this.onClick=onClick;
+		}
+
+		public TextItem(String text, Runnable onClick, @DrawableRes int icon){
+			this.text=text;
+			this.onClick=onClick;
+			this.icon=icon;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.TEXT.ordinal();
+		}
+	}
+
+	private class FooterItem extends Item{
+		private String text;
+		private Runnable onClick;
+
+		public FooterItem(String text, Runnable onClick){
+			this.text=text;
+			this.onClick=onClick;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.FOOTER.ordinal();
+		}
+	}
+
+	public enum Type{
+		HEADER,
+		SWITCH,
+		TEXT,
+		FOOTER,
+		BUTTON,
+		SMALL_TEXT,
+	}
+
+
+	private class SettingsAdapter extends RecyclerView.Adapter<BindableViewHolder<Item>>{
+
+		@NonNull
+		@Override
+		public BindableViewHolder<Item> onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			//noinspection unchecked
+			return (BindableViewHolder<Item>) switch(Type.values()[viewType]){
+				case HEADER -> new HeaderViewHolder();
+				case SWITCH -> new SwitchViewHolder();
+				case TEXT -> new TextViewHolder();
+				case FOOTER -> new FooterViewHolder();
+				case BUTTON -> new ButtonViewHolder();
+				case SMALL_TEXT -> new SmallTextViewHolder();
+			};
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull BindableViewHolder<Item> holder, int position){
+			holder.bind(items.get(position));
+		}
+
+		@Override
+		public int getItemCount(){
+			return items.size();
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return items.get(position).getViewType();
+		}
+	}
+
+	private class HeaderViewHolder extends BindableViewHolder<HeaderItem>{
+		private final TextView text;
+		public HeaderViewHolder(){
+			super(getActivity(), R.layout.item_settings_header, list);
+			text=(TextView) itemView;
+		}
+
+		@Override
+		public void onBind(HeaderItem item){
+			text.setText(item.text);
+		}
+	}
+
+	private class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
+		private final TextView text;
+		private final ImageView icon;
+		private final Switch checkbox;
+
+		public SwitchViewHolder(){
+			super(getActivity(), R.layout.item_settings_switch, list);
+			text=findViewById(R.id.text);
+			icon=findViewById(R.id.icon);
+			checkbox=findViewById(R.id.checkbox);
+		}
+
+		@Override
+		public void onBind(SwitchItem item){
+			text.setText(item.text);
+			if (item.icon == 0) {
+				icon.setVisibility(View.GONE);
+			} else {
+				icon.setVisibility(View.VISIBLE);
+				icon.setImageResource(item.icon);
+			}
+			checkbox.setChecked(item.checked && item.enabled);
+			checkbox.setEnabled(item.enabled);
+		}
+
+		@Override
+		public void onClick(){
+			item.checked=!item.checked;
+			checkbox.setChecked(item.checked);
+			item.onChanged.accept(item);
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return item.enabled;
+		}
+	}
+
+	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
+		private final Button button;
+		private final ImageView icon;
+		private final TextView text;
+
+		@SuppressLint("ClickableViewAccessibility")
+		public ButtonViewHolder(){
+			super(getActivity(), R.layout.item_settings_button, list);
+			text=findViewById(R.id.text);
+			icon=findViewById(R.id.icon);
+			button=findViewById(R.id.button);
+		}
+
+		@Override
+		public void onBind(ButtonItem item){
+			text.setText(item.text);
+			icon.setImageResource(item.icon);
+			item.buttonConsumer.accept(button);
+		}
+	}
+
+	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
+		private final TextView text, secondaryText;
+		private final ProgressBar progress;
+		private final ImageView icon;
+
+		public TextViewHolder(){
+			super(getActivity(), R.layout.item_settings_text, list);
+			text = itemView.findViewById(R.id.text);
+			secondaryText = itemView.findViewById(R.id.secondary_text);
+			progress = itemView.findViewById(R.id.progress);
+			icon = itemView.findViewById(R.id.icon);
+		}
+
+		@Override
+		public void onBind(TextItem item){
+			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
+			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
+
+			text.setText(item.text);
+			progress.animate().alpha(item.loading ? 1 : 0);
+			icon.setImageResource(item.icon);
+			secondaryText.setText(item.secondaryText);
+		}
+
+		@Override
+		public void onClick(){
+			item.onClick.run();
+		}
+	}
+
+	private class SmallTextViewHolder extends BindableViewHolder<SmallTextItem> {
+		private final TextView text;
+
+		public SmallTextViewHolder(){
+			super(getActivity(), R.layout.item_settings_text, list);
+			text = itemView.findViewById(R.id.text);
+			text.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
+			text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+			text.setPaddingRelative(text.getPaddingStart(), 0, text.getPaddingEnd(), text.getPaddingBottom());
+		}
+
+		@Override
+		public void onBind(SmallTextItem item){
+			text.setText(item.text);
+		}
+	}
+
+	private class FooterViewHolder extends BindableViewHolder<FooterItem> implements UsableRecyclerView.Clickable{
+		private final TextView text;
+		public FooterViewHolder(){
+			super(getActivity(), R.layout.item_settings_footer, list);
+			text=(TextView) itemView;
+		}
+
+		@Override
+		public void onBind(FooterItem item){
+			text.setText(item.text);
+		}
+
+		@Override
+		public void onClick(){
+			item.onClick.run();
+		}
+	}
+}

From a6a67512f40f076494f92dcb3397de005d4a1974 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 22 Apr 2023 18:02:54 -0300
Subject: [PATCH 03/45] feat: add all previously missing view holders

This includes: Updater View holder, theme view holder and notification policy view holder
---
 .../settings/SettingsBaseFragment.java        | 319 ++++++++++++++++++
 1 file changed, 319 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index f00bdd2fb..be246163f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -1,18 +1,27 @@
 package org.joinmastodon.android.fragments.settings;
 
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.animation.LinearInterpolator;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupMenu;
 import android.widget.ProgressBar;
+import android.widget.RadioButton;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -23,12 +32,18 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.DomainManager;
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.DomainDisplay;
 import org.joinmastodon.android.fragments.MastodonToolbarFragment;
+import org.joinmastodon.android.model.PushNotification;
+import org.joinmastodon.android.model.PushSubscription;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -40,9 +55,17 @@ import me.grishka.appkit.views.UsableRecyclerView;
 public abstract class SettingsBaseFragment extends MastodonToolbarFragment implements DomainDisplay {
 	protected View view;
 	private UsableRecyclerView list;
+
+	private ImageView themeTransitionWindowView;
+
+	private SettingsBaseFragment.NotificationPolicyItem notificationPolicyItem;
+
+	private PushSubscription pushSubscription;
 	private ArrayList<Item> items=new ArrayList<>();
 	private String accountID;
 
+	private boolean needUpdateNotificationSettings;
+
 	public abstract void addItems(ArrayList<Item> items);
 
 	@Override
@@ -144,6 +167,31 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	private class UpdateItem extends SettingsBaseFragment.Item {
+
+		@Override
+		public int getViewType(){
+			return Type.UPDATER.ordinal();
+		}
+	}
+
+	private static class ThemeItem extends SettingsBaseFragment.Item {
+
+		@Override
+		public int getViewType(){
+			return Type.THEME.ordinal();
+		}
+	}
+
+	private static class NotificationPolicyItem extends SettingsBaseFragment.Item {
+
+		@Override
+		public int getViewType(){
+			return Type.NOTIFICATION_POLICY.ordinal();
+		}
+	}
+
+
 	public class ButtonItem extends Item{
 		private int text;
 		private int icon;
@@ -236,10 +284,13 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	public enum Type{
 		HEADER,
 		SWITCH,
+		THEME,
 		TEXT,
+		NOTIFICATION_POLICY,
 		FOOTER,
 		BUTTON,
 		SMALL_TEXT,
+		UPDATER
 	}
 
 
@@ -252,10 +303,13 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			return (BindableViewHolder<Item>) switch(Type.values()[viewType]){
 				case HEADER -> new HeaderViewHolder();
 				case SWITCH -> new SwitchViewHolder();
+				case THEME -> new ThemeViewHolder();
 				case TEXT -> new TextViewHolder();
+				case NOTIFICATION_POLICY -> new NotificationPolicyViewHolder();
 				case FOOTER -> new FooterViewHolder();
 				case BUTTON -> new ButtonViewHolder();
 				case SMALL_TEXT -> new SmallTextViewHolder();
+				case UPDATER -> new UpdateViewHolder();
 			};
 		}
 
@@ -288,6 +342,136 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	private void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
+		GlobalUserPreferences.theme=theme;
+		GlobalUserPreferences.save();
+		restartActivityToApplyNewTheme();
+	}
+
+	private void restartActivityToApplyNewTheme(){
+		// Calling activity.recreate() causes a black screen for like half a second.
+		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
+		// As a bonus, we can fade it out to make it even smoother.
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+			View activityDecorView=getActivity().getWindow().getDecorView();
+			Bitmap bitmap=Bitmap.createBitmap(activityDecorView.getWidth(), activityDecorView.getHeight(), Bitmap.Config.ARGB_8888);
+			activityDecorView.draw(new Canvas(bitmap));
+			themeTransitionWindowView=new ImageView(MastodonApp.context);
+			themeTransitionWindowView.setImageBitmap(bitmap);
+			WindowManager.LayoutParams lp=new WindowManager.LayoutParams(WindowManager.LayoutParams.TYPE_APPLICATION);
+			lp.flags=WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE |
+					WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
+			lp.systemUiVisibility=View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+			lp.systemUiVisibility|=(activityDecorView.getWindowSystemUiVisibility() & (View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR));
+			lp.width=lp.height=WindowManager.LayoutParams.MATCH_PARENT;
+			lp.token=getActivity().getWindow().getAttributes().token;
+			lp.windowAnimations=R.style.window_fade_out;
+			MastodonApp.context.getSystemService(WindowManager.class).addView(themeTransitionWindowView, lp);
+		}
+		getActivity().recreate();
+	}
+
+	private class NotificationPolicyViewHolder extends BindableViewHolder<NotificationPolicyItem>{
+		private final Button button;
+		private final PopupMenu popupMenu;
+
+		@SuppressLint("ClickableViewAccessibility")
+		public NotificationPolicyViewHolder(){
+			super(getActivity(), R.layout.item_settings_notification_policy, list);
+			button=findViewById(R.id.button);
+			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.notification_policy);
+			popupMenu.setOnMenuItemClickListener(item->{
+				PushSubscription.Policy policy;
+				int id=item.getItemId();
+				if(id==R.id.notify_anyone)
+					policy=PushSubscription.Policy.ALL;
+				else if(id==R.id.notify_followed)
+					policy=PushSubscription.Policy.FOLLOWED;
+				else if(id==R.id.notify_follower)
+					policy=PushSubscription.Policy.FOLLOWER;
+				else if(id==R.id.notify_none)
+					policy=PushSubscription.Policy.NONE;
+				else
+					return false;
+				onNotificationsPolicyChanged(policy);
+				return true;
+			});
+			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
+			button.setOnTouchListener(popupMenu.getDragToOpenListener());
+			button.setOnClickListener(v->popupMenu.show());
+		}
+
+		@Override
+		public void onBind(SettingsBaseFragment.NotificationPolicyItem item){
+			button.setText(switch(getPushSubscription().policy){
+				case ALL -> R.string.notify_anyone;
+				case FOLLOWED -> R.string.notify_followed;
+				case FOLLOWER -> R.string.notify_follower;
+				case NONE -> R.string.notify_none;
+			});
+		}
+	}
+
+	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
+		PushSubscription subscription=getPushSubscription();
+		PushSubscription.Policy prevPolicy=subscription.policy;
+		if(prevPolicy==policy)
+			return;
+		subscription.policy=policy;
+		int index=items.indexOf(notificationPolicyItem);
+		RecyclerView.ViewHolder policyHolder=list.findViewHolderForAdapterPosition(index);
+		if(policyHolder!=null){
+			((SettingsBaseFragment.NotificationPolicyViewHolder)policyHolder).rebind();
+		}else{
+			list.getAdapter().notifyItemChanged(index);
+		}
+		if((prevPolicy==PushSubscription.Policy.NONE)!=(policy==PushSubscription.Policy.NONE)){
+			boolean newState=policy!=PushSubscription.Policy.NONE;
+			for(PushNotification.Type value : PushNotification.Type.values()){
+				onNotificationsChanged(value, newState);
+			}
+			index++;
+			while(items.get(index) instanceof SettingsBaseFragment.SwitchItem si){
+				si.enabled=si.checked=newState;
+				RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(index);
+				if(holder!=null)
+					((BindableViewHolder<?>)holder).rebind();
+				else
+					list.getAdapter().notifyItemChanged(index);
+				index++;
+			}
+		}
+		needUpdateNotificationSettings=true;
+	}
+
+	private void onNotificationsChanged(PushNotification.Type type, boolean enabled){
+		PushSubscription subscription=getPushSubscription();
+		switch(type){
+			case FAVORITE -> subscription.alerts.favourite=enabled;
+			case FOLLOW -> subscription.alerts.follow=enabled;
+			case REBLOG -> subscription.alerts.reblog=enabled;
+			case MENTION -> subscription.alerts.mention=enabled;
+			case POLL -> subscription.alerts.poll=enabled;
+			case STATUS -> subscription.alerts.status=enabled;
+			case UPDATE -> subscription.alerts.update=enabled;
+		}
+		needUpdateNotificationSettings=true;
+	}
+
+	private PushSubscription getPushSubscription(){
+		if(pushSubscription!=null)
+			return pushSubscription;
+		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+		if(session.pushSubscription==null){
+			pushSubscription=new PushSubscription();
+			pushSubscription.alerts=PushSubscription.Alerts.ofAll();
+		}else{
+			pushSubscription=session.pushSubscription.clone();
+		}
+		return pushSubscription;
+	}
+
 	private class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
 		private final TextView text;
 		private final ImageView icon;
@@ -326,6 +510,67 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	private class ThemeViewHolder extends BindableViewHolder<ThemeItem>{
+		private ThemeViewHolder.SubitemHolder autoHolder, lightHolder, darkHolder;
+
+		public ThemeViewHolder(){
+			super(getActivity(), R.layout.item_settings_theme, list);
+			autoHolder=new ThemeViewHolder.SubitemHolder(findViewById(R.id.theme_auto));
+			lightHolder=new ThemeViewHolder.SubitemHolder(findViewById(R.id.theme_light));
+			darkHolder=new ThemeViewHolder.SubitemHolder(findViewById(R.id.theme_dark));
+		}
+
+		@Override
+		public void onBind(SettingsBaseFragment.ThemeItem item){
+			bindSubitems();
+		}
+
+		public void bindSubitems(){
+			autoHolder.bind(R.string.theme_auto, GlobalUserPreferences.trueBlackTheme ? R.drawable.theme_auto_trueblack : R.drawable.theme_auto, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO);
+			lightHolder.bind(R.string.theme_light, R.drawable.theme_light, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.LIGHT);
+			darkHolder.bind(R.string.theme_dark, GlobalUserPreferences.trueBlackTheme ? R.drawable.theme_dark_trueblack : R.drawable.theme_dark, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK);
+		}
+
+		private void onSubitemClick(View v){
+			GlobalUserPreferences.ThemePreference pref;
+			if(v.getId()==R.id.theme_auto)
+				pref=GlobalUserPreferences.ThemePreference.AUTO;
+			else if(v.getId()==R.id.theme_light)
+				pref=GlobalUserPreferences.ThemePreference.LIGHT;
+			else if(v.getId()==R.id.theme_dark)
+				pref=GlobalUserPreferences.ThemePreference.DARK;
+			else
+				return;
+			onThemePreferenceClick(pref);
+		}
+
+		private class SubitemHolder{
+			public TextView text;
+			public ImageView icon;
+			public RadioButton checkbox;
+
+			public SubitemHolder(View view){
+				text=view.findViewById(R.id.text);
+				icon=view.findViewById(R.id.icon);
+				checkbox=view.findViewById(R.id.checkbox);
+				view.setOnClickListener(ThemeViewHolder.this::onSubitemClick);
+
+				icon.setClipToOutline(true);
+				icon.setOutlineProvider(OutlineProviders.roundedRect(4));
+			}
+
+			public void bind(int text, int icon, boolean checked){
+				this.text.setText(text);
+				this.icon.setImageResource(icon);
+				checkbox.setChecked(checked);
+			}
+
+			public void setChecked(boolean checked){
+				checkbox.setChecked(checked);
+			}
+		}
+	}
+
 	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
@@ -412,4 +657,78 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			item.onClick.run();
 		}
 	}
+
+	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
+
+		private final TextView text, changelog;
+		private final Button button;
+		private final ImageButton cancelBtn;
+		private final ProgressBar progress;
+
+		private ObjectAnimator rotationAnimator;
+		private Runnable progressUpdater=this::updateProgress;
+
+		public UpdateViewHolder(){
+			super(getActivity(), R.layout.item_settings_update, list);
+			text=findViewById(R.id.text);
+			changelog=findViewById(R.id.changelog);
+			button=findViewById(R.id.button);
+			cancelBtn=findViewById(R.id.cancel_btn);
+			progress=findViewById(R.id.progress);
+			button.setOnClickListener(v->{
+				GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+				switch(updater.getState()){
+					case UPDATE_AVAILABLE -> updater.downloadUpdate();
+					case DOWNLOADED -> updater.installUpdate(getActivity());
+				}
+			});
+			cancelBtn.setOnClickListener(v->GithubSelfUpdater.getInstance().cancelDownload());
+			rotationAnimator=ObjectAnimator.ofFloat(progress, View.ROTATION, 0f, 360f);
+			rotationAnimator.setInterpolator(new LinearInterpolator());
+			rotationAnimator.setDuration(1500);
+			rotationAnimator.setRepeatCount(ObjectAnimator.INFINITE);
+		}
+
+		@Override
+		public void onBind(SettingsBaseFragment.UpdateItem item){
+			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+			GithubSelfUpdater.UpdateState state=updater.getState();
+			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;
+			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
+			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
+				text.setText(getString(R.string.mo_update_available, info.version));
+				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
+			}else{
+				text.setText(getString(R.string.mo_update_ready, info.version));
+				button.setText(R.string.install_update);
+			}
+			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){
+				rotationAnimator.start();
+				button.setVisibility(View.INVISIBLE);
+				cancelBtn.setVisibility(View.VISIBLE);
+				progress.setVisibility(View.VISIBLE);
+				updateProgress();
+			}else{
+				rotationAnimator.cancel();
+				button.setVisibility(View.VISIBLE);
+				cancelBtn.setVisibility(View.GONE);
+				progress.setVisibility(View.GONE);
+				progress.removeCallbacks(progressUpdater);
+			}
+			changelog.setText(info.changelog);
+//			changelog.setText(getString(R.string.sk_changelog, info.changelog));
+		}
+
+		private void updateProgress(){
+			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
+			if(updater.getState()!=GithubSelfUpdater.UpdateState.DOWNLOADING)
+				return;
+			int value=Math.round(progress.getMax()*updater.getDownloadProgress());
+			if(Build.VERSION.SDK_INT>=24)
+				progress.setProgress(value, true);
+			else
+				progress.setProgress(value);
+			progress.postDelayed(progressUpdater, 1000);
+		}
+	}
 }

From 03612fcf648b7cbdae1b6083864efc21ee5c1ced Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 22 Apr 2023 22:35:39 -0300
Subject: [PATCH 04/45] feat: add settings category view holder

Also adds a small proof of concept
---
 .../android/fragments/HomeTabFragment.java    |  3 +-
 .../settings/SettingsBaseFragment.java        | 88 ++++++++++++++++---
 .../settings/SettingsMainFragment.java        | 14 +++
 .../res/layout/item_settings_category.xml     | 32 +++++++
 4 files changed, 125 insertions(+), 12 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
 create mode 100644 mastodon/src/main/res/layout/item_settings_category.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index 4e0a09659..4cd882828 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -48,6 +48,7 @@ import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.fragments.settings.SettingsFragment;
+import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
@@ -484,7 +485,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 			getToolbar().post(() -> overflowPopup.show());
 			return true;
 		} else if (id == R.id.settings || id == R.id.settings_action) {
-			Nav.go(getActivity(), SettingsFragment.class, args);
+			Nav.go(getActivity(), SettingsMainFragment.class, args);
 		} else if (id == R.id.announcements || id == R.id.announcements_action) {
 			Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
 		} else if (id == R.id.edit_timelines) {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index be246163f..93f7429b7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -118,11 +118,11 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	}
 
 
-	private static abstract class Item{
+	static abstract class Item{
 		public abstract int getViewType();
 	}
 
-	private class HeaderItem extends Item{
+	protected class HeaderItem extends Item{
 		private String text;
 
 		public HeaderItem(@StringRes int text){
@@ -139,7 +139,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class SwitchItem extends Item{
+	protected class SwitchItem extends Item{
 		private String text;
 		private int icon;
 		private boolean checked;
@@ -167,7 +167,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class UpdateItem extends SettingsBaseFragment.Item {
+	protected class UpdateItem extends SettingsBaseFragment.Item {
 
 		@Override
 		public int getViewType(){
@@ -175,7 +175,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private static class ThemeItem extends SettingsBaseFragment.Item {
+	protected static class ThemeItem extends SettingsBaseFragment.Item {
 
 		@Override
 		public int getViewType(){
@@ -183,7 +183,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private static class NotificationPolicyItem extends SettingsBaseFragment.Item {
+	protected static class NotificationPolicyItem extends SettingsBaseFragment.Item {
 
 		@Override
 		public int getViewType(){
@@ -192,7 +192,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	}
 
 
-	public class ButtonItem extends Item{
+	protected class ButtonItem extends Item{
 		private int text;
 		private int icon;
 		private Consumer<Button> buttonConsumer;
@@ -209,7 +209,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class SmallTextItem extends Item {
+	protected class SmallTextItem extends Item {
 		private String text;
 
 		public SmallTextItem(String text) {
@@ -222,7 +222,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class TextItem extends Item{
+	protected class TextItem extends Item{
 		private String text;
 		private String secondaryText;
 		private Runnable onClick;
@@ -266,7 +266,52 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class FooterItem extends Item{
+	protected class SettingsCategoryItem extends Item{
+		private String text;
+		private String secondaryText;
+		private Runnable onClick;
+		private boolean loading;
+		private int icon;
+
+		public SettingsCategoryItem(@StringRes int text, Runnable onClick) {
+			this(text, null, onClick, false, 0);
+		}
+
+		public SettingsCategoryItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
+			this(text, null, onClick, false, icon);
+		}
+
+		public SettingsCategoryItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
+			this(text, secondaryText, onClick, false, icon);
+		}
+
+		public SettingsCategoryItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
+			this.text=getString(text);
+			this.onClick=onClick;
+			this.loading=loading;
+			this.icon=icon;
+			this.secondaryText = secondaryText;
+		}
+
+		public SettingsCategoryItem(String text, Runnable onClick){
+			this.text=text;
+			this.onClick=onClick;
+		}
+
+		public SettingsCategoryItem(String text, Runnable onClick, @DrawableRes int icon){
+			this.text=text;
+			this.onClick=onClick;
+			this.icon=icon;
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.SETTINGS_CATEGORY.ordinal();
+		}
+	}
+
+
+	protected class FooterItem extends Item{
 		private String text;
 		private Runnable onClick;
 
@@ -290,7 +335,8 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		FOOTER,
 		BUTTON,
 		SMALL_TEXT,
-		UPDATER
+		UPDATER,
+		SETTINGS_CATEGORY
 	}
 
 
@@ -310,6 +356,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 				case BUTTON -> new ButtonViewHolder();
 				case SMALL_TEXT -> new SmallTextViewHolder();
 				case UPDATER -> new UpdateViewHolder();
+				case SETTINGS_CATEGORY -> new SettingsCategoryViewHolder();
 			};
 		}
 
@@ -571,6 +618,25 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	private class SettingsCategoryViewHolder extends BindableViewHolder<SettingsCategoryItem>{
+		private final ImageView icon;
+		private final TextView text;
+
+		@SuppressLint("ClickableViewAccessibility")
+		public SettingsCategoryViewHolder(){
+			super(getActivity(), R.layout.item_settings_category, list);
+			text=findViewById(R.id.text);
+			icon=findViewById(R.id.icon);
+		}
+
+		@Override
+		public void onBind(SettingsCategoryItem item){
+			text.setText(item.text);
+			icon.setImageResource(item.icon);
+			item.onClick.run();
+		}
+	}
+
 	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
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
new file mode 100644
index 000000000..d2fc74bca
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
@@ -0,0 +1,14 @@
+package org.joinmastodon.android.fragments.settings;
+
+import org.joinmastodon.android.R;
+
+import java.util.ArrayList;
+
+public class SettingsMainFragment extends SettingsBaseFragment{
+    @Override
+    public void addItems(ArrayList<SettingsBaseFragment.Item> items) {
+        items.add(new SettingsBaseFragment.SettingsCategoryItem(R.string.settings_theme, () -> {
+            System.out.println("YAY");
+        }, R.drawable.ic_fluent_color_24_regular));
+    }
+}
diff --git a/mastodon/src/main/res/layout/item_settings_category.xml b/mastodon/src/main/res/layout/item_settings_category.xml
new file mode 100644
index 000000000..67e04c251
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_settings_category.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:gravity="center_vertical"
+    android:layoutDirection="locale">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="32dp"
+        android:importantForAccessibility="no"
+        android:tint="?android:textColorPrimary"
+        tools:src="@drawable/ic_fluent_color_24_regular"/>
+
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginEnd="8dp"
+        android:paddingVertical="8dp"
+        android:gravity="center_vertical"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="16sp" />
+</LinearLayout>
\ No newline at end of file

From ea152234a9fa54d62d34915b346349c88f51a0ba Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 22 Apr 2023 23:01:31 -0300
Subject: [PATCH 05/45] feat: trying to add the theme settings. Still missing
 some things

What is an enclosed class? What am I missing?
---
 .../settings/SettingsAppearanceFragment.java  | 61 ++++++++++++++
 .../settings/SettingsBaseFragment.java        | 82 +++++++++++++++----
 2 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
new file mode 100644
index 000000000..3fc28515f
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
@@ -0,0 +1,61 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MastodonApp;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+
+public class SettingsAppearanceFragment extends SettingsBaseFragment {
+    @Override
+    public void addItems(ArrayList<Item> items) {
+        items.add(themeItem SettingsBaseFragment.ThemeItem());
+        items.add(new SettingsFragment.ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b -> {
+            PopupMenu popupMenu = new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+            popupMenu.inflate(R.menu.color_palettes);
+            popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
+            popupMenu.setOnMenuItemClickListener(SettingsBaseFragment.this::onColorPreferenceClick);
+            b.setOnTouchListener(popupMenu.getDragToOpenListener());
+            b.setOnClickListener(v -> popupMenu.show());
+            b.setText(switch (GlobalUserPreferences.color) {
+                case MATERIAL3 -> R.string.sk_color_palette_material3;
+                case PINK -> R.string.sk_color_palette_pink;
+                case PURPLE -> R.string.sk_color_palette_purple;
+                case GREEN -> R.string.sk_color_palette_green;
+                case BLUE -> R.string.sk_color_palette_blue;
+                case BROWN -> R.string.sk_color_palette_brown;
+                case RED -> R.string.sk_color_palette_red;
+                case YELLOW -> R.string.sk_color_palette_yellow;
+                case NORD -> R.string.mo_color_palette_nord;
+            });
+        }));
+        items.add(new SettingsBaseFragment.SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
+        items.add(new SettingsBaseFragment.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 SettingsBaseFragment.SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i -> {
+            GlobalUserPreferences.uniformNotificationIcon = i.checked;
+            GlobalUserPreferences.save();
+        }));
+        items.add(new SettingsBaseFragment.SwitchItem(R.string.sk_settings_reduce_motion, 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/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 93f7429b7..d11ef067d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -10,6 +10,7 @@ import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -35,6 +36,7 @@ import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.PushSubscriptionManager;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.DomainDisplay;
@@ -54,17 +56,21 @@ import me.grishka.appkit.views.UsableRecyclerView;
 
 public abstract class SettingsBaseFragment extends MastodonToolbarFragment implements DomainDisplay {
 	protected View view;
-	private UsableRecyclerView list;
+	protected UsableRecyclerView list;
 
-	private ImageView themeTransitionWindowView;
+	protected ImageView themeTransitionWindowView;
 
-	private SettingsBaseFragment.NotificationPolicyItem notificationPolicyItem;
+	protected ThemeItem themeItem;
 
-	private PushSubscription pushSubscription;
-	private ArrayList<Item> items=new ArrayList<>();
-	private String accountID;
+	protected boolean needAppRestart;
 
-	private boolean needUpdateNotificationSettings;
+	protected SettingsBaseFragment.NotificationPolicyItem notificationPolicyItem;
+
+	protected PushSubscription pushSubscription;
+	protected ArrayList<Item> items=new ArrayList<>();
+	protected String accountID;
+
+	protected boolean needUpdateNotificationSettings;
 
 	public abstract void addItems(ArrayList<Item> items);
 
@@ -142,7 +148,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	protected class SwitchItem extends Item{
 		private String text;
 		private int icon;
-		private boolean checked;
+		boolean checked;
 		private Consumer<SwitchItem> onChanged;
 		private boolean enabled=true;
 
@@ -389,13 +395,35 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
+	protected boolean onColorPreferenceClick(MenuItem item){
+		GlobalUserPreferences.ColorPreference pref = null;
+		int id = item.getItemId();
+
+		if (id == R.id.m3_color) pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
+		else if (id == R.id.pink_color) pref = GlobalUserPreferences.ColorPreference.PINK;
+		else if (id == R.id.purple_color) pref = GlobalUserPreferences.ColorPreference.PURPLE;
+		else if (id == R.id.green_color) pref = GlobalUserPreferences.ColorPreference.GREEN;
+		else if (id == R.id.blue_color) pref = GlobalUserPreferences.ColorPreference.BLUE;
+		else if (id == R.id.brown_color) pref = GlobalUserPreferences.ColorPreference.BROWN;
+		else if (id == R.id.red_color) pref = GlobalUserPreferences.ColorPreference.RED;
+		else if (id == R.id.yellow_color) pref = GlobalUserPreferences.ColorPreference.YELLOW;
+		else if (id == R.id.nord_color) pref = GlobalUserPreferences.ColorPreference.NORD;
+
+		if (pref == null) return false;
+
+		GlobalUserPreferences.color=pref;
+		GlobalUserPreferences.save();
+		restartActivityToApplyNewTheme();
+		return true;
+	}
+
+	protected void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
 		GlobalUserPreferences.theme=theme;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
 	}
 
-	private void restartActivityToApplyNewTheme(){
+	protected void restartActivityToApplyNewTheme(){
 		// Calling activity.recreate() causes a black screen for like half a second.
 		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
 		// As a bonus, we can fade it out to make it even smoother.
@@ -418,6 +446,32 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		getActivity().recreate();
 	}
 
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){
+			AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().updatePushSettings(pushSubscription);
+		}
+		if(needAppRestart) UiUtils.restartApp();
+	}
+
+
+	protected void onTrueBlackThemeChanged(SettingsBaseFragment.SwitchItem item){
+		GlobalUserPreferences.trueBlackTheme=item.checked;
+		GlobalUserPreferences.save();
+
+		RecyclerView.ViewHolder themeHolder=list.findViewHolderForAdapterPosition(items.indexOf(themeItem));
+		if(themeHolder!=null){
+			((SettingsBaseFragment.ThemeViewHolder)themeHolder).bindSubitems();
+		}else{
+			list.getAdapter().notifyItemChanged(items.indexOf(themeItem));
+		}
+
+		if(UiUtils.isDarkTheme()){
+			restartActivityToApplyNewTheme();
+		}
+	}
+
 	private class NotificationPolicyViewHolder extends BindableViewHolder<NotificationPolicyItem>{
 		private final Button button;
 		private final PopupMenu popupMenu;
@@ -492,7 +546,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		needUpdateNotificationSettings=true;
 	}
 
-	private void onNotificationsChanged(PushNotification.Type type, boolean enabled){
+	protected void onNotificationsChanged(PushNotification.Type type, boolean enabled){
 		PushSubscription subscription=getPushSubscription();
 		switch(type){
 			case FAVORITE -> subscription.alerts.favourite=enabled;
@@ -506,7 +560,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		needUpdateNotificationSettings=true;
 	}
 
-	private PushSubscription getPushSubscription(){
+	protected PushSubscription getPushSubscription(){
 		if(pushSubscription!=null)
 			return pushSubscription;
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
@@ -557,7 +611,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class ThemeViewHolder extends BindableViewHolder<ThemeItem>{
+	class ThemeViewHolder extends BindableViewHolder<ThemeItem>{
 		private ThemeViewHolder.SubitemHolder autoHolder, lightHolder, darkHolder;
 
 		public ThemeViewHolder(){
@@ -637,7 +691,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
+	protected class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
 		private final TextView text;

From 78a0c60600ca341f55975d152835a0c112556b64 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 12:10:43 +0200
Subject: [PATCH 06/45] fix: move method to fix compiler error

---
 .../settings/SettingsAppearanceFragment.java  | 48 ++++++++++++-------
 .../settings/SettingsBaseFragment.java        | 44 +++++------------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
index 3fc28515f..62968cece 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
@@ -1,32 +1,26 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.os.Build;
 import android.view.Gravity;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
+import android.view.MenuItem;
 import android.widget.PopupMenu;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
 
 public class SettingsAppearanceFragment extends SettingsBaseFragment {
+
     @Override
     public void addItems(ArrayList<Item> items) {
-        items.add(themeItem SettingsBaseFragment.ThemeItem());
-        items.add(new SettingsFragment.ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b -> {
+        themeItem = new ThemeItem();
+        items.add(themeItem);
+        items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b -> {
             PopupMenu popupMenu = new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
             popupMenu.inflate(R.menu.color_palettes);
             popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-            popupMenu.setOnMenuItemClickListener(SettingsBaseFragment.this::onColorPreferenceClick);
+            popupMenu.setOnMenuItemClickListener(this::onColorPreferenceClick);
             b.setOnTouchListener(popupMenu.getDragToOpenListener());
             b.setOnClickListener(v -> popupMenu.show());
             b.setText(switch (GlobalUserPreferences.color) {
@@ -41,21 +35,43 @@ public class SettingsAppearanceFragment extends SettingsBaseFragment {
                 case NORD -> R.string.mo_color_palette_nord;
             });
         }));
-        items.add(new SettingsBaseFragment.SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
-        items.add(new SettingsBaseFragment.SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i -> {
+        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.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 SettingsBaseFragment.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.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i -> {
             GlobalUserPreferences.uniformNotificationIcon = i.checked;
             GlobalUserPreferences.save();
         }));
-        items.add(new SettingsBaseFragment.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.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i -> {
             GlobalUserPreferences.reduceMotion = i.checked;
             GlobalUserPreferences.save();
             needAppRestart = true;
         }));
     }
+
+    private boolean onColorPreferenceClick(MenuItem item) {
+            GlobalUserPreferences.ColorPreference pref = null;
+            int id = item.getItemId();
+
+            if (id == R.id.m3_color) pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
+            else if (id == R.id.pink_color) pref = GlobalUserPreferences.ColorPreference.PINK;
+            else if (id == R.id.purple_color) pref = GlobalUserPreferences.ColorPreference.PURPLE;
+            else if (id == R.id.green_color) pref = GlobalUserPreferences.ColorPreference.GREEN;
+            else if (id == R.id.blue_color) pref = GlobalUserPreferences.ColorPreference.BLUE;
+            else if (id == R.id.brown_color) pref = GlobalUserPreferences.ColorPreference.BROWN;
+            else if (id == R.id.red_color) pref = GlobalUserPreferences.ColorPreference.RED;
+            else if (id == R.id.yellow_color) pref = GlobalUserPreferences.ColorPreference.YELLOW;
+            else if (id == R.id.nord_color) pref = GlobalUserPreferences.ColorPreference.NORD;
+
+            if (pref == null) return false;
+
+            GlobalUserPreferences.color=pref;
+            GlobalUserPreferences.save();
+            restartActivityToApplyNewTheme();
+            return true;
+    }
 }
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index d11ef067d..d31ca1790 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -64,7 +64,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 	protected boolean needAppRestart;
 
-	protected SettingsBaseFragment.NotificationPolicyItem notificationPolicyItem;
+	protected NotificationPolicyItem notificationPolicyItem;
 
 	protected PushSubscription pushSubscription;
 	protected ArrayList<Item> items=new ArrayList<>();
@@ -173,7 +173,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	protected class UpdateItem extends SettingsBaseFragment.Item {
+	protected class UpdateItem extends Item {
 
 		@Override
 		public int getViewType(){
@@ -181,7 +181,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	protected static class ThemeItem extends SettingsBaseFragment.Item {
+	protected static class ThemeItem extends Item {
 
 		@Override
 		public int getViewType(){
@@ -189,7 +189,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	protected static class NotificationPolicyItem extends SettingsBaseFragment.Item {
+	protected static class NotificationPolicyItem extends Item {
 
 		@Override
 		public int getViewType(){
@@ -395,28 +395,6 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	protected boolean onColorPreferenceClick(MenuItem item){
-		GlobalUserPreferences.ColorPreference pref = null;
-		int id = item.getItemId();
-
-		if (id == R.id.m3_color) pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
-		else if (id == R.id.pink_color) pref = GlobalUserPreferences.ColorPreference.PINK;
-		else if (id == R.id.purple_color) pref = GlobalUserPreferences.ColorPreference.PURPLE;
-		else if (id == R.id.green_color) pref = GlobalUserPreferences.ColorPreference.GREEN;
-		else if (id == R.id.blue_color) pref = GlobalUserPreferences.ColorPreference.BLUE;
-		else if (id == R.id.brown_color) pref = GlobalUserPreferences.ColorPreference.BROWN;
-		else if (id == R.id.red_color) pref = GlobalUserPreferences.ColorPreference.RED;
-		else if (id == R.id.yellow_color) pref = GlobalUserPreferences.ColorPreference.YELLOW;
-		else if (id == R.id.nord_color) pref = GlobalUserPreferences.ColorPreference.NORD;
-
-		if (pref == null) return false;
-
-		GlobalUserPreferences.color=pref;
-		GlobalUserPreferences.save();
-		restartActivityToApplyNewTheme();
-		return true;
-	}
-
 	protected void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
 		GlobalUserPreferences.theme=theme;
 		GlobalUserPreferences.save();
@@ -456,13 +434,13 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	}
 
 
-	protected void onTrueBlackThemeChanged(SettingsBaseFragment.SwitchItem item){
+	protected void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
 
 		RecyclerView.ViewHolder themeHolder=list.findViewHolderForAdapterPosition(items.indexOf(themeItem));
 		if(themeHolder!=null){
-			((SettingsBaseFragment.ThemeViewHolder)themeHolder).bindSubitems();
+			((ThemeViewHolder)themeHolder).bindSubitems();
 		}else{
 			list.getAdapter().notifyItemChanged(items.indexOf(themeItem));
 		}
@@ -504,7 +482,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 
 		@Override
-		public void onBind(SettingsBaseFragment.NotificationPolicyItem item){
+		public void onBind(NotificationPolicyItem item){
 			button.setText(switch(getPushSubscription().policy){
 				case ALL -> R.string.notify_anyone;
 				case FOLLOWED -> R.string.notify_followed;
@@ -523,7 +501,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		int index=items.indexOf(notificationPolicyItem);
 		RecyclerView.ViewHolder policyHolder=list.findViewHolderForAdapterPosition(index);
 		if(policyHolder!=null){
-			((SettingsBaseFragment.NotificationPolicyViewHolder)policyHolder).rebind();
+			((NotificationPolicyViewHolder)policyHolder).rebind();
 		}else{
 			list.getAdapter().notifyItemChanged(index);
 		}
@@ -533,7 +511,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 				onNotificationsChanged(value, newState);
 			}
 			index++;
-			while(items.get(index) instanceof SettingsBaseFragment.SwitchItem si){
+			while(items.get(index) instanceof SwitchItem si){
 				si.enabled=si.checked=newState;
 				RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(index);
 				if(holder!=null)
@@ -622,7 +600,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 
 		@Override
-		public void onBind(SettingsBaseFragment.ThemeItem item){
+		public void onBind(ThemeItem item){
 			bindSubitems();
 		}
 
@@ -810,7 +788,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 
 		@Override
-		public void onBind(SettingsBaseFragment.UpdateItem item){
+		public void onBind(UpdateItem item){
 			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
 			GithubSelfUpdater.UpdateState state=updater.getState();
 			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;

From 6343da1410808f598b31040e718a5661227ead45 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 12:24:06 +0200
Subject: [PATCH 07/45] refactor: use SettingsCategory to move between pages

---
 .../settings/SettingsBaseFragment.java        | 51 +++++++------------
 .../settings/SettingsMainFragment.java        |  4 +-
 2 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index d31ca1790..915d7f787 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
+import android.app.Fragment;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -50,6 +51,7 @@ import org.joinmastodon.android.updater.GithubSelfUpdater;
 import java.util.ArrayList;
 import java.util.function.Consumer;
 
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
@@ -274,41 +276,20 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 	protected class SettingsCategoryItem extends Item{
 		private String text;
-		private String secondaryText;
-		private Runnable onClick;
-		private boolean loading;
 		private int icon;
 
-		public SettingsCategoryItem(@StringRes int text, Runnable onClick) {
-			this(text, null, onClick, false, 0);
-		}
+		private Class<? extends Fragment> fragmentClass;
 
-		public SettingsCategoryItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, null, onClick, false, icon);
-		}
+        public SettingsCategoryItem(@StringRes int text, Class<? extends Fragment> fragmentClass, @DrawableRes int icon) {
+            this.text = getString(text);
+            this.fragmentClass=fragmentClass;
+            this.icon=icon;
+        }
 
-		public SettingsCategoryItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
-			this(text, secondaryText, onClick, false, icon);
-		}
+        public SettingsCategoryItem(@StringRes int text, Class<? extends Fragment> fragmentClass) {
+            this(text, fragmentClass, 0);
+        }
 
-		public SettingsCategoryItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
-			this.text=getString(text);
-			this.onClick=onClick;
-			this.loading=loading;
-			this.icon=icon;
-			this.secondaryText = secondaryText;
-		}
-
-		public SettingsCategoryItem(String text, Runnable onClick){
-			this.text=text;
-			this.onClick=onClick;
-		}
-
-		public SettingsCategoryItem(String text, Runnable onClick, @DrawableRes int icon){
-			this.text=text;
-			this.onClick=onClick;
-			this.icon=icon;
-		}
 
 		@Override
 		public int getViewType(){
@@ -650,7 +631,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class SettingsCategoryViewHolder extends BindableViewHolder<SettingsCategoryItem>{
+	private class SettingsCategoryViewHolder extends BindableViewHolder<SettingsCategoryItem> implements UsableRecyclerView.Clickable{
 		private final ImageView icon;
 		private final TextView text;
 
@@ -665,9 +646,13 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		public void onBind(SettingsCategoryItem item){
 			text.setText(item.text);
 			icon.setImageResource(item.icon);
-			item.onClick.run();
 		}
-	}
+
+        @Override
+        public void onClick() {
+            Nav.go(getActivity(), item.fragmentClass, getArguments());
+        }
+    }
 
 	protected class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
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 d2fc74bca..4e2a1f256 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
@@ -7,8 +7,6 @@ import java.util.ArrayList;
 public class SettingsMainFragment extends SettingsBaseFragment{
     @Override
     public void addItems(ArrayList<SettingsBaseFragment.Item> items) {
-        items.add(new SettingsBaseFragment.SettingsCategoryItem(R.string.settings_theme, () -> {
-            System.out.println("YAY");
-        }, R.drawable.ic_fluent_color_24_regular));
+        items.add(new SettingsCategoryItem(R.string.settings_theme, SettingsAppearanceFragment.class, R.drawable.ic_fluent_color_24_regular));
     }
 }

From 3497747015db8a5fef54d29c371089a1705612fc Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 12:33:03 +0200
Subject: [PATCH 08/45] refactor: move behaviour settings to behaviour page

---
 .../fragments/settings/BehaviourFragment.java | 57 +++++++++++++++++++
 .../settings/SettingsMainFragment.java        |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java

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<Item> 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<SettingsBaseFragment.Item> 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));
     }
 }

From 9409bbb9b2b8f2835a9e7dd0253027bd75edf88b Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 12:38:51 +0200
Subject: [PATCH 09/45] refactor: add compose behaviour to behaviour page

---
 .../fragments/settings/BehaviourFragment.java | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

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 768e9cb34..8b9633904 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
@@ -1,13 +1,23 @@
 package org.joinmastodon.android.fragments.settings;
 
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
 import java.util.ArrayList;
 
+import me.grishka.appkit.utils.V;
+
 public class BehaviourFragment extends SettingsBaseFragment{
     @Override
     public void addItems(ArrayList<Item> 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->{
             GlobalUserPreferences.playGifs=i.checked;
             GlobalUserPreferences.save();
@@ -53,5 +63,67 @@ public class BehaviourFragment extends SettingsBaseFragment{
             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-> {
+            updatePublishText(b);
+            b.setOnClickListener(l -> {
+                if(!GlobalUserPreferences.relocatePublishButton) {
+                    FrameLayout inputWrap = new FrameLayout(getContext());
+                    EditText input = new EditText(getContext());
+                    input.setHint(R.string.publish);
+                    input.setText(GlobalUserPreferences.publishButtonText.trim());
+                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                    params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
+                    input.setLayoutParams(params);
+                    inputWrap.addView(input);
+                    new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
+                            .setPositiveButton(R.string.save, (d, which) -> {
+                                GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
+                                GlobalUserPreferences.save();
+                                updatePublishText(b);
+                            })
+                            .setNeutralButton(R.string.clear, (d, which) -> {
+                                GlobalUserPreferences.publishButtonText = "";
+                                GlobalUserPreferences.save();
+                                updatePublishText(b);
+                            })
+                            .setNegativeButton(R.string.cancel, (d, which) -> {
+                            })
+                            .show();
+
+                } else {
+                    Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization,
+                            Toast.LENGTH_LONG).show();
+                }
+            });
+        }));
+        items.add(new SwitchItem(R.string.mo_relocate_publish_button, 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->{
+            GlobalUserPreferences.defaultToUnlistedReplies=i.checked;
+            GlobalUserPreferences.save();
+        }));
+        // TODO find a good icon for this setting
+        items.add(new SwitchItem(R.string.mo_mention_reblogger_automatically, R.drawable.ic_fluent_balloon_24_regular, GlobalUserPreferences.mentionRebloggerAutomatically, i -> {
+            GlobalUserPreferences.mentionRebloggerAutomatically=i.checked;
+            GlobalUserPreferences.save();
+        }));
+        items.add(new SwitchItem(R.string.mo_disable_reminder_to_add_alt_text, R.drawable.ic_fluent_image_alt_text_24_regular, GlobalUserPreferences.disableAltTextReminder, i->{
+            GlobalUserPreferences.disableAltTextReminder=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.prefixRepliesWithRe, i->{
+            GlobalUserPreferences.prefixRepliesWithRe=i.checked;
+            GlobalUserPreferences.save();
+        }));
+    }
+
+    private void updatePublishText(Button btn) {
+        if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
+        else btn.setText(GlobalUserPreferences.publishButtonText);
     }
 }

From c36d3e9011fd16e2211f0869881eb523e417b5a3 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 12:44:40 +0200
Subject: [PATCH 10/45] refactor: move timelines to TimelineFragment

---
 .../settings/SettingsBaseFragment.java        |  17 ++-
 .../settings/SettingsMainFragment.java        |   1 +
 .../fragments/settings/TimeLineFragment.java  | 123 ++++++++++++++++++
 3 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 915d7f787..4e4d4f6b0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -42,6 +42,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.DomainDisplay;
 import org.joinmastodon.android.fragments.MastodonToolbarFragment;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.OutlineProviders;
@@ -65,6 +66,8 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	protected ThemeItem themeItem;
 
 	protected boolean needAppRestart;
+	private Instance instance;
+	private String instanceName;
 
 	protected NotificationPolicyItem notificationPolicyItem;
 
@@ -85,6 +88,8 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 		accountID=getArguments().getString("account");
 		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
+		instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		instanceName = UiUtils.getInstanceName(accountID);
 		DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
 
 		addItems(items);
@@ -125,6 +130,14 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		this.view = view;
 	}
 
+	protected Instance getInstance() {
+		return instance;
+	}
+
+	protected String getInstanceName() {
+		return instanceName;
+	}
+
 
 	static abstract class Item{
 		public abstract int getViewType();
@@ -152,7 +165,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		private int icon;
 		boolean checked;
 		private Consumer<SwitchItem> onChanged;
-		private boolean enabled=true;
+		protected boolean enabled=true;
 
 		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
 			this.text=getString(text);
@@ -532,7 +545,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		return pushSubscription;
 	}
 
-	private class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
+	protected class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
 		private final TextView text;
 		private final ImageView icon;
 		private final Switch checkbox;
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 db9398a4f..64141cca3 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
@@ -9,5 +9,6 @@ public class SettingsMainFragment extends SettingsBaseFragment{
     public void addItems(ArrayList<SettingsBaseFragment.Item> 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));
+        items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
new file mode 100644
index 000000000..528a06fd3
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
@@ -0,0 +1,123 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.view.Gravity;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.PopupMenu;
+import android.widget.Toast;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+
+import java.util.ArrayList;
+
+import me.grishka.appkit.utils.V;
+
+public class TimeLineFragment extends SettingsBaseFragment{
+
+    private SwitchItem showNewPostsButtonItem, compactReblogReplyLineItem;
+    @Override
+    public void addItems(ArrayList<Item> items) {
+        items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
+            GlobalUserPreferences.showReplies=i.checked;
+            GlobalUserPreferences.save();
+        }));
+        if (getInstance().pleroma != null) {
+            items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
+                PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+                popupMenu.inflate(R.menu.reply_visibility);
+                popupMenu.setOnMenuItemClickListener(item -> this.onReplyVisibilityChanged(item, b));
+                b.setOnTouchListener(popupMenu.getDragToOpenListener());
+                b.setOnClickListener(v->popupMenu.show());
+                b.setText(GlobalUserPreferences.replyVisibility == null ?
+                        R.string.sk_settings_reply_visibility_all :
+                        switch(GlobalUserPreferences.replyVisibility){
+                            case "following" -> R.string.sk_settings_reply_visibility_following;
+                            case "self" -> R.string.sk_settings_reply_visibility_self;
+                            default -> R.string.sk_settings_reply_visibility_all;
+                        });
+            }));
+        }
+        items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
+            GlobalUserPreferences.showBoosts=i.checked;
+            GlobalUserPreferences.save();
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
+            GlobalUserPreferences.loadNewPosts=i.checked;
+            showNewPostsButtonItem.enabled = i.checked;
+            if (!i.checked) {
+                GlobalUserPreferences.showNewPostsButton = false;
+                showNewPostsButtonItem.checked = false;
+            }
+            if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsButtonItem)) instanceof SwitchViewHolder svh) svh.rebind();
+            GlobalUserPreferences.save();
+        }));
+        items.add(showNewPostsButtonItem = new SwitchItem(R.string.sk_settings_show_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+            GlobalUserPreferences.showNewPostsButton=i.checked;
+            GlobalUserPreferences.save();
+        }));
+
+        items.add(new SwitchItem(R.string.sk_settings_show_alt_indicator, R.drawable.ic_fluent_scan_text_24_regular, GlobalUserPreferences.showAltIndicator, i->{
+            GlobalUserPreferences.showAltIndicator=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{
+            GlobalUserPreferences.showNoAltIndicator=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_collapse_long_posts, R.drawable.ic_fluent_chevron_down_24_regular, GlobalUserPreferences.collapseLongPosts, i->{
+            GlobalUserPreferences.collapseLongPosts=i.checked;
+            GlobalUserPreferences.save();
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_hide_fab, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
+            GlobalUserPreferences.autoHideFab=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(new SwitchItem(R.string.sk_reply_line_above_avatar, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.replyLineAboveHeader, i->{
+            GlobalUserPreferences.replyLineAboveHeader=i.checked;
+            GlobalUserPreferences.compactReblogReplyLine=i.checked;
+            compactReblogReplyLineItem.enabled=i.checked;
+            compactReblogReplyLineItem.checked= GlobalUserPreferences.replyLineAboveHeader;
+            if (list.findViewHolderForAdapterPosition(items.indexOf(compactReblogReplyLineItem)) instanceof SwitchViewHolder svh) svh.rebind();
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(compactReblogReplyLineItem=new SwitchItem(R.string.sk_compact_reblog_reply_line, R.drawable.ic_fluent_re_order_24_regular, GlobalUserPreferences.compactReblogReplyLine, i->{
+            GlobalUserPreferences.compactReblogReplyLine=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
+        items.add(new SwitchItem(R.string.sk_settings_hide_interaction, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
+            GlobalUserPreferences.spectatorMode=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+    }
+
+    private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
+        String pref = null;
+        int id = item.getItemId();
+
+        if (id == R.id.reply_visibility_following) pref = "following";
+        else if (id == R.id.reply_visibility_self) pref = "self";
+
+        GlobalUserPreferences.replyVisibility=pref;
+        GlobalUserPreferences.save();
+        btn.setText(GlobalUserPreferences.replyVisibility == null ?
+                R.string.sk_settings_reply_visibility_all :
+                switch(GlobalUserPreferences.replyVisibility){
+                    case "following" -> R.string.sk_settings_reply_visibility_following;
+                    case "self" -> R.string.sk_settings_reply_visibility_self;
+                    default -> R.string.sk_settings_reply_visibility_all;
+                });
+        return true;
+    }
+}

From c9692ef27b376a84b46098e6eee95650ae2f3032 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 14:45:57 +0200
Subject: [PATCH 11/45] refactor: move notifications to NotificationsFragment

---
 .../settings/NotificationsFragment.java       | 25 +++++++++++++++++++
 .../settings/SettingsBaseFragment.java        |  2 +-
 .../settings/SettingsMainFragment.java        |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java

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
new file mode 100644
index 000000000..75d9d9326
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/NotificationsFragment.java
@@ -0,0 +1,25 @@
+package org.joinmastodon.android.fragments.settings;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.PushNotification;
+import org.joinmastodon.android.model.PushSubscription;
+
+import java.util.ArrayList;
+
+public class NotificationsFragment extends SettingsBaseFragment {
+    @Override
+    public void addItems(ArrayList<Item> items) {
+        items.add(notificationPolicyItem = new NotificationPolicyItem());
+        PushSubscription pushSubscription = getPushSubscription();
+        boolean switchEnabled = pushSubscription.policy != PushSubscription.Policy.NONE;
+
+        items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i -> onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked), switchEnabled));
+        items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i -> onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked), switchEnabled));
+        items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i -> onNotificationsChanged(PushNotification.Type.REBLOG, i.checked), switchEnabled));
+        items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i -> onNotificationsChanged(PushNotification.Type.MENTION, i.checked), switchEnabled));
+        items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_chat_24_regular, pushSubscription.alerts.status, i -> onNotificationsChanged(PushNotification.Type.STATUS, i.checked), switchEnabled));
+        items.add(new SwitchItem(R.string.sk_notify_update, R.drawable.ic_fluent_history_24_regular, pushSubscription.alerts.update, i -> onNotificationsChanged(PushNotification.Type.UPDATE, i.checked), switchEnabled));
+        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));
+
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 4e4d4f6b0..0810cdcf0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -505,7 +505,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 				onNotificationsChanged(value, newState);
 			}
 			index++;
-			while(items.get(index) instanceof SwitchItem si){
+			while(items.size() > index && items.get(index) instanceof SwitchItem si){
 				si.enabled=si.checked=newState;
 				RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(index);
 				if(holder!=null)
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 64141cca3..d9dad5c5c 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
@@ -10,5 +10,6 @@ public class SettingsMainFragment extends SettingsBaseFragment{
         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));
         items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
+        items.add(new SettingsCategoryItem(R.string.settings_notifications, NotificationsFragment.class, R.drawable.ic_fluent_alert_28_regular_badged));
     }
 }

From d29eef51ca3fcd3007114817e14f7ae59350c2e1 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 14:50:00 +0200
Subject: [PATCH 12/45] refactor: move miscellanious settings

---
 .../fragments/settings/NotificationsFragment.java   | 13 +++++++++++++
 .../fragments/settings/TimeLineFragment.java        |  5 +++++
 2 files changed, 18 insertions(+)

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 75d9d9326..6904ac153 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
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.settings;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
@@ -21,5 +22,17 @@ public class NotificationsFragment extends SettingsBaseFragment {
         items.add(new SwitchItem(R.string.sk_notify_update, R.drawable.ic_fluent_history_24_regular, pushSubscription.alerts.update, i -> onNotificationsChanged(PushNotification.Type.UPDATE, i.checked), switchEnabled));
         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->{
+            GlobalUserPreferences.enableDeleteNotifications=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
+        items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
+            GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
+            GlobalUserPreferences.save();
+        }));
+
+
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
index 528a06fd3..3ff44655b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
@@ -100,6 +100,11 @@ public class TimeLineFragment extends SettingsBaseFragment{
             GlobalUserPreferences.save();
             needAppRestart=true;
         }));
+        items.add(new SwitchItem(R.string.mo_disable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.disableDividers, i->{
+            GlobalUserPreferences.disableDividers=i.checked;
+            GlobalUserPreferences.save();
+            needAppRestart=true;
+        }));
     }
 
     private boolean onReplyVisibilityChanged(MenuItem item, Button btn){

From 6311d187517e4726f91ec21040f6aa46dfac890f Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 15:02:26 +0200
Subject: [PATCH 13/45] refactor: move account and instance setttings to
 account page

---
 .../fragments/settings/AccountFragment.java   | 122 ++++++++++++++++++
 .../settings/SettingsBaseFragment.java        |   3 +-
 .../settings/SettingsMainFragment.java        |   1 +
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java

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
new file mode 100644
index 000000000..fdbe31369
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java
@@ -0,0 +1,122 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MainActivity;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.utils.V;
+
+public class AccountFragment extends SettingsBaseFragment{
+
+
+    private SwitchItem glitchModeItem;
+    @Override
+    public void addItems(ArrayList<Item> items) {
+        items.add(new HeaderItem(R.string.settings_account));
+        items.add(new TextItem(R.string.sk_settings_profile, ()-> UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/profile"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.sk_settings_posting, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/preferences/other"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.sk_settings_filters, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/filters"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
+
+        items.add(new HeaderItem(getInstanceName()));
+        items.add(new TextItem(R.string.sk_settings_rules, ()->{
+            Bundle args=new Bundle();
+            args.putParcelable("instance", Parcels.wrap(getInstance()));
+            Nav.go(getActivity(), InstanceRulesFragment.class, args);
+        }, R.drawable.ic_fluent_task_list_ltr_24_regular));
+        items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
+        items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
+        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->{
+            glitchModeItem.enabled = i.checked;
+            if (i.checked) {
+                GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
+                if (getInstance().pleroma == null) GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+            } else {
+                GlobalUserPreferences.accountsWithLocalOnlySupport.remove(accountID);
+                GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
+            }
+            glitchModeItem.checked = GlobalUserPreferences.accountsInGlitchMode.contains(accountID);
+            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->{
+            if (i.checked) {
+                GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+            } else {
+                GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
+            }
+            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;
+        items.add(new SmallTextItem(getString(translationAvailable ?
+                R.string.sk_settings_translation_availability_note_available :
+                R.string.sk_settings_translation_availability_note_unavailable, getInstance().title)));
+
+    }
+
+    private void confirmLogOut(){
+        new M3AlertDialogBuilder(getActivity())
+                .setTitle(R.string.log_out)
+                .setMessage(R.string.confirm_log_out)
+                .setPositiveButton(R.string.log_out, (dialog, which) -> logOut())
+                .setNegativeButton(R.string.cancel, null)
+                .show();
+    }
+
+    private void logOut(){
+        AccountSession session= AccountSessionManager.getInstance().getAccount(accountID);
+        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
+                .setCallback(new Callback<>(){
+                    @Override
+                    public void onSuccess(Object result){
+                        onLoggedOut();
+                    }
+
+                    @Override
+                    public void onError(ErrorResponse error){
+                        onLoggedOut();
+                    }
+                })
+                .wrapProgress(getActivity(), R.string.loading, false)
+                .exec(accountID);
+    }
+
+    private void onLoggedOut(){
+        if (getActivity() == null) return;
+        AccountSessionManager.getInstance().removeAccount(accountID);
+        getActivity().finish();
+        Intent intent=new Intent(getActivity(), MainActivity.class);
+        startActivity(intent);
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 0810cdcf0..4260bbf11 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -74,6 +74,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	protected PushSubscription pushSubscription;
 	protected ArrayList<Item> items=new ArrayList<>();
 	protected String accountID;
+	protected AccountSession session;
 
 	protected boolean needUpdateNotificationSettings;
 
@@ -87,7 +88,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		setTitle(R.string.settings);
 
 		accountID=getArguments().getString("account");
-		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
+		session = AccountSessionManager.getInstance().getAccount(accountID);
 		instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
 		instanceName = UiUtils.getInstanceName(accountID);
 		DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
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 d9dad5c5c..7a82368f4 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
@@ -11,5 +11,6 @@ public class SettingsMainFragment extends SettingsBaseFragment{
         items.add(new SettingsCategoryItem(R.string.settings_behavior, BehaviourFragment.class, R.drawable.ic_fluent_chat_settings_24_regular));
         items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
         items.add(new SettingsCategoryItem(R.string.settings_notifications, NotificationsFragment.class, R.drawable.ic_fluent_alert_28_regular_badged));
+        items.add(new SettingsCategoryItem(R.string.settings_account, AccountFragment.class, R.drawable.ic_fluent_person_28_regular));
     }
 }

From e585f1df296aeab56a06a41689edbb1b3e70ddd1 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 15:10:47 +0200
Subject: [PATCH 14/45] refactor(settings): move about to about page

---
 .../fragments/settings/AboutFragment.java     | 126 ++++++++++++++++++
 .../settings/SettingsBaseFragment.java        |   4 +-
 .../settings/SettingsMainFragment.java        |   1 +
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
new file mode 100644
index 000000000..c8cdb82bf
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
@@ -0,0 +1,126 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.LruCache;
+import android.widget.Toast;
+
+import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.MainActivity;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
+import org.joinmastodon.android.api.session.AccountActivationInfo;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
+import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.imageloader.ImageCache;
+
+public class AboutFragment extends SettingsBaseFragment{
+
+    private TextItem checkForUpdateItem, clearImageCacheItem;
+    private ImageCache imageCache;
+    @Override
+    public void addItems(ArrayList<Item> items) {
+        items.add(new HeaderItem(R.string.sk_settings_about));
+
+//		if(BuildConfig.BUILD_TYPE.equals("nightly")){
+//			items.add(new TextItem(R.string.mo_download_latest_nightly_release, ()->UiUtils.launchWebBrowser(getActivity(), "https://nightly.link/LucasGGamerM/moshidon/workflows/nightly-builds/master/moshidon-nightly.apk.zip"), R.drawable.ic_fluent_open_24_regular));
+//		}
+
+        items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
+        items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
+
+        if (GithubSelfUpdater.needSelfUpdating()) {
+            checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+            items.add(checkForUpdateItem);
+            items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
+                GlobalUserPreferences.enablePreReleases=i.checked;
+                GlobalUserPreferences.save();
+            }));
+        }
+
+        LruCache<?, ?> cache = imageCache == null ? null : imageCache.getLruCache();
+        clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), cache != null ? cache.size() : 0, true), this::clearImageCache, 0);
+        items.add(clearImageCacheItem);
+        items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
+            GlobalUserPreferences.recentLanguages.remove(accountID);
+            GlobalUserPreferences.save();
+        })));
+
+        items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
+            GlobalUserPreferences.recentEmojis.clear();
+            GlobalUserPreferences.save();
+        }));
+
+        if(BuildConfig.DEBUG){
+            items.add(new HeaderItem("Debug options"));
+
+            items.add(new TextItem("Test E-Mail confirmation flow", ()->{
+                AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
+                sess.activated=false;
+                sess.activationInfo=new AccountActivationInfo("test@email", System.currentTimeMillis());
+                Bundle args=new Bundle();
+                args.putString("account", accountID);
+                args.putBoolean("debug", true);
+                Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
+            }));
+
+            items.add(new TextItem("Copy preferences", ()->{
+                StringBuilder prefBuilder = new StringBuilder();
+                GlobalUserPreferences.load();
+                GlobalUserPreferences.getPrefs().getAll().forEach((key, value) -> prefBuilder.append(key).append(": ").append(value).append('\n'));
+                UiUtils.copyText(view, prefBuilder.toString());
+            }));
+
+            items.add(new TextItem("Reset preferences", ()->{
+                GlobalUserPreferences.load();
+                GlobalUserPreferences.getPrefs().edit().clear().commit();
+                UiUtils.restartApp();
+            }, R.drawable.ic_fluent_warning_24_regular));
+
+            items.add(new TextItem("Open App Info", () ->
+                            getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                    .setData(Uri.fromParts("package", getContext().getPackageName(), null))),
+                            R.drawable.ic_fluent_open_24_regular
+                    )
+            );
+
+            items.add(new TextItem("Open developer settings",
+                    ()-> getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)),
+                    R.drawable.ic_fluent_open_24_regular)
+            );
+        }
+
+        String version = getContext().getString(R.string.mo_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
+        items.add(new FooterItem(version, () -> UiUtils.copyText(view, version)));
+    }
+
+    private void clearImageCache(){
+        MastodonAPIController.runInBackground(()->{
+            Activity activity=getActivity();
+            imageCache.clear();
+            Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
+        });
+        if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
+            clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
+            tvh.rebind();
+        }
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 4260bbf11..a31cac8b1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -246,7 +246,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 	protected class TextItem extends Item{
 		private String text;
-		private String secondaryText;
+		protected String secondaryText;
 		private Runnable onClick;
 		private boolean loading;
 		private int icon;
@@ -689,7 +689,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
-	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
+	protected class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
 		private final TextView text, secondaryText;
 		private final ProgressBar progress;
 		private final ImageView icon;
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 7a82368f4..eb3ef9f67 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
@@ -12,5 +12,6 @@ public class SettingsMainFragment extends SettingsBaseFragment{
         items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
         items.add(new SettingsCategoryItem(R.string.settings_notifications, NotificationsFragment.class, R.drawable.ic_fluent_alert_28_regular_badged));
         items.add(new SettingsCategoryItem(R.string.settings_account, AccountFragment.class, R.drawable.ic_fluent_person_28_regular));
+        items.add(new SettingsCategoryItem(R.string.sk_settings_about, AboutFragment.class, R.drawable.ic_fluent_info_24_regular));
     }
 }

From 35477055a9530d58b9adf426d84f80cd65f38bbe Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 23 Apr 2023 15:20:57 +0200
Subject: [PATCH 15/45] refactor(settings): add red header item

---
 .../fragments/settings/AboutFragment.java     |  6 +---
 .../settings/SettingsBaseFragment.java        | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
index c8cdb82bf..e902d8d7c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
@@ -40,10 +40,6 @@ public class AboutFragment extends SettingsBaseFragment{
     public void addItems(ArrayList<Item> items) {
         items.add(new HeaderItem(R.string.sk_settings_about));
 
-//		if(BuildConfig.BUILD_TYPE.equals("nightly")){
-//			items.add(new TextItem(R.string.mo_download_latest_nightly_release, ()->UiUtils.launchWebBrowser(getActivity(), "https://nightly.link/LucasGGamerM/moshidon/workflows/nightly-builds/master/moshidon-nightly.apk.zip"), R.drawable.ic_fluent_open_24_regular));
-//		}
-
         items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
         items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
 
@@ -70,7 +66,7 @@ public class AboutFragment extends SettingsBaseFragment{
         }));
 
         if(BuildConfig.DEBUG){
-            items.add(new HeaderItem("Debug options"));
+            items.add(new RedHeaderItem("Debug options"));
 
             items.add(new TextItem("Test E-Mail confirmation flow", ()->{
                 AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index a31cac8b1..efb29350a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -161,6 +161,23 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	protected class RedHeaderItem extends HeaderItem {
+
+		public RedHeaderItem(int text){
+			super(text);
+		}
+
+		public RedHeaderItem(String text){
+			super(text);
+		}
+
+		@Override
+		public int getViewType(){
+			return Type.RED_HEADER.ordinal();
+		}
+	}
+
+
 	protected class SwitchItem extends Item{
 		private String text;
 		private int icon;
@@ -329,6 +346,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 	public enum Type{
 		HEADER,
+		RED_HEADER,
 		SWITCH,
 		THEME,
 		TEXT,
@@ -337,7 +355,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		BUTTON,
 		SMALL_TEXT,
 		UPDATER,
-		SETTINGS_CATEGORY
+		SETTINGS_CATEGORY;
 	}
 
 
@@ -349,6 +367,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			//noinspection unchecked
 			return (BindableViewHolder<Item>) switch(Type.values()[viewType]){
 				case HEADER -> new HeaderViewHolder();
+				case RED_HEADER -> new HeaderViewHolder(true);
 				case SWITCH -> new SwitchViewHolder();
 				case THEME -> new ThemeViewHolder();
 				case TEXT -> new TextViewHolder();
@@ -384,6 +403,13 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			text=(TextView) itemView;
 		}
 
+		public HeaderViewHolder(boolean red){
+			super(getActivity(), R.layout.item_settings_header, list);
+			text=(TextView) itemView;
+			if(red)
+				text.setTextColor(getResources().getColor(UiUtils.isDarkTheme() ? R.color.error_400 : R.color.error_700));
+		}
+
 		@Override
 		public void onBind(HeaderItem item){
 			text.setText(item.text);

From 1fab3d3743cb6c5988084335c504bb854919a49b Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Tue, 16 May 2023 21:31:06 +0200
Subject: [PATCH 16/45] feat(settings): add summary label to switch

---
 .../settings/SettingsBaseFragment.java        | 33 ++++++++++++++-----
 .../main/res/layout/item_settings_switch.xml  | 33 ++++++++++++++-----
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index efb29350a..9505fb5f5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -179,21 +179,30 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 
 	protected class SwitchItem extends Item{
-		private String text;
+		private String title;
+		private String summary;
 		private int icon;
 		boolean checked;
 		private Consumer<SwitchItem> onChanged;
 		protected boolean enabled=true;
 
-		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
-			this.text=getString(text);
+		public SwitchItem(@StringRes int title, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
+			this.title=getString(title);
 			this.icon=icon;
 			this.checked=checked;
 			this.onChanged=onChanged;
 		}
 
-		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
-			this.text=getString(text);
+		public SwitchItem(@StringRes int title, @StringRes int summary, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
+			this.title=getString(title);
+			this.summary=getString(summary);
+			this.icon=icon;
+			this.checked=checked;
+			this.onChanged=onChanged;
+		}
+
+		public SwitchItem(@StringRes int title, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
+			this.title=getString(title);
 			this.icon=icon;
 			this.checked=checked;
 			this.onChanged=onChanged;
@@ -573,20 +582,28 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	}
 
 	protected class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
-		private final TextView text;
+		private final TextView title;
+		private final TextView summary;
 		private final ImageView icon;
 		private final Switch checkbox;
 
 		public SwitchViewHolder(){
 			super(getActivity(), R.layout.item_settings_switch, list);
-			text=findViewById(R.id.text);
+			title=findViewById(R.id.title);
+			summary=findViewById(R.id.summary);
 			icon=findViewById(R.id.icon);
 			checkbox=findViewById(R.id.checkbox);
 		}
 
 		@Override
 		public void onBind(SwitchItem item){
-			text.setText(item.text);
+			title.setText(item.title);
+
+			if (item.summary != null) {
+				summary.setText(item.summary);
+				summary.setVisibility(View.VISIBLE);
+			}
+
 			if (item.icon == 0) {
 				icon.setVisibility(View.GONE);
 			} else {
diff --git a/mastodon/src/main/res/layout/item_settings_switch.xml b/mastodon/src/main/res/layout/item_settings_switch.xml
index 20538dad7..897639ace 100644
--- a/mastodon/src/main/res/layout/item_settings_switch.xml
+++ b/mastodon/src/main/res/layout/item_settings_switch.xml
@@ -17,16 +17,33 @@
 		android:tint="?android:textColorPrimary"
 		tools:src="@drawable/ic_fluent_star_24_regular"/>
 
-	<TextView
-		android:id="@+id/text"
+	<RelativeLayout
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_marginStart="16dp"
-		android:paddingVertical="8dp"
-		android:textSize="16sp"
-		android:textColor="?android:textColorPrimary"
-		tools:text="@string/theme_true_black"/>
+		android:layout_marginStart="15dip"
+		android:layout_marginEnd="6dip"
+		android:layout_marginTop="6dip"
+		android:layout_marginBottom="6dip"
+		android:layout_weight="1">
+
+		<TextView android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:ellipsize="marquee"
+			android:textColor="?android:textColorPrimary"
+			android:fadingEdge="horizontal"
+			android:text=""/>
+
+		<TextView android:id="@+id/summary"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/title"
+			android:layout_alignStart="@id/title"
+			android:visibility="gone"
+			android:maxLines="4" />
+
+	</RelativeLayout>
 
 	<Switch
 		android:id="@+id/checkbox"

From e94364ecf6ae893c9834b4c3cd68c2218f04d6a1 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Tue, 16 May 2023 21:36:56 +0200
Subject: [PATCH 17/45] feat(settings): use default text size for switch
 summary

---
 mastodon/src/main/res/layout/item_settings_switch.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_settings_switch.xml b/mastodon/src/main/res/layout/item_settings_switch.xml
index 897639ace..217216845 100644
--- a/mastodon/src/main/res/layout/item_settings_switch.xml
+++ b/mastodon/src/main/res/layout/item_settings_switch.xml
@@ -32,6 +32,7 @@
 			android:singleLine="true"
 			android:ellipsize="marquee"
 			android:textColor="?android:textColorPrimary"
+			android:textSize="16sp"
 			android:fadingEdge="horizontal"
 			android:text=""/>
 

From f7c76f7503082eaf82955a1ba0cad962b75386b2 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Tue, 16 May 2023 21:50:54 +0200
Subject: [PATCH 18/45] feat(settings): add summary label to button

---
 .../settings/SettingsBaseFragment.java        | 30 ++++++++++----
 .../main/res/layout/item_settings_button.xml  | 39 +++++++++++++------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 9505fb5f5..8a5ce06ab 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -8,10 +8,10 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -241,12 +241,20 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
 
 	protected class ButtonItem extends Item{
-		private int text;
+		private int title;
+		private int summary;
 		private int icon;
 		private Consumer<Button> buttonConsumer;
 
-		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
-			this.text = text;
+		public ButtonItem(@StringRes int title, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
+			this.title = title;
+			this.icon = icon;
+			this.buttonConsumer = buttonConsumer;
+		}
+
+		public ButtonItem(@StringRes int title, @StringRes int summary, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
+			this.title = title;
+			this.summary = summary;
 			this.icon = icon;
 			this.buttonConsumer = buttonConsumer;
 		}
@@ -714,19 +722,27 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	protected class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
-		private final TextView text;
+		private final TextView title;
+		private final TextView summary;
 
 		@SuppressLint("ClickableViewAccessibility")
 		public ButtonViewHolder(){
 			super(getActivity(), R.layout.item_settings_button, list);
-			text=findViewById(R.id.text);
+			title=findViewById(R.id.title);
+			summary=findViewById(R.id.summary);
 			icon=findViewById(R.id.icon);
 			button=findViewById(R.id.button);
 		}
 
 		@Override
 		public void onBind(ButtonItem item){
-			text.setText(item.text);
+			title.setText(item.title);
+
+			if (item.summary != 0) {
+				summary.setText(item.summary);
+				summary.setVisibility(View.VISIBLE);
+			}
+
 			icon.setImageResource(item.icon);
 			item.buttonConsumer.accept(button);
 		}
diff --git a/mastodon/src/main/res/layout/item_settings_button.xml b/mastodon/src/main/res/layout/item_settings_button.xml
index 0789ac9c3..11b6cfe31 100644
--- a/mastodon/src/main/res/layout/item_settings_button.xml
+++ b/mastodon/src/main/res/layout/item_settings_button.xml
@@ -13,24 +13,39 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="32dp"
         android:importantForAccessibility="no"
         android:tint="?android:textColorPrimary"
         tools:src="@drawable/ic_fluent_color_24_regular"/>
 
 
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
-        android:paddingVertical="8dp"
-        android:gravity="center_vertical"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="16sp" />
 
+	<RelativeLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
+		android:paddingVertical="8dp"
+		android:layout_weight="1">
+
+		<TextView android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:ellipsize="marquee"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="16sp"
+			android:fadingEdge="horizontal"
+			android:text=""/>
+
+		<TextView android:id="@+id/summary"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/title"
+			android:layout_alignStart="@id/title"
+			android:visibility="gone"
+			android:maxLines="4" />
+
+	</RelativeLayout>
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"

From 992fb5fefe3b90c3e02795a140711be25b22c480 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Wed, 17 May 2023 12:56:19 +0200
Subject: [PATCH 19/45] feat(settings): add giant header

---
 .../settings/SettingsBaseFragment.java        | 43 ++++++++++++++++++-
 .../settings/SettingsMainFragment.java        | 16 ++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 8a5ce06ab..6d86abc48 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -8,7 +8,6 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -131,6 +130,15 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		this.view = view;
 	}
 
+	protected void hideToolbar() {
+		getToolbar().setElevation(0f);
+        getToolbar().setTitle("");
+        TypedValue typedValue = new TypedValue();
+        if (getActivity().getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true)) {
+            getToolbar().setBackgroundColor(typedValue.data);
+        }
+	}
+
 	protected Instance getInstance() {
 		return instance;
 	}
@@ -265,6 +273,19 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	protected class GiantHeaderItem extends Item {
+		private String text;
+
+		public GiantHeaderItem(String text) {
+			this.text = text;
+		}
+
+		@Override
+		public int getViewType() {
+			return Type.GIANT_HEADER.ordinal();
+		}
+	}
+
 	protected class SmallTextItem extends Item {
 		private String text;
 
@@ -364,6 +385,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	public enum Type{
 		HEADER,
 		RED_HEADER,
+		GIANT_HEADER,
 		SWITCH,
 		THEME,
 		TEXT,
@@ -385,6 +407,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			return (BindableViewHolder<Item>) switch(Type.values()[viewType]){
 				case HEADER -> new HeaderViewHolder();
 				case RED_HEADER -> new HeaderViewHolder(true);
+				case GIANT_HEADER -> new GiantHeaderViewHolder();
 				case SWITCH -> new SwitchViewHolder();
 				case THEME -> new ThemeViewHolder();
 				case TEXT -> new TextViewHolder();
@@ -433,6 +456,24 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		}
 	}
 
+	private class GiantHeaderViewHolder extends BindableViewHolder<GiantHeaderItem> {
+		private final TextView text;
+
+		public GiantHeaderViewHolder(){
+			super(getActivity(), R.layout.item_settings_text, list);
+			text = itemView.findViewById(R.id.text);
+			text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 32);
+			text.setPaddingRelative(text.getPaddingStart(), 0, text.getPaddingEnd(), text.getPaddingBottom());
+		}
+
+		@Override
+		public void onBind(GiantHeaderItem item){
+			text.setText(item.text);
+		}
+	}
+
+
 	protected void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
 		GlobalUserPreferences.theme=theme;
 		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 eb3ef9f67..a9eb8798d 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
@@ -1,17 +1,31 @@
 package org.joinmastodon.android.fragments.settings;
 
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.TypedValue;
+import android.view.View;
+
 import org.joinmastodon.android.R;
 
 import java.util.ArrayList;
 
 public class SettingsMainFragment extends SettingsBaseFragment{
     @Override
-    public void addItems(ArrayList<SettingsBaseFragment.Item> items) {
+    public void addItems(ArrayList<Item> items) {
+        items.add(new GiantHeaderItem(getContext().getString(R.string.settings)));
         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));
         items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
         items.add(new SettingsCategoryItem(R.string.settings_notifications, NotificationsFragment.class, R.drawable.ic_fluent_alert_28_regular_badged));
         items.add(new SettingsCategoryItem(R.string.settings_account, AccountFragment.class, R.drawable.ic_fluent_person_28_regular));
         items.add(new SettingsCategoryItem(R.string.sk_settings_about, AboutFragment.class, R.drawable.ic_fluent_info_24_regular));
+
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        hideToolbar();
     }
 }

From 80c9c591fc5cd9026353ea2a28fea590c6baa5ea Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Thu, 18 May 2023 22:11:54 +0200
Subject: [PATCH 20/45] feat(settings): add updater

---
 ...eFragment.java => AppearanceFragment.java} |  0
 .../settings/SettingsMainFragment.java        | 27 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)
 rename mastodon/src/main/java/org/joinmastodon/android/fragments/settings/{SettingsAppearanceFragment.java => AppearanceFragment.java} (100%)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java
similarity index 100%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAppearanceFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java
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 a9eb8798d..f44209b22 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
@@ -1,20 +1,28 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Bundle;
-import android.util.TypedValue;
 import android.view.View;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
 
-public class SettingsMainFragment extends SettingsBaseFragment{
+public class SettingsMainFragment extends SettingsBaseFragment {
     @Override
     public void addItems(ArrayList<Item> items) {
         items.add(new GiantHeaderItem(getContext().getString(R.string.settings)));
-        items.add(new SettingsCategoryItem(R.string.settings_theme, SettingsAppearanceFragment.class, R.drawable.ic_fluent_color_24_regular));
+
+        if (GithubSelfUpdater.needSelfUpdating()) {
+            GithubSelfUpdater updater = GithubSelfUpdater.getInstance();
+            GithubSelfUpdater.UpdateState state = updater.getState();
+            if (state != GithubSelfUpdater.UpdateState.NO_UPDATE && state != GithubSelfUpdater.UpdateState.CHECKING && updater.getUpdateInfo() != null) {
+                items.add(new SettingsBaseFragment.UpdateItem());
+            }
+        }
+
+        items.add(new SettingsCategoryItem(R.string.settings_theme, AppearanceFragment.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));
         items.add(new SettingsCategoryItem(R.string.sk_timelines, TimeLineFragment.class, R.drawable.ic_fluent_timeline_24_regular));
         items.add(new SettingsCategoryItem(R.string.settings_notifications, NotificationsFragment.class, R.drawable.ic_fluent_alert_28_regular_badged));
@@ -26,6 +34,15 @@ public class SettingsMainFragment extends SettingsBaseFragment{
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        if (GithubSelfUpdater.needSelfUpdating())
+            E.register(this);
         hideToolbar();
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (GithubSelfUpdater.needSelfUpdating())
+            E.unregister(this);
+    }
 }

From 6fb7e97f13bc5ccbb5c8b65d99b1466e96df79bd Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Thu, 18 May 2023 22:38:58 +0200
Subject: [PATCH 21/45] feat(settings): use secondary text color for summary

---
 mastodon/src/main/res/layout/item_settings_button.xml | 1 +
 mastodon/src/main/res/layout/item_settings_switch.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/layout/item_settings_button.xml b/mastodon/src/main/res/layout/item_settings_button.xml
index 11b6cfe31..1c1a352d6 100644
--- a/mastodon/src/main/res/layout/item_settings_button.xml
+++ b/mastodon/src/main/res/layout/item_settings_button.xml
@@ -40,6 +40,7 @@
 		<TextView android:id="@+id/summary"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:textColor="?android:textColorSecondary"
 			android:layout_below="@id/title"
 			android:layout_alignStart="@id/title"
 			android:visibility="gone"
diff --git a/mastodon/src/main/res/layout/item_settings_switch.xml b/mastodon/src/main/res/layout/item_settings_switch.xml
index 217216845..6d11ea7a1 100644
--- a/mastodon/src/main/res/layout/item_settings_switch.xml
+++ b/mastodon/src/main/res/layout/item_settings_switch.xml
@@ -29,7 +29,6 @@
 		<TextView android:id="@+id/title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:singleLine="true"
 			android:ellipsize="marquee"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="16sp"
@@ -40,6 +39,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/title"
+			android:textColor="?android:textColorSecondary"
 			android:layout_alignStart="@id/title"
 			android:visibility="gone"
 			android:maxLines="4" />

From 4e188503a2fa46485ae5bc93007e2a4a4d98ae1d Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Thu, 18 May 2023 22:42:55 +0200
Subject: [PATCH 22/45] 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<Item> 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<Item> 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 @@
     <string name="mo_instance_info_moderated_servers">Moderated servers</string>
     <string name="mo_severity_silence">Silenced</string>
     <string name="mo_severity_suspend">Blocked</string>
+
+<!--    Settings summaries-->
+    <string name="mo_setting_true_black_summary">Might save your power on AMOLED displays</string>
+    <string name="mo_setting_marquee_summary">Disables the ellipsized title scrolling</string>
+    <string name="mo_setting_uniform_summary">Use the app icon for all notifications</string>
+    <string name="mo_setting_reduced_motion_summary">Disable animations of interactions</string>
+    <string name="mo_setting_play_gif_summary">Automatically play GIFs in avatars and emoji</string>
+    <string name="mo_setting_remote_follower_summary">Show followers from other instances</string>
+    <string name="mo_setting_relocate_publish_summary">Move the publish button to the bottom bar</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_disable_swipe_summary">Swipe to change viewed timeline</string>
 </resources>
\ No newline at end of file

From 3c8715a7c4aefb76e807e05bd752fc0e9c5eb451 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 15:10:31 +0200
Subject: [PATCH 23/45] feat(settings): add giant header to all subpages

---
 .../android/fragments/settings/SettingsBaseFragment.java   | 7 ++++++-
 .../android/fragments/settings/SettingsMainFragment.java   | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 6d86abc48..4546aeb06 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -93,6 +93,8 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
 
 		addItems(items);
+		String title = getArguments().getString("title", getTitle().toString());
+		items.add(0, new GiantHeaderItem(title));
 	}
 
 	@Override
@@ -128,6 +130,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		this.view = view;
+		hideToolbar();
 	}
 
 	protected void hideToolbar() {
@@ -756,7 +759,9 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 
         @Override
         public void onClick() {
-            Nav.go(getActivity(), item.fragmentClass, getArguments());
+			Bundle args = getArguments();
+			args.putString("title", item.text);
+            Nav.go(getActivity(), item.fragmentClass, args);
         }
     }
 
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 f44209b22..d780f8a0b 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
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 public class SettingsMainFragment extends SettingsBaseFragment {
     @Override
     public void addItems(ArrayList<Item> items) {
-        items.add(new GiantHeaderItem(getContext().getString(R.string.settings)));
 
         if (GithubSelfUpdater.needSelfUpdating()) {
             GithubSelfUpdater updater = GithubSelfUpdater.getInstance();
@@ -34,9 +33,9 @@ public class SettingsMainFragment extends SettingsBaseFragment {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (GithubSelfUpdater.needSelfUpdating())
+        if (GithubSelfUpdater.needSelfUpdating()) {
             E.register(this);
-        hideToolbar();
+        }
     }
 
     @Override

From 62090475f9a27269294abdc2cc5704cf7d21a44b Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:21:05 +0200
Subject: [PATCH 24/45] fix(settings): remove duplicated auto-hide compose

---
 .../java/org/joinmastodon/android/GlobalUserPreferences.java | 3 ---
 .../android/fragments/settings/BehaviourFragment.java        | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 045c35699..dc9fe0321 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -38,7 +38,6 @@ public class GlobalUserPreferences{
 	public static boolean relocatePublishButton;
 	public static boolean reduceMotion;
 	public static boolean keepOnlyLatestNotification;
-	public static boolean enableFabAutoHide;
 	public static boolean disableAltTextReminder;
 	public static boolean showAltIndicator;
 	public static boolean showNoAltIndicator;
@@ -109,7 +108,6 @@ public class GlobalUserPreferences{
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
 		reduceMotion=prefs.getBoolean("reduceMotion", false);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
-		enableFabAutoHide=prefs.getBoolean("enableFabAutoHide", true);
 		disableAltTextReminder=prefs.getBoolean("disableAltTextReminder", false);
 		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
 		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
@@ -171,7 +169,6 @@ public class GlobalUserPreferences{
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
 				.putBoolean("reduceMotion", reduceMotion)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
-				.putBoolean("enableFabAutoHide", enableFabAutoHide)
 				.putBoolean("disableAltTextReminder", disableAltTextReminder)
 				.putBoolean("showAltIndicator", showAltIndicator)
 				.putBoolean("showNoAltIndicator", showNoAltIndicator)
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 ab1573637..88fe83297 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
@@ -26,11 +26,6 @@ public class BehaviourFragment extends SettingsBaseFragment{
             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.string.mo_setting_remote_follower_summary, R.drawable.ic_fluent_people_24_regular, GlobalUserPreferences.loadRemoteAccountFollowers, i -> {
             GlobalUserPreferences.loadRemoteAccountFollowers=i.checked;
             GlobalUserPreferences.save();

From de4e7c1822a75ffb0539b512a8ff5b656fc15b05 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:22:14 +0200
Subject: [PATCH 25/45] refactor(settings/about): use local var

---
 .../android/fragments/settings/AboutFragment.java          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
index e902d8d7c..3b0112013 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
@@ -34,17 +34,18 @@ import me.grishka.appkit.imageloader.ImageCache;
 
 public class AboutFragment extends SettingsBaseFragment{
 
-    private TextItem checkForUpdateItem, clearImageCacheItem;
+    private TextItem clearImageCacheItem;
     private ImageCache imageCache;
     @Override
     public void addItems(ArrayList<Item> items) {
-        items.add(new HeaderItem(R.string.sk_settings_about));
+
+        imageCache = ImageCache.getInstance(getActivity());
 
         items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
         items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
 
         if (GithubSelfUpdater.needSelfUpdating()) {
-            checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+            TextItem checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
             items.add(checkForUpdateItem);
             items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
                 GlobalUserPreferences.enablePreReleases=i.checked;

From a71dc7f48109136580e8c8d6b693abc8cb68655d Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:23:00 +0200
Subject: [PATCH 26/45] feat(settings): move uniform icon to notifications page

---
 .../android/fragments/settings/AppearanceFragment.java      | 4 ----
 .../android/fragments/settings/NotificationsFragment.java   | 6 +++++-
 .../android/fragments/settings/SettingsFragment.java        | 4 ++--
 mastodon/src/main/res/values/strings_mo.xml                 | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

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 43ea614ce..d18372503 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
@@ -41,10 +41,6 @@ public class AppearanceFragment extends SettingsBaseFragment {
             GlobalUserPreferences.save();
             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 -> {
             GlobalUserPreferences.reduceMotion = 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 21fb9e30c..9d7b5e93c 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
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 public class NotificationsFragment extends SettingsBaseFragment {
     @Override
     public void addItems(ArrayList<Item> items) {
+        items.add(new HeaderItem(R.string.mo_notification_audience_settings));
         items.add(notificationPolicyItem = new NotificationPolicyItem());
         PushSubscription pushSubscription = getPushSubscription();
         boolean switchEnabled = pushSubscription.policy != PushSubscription.Policy.NONE;
@@ -32,7 +33,10 @@ public class NotificationsFragment extends SettingsBaseFragment {
             GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
             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();
+        }));
 
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
index 639261ea1..7e4753f95 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
@@ -172,8 +172,8 @@ public class SettingsFragment extends MastodonToolbarFragment {
 			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;
+		items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
+			GlobalUserPreferences.autoHideFab =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 a55eafb82..a8bea9e7a 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -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_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>
+
+<!--  Settings  -->
+    <string name="mo_notification_audience_settings">Notification Audience</string>
 </resources>
\ No newline at end of file

From b73ef28f12f2980ad4c7c6c55c7fa5ceeb02a3bb Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:23:25 +0200
Subject: [PATCH 27/45] feat(settings): move interaction count to timeline page

---
 .../android/fragments/settings/BehaviourFragment.java         | 4 ----
 .../android/fragments/settings/TimeLineFragment.java          | 4 ++++
 2 files changed, 4 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 88fe83297..a32324144 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
@@ -30,10 +30,6 @@ public class BehaviourFragment extends SettingsBaseFragment{
             GlobalUserPreferences.loadRemoteAccountFollowers=i.checked;
             GlobalUserPreferences.save();
         }));
-        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();
-        }));
         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();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
index 3ff44655b..60d49cb31 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
@@ -94,6 +94,10 @@ public class TimeLineFragment extends SettingsBaseFragment{
             GlobalUserPreferences.save();
             needAppRestart=true;
         }));
+        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();
+        }));
         compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
         items.add(new SwitchItem(R.string.sk_settings_hide_interaction, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
             GlobalUserPreferences.spectatorMode=i.checked;

From 28893bc50b591d1ff3a9f78c758651fd696be828 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:25:40 +0200
Subject: [PATCH 28/45] refactor(settings): remove unused code

---
 .../android/fragments/HomeTabFragment.java    |    1 -
 .../onboarding/AccountActivationFragment.java |    4 +-
 .../fragments/settings/BehaviourFragment.java |    1 -
 .../fragments/settings/SettingsFragment.java  | 1407 -----------------
 4 files changed, 2 insertions(+), 1411 deletions(-)
 delete mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index 4cd882828..b19dd8a4c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -47,7 +47,6 @@ import org.joinmastodon.android.events.HashtagUpdatedEvent;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.settings.SettingsFragment;
 import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
index d30a93db3..a4cd41554 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
@@ -23,7 +23,7 @@ import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.settings.SettingsFragment;
+import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -69,7 +69,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 		openEmailBtn.setOnLongClickListener(v->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			Nav.go(getActivity(), SettingsFragment.class, args);
+			Nav.go(getActivity(), SettingsMainFragment.class, args);
 			return true;
 		});
 		resendBtn=view.findViewById(R.id.btn_resend);
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 a32324144..cba77e8af 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
@@ -35,7 +35,6 @@ public class BehaviourFragment extends SettingsBaseFragment{
             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.string.mo_setting_disable_swipe_summary, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{
             GlobalUserPreferences.disableSwipe=i.checked;
             GlobalUserPreferences.save();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
deleted file mode 100644
index 7e4753f95..000000000
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFragment.java
+++ /dev/null
@@ -1,1407 +0,0 @@
-package org.joinmastodon.android.fragments.settings;
-
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.LruCache;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-import android.view.WindowManager;
-import android.view.animation.LinearInterpolator;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.ProgressBar;
-import android.widget.RadioButton;
-import android.widget.Switch;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.DomainManager;
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.PushSubscriptionManager;
-import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
-import org.joinmastodon.android.api.session.AccountActivationInfo;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.MastodonToolbarFragment;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.model.ContentType;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.model.PushNotification;
-import org.joinmastodon.android.model.PushSubscription;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.OutlineProviders;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-import java.util.function.Consumer;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.imageloader.ImageCache;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class SettingsFragment extends MastodonToolbarFragment {
-	private View view;
-	private UsableRecyclerView list;
-	private ArrayList<Item> items=new ArrayList<>();
-	private ThemeItem themeItem;
-	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsItem, glitchModeItem, compactReblogReplyLineItem;
-	private ButtonItem defaultContentTypeButtonItem;
-	private String accountID;
-	private boolean needUpdateNotificationSettings;
-	private boolean needAppRestart;
-	private PushSubscription pushSubscription;
-
-	private ImageView themeTransitionWindowView;
-	private TextItem checkForUpdateItem, clearImageCacheItem;
-	private ImageCache imageCache;
-	private Menu contentTypeMenu;
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
-			setRetainInstance(true);
-		setTitle(R.string.settings);
-		imageCache = ImageCache.getInstance(getActivity());
-		accountID=getArguments().getString("account");
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		String instanceName = UiUtils.getInstanceName(accountID);
-
-		DomainManager.getInstance().setCurrentDomain(session.domain + "/settings");
-
-		if(GithubSelfUpdater.needSelfUpdating()){
-			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
-			GithubSelfUpdater.UpdateState state=updater.getState();
-			if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING && updater.getUpdateInfo() != null){
-				items.add(new UpdateItem());
-			}
-		}
-
-		items.add(new HeaderItem(R.string.settings_theme));
-
-		items.add(themeItem=new ThemeItem());
-		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
-			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.color_palettes);
-			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
-			b.setOnTouchListener(popupMenu.getDragToOpenListener());
-			b.setOnClickListener(v->popupMenu.show());
-			b.setText(switch(GlobalUserPreferences.color){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-				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.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->{
-			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->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-
-
-		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->{
-			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.autoHideFab, i->{
-			GlobalUserPreferences.autoHideFab =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();
-		}));
-
-
-		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-> {
-			updatePublishText(b);
-			b.setOnClickListener(l -> {
-				if(!GlobalUserPreferences.relocatePublishButton) {
-					FrameLayout inputWrap = new FrameLayout(getContext());
-					EditText input = new EditText(getContext());
-					input.setHint(R.string.publish);
-					input.setText(GlobalUserPreferences.publishButtonText.trim());
-					FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-					params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-					input.setLayoutParams(params);
-					inputWrap.addView(input);
-					new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-							.setPositiveButton(R.string.save, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNeutralButton(R.string.clear, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = "";
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNegativeButton(R.string.cancel, (d, which) -> {
-							})
-							.show();
-
-				} else {
-					Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization,
-							Toast.LENGTH_LONG).show();
-				}
-			});
-		}));
-		items.add(new SwitchItem(R.string.mo_relocate_publish_button, 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->{
-			GlobalUserPreferences.defaultToUnlistedReplies=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.mo_mention_reblogger_automatically, R.drawable.ic_fluent_comment_mention_24_regular, GlobalUserPreferences.mentionRebloggerAutomatically, i -> {
-			GlobalUserPreferences.mentionRebloggerAutomatically=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.mo_disable_reminder_to_add_alt_text, R.drawable.ic_fluent_image_alt_text_24_regular, GlobalUserPreferences.disableAltTextReminder, i->{
-			GlobalUserPreferences.disableAltTextReminder=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.prefixRepliesWithRe, i->{
-			GlobalUserPreferences.prefixRepliesWithRe=i.checked;
-			GlobalUserPreferences.save();
-		}));
-
-		items.add(new HeaderItem(R.string.sk_timelines));
-		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
-			GlobalUserPreferences.showReplies=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		if (instance.pleroma != null) {
-			items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
-				PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-				popupMenu.inflate(R.menu.reply_visibility);
-				popupMenu.setOnMenuItemClickListener(item -> this.onReplyVisibilityChanged(item, b));
-				b.setOnTouchListener(popupMenu.getDragToOpenListener());
-				b.setOnClickListener(v->popupMenu.show());
-				b.setText(GlobalUserPreferences.replyVisibility == null ?
-						R.string.sk_settings_reply_visibility_all :
-						switch(GlobalUserPreferences.replyVisibility){
-							case "following" -> R.string.sk_settings_reply_visibility_following;
-							case "self" -> R.string.sk_settings_reply_visibility_self;
-							default -> R.string.sk_settings_reply_visibility_all;
-						});
-			}));
-		}
-		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
-			GlobalUserPreferences.showBoosts=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
-			GlobalUserPreferences.loadNewPosts=i.checked;
-			showNewPostsItem.enabled = i.checked;
-			if (!i.checked) {
-				GlobalUserPreferences.showNewPostsButton = false;
-				showNewPostsItem.checked = false;
-			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
-			GlobalUserPreferences.save();
-		}));
-		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
-			GlobalUserPreferences.showNewPostsButton=i.checked;
-			GlobalUserPreferences.save();
-		}));
-
-		items.add(new SwitchItem(R.string.sk_settings_show_alt_indicator, R.drawable.ic_fluent_scan_text_24_regular, GlobalUserPreferences.showAltIndicator, i->{
-			GlobalUserPreferences.showAltIndicator=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{
-			GlobalUserPreferences.showNoAltIndicator=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_collapse_long_posts, R.drawable.ic_fluent_chevron_down_24_regular, GlobalUserPreferences.collapseLongPosts, i->{
-			GlobalUserPreferences.collapseLongPosts=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_hide_fab, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
-			GlobalUserPreferences.autoHideFab=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_reply_line_above_avatar, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.replyLineAboveHeader, i->{
-			GlobalUserPreferences.replyLineAboveHeader=i.checked;
-			GlobalUserPreferences.compactReblogReplyLine=i.checked;
-			compactReblogReplyLineItem.enabled=i.checked;
-			compactReblogReplyLineItem.checked= GlobalUserPreferences.replyLineAboveHeader;
-			if (list.findViewHolderForAdapterPosition(items.indexOf(compactReblogReplyLineItem)) instanceof SwitchViewHolder svh) svh.rebind();
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(compactReblogReplyLineItem=new SwitchItem(R.string.sk_compact_reblog_reply_line, R.drawable.ic_fluent_re_order_24_regular, GlobalUserPreferences.compactReblogReplyLine, i->{
-			GlobalUserPreferences.compactReblogReplyLine=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
-		items.add(new SwitchItem(R.string.sk_settings_hide_interaction, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
-			GlobalUserPreferences.spectatorMode=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-//		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
-//			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
-//			GlobalUserPreferences.save();
-//			needAppRestart=true;
-//		}));
-
-		items.add(new HeaderItem(R.string.settings_notifications));
-		items.add(notificationPolicyItem=new NotificationPolicyItem());
-		PushSubscription pushSubscription=getPushSubscription();
-		boolean switchEnabled=pushSubscription.policy!=PushSubscription.Policy.NONE;
-
-		items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i->onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_chat_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.sk_notify_update, R.drawable.ic_fluent_history_24_regular, pushSubscription.alerts.update, i->onNotificationsChanged(PushNotification.Type.UPDATE, i.checked), switchEnabled));
-		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.mo_disable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.disableDividers, i->{
-			GlobalUserPreferences.disableDividers=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		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;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
-			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
-			GlobalUserPreferences.save();
-		}));
-
-
-
-		items.add(new HeaderItem(R.string.settings_account));
-		items.add(new TextItem(R.string.sk_settings_profile, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/profile"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_posting, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/preferences/other"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_filters, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/filters"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
-
-		items.add(new HeaderItem(instanceName));
-		items.add(new TextItem(R.string.sk_settings_rules, ()->{
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
-			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
-		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
-		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
-		if (!TextUtils.isEmpty(instance.version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, instance.version)));
-
-		items.add(new HeaderItem(R.string.sk_instance_features));
-		items.add(new SwitchItem(R.string.sk_settings_content_types, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
-			if (i.checked) {
-				GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
-				if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
-					GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
-				}
-			} else {
-				GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
-				GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
-			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
-					instanceof ButtonViewHolder bvh) bvh.rebind();
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SmallTextItem(getString(R.string.sk_settings_content_types_explanation)));
-		items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, 0, b->{
-			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.compose_content_type);
-			popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
-			b.setOnTouchListener(popupMenu.getDragToOpenListener());
-			b.setOnClickListener(v->popupMenu.show());
-			ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
-			b.setText(getContentTypeString(contentType));
-			contentTypeMenu = popupMenu.getMenu();
-			contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
-			ContentType.adaptMenuToInstance(contentTypeMenu, instance);
-			contentTypeMenu.findItem(R.id.content_type_null).setVisible(
-					!GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID));
-		}));
-		items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation)));
-		items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
-			glitchModeItem.enabled = i.checked;
-			if (i.checked) {
-				GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
-				if (instance.pleroma == null) GlobalUserPreferences.accountsInGlitchMode.add(accountID);
-			} else {
-				GlobalUserPreferences.accountsWithLocalOnlySupport.remove(accountID);
-				GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
-			}
-			glitchModeItem.checked = GlobalUserPreferences.accountsInGlitchMode.contains(accountID);
-			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->{
-			if (i.checked) {
-				GlobalUserPreferences.accountsInGlitchMode.add(accountID);
-			} else {
-				GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
-			}
-			GlobalUserPreferences.save();
-		}));
-		glitchModeItem.enabled = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID);
-		items.add(new SmallTextItem(getString(R.string.sk_settings_glitch_mode_explanation)));
-
-
-		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
-		items.add(new SmallTextItem(getString(translationAvailable ?
-				R.string.sk_settings_translation_availability_note_available :
-				R.string.sk_settings_translation_availability_note_unavailable, instance.title)));
-
-
-		items.add(new HeaderItem(R.string.sk_settings_about));
-
-//		if(BuildConfig.BUILD_TYPE.equals("nightly")){
-//			items.add(new TextItem(R.string.mo_download_latest_nightly_release, ()->UiUtils.launchWebBrowser(getActivity(), "https://nightly.link/LucasGGamerM/moshidon/workflows/nightly-builds/master/moshidon-nightly.apk.zip"), R.drawable.ic_fluent_open_24_regular));
-//		}
-
-		items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
-
-		if (GithubSelfUpdater.needSelfUpdating()) {
-			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
-			items.add(checkForUpdateItem);
-			items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
-				GlobalUserPreferences.enablePreReleases=i.checked;
-				GlobalUserPreferences.save();
-			}));
-		}
-
-		LruCache<?, ?> cache = imageCache == null ? null : imageCache.getLruCache();
-		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), cache != null ? cache.size() : 0, true), this::clearImageCache, 0);
-		items.add(clearImageCacheItem);
-		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
-			GlobalUserPreferences.recentLanguages.remove(accountID);
-			GlobalUserPreferences.save();
-		})));
-
-		items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
-			GlobalUserPreferences.recentEmojis.clear();
-			GlobalUserPreferences.save();
-		}));
-
-		if(BuildConfig.DEBUG){
-			items.add(new RedHeaderItem("Debug options"));
-
-			items.add(new TextItem("Test E-Mail confirmation flow", ()->{
-				AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
-				sess.activated=false;
-				sess.activationInfo=new AccountActivationInfo("test@email", System.currentTimeMillis());
-				Bundle args=new Bundle();
-				args.putString("account", accountID);
-				args.putBoolean("debug", true);
-				Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
-			}));
-
-			items.add(new TextItem("Copy preferences", ()->{
-				StringBuilder prefBuilder = new StringBuilder();
-				GlobalUserPreferences.load();
-				GlobalUserPreferences.getPrefs().getAll().forEach((key, value) -> prefBuilder.append(key).append(": ").append(value).append('\n'));
-				UiUtils.copyText(view, prefBuilder.toString());
-			}));
-
-			items.add(new TextItem("Reset preferences", ()->{
-				GlobalUserPreferences.load();
-				GlobalUserPreferences.getPrefs().edit().clear().commit();
-				UiUtils.restartApp();
-			}, R.drawable.ic_fluent_warning_24_regular));
-
-			items.add(new TextItem("Open App Info", () ->
-					getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-							.setData(Uri.fromParts("package", getContext().getPackageName(), null))),
-					R.drawable.ic_fluent_open_24_regular
-					)
-			);
-
-			items.add(new TextItem("Open developer settings",
-					()-> getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)),
-					R.drawable.ic_fluent_open_24_regular)
-			);
-		}
-
-		String version = getContext().getString(R.string.mo_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
-		items.add(new FooterItem(version, () -> UiUtils.copyText(view, version)));
-	}
-
-	private void updatePublishText(Button btn) {
-		if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
-		else btn.setText(GlobalUserPreferences.publishButtonText);
-	}
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		if(themeTransitionWindowView!=null){
-			// Activity has finished recreating. Remove the overlay.
-			MastodonApp.context.getSystemService(WindowManager.class).removeView(themeTransitionWindowView);
-			themeTransitionWindowView=null;
-		}
-	}
-
-	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
-		list=new UsableRecyclerView(getActivity());
-		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		list.setAdapter(new SettingsAdapter());
-		list.setBackgroundColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorBackground));
-		list.setPadding(0, V.dp(16), 0, V.dp(12));
-		list.setClipToPadding(false);
-		list.addItemDecoration(new RecyclerView.ItemDecoration(){
-			@Override
-			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				// Add 32dp gaps between sections
-				RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-				if((holder instanceof HeaderViewHolder || holder instanceof FooterViewHolder) && holder.getAbsoluteAdapterPosition()>1)
-					outRect.top=V.dp(32);
-			}
-		});
-		return list;
-	}
-
-	@Override
-	public void onApplyWindowInsets(WindowInsets insets){
-		if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
-			list.setPadding(0, V.dp(16), 0, V.dp(12)+insets.getSystemWindowInsetBottom());
-			insets=insets.inset(0, 0, 0, insets.getSystemWindowInsetBottom());
-		}
-		super.onApplyWindowInsets(insets);
-	}
-
-	@Override
-	public void onDestroy(){
-		super.onDestroy();
-		if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){
-			AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().updatePushSettings(pushSubscription);
-		}
-		if(needAppRestart) UiUtils.restartApp();
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		this.view = view;
-		if(GithubSelfUpdater.needSelfUpdating())
-			E.register(this);
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		if(GithubSelfUpdater.needSelfUpdating())
-			E.unregister(this);
-	}
-
-	private void onThemePreferenceClick(GlobalUserPreferences.ThemePreference theme){
-		GlobalUserPreferences.theme=theme;
-		GlobalUserPreferences.save();
-		restartActivityToApplyNewTheme();
-	}
-
-	private boolean onColorPreferenceClick(MenuItem item){
-		ColorPreference pref = null;
-		int id = item.getItemId();
-
-		if (id == R.id.m3_color) pref = ColorPreference.MATERIAL3;
-		else if (id == R.id.pink_color) pref = ColorPreference.PINK;
-		else if (id == R.id.purple_color) pref = ColorPreference.PURPLE;
-		else if (id == R.id.green_color) pref = ColorPreference.GREEN;
-		else if (id == R.id.blue_color) pref = ColorPreference.BLUE;
-		else if (id == R.id.brown_color) pref = ColorPreference.BROWN;
-		else if (id == R.id.red_color) pref = ColorPreference.RED;
-		else if (id == R.id.yellow_color) pref = ColorPreference.YELLOW;
-		else if (id == R.id.nord_color) pref = ColorPreference.NORD;
-
-		if (pref == null) return false;
-
-		GlobalUserPreferences.color=pref;
-		GlobalUserPreferences.save();
-		restartActivityToApplyNewTheme();
-		return true;
-	}
-
-
-	private void onTrueBlackThemeChanged(SwitchItem item){
-		GlobalUserPreferences.trueBlackTheme=item.checked;
-		GlobalUserPreferences.save();
-
-		RecyclerView.ViewHolder themeHolder=list.findViewHolderForAdapterPosition(items.indexOf(themeItem));
-		if(themeHolder!=null){
-			((ThemeViewHolder)themeHolder).bindSubitems();
-		}else{
-			list.getAdapter().notifyItemChanged(items.indexOf(themeItem));
-		}
-
-		if(UiUtils.isDarkTheme()){
-			restartActivityToApplyNewTheme();
-		}
-	}
-
-	private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
-		if (contentType == null) return R.string.sk_content_type_unspecified;
-		return switch (contentType) {
-			case PLAIN -> R.string.sk_content_type_plain;
-			case HTML -> R.string.sk_content_type_html;
-			case MARKDOWN -> R.string.sk_content_type_markdown;
-			case BBCODE -> R.string.sk_content_type_bbcode;
-			case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
-		};
-	}
-
-	private boolean onContentTypeChanged(MenuItem item, Button btn){
-		int id = item.getItemId();
-		ContentType contentType = switch (id) {
-			case R.id.content_type_plain -> ContentType.PLAIN;
-			case R.id.content_type_html -> ContentType.HTML;
-			case R.id.content_type_markdown -> ContentType.MARKDOWN;
-			case R.id.content_type_bbcode -> ContentType.BBCODE;
-			case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
-			default -> null;
-		};
-		GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
-		GlobalUserPreferences.save();
-		btn.setText(getContentTypeString(contentType));
-		item.setChecked(true);
-		return true;
-	}
-
-	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
-		String pref = null;
-		int id = item.getItemId();
-
-		if (id == R.id.reply_visibility_following) pref = "following";
-		else if (id == R.id.reply_visibility_self) pref = "self";
-
-		GlobalUserPreferences.replyVisibility=pref;
-		GlobalUserPreferences.save();
-		btn.setText(GlobalUserPreferences.replyVisibility == null ?
-				R.string.sk_settings_reply_visibility_all :
-				switch(GlobalUserPreferences.replyVisibility){
-					case "following" -> R.string.sk_settings_reply_visibility_following;
-					case "self" -> R.string.sk_settings_reply_visibility_self;
-					default -> R.string.sk_settings_reply_visibility_all;
-				});
-		return true;
-	}
-
-	private void restartActivityToApplyNewTheme(){
-		// Calling activity.recreate() causes a black screen for like half a second.
-		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
-		// As a bonus, we can fade it out to make it even smoother.
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-			View activityDecorView=getActivity().getWindow().getDecorView();
-			Bitmap bitmap=Bitmap.createBitmap(activityDecorView.getWidth(), activityDecorView.getHeight(), Bitmap.Config.ARGB_8888);
-			activityDecorView.draw(new Canvas(bitmap));
-			themeTransitionWindowView=new ImageView(MastodonApp.context);
-			themeTransitionWindowView.setImageBitmap(bitmap);
-			WindowManager.LayoutParams lp=new WindowManager.LayoutParams(WindowManager.LayoutParams.TYPE_APPLICATION);
-			lp.flags=WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE |
-					WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-			lp.systemUiVisibility=View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
-			lp.systemUiVisibility|=(activityDecorView.getWindowSystemUiVisibility() & (View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR));
-			lp.width=lp.height=WindowManager.LayoutParams.MATCH_PARENT;
-			lp.token=getActivity().getWindow().getAttributes().token;
-			lp.windowAnimations=R.style.window_fade_out;
-			MastodonApp.context.getSystemService(WindowManager.class).addView(themeTransitionWindowView, lp);
-		}
-		getActivity().recreate();
-	}
-
-	private PushSubscription getPushSubscription(){
-		if(pushSubscription!=null)
-			return pushSubscription;
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		if(session.pushSubscription==null){
-			pushSubscription=new PushSubscription();
-			pushSubscription.alerts=PushSubscription.Alerts.ofAll();
-		}else{
-			pushSubscription=session.pushSubscription.clone();
-		}
-		return pushSubscription;
-	}
-
-	private void onNotificationsChanged(PushNotification.Type type, boolean enabled){
-		PushSubscription subscription=getPushSubscription();
-		switch(type){
-			case FAVORITE -> subscription.alerts.favourite=enabled;
-			case FOLLOW -> subscription.alerts.follow=enabled;
-			case REBLOG -> subscription.alerts.reblog=enabled;
-			case MENTION -> subscription.alerts.mention=enabled;
-			case POLL -> subscription.alerts.poll=enabled;
-			case STATUS -> subscription.alerts.status=enabled;
-			case UPDATE -> subscription.alerts.update=enabled;
-		}
-		needUpdateNotificationSettings=true;
-	}
-
-	private void onNotificationStyleChanged(SwitchItem item){
-		GlobalUserPreferences.uniformNotificationIcon=item.checked;
-		GlobalUserPreferences.save();
-	}
-
-
-	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
-		PushSubscription subscription=getPushSubscription();
-		PushSubscription.Policy prevPolicy=subscription.policy;
-		if(prevPolicy==policy)
-			return;
-		subscription.policy=policy;
-		int index=items.indexOf(notificationPolicyItem);
-		RecyclerView.ViewHolder policyHolder=list.findViewHolderForAdapterPosition(index);
-		if(policyHolder!=null){
-			((NotificationPolicyViewHolder)policyHolder).rebind();
-		}else{
-			list.getAdapter().notifyItemChanged(index);
-		}
-		if((prevPolicy==PushSubscription.Policy.NONE)!=(policy==PushSubscription.Policy.NONE)){
-			boolean newState=policy!=PushSubscription.Policy.NONE;
-			for(PushNotification.Type value : PushNotification.Type.values()){
-				onNotificationsChanged(value, newState);
-			}
-			index++;
-			while(items.get(index) instanceof SwitchItem si){
-				si.enabled=si.checked=newState;
-				RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(index);
-				if(holder!=null)
-					((BindableViewHolder<?>)holder).rebind();
-				else
-					list.getAdapter().notifyItemChanged(index);
-				index++;
-			}
-		}
-		needUpdateNotificationSettings=true;
-	}
-
-	private void confirmLogOut(){
-		new M3AlertDialogBuilder(getActivity())
-				.setTitle(R.string.log_out)
-				.setMessage(R.string.confirm_log_out)
-				.setPositiveButton(R.string.log_out, (dialog, which) -> logOut())
-				.setNegativeButton(R.string.cancel, null)
-				.show();
-	}
-
-	private void logOut(){
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(Object result){
-						onLoggedOut();
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						onLoggedOut();
-					}
-				})
-				.wrapProgress(getActivity(), R.string.loading, false)
-				.exec(accountID);
-	}
-
-	private void onLoggedOut(){
-		if (getActivity() == null) return;
-		AccountSessionManager.getInstance().removeAccount(accountID);
-		getActivity().finish();
-		Intent intent=new Intent(getActivity(), MainActivity.class);
-		startActivity(intent);
-	}
-
-	private void clearImageCache(){
-		MastodonAPIController.runInBackground(()->{
-			Activity activity=getActivity();
-			imageCache.clear();
-			Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
-		});
-		if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
-			clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
-			tvh.rebind();
-		}
-	}
-
-	@Subscribe
-	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-		checkForUpdateItem.loading = ev.state == GithubSelfUpdater.UpdateState.CHECKING;
-		if (list.findViewHolderForAdapterPosition(items.indexOf(checkForUpdateItem)) instanceof TextViewHolder tvh) tvh.rebind();
-		
-		UpdateItem updateItem = null;
-		if(items.get(0) instanceof UpdateItem item0) {
-			updateItem = item0;
-		} else if (ev.state != GithubSelfUpdater.UpdateState.CHECKING
-				&& ev.state != GithubSelfUpdater.UpdateState.NO_UPDATE) {
-			updateItem = new UpdateItem();
-			items.add(0, updateItem);
-			list.setAdapter(new SettingsAdapter());
-		}
-
-		if(updateItem != null && list.findViewHolderForAdapterPosition(0) instanceof UpdateViewHolder uvh){
-			uvh.bind(updateItem);
-		}
-
-		if (ev.state == GithubSelfUpdater.UpdateState.NO_UPDATE) {
-			Toast.makeText(getActivity(), R.string.sk_no_update_available, Toast.LENGTH_SHORT).show();
-		}
-	}
-
-	private static abstract class Item{
-		public abstract int getViewType();
-	}
-
-	private class HeaderItem extends Item{
-		private String text;
-
-		public HeaderItem(@StringRes int text){
-			this.text=getString(text);
-		}
-
-		public HeaderItem(String text){
-			this.text=text;
-		}
-
-		@Override
-		public int getViewType(){
-			return 0;
-		}
-	}
-
-	private class SwitchItem extends Item{
-		private String text;
-		private int icon;
-		private boolean checked;
-		private Consumer<SwitchItem> onChanged;
-		private boolean enabled=true;
-
-		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged){
-			this.text=getString(text);
-			this.icon=icon;
-			this.checked=checked;
-			this.onChanged=onChanged;
-		}
-
-		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
-			this.text=getString(text);
-			this.icon=icon;
-			this.checked=checked;
-			this.onChanged=onChanged;
-			this.enabled=enabled;
-		}
-
-		@Override
-		public int getViewType(){
-			return 1;
-		}
-	}
-
-	public class ButtonItem extends Item{
-		private int text;
-		private int icon;
-		private Consumer<Button> buttonConsumer;
-
-		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
-			this.text = text;
-			this.icon = icon;
-			this.buttonConsumer = buttonConsumer;
-		}
-
-		@Override
-		public int getViewType(){
-			return 8;
-		}
-	}
-
-	public class ColorPicker extends Item{
-		@Override
-		public int getViewType(){
-			return 8;
-		}
-	}
-
-	private static class ThemeItem extends Item{
-
-		@Override
-		public int getViewType(){
-			return 2;
-		}
-	}
-
-	private static class NotificationPolicyItem extends Item{
-
-		@Override
-		public int getViewType(){
-			return 3;
-		}
-	}
-
-	private class SmallTextItem extends Item {
-		private String text;
-
-		public SmallTextItem(String text) {
-			this.text = text;
-		}
-
-		@Override
-		public int getViewType() {
-			return 9;
-		}
-	}
-
-	private class TextItem extends Item{
-		private String text;
-		private String secondaryText;
-		private Runnable onClick;
-		private boolean loading;
-		private int icon;
-
-		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, null, onClick, false, 0);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, null, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
-			this(text, secondaryText, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
-			this.text=getString(text);
-			this.onClick=onClick;
-			this.loading=loading;
-			this.icon=icon;
-			this.secondaryText = secondaryText;
-		}
-
-		public TextItem(String text, Runnable onClick){
-			this.text=text;
-			this.onClick=onClick;
-		}
-
-		public TextItem(String text, Runnable onClick, @DrawableRes int icon){
-			this.text=text;
-			this.onClick=onClick;
-			this.icon=icon;
-		}
-
-		@Override
-		public int getViewType(){
-			return 4;
-		}
-	}
-
-	private class RedHeaderItem extends HeaderItem{
-
-		public RedHeaderItem(int text){
-			super(text);
-		}
-
-		public RedHeaderItem(String text){
-			super(text);
-		}
-
-		@Override
-		public int getViewType(){
-			return 5;
-		}
-	}
-
-	private class FooterItem extends Item{
-		private String text;
-		private Runnable onClick;
-
-		public FooterItem(String text, Runnable onClick){
-			this.text=text;
-			this.onClick=onClick;
-		}
-
-		@Override
-		public int getViewType(){
-			return 6;
-		}
-	}
-
-	private class UpdateItem extends Item{
-
-		@Override
-		public int getViewType(){
-			return 7;
-		}
-	}
-
-	private class SettingsAdapter extends RecyclerView.Adapter<BindableViewHolder<Item>>{
-		@NonNull
-		@Override
-		public BindableViewHolder<Item> onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			//noinspection unchecked
-			return (BindableViewHolder<Item>) switch(viewType){
-				case 0 -> new HeaderViewHolder(false);
-				case 1 -> new SwitchViewHolder();
-				case 2 -> new ThemeViewHolder();
-				case 3 -> new NotificationPolicyViewHolder();
-				case 4 -> new TextViewHolder();
-				case 5 -> new HeaderViewHolder(true);
-				case 6 -> new FooterViewHolder();
-				case 7 -> new UpdateViewHolder();
-				case 8 -> new ButtonViewHolder();
-				case 9 -> new SmallTextViewHolder();
-				default -> throw new IllegalStateException("Unexpected value: "+viewType);
-			};
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull BindableViewHolder<Item> holder, int position){
-			holder.bind(items.get(position));
-		}
-
-		@Override
-		public int getItemCount(){
-			return items.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return items.get(position).getViewType();
-		}
-	}
-
-	private class HeaderViewHolder extends BindableViewHolder<HeaderItem>{
-		private final TextView text;
-		public HeaderViewHolder(boolean red){
-			super(getActivity(), R.layout.item_settings_header, list);
-			text=(TextView) itemView;
-			if(red)
-				text.setTextColor(getResources().getColor(UiUtils.isDarkTheme() ? R.color.error_400 : R.color.error_700));
-		}
-
-		@Override
-		public void onBind(HeaderItem item){
-			text.setText(item.text);
-		}
-	}
-
-	private class SwitchViewHolder extends BindableViewHolder<SwitchItem> implements UsableRecyclerView.DisableableClickable{
-		private final TextView text;
-		private final ImageView icon;
-		private final Switch checkbox;
-
-		public SwitchViewHolder(){
-			super(getActivity(), R.layout.item_settings_switch, list);
-			text=findViewById(R.id.text);
-			icon=findViewById(R.id.icon);
-			checkbox=findViewById(R.id.checkbox);
-		}
-
-		@Override
-		public void onBind(SwitchItem item){
-			text.setText(item.text);
-			if (item.icon == 0) {
-				icon.setVisibility(View.GONE);
-			} else {
-				icon.setVisibility(View.VISIBLE);
-				icon.setImageResource(item.icon);
-			}
-			checkbox.setChecked(item.checked && item.enabled);
-			checkbox.setEnabled(item.enabled);
-		}
-
-		@Override
-		public void onClick(){
-			item.checked=!item.checked;
-			checkbox.setChecked(item.checked);
-			item.onChanged.accept(item);
-		}
-
-		@Override
-		public boolean isEnabled(){
-			return item.enabled;
-		}
-	}
-
-	private class ThemeViewHolder extends BindableViewHolder<ThemeItem>{
-		private SubitemHolder autoHolder, lightHolder, darkHolder;
-
-		public ThemeViewHolder(){
-			super(getActivity(), R.layout.item_settings_theme, list);
-			autoHolder=new SubitemHolder(findViewById(R.id.theme_auto));
-			lightHolder=new SubitemHolder(findViewById(R.id.theme_light));
-			darkHolder=new SubitemHolder(findViewById(R.id.theme_dark));
-		}
-
-		@Override
-		public void onBind(ThemeItem item){
-			bindSubitems();
-		}
-
-		public void bindSubitems(){
-			autoHolder.bind(R.string.theme_auto, GlobalUserPreferences.trueBlackTheme ? R.drawable.theme_auto_trueblack : R.drawable.theme_auto, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO);
-			lightHolder.bind(R.string.theme_light, R.drawable.theme_light, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.LIGHT);
-			darkHolder.bind(R.string.theme_dark, GlobalUserPreferences.trueBlackTheme ? R.drawable.theme_dark_trueblack : R.drawable.theme_dark, GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK);
-		}
-
-		private void onSubitemClick(View v){
-			GlobalUserPreferences.ThemePreference pref;
-			if(v.getId()==R.id.theme_auto)
-				pref=GlobalUserPreferences.ThemePreference.AUTO;
-			else if(v.getId()==R.id.theme_light)
-				pref=GlobalUserPreferences.ThemePreference.LIGHT;
-			else if(v.getId()==R.id.theme_dark)
-				pref=GlobalUserPreferences.ThemePreference.DARK;
-			else
-				return;
-			onThemePreferenceClick(pref);
-		}
-
-		private class SubitemHolder{
-			public TextView text;
-			public ImageView icon;
-			public RadioButton checkbox;
-
-			public SubitemHolder(View view){
-				text=view.findViewById(R.id.text);
-				icon=view.findViewById(R.id.icon);
-				checkbox=view.findViewById(R.id.checkbox);
-				view.setOnClickListener(ThemeViewHolder.this::onSubitemClick);
-
-				icon.setClipToOutline(true);
-				icon.setOutlineProvider(OutlineProviders.roundedRect(4));
-			}
-
-			public void bind(int text, int icon, boolean checked){
-				this.text.setText(text);
-				this.icon.setImageResource(icon);
-				checkbox.setChecked(checked);
-			}
-
-			public void setChecked(boolean checked){
-				checkbox.setChecked(checked);
-			}
-		}
-	}
-
-	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
-		private final Button button;
-		private final ImageView icon;
-		private final TextView text;
-
-		@SuppressLint("ClickableViewAccessibility")
-		public ButtonViewHolder(){
-			super(getActivity(), R.layout.item_settings_button, list);
-			text=findViewById(R.id.text);
-			icon=findViewById(R.id.icon);
-			button=findViewById(R.id.button);
-		}
-
-		@Override
-		public void onBind(ButtonItem item){
-			text.setText(item.text);
-			if (item.icon == 0) {
-				icon.setVisibility(View.GONE);
-			} else {
-				icon.setImageResource(item.icon);
-			}
-			item.buttonConsumer.accept(button);
-		}
-	}
-
-
-	private class NotificationPolicyViewHolder extends BindableViewHolder<NotificationPolicyItem>{
-		private final Button button;
-		private final PopupMenu popupMenu;
-
-		@SuppressLint("ClickableViewAccessibility")
-		public NotificationPolicyViewHolder(){
-			super(getActivity(), R.layout.item_settings_notification_policy, list);
-			button=findViewById(R.id.button);
-			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.notification_policy);
-			popupMenu.setOnMenuItemClickListener(item->{
-				PushSubscription.Policy policy;
-				int id=item.getItemId();
-				if(id==R.id.notify_anyone)
-					policy=PushSubscription.Policy.ALL;
-				else if(id==R.id.notify_followed)
-					policy=PushSubscription.Policy.FOLLOWED;
-				else if(id==R.id.notify_follower)
-					policy=PushSubscription.Policy.FOLLOWER;
-				else if(id==R.id.notify_none)
-					policy=PushSubscription.Policy.NONE;
-				else
-					return false;
-				onNotificationsPolicyChanged(policy);
-				return true;
-			});
-			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
-			button.setOnTouchListener(popupMenu.getDragToOpenListener());
-			button.setOnClickListener(v->popupMenu.show());
-		}
-
-		@Override
-		public void onBind(NotificationPolicyItem item){
-			button.setText(switch(getPushSubscription().policy){
-				case ALL -> R.string.notify_anyone;
-				case FOLLOWED -> R.string.notify_followed;
-				case FOLLOWER -> R.string.notify_follower;
-				case NONE -> R.string.notify_none;
-			});
-		}
-	}
-
-	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
-		private final TextView text, secondaryText;
-		private final ProgressBar progress;
-		private final ImageView icon;
-
-		public TextViewHolder(){
-			super(getActivity(), R.layout.item_settings_text, list);
-			text = itemView.findViewById(R.id.text);
-			secondaryText = itemView.findViewById(R.id.secondary_text);
-			progress = itemView.findViewById(R.id.progress);
-			icon = itemView.findViewById(R.id.icon);
-		}
-
-		@Override
-		public void onBind(TextItem item){
-			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
-			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
-
-			text.setText(item.text);
-			progress.animate().alpha(item.loading ? 1 : 0);
-			icon.setImageResource(item.icon);
-			secondaryText.setText(item.secondaryText);
-		}
-
-		@Override
-		public void onClick(){
-			item.onClick.run();
-		}
-	}
-
-	private class SmallTextViewHolder extends BindableViewHolder<SmallTextItem> {
-		private final TextView text;
-
-		public SmallTextViewHolder(){
-			super(getActivity(), R.layout.item_settings_text, list);
-			text = itemView.findViewById(R.id.text);
-			text.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
-			text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-			text.setPaddingRelative(text.getPaddingStart(), 0, text.getPaddingEnd(), text.getPaddingBottom());
-		}
-
-		@Override
-		public void onBind(SmallTextItem item){
-			text.setText(item.text);
-		}
-	}
-
-	private class FooterViewHolder extends BindableViewHolder<FooterItem> implements UsableRecyclerView.Clickable{
-		private final TextView text;
-		public FooterViewHolder(){
-			super(getActivity(), R.layout.item_settings_footer, list);
-			text=(TextView) itemView;
-		}
-
-		@Override
-		public void onBind(FooterItem item){
-			text.setText(item.text);
-		}
-
-		@Override
-		public void onClick(){
-			item.onClick.run();
-		}
-	}
-
-	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
-
-		private final TextView text, changelog, changelogHeader;
-		private final Button button;
-		private final ImageButton cancelBtn;
-		private final ProgressBar progress;
-
-		private ObjectAnimator rotationAnimator;
-		private Runnable progressUpdater=this::updateProgress;
-
-		public UpdateViewHolder(){
-			super(getActivity(), R.layout.item_settings_update, list);
-			text=findViewById(R.id.text);
-			changelog=findViewById(R.id.changelog);
-			changelogHeader=findViewById(R.id.changelog_header);
-			button=findViewById(R.id.button);
-			cancelBtn=findViewById(R.id.cancel_btn);
-			progress=findViewById(R.id.progress);
-			button.setOnClickListener(v->{
-				GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
-				switch(updater.getState()){
-					case UPDATE_AVAILABLE -> updater.downloadUpdate();
-					case DOWNLOADED -> updater.installUpdate(getActivity());
-				}
-			});
-			cancelBtn.setOnClickListener(v->GithubSelfUpdater.getInstance().cancelDownload());
-			rotationAnimator=ObjectAnimator.ofFloat(progress, View.ROTATION, 0f, 360f);
-			rotationAnimator.setInterpolator(new LinearInterpolator());
-			rotationAnimator.setDuration(1500);
-			rotationAnimator.setRepeatCount(ObjectAnimator.INFINITE);
-		}
-
-		@Override
-		public void onBind(UpdateItem item){
-			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
-			GithubSelfUpdater.UpdateState state=updater.getState();
-			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;
-			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
-			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
-				text.setText(getString(R.string.mo_update_available, info.version));
-				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
-			}else{
-				text.setText(getString(R.string.mo_update_ready, info.version));
-				button.setText(R.string.install_update);
-			}
-			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){
-				rotationAnimator.start();
-				button.setVisibility(View.INVISIBLE);
-				cancelBtn.setVisibility(View.VISIBLE);
-				progress.setVisibility(View.VISIBLE);
-				updateProgress();
-			}else{
-				rotationAnimator.cancel();
-				button.setVisibility(View.VISIBLE);
-				cancelBtn.setVisibility(View.GONE);
-				progress.setVisibility(View.GONE);
-				progress.removeCallbacks(progressUpdater);
-			}
-			changelog.setText(info.changelog);
-			if(info.changelog.isEmpty()){
-				changelogHeader.setVisibility(View.GONE);
-				changelog.setVisibility(View.GONE);
-			}
-//			changelog.setText(getString(R.string.sk_changelog, info.changelog));
-		}
-
-		private void updateProgress(){
-			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
-			if(updater.getState()!=GithubSelfUpdater.UpdateState.DOWNLOADING)
-				return;
-			int value=Math.round(progress.getMax()*updater.getDownloadProgress());
-			if(Build.VERSION.SDK_INT>=24)
-				progress.setProgress(value, true);
-			else
-				progress.setProgress(value);
-			progress.postDelayed(progressUpdater, 1000);
-		}
-	}
-}

From 8befbb5a62704535baa94569926222c8f5dea02c Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:30:04 +0200
Subject: [PATCH 29/45] refactor(settings): adjust icon color

---
 .../main/res/drawable/ic_fluent_chat_settings_24_regular.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/drawable/ic_fluent_chat_settings_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_chat_settings_24_regular.xml
index 703f8f901..f0c00234f 100644
--- a/mastodon/src/main/res/drawable/ic_fluent_chat_settings_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_settings_24_regular.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M22,12c0,-5.523 -4.477,-10 -10,-10S2,6.477 2,12a9.96,9.96 0,0 0,1.115 4.592l-1.068,3.823a1.25,1.25 0,0 0,1.54 1.54l3.826,-1.067a9.96,9.96 0,0 0,5.368 1.082,6.518 6.518,0 0,1 -1.051,-1.474 8.449,8.449 0,0 1,-3.863 -1.066l-0.27,-0.15 -3.986,1.111 1.113,-3.984 -0.151,-0.27A8.458,8.458 0,0 1,3.5 12a8.5,8.5 0,0 1,16.996 -0.27c0.54,0.281 1.036,0.636 1.474,1.05 0.02,-0.257 0.03,-0.517 0.03,-0.78ZM12.837,16.472a2,2 0,0 0,1.441 -2.496l-0.198,-0.687a5.28,5.28 0,0 1,1.483 -0.912l0.499,0.524a2,2 0,0 0,2.899 0.001l0.493,-0.518a5.28,5.28 0,0 1,1.484 0.921l-0.186,0.631a2,2 0,0 0,1.45 2.51l0.539,0.13a5.732,5.732 0,0 1,0.006 1.808l-0.584,0.144a2,2 0,0 0,-1.44 2.496l0.197,0.686c-0.439,0.383 -0.939,0.693 -1.483,0.913l-0.498,-0.525a2,2 0,0 0,-2.9 0l-0.493,0.519a5.28,5.28 0,0 1,-1.484 -0.922l0.187,-0.631a2,2 0,0 0,-1.45 -2.51l-0.54,-0.13a5.718,5.718 0,0 1,-0.006 -1.808l0.584,-0.144ZM18.95,17.5c0,-0.828 -0.65,-1.5 -1.45,-1.5 -0.8,0 -1.45,0.672 -1.45,1.5S16.7,19 17.5,19c0.8,0 1.45,-0.672 1.45,-1.5Z"
-      android:fillColor="#212121"/>
+      android:fillColor="@color/fluent_default_icon_tint"/>
 </vector>

From a87da87aad91fcde071b73d9b33df15a61ff9206 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:31:13 +0200
Subject: [PATCH 30/45] refactor(settings): adjust amoled summary

---
 mastodon/src/main/res/values/strings_mo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index a8bea9e7a..76552f031 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -71,7 +71,7 @@
     <string name="mo_severity_suspend">Blocked</string>
 
 <!--    Settings summaries-->
-    <string name="mo_setting_true_black_summary">Might save your power on AMOLED displays</string>
+    <string name="mo_setting_true_black_summary">Might save power on AMOLED displays</string>
     <string name="mo_setting_marquee_summary">Disables the ellipsized title scrolling</string>
     <string name="mo_setting_uniform_summary">Use the app icon for all notifications</string>
     <string name="mo_setting_reduced_motion_summary">Disable animations of interactions</string>

From a14e8647311133da62ccd638851cd31cf1f52892 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:41:37 +0200
Subject: [PATCH 31/45] feat(settings): allow complete button row to be clicked

---
 .../android/fragments/settings/SettingsBaseFragment.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 4546aeb06..837c05d7b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -765,7 +765,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
         }
     }
 
-	protected class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
+	protected class ButtonViewHolder extends BindableViewHolder<ButtonItem> implements  UsableRecyclerView.Clickable{
 		private final Button button;
 		private final ImageView icon;
 		private final TextView title;
@@ -792,6 +792,11 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 			icon.setImageResource(item.icon);
 			item.buttonConsumer.accept(button);
 		}
+
+		@Override
+		public void onClick() {
+			button.performClick();
+		}
 	}
 
 	protected class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{

From 78acb5e7ea7d731b782602b14f18e963264a5fb6 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 20:52:10 +0200
Subject: [PATCH 32/45] feat(settings): invert double tab to swipe setting

---
 .../org/joinmastodon/android/GlobalUserPreferences.java     | 6 +++---
 .../org/joinmastodon/android/fragments/HomeTabFragment.java | 2 +-
 .../android/fragments/NotificationsFragment.java            | 2 +-
 .../android/fragments/settings/BehaviourFragment.java       | 4 ++--
 mastodon/src/main/res/values/strings_mo.xml                 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index dc9fe0321..66be9a553 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -48,7 +48,7 @@ public class GlobalUserPreferences{
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
 	public static boolean defaultToUnlistedReplies;
-	public static boolean disableDoubleTapToSwipe;
+	public static boolean doubleTapToSwipe;
 	public static boolean compactReblogReplyLine;
 	public static boolean confirmBeforeReblog;
 	public static boolean replyLineAboveHeader;
@@ -119,7 +119,7 @@ public class GlobalUserPreferences{
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
-		disableDoubleTapToSwipe=prefs.getBoolean("disableDoubleTapToSwipe", false);
+		doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true);
 		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
@@ -180,7 +180,7 @@ public class GlobalUserPreferences{
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
 				.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
-				.putBoolean("disableDoubleTapToSwipe", disableDoubleTapToSwipe)
+				.putBoolean("doubleTapToSwipe", doubleTapToSwipe)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index b19dd8a4c..ed2851dc1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -505,7 +505,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	@Override
 	public void scrollToTop(){
 		if (((ScrollableToTop) fragments[pager.getCurrentItem()]).isScrolledToTop() &&
-				!GlobalUserPreferences.disableDoubleTapToSwipe && !newPostsBtnShown) {
+				GlobalUserPreferences.doubleTapToSwipe && !newPostsBtnShown) {
 			int nextPage = (pager.getCurrentItem() + 1) % count;
 			navigateTo(nextPage);
 			return;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
index 0cba032d2..06719c24d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
@@ -205,7 +205,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 	@Override
 	public void scrollToTop(){
-		if (getFragmentForPage(pager.getCurrentItem()).isScrolledToTop() && !GlobalUserPreferences.disableDoubleTapToSwipe) {
+		if (getFragmentForPage(pager.getCurrentItem()).isScrolledToTop() && GlobalUserPreferences.doubleTapToSwipe) {
 			int nextPage = (pager.getCurrentItem() + 1) % tabViews.length;
 			pager.setCurrentItem(nextPage, true);
 			return;
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 cba77e8af..ea21bf8b8 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
@@ -40,8 +40,8 @@ public class BehaviourFragment extends SettingsBaseFragment{
             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;
+        items.add(new SwitchItem(R.string.mo_double_tap_to_swipe_between_tabs, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, GlobalUserPreferences.doubleTapToSwipe, i->{
+            GlobalUserPreferences.doubleTapToSwipe=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 76552f031..3d3f84033 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -11,7 +11,7 @@
     <string name="mo_hide_compose_button_while_scrolling_setting">Hide compose button while scrolling</string>
     <string name="mo_welcome_text">To get started, please enter your home instance’s domain name below.</string>
 
-    <!--    Setting this as non-translatable as it simply doesnt change with language-->
+    <!--    Setting this as non-translatable as it simply doesn't change with language-->
     <string name="mo_settings_app_version" translatable="false">Moshidon v%1$s (%2$d)</string>
 
     <string name="mo_personal_note">Add a note about this profile</string>
@@ -50,7 +50,7 @@
     <string name="mo_duration_days_7">7 days</string>
 
     <string name="mo_share_open_url">Open in App</string>
-    <string name="mo_disable_double_tap_to_swipe_between_tabs">Disable double tap to swipe between tabs</string>
+    <string name="mo_double_tap_to_swipe_between_tabs">Double tap to swipe between tabs</string>
     <string name="mo_swap_bookmark_with_reblog">Use reblog action instead of bookmark action on notifications</string>
     <string name="mo_download_latest_nightly_release">Download latest nightly release</string>
     <string name="mo_load_remote_followers">Load remote profile follows and followers</string>

From f320ac066cc42db748aa3b4f7cec94429d35adfa Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:10:53 +0200
Subject: [PATCH 33/45] feat(settings): improve autoplay gif summary

---
 mastodon/src/main/res/values/strings_mo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index 3d3f84033..bcc6042a8 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -75,7 +75,7 @@
     <string name="mo_setting_marquee_summary">Disables the ellipsized title scrolling</string>
     <string name="mo_setting_uniform_summary">Use the app icon for all notifications</string>
     <string name="mo_setting_reduced_motion_summary">Disable animations of interactions</string>
-    <string name="mo_setting_play_gif_summary">Automatically play GIFs in avatars and emoji</string>
+    <string name="mo_setting_play_gif_summary">Autoplay GIFs in avatars and emoji</string>
     <string name="mo_setting_remote_follower_summary">Show followers from other instances</string>
     <string name="mo_setting_relocate_publish_summary">Move the publish button to the bottom bar</string>
     <string name="mo_setting_default_reply_privacy_summary">Replies will be opted out of discovery features by default</string>

From 197110cfaffd2d8d534620b3f5be026415ffac95 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:22:41 +0200
Subject: [PATCH 34/45] feat(settings): improve unlisted reply default title
 and summary

---
 mastodon/src/main/res/values/strings_mo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index bcc6042a8..70c42f082 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -29,7 +29,7 @@
     <string name="mo_disable_reminder_to_add_alt_text">Disable reminder to add alt text</string>
     <string name="mo_add_custom_server_local_timeline">Add a custom server\'s local timeline</string>
     <string name="mo_notification_action_replied">Successfully replied to the post by %s</string>
-    <string name="mo_change_default_reply_visibility_to_unlisted">Change default reply visibility to unlisted</string>
+    <string name="mo_change_default_reply_visibility_to_unlisted">Reply as \'Unlisted\' by default</string>
     <string name="mo_composer_behavior">Composer\'s Behavior</string>
     <string name="mo_miscellaneous_settings">Miscellaneous Settings</string>
     
@@ -78,7 +78,7 @@
     <string name="mo_setting_play_gif_summary">Autoplay GIFs in avatars and emoji</string>
     <string name="mo_setting_remote_follower_summary">Show followers from other instances</string>
     <string name="mo_setting_relocate_publish_summary">Move the publish button to the bottom bar</string>
-    <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</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>
 

From e8290e2f78524e512e10c2bf4ea88f7045ae5167 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:32:53 +0200
Subject: [PATCH 35/45] 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();
+        }));
+
 
     }
 }

From f14977ba2470808b45a4dba1a40cebafb1189e4f Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:35:15 +0200
Subject: [PATCH 36/45] feat(settings): add summary to reblog action

---
 .../android/fragments/settings/NotificationsFragment.java      | 2 +-
 mastodon/src/main/res/values/strings_mo.xml                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 63058d542..af10125d4 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,7 +37,7 @@ 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 -> {
+        items.add(new SwitchItem(R.string.mo_swap_bookmark_with_reblog, R.string.mo_swap_bookmark_with_reblog_summary, R.drawable.ic_boost, GlobalUserPreferences.swapBookmarkWithBoostAction, i -> {
             GlobalUserPreferences.swapBookmarkWithBoostAction=i.checked;
             GlobalUserPreferences.save();
         }));
diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index 70c42f082..97a72def4 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -51,7 +51,7 @@
 
     <string name="mo_share_open_url">Open in App</string>
     <string name="mo_double_tap_to_swipe_between_tabs">Double tap to swipe between tabs</string>
-    <string name="mo_swap_bookmark_with_reblog">Use reblog action instead of bookmark action on notifications</string>
+    <string name="mo_swap_bookmark_with_reblog">Swap bookmark with reblog action</string>
     <string name="mo_download_latest_nightly_release">Download latest nightly release</string>
     <string name="mo_load_remote_followers">Load remote profile follows and followers</string>
     <string name="mo_mention_reblogger_automatically">Automatically mention account who reblogged the post in replies</string>
@@ -81,6 +81,7 @@
     <string name="mo_setting_default_reply_privacy_summary">Replies will be opted out of discovery features</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_swap_bookmark_with_reblog_summary">Bookmark or reblog posts from the notification</string>
 
 <!--  Settings  -->
     <string name="mo_notification_audience_settings">Notification Audience</string>

From e682cae7e7a13e2b373c1d36f9da09f12e2781e7 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:39:23 +0200
Subject: [PATCH 37/45] feat(settings/notifications): improve sub-header title

---
 .../android/fragments/settings/NotificationsFragment.java       | 2 +-
 mastodon/src/main/res/values/strings_mo.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 af10125d4..265a4be75 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_update, R.drawable.ic_fluent_history_24_regular, pushSubscription.alerts.update, i -> onNotificationsChanged(PushNotification.Type.UPDATE, i.checked), switchEnabled));
         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 HeaderItem(R.string.mo_notification_management_settings));
         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();
diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml
index 97a72def4..803ad6ced 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -31,7 +31,7 @@
     <string name="mo_notification_action_replied">Successfully replied to the post by %s</string>
     <string name="mo_change_default_reply_visibility_to_unlisted">Reply as \'Unlisted\' by default</string>
     <string name="mo_composer_behavior">Composer\'s Behavior</string>
-    <string name="mo_miscellaneous_settings">Miscellaneous Settings</string>
+    <string name="mo_notification_management_settings">Manage Notifications</string>
     
     <!--    accessibility labels-->
     <string name="mo_poll_option_add">Add new poll option</string>

From 9aac0c007ea77546164e6d6b70a99bf4a917a498 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:57:20 +0200
Subject: [PATCH 38/45] feat(settings): invert post-divider setting

---
 .../joinmastodon/android/GlobalUserPreferences.java   |  6 +++---
 .../android/fragments/BaseStatusListFragment.java     |  2 +-
 .../android/fragments/settings/TimeLineFragment.java  | 11 ++---------
 mastodon/src/main/res/values/strings_mo.xml           |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 66be9a553..66c7ffc5c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -31,7 +31,7 @@ public class GlobalUserPreferences{
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
-	public static boolean disableDividers;
+	public static boolean showDividers;
 	public static boolean voteButtonForSingleChoice;
 	public static boolean uniformNotificationIcon;
 	public static boolean enableDeleteNotifications;
@@ -102,7 +102,7 @@ public class GlobalUserPreferences{
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		disableDividers=prefs.getBoolean("disableDividers", true);
+		showDividers =prefs.getBoolean("showDividers", true);
 		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
@@ -163,7 +163,7 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("disableDividers", disableDividers)
+				.putBoolean("showDividers", showDividers)
 				.putBoolean("relocatePublishButton", relocatePublishButton)
 				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index ad824a576..b6cd6cba2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -763,7 +763,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		private int currentMediaHiddenLayoutsWidth=0;
 
 		{
-			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), GlobalUserPreferences.disableDividers ? R.attr.colorWindowBackground : R.attr.colorPollVoted));
+			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), GlobalUserPreferences.showDividers ? R.attr.colorPollVoted : R.attr.colorWindowBackground));
 			dividerPaint.setStyle(Paint.Style.STROKE);
 			dividerPaint.setStrokeWidth(V.dp(1));
 		}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
index 60d49cb31..7a9d28be9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
@@ -2,21 +2,14 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.view.Gravity;
 import android.view.MenuItem;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.PopupMenu;
-import android.widget.Toast;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
 import java.util.ArrayList;
 
-import me.grishka.appkit.utils.V;
-
 public class TimeLineFragment extends SettingsBaseFragment{
 
     private SwitchItem showNewPostsButtonItem, compactReblogReplyLineItem;
@@ -104,8 +97,8 @@ public class TimeLineFragment extends SettingsBaseFragment{
             GlobalUserPreferences.save();
             needAppRestart=true;
         }));
-        items.add(new SwitchItem(R.string.mo_disable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.disableDividers, i->{
-            GlobalUserPreferences.disableDividers=i.checked;
+        items.add(new SwitchItem(R.string.mo_enable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.showDividers, i->{
+            GlobalUserPreferences.showDividers =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 803ad6ced..45f10ad35 100644
--- a/mastodon/src/main/res/values/strings_mo.xml
+++ b/mastodon/src/main/res/values/strings_mo.xml
@@ -6,7 +6,7 @@
 
     <string name="mo_color_palette_nord">Nord</string>
     <string name="mo_app_username" translatable="false">\@moshidon</string>
-    <string name="mo_disable_dividers">Disable post dividers</string>
+    <string name="mo_enable_dividers">Show post dividers</string>
     <string name="mo_relocate_publish_button">Relocate publish button</string>
     <string name="mo_hide_compose_button_while_scrolling_setting">Hide compose button while scrolling</string>
     <string name="mo_welcome_text">To get started, please enter your home instance’s domain name below.</string>

From f922e028a7abc0b418f18de515be8b2be3d48cba Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 19 May 2023 21:58:56 +0200
Subject: [PATCH 39/45] feat(settings): invert default post-divider value

---
 .../java/org/joinmastodon/android/GlobalUserPreferences.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 66c7ffc5c..7d3a45c2c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -102,7 +102,7 @@ public class GlobalUserPreferences{
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		showDividers =prefs.getBoolean("showDividers", true);
+		showDividers =prefs.getBoolean("showDividers", false);
 		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);

From 140395f3cd28185b831dc472fc6d4d75682dd38e Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 26 May 2023 20:14:21 +0200
Subject: [PATCH 40/45] fix: use autoHideCompose variable

---
 .../android/fragments/BaseStatusListFragment.java  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index b6cd6cba2..9b5820f95 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -13,7 +13,6 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -21,14 +20,15 @@ import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.Toolbar;
 
-import org.joinmastodon.android.DomainManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
@@ -58,10 +58,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -317,7 +313,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					currentPhotoViewer.offsetView(-dx, -dy);
 
 				View fab = getFab();
-				if (fab!=null && GlobalUserPreferences.enableFabAutoHide) {
+				if (fab!=null && GlobalUserPreferences.autoHideFab) {
 					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
 						animateFab(false);
 					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {

From f1ab6833d3840efe047b95d1e3c6e72dd3f67815 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 26 May 2023 20:22:53 +0200
Subject: [PATCH 41/45] feat: add content type setting

Re-add settings from https://github.com/sk22/megalodon/commit/8b502b605c4a3616d6700ad8507205d96c6de946\#diff-29b258979e7004d7e5473b71e91747f57a36af0e0b07e0a119968a1e8e72669f
---
 .../fragments/settings/AccountFragment.java   | 71 +++++++++++++++++--
 .../settings/SettingsBaseFragment.java        |  7 +-
 .../fragments/settings/TimeLineFragment.java  | 10 +--
 3 files changed, 76 insertions(+), 12 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 a627fc136..98fe71255 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
@@ -3,11 +3,14 @@ package org.joinmastodon.android.fragments.settings;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.ViewGroup;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.Toast;
+import android.widget.PopupMenu;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
@@ -16,6 +19,7 @@ import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
@@ -25,12 +29,13 @@ import java.util.ArrayList;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.utils.V;
 
 public class AccountFragment extends SettingsBaseFragment{
 
 
     private SwitchItem glitchModeItem;
+    private ButtonItem defaultContentTypeButtonItem;
+    private Menu contentTypeMenu;
     @Override
     public void addItems(ArrayList<Item> items) {
         items.add(new HeaderItem(R.string.settings_account));
@@ -52,6 +57,34 @@ 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_content_types, R.string.sk_settings_content_types_explanation, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
+            if (i.checked) {
+                GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
+                if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
+                    GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
+                }
+            } else {
+                GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
+                GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
+            }
+            if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
+                    instanceof ButtonViewHolder bvh) bvh.rebind();
+            GlobalUserPreferences.save();
+        }));
+        items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, R.string.sk_settings_default_content_type_explanation, 0, b->{
+            PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+            popupMenu.inflate(R.menu.compose_content_type);
+            popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
+            b.setOnTouchListener(popupMenu.getDragToOpenListener());
+            b.setOnClickListener(v->popupMenu.show());
+            ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
+            b.setText(getContentTypeString(contentType));
+            contentTypeMenu = popupMenu.getMenu();
+            contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
+            ContentType.adaptMenuToInstance(contentTypeMenu, getInstance());
+            contentTypeMenu.findItem(R.id.content_type_null).setVisible(
+                    !GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID));
+        }));
         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) {
@@ -117,4 +150,32 @@ public class AccountFragment extends SettingsBaseFragment{
         Intent intent=new Intent(getActivity(), MainActivity.class);
         startActivity(intent);
     }
+
+    private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
+        if (contentType == null) return R.string.sk_content_type_unspecified;
+        return switch (contentType) {
+            case PLAIN -> R.string.sk_content_type_plain;
+            case HTML -> R.string.sk_content_type_html;
+            case MARKDOWN -> R.string.sk_content_type_markdown;
+            case BBCODE -> R.string.sk_content_type_bbcode;
+            case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
+        };
+    }
+
+    private boolean onContentTypeChanged(MenuItem item, Button btn){
+        int id = item.getItemId();
+        ContentType contentType = switch (id) {
+            case R.id.content_type_plain -> ContentType.PLAIN;
+            case R.id.content_type_html -> ContentType.HTML;
+            case R.id.content_type_markdown -> ContentType.MARKDOWN;
+            case R.id.content_type_bbcode -> ContentType.BBCODE;
+            case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
+            default -> null;
+        };
+        GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
+        GlobalUserPreferences.save();
+        btn.setText(getContentTypeString(contentType));
+        item.setChecked(true);
+        return true;
+    }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 837c05d7b..a07cec61d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -788,8 +788,11 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 				summary.setText(item.summary);
 				summary.setVisibility(View.VISIBLE);
 			}
-
-			icon.setImageResource(item.icon);
+			if (item.icon == 0) {
+				icon.setVisibility(View.GONE);
+			} else {
+				icon.setImageResource(item.icon);
+			}
 			item.buttonConsumer.accept(button);
 		}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
index 7a9d28be9..ec901026f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 
 public class TimeLineFragment extends SettingsBaseFragment{
 
-    private SwitchItem showNewPostsButtonItem, compactReblogReplyLineItem;
+    private SwitchItem showNewPostsItem, compactReblogReplyLineItem;
     @Override
     public void addItems(ArrayList<Item> items) {
         items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
@@ -41,15 +41,15 @@ public class TimeLineFragment extends SettingsBaseFragment{
         }));
         items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
             GlobalUserPreferences.loadNewPosts=i.checked;
-            showNewPostsButtonItem.enabled = i.checked;
+            showNewPostsItem.enabled = i.checked;
             if (!i.checked) {
                 GlobalUserPreferences.showNewPostsButton = false;
-                showNewPostsButtonItem.checked = false;
+                showNewPostsItem.checked = false;
             }
-            if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsButtonItem)) instanceof SwitchViewHolder svh) svh.rebind();
+            if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
             GlobalUserPreferences.save();
         }));
-        items.add(showNewPostsButtonItem = new SwitchItem(R.string.sk_settings_show_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+        items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_show_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
             GlobalUserPreferences.showNewPostsButton=i.checked;
             GlobalUserPreferences.save();
         }));

From 64d5f9190a86e713ec6091efb6dfa1abd7c99c22 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 26 May 2023 15:34:20 -0300
Subject: [PATCH 42/45] fix: compilation problems

Uses show instead of see on strings_sk.xml
---
 mastodon/src/main/res/values/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 6eae86635..9c4c6fb0d 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -240,7 +240,7 @@
     <string name="sk_settings_show_alt_indicator">Indicator for alt texts</string>
     <string name="sk_settings_show_no_alt_indicator">Indicator for missing alt texts</string>
     <string name="sk_updater_enable_pre_releases">Enable pre-releases</string>
-    <string name="sk_settings_see_new_posts_button">“See new posts” button</string>
+    <string name="sk_settings_show_new_posts_button">“Show new posts” button</string>
     <string name="sk_inline_local_only">local-only</string>
     <string name="sk_inline_direct">mentioned-only</string>
     <string name="sk_separator">·</string>

From 724d872491aa48436bc27575f0dfc59a87ee0a13 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Fri, 26 May 2023 20:35:46 +0200
Subject: [PATCH 43/45] fix: remove theme transition

Removes the fade effect when changing themes, as took a long time to apply
---
 .../settings/SettingsBaseFragment.java        | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index a07cec61d..6ea492b41 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -484,25 +484,6 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 	}
 
 	protected void restartActivityToApplyNewTheme(){
-		// Calling activity.recreate() causes a black screen for like half a second.
-		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
-		// As a bonus, we can fade it out to make it even smoother.
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-			View activityDecorView=getActivity().getWindow().getDecorView();
-			Bitmap bitmap=Bitmap.createBitmap(activityDecorView.getWidth(), activityDecorView.getHeight(), Bitmap.Config.ARGB_8888);
-			activityDecorView.draw(new Canvas(bitmap));
-			themeTransitionWindowView=new ImageView(MastodonApp.context);
-			themeTransitionWindowView.setImageBitmap(bitmap);
-			WindowManager.LayoutParams lp=new WindowManager.LayoutParams(WindowManager.LayoutParams.TYPE_APPLICATION);
-			lp.flags=WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE |
-					WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
-			lp.systemUiVisibility=View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
-			lp.systemUiVisibility|=(activityDecorView.getWindowSystemUiVisibility() & (View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR));
-			lp.width=lp.height=WindowManager.LayoutParams.MATCH_PARENT;
-			lp.token=getActivity().getWindow().getAttributes().token;
-			lp.windowAnimations=R.style.window_fade_out;
-			MastodonApp.context.getSystemService(WindowManager.class).addView(themeTransitionWindowView, lp);
-		}
 		getActivity().recreate();
 	}
 

From 84ba4ea9993876c16b99855a2ce532fa4b5c6ef5 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 27 May 2023 08:46:04 -0300
Subject: [PATCH 44/45] feat: use correct background colors in settings

---
 .../android/fragments/settings/SettingsBaseFragment.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
index 6ea492b41..78c5c544d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBaseFragment.java
@@ -102,7 +102,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		list=new UsableRecyclerView(getActivity());
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
 		list.setAdapter(new SettingsAdapter());
-		list.setBackgroundColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorBackground));
+		list.setBackgroundColor(UiUtils.getThemeColor(getActivity(), android.R.attr.windowBackground));
 		list.setPadding(0, V.dp(16), 0, V.dp(12));
 		list.setClipToPadding(false);
 		list.addItemDecoration(new RecyclerView.ItemDecoration(){
@@ -137,7 +137,7 @@ public abstract class SettingsBaseFragment extends MastodonToolbarFragment imple
 		getToolbar().setElevation(0f);
         getToolbar().setTitle("");
         TypedValue typedValue = new TypedValue();
-        if (getActivity().getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true)) {
+        if (getActivity().getTheme().resolveAttribute(android.R.attr.windowBackground, typedValue, true)) {
             getToolbar().setBackgroundColor(typedValue.data);
         }
 	}

From 2d4fc2166a0d64183378af64c12c032472b32ab3 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 27 May 2023 08:55:04 -0300
Subject: [PATCH 45/45] feat: increase top padding in theme item for
 consistency

---
 mastodon/src/main/res/layout/item_settings_theme.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_settings_theme.xml b/mastodon/src/main/res/layout/item_settings_theme.xml
index bfdc5f9f6..7da5a2a2f 100644
--- a/mastodon/src/main/res/layout/item_settings_theme.xml
+++ b/mastodon/src/main/res/layout/item_settings_theme.xml
@@ -5,6 +5,7 @@
 	android:layout_height="wrap_content"
 	android:paddingLeft="16dp"
 	android:paddingRight="16dp"
+	android:paddingTop="16dp"
 	android:paddingBottom="8dp"
 	android:clipChildren="false"
 	android:clipToPadding="false">