fix deleting boosted posts in profile

closes sk22#

mastodon/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 100
+		versionCode 104
-		versionName "2.1.6+fork.100"
+		versionName "2.1.6+fork.104"
 		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']
     }

mastodon/src/main/assets/blocks.txt

@@ -1,56 +1,43 @@
 13bells.com
 1611.social
 4aem.com
+5dollah.click
 adachi.party
-anime.website
+adtension.com
 annihilation.social
 anon-kenkai.com
 asbestos.cafe
 bae.st
-bajax.us
 banepo.st
-baraag.net
 bassam.social
+battlepenguin.video
 beefyboys.win
-beepboop.ga
-berserker.town
-bikeshed.party
-boks.moe
 boymoder.biz
 brainsoap.net
 breastmilk.club
 brighteon.social
-bungle.online
+cachapa.xyz
+canary.fedinuke.example.com
+catgirl.life
 cawfee.club
+childlove.space
 clew.lol
 clubcyberia.co
-collapsitarian.io
-comfyboy.club
 contrapointsfan.club
+crucible.world
 cum.camp
 cum.salon
-darknight-coffee.org
 decayable.ink
 dembased.xyz
-desupost.soy
 detroitriotcity.com
-eatthebugs.social
+djsumdog.com
 eientei.org
-elementality.org
 eveningzoo.club
-firedragonstudios.com
-firefaithfellowship.com
 fluf.club
-foxfam.club
 freak.university
 freeatlantis.com
-freedomstrike.org
-freesoftwareextremist.com
-freespeech.group
 freespeechextremist.com
-freetalklive.com
 froth.zone
-fulltermprivacy.com
 gameliberty.club
 gearlandia.haus
 genderheretics.xyz
@@ -59,42 +46,34 @@ gleasonator.com
 glee.li
 glindr.org
 goyim.app
-goyslop.cafe
+h5q.net
 haeder.net
 handholding.io
 hitchhiker.social
-hunk.city
 iddqd.social
-intkos.link
-justicewarrior.social
-kawa-kun.com
 kitsunemimi.club
 kiwifarms.cc
-kompost.cz
 kurosawa.moe
+kyaruc.moe
 leafposter.club
-leftychan.net
 lewdieheaven.com
 liberdon.com
 ligma.pro
 lolicon.rocks
+lolison.network
 lolison.top
 lovingexpressions.net
-mahodou.moe
 makemysarcophagus.com
-maladaptive.art
 marsey.moe
-masochi.st
 mastinator.com
 merovingian.club
 midwaytrades.com
 mirr0r.city
-moa.st
+morale.ch
 mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
-neckbeard.xyz
 needs.vodka
 neenster.org
 nicecrew.digital
@@ -103,18 +82,18 @@ noagendasocial.com
 noagendasocial.nl
 noagendatube.com
 nobodyhasthe.biz
-nukem.biz
+norwoodzero.net
-obo.sh
+nyanide.com
 onionfarms.org
 pawlicker.com
 pawoo.net
 pedo.school
+peervideo.club
 piazza.today
 pibvt.net
 pieville.net
 pisskey.io
 plagu.ee
-pmth.us
 poa.st
 poast.org
 poast.tv
@@ -123,17 +102,18 @@ prospeech.space
 quodverum.com
 r18.social
 rakket.app
+rapemeat.express
 rapemeat.solutions
-rdrama.cc
+rayci.st
 rebelbase.site
-retardedniggers.forsale
-rojogato.com
 ryona.agency
+sad.cab
 schwartzwelt.xyz
 seal.cafe
+shaw.app
 shigusegubu.club
 shitpost.cloud
-shota.house
+shortstacksran.ch
 silliness.observer
 skinheads.eu
 skinheads.io
@@ -148,23 +128,20 @@ sneed.social
 sonichu.com
 spinster.xyz
 springbo.cc
-starnix.network
 strelizia.net
-syspxl.xyz
 tastingtraffic.net
 teci.world
 theapex.social
+thechimp.zone
+thenobody.club
 thepostearthdestination.com
 tkammer.de
 trumpislovetrumpis.life
 truthsocial.co.in
-urchan.org
+usualsuspects.lol
 varishangout.net
-whinge.house
+vtuberfan.social
-whinge.town
-wideboys.org
 wolfgirl.bar
 xn--p1abe3d.xn--80asehdb
 yggdrasil.social
 youjo.love
-zztails.gay

mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java

@@ -281,7 +281,7 @@ public class AudioPlayerService extends Service{
 
 		if(playerReady){
 			boolean isPlaying=player.isPlaying();
-			bldr.addAction(new Notification.Action.Builder(Icon.createWithResource(this, isPlaying ? R.drawable.ic_pause_24 : R.drawable.ic_play_24),
+			bldr.addAction(new Notification.Action.Builder(Icon.createWithResource(this, isPlaying ? R.drawable.ic_fluent_pause_24_filled : R.drawable.ic_fluent_play_24_filled),
 						getString(isPlaying ? R.string.pause : R.string.play),
 						PendingIntent.getBroadcast(this, 2, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_IMMUTABLE))
 					.build());

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -1,17 +1,17 @@
 package org.joinmastodon.android;
 
 import static org.joinmastodon.android.api.MastodonAPIController.gson;
+import static org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference.MATERIAL3;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
 
-import androidx.annotation.StringRes;
-
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
+import org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.ContentType;
@@ -25,8 +25,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.StringRes;
-
 public class GlobalUserPreferences{
 	private static final String TAG="GlobalUserPreferences";
 
@@ -62,6 +60,9 @@ public class GlobalUserPreferences{
 	public static boolean displayPronounsInTimelines, displayPronounsInThreads, displayPronounsInUserListings;
 	public static boolean overlayMedia;
 	public static boolean showSuicideHelp;
+	public static boolean underlinedLinks;
+	public static ColorPreference color;
+	public static boolean likeIcon;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -122,6 +123,9 @@ public class GlobalUserPreferences{
 		displayPronounsInUserListings=prefs.getBoolean("displayPronounsInUserListings", true);
 		overlayMedia=prefs.getBoolean("overlayMedia", false);
 		showSuicideHelp=prefs.getBoolean("showSuicideHelp", true);
+		underlinedLinks=prefs.getBoolean("underlinedLinks", true);
+		color=ColorPreference.valueOf(prefs.getString("color", MATERIAL3.name()));
+		likeIcon=prefs.getBoolean("likeIcon", false);
 
 		if (prefs.contains("prefixRepliesWithRe")) {
 			prefixReplies = prefs.getBoolean("prefixRepliesWithRe", false)
@@ -132,8 +136,11 @@ public class GlobalUserPreferences{
 					.apply();
 		}
 
-		if(prefs.getInt("migrationLevel", 0) < 61) migrateToUpstreamVersion61();
+		int migrationLevel=prefs.getInt("migrationLevel", BuildConfig.VERSION_CODE);
-		if(prefs.getInt("migrationLevel", 0) < 101) migrateToVersion101();
+		if(migrationLevel < 61)
+			migrateToUpstreamVersion61();
+		if(migrationLevel < BuildConfig.VERSION_CODE)
+			prefs.edit().putInt("migrationLevel", BuildConfig.VERSION_CODE).apply();
 	}
 
 	public static void save(){
@@ -174,19 +181,33 @@ public class GlobalUserPreferences{
 				.putBoolean("displayPronounsInUserListings", displayPronounsInUserListings)
 				.putBoolean("overlayMedia", overlayMedia)
 				.putBoolean("showSuicideHelp", showSuicideHelp)
+				.putBoolean("underlinedLinks", underlinedLinks)
+				.putString("color", color.name())
+				.putBoolean("likeIcon", likeIcon)
 				.apply();
 	}
 
-	private static void migrateToVersion101(){
+	public enum ThemePreference{
-		Log.d(TAG, "Migrating preferences to version 101!! (copy current theme to local preferences)");
+		AUTO,
+		LIGHT,
+		DARK
+	}
 
-		AccountSessionManager asm=AccountSessionManager.getInstance();
+	public enum AutoRevealMode {
-		for(AccountSession session : asm.getLoggedInAccounts()){
+		NEVER,
-			String accountID=session.getID();
+		THREADS,
-			AccountLocalPreferences localPrefs=session.getLocalPreferences();
+		DISCUSSIONS
 	}
+
+	public enum PrefixRepliesMode {
+		NEVER,
+		ALWAYS,
+		TO_OTHERS
 	}
 
+
+	//region preferences migrations
+
 	private static void migrateToUpstreamVersion61(){
 		Log.d(TAG, "Migrating preferences to upstream version 61!!");
 
@@ -233,25 +254,8 @@ public class GlobalUserPreferences{
 
 			localPrefs.save();
 		}
-
-		prefs.edit().putInt("migrationLevel", 61).apply();
 	}
 
-	public enum ThemePreference{
+	//endregion
-		AUTO,
-		LIGHT,
-		DARK
-	}
 
-	public enum AutoRevealMode {
-		NEVER,
-		THREADS,
-		DISCUSSIONS
-	}
-
-	public enum PrefixRepliesMode {
-		NEVER,
-		ALWAYS,
-		TO_OTHERS
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java

@@ -14,7 +14,6 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -33,7 +32,6 @@ import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -212,7 +210,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
-				case FAVORITE -> R.drawable.ic_fluent_star_24_filled;
+				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_filled : R.drawable.ic_fluent_star_24_filled;
 				case REBLOG -> R.drawable.ic_fluent_arrow_repeat_all_24_filled;
 				case FOLLOW -> R.drawable.ic_fluent_person_add_24_filled;
 				case MENTION -> R.drawable.ic_fluent_mention_24_filled;

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import me.grishka.appkit.api.Callback;
@@ -69,7 +70,7 @@ public class CacheController{
 								Status status=MastodonAPIController.gson.fromJson(cursor.getString(0), Status.class);
 								status.postprocess();
 								int flags=cursor.getInt(1);
-								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
+								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0) ? status.id : null;
 								newMaxID=status.id;
 								result.add(status);
 							}while(cursor.moveToNext());
@@ -113,7 +114,7 @@ public class CacheController{
 				values.put("id", s.id);
 				values.put("json", MastodonAPIController.gson.toJson(s));
 				int flags=0;
-				if(s.hasGapAfter)
+				if(Objects.equals(s.hasGapAfter, s.id))
 					flags|=POST_FLAG_GAP_AFTER;
 				values.put("flags", flags);
 				values.put("time", s.createdAt.getEpochSecond());

mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java

@@ -97,7 +97,7 @@ public class PushSubscriptionManager{
 		deviceToken=getPrefs().getString("deviceToken", null);
 		int tokenVersion=getPrefs().getInt("version", 0);
 		if(!TextUtils.isEmpty(deviceToken) && tokenVersion==BuildConfig.VERSION_CODE){
-			registerAllAccountsForPush(true); // TODO: revert this before release
+			registerAllAccountsForPush(false);
 			return;
 		}
 		Log.i(TAG, "tryRegisterFCM: no token found or app was updated. Trying to get push token...");

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java

@@ -13,7 +13,7 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
-    private String maxID;
+    private final String maxID;
     public PleromaMarkNotificationsRead(String maxID) {
         super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
         this.maxID = maxID;

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java

@@ -10,6 +10,7 @@ import androidx.annotation.StringRes;
 
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
@@ -43,7 +44,6 @@ public class AccountLocalPreferences{
 	public boolean emojiReactionsEnabled;
 	public ShowEmojiReactions showEmojiReactions;
 	public ColorPreference color;
-	public boolean likeIcon;
 	public ArrayList<Emoji> recentCustomEmoji;
 
 	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
@@ -73,8 +73,7 @@ public class AccountLocalPreferences{
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
 		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
-		color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
+		color=prefs.contains("color") ? ColorPreference.valueOf(prefs.getString("color", null)) : null;
-		likeIcon=prefs.getBoolean("likeIcon", false);
 		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());
 	}
 
@@ -86,6 +85,10 @@ public class AccountLocalPreferences{
 		prefs.edit().putLong("notificationsPauseTime", time).apply();
 	}
 
+	public ColorPreference getCurrentColor(){
+		return color!=null ? color : GlobalUserPreferences.color!=null ? GlobalUserPreferences.color : ColorPreference.MATERIAL3;
+	}
+
 	public void save(){
 		prefs.edit()
 				.putBoolean("interactionCounts", showInteractionCounts)
@@ -109,8 +112,7 @@ public class AccountLocalPreferences{
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
 				.putString("showEmojiReactions", showEmojiReactions.name())
-				.putString("color", color.name())
+				.putString("color", color!=null ? color.name() : null)
-				.putBoolean("likeIcon", likeIcon)
 				.putString("recentCustomEmoji", gson.toJson(recentCustomEmoji))
 				.apply();
 	}

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java

@@ -270,6 +270,7 @@ public class AccountSession{
 			if(s!=null && s.filtered!=null){
 				localPreferences.serverSideFiltersSupported=true;
 				localPreferences.save();
+				break;
 			}
 		}
 
@@ -279,9 +280,17 @@ public class AccountSession{
 			if(filterStatusContainingObject(o, extractor, context, profile)){
 				Status s=extractor.apply(o);
 				removeUs.add(o);
-				if(s!=null && s.hasGapAfter && i > 0){
+				if(s!=null && s.hasGapAfter!=null && i>0){
-					Status prev=extractor.apply(objects.get(i - 1));
+					// oops, we're about to remove an item that has a gap after...
-					if(prev!=null) prev.hasGapAfter=true;
+					// gotta find the previous status that's not also about to be removed
+					for(int j=i-1; j>=0; j--){
+						T p=objects.get(j);
+						Status prev=extractor.apply(objects.get(j));
+						if(prev!=null && !removeUs.contains(p)){
+							prev.hasGapAfter=s.hasGapAfter;
+							break;
+						}
+					}
 				}
 			}
 		}
@@ -295,7 +304,7 @@ public class AccountSession{
 		// don't hide own posts in own profile
 		if(statusIsOnOwnProfile(s, profile))
 			return false;
-		if(isFilteredType(s))
+		if(isFilteredType(s) && (context == FilterContext.HOME || context == FilterContext.PUBLIC))
 			return true;
 		// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
 		if(localPreferences.serverSideFiltersSupported){

mastodon/src/main/java/org/joinmastodon/android/events/ScheduledStatusDeletedEvent.java

@@ -1,7 +1,5 @@
 package org.joinmastodon.android.events;
 
-import org.joinmastodon.android.model.ScheduledStatus;
-
 public class ScheduledStatusDeletedEvent{
 	public final String id;
 	public final String accountID;

mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java

@@ -52,14 +52,14 @@ public class AccountTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter)
+		currentRequest=new GetAccountStatuses(user.id, getMaxID(), null, count, filter)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext(), user);
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 					}
 				})
 				.exec(accountID);

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -33,7 +33,6 @@ import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
@@ -89,6 +88,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected Rect tmpRect=new Rect();
 	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
 	protected boolean currentlyScrolling;
+	protected String maxID;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -155,6 +155,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected String getMaxID(){
+		if(refreshing) return null;
+		if(maxID!=null) return maxID;
 		if(!preloadedData.isEmpty())
 			return preloadedData.get(preloadedData.size()-1).getID();
 		else if(!data.isEmpty())
@@ -163,6 +165,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			return null;
 	}
 
+	protected boolean applyMaxID(List<Status> result){
+		boolean empty=result.isEmpty();
+		if(!empty) maxID=result.get(result.size()-1).id;
+		return !empty;
+	}
+
 	protected abstract List<StatusDisplayItem> buildDisplayItems(T s);
 	protected abstract void addAccountToKnown(T s);
 
@@ -457,12 +465,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public abstract void onItemClick(String id);
 
-	protected void updatePoll(String itemID, Status status, Poll poll){
+	protected void updatePoll(String parentID, Status statusForContent, Poll poll){
-		status.poll=poll;
+		statusForContent.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(item.parentID.equals(itemID)){
+			if(item.contentStatusID.equals(statusForContent.id)){
 				if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
 					firstOptionIndex=i;
 				}else if(item instanceof PollFooterStatusDisplayItem){
@@ -477,7 +485,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
+		StatusDisplayItem.buildPollItems(parentID, statusForContent.id, this, poll, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -549,21 +557,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder) {
 		Status status = holder.getItem().status;
+		if(holder.getItem().hasVisibilityToggle) holder.animateVisibilityToggle(false);
 		MediaGridStatusDisplayItem.Holder mediaGrid=findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
 		if(mediaGrid!=null){
 			if(!status.sensitiveRevealed) mediaGrid.revealSensitive();
 			else mediaGrid.hideSensitive();
 		}else{
-			// media grid's methods normally change the status' state - we still want to be able
+			status.sensitiveRevealed=false;
-			// to do this if the media grid is not bound, tho - so, doing it ourselves here
+			notifyItemChangedAfter(holder.getItem(), MediaGridStatusDisplayItem.class);
-			status.sensitiveRevealed = !status.sensitiveRevealed;
 		}
-		if(holder.getItem().hasVisibilityToggle) holder.animateVisibilityToggle(false);
 	}
 
 	public void onSensitiveRevealed(MediaGridStatusDisplayItem.Holder holder) {
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
 		if(header!=null && header.getItem().hasVisibilityToggle) header.animateVisibilityToggle(true);
+		else notifyItemChangedBefore(holder.getItem(), HeaderStatusDisplayItem.class);
 	}
 
 	protected void toggleSpoiler(Status status, String itemID){
@@ -572,8 +580,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			status.sensitiveRevealed = false;
 
 		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
-		if(spoiler!=null)
+		if(spoiler!=null) spoiler.rebind();
-			spoiler.rebind();
+		else notifyItemChanged(itemID, SpoilerStatusDisplayItem.class);
 		SpoilerStatusDisplayItem spoilerItem=Objects.requireNonNull(findItemOfType(itemID, SpoilerStatusDisplayItem.class));
 
 		int index=displayItems.indexOf(spoilerItem);
@@ -585,39 +593,29 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			adapter.notifyItemRangeRemoved(index+1, spoilerItem.contentItems.size());
 		}
 
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		notifyItemChanged(itemID, TextStatusDisplayItem.class);
-		if(text!=null)
-			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if(header!=null)
+		if(header!=null) header.rebind();
-			header.rebind();
+		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
 
 		list.invalidateItemDecorations();
 	}
 
 	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable) {
-		if (holder.getItem().status.textExpandable != expandable && list != null) {
+		Status s=holder.getItem().status;
-			holder.getItem().status.textExpandable = expandable;
+		if(s.textExpandable!=expandable && list!=null) {
+			s.textExpandable=expandable;
 			HeaderStatusDisplayItem.Holder header=findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-			if (header != null) header.rebind();
+			if(header!=null) header.bindCollapseButton();
 		}
 	}
 
 	public void onToggleExpanded(Status status, String itemID) {
 		status.textExpanded = !status.textExpanded;
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		notifyItemChanged(itemID, TextStatusDisplayItem.class);
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if (text != null) text.rebind();
+		if(header!=null) header.animateExpandToggle();
-		if (header != null) header.rebind();
+		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
-	}
-
-	public void updateEmojiReactions(Status status, String itemID){
-		EmojiReactionsStatusDisplayItem.Holder reactions=findHolderOfType(itemID, EmojiReactionsStatusDisplayItem.Holder.class);
-		if(reactions != null){
-			reactions.getItem().status.reactions.clear();
-			reactions.getItem().status.reactions.addAll(status.reactions);
-			reactions.rebind();
-		}
 	}
 
 	public void onGapClick(GapStatusDisplayItem.Holder item, boolean downwards){}
@@ -676,6 +674,58 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return null;
 	}
 
+	/**
+	 * Use this as a fallback if findHolderOfType fails to find the ViewHolder.
+	 * It might still be bound but off-screen and therefore not a child of the RecyclerView -
+	 * resulting in the ViewHolder displaying an outdated state once scrolled back into view.
+	 */
+	protected <I extends StatusDisplayItem> int notifyItemChanged(String id, Class<I> type){
+		boolean encounteredParent=false;
+		for(int i=0; i<displayItems.size(); i++){
+			StatusDisplayItem item=displayItems.get(i);
+			boolean idEquals=id.equals(item.parentID);
+			if(!encounteredParent && idEquals) encounteredParent=true; // reached top of the parent
+			else if(encounteredParent && !idEquals) break; // passed by bottom of the parent. man muss ja wissen wann schluss is
+			if(idEquals && type.isInstance(item)){
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	protected <I extends StatusDisplayItem> int notifyItemChangedAfter(StatusDisplayItem afterThis, Class<I> type){
+		int startIndex=displayItems.indexOf(afterThis);
+		if(startIndex == -1) throw new IllegalStateException("notifyItemChangedAfter didn't find the passed StatusDisplayItem");
+		String parentID=afterThis.parentID;
+		for(int i=startIndex; i<displayItems.size(); i++){
+			StatusDisplayItem item=displayItems.get(i);
+			if(!parentID.equals(item.parentID)) break; // didn't find anything
+			if(type.isInstance(item)){
+				// found it
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
+	protected <I extends StatusDisplayItem> int notifyItemChangedBefore(StatusDisplayItem beforeThis, Class<I> type){
+		int startIndex=displayItems.indexOf(beforeThis);
+		if(startIndex == -1) throw new IllegalStateException("notifyItemChangedBefore didn't find the passed StatusDisplayItem");
+		String parentID=beforeThis.parentID;
+		for(int i=startIndex; i>=0; i--){
+			StatusDisplayItem item=displayItems.get(i);
+			if(!parentID.equals(item.parentID)) break; // didn't find anything
+			if(type.isInstance(item)){
+				// found it
+				adapter.notifyItemChanged(i);
+				return i;
+			}
+		}
+		return -1;
+	}
+
 	@Nullable
 	protected <I extends StatusDisplayItem, H extends StatusDisplayItem.Holder<I>> H findHolderOfType(String id, Class<H> type){
 		for(int i=0; i<list.getChildCount(); i++){
@@ -800,6 +850,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 									if(text!=null){
 										text.updateTranslation(true);
 										imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+									}else{
+										notifyItemChanged(itemID, TextStatusDisplayItem.class);
 									}
 								}
 
@@ -811,6 +863,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
 									if(text!=null){
 										text.updateTranslation(true);
+									}else{
+										notifyItemChanged(itemID, TextStatusDisplayItem.class);
 									}
 									new M3AlertDialogBuilder(getActivity())
 											.setTitle(R.string.error)
@@ -827,6 +881,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(text!=null){
 			text.updateTranslation(true);
 			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+		}else{
+			notifyItemChanged(itemID, TextStatusDisplayItem.class);
 		}
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeImageDescriptionFragment.java

@@ -63,7 +63,8 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 		accountID=getArguments().getString("account");
 		attachmentID=getArguments().getString("attachment");
 		themeWrapper=new ContextThemeWrapper(activity, R.style.Theme_Mastodon_Dark);
-		ColorPalette.palettes.get(AccountSessionManager.get(accountID).getLocalPreferences().color).apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
+		ColorPalette.palettes.get(AccountSessionManager.get(accountID).getLocalPreferences().getCurrentColor())
+				.apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
 		setTitle(R.string.add_alt_text);
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java

@@ -91,14 +91,14 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtagName, offset==0 ? null : getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetHashtagTimeline(hashtagName, getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 					}
 				})
 				.exec(accountID);

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -137,11 +138,13 @@ public class HomeTimelineFragment extends StatusListFragment {
 						Status last=result.get(result.size()-1);
 						List<Status> toAdd;
 						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
-							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
+							toAdd=new ArrayList<>(result.subList(0, result.size()-1)); // Remove the already known last post
 						}else{
-							result.get(result.size()-1).hasGapAfter=true;
+							last.hasGapAfter=last.id;
 							toAdd=result;
 						}
+						List<String> existingIds=data.stream().map(Status::getID).collect(Collectors.toList());
+						toAdd.removeIf(s->existingIds.contains(s.getID()));
 						List<Status> toAddUnfiltered=new ArrayList<>(toAdd);
 						AccountSessionManager.get(accountID).filterStatuses(toAdd, getFilterContext());
 						if(!toAdd.isEmpty()){
@@ -176,7 +179,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		String maxID=null;
 		String minID=null;
 		if (downwards) {
-			maxID = item.getItemID();
+			maxID=item.getItem().getMaxID();
 		} else {
 			int gapPos=displayItems.indexOf(gap);
 			StatusDisplayItem nextItem=displayItems.get(gapPos + 1);
@@ -193,12 +196,13 @@ public class HomeTimelineFragment extends StatusListFragment {
 						int gapPos=displayItems.indexOf(gap);
 						if(gapPos==-1)
 							return;
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
 						if(result.isEmpty()){
 							displayItems.remove(gapPos);
 							adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
 							Status gapStatus=getStatusByID(gap.parentID);
 							if(gapStatus!=null){
-								gapStatus.hasGapAfter=false;
+								gapStatus.hasGapAfter=null;
 								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
@@ -211,7 +215,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 										idsBelowGap.add(s.id);
 									}else if(s.id.equals(gap.parentID)){
 										belowGap=true;
-										s.hasGapAfter=false;
+										s.hasGapAfter=null;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
 									}else{
 										gapPostIndex++;
@@ -224,7 +228,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 										break;
 								}
 								if(endIndex==result.size()){
-									result.get(result.size()-1).hasGapAfter=true;
+									Status last=result.get(result.size()-1);
+									last.hasGapAfter=last.id;
 								}else{
 									result=result.subList(0, endIndex);
 								}
@@ -269,7 +274,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 											.filter(s->Objects.equals(s.id, gap.parentID))
 											.findFirst();
 									if (gapStatus.isPresent()) {
-										gapStatus.get().hasGapAfter=false;
+										gapStatus.get().hasGapAfter=null;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus.get()), false);
 									}
 									targetList.clear();

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java

@@ -133,14 +133,14 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
 
     @Override
     protected void doLoadData(int offset, int count) {
-        currentRequest=new GetListTimeline(listID, offset==0 ? null : getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetListTimeline(listID, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this) {
                     @Override
                     public void onSuccess(List<Status> result) {
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
                     }
                 })
                .exec(accountID);

mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java

@@ -238,7 +238,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				continue;
 			Status contentStatus=ntf.status.getContentStatus();
 			if(contentStatus.poll!=null && contentStatus.poll.id.equals(ev.poll.id)){
-				updatePoll(ntf.id, ntf.status, ev.poll);
+				updatePoll(ntf.id, contentStatus, ev.poll);
 			}
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -1177,6 +1177,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		imm.hideSoftInputFromWindow(content.getWindowToken(), 0);
 		V.setVisibilityAnimated(fab, View.VISIBLE);
 		bindHeaderView();
+		V.setVisibilityAnimated(fab, View.VISIBLE);
 	}
 
 	private void saveAndExitEditMode(){

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java

@@ -145,7 +145,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 			}
 			String sep = getString(R.string.sk_separator);
 			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null, s));
-			items.add(1, new DummyStatusDisplayItem(s.id, this));
+			items.add(1, new DummyStatusDisplayItem(s.id, s.getContentStatus().id, this));
 		}
 		return items;
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -28,7 +28,9 @@ import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -174,41 +176,57 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
+	private void iterateRemoveStatus(List<Status> l, String id){
+		Iterator<Status> it=l.iterator();
+		while(it.hasNext()){
+			if(Objects.equals(it.next().getContentStatus().id, id)){
+				it.remove();
+			}
+		}
+	}
+
+	private int removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex, int indexOffset){
+		// 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);
+				// update ancestor to have no descendant anymore
+				if(item.contentStatusID.equals(status.inReplyToId)) item.hasDescendantNeighbor=false;
+			}
+			adapter.notifyItemRangeChanged(ancestorFirstIndex-indexOffset, ancestorLastIndex-ancestorFirstIndex+1);
+		}
+
+		if(index==-1) return 0;
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).contentStatusID.equals(status.id))
+				break;
+		}
+		int count=lastIndex-index;
+		displayItems.subList(index-indexOffset, lastIndex-indexOffset).clear();
+		adapter.notifyItemRangeRemoved(index-indexOffset, lastIndex-index);
+		return count;
+	}
+
 	protected void removeStatus(Status status){
-		data.remove(status);
+		Status contentStatus=status.getContentStatus();
-		preloadedData.remove(status);
+		String id=contentStatus.id;
-		int index=-1, ancestorFirstIndex = -1, ancestorLastIndex = -1;
+		iterateRemoveStatus(data, id);
+		iterateRemoveStatus(preloadedData, id);
+		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
+		int offset=0;
 		for(int i=0;i<displayItems.size();i++){
 			StatusDisplayItem item = displayItems.get(i);
-			if(status.id.equals(item.parentID)){
+			if(id.equals(item.contentStatusID)){
-				index=i;
+				offset+=removeStatusDisplayItems(contentStatus, i, ancestorFirstIndex, ancestorLastIndex, offset);
-				break;
+				ancestorFirstIndex=ancestorLastIndex=-1;
+				continue;
 			}
 			if(item.parentID.equals(status.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}
 		}
-
-		// 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);
-				// update ancestor to have no descendant anymore
-				if (item.parentID.equals(status.inReplyToId)) item.hasDescendantNeighbor = false;
-			}
-			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex - ancestorFirstIndex + 1);
-		}
-
-		if(index==-1)
-			return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).parentID.equals(status.id))
-				break;
-		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/BubbleTimelineFragment.java

@@ -19,7 +19,6 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class BubbleTimelineFragment extends StatusListFragment {
     private DiscoverInfoBannerHelper bannerHelper;
-    private String maxID;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -35,15 +34,14 @@ public class BubbleTimelineFragment extends StatusListFragment {
 
 	@Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetBubbleTimeline(refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetBubbleTimeline(getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
-						if(!empty) maxID=result.get(result.size()-1).id;
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 						bannerHelper.onBannerBecameVisible();
                     }
                 })

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java

@@ -96,8 +96,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override
 			public void onPageSelected(int position){
-				if(position==0)
-					return;
 				Fragment _page=getFragmentForPage(position);
 				if(_page instanceof BaseRecyclerFragment<?> page){
 					if(!page.loaded && !page.isDataLoading())

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java

@@ -18,6 +18,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
+	private int offset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -26,13 +27,15 @@ public class DiscoverPostsFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int o, int count){
+		if(refreshing) offset=0;
 		currentRequest=new GetTrendingStatuses(offset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
 						boolean empty=result.isEmpty();
+						offset+=result.size();
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
 						onDataLoaded(result, !empty);
 						bannerHelper.onBannerBecameVisible();

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java

@@ -29,15 +29,14 @@ public class FederatedTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(false, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
-						if(!empty) maxID=result.get(result.size()-1).id;
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 						bannerHelper.onBannerBecameVisible();
 					}
 				})

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java

@@ -29,15 +29,14 @@ public class LocalTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean empty=result.isEmpty();
+						boolean more=applyMaxID(result);
-						if(!empty) maxID=result.get(result.size()-1).id;
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, !empty);
+						onDataLoaded(result, more);
 						bannerHelper.onBannerBecameVisible();
 					}
 				})

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -83,7 +83,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
+		currentRequest=new GetAccountStatuses(reportAccount.id, getMaxID(), null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
@@ -104,8 +104,8 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		else
 			selectedIDs.add(id);
 		CheckableHeaderStatusDisplayItem.Holder holder=findHolderOfType(id, CheckableHeaderStatusDisplayItem.Holder.class);
-		if(holder!=null)
+		if(holder!=null) holder.rebind();
-			holder.rebind();
+		else notifyItemChanged(id, CheckableHeaderStatusDisplayItem.class);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/FilterWordsFragment.java

@@ -97,7 +97,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
-		fab.setImageResource(R.drawable.ic_add_24px);
+		fab.setImageResource(R.drawable.ic_fluent_add_24_regular);
 		fab.setContentDescription(getString(R.string.add_muted_word));
 		fab.setOnClickListener(v->onFabClick());
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.settings;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.os.Build;
@@ -28,6 +29,8 @@ import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import me.grishka.appkit.FragmentStackActivity;
@@ -38,7 +41,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	private CheckableListItem<Void> revealCWsItem, hideSensitiveMediaItem, interactionCountsItem, emojiInNamesItem;
 
 	// MEGALODON
-	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem, likeIconItem;
+	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem, likeIconItem, underlinedLinksItem;
 	private ListItem<Void> colorItem, publishTextItem, autoRevealCWsItem;
 	private CheckableListItem<Void> pronounsInUserListingsItem, pronounsInTimelinesItem, pronounsInThreadsItem;
 
@@ -52,7 +55,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		lp=s.getLocalPreferences();
 		onDataLoaded(List.of(
 				themeItem=new ListItem<>(R.string.settings_theme, getAppearanceValue(), R.drawable.ic_fluent_weather_moon_24_regular, this::onAppearanceClick),
-				colorItem=new ListItem<>(R.string.sk_settings_color_palette, getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
+				colorItem=new ListItem<>(getString(R.string.sk_settings_color_palette), getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
 				trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, this::onTrueBlackModeClick, true),
 				publishTextItem=new ListItem<>(getString(R.string.sk_settings_publish_button_text), getPublishButtonText(), R.drawable.ic_fluent_send_24_regular, this::onPublishTextClick),
 				autoRevealCWsItem=new ListItem<>(R.string.sk_settings_auto_reveal_equal_spoilers, getAutoRevealSpoilersText(), R.drawable.ic_fluent_eye_24_regular, this::onAutoRevealSpoilersClick),
@@ -69,8 +72,9 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				spectatorModeItem=new CheckableListItem<>(R.string.sk_settings_hide_interaction, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.spectatorMode, R.drawable.ic_fluent_star_off_24_regular, ()->toggleCheckableItem(spectatorModeItem)),
 				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, ()->toggleCheckableItem(hideFabItem)),
 				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, ()->toggleCheckableItem(translateOpenedItem)),
+				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.likeIcon, R.drawable.ic_fluent_heart_24_regular, ()->toggleCheckableItem(likeIconItem)),
+				underlinedLinksItem=new CheckableListItem<>(R.string.sk_settings_underlined_links, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.underlinedLinks, R.drawable.ic_fluent_text_underline_24_regular, ()->toggleCheckableItem(underlinedLinksItem)),
 				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, ()->toggleCheckableItem(disablePillItem)),
-				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, lp.likeIcon, R.drawable.ic_fluent_heart_24_regular, ()->toggleCheckableItem(likeIconItem)),
 				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, ()->toggleCheckableItem(showNavigationLabelsItem), true),
 				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, ()->toggleCheckableItem(pronounsInTimelinesItem)),
 				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, ()->toggleCheckableItem(pronounsInThreadsItem)),
@@ -96,16 +100,14 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	protected void onHidden(){
 		super.onHidden();
 
-		boolean restartPlease=
+		boolean restartPlease=GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked
-				GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked ||
+				|| GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked
-				GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked ||
+				|| GlobalUserPreferences.likeIcon!=likeIconItem.checked;
-				lp.likeIcon!=likeIconItem.checked;
 
 		lp.revealCWs=revealCWsItem.checked;
 		lp.hideSensitiveMedia=hideSensitiveMediaItem.checked;
 		lp.showInteractionCounts=interactionCountsItem.checked;
 		lp.customEmojiInNames=emojiInNamesItem.checked;
-		lp.likeIcon=likeIconItem.checked;
 		lp.save();
 		GlobalUserPreferences.toolbarMarquee=marqueeItem.checked;
 		GlobalUserPreferences.reduceMotion=reduceMotionItem.checked;
@@ -116,6 +118,8 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		GlobalUserPreferences.spectatorMode=spectatorModeItem.checked;
 		GlobalUserPreferences.autoHideFab=hideFabItem.checked;
 		GlobalUserPreferences.translateButtonOpenedOnly=translateOpenedItem.checked;
+		GlobalUserPreferences.likeIcon=likeIconItem.checked;
+		GlobalUserPreferences.underlinedLinks=underlinedLinksItem.checked;
 		GlobalUserPreferences.disableM3PillActiveIndicator=disablePillItem.checked;
 		GlobalUserPreferences.showNavigationLabels=showNavigationLabelsItem.checked;
 		GlobalUserPreferences.displayPronounsInTimelines=pronounsInTimelinesItem.checked;
@@ -134,17 +138,11 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		};
 	}
 
-	private @StringRes int getColorPaletteValue(){
+	private String getColorPaletteValue(){
-		return switch(AccountSessionManager.get(accountID).getLocalPreferences().color){
+		ColorPreference color=AccountSessionManager.get(accountID).getLocalPreferences().color;
-			case MATERIAL3 -> R.string.sk_color_palette_material3;
+		return color==null
-			case PINK -> R.string.sk_color_palette_pink;
+				? getString(R.string.sk_settings_color_palette_default, getString(GlobalUserPreferences.color.getName()))
-			case PURPLE -> R.string.sk_color_palette_purple;
+				: getString(color.getName());
-			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;
-		};
 	}
 
 	private String getPublishButtonText() {
@@ -200,26 +198,40 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	}
 
 	private void onColorClick(){
-		int selected=lp.color.ordinal();
+		boolean multiple=AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
+		int indexOffset=multiple ? 1 : 0;
+		int selected=lp.color==null ? 0 : lp.color.ordinal() + indexOffset;
 		int[] newSelected={selected};
-		String[] names=Arrays.stream(ColorPreference.values()).map(ColorPreference::getName).map(this::getString).toArray(String[]::new);
+		List<String> items=Arrays.stream(ColorPreference.values()).map(ColorPreference::getName).map(this::getString).collect(Collectors.toList());
-		new M3AlertDialogBuilder(getActivity())
+		if(multiple)
-				.setTitle(R.string.sk_settings_color_palette)
+			items.add(0, getString(R.string.sk_settings_color_palette_default, items.get(GlobalUserPreferences.color.ordinal())));
-				.setSingleChoiceItems(names,
+
-						selected, (dlg, item)->newSelected[0]=item)
+		Consumer<Boolean> save=(asDefault)->{
-				.setPositiveButton(R.string.ok, (dlg, item)->{
+			boolean defaultSelected=multiple && newSelected[0]==0;
-					ColorPreference pref=ColorPreference.values()[newSelected[0]];
+			ColorPreference pref=defaultSelected ? null : ColorPreference.values()[newSelected[0]-indexOffset];
 			if(pref!=lp.color){
 				ColorPreference prev=lp.color;
-						lp.color=pref;
+				lp.color=asDefault ? null : pref;
+				lp.save();
+				if((asDefault || !multiple) && pref!=null){
+					GlobalUserPreferences.color=pref;
 					GlobalUserPreferences.save();
-						colorItem.subtitleRes=getColorPaletteValue();
-						rebindItem(colorItem);
-						maybeApplyNewThemeRightNow(null, prev, null);
 				}
-				})
+				colorItem.subtitle=getColorPaletteValue();
-				.setNegativeButton(R.string.cancel, null)
+				rebindItem(colorItem);
-				.show();
+				if(prev==null && pref!=null) restartActivityToApplyNewTheme();
+				else maybeApplyNewThemeRightNow(null, prev, null);
+			}
+		};
+
+		AlertDialog.Builder alert=new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_settings_color_palette)
+				.setSingleChoiceItems(items.toArray(String[]::new),
+						selected, (dlg, item)->newSelected[0]=item)
+				.setPositiveButton(R.string.ok, (dlg, item)->save.accept(false))
+				.setNegativeButton(R.string.cancel, null);
+		if(multiple) alert.setNeutralButton(R.string.sk_set_as_default, (dlg, item)->save.accept(true));
+		alert.show();
 	}
 
 	private void onPublishTextClick(){
@@ -264,14 +276,14 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, ColorPreference prevColor, Boolean prevTrueBlack){
 		if(prevTheme==null) prevTheme=GlobalUserPreferences.theme;
 		if(prevTrueBlack==null) prevTrueBlack=GlobalUserPreferences.trueBlackTheme;
-		if(prevColor==null) prevColor=lp.color;
+		if(prevColor==null) prevColor=lp.getCurrentColor();
 
 		boolean isCurrentDark=prevTheme==GlobalUserPreferences.ThemePreference.DARK ||
 				(prevTheme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewDark=GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK ||
 				(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewBlack=GlobalUserPreferences.trueBlackTheme;
-		if(isCurrentDark!=isNewDark || prevColor!=lp.color || (isNewDark && prevTrueBlack!=isNewBlack)){
+		if(isCurrentDark!=isNewDark || prevColor!=lp.getCurrentColor() || (isNewDark && prevTrueBlack!=isNewBlack)){
 			restartActivityToApplyNewTheme();
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsFiltersFragment.java

@@ -55,7 +55,7 @@ public class SettingsFiltersFragment extends BaseSettingsFragment<Filter>{
 		MergeRecyclerAdapter adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(super.getAdapter());
 		adapter.addAdapter(new GenericListItemsAdapter<>(Collections.singletonList(
-				new ListItem<Void>(R.string.settings_add_filter, 0, R.drawable.ic_add_24px, this::onAddFilterClick)
+				new ListItem<Void>(R.string.settings_add_filter, 0, R.drawable.ic_fluent_add_24_regular, this::onAddFilterClick)
 		)));
 		return adapter;
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java

@@ -55,8 +55,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		onDataLoaded(List.of(
 				new ListItem<>(R.string.settings_behavior, 0, R.drawable.ic_fluent_settings_24_regular, this::onBehaviorClick),
 				new ListItem<>(R.string.settings_display, 0, R.drawable.ic_fluent_color_24_regular, this::onDisplayClick),
-				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_privacy_tip_24px, this::onPrivacyClick),
+				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_fluent_shield_24_regular, this::onPrivacyClick),
-				new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_filter_alt_24px, this::onFiltersClick),
 				new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_fluent_alert_24_regular, this::onNotificationsClick),
 				new ListItem<>(R.string.sk_settings_instance, 0, R.drawable.ic_fluent_server_24_regular, this::onInstanceClick),
 				new ListItem<>(getString(R.string.about_app, getString(R.string.sk_app_name)), null, R.drawable.ic_fluent_info_24_regular, this::onAboutClick, null, 0, true),
@@ -65,7 +64,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(account.domain);
 		if (!instance.isAkkoma())
-			data.add(2, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
+			data.add(3, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
 
 		if(BuildConfig.DEBUG || BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta")){
 			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, ()->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));

mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsPrivacyFragment.java

@@ -18,8 +18,8 @@ public class SettingsPrivacyFragment extends BaseSettingsFragment<Void>{
 		setTitle(R.string.settings_privacy);
 		Account self=AccountSessionManager.get(accountID).self;
 		onDataLoaded(List.of(
-			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_thumbs_up_down_24px, ()->toggleCheckableItem(discoverableItem)),
+			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_fluent_thumb_like_dislike_24_regular, ()->toggleCheckableItem(discoverableItem)),
-			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_search_24px, ()->toggleCheckableItem(indexableItem))
+			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_fluent_search_24_regular, ()->toggleCheckableItem(indexableItem))
 		));
 		if(self.source.indexable==null)
 			indexableItem.isEnabled=false;

mastodon/src/main/java/org/joinmastodon/android/model/Status.java

@@ -100,7 +100,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public transient boolean spoilerRevealed;
 	public transient boolean sensitiveRevealed;
 	public transient boolean textExpanded, textExpandable;
-	public transient boolean hasGapAfter;
+	public transient String hasGapAfter;
 	private transient String strippedText;
 	public transient TranslationState translationState=TranslationState.HIDDEN;
 	public transient Translation translation;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java

@@ -43,7 +43,7 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	public CharSequence parsedName, parsedBio;
 
 	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Account account, Notification notification){
-		super(parentID, parentFragment);
+		super(parentID, null, parentFragment);
 		this.account=account;
 		this.notification=notification;
 		avaRequest=new UrlImageLoaderRequest(

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountStatusDisplayItem.java

@@ -14,7 +14,7 @@ public class AccountStatusDisplayItem extends StatusDisplayItem{
 	public final AccountViewModel account;
 
 	public AccountStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account){
-		super(parentID, parentFragment);
+		super(parentID, null, parentFragment);
 		this.account=new AccountViewModel(account, parentFragment.getAccountID());
 	}
 

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java

@@ -37,7 +37,7 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 	private final ImageLoaderRequest imageRequest;
 
 	public AudioStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, Attachment attachment){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		this.attachment=attachment;
 		imageRequest=new UrlImageLoaderRequest(TextUtils.isEmpty(attachment.previewUrl) ? status.account.avatarStatic : attachment.previewUrl, V.dp(100), V.dp(100));

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/DummyStatusDisplayItem.java

@@ -12,8 +12,8 @@ import me.grishka.appkit.utils.V;
 
 public class DummyStatusDisplayItem extends StatusDisplayItem {
 
-	public DummyStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment) {
+	public DummyStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment) {
-		super(parentID, parentFragment);
+		super(parentID, contentStatusID, parentFragment);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/EmojiReactionsStatusDisplayItem.java

@@ -65,7 +65,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 	private static final float ALPHA_DISABLED=0.55f;
 
     public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, String accountID, boolean hideEmpty, boolean forAnnouncement) {
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		this.hideEmpty=hideEmpty;
 		this.forAnnouncement=forAnnouncement;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java

@@ -13,6 +13,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -41,7 +42,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT);
 
 	public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Status status){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}
@@ -76,9 +77,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(ExtendedFooterStatusDisplayItem item){
 			Status s=item.status;
-			AccountSession session=AccountSessionManager.get(item.accountID);
+			favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
-			boolean like=session!=null && session.getLocalPreferences().likeIcon;
-			favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(like ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
 			favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount));
 			reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int) (s.reblogsCount % 1000), s.reblogsCount));
 			reblogs.setVisibility(s.visibility != StatusPrivacy.DIRECT ? View.VISIBLE : View.GONE);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java

@@ -1,29 +1,22 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Card;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-
 public class FileStatusDisplayItem extends StatusDisplayItem{
     private final Attachment attachment;
 
-    public FileStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
+    public FileStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
-        super(parentID, parentFragment);
+        super(parentID, contentStatusID, parentFragment);
         this.attachment=attachment;
     }
 

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java

@@ -43,7 +43,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public boolean hideCounts;
 
 	public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}
@@ -133,13 +133,10 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			boolean condenseBottom = !item.isMainStatus && item.hasDescendantNeighbor &&
 					!nextIsWarning;
 
-
-			AccountSession session=AccountSessionManager.get(item.accountID);
-			boolean like=session!=null && session.getLocalPreferences().likeIcon;
 			ColorStateList color=item.parentFragment.getResources().getColorStateList(
-					like ? R.color.like_icon : R.color.favorite_icon, item.parentFragment.getContext().getTheme()
+					GlobalUserPreferences.likeIcon ? R.color.like_icon : R.color.favorite_icon, item.parentFragment.getContext().getTheme()
 			);
-			favIcon.setImageResource(like ? R.drawable.ic_fluent_heart_24_selector : R.drawable.ic_fluent_star_24_selector);
+			favIcon.setImageResource(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_selector : R.drawable.ic_fluent_star_24_selector);
 			favIcon.setImageTintList(color);
 			favorites.setTextColor(color);
 
@@ -175,7 +172,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			} else if (action == MotionEvent.ACTION_DOWN) {
 				longClickPerformed = false;
 				touchingView = v;
-				v.setPivotX(V.sp(28));
 				v.animate().scaleX(0.85f).scaleY(0.85f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(75).start();
 				if (disabled) return true;
 				v.postDelayed(longClickRunnable, ViewConfiguration.getLongPressTimeout());
@@ -321,7 +317,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 					R.string.sk_favorite_as,
 					R.string.sk_favorited_as,
 					R.string.sk_already_favorited,
-					R.drawable.ic_fluent_star_28_regular
+					GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_28_regular : R.drawable.ic_fluent_star_28_regular
 			);
 			return true;
 		}

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/GapStatusDisplayItem.java

@@ -18,13 +18,17 @@ import me.grishka.appkit.utils.V;
 
 public class GapStatusDisplayItem extends StatusDisplayItem{
 	public boolean loading;
-	private Status status;
+	private final Status status;
 
 	public GapStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status){
-		super(parentID, parentFragment);
+		super(parentID, null, parentFragment);
 		this.status=status;
 	}
 
+	public String getMaxID(){
+		return status.hasGapAfter;
+	}
+
 	@Override
 	public Type getType(){
 		return Type.GAP;
@@ -54,6 +58,8 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 			if(!item.loading){
 				progressBottom.setVisibility(View.GONE);
 				progressTop.setVisibility(View.GONE);
+				textTop.setAlpha(1);
+				textBottom.setAlpha(1);
 			}
 			top.setClickable(!item.loading);
 			bottom.setClickable(!item.loading);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java

@@ -14,7 +14,7 @@ public class HashtagStatusDisplayItem extends StatusDisplayItem{
 	public final Hashtag tag;
 
 	public HashtagStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Hashtag tag){
-		super(parentID, parentFragment);
+		super(parentID, null, parentFragment);
 		this.tag=tag;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java

@@ -86,7 +86,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private Consumer<String> consumeReadAnnouncement;
 
 	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, CharSequence extraText, Notification notification, ScheduledStatus scheduledStatus){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		AccountSession session = AccountSessionManager.get(accountID);
 		user=scheduledStatus != null ? session.self : user;
 		this.user=user;
@@ -377,21 +377,32 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				markAsRead.setVisibility(View.GONE);
 			}
 
-			if (item.status == null || !item.status.textExpandable) {
+			bindCollapseButton();
-				collapseBtn.setVisibility(View.GONE);
-			} else {
-				String collapseText = item.parentFragment.getString(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
-				collapseBtn.setVisibility(item.status.textExpandable ? View.VISIBLE : View.GONE);
-				collapseBtn.setContentDescription(collapseText);
-				if (GlobalUserPreferences.reduceMotion) collapseBtnIcon.setScaleY(item.status.textExpanded ? -1 : 1);
-				else collapseBtnIcon.animate().scaleY(item.status.textExpanded ? -1 : 1).start();
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) collapseBtn.setTooltipText(collapseText);
-			}
 
 			itemView.setPaddingRelative(itemView.getPaddingStart(), itemView.getPaddingTop(),
 					item.inset ? V.dp(10) : V.dp(4), itemView.getPaddingBottom());
 		}
 
+		public void bindCollapseButton(){
+			boolean expandable=item.status!=null && item.status.textExpandable;
+			collapseBtn.setVisibility(expandable ? View.VISIBLE : View.GONE);
+			if(expandable) {
+				bindCollapseButtonText();
+				collapseBtnIcon.setScaleY(item.status.textExpanded ? -1 : 1);
+			}
+		}
+
+		private void bindCollapseButtonText(){
+			String collapseText = item.parentFragment.getString(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
+			collapseBtn.setContentDescription(collapseText);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) collapseBtn.setTooltipText(collapseText);
+		}
+
+		public void animateExpandToggle(){
+			bindCollapseButtonText();
+			collapseBtnIcon.animate().scaleY(item.status.textExpanded ? -1 : 1).start();
+		}
+
 		public void animateVisibilityToggle(boolean visible){
 			visibility.animate()
 					.alpha(visible ? 1 : 0)

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java

@@ -28,7 +28,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 	private final UrlImageLoaderRequest imgRequest;
 
 	public LinkCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		if(status.card.image!=null)
 			imgRequest=new UrlImageLoaderRequest(status.card.image, 1000, 1000);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java

@@ -57,7 +57,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 	public String sensitiveTitle;
 
 	public MediaGridStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, PhotoLayoutHelper.TiledLayoutResult tiledLayout, List<Attachment> attachments, Status status){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.tiledLayout=tiledLayout;
 		this.viewPool=parentFragment.getAttachmentViewsPool();
 		this.attachments=attachments;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import static org.joinmastodon.android.MastodonApp.context;
-import static org.joinmastodon.android.model.Notification.Type.PLEROMA_EMOJI_REACTION;
 import static org.joinmastodon.android.ui.utils.UiUtils.generateFormattedString;
 
 import android.annotation.SuppressLint;
@@ -9,7 +8,6 @@ import android.app.Activity;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -20,9 +18,11 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.NotificationsListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Notification;
@@ -49,7 +49,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	private final CharSequence timestamp;
 
 	public NotificationHeaderStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Notification notification, String accountID){
-		super(parentID, parentFragment);
+		super(parentID, notification.status!=null ? notification.status.getContentStatus().id : null, parentFragment);
 		this.notification=notification;
 		this.accountID=accountID;
 		this.timestamp=notification.createdAt==null ? null : UiUtils.formatRelativeTimestamp(context, notification.createdAt);
@@ -113,7 +113,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<NotificationHeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final ImageView icon, avatar;
+		private final ImageView icon, avatar, deleteNotification;
 		private final TextView text, timestamp;
 		private final int selectableItemBackground;
 
@@ -123,9 +123,15 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 			avatar=findViewById(R.id.avatar);
 			text=findViewById(R.id.text);
 			timestamp=findViewById(R.id.timestamp);
+			deleteNotification=findViewById(R.id.delete_notification);
 
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(8));
 			avatar.setClipToOutline(true);
+			deleteNotification.setOnClickListener(v->UiUtils.confirmDeleteNotification(activity, item.parentFragment.getAccountID(), item.notification, ()->{
+				if (item.parentFragment instanceof NotificationsListFragment fragment) {
+					fragment.removeNotification(item.notification);
+				}
+			}));
 
 			itemView.setOnClickListener(this::onItemClick);
 			TypedValue outValue = new TypedValue();
@@ -158,7 +164,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 			timestamp.setText(item.timestamp);
 			avatar.setVisibility(item.notification.type==Notification.Type.POLL ? View.GONE : View.VISIBLE);
 			icon.setImageResource(switch(item.notification.type){
-				case FAVORITE -> R.drawable.ic_fluent_star_24_filled;
+				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_filled : R.drawable.ic_fluent_star_24_filled;
 				case REBLOG -> R.drawable.ic_fluent_arrow_repeat_all_24_filled;
 				case FOLLOW, FOLLOW_REQUEST -> R.drawable.ic_fluent_person_add_24_filled;
 				case POLL -> R.drawable.ic_fluent_poll_24_filled;
@@ -169,15 +175,18 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 				default -> throw new IllegalStateException("Unexpected value: "+item.notification.type);
 			});
 			icon.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(item.parentFragment.getActivity(), switch(item.notification.type){
-				case FAVORITE -> R.attr.colorFavorite;
+				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.attr.colorLike : R.attr.colorFavorite;
 				case REBLOG -> R.attr.colorBoost;
 				case POLL -> R.attr.colorPoll;
 				default -> android.R.attr.colorAccent;
 			})));
+			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification != null ? View.VISIBLE : View.GONE);
 			itemView.setBackgroundResource(item.notification.type != Notification.Type.POLL
 					&& item.notification.type != Notification.Type.REPORT ?
 					selectableItemBackground : 0);
 			itemView.setClickable(item.notification.type != Notification.Type.POLL);
+			itemView.setPaddingRelative(itemView.getPaddingStart(), itemView.getPaddingTop(),
+					GlobalUserPreferences.enableDeleteNotifications ? V.dp(4) : V.dp(16), itemView.getPaddingBottom());
 		}
 
 		public void onItemClick(View v) {

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java

@@ -15,8 +15,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 public class PollFooterStatusDisplayItem extends StatusDisplayItem{
 	public final Poll poll;
 
-	public PollFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Poll poll){
+	public PollFooterStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment parentFragment, Poll poll){
-		super(parentID, parentFragment);
+		super(parentID, contentStatusID, parentFragment);
 		this.poll=poll;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java

@@ -31,8 +31,8 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 	private final int optionIndex;
 	public final Poll poll;
 
-	public PollOptionStatusDisplayItem(String parentID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){
+	public PollOptionStatusDisplayItem(String parentID, String contentStatusID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){
-		super(parentID, parentFragment);
+		super(parentID, contentStatusID, parentFragment);
 		this.optionIndex=optionIndex;
 		option=poll.options.get(optionIndex);
 		this.poll=poll;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java

@@ -52,7 +52,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText, Status status) {
-		super(parentID, parentFragment);
+		super(parentID, status.getContentStatus().id, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		if(AccountSessionManager.get(parentFragment.getAccountID()).getLocalPreferences().customEmojiInNames)
 			HtmlParser.parseCustomEmoji(ssb, emojis);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SectionHeaderStatusDisplayItem.java

@@ -14,7 +14,7 @@ public class SectionHeaderStatusDisplayItem extends StatusDisplayItem{
 	public final Runnable onButtonClick;
 
 	public SectionHeaderStatusDisplayItem(BaseStatusListFragment parentFragment, String title, String buttonText, Runnable onButtonClick){
-		super("", parentFragment);
+		super("", null, parentFragment);
 		this.title=title;
 		this.buttonText=buttonText;
 		this.onButtonClick=onButtonClick;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/SpoilerStatusDisplayItem.java

@@ -32,7 +32,7 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{
 	private final int attachmentCount;
 
 	public SpoilerStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, String title, Status statusForContent, Type type){
-		super(parentID, parentFragment);
+		super(parentID, statusForContent.id, parentFragment);
 		this.status=statusForContent;
 		this.type=type;
 		this.attachmentCount=statusForContent.mediaAttachments.size();

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -30,6 +30,7 @@ import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
+import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
@@ -52,7 +53,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public abstract class StatusDisplayItem{
-	public final String parentID;
+	public final String parentID, contentStatusID;
 	public final BaseStatusListFragment<?> parentFragment;
 	public boolean inset;
 	public int index;
@@ -82,8 +83,9 @@ public abstract class StatusDisplayItem{
 		this.isDirectDescendant = isDirectDescendant;
 	}
 
-	public StatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment){
+	public StatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment){
 		this.parentID=parentID;
+		this.contentStatusID=contentStatusID;
 		this.parentFragment=parentFragment;
 	}
 
@@ -145,7 +147,7 @@ public abstract class StatusDisplayItem{
 		Status statusForContent=status.getContentStatus();
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
+		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus s ? s : null;
 
 		HeaderStatusDisplayItem header=null;
 		boolean hideCounts=!AccountSessionManager.get(accountID).getLocalPreferences().showInteractionCounts;
@@ -201,7 +203,7 @@ public abstract class StatusDisplayItem{
 			if((flags & FLAG_CHECKABLE)!=0)
 				items.add(header=new CheckableHeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null));
 			else
-				items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, null, scheduledStatus));
+				items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, parentObject instanceof Notification n ? n : null, scheduledStatus));
 		}
 
 		LegacyFilter applyingFilter=null;
@@ -244,7 +246,7 @@ public abstract class StatusDisplayItem{
 		}else if(!hasSpoiler && header!=null){
 			header.needBottomPadding=true;
 		}else if(hasSpoiler){
-			contentItems.add(new DummyStatusDisplayItem(parentID, fragment));
+			contentItems.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment));
 		}
 
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
@@ -268,11 +270,11 @@ public abstract class StatusDisplayItem{
 				contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
 			}
 			if(att.type==Attachment.Type.UNKNOWN){
-				contentItems.add(new FileStatusDisplayItem(parentID, fragment, att));
+				contentItems.add(new FileStatusDisplayItem(parentID, statusForContent.id, fragment, att));
 			}
 		}
 		if(statusForContent.poll!=null){
-			buildPollItems(parentID, fragment, statusForContent.poll, contentItems);
+			buildPollItems(parentID, statusForContent.id, fragment, statusForContent.poll, contentItems);
 		}
 		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){
 			contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
@@ -292,14 +294,14 @@ public abstract class StatusDisplayItem{
 			footer=new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID);
 			footer.hideCounts=hideCounts;
 			items.add(footer);
-			if(status.hasGapAfter && !(fragment instanceof ThreadFragment))
+			if(status.hasGapAfter!=null && !(fragment instanceof ThreadFragment))
 				items.add(new GapStatusDisplayItem(parentID, fragment, status));
 		}
 		int i=1;
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
 		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
-			items.add(new DummyStatusDisplayItem(parentID, fragment));
+			items.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment));
 			// in case we ever need the dummy to display a margin for the media grid again:
 			// (i forgot why we apparently don't need this anymore)
 			// !contentItems.isEmpty() && contentItems
@@ -320,13 +322,13 @@ public abstract class StatusDisplayItem{
 				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
 	}
 
-	public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
+	public static void buildPollItems(String parentID, String contentStatusID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
 		int i=0;
 		for(Poll.Option opt:poll.options){
-			items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment));
+			items.add(new PollOptionStatusDisplayItem(parentID, contentStatusID, poll, i, fragment));
 			i++;
 		}
-		items.add(new PollFooterStatusDisplayItem(parentID, fragment, poll));
+		items.add(new PollFooterStatusDisplayItem(parentID, contentStatusID, fragment, poll));
 	}
 
 	public enum Type{

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java

@@ -42,7 +42,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	public final Status status;
 
 	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.text=text;
 		this.status=status;
 		this.disableTranslate=disableTranslate;

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java

@@ -19,7 +19,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 	public LegacyFilter applyingFilter;
 
 	public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, List<StatusDisplayItem> filteredItems, LegacyFilter applyingFilter){
-		super(parentID, parentFragment);
+		super(parentID, status.id, parentFragment);
 		this.status=status;
 		this.filteredItems = filteredItems;
 		this.applyingFilter = applyingFilter;

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java

@@ -564,7 +564,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		if(player==null || !player.isPlaying())
 			return;
 		player.pause();
-		videoPlayPauseButton.setImageResource(R.drawable.ic_play_24);
+		videoPlayPauseButton.setImageResource(R.drawable.ic_fluent_play_24_filled);
 		videoPlayPauseButton.setContentDescription(activity.getString(R.string.play));
 		stopUpdatingVideoPosition();
 		windowView.removeCallbacks(uiAutoHider);
@@ -575,7 +575,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		if(player==null || player.isPlaying())
 			return;
 		player.start();
-		videoPlayPauseButton.setImageResource(R.drawable.ic_pause_24);
+		videoPlayPauseButton.setImageResource(R.drawable.ic_fluent_pause_24_filled);
 		videoPlayPauseButton.setContentDescription(activity.getString(R.string.pause));
 		startUpdatingVideoPosition(player);
 	}
@@ -940,7 +940,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 
 		@Override
 		public void onCompletion(MediaPlayer mp){
-			videoPlayPauseButton.setImageResource(R.drawable.ic_play_24);
+			videoPlayPauseButton.setImageResource(R.drawable.ic_fluent_play_24_filled);
 			videoPlayPauseButton.setContentDescription(activity.getString(R.string.play));
 			stopUpdatingVideoPosition();
 			if(!uiVisible)

mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java

@@ -210,6 +210,7 @@ public class HtmlParser{
 	}
 
 	public static void parseCustomEmoji(SpannableStringBuilder ssb, List<Emoji> emojis){
+		if(emojis==null) return;
 		Map<String, Emoji> emojiByCode =
 			emojis.stream()
 			.collect(

mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java

@@ -5,6 +5,7 @@ import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 import android.view.View;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
@@ -34,7 +35,7 @@ public class LinkSpan extends CharacterStyle {
 	@Override
 	public void updateDrawState(TextPaint tp) {
 		tp.setColor(color=tp.linkColor);
-		tp.setUnderlineText(true);
+		tp.setUnderlineText(GlobalUserPreferences.underlinedLinks);
 	}
 	
 	public void onClick(Context context){
@@ -45,7 +46,7 @@ public class LinkSpan extends CharacterStyle {
 				if(linkObject instanceof Hashtag ht)
 					UiUtils.openHashtagTimeline(context, accountID, ht);
 				else
-					UiUtils.openHashtagTimeline(context, accountID, text);
+					UiUtils.openHashtagTimeline(context, accountID, link);
 			}
 			case CUSTOM -> listener.onLinkClick(this);
 		}

mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

@@ -68,6 +68,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.StatusInteractionController;
@@ -630,19 +631,25 @@ public class UiUtils {
 	}
 
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft) {
+		Status s=status.getContentStatus();
 		showConfirmationAlert(activity,
 				forRedraft ? R.string.sk_confirm_delete_and_redraft_title : R.string.confirm_delete_title,
 				forRedraft ? R.string.sk_confirm_delete_and_redraft : R.string.confirm_delete,
 				forRedraft ? R.string.sk_delete_and_redraft : R.string.delete,
 				forRedraft ? R.drawable.ic_fluent_arrow_clockwise_28_regular : R.drawable.ic_fluent_delete_28_regular,
-				() -> new DeleteStatus(status.id)
+				() -> new DeleteStatus(s.id)
 						.setCallback(new Callback<>() {
 							@Override
 							public void onSuccess(Status result) {
 								resultCallback.accept(result);
-								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
+								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));
 								}
+							}
 
 							@Override
 							public void onError(ErrorResponse error) {
@@ -974,7 +981,7 @@ public class UiUtils {
 		});
 
 		AccountLocalPreferences prefs=session!=null ? session.getLocalPreferences() : null;
-		AccountLocalPreferences.ColorPreference color=prefs != null ? prefs.color : AccountLocalPreferences.ColorPreference.MATERIAL3;
+		AccountLocalPreferences.ColorPreference color=prefs!=null ? prefs.getCurrentColor() : AccountLocalPreferences.ColorPreference.MATERIAL3;
 		ColorPalette palette = ColorPalette.palettes.get(color);
 		if (palette != null) palette.apply(context, theme);
 
@@ -1711,7 +1718,7 @@ public class UiUtils {
 	}
 
 	public static Optional<String> extractPronouns(Context context, @Nullable Account account) {
-		if (account == null) return Optional.empty();
+		if (account==null || account.fields==null) return Optional.empty();
 		String localizedPronouns=context.getString(R.string.sk_pronouns_label).toLowerCase();
 
 		// higher = worse. the lowest number wins. also i'm sorry for writing this

mastodon/src/main/java/org/joinmastodon/android/ui/views/TabBar.java

@@ -1,9 +1,11 @@
 package org.joinmastodon.android.ui.views;
 
 import android.content.Context;
+import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import java.util.function.IntConsumer;
 import java.util.function.IntPredicate;
@@ -45,9 +47,7 @@ public class TabBar extends LinearLayout{
 		listener.accept(v.getId());
 		if(v.getId()==selectedTabID)
 			return;
-		findViewById(selectedTabID).setSelected(false);
+		selectTab(v.getId());
-		v.setSelected(true);
-		selectedTabID=v.getId();
 	}
 
 	private boolean onChildLongClick(View v){
@@ -60,8 +60,17 @@ public class TabBar extends LinearLayout{
 	}
 
 	public void selectTab(int id){
-		findViewById(selectedTabID).setSelected(false);
+		toggleSelected(selectedTabID, false);
 		selectedTabID=id;
-		findViewById(selectedTabID).setSelected(true);
+		toggleSelected(id, true);
+	}
+
+	private void toggleSelected(int selectedTabID, boolean selected){
+		LinearLayout tab=findViewById(selectedTabID);
+		tab.setSelected(selected);
+		View v=tab.findViewWithTag("label");
+		if(v instanceof TextView text){
+			text.setTypeface(Typeface.create(text.getTypeface(), selected ? Typeface.BOLD : Typeface.NORMAL));
+		}
 	}
 }

mastodon/src/main/res/drawable/ic_actionmode_close.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="?colorM3OnPrimary"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>

mastodon/src/main/res/drawable/ic_add_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,19V13H5V11H11V5H13V11H19V13H13V19Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_add_photo_alternate_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,3V5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19H19Q19,19 19,19Q19,19 19,19V10H21V19Q21,19.825 20.413,20.413Q19.825,21 19,21H5Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3ZM19,3V5H21V7H19V9H17V7H15V5H17V3ZM6,17H18L14.25,12L11.25,16L9,13ZM5,5V8V10V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_add_photo_alternate_48px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M29.45,6V9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39H39Q39,39 39,39Q39,39 39,39V18.6H42V39Q42,40.2 41.1,41.1Q40.2,42 39,42H9Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6ZM38,6V10.05H42.05V13.05H38V17.1H35V13.05H30.95V10.05H35V6ZM12,33.9H36L28.8,24.3L22.45,32.65L17.75,26.45ZM9,9V14.55V18.6V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_add_photo_alternate_48px_dark_on_surface.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:fillColor="@color/m3_sys_dark_on_surface"
-      android:pathData="M29.45,6V9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39H39Q39,39 39,39Q39,39 39,39V18.6H42V39Q42,40.2 41.1,41.1Q40.2,42 39,42H9Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6ZM38,6V10.05H42.05V13.05H38V17.1H35V13.05H30.95V10.05H35V6ZM12,33.9H36L28.8,24.3L22.45,32.65L17.75,26.45ZM9,9V14.55V18.6V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_alt_24px.xml

@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,16V10.167C3,9.836 3.11,9.564 3.33,9.35C3.57,9.117 3.86,9 4.2,9H7.8C8.14,9 8.42,9.117 8.64,9.35C8.88,9.564 9,9.836 9,10.167V16H7.2V14.25H4.8V16H3ZM4.8,12.5H7.2V10.75H4.8V12.5Z"
-      android:fillColor="#49454F"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M17.1,10.75V16H18.9V10.75H21V9H15V10.75H17.1Z"
-      android:fillColor="#49454F"/>
-  <path
-      android:pathData="M10.2,9V16H15V14.25H12V9H10.2Z"
-      android:fillColor="#49454F"/>
-</vector>

mastodon/src/main/res/drawable/ic_alternate_email_20px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,18.333Q8.271,18.333 6.75,17.677Q5.229,17.021 4.104,15.896Q2.979,14.771 2.323,13.25Q1.667,11.729 1.667,10Q1.667,8.271 2.323,6.75Q2.979,5.229 4.104,4.104Q5.229,2.979 6.75,2.323Q8.271,1.667 10,1.667Q11.729,1.667 13.25,2.323Q14.771,2.979 15.896,4.104Q17.021,5.229 17.677,6.75Q18.333,8.271 18.333,10V11.271Q18.333,12.5 17.49,13.354Q16.646,14.208 15.417,14.208Q14.688,14.208 14.042,13.906Q13.396,13.604 12.958,13.042Q12.375,13.625 11.604,13.927Q10.833,14.229 10,14.229Q8.229,14.229 7,13Q5.771,11.771 5.771,10Q5.771,8.229 7,7Q8.229,5.771 10,5.771Q11.771,5.771 13,7Q14.229,8.229 14.229,10V11.271Q14.229,11.75 14.583,12.104Q14.938,12.458 15.417,12.458Q15.896,12.458 16.24,12.104Q16.583,11.75 16.583,11.271V10Q16.583,7.25 14.667,5.333Q12.75,3.417 10,3.417Q7.25,3.417 5.333,5.333Q3.417,7.25 3.417,10Q3.417,12.75 5.333,14.667Q7.25,16.583 10,16.583H14.125V18.333ZM10,12.479Q11.042,12.479 11.76,11.76Q12.479,11.042 12.479,10Q12.479,8.958 11.76,8.24Q11.042,7.521 10,7.521Q8.958,7.521 8.24,8.24Q7.521,8.958 7.521,10Q7.521,11.042 8.24,11.76Q8.958,12.479 10,12.479Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_animation_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,22Q7.55,22 6.275,21.45Q5,20.9 4.05,19.95Q3.1,19 2.55,17.725Q2,16.45 2,15Q2,12.975 3.05,11.3Q4.1,9.625 5.8,8.75Q6.3,7.775 7.038,7.037Q7.775,6.3 8.75,5.8Q9.575,4.1 11.275,3.05Q12.975,2 15,2Q16.45,2 17.725,2.55Q19,3.1 19.95,4.05Q20.9,5 21.45,6.275Q22,7.55 22,9Q22,11.125 20.95,12.75Q19.9,14.375 18.2,15.25Q17.7,16.225 16.962,16.962Q16.225,17.7 15.25,18.2Q14.375,19.9 12.7,20.95Q11.025,22 9,22ZM9,20Q9.825,20 10.588,19.75Q11.35,19.5 12,19Q10.55,19 9.275,18.45Q8,17.9 7.05,16.95Q6.1,16 5.55,14.725Q5,13.45 5,12Q4.5,12.65 4.25,13.412Q4,14.175 4,15Q4,16.05 4.4,16.95Q4.8,17.85 5.475,18.525Q6.15,19.2 7.05,19.6Q7.95,20 9,20ZM12,17Q12.825,17 13.613,16.75Q14.4,16.5 15.05,16Q13.575,16 12.3,15.438Q11.025,14.875 10.075,13.925Q9.125,12.975 8.562,11.7Q8,10.425 8,8.95Q7.5,9.6 7.25,10.387Q7,11.175 7,12Q7,13.05 7.388,13.95Q7.775,14.85 8.475,15.525Q9.15,16.225 10.05,16.613Q10.95,17 12,17ZM15,14Q15.45,14 15.863,13.925Q16.275,13.85 16.7,13.7Q17.25,12.2 16.863,10.812Q16.475,9.425 15.525,8.475Q14.575,7.525 13.188,7.137Q11.8,6.75 10.3,7.3Q10.15,7.725 10.075,8.137Q10,8.55 10,9Q10,10.05 10.387,10.95Q10.775,11.85 11.475,12.525Q12.15,13.225 13.05,13.613Q13.95,14 15,14ZM19,12.05Q19.5,11.4 19.75,10.612Q20,9.825 20,9Q20,7.95 19.613,7.05Q19.225,6.15 18.525,5.475Q17.85,4.775 16.95,4.387Q16.05,4 15,4Q14.125,4 13.363,4.25Q12.6,4.5 11.95,5Q13.425,5 14.7,5.562Q15.975,6.125 16.925,7.075Q17.875,8.025 18.438,9.3Q19,10.575 19,12.05Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_apk_install_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V4Q2,3.175 2.588,2.587Q3.175,2 4,2H12L18,8V12.25H16V9H11V4H4Q4,4 4,4Q4,4 4,4V20Q4,20 4,20Q4,20 4,20H15V22ZM4,20V12.25V9V4Q4,4 4,4Q4,4 4,4V20Q4,20 4,20Q4,20 4,20ZM5,19Q5.1,17.775 5.75,16.75Q6.4,15.725 7.45,15.125L6.5,13.425Q6.5,13.4 6.6,13.05Q6.725,13 6.838,13Q6.95,13 7,13.125L7.975,14.875Q8.475,14.675 8.975,14.562Q9.475,14.45 10,14.45Q10.525,14.45 11.025,14.562Q11.525,14.675 12.025,14.875L13,13.125Q13,13.125 13.375,13.025Q13.5,13.075 13.525,13.2Q13.55,13.325 13.5,13.425L12.55,15.125Q13.6,15.725 14.25,16.75Q14.9,17.775 15,19ZM7.75,17.5Q7.95,17.5 8.1,17.35Q8.25,17.2 8.25,17Q8.25,16.8 8.1,16.65Q7.95,16.5 7.75,16.5Q7.55,16.5 7.4,16.65Q7.25,16.8 7.25,17Q7.25,17.2 7.4,17.35Q7.55,17.5 7.75,17.5ZM12.25,17.5Q12.45,17.5 12.6,17.35Q12.75,17.2 12.75,17Q12.75,16.8 12.6,16.65Q12.45,16.5 12.25,16.5Q12.05,16.5 11.9,16.65Q11.75,16.8 11.75,17Q11.75,17.2 11.9,17.35Q12.05,17.5 12.25,17.5ZM20,22 L16,18 17.4,16.575 19,18.15V14H21V18.15L22.6,16.575L24,18Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_app_badging_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q507,80 533,83.5Q559,87 584,94Q568,109 555.5,127Q543,145 535,165Q521,163 507.5,161.5Q494,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Q614,800 707,707Q800,614 800,480Q800,466 798.5,452.5Q797,439 795,425Q815,417 833,404.5Q851,392 866,376Q873,401 876.5,427Q880,453 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480ZM720,360Q670,360 635,325Q600,290 600,240Q600,190 635,155Q670,120 720,120Q770,120 805,155Q840,190 840,240Q840,290 805,325Q770,360 720,360Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_backspace_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.4,16 L14,13.4 16.6,16 18,14.6 15.4,12 18,9.4 16.6,8 14,10.6 11.4,8 10,9.4 12.6,12 10,14.6ZM3,12 L7.35,5.85Q7.625,5.45 8.062,5.225Q8.5,5 9,5H19Q19.825,5 20.413,5.588Q21,6.175 21,7V17Q21,17.825 20.413,18.413Q19.825,19 19,19H9Q8.5,19 8.062,18.775Q7.625,18.55 7.35,18.15ZM5.45,12 L9,17Q9,17 9,17Q9,17 9,17H19Q19,17 19,17Q19,17 19,17V7Q19,7 19,7Q19,7 19,7H9Q9,7 9,7Q9,7 9,7ZM19,12V7Q19,7 19,7Q19,7 19,7Q19,7 19,7Q19,7 19,7V17Q19,17 19,17Q19,17 19,17Q19,17 19,17Q19,17 19,17Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_block_20px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,18Q8.354,18 6.896,17.375Q5.438,16.75 4.344,15.656Q3.25,14.562 2.625,13.104Q2,11.646 2,10Q2,8.333 2.625,6.885Q3.25,5.438 4.344,4.344Q5.438,3.25 6.896,2.625Q8.354,2 10,2Q11.667,2 13.115,2.625Q14.562,3.25 15.656,4.344Q16.75,5.438 17.375,6.885Q18,8.333 18,10Q18,11.646 17.375,13.104Q16.75,14.562 15.656,15.656Q14.562,16.75 13.115,17.375Q11.667,18 10,18ZM10,16.5Q12.708,16.5 14.604,14.604Q16.5,12.708 16.5,10Q16.5,8.854 16.125,7.833Q15.75,6.812 15.083,5.979L5.979,15.083Q6.812,15.75 7.833,16.125Q8.854,16.5 10,16.5ZM4.917,14.021 L14.021,4.917Q13.188,4.25 12.167,3.875Q11.146,3.5 10,3.5Q7.292,3.5 5.396,5.396Q3.5,7.292 3.5,10Q3.5,11.146 3.875,12.167Q4.25,13.188 4.917,14.021Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_bookmark_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,17.95 L12,15.8 17,17.95V5Q17,5 17,5Q17,5 17,5H7Q7,5 7,5Q7,5 7,5ZM5,21V5Q5,4.175 5.588,3.587Q6.175,3 7,3H17Q17.825,3 18.413,3.587Q19,4.175 19,5V21L12,18ZM17,5H12H7Q7,5 7,5Q7,5 7,5H17Q17,5 17,5Q17,5 17,5Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_check_20px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8.229,14.062 L4.708,10.521 5.75,9.479 8.229,11.938 14.25,5.938 15.292,7Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_check_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9.55,18 L3.85,12.3 5.275,10.875 9.55,15.15 18.725,5.975 20.15,7.4Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_check_small_16px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.333,11.729 L3,8.396 4.062,7.333 6.333,9.604 11.938,4 13,5.062Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_compose_cw.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:drawable="@drawable/ic_warning_fill1_24px"/>
-	<item android:drawable="@drawable/ic_warning_24px"/>
-</selector>

mastodon/src/main/res/drawable/ic_compose_emoji.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:drawable="@drawable/ic_mood_fill1_24px"/>
-	<item android:drawable="@drawable/ic_mood_24px"/>
-</selector>

mastodon/src/main/res/drawable/ic_compose_poll.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true" android:drawable="@drawable/ic_insert_chart_fill1_24px"/>
-	<item android:drawable="@drawable/ic_insert_chart_24px"/>
-</selector>

mastodon/src/main/res/drawable/ic_dark_mode_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,21Q8.25,21 5.625,18.375Q3,15.75 3,12Q3,8.25 5.625,5.625Q8.25,3 12,3Q12.35,3 12.688,3.025Q13.025,3.05 13.35,3.1Q12.325,3.825 11.713,4.987Q11.1,6.15 11.1,7.5Q11.1,9.75 12.675,11.325Q14.25,12.9 16.5,12.9Q17.875,12.9 19.025,12.287Q20.175,11.675 20.9,10.65Q20.95,10.975 20.975,11.312Q21,11.65 21,12Q21,15.75 18.375,18.375Q15.75,21 12,21ZM12,19Q14.2,19 15.95,17.788Q17.7,16.575 18.5,14.625Q18,14.75 17.5,14.825Q17,14.9 16.5,14.9Q13.425,14.9 11.262,12.738Q9.1,10.575 9.1,7.5Q9.1,7 9.175,6.5Q9.25,6 9.375,5.5Q7.425,6.3 6.213,8.05Q5,9.8 5,12Q5,14.9 7.05,16.95Q9.1,19 12,19ZM11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_dns_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7.5,6Q6.875,6 6.438,6.438Q6,6.875 6,7.5Q6,8.125 6.438,8.562Q6.875,9 7.5,9Q8.125,9 8.562,8.562Q9,8.125 9,7.5Q9,6.875 8.562,6.438Q8.125,6 7.5,6ZM7.5,16Q6.875,16 6.438,16.438Q6,16.875 6,17.5Q6,18.125 6.438,18.562Q6.875,19 7.5,19Q8.125,19 8.562,18.562Q9,18.125 9,17.5Q9,16.875 8.562,16.438Q8.125,16 7.5,16ZM4,3H20Q20.425,3 20.712,3.287Q21,3.575 21,4V11Q21,11.425 20.712,11.712Q20.425,12 20,12H4Q3.575,12 3.288,11.712Q3,11.425 3,11V4Q3,3.575 3.288,3.287Q3.575,3 4,3ZM5,5V10H19V5ZM4,13H20Q20.425,13 20.712,13.287Q21,13.575 21,14V21Q21,21.425 20.712,21.712Q20.425,22 20,22H4Q3.575,22 3.288,21.712Q3,21.425 3,21V14Q3,13.575 3.288,13.287Q3.575,13 4,13ZM5,15V20H19V15ZM5,5V10ZM5,15V20Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_download_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V15H6V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V15H20V18Q20,18.825 19.413,19.413Q18.825,20 18,20ZM12,16 L7,11 8.4,9.55 11,12.15V4H13V12.15L15.6,9.55L17,11Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_drag_indicator_20px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7.5,16Q6.875,16 6.438,15.562Q6,15.125 6,14.5Q6,13.875 6.438,13.438Q6.875,13 7.5,13Q8.125,13 8.562,13.438Q9,13.875 9,14.5Q9,15.125 8.562,15.562Q8.125,16 7.5,16ZM12.5,16Q11.875,16 11.438,15.562Q11,15.125 11,14.5Q11,13.875 11.438,13.438Q11.875,13 12.5,13Q13.125,13 13.562,13.438Q14,13.875 14,14.5Q14,15.125 13.562,15.562Q13.125,16 12.5,16ZM7.5,11.5Q6.875,11.5 6.438,11.062Q6,10.625 6,10Q6,9.375 6.438,8.938Q6.875,8.5 7.5,8.5Q8.125,8.5 8.562,8.938Q9,9.375 9,10Q9,10.625 8.562,11.062Q8.125,11.5 7.5,11.5ZM12.5,11.5Q11.875,11.5 11.438,11.062Q11,10.625 11,10Q11,9.375 11.438,8.938Q11.875,8.5 12.5,8.5Q13.125,8.5 13.562,8.938Q14,9.375 14,10Q14,10.625 13.562,11.062Q13.125,11.5 12.5,11.5ZM7.5,7Q6.875,7 6.438,6.562Q6,6.125 6,5.5Q6,4.875 6.438,4.438Q6.875,4 7.5,4Q8.125,4 8.562,4.438Q9,4.875 9,5.5Q9,6.125 8.562,6.562Q8.125,7 7.5,7ZM12.5,7Q11.875,7 11.438,6.562Q11,6.125 11,5.5Q11,4.875 11.438,4.438Q11.875,4 12.5,4Q13.125,4 13.562,4.438Q14,4.875 14,5.5Q14,6.125 13.562,6.562Q13.125,7 12.5,7Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_edit_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,19H6.4L15.025,10.375L13.625,8.975L5,17.6ZM19.3,8.925 L15.05,4.725 16.45,3.325Q17.025,2.75 17.863,2.75Q18.7,2.75 19.275,3.325L20.675,4.725Q21.25,5.3 21.275,6.113Q21.3,6.925 20.725,7.5ZM17.85,10.4 L7.25,21H3V16.75L13.6,6.15ZM14.325,9.675 L13.625,8.975 15.025,10.375Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_emoticon_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M260,680Q234,680 217,663Q200,646 200,620Q200,595 217,577.5Q234,560 260,560Q285,560 302.5,577.5Q320,595 320,620Q320,646 302.5,663Q285,680 260,680ZM260,400Q234,400 217,383Q200,366 200,340Q200,315 217,297.5Q234,280 260,280Q285,280 302.5,297.5Q320,315 320,340Q320,366 302.5,383Q285,400 260,400ZM400,520L400,440L560,440L560,520L400,520ZM688,720L622,676Q650,633 665,583.5Q680,534 680,480Q680,414 658.5,356Q637,298 598,251L659,200Q707,257 733.5,328.5Q760,400 760,480Q760,547 741,607.5Q722,668 688,720Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_feed_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H16L21,8V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V9H15V5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM7,17H17V15H7ZM7,9H12V7H7ZM7,13H17V11H7ZM5,5V9V5V9V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_filter_alt_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,13V19Q14,19.425 13.713,19.712Q13.425,20 13,20H11Q10.575,20 10.288,19.712Q10,19.425 10,19V13L4.2,5.6Q3.825,5.1 4.088,4.55Q4.35,4 5,4H19Q19.65,4 19.913,4.55Q20.175,5.1 19.8,5.6ZM12,12.3 L16.95,6H7.05ZM12,12.3Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_fluent_heart_28_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M14.604 6.193c2.601-2.932 7.184-2.922 9.772 0.02 2.263 2.574 2.148 6.459-0.263 8.893l-9.58 9.672C14.392 24.92 14.2 25 14 25s-0.392-0.08-0.533-0.222l-9.58-9.672c-2.41-2.434-2.526-6.32-0.263-8.892 2.588-2.943 7.17-2.953 9.772-0.021L14 6.873l0.604-0.68zm8.646 1.011c-1.993-2.266-5.521-2.274-7.524-0.016L14.56 8.501C14.419 8.66 14.214 8.753 14 8.753c-0.215 0-0.419-0.092-0.561-0.252l-1.165-1.313c-2.003-2.257-5.53-2.25-7.524 0.016-1.742 1.981-1.653 4.973 0.203 6.847L14 23.184l9.047-9.133c1.856-1.874 1.945-4.866 0.203-6.847z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_password_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M11.78 10.22c-0.293-0.293-0.768-0.293-1.06 0-0.293 0.293-0.293 0.768 0 1.06L11.44 12l-0.72 0.72c-0.293 0.293-0.293 0.767 0 1.06 0.293 0.293 0.767 0.293 1.06 0l0.72-0.72 0.72 0.72c0.293 0.292 0.768 0.292 1.06-0.001 0.293-0.293 0.293-0.768 0-1.06l-0.719-0.72 0.72-0.719c0.292-0.293 0.292-0.767 0-1.06-0.294-0.293-0.768-0.293-1.061 0l-0.72 0.72-0.72-0.72zm-6.56 0c0.292-0.293 0.767-0.293 1.06 0L7 10.94l0.72-0.72c0.293-0.293 0.767-0.293 1.06 0 0.293 0.293 0.293 0.767 0 1.06L8.061 12l0.72 0.718c0.292 0.293 0.292 0.768 0 1.061-0.293 0.293-0.768 0.293-1.061 0L7 13.06l-0.72 0.72c-0.293 0.293-0.767 0.293-1.06 0-0.293-0.293-0.293-0.767 0-1.06L5.94 12l-0.72-0.72c-0.293-0.292-0.293-0.767 0-1.06zM16.5 13.5c-0.414 0-0.75 0.336-0.75 0.75S16.086 15 16.5 15h1.75c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75H16.5zM5.25 5C3.453 5 2 6.455 2 8.25v7.5C2 17.545 3.455 19 5.25 19h13.5c1.795 0 3.25-1.455 3.25-3.25v-7.5C22 6.455 20.546 5 18.75 5H5.25zM3.5 8.25c0-0.967 0.783-1.75 1.75-1.75h13.5c0.967 0 1.75 0.783 1.75 1.75v7.5c0 0.966-0.784 1.75-1.75 1.75H5.25c-0.966 0-1.75-0.784-1.75-1.75v-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_pause_24_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.746 3c-0.966 0-1.75 0.784-1.75 1.75v14.5c0 0.966 0.784 1.75 1.75 1.75h3.5c0.967 0 1.75-0.784 1.75-1.75V4.75c0-0.966-0.783-1.75-1.75-1.75h-3.5zm9 0c-0.966 0-1.75 0.784-1.75 1.75v14.5c0 0.966 0.784 1.75 1.75 1.75h3.5c0.967 0 1.75-0.784 1.75-1.75V4.75c0-0.966-0.783-1.75-1.75-1.75h-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_play_24_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5 5.274c0-1.707 1.826-2.792 3.325-1.977l12.362 6.726c1.566 0.853 1.566 3.101 0 3.953L8.325 20.702C6.826 21.518 5 20.432 5 18.726V5.274z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_re_order_dots_vertical_20_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M6.5 6C7.328 6 8 5.328 8 4.5S7.328 3 6.5 3 5 3.672 5 4.5 5.672 6 6.5 6zm0 5C7.328 11 8 10.328 8 9.5S7.328 8 6.5 8 5 8.672 5 9.5 5.672 11 6.5 11zM8 14.5C8 15.328 7.328 16 6.5 16S5 15.328 5 14.5 5.672 13 6.5 13 8 13.672 8 14.5zM13.5 6C14.328 6 15 5.328 15 4.5S14.328 3 13.5 3 12 3.672 12 4.5 12.672 6 13.5 6zM15 9.5c0 0.828-0.672 1.5-1.5 1.5S12 10.328 12 9.5 12.672 8 13.5 8 15 8.672 15 9.5zM13.5 16c0.828 0 1.5-0.672 1.5-1.5S14.328 13 13.5 13 12 13.672 12 14.5s0.672 1.5 1.5 1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_search_20_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M8.5 3C11.538 3 14 5.462 14 8.5c0 1.248-0.416 2.4-1.117 3.323l4.147 4.147c0.293 0.293 0.293 0.767 0 1.06-0.266 0.267-0.683 0.29-0.976 0.073L15.97 17.03l-4.147-4.147C10.899 13.584 9.748 14 8.5 14 5.462 14 3 11.538 3 8.5S5.462 3 8.5 3zm0 1.5c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_text_underline_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.75 19h10.5c0.414 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743L17.25 20.5H6.75C6.336 20.5 6 20.164 6 19.75c0-0.38 0.282-0.694 0.648-0.743L6.75 19h10.5-10.5zm10.5-15c0.38 0 0.694 0.282 0.743 0.648L18 4.75v6c0 4.394-2.063 6.75-6.003 6.75-3.855 0-5.91-2.255-5.994-6.466L6 10.75v-6C6 4.336 6.336 4 6.75 4c0.38 0 0.694 0.282 0.743 0.648L7.5 4.75v6C7.497 14.358 8.934 16 11.997 16c2.985 0 4.428-1.56 4.5-4.976L16.5 10.75v-6C16.5 4.336 16.836 4 17.25 4z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_thumb_like_dislike_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.04 3.177C6.305 2.56 7.104 1.772 8.22 2.062c0.7 0.181 1.204 0.6 1.489 1.177 0.248 0.503 0.29 1.05 0.3 1.467 0.008 0.396-0.056 0.828-0.138 1.214h0.194c1.558 0 2.822 1.432 2.332 2.99l-1.15 3.655c-0.465 1.482-2.1 2.25-3.577 1.816l-4.512-1.323c-0.7-0.205-1.284-0.708-1.557-1.387l-0.438-1.088c-0.439-1.09 0.04-2.286 1.055-2.845l1.542-0.85 0.03-0.022c0.051-0.04 0.143-0.12 0.263-0.246 0.239-0.251 0.596-0.7 0.962-1.428 0.178-0.353 0.327-0.63 0.459-0.874V4.316c0.213-0.395 0.378-0.7 0.566-1.14zM4.49 8.199L2.942 9.052c-0.395 0.217-0.524 0.63-0.388 0.97l0.439 1.09c0.09 0.226 0.299 0.422 0.587 0.507l4.512 1.323c0.77 0.226 1.527-0.198 1.725-0.827l1.15-3.654c0.143-0.456-0.21-1.041-0.902-1.041H8.898c-0.238 0-0.462-0.114-0.604-0.306-0.141-0.192-0.183-0.44-0.112-0.667 0.052-0.167 0.105-0.352 0.153-0.542 0.106-0.423 0.18-0.85 0.174-1.168C8.5 4.37 8.459 4.098 8.364 3.903 8.279 3.732 8.137 3.59 7.843 3.513 7.75 3.49 7.679 3.507 7.608 3.552 7.52 3.605 7.45 3.695 7.418 3.77c-0.216 0.502-0.407 0.857-0.62 1.25L6.796 5.028c-0.131 0.245-0.272 0.506-0.44 0.839-0.432 0.859-0.874 1.428-1.214 1.787-0.17 0.18-0.315 0.306-0.42 0.388C4.67 8.084 4.627 8.115 4.596 8.136L4.59 8.139 4.575 8.15 4.563 8.156 4.555 8.162H4.554C4.533 8.176 4.512 8.188 4.49 8.2zm13.47 12.624c-0.265 0.616-1.064 1.405-2.18 1.115-0.7-0.181-1.204-0.6-1.489-1.177-0.248-0.503-0.29-1.05-0.3-1.467-0.008-0.396 0.056-0.828 0.138-1.214h-0.194c-1.558 0-2.822-1.432-2.332-2.99l1.15-3.655c0.465-1.482 2.1-2.25 3.577-1.816l4.512 1.323c0.7 0.205 1.284 0.708 1.557 1.387l0.438 1.088c0.439 1.09-0.04 2.286-1.055 2.845l-1.542 0.85-0.03 0.023c-0.051 0.04-0.143 0.118-0.263 0.245-0.239 0.251-0.596 0.7-0.962 1.428-0.178 0.353-0.327 0.63-0.459 0.874v0.002c-0.213 0.395-0.378 0.7-0.566 1.14zm1.55-5.022l1.548-0.853c0.395-0.217 0.524-0.63 0.387-0.97l-0.438-1.09c-0.09-0.226-0.299-0.422-0.587-0.507l-4.512-1.323c-0.77-0.226-1.527 0.198-1.725 0.827l-1.15 3.654c-0.143 0.456 0.21 1.041 0.902 1.041h1.167c0.238 0 0.462 0.114 0.604 0.306 0.141 0.192 0.183 0.44 0.112 0.667-0.052 0.167-0.105 0.352-0.153 0.542-0.106 0.423-0.18 0.85-0.174 1.168 0.008 0.366 0.05 0.639 0.145 0.834 0.085 0.17 0.227 0.313 0.521 0.39 0.093 0.023 0.164 0.007 0.235-0.038 0.087-0.054 0.158-0.144 0.19-0.219 0.216-0.502 0.407-0.857 0.62-1.25l0.003-0.007c0.132-0.245 0.272-0.506 0.44-0.839 0.432-0.859 0.874-1.428 1.214-1.787 0.17-0.18 0.315-0.306 0.42-0.389 0.052-0.041 0.095-0.072 0.126-0.093l0.006-0.004 0.014-0.01 0.012-0.008 0.008-0.005h0.001c0.021-0.014 0.042-0.026 0.064-0.037z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_follow_selector.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_bookmark_24_filled" android:state_activated="true"/>
-    <item android:drawable="@drawable/ic_fluent_bookmark_24_filled" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_fluent_bookmark_24_filled" android:state_selected="true"/>
-    <item android:drawable="@drawable/ic_fluent_bookmark_24_regular"/>
-</selector>

mastodon/src/main/res/drawable/ic_group_20px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M2,16V14.083Q2,13.542 2.26,13.094Q2.521,12.646 2.979,12.375Q4.104,11.708 5.365,11.354Q6.625,11 8,11Q9.375,11 10.635,11.354Q11.896,11.708 13.021,12.375Q13.479,12.646 13.74,13.094Q14,13.542 14,14.083V16ZM15.5,16V14.083Q15.5,13.208 15.094,12.458Q14.688,11.708 14,11.229Q14.812,11.396 15.573,11.677Q16.333,11.958 17.021,12.375Q17.479,12.646 17.74,13.094Q18,13.542 18,14.083V16ZM8,10Q6.75,10 5.875,9.125Q5,8.25 5,7Q5,5.75 5.875,4.875Q6.75,4 8,4Q9.25,4 10.125,4.875Q11,5.75 11,7Q11,8.25 10.125,9.125Q9.25,10 8,10ZM12,10Q11.833,10 11.688,9.99Q11.542,9.979 11.375,9.938Q11.896,9.333 12.198,8.594Q12.5,7.854 12.5,7Q12.5,6.146 12.198,5.406Q11.896,4.667 11.375,4.062Q11.542,4.021 11.688,4.01Q11.833,4 12,4Q13.25,4 14.125,4.875Q15,5.75 15,7Q15,8.25 14.125,9.125Q13.25,10 12,10ZM3.5,14.5H12.5V14.083Q12.5,13.958 12.438,13.844Q12.375,13.729 12.271,13.667Q11.292,13.104 10.208,12.802Q9.125,12.5 8,12.5Q6.875,12.5 5.792,12.792Q4.708,13.083 3.729,13.667Q3.625,13.729 3.562,13.833Q3.5,13.938 3.5,14.083ZM8,8.5Q8.625,8.5 9.062,8.062Q9.5,7.625 9.5,7Q9.5,6.375 9.062,5.938Q8.625,5.5 8,5.5Q7.375,5.5 6.938,5.938Q6.5,6.375 6.5,7Q6.5,7.625 6.938,8.062Q7.375,8.5 8,8.5ZM8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5Q8,14.5 8,14.5ZM8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Q8,7 8,7Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_group_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M1,20V17.2Q1,16.35 1.438,15.637Q1.875,14.925 2.6,14.55Q4.15,13.775 5.75,13.387Q7.35,13 9,13Q10.65,13 12.25,13.387Q13.85,13.775 15.4,14.55Q16.125,14.925 16.562,15.637Q17,16.35 17,17.2V20ZM19,20V17Q19,15.9 18.388,14.887Q17.775,13.875 16.65,13.15Q17.925,13.3 19.05,13.662Q20.175,14.025 21.15,14.55Q22.05,15.05 22.525,15.662Q23,16.275 23,17V20ZM9,12Q7.35,12 6.175,10.825Q5,9.65 5,8Q5,6.35 6.175,5.175Q7.35,4 9,4Q10.65,4 11.825,5.175Q13,6.35 13,8Q13,9.65 11.825,10.825Q10.65,12 9,12ZM15,12Q14.725,12 14.3,11.938Q13.875,11.875 13.6,11.8Q14.275,11 14.637,10.025Q15,9.05 15,8Q15,6.95 14.637,5.975Q14.275,5 13.6,4.2Q13.95,4.075 14.3,4.037Q14.65,4 15,4Q16.65,4 17.825,5.175Q19,6.35 19,8Q19,9.65 17.825,10.825Q16.65,12 15,12ZM3,18H15V17.2Q15,16.925 14.863,16.7Q14.725,16.475 14.5,16.35Q13.15,15.675 11.775,15.337Q10.4,15 9,15Q7.6,15 6.225,15.337Q4.85,15.675 3.5,16.35Q3.275,16.475 3.138,16.7Q3,16.925 3,17.2ZM9,10Q9.825,10 10.413,9.412Q11,8.825 11,8Q11,7.175 10.413,6.588Q9.825,6 9,6Q8.175,6 7.588,6.588Q7,7.175 7,8Q7,8.825 7.588,9.412Q8.175,10 9,10ZM9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18Q9,18 9,18ZM9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Q9,8 9,8Z"/>
-</vector>

mastodon/src/main/res/drawable/ic_group_add_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12.5,11.95Q13.225,11.15 13.613,10.125Q14,9.1 14,8Q14,6.9 13.613,5.875Q13.225,4.85 12.5,4.05Q14,4.25 15,5.375Q16,6.5 16,8Q16,9.5 15,10.625Q14,11.75 12.5,11.95ZM18,20V17Q18,16.1 17.6,15.288Q17.2,14.475 16.55,13.85Q17.825,14.3 18.913,15.012Q20,15.725 20,17V20ZM20,13V11H18V9H20V7H22V9H24V11H22V13ZM8,12Q6.35,12 5.175,10.825Q4,9.65 4,8Q4,6.35 5.175,5.175Q6.35,4 8,4Q9.65,4 10.825,5.175Q12,6.35 12,8Q12,9.65 10.825,10.825Q9.65,12 8,12ZM0,20V17.2Q0,16.35 0.438,15.637Q0.875,14.925 1.6,14.55Q3.15,13.775 4.75,13.387Q6.35,13 8,13Q9.65,13 11.25,13.387Q12.85,13.775 14.4,14.55Q15.125,14.925 15.562,15.637Q16,16.35 16,17.2V20ZM8,10Q8.825,10 9.413,9.412Q10,8.825 10,8Q10,7.175 9.413,6.588Q8.825,6 8,6Q7.175,6 6.588,6.588Q6,7.175 6,8Q6,8.825 6.588,9.412Q7.175,10 8,10ZM2,18H14V17.2Q14,16.925 13.863,16.7Q13.725,16.475 13.5,16.35Q12.15,15.675 10.775,15.337Q9.4,15 8,15Q6.6,15 5.225,15.337Q3.85,15.675 2.5,16.35Q2.275,16.475 2.138,16.7Q2,16.925 2,17.2ZM8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8Q8,8 8,8ZM8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Q8,18 8,18Z"/>
-</vector>