From 387b31193f9b3c9b0d2c851789b1b4603fa43cd4 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 19 Oct 2023 21:42:17 +0200
Subject: [PATCH 01/19] hopefully unfuck removing statuses and reblogs

---
 .../android/fragments/StatusListFragment.java | 96 ++++++++++++-------
 .../joinmastodon/android/model/Status.java    |  4 +
 .../ui/displayitems/StatusDisplayItem.java    |  2 +-
 .../android/ui/utils/UiUtils.java             |  3 -
 4 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
index 8e0e2cc5e1..2175c9abed 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -9,6 +9,7 @@
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
@@ -31,6 +32,10 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -176,56 +181,71 @@ protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		}
 	}
 
-	private void iterateRemoveStatus(List<Status> l, String id){
-		Iterator<Status> it=l.iterator();
-		while(it.hasNext()){
-			if(it.next().getContentStatus().id.equals(id)){
-				it.remove();
-			}
-		}
-	}
-
-	private void removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex, boolean deleteContent){
+	private boolean removeStatusDisplayItems(String parentID, int firstIndex, int ancestorFirstIndex, int ancestorLastIndex){
 		// did we find an ancestor that is also the status' neighbor?
-		if(ancestorFirstIndex>=0 && ancestorLastIndex==index-1){
-			for(int i=ancestorFirstIndex; i<=ancestorLastIndex; i++){
-				StatusDisplayItem item=displayItems.get(i);
-				String id=deleteContent ? item.getContentID() : item.parentID;
-				// update ancestor to have no descendant anymore
-				if(id.equals(status.inReplyToId)) item.hasDescendantNeighbor=false;
-			}
+		if(ancestorFirstIndex>=0 && ancestorLastIndex==firstIndex-1){
+			// update ancestor to have no descendant anymore
+			displayItems.subList(ancestorFirstIndex, ancestorLastIndex+1).forEach(i->i.hasDescendantNeighbor=false);
 			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex-ancestorFirstIndex+1);
 		}
 
-		if(index==-1) return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			StatusDisplayItem item=displayItems.get(lastIndex);
-			String id=deleteContent ? item.getContentID() : item.parentID;
-			if(!id.equals(status.id)) break;
+		if(firstIndex==-1) return false;
+		int lastIndex=firstIndex;
+		while(lastIndex<displayItems.size()){
+			if(!displayItems.get(lastIndex).parentID.equals(parentID)) break;
+			lastIndex++;
 		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+		int count=lastIndex-firstIndex;
+		displayItems.subList(firstIndex, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(firstIndex, count);
+		return true;
 	}
 
 	protected void removeStatus(Status status){
-		boolean deleteContent=status==status.getContentStatus();
+		final AccountSessionManager asm=AccountSessionManager.getInstance();
+		final CacheController cache=AccountSessionManager.get(accountID).getCacheController();
+		final boolean unReblogging=status.reblog!=null && asm.isSelf(accountID, status.account);
+		final Predicate<Status> isToBeRemovedReblog=item->item!=null && item.reblog!=null
+				&& item.reblog.id.equals(status.reblog.id)
+				&& asm.isSelf(accountID, item.account);
+		final BiPredicate<String, Supplier<String>> isToBeRemovedContent=(parentId, contentIdSupplier)->
+				parentId.equals(status.id) || contentIdSupplier.get().equals(status.id);
+
 		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
 		for(int i=0;i<displayItems.size();i++){
 			StatusDisplayItem item=displayItems.get(i);
-			String id=deleteContent ? item.getContentID() : item.parentID;
-			if(id.equals(status.id)){
-				removeStatusDisplayItems(status, i, ancestorFirstIndex, ancestorLastIndex, deleteContent);
-				ancestorFirstIndex=ancestorLastIndex=-1;
-				continue;
-			}
-			if(id.equals(status.inReplyToId)){
+			// we found a status that the to-be-removed status replies to!
+			// storing indices to maybe update its display items
+			if(item.parentID.equals(status.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}
+			// if we're un-reblogging, we compare the reblogged status's id with the current status's
+			if(unReblogging
+					? isToBeRemovedReblog.test(getStatusByID(item.parentID))
+					: isToBeRemovedContent.test(item.parentID, item::getContentStatusID)){
+				// if statuses are removed from index i, the next iteration should be on the same index again
+				if(removeStatusDisplayItems(item.parentID, i, ancestorFirstIndex, ancestorLastIndex)) i--;
+				// resetting in case we find another occurrence of the same status that also has ancestors
+				// (we won't - unless the timeline is being especially weird)
+				ancestorFirstIndex=-1; ancestorLastIndex=-1;
+			}
 		}
-		iterateRemoveStatus(data, status.id);
-		iterateRemoveStatus(preloadedData, status.id);
+
+		Consumer<List<Status>> removeStatusFromData=(list)->{
+			Iterator<Status> it=list.iterator();
+			while(it.hasNext()){
+				Status s=it.next();
+				if(unReblogging
+						? isToBeRemovedReblog.test(s)
+						: isToBeRemovedContent.test(s.id, s::getContentStatusID)){
+					it.remove();
+					cache.deleteStatus(s.id);
+				}
+			}
+		};
+		removeStatusFromData.accept(data);
+		removeStatusFromData.accept(preloadedData);
 	}
 
 	@Override
@@ -296,10 +316,14 @@ public void onStatusDeleted(StatusDeletedEvent ev){
 
 		@Subscribe
 		public void onReblogDeleted(ReblogDeletedEvent ev){
+			AccountSessionManager asm=AccountSessionManager.getInstance();
 			if(!ev.accountID.equals(accountID))
 				return;
 			for(Status item : data){
-				if(item.getContentStatus().id.equals(ev.statusID) && item.reblog!=null){
+				boolean itemIsOwnReblog=item.reblog!=null
+						&& item.getContentStatusID().equals(ev.statusID)
+						&& asm.isSelf(accountID, item.account);
+				if(itemIsOwnReblog){
 					removeStatus(item);
 					break;
 				}
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 1a67ad6597..eb13a43fcd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -195,6 +195,10 @@ public Status getContentStatus(){
 		return reblog!=null ? reblog : this;
 	}
 
+	public String getContentStatusID(){
+		return getContentStatus().id;
+	}
+
 	public String getStrippedText(){
 		if(strippedText==null)
 			strippedText=HtmlParser.strip(content);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 31f3b84258..71bfdf54f8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -89,7 +89,7 @@ public StatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragme
 	}
 
 	@NonNull
-	public String getContentID(){
+	public String getContentStatusID(){
 		if(parentFragment instanceof StatusListFragment slf){
 			Status s=slf.getContentStatusByID(parentID);
 			return s!=null ? s.id : parentID;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 29210f2f37..325618145c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -638,11 +638,8 @@ public static void confirmDeletePost(Activity activity, String accountID, Status
 							@Override
 							public void onSuccess(Status result) {
 								resultCallback.accept(result);
-								CacheController cache=AccountSessionManager.get(accountID).getCacheController();
-								cache.deleteStatus(s.id);
 								E.post(new StatusDeletedEvent(s.id, accountID));
 								if(status!=s){
-									cache.deleteStatus(status.id);
 									E.post(new StatusDeletedEvent(status.id, accountID));
 								}
 							}

From ef0fbb26a4709e51b0a7f6ca8da6a7b7d6a67ef5 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 10:33:45 +0200
Subject: [PATCH 02/19] don't return before refreshDone

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

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 8cc030c07e..8c00be2284 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -136,6 +136,7 @@ private void loadNewPosts(){
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
+						refreshDone();
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						Status last=result.get(result.size()-1);
@@ -157,7 +158,6 @@ public void onSuccess(List<Status> result){
 							prependItems(toAdd, true);
 							if(parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
 						}
-						refreshDone();
 					}
 
 					@Override

From 59026286a129355550a4cf9dc50368db7d31047f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 10:46:56 +0200
Subject: [PATCH 03/19] don't cache as many posts

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

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
index 832fdcb402..12725fe0c7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
@@ -121,7 +121,7 @@ public void putHomeTimeline(List<Status> posts, boolean clear){
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
 			if(!clear)
-				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"1000"});
+				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"100"});
 		});
 	}
 

From b5eae13a16c20da4fd3aeb2fca5a1a3822aec809 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 11:43:15 +0200
Subject: [PATCH 04/19] introduce separate tonal selector backgrounds

---
 .../fragments/report/ReportDoneFragment.java  |  1 -
 .../main/res/drawable/bg_button_m3_tonal.xml  | 10 ++----
 .../drawable/bg_button_m3_tonal_circle.xml    | 10 ++----
 .../bg_button_m3_tonal_circle_selector.xml    | 32 +++++++++++++++++++
 .../drawable/bg_button_m3_tonal_selector.xml  | 32 +++++++++++++++++++
 .../layout/display_item_emoji_reactions.xml   |  2 +-
 .../src/main/res/layout/edit_timeline.xml     |  2 +-
 .../src/main/res/layout/fragment_compose.xml  |  1 +
 .../src/main/res/layout/fragment_profile.xml  |  2 +-
 .../main/res/layout/item_emoji_reaction.xml   |  2 +-
 10 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
index 2dda2d609b..1b7e9f01cf 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
@@ -34,7 +34,6 @@
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class ReportDoneFragment extends MastodonToolbarFragment{
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
index e529cc6a61..4d731c481a 100644
--- a/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center_vertical" android:height="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
index 82140c91fe..ac0c9dbe2c 100644
--- a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml
@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center" android:height="40dp" android:width="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml
new file mode 100644
index 0000000000..82140c91fe
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_circle_selector.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center" android:height="40dp" android:width="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center" android:height="40dp" android:width="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml
new file mode 100644
index 0000000000..e529cc6a61
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_selector.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center_vertical" android:height="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>
diff --git a/mastodon/src/main/res/layout/display_item_emoji_reactions.xml b/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
index a6627ba8ce..3479357d55 100644
--- a/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
+++ b/mastodon/src/main/res/layout/display_item_emoji_reactions.xml
@@ -30,7 +30,7 @@
 				android:layout_height="wrap_content"
 				android:minHeight="48dp"
 				android:minWidth="48dp"
-				android:background="@drawable/bg_button_m3_tonal_circle"
+				android:background="@drawable/bg_button_m3_tonal_circle_selector"
 				android:tooltipText="@string/sk_button_react"
 				android:contentDescription="@string/sk_button_react"
 				android:src="@drawable/ic_fluent_add_24_filled" />
diff --git a/mastodon/src/main/res/layout/edit_timeline.xml b/mastodon/src/main/res/layout/edit_timeline.xml
index 31db6543df..d754d28e57 100644
--- a/mastodon/src/main/res/layout/edit_timeline.xml
+++ b/mastodon/src/main/res/layout/edit_timeline.xml
@@ -49,7 +49,7 @@
 		<Button
 			android:id="@+id/advanced"
 			style="@style/Widget.Mastodon.M3.Button.Outlined"
-			android:background="@drawable/bg_button_m3_tonal"
+			android:background="@drawable/bg_button_m3_tonal_selector"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="24dp"
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index fa0c628fee..a49f908349 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -366,6 +366,7 @@
 
 				<Button
 					style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+					android:background="@drawable/bg_button_m3_tonal_selector"
 					android:id="@+id/sensitive_item"
 					android:orientation="horizontal"
 					android:layout_width="wrap_content"
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 67b7884e2b..e79bdc0f2a 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -93,7 +93,7 @@
 								android:layout_width="48dp"
 								android:layout_height="48dp"
 								style="@style/Widget.Mastodon.M3.Button.Tonal"
-								android:background="@drawable/bg_button_m3_tonal_circle"
+								android:background="@drawable/bg_button_m3_tonal_circle_selector"
 								android:paddingStart="12dp"
 								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
 
diff --git a/mastodon/src/main/res/layout/item_emoji_reaction.xml b/mastodon/src/main/res/layout/item_emoji_reaction.xml
index 4108df4ad7..b5e9882c46 100644
--- a/mastodon/src/main/res/layout/item_emoji_reaction.xml
+++ b/mastodon/src/main/res/layout/item_emoji_reaction.xml
@@ -23,5 +23,5 @@
 		android:layout_marginEnd="8dp"
 		android:drawableTint="@null"
 		android:drawableStart="@drawable/image_placeholder"
-		android:background="@drawable/bg_button_m3_tonal"/>
+		android:background="@drawable/bg_button_m3_tonal_selector"/>
 </FrameLayout>

From 11c7816bb16b6efb3a913254729ebc49798058f7 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 11:43:35 +0200
Subject: [PATCH 05/19] make show new posts button less disruptive

---
 .../main/res/drawable/bg_button_new_posts.xml | 10 --------
 mastodon/src/main/res/layout/home_toolbar.xml | 25 +++++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/bg_button_new_posts.xml

diff --git a/mastodon/src/main/res/drawable/bg_button_new_posts.xml b/mastodon/src/main/res/drawable/bg_button_new_posts.xml
deleted file mode 100644
index 2c9e3691b4..0000000000
--- a/mastodon/src/main/res/drawable/bg_button_new_posts.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
-	<item>
-		<shape>
-			<solid android:color="?colorPrimary800"/>
-			<corners android:radius="16sp"/>
-			<padding android:left="16sp" android:right="16sp"/>
-		</shape>
-	</item>
-</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 3f801f7229..9587bec324 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -34,7 +34,7 @@
                 android:visibility="gone" />
             <TextView
                 android:id="@+id/timeline_title"
-                style="?android:attr/titleTextAppearance"
+                style="@style/action_bar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -47,22 +47,21 @@
         android:layout_height="match_parent">
         <Button
             android:id="@+id/show_new_posts_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="2dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="20dp"
-            android:minHeight="32sp"
+			style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@drawable/bg_button_m3_tonal_selector"
             android:maxLines="2"
             android:ellipsize="end"
             android:lineSpacingMultiplier="0.8"
-            android:textAppearance="@style/m3_title_medium"
-            android:textSize="16sp"
-            android:text="@string/see_new_posts"
-            android:textColor="@color/gray_25"
-            android:background="@drawable/bg_button_new_posts"
+			android:textAppearance="@style/m3_title_medium"
+			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
-            android:drawablePadding="8dp"
             android:layout_gravity="center" />
+		<!--
+		using the selector background because..
+		the selected=false state's border looks better than the one from the outline style
+		(as per m3 spec) :( i should probably fix this at some point
+		-->
     </FrameLayout>
 </FrameLayout>

From 303461d8038bf9badbbd6327a26573b25ed57d35 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 12:17:12 +0200
Subject: [PATCH 06/19] take switcher width into account for button

---
 .../android/fragments/HomeTabFragment.java    | 28 +++++++++++--------
 mastodon/src/main/res/layout/home_toolbar.xml |  3 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

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 2488e7452e..85a79b7edb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -233,21 +233,25 @@ public void onPageSelected(int position){
 
 		ViewTreeObserver vto = getToolbar().getViewTreeObserver();
 		if (vto.isAlive()) {
-			vto.addOnGlobalLayoutListener(() -> {
-				Toolbar t = getToolbar();
-				if (t == null) return;
-				int toolbarWidth = t.getWidth();
-				if (toolbarWidth == 0) return;
-
-				int toolbarFrameWidth = toolbarFrame.getWidth();
-				int padding = toolbarWidth - toolbarFrameWidth;
-				FrameLayout parent = ((FrameLayout) toolbarShowNewPostsBtn.getParent());
-				if (padding == parent.getPaddingStart()) return;
+			vto.addOnGlobalLayoutListener(()->{
+				Toolbar t=getToolbar();
+				if(t==null) return;
+				int toolbarWidth=t.getWidth();
+				if(toolbarWidth==0) return;
+
+				int toolbarFrameWidth=toolbarFrame.getWidth();
+				int actionsWidth=toolbarWidth-toolbarFrameWidth;
+				// margin (4) + padding (12) + icon (24) + margin (8) + chevron (16) + padding (12)
+				int switcherWidth=V.dp(76);
+				FrameLayout parent=((FrameLayout) toolbarShowNewPostsBtn.getParent());
+				if(actionsWidth==parent.getPaddingStart()) return;
+				int paddingMax=Math.max(actionsWidth, switcherWidth);
+				int paddingEnd=(Math.max(0, switcherWidth-actionsWidth));
 
 				// toolbar frame goes from screen edge to beginning of right-aligned option buttons.
 				// centering button by applying the same space on the left
-				parent.setPaddingRelative(padding, 0, 0, 0);
-				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
+				parent.setPaddingRelative(paddingMax, 0, paddingEnd, 0);
+				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth-paddingMax*2);
 
 				switcher.setPivotX(V.dp(28)); // padding + half of icon
 				switcher.setPivotY(switcher.getHeight() / 2f);
diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 9587bec324..599077613e 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -51,9 +51,8 @@
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:background="@drawable/bg_button_m3_tonal_selector"
-            android:maxLines="2"
+            android:maxLines="1"
             android:ellipsize="end"
-            android:lineSpacingMultiplier="0.8"
 			android:textAppearance="@style/m3_title_medium"
 			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"

From d624a04e18e10fa7bb3792f45e376426303cbe2f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 12:50:34 +0200
Subject: [PATCH 07/19] fix see new posts button font size

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

diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 599077613e..86cc3a9fa5 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -54,6 +54,7 @@
             android:maxLines="1"
             android:ellipsize="end"
 			android:textAppearance="@style/m3_title_medium"
+			android:textSize="16sp"
 			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
             android:layout_gravity="center" />

From 183fb0e8c00876a989226401fac900737a832923 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 12:54:51 +0200
Subject: [PATCH 08/19] use fluent back button

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

diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 183159732b..6b7407311f 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -36,6 +36,7 @@
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="android:actionModeBackground">?colorM3PrimaryContainer</item>
 		<item name="android:actionModeCloseDrawable">@drawable/ic_fluent_dismiss_24_regular</item>
+		<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
 <!--		<item name="appkitEmptyTextAppearance">@style/empty_text</item>-->
 
 		<item name="android:statusBarColor">?colorM3Background</item>
@@ -74,6 +75,7 @@
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="android:actionModeBackground">?colorM3PrimaryContainer</item>
 		<item name="android:actionModeCloseDrawable">@drawable/ic_fluent_dismiss_24_regular</item>
+		<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
 <!--		<item name="appkitEmptyTextAppearance">@style/empty_text</item>-->
 
 		<item name="colorM3DisabledBackground">#1FE3E3E3</item>

From 9de83355e1872b6641676b0e2ddde688d080ec85 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 13:04:51 +0200
Subject: [PATCH 09/19] revert api timeout and increase for search

closes sk22#881
---
 .../android/api/MastodonAPIController.java          | 12 +++++-------
 .../android/api/MastodonAPIRequest.java             |  3 ++-
 .../android/fragments/discover/SearchFragment.java  | 13 +++----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
index ae398cdbf8..c4183c878a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -53,9 +53,7 @@ public class MastodonAPIController{
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(5, TimeUnit.MINUTES)
-			.build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -113,13 +111,13 @@ else if(req.token!=null)
 				}
 
 				Request hreq=builder.build();
-				Call call=httpClient.newCall(hreq);
+				OkHttpClient client=req.timeout>0
+						? httpClient.newBuilder().readTimeout(req.timeout, TimeUnit.MILLISECONDS).build()
+						: httpClient;
+				Call call=client.newCall(hreq);
 				synchronized(req){
 					req.okhttpCall=call;
 				}
-				if(req.timeout>0){
-					call.timeout().timeout(req.timeout, TimeUnit.MILLISECONDS);
-				}
 
 				if(BuildConfig.DEBUG)
 					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
index 023c28f213..09cb7ca60b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java
@@ -153,8 +153,9 @@ protected void addHeader(String key, String value){
 		headers.put(key, value);
 	}
 
-	protected void setTimeout(long timeout){
+	public MastodonAPIRequest<T> setTimeout(long timeout){
 		this.timeout=timeout;
+		return this;
 	}
 
 	protected String getPathPrefix(){
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
index 95b8469250..599d820775 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -36,6 +36,7 @@
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 public class SearchFragment extends BaseStatusListFragment<SearchResult>{
@@ -142,7 +143,7 @@ else if(!data.isEmpty())
 		}*/
 		int offset=_offset;
 		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
-				.setCallback(new Callback<>(){
+				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -165,16 +166,8 @@ public void onSuccess(SearchResults result){
 						unfilteredResults=results;
 						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
 					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						currentRequest=null;
-						Activity a=getActivity();
-						if(a==null)
-							return;
-						error.showToast(a);
-					}
 				})
+				.setTimeout(180000) // 3 minutes (searches can take a long time)
 				.exec(accountID);
 	}
 

From edb0823bf9fb27ecb12b0630eb8b122777e6bf87 Mon Sep 17 00:00:00 2001
From: Choukajohn <j.blanc@ikmail.com>
Date: Thu, 19 Oct 2023 15:47:22 +0000
Subject: [PATCH 10/19] Translated using Weblate (French)

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 990536865a..74016c34d9 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -411,4 +411,7 @@
     <string name="sk_edit_alt_text">Modifier le texte alternatif</string>
     <string name="sk_message_cache_cleared">Cache des messages vidé</string>
     <string name="sk_settings_clear_timeline_cache">Effacer le cache du fil d\'accueil</string>
+    <string name="sk_settings_default_visibility">Visibilité de publication par défaut</string>
+    <string name="sk_settings_lock_account">Approuver manuellement les nouveaux abonnés</string>
+    <string name="sk_timeline_cache_cleared">Cache du fil d\'accueil vidé</string>
 </resources>
\ No newline at end of file

From 3ff442894dfa4e061480eb7b3ac0b3cfeab36eac Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Thu, 19 Oct 2023 23:44:22 +0000
Subject: [PATCH 11/19] Translated using Weblate (Indonesian)

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 46370ddb14..a3bb8c789e 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -402,4 +402,8 @@
     <string name="sk_settings_color_palette_default">Bawaan (%s)</string>
     <string name="sk_settings_underlined_links">Tautan yang digarisbawahi</string>
     <string name="sk_edit_alt_text">Sunting teks alternatif</string>
+    <string name="sk_settings_default_visibility">Keterlihatan kiriman bawaan</string>
+    <string name="sk_settings_lock_account">Setujui pengikut baru secara manual</string>
+    <string name="sk_timeline_cache_cleared">Tembolok lini masa beranda dihapus</string>
+    <string name="sk_settings_clear_timeline_cache">Hapus tembolok lini masa beranda</string>
 </resources>
\ No newline at end of file

From fa04e0003277816a883a04c64090749ebb05270d Mon Sep 17 00:00:00 2001
From: alextecplayz <alextec70@outlook.com>
Date: Fri, 20 Oct 2023 10:55:41 +0000
Subject: [PATCH 12/19] Translated using Weblate (Romanian)

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ro/
---
 mastodon/src/main/res/values-ro-rRO/strings_sk.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values-ro-rRO/strings_sk.xml b/mastodon/src/main/res/values-ro-rRO/strings_sk.xml
index 09018fed44..efd39b47fc 100644
--- a/mastodon/src/main/res/values-ro-rRO/strings_sk.xml
+++ b/mastodon/src/main/res/values-ro-rRO/strings_sk.xml
@@ -405,4 +405,8 @@
     <string name="sk_settings_color_palette_default">Implicit (%s)</string>
     <string name="sk_settings_underlined_links">Link-uri subliniate</string>
     <string name="sk_edit_alt_text">Editați text alternativ</string>
+    <string name="sk_settings_default_visibility">Vizibilitatea implicită a postărilor</string>
+    <string name="sk_settings_lock_account">Aprobați manual urmăritori noi</string>
+    <string name="sk_timeline_cache_cleared">Memoria cache a cronologiei acasă a fost ștearsă</string>
+    <string name="sk_settings_clear_timeline_cache">Ștergeți memoria cache a cronologiei acasă</string>
 </resources>
\ No newline at end of file

From 172d25eeb0274d7835075e247e069952670898a0 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Thu, 19 Oct 2023 15:20:42 +0000
Subject: [PATCH 13/19] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index e8af5689c1..fe134ddcb3 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -144,7 +144,7 @@
     <string name="sk_timeline_federated">Федерація</string>
     <string name="sk_recent_searches_placeholder">Почніть вводити, щоб почати пошук</string>
     <string name="sk_remove_follower">Вилучити як підписника</string>
-    <string name="sk_remove_follower_confirm">Вилучити %s як підписника заблокувавши й миттєво розблокувавши\?</string>
+    <string name="sk_remove_follower_confirm">Вилучити %s як підписника, заблокувавши й миттєво розблокувавши\?</string>
     <string name="sk_do_remove_follower">Вилучити</string>
     <string name="sk_remove_follower_success">Підписника успішно вилучено</string>
     <string name="sk_changelog">Журнал змін</string>
@@ -281,7 +281,7 @@
     <string name="sk_content_type_bbcode">BBCode</string>
     <string name="sk_content_type_mfm">MFM</string>
     <string name="sk_settings_content_types">Увімкнути форматування допису</string>
-    <string name="sk_settings_default_content_type">Типовий тип вмісту</string>
+    <string name="sk_settings_default_content_type">Усталений тип вмісту</string>
     <string name="sk_content_type">Тип вмісту</string>
     <string name="sk_settings_default_content_type_explanation">Це дозволяє вам попередньо вибрати тип вмісту під час написання нових дописів, замінивши значення, встановлене в «Налаштуваннях постингу».</string>
     <string name="sk_content_type_markdown">Markdown</string>
@@ -412,4 +412,7 @@
     <string name="sk_edit_alt_text">Змінити альтернативний текст</string>
     <string name="sk_message_cache_cleared">Кеш повідомлень очищено</string>
     <string name="sk_settings_clear_timeline_cache">Очистити кеш домашньої стрічки</string>
+    <string name="sk_settings_default_visibility">Усталена видимість дописів</string>
+    <string name="sk_settings_lock_account">Затверджувати нових підписників уручну</string>
+    <string name="sk_timeline_cache_cleared">Кеш домашньої стрічки очищено</string>
 </resources>
\ No newline at end of file

From 20039ec97e25049d8dbc05ffe616c7aca77696c6 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 13:33:02 +0200
Subject: [PATCH 14/19] bump version

---
 mastodon/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 8b83c28ac7..011f0982a3 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -15,8 +15,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 106
-		versionName "2.1.6+fork.106"
+		versionCode 107
+		versionName "2.1.6+fork.107"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
     }

From 8009dc0a750b2ac2013bc71bd12487e1d3e413de Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 15:31:06 +0200
Subject: [PATCH 15/19] use tonal background for see new posts button

---
 mastodon/src/main/res/layout/home_toolbar.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 86cc3a9fa5..46dd96bcba 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -50,7 +50,6 @@
 			style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:background="@drawable/bg_button_m3_tonal_selector"
             android:maxLines="1"
             android:ellipsize="end"
 			android:textAppearance="@style/m3_title_medium"
@@ -58,10 +57,5 @@
 			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
             android:layout_gravity="center" />
-		<!--
-		using the selector background because..
-		the selected=false state's border looks better than the one from the outline style
-		(as per m3 spec) :( i should probably fix this at some point
-		-->
     </FrameLayout>
 </FrameLayout>

From ff99e1023ab1dbe86729c69bd4e85c74f4d2b09e Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 16:23:02 +0200
Subject: [PATCH 16/19] Revert "use tonal background for see new posts button"

This reverts commit 8009dc0a750b2ac2013bc71bd12487e1d3e413de.
---
 mastodon/src/main/res/layout/home_toolbar.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 46dd96bcba..86cc3a9fa5 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -50,6 +50,7 @@
 			style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
+			android:background="@drawable/bg_button_m3_tonal_selector"
             android:maxLines="1"
             android:ellipsize="end"
 			android:textAppearance="@style/m3_title_medium"
@@ -57,5 +58,10 @@
 			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
             android:layout_gravity="center" />
+		<!--
+		using the selector background because..
+		the selected=false state's border looks better than the one from the outline style
+		(as per m3 spec) :( i should probably fix this at some point
+		-->
     </FrameLayout>
 </FrameLayout>

From c33c3d9112648f24b69f823feb08120367421767 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 21 Oct 2023 00:54:38 +0200
Subject: [PATCH 17/19] fix compatibility issue

---
 .../android/fragments/settings/SettingsDisplayFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
index b5bb429fc9..dcfde4ae50 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
@@ -226,7 +226,7 @@ private void onColorClick(ListItem<?> item_){
 
 		AlertDialog.Builder alert=new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_settings_color_palette)
-				.setSingleChoiceItems(items.toArray(String[]::new),
+				.setSingleChoiceItems(items.stream().toArray(String[]::new),
 						selected, (dlg, item)->newSelected[0]=item)
 				.setPositiveButton(R.string.ok, (dlg, item)->save.accept(false))
 				.setNegativeButton(R.string.cancel, null);

From 47d1b182acb805267c74df057eec95f905e111ac Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 21 Oct 2023 01:00:51 +0200
Subject: [PATCH 18/19] fix see new posts button design

---
 .../main/res/drawable/bg_button_new_posts.xml | 10 ++
 .../drawable/bg_button_new_posts_outlined.xml | 10 ++
 mastodon/src/main/res/layout/home_toolbar.xml | 94 +++++++++----------
 mastodon/src/main/res/values/attrs.xml        |  1 +
 mastodon/src/main/res/values/palettes.xml     |  2 +
 mastodon/src/main/res/values/styles.xml       | 19 ++++
 6 files changed, 84 insertions(+), 52 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_button_new_posts.xml
 create mode 100644 mastodon/src/main/res/drawable/bg_button_new_posts_outlined.xml

diff --git a/mastodon/src/main/res/drawable/bg_button_new_posts.xml b/mastodon/src/main/res/drawable/bg_button_new_posts.xml
new file mode 100644
index 0000000000..704ca16375
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_new_posts.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_pressed_overlay">
+	<item android:gravity="center_vertical" android:height="36dp">
+		<shape>
+			<solid android:color="?colorM3Primary"/>
+			<corners android:radius="18dp"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/bg_button_new_posts_outlined.xml b/mastodon/src/main/res/drawable/bg_button_new_posts_outlined.xml
new file mode 100644
index 0000000000..90db5e0247
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_new_posts_outlined.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_pressed_overlay">
+	<item android:gravity="center_vertical" android:height="36dp">
+		<shape>
+			<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+			<corners android:radius="18dp"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 86cc3a9fa5..c677bffa5e 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
     <LinearLayout
-        android:id="@+id/switcher_btn"
-        style="@style/Widget.Mastodon.M3.Button.Text"
-        android:orientation="horizontal"
+		android:id="@+id/switcher_btn"
+		style="@style/Widget.Mastodon.M3.Button.Text"
+		android:orientation="horizontal"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		android:layout_gravity="center_vertical|start"
@@ -14,54 +14,44 @@
 		android:tooltipText="@string/sk_switch_timeline"
 		android:paddingStart="12dp"
 		android:paddingEnd="12dp">
-        <ImageView
-            android:id="@+id/timeline_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_fluent_home_24_regular" />
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <ImageView
-                android:id="@+id/collapsed_chevron"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_fluent_chevron_down_16_filled"
-                android:visibility="gone" />
-            <TextView
-                android:id="@+id/timeline_title"
-                style="@style/action_bar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:drawablePadding="8dp"
-                android:drawableEnd="@drawable/ic_fluent_chevron_down_16_filled" />
-        </FrameLayout>
-    </LinearLayout>
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <Button
-            android:id="@+id/show_new_posts_btn"
-			style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+		<ImageView
+			android:id="@+id/timeline_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/ic_fluent_home_24_regular"/>
+		<FrameLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical">
+			<ImageView
+				android:id="@+id/collapsed_chevron"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_gravity="center_vertical"
+				android:src="@drawable/ic_fluent_chevron_down_16_filled"
+				android:visibility="gone"/>
+			<TextView
+				style="@style/action_bar_title"
+				android:id="@+id/timeline_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="16dp"
+				android:drawablePadding="8dp"
+				android:drawableEnd="@drawable/ic_fluent_chevron_down_16_filled"/>
+		</FrameLayout>
+	</LinearLayout>
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+		<Button
+			style="?toolbarActionButtonStyle"
+			android:id="@+id/show_new_posts_btn"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:background="@drawable/bg_button_m3_tonal_selector"
-            android:maxLines="1"
-            android:ellipsize="end"
-			android:textAppearance="@style/m3_title_medium"
-			android:textSize="16sp"
 			android:text="@string/see_new_posts"
-            android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
-            android:layout_gravity="center" />
-		<!--
-		using the selector background because..
-		the selected=false state's border looks better than the one from the outline style
-		(as per m3 spec) :( i should probably fix this at some point
-		-->
-    </FrameLayout>
+			android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
+			android:layout_gravity="center"/>
+	</FrameLayout>
 </FrameLayout>
diff --git a/mastodon/src/main/res/values/attrs.xml b/mastodon/src/main/res/values/attrs.xml
index 109380e680..0224779c0c 100644
--- a/mastodon/src/main/res/values/attrs.xml
+++ b/mastodon/src/main/res/values/attrs.xml
@@ -37,6 +37,7 @@
 	<attr name="colorM3DarkOnSurface" format="color" />
 	<attr name="colorTabBarAlpha" format="color" />
 	<attr name="colorFilledCardAlpha" format="color" />
+	<attr name="toolbarActionButtonStyle" format="reference" />
 
 	<attr name="colorPrimary25" format="color" />
 	<attr name="colorPrimary50" format="color" />
diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index a3d90d37b8..793a4ea064 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -67,6 +67,7 @@
 		<item name="colorM3OnErrorContainer">#410E0B</item>
 		<item name="colorWhite">#FFF</item>
 		<item name="colorSensitiveOverlay">#a6ffffff</item>
+		<item name="toolbarActionButtonStyle">@style/Widget.Mastodon.M3.Button.ToolbarAction</item>
 
 		<!--
 		custom themes generally don't have secondary/tertiary accent colors -
@@ -155,6 +156,7 @@
 		<item name="colorM3SecondaryContainer">?colorNeutral800</item>
 		<item name="colorTabBarAlpha">#00000000</item>
 		<item name="colorFilledCardAlpha">#00000000</item>
+		<item name="toolbarActionButtonStyle">@style/Widget.Mastodon.M3.Button.ToolbarAction.Black</item>
 	</style>
 
 	<style name="ColorPalette.Material3">
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 6b7407311f..71a64a49f3 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -243,6 +243,25 @@
 		<item name="android:paddingStart">16dp</item>
 	</style>
 
+	<style name="Widget.Mastodon.M3.Button.ToolbarAction">
+		<item name="android:paddingStart">14dp</item>
+		<item name="android:paddingEnd">20dp</item>
+		<item name="android:textAppearance">@style/m3_title_medium</item>
+		<item name="android:ellipsize">end</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:textSize">16sp</item>
+		<item name="android:stateListAnimator">@animator/m3_button_elevation</item>
+
+		<item name="android:background">@drawable/bg_button_new_posts</item>
+		<item name="android:textColor">@color/button_text_m3_filled</item>
+		<item name="android:drawableTint">@color/button_text_m3_filled</item>
+	</style>
+	<style name="Widget.Mastodon.M3.Button.ToolbarAction.Black">
+		<item name="android:background">@drawable/bg_button_new_posts_outlined</item>
+		<item name="android:textColor">@color/button_text_m3_tonal</item>
+		<item name="android:drawableTint">@color/button_text_m3_tonal</item>
+	</style>
+
 	<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
 		<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
 		<item name="android:textAppearance">@style/m3_body_large</item>

From b60c1a5db3d8c77c0bae48440e9842ed153a8708 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 21 Oct 2023 01:42:13 +0200
Subject: [PATCH 19/19] add back old see_new_posts strings

---
 mastodon/src/main/res/values-ar-rSA/strings.xml  | 1 +
 mastodon/src/main/res/values-be-rBY/strings.xml  | 1 +
 mastodon/src/main/res/values-ca-rES/strings.xml  | 1 +
 mastodon/src/main/res/values-cs-rCZ/strings.xml  | 1 +
 mastodon/src/main/res/values-da-rDK/strings.xml  | 1 +
 mastodon/src/main/res/values-de-rDE/strings.xml  | 1 +
 mastodon/src/main/res/values-el-rGR/strings.xml  | 1 +
 mastodon/src/main/res/values-eu-rES/strings.xml  | 1 +
 mastodon/src/main/res/values-fi-rFI/strings.xml  | 1 +
 mastodon/src/main/res/values-fil-rPH/strings.xml | 1 +
 mastodon/src/main/res/values-fr-rFR/strings.xml  | 1 +
 mastodon/src/main/res/values-gd-rGB/strings.xml  | 1 +
 mastodon/src/main/res/values-hu-rHU/strings.xml  | 1 +
 mastodon/src/main/res/values-hy-rAM/strings.xml  | 1 +
 mastodon/src/main/res/values-in-rID/strings.xml  | 1 +
 mastodon/src/main/res/values-it-rIT/strings.xml  | 1 +
 mastodon/src/main/res/values-ja-rJP/strings.xml  | 1 +
 mastodon/src/main/res/values-kab/strings.xml     | 1 +
 mastodon/src/main/res/values-ko-rKR/strings.xml  | 1 +
 mastodon/src/main/res/values-nl-rNL/strings.xml  | 1 +
 mastodon/src/main/res/values-pl-rPL/strings.xml  | 1 +
 mastodon/src/main/res/values-pt-rBR/strings.xml  | 1 +
 mastodon/src/main/res/values-pt-rPT/strings.xml  | 1 +
 mastodon/src/main/res/values-ro-rRO/strings.xml  | 1 +
 mastodon/src/main/res/values-ru-rRU/strings.xml  | 1 +
 mastodon/src/main/res/values-sl-rSI/strings.xml  | 1 +
 mastodon/src/main/res/values-sv-rSE/strings.xml  | 1 +
 mastodon/src/main/res/values-tr-rTR/strings.xml  | 1 +
 mastodon/src/main/res/values-uk-rUA/strings.xml  | 1 +
 mastodon/src/main/res/values-vi-rVN/strings.xml  | 1 +
 mastodon/src/main/res/values-zh-rCN/strings.xml  | 1 +
 mastodon/src/main/res/values/strings.xml         | 2 +-
 32 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-ar-rSA/strings.xml b/mastodon/src/main/res/values-ar-rSA/strings.xml
index 3ea30d87d7..94eb58203f 100644
--- a/mastodon/src/main/res/values-ar-rSA/strings.xml
+++ b/mastodon/src/main/res/values-ar-rSA/strings.xml
@@ -714,4 +714,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">استعرض المنشورات الجديدة</string>
 </resources>
diff --git a/mastodon/src/main/res/values-be-rBY/strings.xml b/mastodon/src/main/res/values-be-rBY/strings.xml
index 90ec4d75bf..d10c578d4b 100644
--- a/mastodon/src/main/res/values-be-rBY/strings.xml
+++ b/mastodon/src/main/res/values-be-rBY/strings.xml
@@ -531,4 +531,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Паказаць новыя допісы</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ca-rES/strings.xml b/mastodon/src/main/res/values-ca-rES/strings.xml
index 14327aaa56..ca8d615d6e 100644
--- a/mastodon/src/main/res/values-ca-rES/strings.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings.xml
@@ -297,4 +297,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Publicacions noves</string>
 </resources>
diff --git a/mastodon/src/main/res/values-cs-rCZ/strings.xml b/mastodon/src/main/res/values-cs-rCZ/strings.xml
index 9f10c5805d..0b39122c28 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings.xml
@@ -643,4 +643,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Zobrazit nové příspěvky</string>
 </resources>
diff --git a/mastodon/src/main/res/values-da-rDK/strings.xml b/mastodon/src/main/res/values-da-rDK/strings.xml
index 5524da7717..d0bce21247 100644
--- a/mastodon/src/main/res/values-da-rDK/strings.xml
+++ b/mastodon/src/main/res/values-da-rDK/strings.xml
@@ -507,4 +507,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Se nye indlæg</string>
 </resources>
diff --git a/mastodon/src/main/res/values-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index a76c7c45a0..f794a83efd 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -586,4 +586,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Neue Beiträge anzeigen</string>
 </resources>
diff --git a/mastodon/src/main/res/values-el-rGR/strings.xml b/mastodon/src/main/res/values-el-rGR/strings.xml
index 1d84b9e18f..57a6b14d2b 100644
--- a/mastodon/src/main/res/values-el-rGR/strings.xml
+++ b/mastodon/src/main/res/values-el-rGR/strings.xml
@@ -615,4 +615,5 @@
 	<string name="delete_list_confirm">Διαγραφή “%s”;</string>
 	<string name="list_exclusive">Απόκρυψη μελών στο Ακολουθείς</string>
 	<!-- %s is a username -->
+	<string name="see_new_posts">Δες νέες αναρτήσεις</string>
 </resources>
diff --git a/mastodon/src/main/res/values-eu-rES/strings.xml b/mastodon/src/main/res/values-eu-rES/strings.xml
index ec4ea1b37c..a44f60ba52 100644
--- a/mastodon/src/main/res/values-eu-rES/strings.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings.xml
@@ -445,4 +445,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Ikusi bidalketa berriak</string>
 </resources>
diff --git a/mastodon/src/main/res/values-fi-rFI/strings.xml b/mastodon/src/main/res/values-fi-rFI/strings.xml
index 9c91a2a3ac..0e65723e76 100644
--- a/mastodon/src/main/res/values-fi-rFI/strings.xml
+++ b/mastodon/src/main/res/values-fi-rFI/strings.xml
@@ -602,4 +602,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Uusia julkaisuja</string>
 </resources>
diff --git a/mastodon/src/main/res/values-fil-rPH/strings.xml b/mastodon/src/main/res/values-fil-rPH/strings.xml
index e35210849d..a01971a1b5 100644
--- a/mastodon/src/main/res/values-fil-rPH/strings.xml
+++ b/mastodon/src/main/res/values-fil-rPH/strings.xml
@@ -288,4 +288,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Tingnan ang mga bagong post</string>
 </resources>
diff --git a/mastodon/src/main/res/values-fr-rFR/strings.xml b/mastodon/src/main/res/values-fr-rFR/strings.xml
index 4f84792103..d1e3635936 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings.xml
@@ -598,4 +598,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Voir les nouveaux messages</string>
 </resources>
diff --git a/mastodon/src/main/res/values-gd-rGB/strings.xml b/mastodon/src/main/res/values-gd-rGB/strings.xml
index e60396ca4d..537fb7ca2f 100644
--- a/mastodon/src/main/res/values-gd-rGB/strings.xml
+++ b/mastodon/src/main/res/values-gd-rGB/strings.xml
@@ -644,4 +644,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Seall na postaichean ùra</string>
 </resources>
diff --git a/mastodon/src/main/res/values-hu-rHU/strings.xml b/mastodon/src/main/res/values-hu-rHU/strings.xml
index afe6cf9370..d017b66d64 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings.xml
@@ -376,4 +376,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Új bejegyzések megtekintése</string>
 </resources>
diff --git a/mastodon/src/main/res/values-hy-rAM/strings.xml b/mastodon/src/main/res/values-hy-rAM/strings.xml
index 573bc940b9..f410835333 100644
--- a/mastodon/src/main/res/values-hy-rAM/strings.xml
+++ b/mastodon/src/main/res/values-hy-rAM/strings.xml
@@ -388,4 +388,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Նոր գրառումներ</string>
 </resources>
diff --git a/mastodon/src/main/res/values-in-rID/strings.xml b/mastodon/src/main/res/values-in-rID/strings.xml
index 58d9dac737..aad346d825 100644
--- a/mastodon/src/main/res/values-in-rID/strings.xml
+++ b/mastodon/src/main/res/values-in-rID/strings.xml
@@ -570,4 +570,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Lihat kiriman baru</string>
 </resources>
diff --git a/mastodon/src/main/res/values-it-rIT/strings.xml b/mastodon/src/main/res/values-it-rIT/strings.xml
index 723e2d0fdd..9fcdfe326e 100644
--- a/mastodon/src/main/res/values-it-rIT/strings.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings.xml
@@ -602,4 +602,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Visualizza nuovi post</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ja-rJP/strings.xml b/mastodon/src/main/res/values-ja-rJP/strings.xml
index 4c9ecbc28c..eacc73d011 100644
--- a/mastodon/src/main/res/values-ja-rJP/strings.xml
+++ b/mastodon/src/main/res/values-ja-rJP/strings.xml
@@ -602,4 +602,5 @@
 	<plurals name="x_posts_recently">
 		<item quantity="other">最近の投稿 %,d 件</item>
 	</plurals>
+	<string name="see_new_posts">新しい投稿を見る</string>
 </resources>
diff --git a/mastodon/src/main/res/values-kab/strings.xml b/mastodon/src/main/res/values-kab/strings.xml
index 32fe94000a..ade09fa5ac 100644
--- a/mastodon/src/main/res/values-kab/strings.xml
+++ b/mastodon/src/main/res/values-kab/strings.xml
@@ -246,4 +246,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Ẓer tissufaɣ timaynutin</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ko-rKR/strings.xml b/mastodon/src/main/res/values-ko-rKR/strings.xml
index b1f4af0a41..a65c3b040f 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings.xml
@@ -304,4 +304,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">새 게시물 보기</string>
 </resources>
diff --git a/mastodon/src/main/res/values-nl-rNL/strings.xml b/mastodon/src/main/res/values-nl-rNL/strings.xml
index ee00cfc308..50cc264e76 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings.xml
@@ -598,4 +598,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Nieuwe berichten</string>
 </resources>
diff --git a/mastodon/src/main/res/values-pl-rPL/strings.xml b/mastodon/src/main/res/values-pl-rPL/strings.xml
index 33ae06c558..9831a40141 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings.xml
@@ -461,4 +461,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Zobacz nowe wpisy</string>
 </resources>
diff --git a/mastodon/src/main/res/values-pt-rBR/strings.xml b/mastodon/src/main/res/values-pt-rBR/strings.xml
index 2d4a03fad9..7cc2a2eb2a 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings.xml
@@ -585,4 +585,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Ver novas publicações</string>
 </resources>
diff --git a/mastodon/src/main/res/values-pt-rPT/strings.xml b/mastodon/src/main/res/values-pt-rPT/strings.xml
index 7978de1841..3f2a986819 100644
--- a/mastodon/src/main/res/values-pt-rPT/strings.xml
+++ b/mastodon/src/main/res/values-pt-rPT/strings.xml
@@ -238,4 +238,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Ver novas publicações</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ro-rRO/strings.xml b/mastodon/src/main/res/values-ro-rRO/strings.xml
index 934f2cf991..88524c8b52 100644
--- a/mastodon/src/main/res/values-ro-rRO/strings.xml
+++ b/mastodon/src/main/res/values-ro-rRO/strings.xml
@@ -53,4 +53,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Se nye innlegg</string>
 </resources>
diff --git a/mastodon/src/main/res/values-ru-rRU/strings.xml b/mastodon/src/main/res/values-ru-rRU/strings.xml
index a3bd6836d8..e4b99b6ed5 100644
--- a/mastodon/src/main/res/values-ru-rRU/strings.xml
+++ b/mastodon/src/main/res/values-ru-rRU/strings.xml
@@ -664,4 +664,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Показать новые</string>
 </resources>
diff --git a/mastodon/src/main/res/values-sl-rSI/strings.xml b/mastodon/src/main/res/values-sl-rSI/strings.xml
index 980040fb5c..dcefd17bac 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings.xml
@@ -549,4 +549,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Pokaži nove objave</string>
 </resources>
diff --git a/mastodon/src/main/res/values-sv-rSE/strings.xml b/mastodon/src/main/res/values-sv-rSE/strings.xml
index 6a1ec585ec..7c5b9df450 100644
--- a/mastodon/src/main/res/values-sv-rSE/strings.xml
+++ b/mastodon/src/main/res/values-sv-rSE/strings.xml
@@ -572,4 +572,5 @@
 	<!-- %s is a username -->
 	<string name="remove_from_list">Ta bort från lista</string>
 	<string name="confirm_remove_list_member">Ta bort medlem?</string>
+	<string name="see_new_posts">Se nya inlägg</string>
 </resources>
diff --git a/mastodon/src/main/res/values-tr-rTR/strings.xml b/mastodon/src/main/res/values-tr-rTR/strings.xml
index f0cf9cf476..b4540a1a56 100644
--- a/mastodon/src/main/res/values-tr-rTR/strings.xml
+++ b/mastodon/src/main/res/values-tr-rTR/strings.xml
@@ -601,4 +601,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Yeni gönderileri gör</string>
 </resources>
diff --git a/mastodon/src/main/res/values-uk-rUA/strings.xml b/mastodon/src/main/res/values-uk-rUA/strings.xml
index 8351d7a04a..ff94b0de34 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings.xml
@@ -664,4 +664,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">Переглянути нові дописи</string>
 </resources>
diff --git a/mastodon/src/main/res/values-vi-rVN/strings.xml b/mastodon/src/main/res/values-vi-rVN/strings.xml
index 3214c97f84..45d0532a16 100644
--- a/mastodon/src/main/res/values-vi-rVN/strings.xml
+++ b/mastodon/src/main/res/values-vi-rVN/strings.xml
@@ -602,4 +602,5 @@
 	<plurals name="x_posts_recently">
 		<item quantity="other">%,d tút mới</item>
 	</plurals>
+	<string name="see_new_posts">Đọc những tút mới</string>
 </resources>
diff --git a/mastodon/src/main/res/values-zh-rCN/strings.xml b/mastodon/src/main/res/values-zh-rCN/strings.xml
index 5464b2d878..48ba49e488 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings.xml
@@ -563,4 +563,5 @@
 	<!-- Screen reader description for the menu on the home timeline screen -->
 	<!-- %s is the name of the list -->
 	<!-- %s is a username -->
+	<string name="see_new_posts">查看新嘟文</string>
 </resources>
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 6fc43d176d..967138f589 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -267,7 +267,7 @@
 	<!-- %s is the server domain -->
 	<string name="local_timeline_info_banner">These are all the posts from all users in your server (%s).</string>
 	<string name="recommended_accounts_info_banner">You might like these accounts based on others you follow.</string>
-	<string name="see_new_posts">See new posts</string>
+	<string name="see_new_posts">New posts</string>
 	<string name="load_missing_posts">Load missing posts</string>
 	<string name="follow_back">Follow Back</string>
 	<string name="button_follow_pending">Pending</string>