From 1f7155a9328ce8348d8a0d907a21b14fbbe4963a Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Tue, 17 Oct 2023 03:00:05 +0300
Subject: [PATCH] Reorder notification tabs and remember selection (AND-82)

---
 .../android/api/session/AccountSession.java   |  8 +++++++
 .../fragments/NotificationsListFragment.java  | 24 ++++++-------------
 .../joinmastodon/android/model/Status.java    |  2 +-
 .../res/layout/fragment_notifications.xml     | 18 +++++++-------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
index 0f5a773b..43190c73 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
@@ -268,4 +268,12 @@ public class AccountSession{
 	public void updateAccountInfo(){
 		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
 	}
+
+	public boolean isNotificationsMentionsOnly(){
+		return getRawLocalPreferences().getBoolean("notificationsMentionsOnly", false);
+	}
+
+	public void setNotificationsMentionsOnly(boolean mentionsOnly){
+		getRawLocalPreferences().edit().putBoolean("notificationsMentionsOnly", mentionsOnly).apply();
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
index fb4d576b..23b85dc9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
@@ -44,7 +44,7 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
-	private boolean onlyMentions=true;
+	private boolean onlyMentions;
 	private String maxID;
 	private View tabBar;
 	private View mentionsTab, allTab;
@@ -58,9 +58,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		super.onCreate(savedInstanceState);
 		setLayout(R.layout.fragment_notifications);
 		E.register(this);
-		if(savedInstanceState!=null){
-			onlyMentions=savedInstanceState.getBoolean("onlyMentions", true);
-		}
+		onlyMentions=AccountSessionManager.get(accountID).isNotificationsMentionsOnly();
 		setHasOptionsMenu(true);
 	}
 
@@ -133,12 +131,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		super.onShown();
 		unreadMarker=realUnreadMarker=AccountSessionManager.get(accountID).getLastKnownNotificationsMarker();
 		if(!dataLoading){
-			if(onlyMentions){
-				refresh();
-			}else{
-				reloadingFromCache=true;
-				refresh();
-			}
+			reloadingFromCache=true;
+			refresh();
 		}
 	}
 
@@ -221,12 +215,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		return views;
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle outState){
-		super.onSaveInstanceState(outState);
-		outState.putBoolean("onlyMentions", onlyMentions);
-	}
-
 	private Notification getNotificationByID(String id){
 		for(Notification n:data){
 			if(n.id.equals(id))
@@ -291,8 +279,10 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		allTab.setSelected(!onlyMentions);
 		maxID=null;
 		showProgress();
-		loadData(0, 20);
 		refreshing=true;
+		reloadingFromCache=true;
+		loadData(0, 20);
+		AccountSessionManager.get(accountID).setNotificationsMentionsOnly(onlyMentions);
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
index caeba6bb..2a5ccd85 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -31,7 +31,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public StatusPrivacy visibility;
 	public boolean sensitive;
 	@RequiredField
-	public String spoilerText;
+	public String spoilerText="";
 	@RequiredField
 	public List<Attachment> mediaAttachments;
 	public Application application;
diff --git a/mastodon/src/main/res/layout/fragment_notifications.xml b/mastodon/src/main/res/layout/fragment_notifications.xml
index 7a820afa..7e093fe8 100644
--- a/mastodon/src/main/res/layout/fragment_notifications.xml
+++ b/mastodon/src/main/res/layout/fragment_notifications.xml
@@ -35,15 +35,6 @@
 					android:layout_gravity="center"
 					style="@style/Widget.Mastodon.M3.SegmentedButtonContainer">
 
-					<FrameLayout
-						android:id="@+id/mentions_tab"
-						style="@style/Widget.Mastodon.M3.SegmentedButton">
-						<org.joinmastodon.android.ui.views.CheckIconSelectableTextView
-							android:id="@+id/mentions_text"
-							style="@style/Widget.Mastodon.M3.SegmentedButtonText"
-							android:text="@string/mentions"/>
-					</FrameLayout>
-
 					<FrameLayout
 						android:id="@+id/all_tab"
 						style="@style/Widget.Mastodon.M3.SegmentedButton">
@@ -53,6 +44,15 @@
 							android:text="@string/all_notifications"/>
 					</FrameLayout>
 
+					<FrameLayout
+						android:id="@+id/mentions_tab"
+						style="@style/Widget.Mastodon.M3.SegmentedButton">
+						<org.joinmastodon.android.ui.views.CheckIconSelectableTextView
+							android:id="@+id/mentions_text"
+							style="@style/Widget.Mastodon.M3.SegmentedButtonText"
+							android:text="@string/mentions"/>
+					</FrameLayout>
+
 				</LinearLayout>
 
 			</FrameLayout>