refactor code

mastodon/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 104
-		versionName "2.1.6+fork.104"
+		versionCode 100
+		versionName "2.1.4+fork.100"
 		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']
     }
@@ -70,7 +70,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.14'
+	implementation 'me.grishka.appkit:appkit:1.2.9'
 	implementation 'com.google.code.gson:gson:2.9.0'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

mastodon/src/main/assets/blocks.txt

@@ -1,43 +1,56 @@
 13bells.com
 1611.social
 4aem.com
-5dollah.click
 adachi.party
-adtension.com
+anime.website
 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
-cachapa.xyz
-canary.fedinuke.example.com
-catgirl.life
+bungle.online
 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
-djsumdog.com
+eatthebugs.social
 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
@@ -46,34 +59,42 @@ gleasonator.com
 glee.li
 glindr.org
 goyim.app
-h5q.net
+goyslop.cafe
 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
-morale.ch
+moa.st
 mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
+neckbeard.xyz
 needs.vodka
 neenster.org
 nicecrew.digital
@@ -82,18 +103,18 @@ noagendasocial.com
 noagendasocial.nl
 noagendatube.com
 nobodyhasthe.biz
-norwoodzero.net
-nyanide.com
+nukem.biz
+obo.sh
 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
@@ -102,18 +123,17 @@ prospeech.space
 quodverum.com
 r18.social
 rakket.app
-rapemeat.express
 rapemeat.solutions
-rayci.st
+rdrama.cc
 rebelbase.site
+retardedniggers.forsale
+rojogato.com
 ryona.agency
-sad.cab
 schwartzwelt.xyz
 seal.cafe
-shaw.app
 shigusegubu.club
 shitpost.cloud
-shortstacksran.ch
+shota.house
 silliness.observer
 skinheads.eu
 skinheads.io
@@ -128,20 +148,23 @@ 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
-usualsuspects.lol
+urchan.org
 varishangout.net
-vtuberfan.social
+whinge.house
+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_fluent_pause_24_filled : R.drawable.ic_fluent_play_24_filled),
+			bldr.addAction(new Notification.Action.Builder(Icon.createWithResource(this, isPlaying ? R.drawable.ic_pause_24 : R.drawable.ic_play_24),
 						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/ExternalShareActivity.java

@@ -32,6 +32,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
+
 			Optional<String> text = Optional.ofNullable(getIntent().getStringExtra(Intent.EXTRA_TEXT));
 			Optional<Pair<String, Optional<String>>> fediHandle = text.flatMap(UiUtils::parseFediverseHandle);
 			boolean isFediUrl = text.map(UiUtils::looksLikeFediverseUrl).orElse(false);

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,6 +25,8 @@ 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";
 
@@ -55,14 +57,12 @@ public class GlobalUserPreferences{
 	public static boolean allowRemoteLoading;
 	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
+	public static ColorPreference color;
 	public static boolean disableM3PillActiveIndicator;
 	public static boolean showNavigationLabels;
 	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);
@@ -123,9 +123,6 @@ 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)
@@ -136,11 +133,14 @@ public class GlobalUserPreferences{
 					.apply();
 		}
 
-		int migrationLevel=prefs.getInt("migrationLevel", BuildConfig.VERSION_CODE);
-		if(migrationLevel < 61)
-			migrateToUpstreamVersion61();
-		if(migrationLevel < BuildConfig.VERSION_CODE)
-			prefs.edit().putInt("migrationLevel", BuildConfig.VERSION_CODE).apply();
+		try {
+			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
+		} catch (IllegalArgumentException|ClassCastException ignored) {
+			// invalid color name or color was previously saved as integer
+			color=ColorPreference.PINK;
+		}
+
+		if(prefs.getInt("migrationLevel", 0) < 61) migrateToUpstreamVersion61();
 	}
 
 	public static void save(){
@@ -171,6 +171,7 @@ public class GlobalUserPreferences{
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
+				.putString("color", color.name())
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
 				.putBoolean("forwardReportDefault", forwardReportDefault)
@@ -181,33 +182,9 @@ public class GlobalUserPreferences{
 				.putBoolean("displayPronounsInUserListings", displayPronounsInUserListings)
 				.putBoolean("overlayMedia", overlayMedia)
 				.putBoolean("showSuicideHelp", showSuicideHelp)
-				.putBoolean("underlinedLinks", underlinedLinks)
-				.putString("color", color.name())
-				.putBoolean("likeIcon", likeIcon)
 				.apply();
 	}
 
-	public enum ThemePreference{
-		AUTO,
-		LIGHT,
-		DARK
-	}
-
-	public enum AutoRevealMode {
-		NEVER,
-		THREADS,
-		DISCUSSIONS
-	}
-
-	public enum PrefixRepliesMode {
-		NEVER,
-		ALWAYS,
-		TO_OTHERS
-	}
-
-
-	//region preferences migrations
-
 	private static void migrateToUpstreamVersion61(){
 		Log.d(TAG, "Migrating preferences to upstream version 61!!");
 
@@ -254,8 +231,49 @@ public class GlobalUserPreferences{
 
 			localPrefs.save();
 		}
+
+		prefs.edit().putInt("migrationLevel", 61).apply();
 	}
 
-	//endregion
+	public enum ColorPreference{
+		MATERIAL3,
+		PINK,
+		PURPLE,
+		GREEN,
+		BLUE,
+		BROWN,
+		RED,
+		YELLOW;
 
+		public @StringRes int getName() {
+			return switch(this){
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case RED -> R.string.sk_color_palette_red;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+			};
+		}
+	}
+
+	public enum ThemePreference{
+		AUTO,
+		LIGHT,
+		DARK
+	}
+
+	public enum AutoRevealMode {
+		NEVER,
+		THREADS,
+		DISCUSSIONS
+	}
+
+	public enum PrefixRepliesMode {
+		NEVER,
+		ALWAYS,
+		TO_OTHERS
+	}
 }

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

@@ -39,8 +39,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
-		AccountSession session=getCurrentSession();
-		UiUtils.setUserPreferredTheme(this, session);
+		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 
 		if(savedInstanceState==null){
@@ -218,36 +217,6 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
 	}
 
-	public AccountSession getCurrentSession(){
-		AccountSession session;
-		Bundle args=new Bundle();
-		Intent intent=getIntent();
-		if(intent.hasExtra("fromExternalShare")) {
-			return AccountSessionManager.getInstance()
-					.getAccount(intent.getStringExtra("account"));
-		}
-
-		boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
-		boolean hasNotification = intent.hasExtra("notification");
-		if(fromNotification){
-			String accountID=intent.getStringExtra("accountID");
-			try{
-				session=AccountSessionManager.getInstance().getAccount(accountID);
-				if(!hasNotification) args.putString("tab", "notifications");
-			}catch(IllegalStateException x){
-				session=AccountSessionManager.getInstance().getLastActiveAccount();
-			}
-		}else{
-			session=AccountSessionManager.getInstance().getLastActiveAccount();
-		}
-		return session;
-	}
-
-	public void restartActivity(){
-		finish();
-		startActivity(new Intent(this, MainActivity.class));
-	}
-
 	public void restartHomeFragment(){
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
 			showFragmentClearingBackStack(new CustomWelcomeFragment());

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

@@ -14,6 +14,7 @@ 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;
 
@@ -32,6 +33,7 @@ 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;
 
@@ -210,7 +212,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
-				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_filled : R.drawable.ic_fluent_star_24_filled;
+				case FAVORITE -> 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,7 +26,6 @@ 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;
@@ -70,11 +69,12 @@ 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.id : null;
+								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
+							AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
@@ -86,7 +86,9 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result, result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								ArrayList<Status> filtered=new ArrayList<>(result);
+								AccountSessionManager.get(accountID).filterStatuses(filtered, FilterContext.HOME);
+								callback.onSuccess(new CacheablePaginatedResponse<>(filtered, result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -114,7 +116,7 @@ public class CacheController{
 				values.put("id", s.id);
 				values.put("json", MastodonAPIController.gson.toJson(s));
 				int flags=0;
-				if(Objects.equals(s.hasGapAfter, s.id))
+				if(s.hasGapAfter)
 					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(false);
+			registerAllAccountsForPush(true); // TODO: revert this before release
 			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 final String maxID;
+    private 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

@@ -6,14 +6,9 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.SharedPreferences;
 
-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;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -41,14 +36,12 @@ public class AccountLocalPreferences{
 	public String publishButtonText;
 	public String timelineReplyVisibility; // akkoma-only
 	public boolean keepOnlyLatestNotification;
+
 	public boolean emojiReactionsEnabled;
 	public ShowEmojiReactions showEmojiReactions;
-	public ColorPreference color;
-	public ArrayList<Emoji> recentCustomEmoji;
 
 	private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
 	private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
-	private final static Type recentCustomEmojiType=new TypeToken<ArrayList<Emoji>>() {}.getType();
 
 	public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		this.prefs=prefs;
@@ -73,8 +66,6 @@ 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=prefs.contains("color") ? ColorPreference.valueOf(prefs.getString("color", null)) : null;
-		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());
 	}
 
 	public long getNotificationsPauseEndTime(){
@@ -85,10 +76,6 @@ 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)
@@ -112,35 +99,9 @@ public class AccountLocalPreferences{
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
 				.putString("showEmojiReactions", showEmojiReactions.name())
-				.putString("color", color!=null ? color.name() : null)
-				.putString("recentCustomEmoji", gson.toJson(recentCustomEmoji))
 				.apply();
 	}
 
-	public enum ColorPreference{
-		MATERIAL3,
-		PINK,
-		PURPLE,
-		GREEN,
-		BLUE,
-		BROWN,
-		RED,
-		YELLOW;
-
-		public @StringRes int getName() {
-			return switch(this){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-			};
-		}
-	}
-
 	public enum ShowEmojiReactions{
 		HIDE_EMPTY,
 		ONLY_OPENED,

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

@@ -40,6 +40,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -254,71 +255,52 @@ public class AccountSession{
 		filterStatusContainingObjects(objects, extractor, context, null);
 	}
 
-	private boolean statusIsOnOwnProfile(Status s, Account profile){
-		return self != null && profile != null && s.account != null
-				&& Objects.equals(self.id, profile.id) && Objects.equals(self.id, s.account.id);
-	}
-
-	private boolean isFilteredType(Status s){
-		return (!localPreferences.showReplies && s.inReplyToId != null)
-				|| (!localPreferences.showBoosts && s.reblog != null);
-	}
-
 	public <T> void filterStatusContainingObjects(List<T> objects, Function<T, Status> extractor, FilterContext context, Account profile){
-		if(!localPreferences.serverSideFiltersSupported) for(T obj:objects){
-			Status s=extractor.apply(obj);
-			if(s!=null && s.filtered!=null){
-				localPreferences.serverSideFiltersSupported=true;
-				localPreferences.save();
-				break;
-			}
-		}
+		Predicate<Status> statusIsOnOwnProfile = (s) -> self != null && profile != null && s.account != null
+				&& Objects.equals(self.id, profile.id) && Objects.equals(self.id, s.account.id);
 
-		List<T> removeUs=new ArrayList<>();
-		for(int i=0; i<objects.size(); i++){
-			T o=objects.get(i);
-			if(filterStatusContainingObject(o, extractor, context, profile)){
+		if(getLocalPreferences().serverSideFiltersSupported){
+			// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
+			objects.removeIf(o->{
 				Status s=extractor.apply(o);
-				removeUs.add(o);
-				if(s!=null && s.hasGapAfter!=null && i>0){
-					// oops, we're about to remove an item that has a gap after...
-					// 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;
-						}
-					}
-				}
-			}
-		}
-		objects.removeAll(removeUs);
-	}
-
-	public <T> boolean filterStatusContainingObject(T object, Function<T, Status> extractor, FilterContext context, Account profile){
-		Status s=extractor.apply(object);
 				if(s==null)
 					return false;
-		// don't hide own posts in own profile
-		if(statusIsOnOwnProfile(s, profile))
+				if(s.filtered==null)
+					return false;
+				// don't hide own posts in own profile
+				if (statusIsOnOwnProfile.test(s))
 					return false;
-		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){
 				for(FilterResult filter:s.filtered){
 					if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
 						return true;
 				}
-		}else if(wordFilters!=null){
+				return false;
+			});
+			return;
+		}
+		if(wordFilters==null)
+			return;
+		for(T obj:objects){
+			Status s=extractor.apply(obj);
+			if(s!=null && s.filtered!=null){
+				getLocalPreferences().serverSideFiltersSupported=true;
+				getLocalPreferences().save();
+				return;
+			}
+		}
+		objects.removeIf(o->{
+			Status s=extractor.apply(o);
+			if(s==null)
+				return false;
+			// don't hide own posts in own profile
+			if (statusIsOnOwnProfile.test(s))
+				return false;
 			for(LegacyFilter filter:wordFilters){
 				if(filter.context.contains(context) && filter.matches(s) && filter.isActive())
 					return true;
 			}
-		}
 			return false;
+		});
 	}
 
 	public void updateAccountInfo(){

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

@@ -1,5 +1,7 @@
 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

@@ -9,16 +9,19 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
@@ -52,14 +55,15 @@ public class AccountTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(user.id, getMaxID(), null, count, filter)
+		currentRequest=new GetAccountStatuses(user.id, offset>0 ? getMaxID() : null, null, count, filter)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
 						if(getActivity()==null) return;
-						boolean more=applyMaxID(result);
+						AccountSessionManager asm = AccountSessionManager.getInstance();
+						boolean empty=result.isEmpty();
 						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext(), user);
-						onDataLoaded(result, more);
+						onDataLoaded(result, !empty);
 					}
 				})
 				.exec(accountID);

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

@@ -9,6 +9,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -33,6 +34,7 @@ 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;
@@ -88,7 +90,6 @@ 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,8 +156,6 @@ 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())
@@ -165,12 +164,6 @@ 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);
 
@@ -465,12 +458,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public abstract void onItemClick(String id);
 
-	protected void updatePoll(String parentID, Status statusForContent, Poll poll){
-		statusForContent.poll=poll;
+	protected void updatePoll(String itemID, Status status, Poll poll){
+		status.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(item.contentStatusID.equals(statusForContent.id)){
+			if(item.parentID.equals(itemID)){
 				if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
 					firstOptionIndex=i;
 				}else if(item instanceof PollFooterStatusDisplayItem){
@@ -485,7 +478,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(parentID, statusForContent.id, this, poll, pollItems);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -557,21 +550,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 {
-			status.sensitiveRevealed=false;
-			notifyItemChangedAfter(holder.getItem(), MediaGridStatusDisplayItem.class);
+			// media grid's methods normally change the status' state - we still want to be able
+			// to do this if the media grid is not bound, tho - so, doing it ourselves here
+			status.sensitiveRevealed = !status.sensitiveRevealed;
 		}
+		holder.rebind();
 	}
 
 	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);
+		if(header != null) header.rebind();
 	}
 
 	protected void toggleSpoiler(Status status, String itemID){
@@ -580,8 +573,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			status.sensitiveRevealed = false;
 
 		SpoilerStatusDisplayItem.Holder spoiler=findHolderOfType(itemID, SpoilerStatusDisplayItem.Holder.class);
-		if(spoiler!=null) spoiler.rebind();
-		else notifyItemChanged(itemID, SpoilerStatusDisplayItem.class);
+		if(spoiler!=null)
+			spoiler.rebind();
 		SpoilerStatusDisplayItem spoilerItem=Objects.requireNonNull(findItemOfType(itemID, SpoilerStatusDisplayItem.class));
 
 		int index=displayItems.indexOf(spoilerItem);
@@ -593,29 +586,39 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			adapter.notifyItemRangeRemoved(index+1, spoilerItem.contentItems.size());
 		}
 
-		notifyItemChanged(itemID, TextStatusDisplayItem.class);
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null)
+			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if(header!=null) header.rebind();
-		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
+		if(header!=null)
+			header.rebind();
 
 		list.invalidateItemDecorations();
 	}
 
 	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable) {
-		Status s=holder.getItem().status;
-		if(s.textExpandable!=expandable && list!=null) {
-			s.textExpandable=expandable;
+		if (holder.getItem().status.textExpandable != expandable && list != null) {
+			holder.getItem().status.textExpandable = expandable;
 			HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-			if(header!=null) header.bindCollapseButton();
+			if (header != null) header.rebind();
 		}
 	}
 
 	public void onToggleExpanded(Status status, String itemID) {
 		status.textExpanded = !status.textExpanded;
-		notifyItemChanged(itemID, TextStatusDisplayItem.class);
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
 		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if(header!=null) header.animateExpandToggle();
-		else notifyItemChanged(itemID, HeaderStatusDisplayItem.class);
+		if (text != null) text.rebind();
+		if (header != null) header.rebind();
+	}
+
+	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){}
@@ -674,58 +677,6 @@ 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++){
@@ -850,8 +801,6 @@ 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);
 									}
 								}
 
@@ -863,8 +812,6 @@ 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)
@@ -881,8 +828,6 @@ 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);
 		}
 	}
 
@@ -901,7 +846,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(getContext()==null) return;
 		super.onDataLoaded(d, more);
 		// more available, but the page isn't even full yet? seems wrong, let's load some more
-		if(more && data.size() < itemsPerPage){
+		if(more && d.size() < itemsPerPage){
 			preloader.onScrolledToLastItem();
 		}
 	}

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

@@ -162,7 +162,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn;
-	private PopupMenu contentTypePopup, visibilityPopup, draftOptionsPopup;
+	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, draftsBtn, scheduleDraftDismiss, contentTypeBtn;
 	private View sensitiveBtn;
 	private TextView replyText;
@@ -294,7 +294,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
-		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), accountID, customEmojis, instanceDomain);
+		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain);
 		emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
 			@Override
 			public void onEmojiSelected(Emoji emoji){

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

@@ -26,12 +26,12 @@ import android.widget.ImageView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.utils.ColorPalette;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.FixedAspectRatioImageView;
 
 import java.util.Collections;
 
@@ -54,17 +54,16 @@ public class ComposeImageDescriptionFragment extends MastodonToolbarFragment imp
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+		attachmentID=getArguments().getString("attachment");
 		setHasOptionsMenu(true);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		accountID=getArguments().getString("account");
-		attachmentID=getArguments().getString("attachment");
 		themeWrapper=new ContextThemeWrapper(activity, R.style.Theme_Mastodon_Dark);
-		ColorPalette.palettes.get(AccountSessionManager.get(accountID).getLocalPreferences().getCurrentColor())
-				.apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
+		ColorPalette.palettes.get(GlobalUserPreferences.color).apply(themeWrapper, GlobalUserPreferences.ThemePreference.DARK);
 		setTitle(R.string.add_alt_text);
 	}
 

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

@@ -21,7 +21,6 @@ import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.tags.GetTag;
 import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
@@ -86,19 +85,16 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 
 	@Override
 	protected TimelineDefinition makeTimelineDefinition() {
-		return TimelineDefinition.ofHashtag(hashtagName);
+		return TimelineDefinition.ofHashtag(hashtag);
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtagName, getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetHashtagTimeline(hashtagName, offset==0 ? null : 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 more=applyMaxID(result);
-						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, more);
+						onDataLoaded(result, !result.isEmpty());
 					}
 				})
 				.exec(accountID);
@@ -221,6 +217,8 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 		followMenuItem=optionsMenu.findItem(R.id.follow_hashtag);
 		pinMenuItem=optionsMenu.findItem(R.id.pin);
 		followMenuItem.setVisible(toolbarContentVisible);
+		followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+		followMenuItem.setIcon(hashtag.following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
 		pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
 		super.updatePinButton(pinMenuItem);
 		if(toolbarContentVisible){
@@ -262,7 +260,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment{
 	}
 
 	private void updateHeader(){
-		if(hashtag==null || getActivity()==null)
+		if(hashtag==null)
 			return;
 
 		if(hashtag.history!=null && !hashtag.history.isEmpty()){

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

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
+import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
@@ -19,7 +20,6 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -49,6 +49,16 @@ public class HomeTimelineFragment extends StatusListFragment {
 		loadData();
 	}
 
+	private boolean typeFilterPredicate(Status s) {
+		AccountLocalPreferences lp=getLocalPrefs();
+		return (lp.showReplies || s.inReplyToId == null) &&
+				(lp.showBoosts || s.reblog == null);
+	}
+
+	private List<Status> filterPosts(List<Status> items) {
+		return items.stream().filter(this::typeFilterPredicate).collect(Collectors.toList());
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
@@ -57,10 +67,9 @@ public class HomeTimelineFragment extends StatusListFragment {
 					@Override
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if (getActivity() == null) return;
-						boolean empty=result.items.isEmpty();
+						List<Status> filteredItems = filterPosts(result.items);
 						maxID=result.maxID;
-						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
-						onDataLoaded(result.items, !empty);
+						onDataLoaded(filteredItems, !result.items.isEmpty());
 						if(result.isFromCache())
 							loadNewPosts();
 					}
@@ -133,26 +142,23 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
+						result = filterPosts(result);
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						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=new ArrayList<>(result.subList(0, result.size()-1)); // Remove the already known last post
+							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
 						}else{
-							last.hasGapAfter=last.id;
+							result.get(result.size()-1).hasGapAfter=true;
 							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()){
 							prependItems(toAdd, true);
 							if (parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
-						if(toAddUnfiltered.isEmpty())
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAddUnfiltered, false);
 					}
 
 					@Override
@@ -179,7 +185,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		String maxID = null;
 		String minID = null;
 		if (downwards) {
-			maxID=item.getItem().getMaxID();
+			maxID = item.getItemID();
 		} else {
 			int gapPos=displayItems.indexOf(gap);
 			StatusDisplayItem nextItem=displayItems.get(gapPos + 1);
@@ -196,13 +202,12 @@ 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=null;
+								gapStatus.hasGapAfter=false;
 								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
@@ -215,7 +220,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 										idsBelowGap.add(s.id);
 									}else if(s.id.equals(gap.parentID)){
 										belowGap=true;
-										s.hasGapAfter=null;
+										s.hasGapAfter=false;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
 									}else{
 										gapPostIndex++;
@@ -228,8 +233,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 										break;
 								}
 								if(endIndex==result.size()){
-									Status last=result.get(result.size()-1);
-									last.hasGapAfter=last.id;
+									result.get(result.size()-1).hasGapAfter=true;
 								}else{
 									result=result.subList(0, endIndex);
 								}
@@ -274,7 +278,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 											.filter(s->Objects.equals(s.id, gap.parentID))
 											.findFirst();
 									if (gapStatus.isPresent()) {
-										gapStatus.get().hasGapAfter=null;
+										gapStatus.get().hasGapAfter=false;
 										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus.get()), false);
 									}
 									targetList.clear();

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

@@ -16,7 +16,6 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetList;
 import org.joinmastodon.android.api.requests.lists.UpdateList;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.model.FilterContext;
@@ -26,8 +25,10 @@ import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ListEditor;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -133,14 +134,13 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
 
     @Override
     protected void doLoadData(int offset, int count) {
-        currentRequest=new GetListTimeline(listID, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetListTimeline(listID, offset==0 ? null : getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this) {
                     @Override
                     public void onSuccess(List<Status> result) {
                         if (getActivity() == null) return;
-						boolean more=applyMaxID(result);
-						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, more);
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
+                        onDataLoaded(result, !result.isEmpty());
                     }
                 })
                .exec(accountID);

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

@@ -134,7 +134,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 							return;
 						maxID=result.maxID;
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
-						if(bannerHelper!=null) bannerHelper.onBannerBecameVisible();
 						reloadingFromCache=false;
 						if (getParentFragment() instanceof NotificationsFragment nf) {
 							nf.updateMarkAllReadButton();
@@ -238,7 +237,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, contentStatus, ev.poll);
+				updatePoll(ntf.id, ntf.status, ev.poll);
 			}
 		}
 	}

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -36,8 +35,6 @@ public class PinnedPostsListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(getActivity()==null) return;
-						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
 						onDataLoaded(result, false);
 					}
 				}).exec(accountID);

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

@@ -133,7 +133,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ImageView avatar;
 	private CoverImageView cover;
 	private View avatarBorder;
-	private View usernameWrap;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel;
 	private ImageView lockIcon, botIcon;
 	private ProgressBarButton actionButton, notifyButton;
@@ -234,7 +233,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		cover=content.findViewById(R.id.cover);
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
-		usernameWrap=content.findViewById(R.id.username_wrap);
 		username=content.findViewById(R.id.username);
 		lockIcon=content.findViewById(R.id.lock_icon);
 		botIcon=content.findViewById(R.id.bot_icon);
@@ -1116,7 +1114,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		name.setVisibility(View.GONE);
 		rolesView.setVisibility(View.GONE);
-		usernameWrap.setVisibility(View.GONE);
+		username.setVisibility(View.GONE);
 		bio.setVisibility(View.GONE);
 		countersLayout.setVisibility(View.GONE);
 
@@ -1165,7 +1163,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEditWrap.setVisibility(View.GONE);
 		name.setVisibility(View.VISIBLE);
 		rolesView.setVisibility(View.VISIBLE);
-		usernameWrap.setVisibility(View.VISIBLE);
+		username.setVisibility(View.VISIBLE);
 		bio.setVisibility(View.VISIBLE);
 		countersLayout.setVisibility(View.VISIBLE);
 		refreshLayout.setEnabled(true);
@@ -1177,7 +1175,6 @@ 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/SplashFragment.java

@@ -47,12 +47,13 @@ public class SplashFragment extends AppKitFragment{
 	private ProgressBarButton defaultServerButton;
 	private ProgressBar defaultServerProgress;
 	private String chosenDefaultServer=DEFAULT_SERVER;
-	private boolean loadingDefaultServer, loadedDefaultServer;
+	private boolean loadingDefaultServer;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
+		loadAndChooseDefaultServer();
 	}
 
 	@Nullable
@@ -100,8 +101,6 @@ public class SplashFragment extends AppKitFragment{
 				});
 			}
 		});
-		if(!loadedDefaultServer && !loadingDefaultServer)
-			loadAndChooseDefaultServer();
 
 		return contentView;
 	}
@@ -240,7 +239,6 @@ public class SplashFragment extends AppKitFragment{
 	private void setChosenDefaultServer(String domain){
 		chosenDefaultServer=domain;
 		loadingDefaultServer=false;
-		loadedDefaultServer=true;
 		if(defaultServerButton!=null && getActivity()!=null){
 			defaultServerButton.setTextVisible(true);
 			defaultServerProgress.setVisibility(View.GONE);

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

@@ -48,8 +48,8 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(getActivity()==null) return;
 						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
+						if (getActivity() == null) return;
 						onDataLoaded(result, false);
 					}
 				})
@@ -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, s.getContentStatus().id, this));
+			items.add(1, new DummyStatusDisplayItem(s.id, this));
 		}
 		return items;
 	}

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

@@ -28,9 +28,7 @@ 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;
 
@@ -48,8 +46,6 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			flags |= StatusDisplayItem.FLAG_NO_FOOTER;
 		if (!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
 			flags |= StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS;
-		if(GlobalUserPreferences.translateButtonOpenedOnly)
-			flags |= StatusDisplayItem.FLAG_NO_TRANSLATE;
 		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), isMainThreadStatus ? 0 : flags);
 	}
 
@@ -176,57 +172,41 @@ 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){
-		Status contentStatus=status.getContentStatus();
-		String id=contentStatus.id;
-		iterateRemoveStatus(data, id);
-		iterateRemoveStatus(preloadedData, id);
-		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
-		int offset=0;
+		data.remove(status);
+		preloadedData.remove(status);
+		int index=-1, ancestorFirstIndex = -1, ancestorLastIndex = -1;
 		for(int i=0;i<displayItems.size();i++){
 			StatusDisplayItem item = displayItems.get(i);
-			if(id.equals(item.contentStatusID)){
-				offset+=removeStatusDisplayItems(contentStatus, i, ancestorFirstIndex, ancestorLastIndex, offset);
-				ancestorFirstIndex=ancestorLastIndex=-1;
-				continue;
+			if(status.id.equals(item.parentID)){
+				index=i;
+				break;
 			}
 			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/ThreadFragment.java

@@ -13,8 +13,8 @@ import org.joinmastodon.android.GlobalUserPreferences.AutoRevealMode;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
@@ -31,6 +31,7 @@ import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayDeque;
@@ -194,8 +195,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		// TODO: figure out how this code works
 		if (isInstanceAkkoma()) sortStatusContext(mainStatus, result);
 
-		filterStatuses(result.descendants);
-		filterStatuses(result.ancestors);
+		result.descendants=filterStatuses(result.descendants);
+		result.ancestors=filterStatuses(result.ancestors);
 		restoreStatusStates(result.descendants, oldData);
 		restoreStatusStates(result.ancestors, oldData);
 
@@ -331,8 +332,11 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				.collect(Collectors.toList());
 	}
 
-	private void filterStatuses(List<Status> statuses){
-		AccountSessionManager.get(accountID).filterStatuses(statuses, getFilterContext());
+	private List<Status> filterStatuses(List<Status> statuses){
+		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
+		return statuses.stream()
+				.filter(statusFilterPredicate)
+				.collect(Collectors.toList());
 	}
 
 	@Override

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

@@ -6,19 +6,21 @@ import android.os.Bundle;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.api.requests.timelines.GetBubbleTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class BubbleTimelineFragment extends StatusListFragment {
     private DiscoverInfoBannerHelper bannerHelper;
+    private String maxID;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -34,15 +36,15 @@ public class BubbleTimelineFragment extends StatusListFragment {
 
 	@Override
     protected void doLoadData(int offset, int count){
-        currentRequest=new GetBubbleTimeline(getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+        currentRequest=new GetBubbleTimeline(refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(List<Status> result){
+                        if(!result.isEmpty())
+                            maxID=result.get(result.size()-1).id;
                         if (getActivity() == null) return;
-						boolean more=applyMaxID(result);
-						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, more);
-						bannerHelper.onBannerBecameVisible();
+                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
+                        onDataLoaded(result, !result.isEmpty());
                     }
                 })
                 .exec(accountID);

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

@@ -96,6 +96,8 @@ 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

@@ -4,7 +4,6 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -18,7 +17,6 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
-	private int offset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -27,17 +25,12 @@ public class DiscoverPostsFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected void doLoadData(int o, int count){
-		if(refreshing) offset=0;
+	protected void doLoadData(int offset, int count){
 		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);
+						onDataLoaded(result, !result.isEmpty());
 						bannerHelper.onBannerBecameVisible();
 					}
 				}).exec(accountID);

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

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

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

@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
 
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -29,14 +30,15 @@ public class LocalTimelineFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(getActivity()==null) return;
-						boolean more=applyMaxID(result);
-						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
-						onDataLoaded(result, more);
+						if(!result.isEmpty())
+							maxID=result.get(result.size()-1).id;
+						boolean empty=result.isEmpty();
+						AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC);
+						onDataLoaded(result, !empty);
 						bannerHelper.onBannerBecameVisible();
 					}
 				})

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

@@ -83,11 +83,10 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(reportAccount.id, getMaxID(), null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
+		currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(getActivity()==null) return;
 						for(Status s:result){
 							s.sensitive=true;
 						}
@@ -104,8 +103,8 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		else
 			selectedIDs.add(id);
 		CheckableHeaderStatusDisplayItem.Holder holder=findHolderOfType(id, CheckableHeaderStatusDisplayItem.Holder.class);
-		if(holder!=null) holder.rebind();
-		else notifyItemChanged(id, CheckableHeaderStatusDisplayItem.class);
+		if(holder!=null)
+			holder.rebind();
 	}
 
 	@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_fluent_add_24_regular);
+		fab.setImageResource(R.drawable.ic_add_24px);
 		fab.setContentDescription(getString(R.string.add_muted_word));
 		fab.setOnClickListener(v->onFabClick());
 	}

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

@@ -1,7 +1,6 @@
 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;
@@ -18,7 +17,6 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 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.events.StatusDisplaySettingsChangedEvent;
@@ -29,8 +27,6 @@ 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;
@@ -41,7 +37,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, underlinedLinksItem;
+	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem;
 	private ListItem<Void> colorItem, publishTextItem, autoRevealCWsItem;
 	private CheckableListItem<Void> pronounsInUserListingsItem, pronounsInTimelinesItem, pronounsInThreadsItem;
 
@@ -55,7 +51,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<>(getString(R.string.sk_settings_color_palette), getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
+				colorItem=new ListItem<>(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),
@@ -72,8 +68,6 @@ 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)),
 				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)),
@@ -100,9 +94,9 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	protected void onHidden(){
 		super.onHidden();
 
-		boolean restartPlease=GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked
-				|| GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked
-				|| GlobalUserPreferences.likeIcon!=likeIconItem.checked;
+		boolean restartPlease=
+				GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked ||
+				GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked;
 
 		lp.revealCWs=revealCWsItem.checked;
 		lp.hideSensitiveMedia=hideSensitiveMediaItem.checked;
@@ -118,8 +112,6 @@ 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;
@@ -138,11 +130,17 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		};
 	}
 
-	private String getColorPaletteValue(){
-		ColorPreference color=AccountSessionManager.get(accountID).getLocalPreferences().color;
-		return color==null
-				? getString(R.string.sk_settings_color_palette_default, getString(GlobalUserPreferences.color.getName()))
-				: getString(color.getName());
+	private @StringRes int getColorPaletteValue(){
+		return switch(GlobalUserPreferences.color){
+			case MATERIAL3 -> R.string.sk_color_palette_material3;
+			case PINK -> R.string.sk_color_palette_pink;
+			case PURPLE -> R.string.sk_color_palette_purple;
+			case GREEN -> R.string.sk_color_palette_green;
+			case BLUE -> R.string.sk_color_palette_blue;
+			case BROWN -> R.string.sk_color_palette_brown;
+			case RED -> R.string.sk_color_palette_red;
+			case YELLOW -> R.string.sk_color_palette_yellow;
+		};
 	}
 
 	private String getPublishButtonText() {
@@ -198,40 +196,26 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	}
 
 	private void onColorClick(){
-		boolean multiple=AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
-		int indexOffset=multiple ? 1 : 0;
-		int selected=lp.color==null ? 0 : lp.color.ordinal() + indexOffset;
+		int selected=GlobalUserPreferences.color.ordinal();
 		int[] newSelected={selected};
-		List<String> items=Arrays.stream(ColorPreference.values()).map(ColorPreference::getName).map(this::getString).collect(Collectors.toList());
-		if(multiple)
-			items.add(0, getString(R.string.sk_settings_color_palette_default, items.get(GlobalUserPreferences.color.ordinal())));
-
-		Consumer<Boolean> save=(asDefault)->{
-			boolean defaultSelected=multiple && newSelected[0]==0;
-			ColorPreference pref=defaultSelected ? null : ColorPreference.values()[newSelected[0]-indexOffset];
-			if(pref!=lp.color){
-				ColorPreference prev=lp.color;
-				lp.color=asDefault ? null : pref;
-				lp.save();
-				if((asDefault || !multiple) && pref!=null){
+		String[] names=Arrays.stream(GlobalUserPreferences.ColorPreference.values()).map(GlobalUserPreferences.ColorPreference::getName).map(this::getString).toArray(String[]::new);
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.settings_theme)
+				.setSingleChoiceItems(names,
+						selected, (dlg, item)->newSelected[0]=item)
+				.setPositiveButton(R.string.ok, (dlg, item)->{
+					GlobalUserPreferences.ColorPreference pref=GlobalUserPreferences.ColorPreference.values()[newSelected[0]];
+					if(pref!=GlobalUserPreferences.color){
+						GlobalUserPreferences.ColorPreference prev=GlobalUserPreferences.color;
 						GlobalUserPreferences.color=pref;
 						GlobalUserPreferences.save();
-				}
-				colorItem.subtitle=getColorPaletteValue();
+						colorItem.subtitleRes=getColorPaletteValue();
 						rebindItem(colorItem);
-				if(prev==null && pref!=null) restartActivityToApplyNewTheme();
-				else maybeApplyNewThemeRightNow(null, prev, null);
+						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();
+				})
+				.setNegativeButton(R.string.cancel, null)
+				.show();
 	}
 
 	private void onPublishTextClick(){
@@ -273,17 +257,17 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, ColorPreference prevColor, Boolean prevTrueBlack){
+	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, GlobalUserPreferences.ColorPreference prevColor, Boolean prevTrueBlack){
 		if(prevTheme==null) prevTheme=GlobalUserPreferences.theme;
 		if(prevTrueBlack==null) prevTrueBlack=GlobalUserPreferences.trueBlackTheme;
-		if(prevColor==null) prevColor=lp.getCurrentColor();
+		if(prevColor==null) prevColor=GlobalUserPreferences.color;
 
 		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.getCurrentColor() || (isNewDark && prevTrueBlack!=isNewBlack)){
+		if(isCurrentDark!=isNewDark || prevColor!=GlobalUserPreferences.color || (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_fluent_add_24_regular, this::onAddFilterClick)
+				new ListItem<Void>(R.string.settings_add_filter, 0, R.drawable.ic_add_24px, this::onAddFilterClick)
 		)));
 		return adapter;
 	}

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

@@ -55,7 +55,8 @@ 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_fluent_shield_24_regular, this::onPrivacyClick),
+				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_privacy_tip_24px, 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),
@@ -64,7 +65,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(account.domain);
 		if (!instance.isAkkoma())
-			data.add(3, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
+			data.add(2, 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));
@@ -162,7 +163,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 				.setMessage(getString(R.string.confirm_log_out, session.getFullUsername()))
 				.setPositiveButton(R.string.log_out, (dialog, which)->account.logOut(getActivity(), ()->{
 					loggedOut=true;
-					((MainActivity)getActivity()).restartActivity();
+					((MainActivity)getActivity()).restartHomeFragment();
 				}))
 				.setNegativeButton(R.string.cancel, null)
 				.show();

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_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_fluent_search_24_regular, ()->toggleCheckableItem(indexableItem))
+			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_thumbs_up_down_24px, ()->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))
 		));
 		if(self.source.indexable==null)
 			indexableItem.isEnabled=false;

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

@@ -68,14 +68,6 @@ public class Attachment extends BaseModel{
 		return 1080;
 	}
 
-	public boolean hasKnownDimensions(){
-		return meta!=null && (
-				(meta.height>0 && meta.width>0)
-				|| (meta.original!=null && meta.original.height>0 && meta.original.width>0)
-				|| (meta.small!=null && meta.small.height>0 && meta.small.width>0)
-				);
-	}
-
 	public double getDuration(){
 		if(meta==null)
 			return 0;

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 String hasGapAfter;
+	public transient boolean hasGapAfter;
 	private transient String strippedText;
 	public transient TranslationState translationState=TranslationState.HIDDEN;
 	public transient Translation translation;

mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java

@@ -147,7 +147,8 @@ public class AccountSwitcherSheet extends BottomSheet{
 
 	private void logOut(String accountID){
 		AccountSessionManager.get(accountID).logOut(activity, ()->{
-			((MainActivity)activity).restartActivity();
+			dismiss();
+			((MainActivity)activity).restartHomeFragment();
 		});
 	}
 
@@ -316,14 +317,14 @@ public class AccountSwitcherSheet extends BottomSheet{
 		@Override
 		public void onClick(){
 			setOnDismissListener(null);
-			if (onClick != null) {
 			dismiss();
+			if (onClick != null) {
 				onClick.accept(item.getID(), false);
 				return;
 			}
 			if(AccountSessionManager.getInstance().tryGetAccount(item.getID())!=null){
 				AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
-				((MainActivity)activity).restartActivity();
+				((MainActivity)activity).restartHomeFragment();
 			}
 		}
 

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, null, parentFragment);
+		super(parentID, 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, null, parentFragment);
+		super(parentID, 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, status.id, parentFragment);
+		super(parentID, 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, String contentStatusID, BaseStatusListFragment<?> parentFragment) {
-		super(parentID, contentStatusID, parentFragment);
+	public DummyStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment) {
+		super(parentID, 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, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.hideEmpty=hideEmpty;
 		this.forAnnouncement=forAnnouncement;
@@ -170,14 +170,12 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
         @Override
         public void onBind(EmojiReactionsStatusDisplayItem item) {
 			if(emojiKeyboard != null) root.removeView(emojiKeyboard.getView());
-			addButton.setSelected(false);
 			AccountSession session=item.parentFragment.getSession();
 			item.status.reactions.forEach(r->r.request=r.getUrl(item.playGifs)!=null
 					? new UrlImageLoaderRequest(r.getUrl(item.playGifs), V.sp(24), V.sp(24))
 					: null);
 			emojiKeyboard=new CustomEmojiPopupKeyboard(
 					(Activity) item.parentFragment.getContext(),
-					item.accountID,
 					AccountSessionManager.getInstance().getCustomEmojis(session.domain),
 					session.domain, true);
 			emojiKeyboard.setListener(this);

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

@@ -13,10 +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;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.StatusEditHistoryFragment;
 import org.joinmastodon.android.fragments.account_list.StatusFavoritesListFragment;
@@ -42,7 +39,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, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}
@@ -77,7 +74,6 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(ExtendedFooterStatusDisplayItem item){
 			Status s=item.status;
-			favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? 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,22 +1,29 @@
 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, String contentStatusID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
-        super(parentID, contentStatusID, parentFragment);
+    public FileStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
+        super(parentID, parentFragment);
         this.attachment=attachment;
     }
 

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

@@ -1,10 +1,12 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import static org.joinmastodon.android.ui.utils.UiUtils.opacityIn;
+import static org.joinmastodon.android.ui.utils.UiUtils.opacityOut;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -15,7 +17,6 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Button;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -43,7 +44,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public boolean hideCounts;
 
 	public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}
@@ -56,14 +57,13 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
 		private final TextView replies, boosts, favorites;
 		private final View reply, boost, favorite, share, bookmark;
-		private final ImageView favIcon;
 
 		private View touchingView = null;
 		private boolean longClickPerformed = false;
 		private final Runnable longClickRunnable = () -> {
 			longClickPerformed = touchingView != null && touchingView.performLongClick();
 			if (longClickPerformed && touchingView != null) {
-				UiUtils.opacityIn(touchingView);
+				touchingView.startAnimation(opacityIn);
 				touchingView.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
 			}
 		};
@@ -89,7 +89,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			favorite=findViewById(R.id.favorite_btn);
 			share=findViewById(R.id.share_btn);
 			bookmark=findViewById(R.id.bookmark_btn);
-			favIcon=findViewById(R.id.favorite_icon);
 
 			reply.setOnTouchListener(this::onButtonTouch);
 			reply.setOnClickListener(this::onReplyClick);
@@ -133,13 +132,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			boolean condenseBottom = !item.isMainStatus && item.hasDescendantNeighbor &&
 					!nextIsWarning;
 
-			ColorStateList color=item.parentFragment.getResources().getColorStateList(
-					GlobalUserPreferences.likeIcon ? R.color.like_icon : R.color.favorite_icon, item.parentFragment.getContext().getTheme()
-			);
-			favIcon.setImageResource(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_selector : R.drawable.ic_fluent_star_24_selector);
-			favIcon.setImageTintList(color);
-			favorites.setTextColor(color);
-
 			ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) itemView.getLayoutParams();
 			params.setMargins(params.leftMargin, params.topMargin, params.rightMargin,
 					condenseBottom ? V.dp(-5) : 0);
@@ -168,20 +160,21 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				if (!longClickPerformed) v.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
 				if (disabled) return true;
 				if (action == MotionEvent.ACTION_UP && !longClickPerformed) v.performClick();
-				else if (!longClickPerformed) UiUtils.opacityIn(v);
+				else if (!longClickPerformed) v.startAnimation(opacityIn);
 			} 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());
-				UiUtils.opacityOut(v);
+				v.startAnimation(opacityOut);
 			}
 			return true;
 		}
 
 		private void onReplyClick(View v){
-			UiUtils.opacityIn(v);
+			v.startAnimation(opacityIn);
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
 			args.putParcelable("replyTo", Parcels.wrap(item.status));
@@ -205,7 +198,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 
 		private void onBoostClick(View v){
 			if (GlobalUserPreferences.confirmBoost) {
-				UiUtils.opacityIn(v);
+				v.startAnimation(opacityIn);
 				onBoostLongClick(v);
 				return;
 			}
@@ -214,7 +207,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void boostConsumer(View v, Status r) {
-			UiUtils.opacityIn(v);
+			v.startAnimation(opacityIn);
 			bindText(boosts, r.reblogsCount);
 		}
 
@@ -225,7 +218,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			AccountSession session = AccountSessionManager.getInstance().getAccount(item.accountID);
 
 			Consumer<StatusPrivacy> doReblog = (visibility) -> {
-				UiUtils.opacityOut(v);
+				v.startAnimation(opacityOut);
 				session.getStatusInteractionController()
 						.setReblogged(item.status, !item.status.reblogged, visibility, r->boostConsumer(v, r));
 				dialog.dismiss();
@@ -278,7 +271,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 
 			menu.findViewById(R.id.quote).setOnClickListener(c->{
 				dialog.dismiss();
-				UiUtils.opacityIn(v);
+				v.startAnimation(opacityIn);
 				Bundle args=new Bundle();
 				args.putString("account", item.accountID);
 				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(item.accountID);
@@ -303,7 +296,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private void onFavoriteClick(View v){
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
-				UiUtils.opacityIn(v);
+				v.startAnimation(opacityIn);
 				bindText(favorites, r.favouritesCount);
 			});
 		}
@@ -317,7 +310,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 					R.string.sk_favorite_as,
 					R.string.sk_favorited_as,
 					R.string.sk_already_favorited,
-					GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_28_regular : R.drawable.ic_fluent_star_28_regular
+					R.drawable.ic_fluent_star_28_regular
 			);
 			return true;
 		}
@@ -325,7 +318,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private void onBookmarkClick(View v){
 			bookmark.setSelected(!item.status.bookmarked);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked, r->{
-				UiUtils.opacityIn(v);
+				v.startAnimation(opacityIn);
 			});
 		}
 
@@ -344,7 +337,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onShareClick(View v){
-			UiUtils.opacityIn(v);
+			v.startAnimation(opacityIn);
 			Intent intent=new Intent(Intent.ACTION_SEND);
 			intent.setType("text/plain");
 			intent.putExtra(Intent.EXTRA_TEXT, item.status.url);

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

@@ -18,17 +18,13 @@ import me.grishka.appkit.utils.V;
 
 public class GapStatusDisplayItem extends StatusDisplayItem{
 	public boolean loading;
-	private final Status status;
+	private Status status;
 
 	public GapStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status){
-		super(parentID, null, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 	}
 
-	public String getMaxID(){
-		return status.hasGapAfter;
-	}
-
 	@Override
 	public Type getType(){
 		return Type.GAP;
@@ -58,8 +54,6 @@ 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);
@@ -78,7 +72,7 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 		private void onViewClick(View v){
 			if(item.loading) return;
 			boolean isTop=v==top;
-			UiUtils.opacityOut(isTop ? textTop : textBottom);
+			(isTop ? textTop : textBottom).startAnimation(UiUtils.opacityOut);
 			V.setVisibilityAnimated((isTop ? progressTop : progressBottom), View.VISIBLE);
 			item.parentFragment.onGapClick(this, isTop);
 		}

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, null, parentFragment);
+		super(parentID, parentFragment);
 		this.tag=tag;
 	}
 

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

@@ -66,7 +66,6 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class HeaderStatusDisplayItem extends StatusDisplayItem{
@@ -77,7 +76,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private SpannableStringBuilder parsedName;
 	public final Status status;
-	public boolean hasVisibilityToggle;
+	private boolean hasVisibilityToggle;
 	boolean needBottomPadding;
 	private CharSequence extraText;
 	private Notification notification;
@@ -86,7 +85,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, status.id, parentFragment);
+		super(parentID, parentFragment);
 		AccountSession session = AccountSessionManager.get(accountID);
 		user=scheduledStatus != null ? session.self : user;
 		this.user=user;
@@ -295,6 +294,17 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			UiUtils.enablePopupMenuIcons(activity, optionsMenu);
 		}
 
+		private void populateAccountsMenu(Menu menu) {
+			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
+			sessions.stream().filter(s -> !s.getID().equals(item.accountID)).forEach(s -> {
+				String username = "@"+s.self.username+"@"+s.domain;
+				menu.add(username).setOnMenuItemClickListener(c->{
+					UiUtils.openURL(item.parentFragment.getActivity(), s.getID(), item.status.url, false);
+					return true;
+				});
+			});
+		}
+
 		@SuppressLint("SetTextI18n")
 		@Override
 		public void onBind(HeaderStatusDisplayItem item){
@@ -321,13 +331,23 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			botIcon.setColorFilter(username.getCurrentTextColor());
 
 			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
-			visibility.setVisibility(item.hasVisibilityToggle ? View.VISIBLE : View.GONE);
 			if (item.hasVisibilityToggle){
-				boolean visible = item.status.sensitiveRevealed && (!item.status.hasSpoiler() || item.status.spoilerRevealed);
-				visibility.setAlpha(visible ? 1 : 0f);
-				visibility.setScaleY(visible ? 1 : 0.8f);
-				visibility.setScaleX(visible ? 1 : 0.8f);
-				visibility.setEnabled(visible);
+				boolean hidden = !item.status.sensitiveRevealed || (item.status.hasSpoiler() && !item.status.spoilerRevealed);
+
+				// doing this because V.setVisibilityAnimated ignores changes between INVISIBLE and GONE
+				int newVis=hidden ? View.INVISIBLE : View.VISIBLE;
+				if(newVis==View.INVISIBLE && visibility.getVisibility()==View.GONE)
+					visibility.setVisibility(newVis);
+				else
+					V.setVisibilityAnimated(visibility, newVis);
+
+				visibility.setEnabled(!hidden);
+				visibility.setContentDescription(item.parentFragment.getString(item.status.sensitiveRevealed ? R.string.spoiler_hide : R.string.spoiler_show));
+				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
+					visibility.setTooltipText(visibility.getContentDescription());
+				}
+			} else {
+				visibility.setVisibility(View.GONE);
 			}
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
 			if(TextUtils.isEmpty(item.extraText)){
@@ -377,40 +397,19 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				markAsRead.setVisibility(View.GONE);
 			}
 
-			bindCollapseButton();
-
-			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(){
+			if (item.status == null || !item.status.textExpandable) {
+				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);
 			}
 
-		public void animateExpandToggle(){
-			bindCollapseButtonText();
-			collapseBtnIcon.animate().scaleY(item.status.textExpanded ? -1 : 1).start();
-		}
-
-		public void animateVisibilityToggle(boolean visible){
-			visibility.animate()
-					.alpha(visible ? 1 : 0)
-					.scaleX(visible ? 1 : 0.8f)
-					.scaleY(visible ? 1 : 0.8f)
-					.setInterpolator(CubicBezierInterpolator.DEFAULT)
-					.start();
-			visibility.setEnabled(visible);
+			itemView.setPaddingRelative(itemView.getPaddingStart(), itemView.getPaddingTop(),
+					item.inset ? V.dp(10) : V.dp(4), itemView.getPaddingBottom());
 		}
 
 		@Override

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, status.id, parentFragment);
+		super(parentID, 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, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.tiledLayout=tiledLayout;
 		this.viewPool=parentFragment.getAttachmentViewsPool();
 		this.attachments=attachments;

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

@@ -1,6 +1,7 @@
 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;
@@ -8,6 +9,7 @@ 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;
@@ -18,11 +20,9 @@ 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;
@@ -46,13 +46,11 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	private final String accountID;
 	private final CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private final CharSequence text;
-	private final CharSequence timestamp;
 
 	public NotificationHeaderStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Notification notification, String accountID){
-		super(parentID, notification.status!=null ? notification.status.getContentStatus().id : null, parentFragment);
+		super(parentID, parentFragment);
 		this.notification=notification;
 		this.accountID=accountID;
-		this.timestamp=notification.createdAt==null ? null : UiUtils.formatRelativeTimestamp(context, notification.createdAt);
 
 		if(notification.type==Notification.Type.POLL){
 			text=parentFragment.getString(R.string.poll_ended);
@@ -113,8 +111,8 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<NotificationHeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final ImageView icon, avatar, deleteNotification;
-		private final TextView text, timestamp;
+		private final ImageView icon, avatar;
+		private final TextView text;
 		private final int selectableItemBackground;
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -122,16 +120,9 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 			icon=findViewById(R.id.icon);
 			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();
@@ -161,10 +152,9 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(NotificationHeaderStatusDisplayItem item){
 			text.setText(item.text);
-			timestamp.setText(item.timestamp);
 			avatar.setVisibility(item.notification.type==Notification.Type.POLL ? View.GONE : View.VISIBLE);
 			icon.setImageResource(switch(item.notification.type){
-				case FAVORITE -> GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_24_filled : R.drawable.ic_fluent_star_24_filled;
+				case FAVORITE -> 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;
@@ -175,18 +165,15 @@ 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 -> GlobalUserPreferences.likeIcon ? R.attr.colorLike : R.attr.colorFavorite;
+				case FAVORITE -> 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, String contentStatusID, BaseStatusListFragment parentFragment, Poll poll){
-		super(parentID, contentStatusID, parentFragment);
+	public PollFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Poll poll){
+		super(parentID, 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, String contentStatusID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){
-		super(parentID, contentStatusID, parentFragment);
+	public PollOptionStatusDisplayItem(String parentID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){
+		super(parentID, parentFragment);
 		this.optionIndex=optionIndex;
 		option=poll.options.get(optionIndex);
 		this.poll=poll;
@@ -68,7 +68,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		private final TextView text, percent;
 		private final View button;
 		private final ImageView icon;
-		private final Drawable progressBg;
+		private final Drawable progressBg, progressBgInset;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_poll_option, parent);
@@ -77,6 +77,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 			icon=findViewById(R.id.icon);
 			button=findViewById(R.id.button);
 			progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate();
+			progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate();
 			itemView.setOnClickListener(this::onButtonClick);
 			button.setOutlineProvider(OutlineProviders.roundedRect(20));
 			button.setClipToOutline(true);
@@ -92,18 +93,23 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 					item.showResults ? R.drawable.ic_poll_option_button : R.drawable.ic_fluent_radio_button_24_selector
 			));
 			if(item.showResults){
-				Drawable bg=progressBg;
+				Drawable bg=item.inset ? progressBgInset : progressBg;
 				bg.setLevel(Math.round(10000f*item.votesFraction));
 				button.setBackground(bg);
 				itemView.setSelected(item.poll.ownVotes!=null && item.poll.ownVotes.contains(item.optionIndex));
 				percent.setText(String.format(Locale.getDefault(), "%d%%", Math.round(item.votesFraction*100f)));
 			}else{
 				itemView.setSelected(item.poll.selectedOptions!=null && item.poll.selectedOptions.contains(item.option));
-				button.setBackgroundResource(R.drawable.bg_poll_option_clickable);
+				button.setBackgroundResource(item.inset ? R.drawable.bg_poll_option_clickable_inset : R.drawable.bg_poll_option_clickable);
 			}
+			if(item.inset){
+				text.setTextColor(itemView.getContext().getColorStateList(R.color.poll_option_text_inset));
+				percent.setTextColor(itemView.getContext().getColorStateList(R.color.poll_option_text_inset));
+			}else{
 				text.setTextColor(UiUtils.getThemeColor(itemView.getContext(), android.R.attr.textColorPrimary));
 				percent.setTextColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3OnSecondaryContainer));
 			}
+		}
 
 		@Override
 		public void setImage(int index, Drawable image){

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, status.getContentStatus().id, parentFragment);
+		super(parentID, 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("", null, parentFragment);
+		super("", 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, statusForContent.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=statusForContent;
 		this.type=type;
 		this.attachmentCount=statusForContent.mediaAttachments.size();

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

@@ -30,7 +30,6 @@ 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;
@@ -53,7 +52,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public abstract class StatusDisplayItem{
-	public final String parentID, contentStatusID;
+	public final String parentID;
 	public final BaseStatusListFragment<?> parentFragment;
 	public boolean inset;
 	public int index;
@@ -83,9 +82,8 @@ public abstract class StatusDisplayItem{
 		this.isDirectDescendant = isDirectDescendant;
 	}
 
-	public StatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment){
+	public StatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment){
 		this.parentID=parentID;
-		this.contentStatusID=contentStatusID;
 		this.parentFragment=parentFragment;
 	}
 
@@ -147,7 +145,7 @@ public abstract class StatusDisplayItem{
 		Status statusForContent=status.getContentStatus();
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus s ? s : null;
+		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
 
 		HeaderStatusDisplayItem header=null;
 		boolean hideCounts=!AccountSessionManager.get(accountID).getLocalPreferences().showInteractionCounts;
@@ -203,15 +201,14 @@ 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, parentObject instanceof Notification n ? n : null, scheduledStatus));
+				items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, null, scheduledStatus));
 		}
 
-		LegacyFilter applyingFilter=null;
+		boolean filtered=false;
 		if(status.filtered!=null){
 			for(FilterResult filter:status.filtered){
-				LegacyFilter f=filter.filter;
-				if(f.isActive() && filterContext != null && f.context.contains(filterContext)){
-					applyingFilter=f;
+				if(filter.filter.isActive()){
+					filtered=true;
 					break;
 				}
 			}
@@ -246,7 +243,7 @@ public abstract class StatusDisplayItem{
 		}else if(!hasSpoiler && header!=null){
 			header.needBottomPadding=true;
 		}else if(hasSpoiler){
-			contentItems.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment));
+			contentItems.add(new DummyStatusDisplayItem(parentID, fragment));
 		}
 
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
@@ -270,11 +267,11 @@ public abstract class StatusDisplayItem{
 				contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
 			}
 			if(att.type==Attachment.Type.UNKNOWN){
-				contentItems.add(new FileStatusDisplayItem(parentID, statusForContent.id, fragment, att));
+				contentItems.add(new FileStatusDisplayItem(parentID, fragment, att));
 			}
 		}
 		if(statusForContent.poll!=null){
-			buildPollItems(parentID, statusForContent.id, fragment, statusForContent.poll, contentItems);
+			buildPollItems(parentID, fragment, statusForContent.poll, contentItems);
 		}
 		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){
 			contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
@@ -294,14 +291,14 @@ public abstract class StatusDisplayItem{
 			footer=new FooterStatusDisplayItem(parentID, fragment, statusForContent, accountID);
 			footer.hideCounts=hideCounts;
 			items.add(footer);
-			if(status.hasGapAfter!=null && !(fragment instanceof ThreadFragment))
+			if(status.hasGapAfter && !(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, statusForContent.id, fragment));
+			items.add(new DummyStatusDisplayItem(parentID, 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
@@ -318,17 +315,24 @@ public abstract class StatusDisplayItem{
 			}
 		}
 
-		return applyingFilter==null ? items :
+		LegacyFilter applyingFilter = null;
+		if (!statusForContent.filterRevealed) {
+			StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, FilterAction.WARN);
+			statusForContent.filterRevealed = predicate.test(status);
+			applyingFilter = predicate.getApplyingFilter();
+		}
+
+		return statusForContent.filterRevealed ? items :
 				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
 	}
 
-	public static void buildPollItems(String parentID, String contentStatusID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
+	public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
 		int i=0;
 		for(Poll.Option opt:poll.options){
-			items.add(new PollOptionStatusDisplayItem(parentID, contentStatusID, poll, i, fragment));
+			items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment));
 			i++;
 		}
-		items.add(new PollFooterStatusDisplayItem(parentID, contentStatusID, fragment, poll));
+		items.add(new PollFooterStatusDisplayItem(parentID, fragment, poll));
 	}
 
 	public enum Type{

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

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import static org.joinmastodon.android.ui.utils.UiUtils.opacityIn;
+
 import android.app.Activity;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -28,7 +30,6 @@ import java.util.Locale;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
@@ -42,7 +43,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	public final Status status;
 
 	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
 		this.disableTranslate=disableTranslate;
@@ -112,8 +113,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			}else{
 				text.setText(item.text);
 			}
-			text.setTextIsSelectable(false);
-			if(item.textSelectable) itemView.post(() -> text.setTextIsSelectable(true));
+			text.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
 			itemView.setClickable(false);
 			itemView.setPadding(itemView.getPaddingLeft(), item.reduceTopPadding ? V.dp(6) : V.dp(12), itemView.getPaddingRight(), itemView.getPaddingBottom());
@@ -201,7 +201,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				translationProgress=findViewById(R.id.translation_progress);
 				translationButton.setOnClickListener(v->item.parentFragment.togglePostTranslation(item.status, item.parentID));
 			}
-			if(translationButton!=null) translationButton.animate().cancel();
 			if(item.status.translationState==Status.TranslationState.HIDDEN){
 				if(updateText) text.setText(item.text);
 				if(translationFooter==null) return;
@@ -213,8 +212,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				String displayLang=Locale.forLanguageTag(lang != null ? lang
 						: AccountSessionManager.get(item.parentFragment.getAccountID()).preferences.postingDefaultLanguage).getDisplayLanguage();
 				translationButton.setText(item.parentFragment.getString(R.string.translate_post, !displayLang.isBlank() ? displayLang : lang));
-				translationButton.setClickable(true);
-				translationButton.animate().alpha(1).setDuration(100).start();
+				translationButton.setEnabled(true);
+				translationButton.setAlpha(1);
 				translationInfo.setVisibility(View.GONE);
 				UiUtils.beginLayoutTransition((ViewGroup) translationButtonWrap);
 			}else{
@@ -222,8 +221,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				if(item.status.translationState==Status.TranslationState.SHOWN){
 					translationProgress.setVisibility(View.GONE);
 					translationButton.setText(R.string.translation_show_original);
-					translationButton.setClickable(true);
-					translationButton.animate().alpha(1).setDuration(200).start();
+					translationButton.setEnabled(true);
+					translationButton.setAlpha(1);
 					translationInfo.setVisibility(View.VISIBLE);
 					translationButton.setVisibility(View.VISIBLE);
 					String displayLang=Locale.forLanguageTag(item.status.translation.detectedSourceLanguage).getDisplayLanguage();
@@ -237,8 +236,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 					}
 				}else{ // LOADING
 					translationProgress.setVisibility(View.VISIBLE);
-					translationButton.setClickable(false);
-					translationButton.animate().alpha(UiUtils.ALPHA_PRESSED).setStartDelay(50).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+					translationButton.setEnabled(false);
+					translationButton.startAnimation(opacityIn);
 					translationInfo.setVisibility(View.INVISIBLE);
 					UiUtils.beginLayoutTransition((ViewGroup) translationButton.getParent());
 				}

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, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.filteredItems = filteredItems;
 		this.applyingFilter = applyingFilter;
@@ -31,11 +31,13 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<WarningFilteredStatusDisplayItem>{
+		public final View warningWrap;
 		public final TextView text;
 		public List<StatusDisplayItem> filteredItems;
 
 		public Holder(Context context, ViewGroup parent) {
 			super(context, R.layout.display_item_filter_warning, parent);
+			warningWrap=findViewById(R.id.warning_wrap);
 			text=findViewById(R.id.text);
 		}
 
@@ -43,7 +45,11 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(WarningFilteredStatusDisplayItem item) {
 			filteredItems = item.filteredItems;
 			text.setText(item.parentFragment.getString(R.string.sk_filtered, item.applyingFilter.title));
-			itemView.setOnClickListener(v->item.parentFragment.onWarningClick(this));
+		}
+
+		@Override
+		public void onClick() {
+			item.parentFragment.onWarningClick(this);
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/drawables/BlurhashCrossfadeDrawable.java

@@ -66,10 +66,6 @@ public class BlurhashCrossfadeDrawable extends Drawable{
 
 	public void setImageDrawable(Drawable imageDrawable){
 		this.imageDrawable=imageDrawable;
-		if(imageDrawable!=null){
-			width=imageDrawable.getIntrinsicWidth();
-			height=imageDrawable.getIntrinsicHeight();
-		}
 		invalidateSelf();
 	}
 
@@ -103,15 +99,11 @@ public class BlurhashCrossfadeDrawable extends Drawable{
 
 	@Override
 	public int getIntrinsicWidth(){
-		if(width==0)
-			return imageDrawable==null ? 1920 : imageDrawable.getIntrinsicWidth();
 		return width;
 	}
 
 	@Override
 	public int getIntrinsicHeight(){
-		if(height==0)
-			return imageDrawable==null ? 1080 : imageDrawable.getIntrinsicHeight();
 		return height;
 	}
 

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_fluent_play_24_filled);
+		videoPlayPauseButton.setImageResource(R.drawable.ic_play_24);
 		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_fluent_pause_24_filled);
+		videoPlayPauseButton.setImageResource(R.drawable.ic_pause_24);
 		videoPlayPauseButton.setContentDescription(activity.getString(R.string.pause));
 		startUpdatingVideoPosition(player);
 	}
@@ -734,18 +734,9 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		public void onBind(Attachment item){
 			super.onBind(item);
 			FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) imageView.getLayoutParams();
-			Drawable currentDrawable=listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition());
-			if(item.hasKnownDimensions()){
 			params.width=item.getWidth();
 			params.height=item.getHeight();
-			}else if(currentDrawable!=null){
-				params.width=currentDrawable.getIntrinsicWidth();
-				params.height=currentDrawable.getIntrinsicHeight();
-			}else{
-				params.width=1920;
-				params.height=1080;
-			}
-			ViewImageLoader.load(this, currentDrawable, new UrlImageLoaderRequest(item.url), false);
+			ViewImageLoader.load(this, listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition()), new UrlImageLoaderRequest(item.url), false);
 		}
 
 		@Override
@@ -787,18 +778,9 @@ public class PhotoViewer implements ZoomPanView.Listener{
 			super.onBind(item);
 			playerReady=false;
 			FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) wrap.getLayoutParams();
-			Drawable currentDrawable=listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition());
-			if(item.hasKnownDimensions()){
 			params.width=item.getWidth();
 			params.height=item.getHeight();
-			}else if(currentDrawable!=null){
-				params.width=currentDrawable.getIntrinsicWidth();
-				params.height=currentDrawable.getIntrinsicHeight();
-			}else{
-				params.width=1920;
-				params.height=1080;
-			}
-			wrap.setBackground(currentDrawable);
+			wrap.setBackground(listener.getPhotoViewCurrentDrawable(getAbsoluteAdapterPosition()));
 			progressBar.setVisibility(item.type==Attachment.Type.VIDEO ? View.VISIBLE : View.GONE);
 			if(itemView.isAttachedToWindow()){
 				reset();
@@ -859,9 +841,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		@Override
 		public boolean onError(MediaPlayer mp, int what, int extra){
 			Log.e(TAG, "video player onError() called with: mp = ["+mp+"], what = ["+what+"], extra = ["+extra+"]");
-			Toast.makeText(activity, R.string.error_playing_video, Toast.LENGTH_SHORT).show();
-			onStartSwipeToDismissTransition(0f);
-			return true;
+			return false;
 		}
 
 		public void prepareAndStartPlayer(){
@@ -882,8 +862,6 @@ public class PhotoViewer implements ZoomPanView.Listener{
 				player.prepareAsync();
 			}catch(IOException x){
 				Log.w(TAG, "Error initializing gif player", x);
-				Toast.makeText(activity, R.string.error_playing_video, Toast.LENGTH_SHORT).show();
-				onStartSwipeToDismissTransition(0f);
 			}
 		}
 
@@ -940,7 +918,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 
 		@Override
 		public void onCompletion(MediaPlayer mp){
-			videoPlayPauseButton.setImageResource(R.drawable.ic_fluent_play_24_filled);
+			videoPlayPauseButton.setImageResource(R.drawable.ic_play_24);
 			videoPlayPauseButton.setContentDescription(activity.getString(R.string.play));
 			stopUpdatingVideoPosition();
 			if(!uiVisible)

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

@@ -119,10 +119,8 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 
 		int width=right-left;
 		int height=bottom-top;
-		if(width==0 || height==0 || child.getWidth()==0 || child.getWidth()==0){
-			matrix.reset();
+		if(width==0 || height==0)
 			return;
-		}
 
 		float scale=Math.min(width/(float)child.getWidth(), height/(float)child.getHeight());
 		minScale=scale;

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

@@ -210,7 +210,6 @@ 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,7 +5,6 @@ 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;
 
@@ -35,7 +34,7 @@ public class LinkSpan extends CharacterStyle {
 	@Override
 	public void updateDrawState(TextPaint tp) {
 		tp.setColor(color=tp.linkColor);
-		tp.setUnderlineText(GlobalUserPreferences.underlinedLinks);
+		tp.setUnderlineText(true);
 	}
 	
 	public void onClick(Context context){
@@ -46,7 +45,7 @@ public class LinkSpan extends CharacterStyle {
 				if(linkObject instanceof Hashtag ht)
 					UiUtils.openHashtagTimeline(context, accountID, ht);
 				else
-					UiUtils.openHashtagTimeline(context, accountID, link);
+					UiUtils.openHashtagTimeline(context, accountID, text);
 			}
 			case CUSTOM -> listener.onLinkClick(this);
 		}

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

@@ -1,8 +1,8 @@
 package org.joinmastodon.android.ui.utils;
 
+import static org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
 import static org.joinmastodon.android.GlobalUserPreferences.ThemePreference;
 import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
-import static org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference.*;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,21 +11,20 @@ import androidx.annotation.StyleRes;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.session.AccountLocalPreferences;
 
 import java.util.Map;
 
 public class ColorPalette {
-    public static final Map<AccountLocalPreferences.ColorPreference, ColorPalette> palettes = Map.of(
-            MATERIAL3, new ColorPalette(R.style.ColorPalette_Material3)
+    public static final Map<GlobalUserPreferences.ColorPreference, ColorPalette> palettes = Map.of(
+            ColorPreference.MATERIAL3, new ColorPalette(R.style.ColorPalette_Material3)
                     .dark(R.style.ColorPalette_Material3_Dark, R.style.ColorPalette_Material3_AutoLightDark),
-            PINK, new ColorPalette(R.style.ColorPalette_Pink),
-            PURPLE, new ColorPalette(R.style.ColorPalette_Purple),
-            GREEN, new ColorPalette(R.style.ColorPalette_Green),
-            BLUE, new ColorPalette(R.style.ColorPalette_Blue),
-            BROWN, new ColorPalette(R.style.ColorPalette_Brown),
-            RED, new ColorPalette(R.style.ColorPalette_Red),
-            YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
+            ColorPreference.PINK, new ColorPalette(R.style.ColorPalette_Pink),
+            ColorPreference.PURPLE, new ColorPalette(R.style.ColorPalette_Purple),
+            ColorPreference.GREEN, new ColorPalette(R.style.ColorPalette_Green),
+            ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
+            ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
+            ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
+            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
     );
 
     private @StyleRes int base;

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

@@ -28,7 +28,6 @@ public class MediaAttachmentViewController{
 	private final Context context;
 	private boolean didClear;
 	private Status status;
-	private Attachment attachment;
 
 	public MediaAttachmentViewController(Context context, MediaGridStatusDisplayItem.GridItemType type){
 		view=context.getSystemService(LayoutInflater.class).inflate(switch(type){
@@ -55,7 +54,6 @@ public class MediaAttachmentViewController{
 
 	public void bind(Attachment attachment, Status status){
 		this.status=status;
-		this.attachment=attachment;
 		crossfadeDrawable.setSize(attachment.getWidth(), attachment.getHeight());
 		crossfadeDrawable.setBlurhashDrawable(attachment.blurhashPlaceholder);
 		crossfadeDrawable.setCrossfadeAlpha(0f);
@@ -78,11 +76,6 @@ public class MediaAttachmentViewController{
 		crossfadeDrawable.setImageDrawable(drawable);
 		if(didClear)
 			 crossfadeDrawable.animateAlpha(0f);
-		// Make sure the image is not stretched if the server returned wrong dimensions
-		if(drawable!=null && (drawable.getIntrinsicWidth()!=attachment.getWidth() || drawable.getIntrinsicHeight()!=attachment.getHeight())){
-			photo.setImageDrawable(null);
-			photo.setImageDrawable(crossfadeDrawable);
-		}
 	}
 
 	public void clearImage(){

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.ui.utils;
 
 import static android.view.Menu.NONE;
-import static org.joinmastodon.android.GlobalUserPreferences.ThemePreference.*;
 import static org.joinmastodon.android.GlobalUserPreferences.theme;
 import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
 
@@ -54,8 +53,9 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
 import android.view.WindowInsets;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
 import android.webkit.MimeTypeMap;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -68,7 +68,6 @@ 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;
@@ -86,7 +85,6 @@ import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
-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.events.ScheduledStatusDeletedEvent;
@@ -178,6 +176,17 @@ public class UiUtils {
 	public static int MAX_WIDTH, SCROLL_TO_TOP_DELTA;
 
 	public static final float ALPHA_PRESSED=0.55f;
+	public static final Animation opacityOut, opacityIn;
+
+	static {
+		opacityOut = new AlphaAnimation(1, ALPHA_PRESSED);
+		opacityOut.setDuration(300);
+		opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		opacityOut.setFillAfter(true);
+		opacityIn = new AlphaAnimation(ALPHA_PRESSED, 1);
+		opacityIn.setDuration(400);
+		opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
+	}
 
 	private UiUtils() {
 	}
@@ -631,25 +640,19 @@ 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(s.id)
+				() -> new DeleteStatus(status.id)
 						.setCallback(new Callback<>() {
 							@Override
 							public void onSuccess(Status result) {
 								resultCallback.accept(result);
-								CacheController cache=AccountSessionManager.get(accountID).getCacheController();
-								cache.deleteStatus(s.id);
-								E.post(new StatusDeletedEvent(s.id, accountID));
-								if(status!=s){
-									cache.deleteStatus(status.id);
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
 								E.post(new StatusDeletedEvent(status.id, accountID));
 							}
-							}
 
 							@Override
 							public void onError(ErrorResponse error) {
@@ -970,20 +973,14 @@ public class UiUtils {
 	}
 
 	public static void setUserPreferredTheme(Context context) {
-		setUserPreferredTheme(context, null);
-	}
-
-	public static void setUserPreferredTheme(Context context, @Nullable AccountSession session) {
 		context.setTheme(switch (theme) {
 			case LIGHT -> R.style.Theme_Mastodon_Light;
 			case DARK -> R.style.Theme_Mastodon_Dark;
 			default -> R.style.Theme_Mastodon_AutoLightDark;
 		});
 
-		AccountLocalPreferences prefs=session!=null ? session.getLocalPreferences() : null;
-		AccountLocalPreferences.ColorPreference color=prefs!=null ? prefs.getCurrentColor() : AccountLocalPreferences.ColorPreference.MATERIAL3;
-		ColorPalette palette = ColorPalette.palettes.get(color);
-		if (palette != null) palette.apply(context, theme);
+		ColorPalette palette = ColorPalette.palettes.get(GlobalUserPreferences.color);
+		if (palette != null) palette.apply(context);
 
 		Resources res = context.getResources();
 		MAX_WIDTH = (int) res.getDimension(R.dimen.layout_max_width);
@@ -1000,9 +997,9 @@ public class UiUtils {
 	}
 
 	public static boolean isDarkTheme() {
-		if (theme == AUTO)
+		if (theme == GlobalUserPreferences.ThemePreference.AUTO)
 			return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
-		return theme == DARK;
+		return theme == GlobalUserPreferences.ThemePreference.DARK;
 	}
 
 	public static Optional<Pair<String, Optional<String>>> parseFediverseHandle(String maybeFediHandle) {
@@ -1718,7 +1715,7 @@ public class UiUtils {
 	}
 
 	public static Optional<String> extractPronouns(Context context, @Nullable Account account) {
-		if (account==null || account.fields==null) return Optional.empty();
+		if (account == 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
@@ -1743,16 +1740,4 @@ public class UiUtils {
 				.filter(Objects::nonNull)
 				.findFirst();
 	}
-
-	public static void opacityIn(View v){
-		v.animate().alpha(1).setDuration(400).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
-	}
-
-	public static void opacityOut(View v){
-		opacityOut(v, ALPHA_PRESSED).start();
-	}
-
-	public static ViewPropertyAnimator opacityOut(View v, float alpha){
-		return v.animate().alpha(alpha).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT);
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java

@@ -18,7 +18,6 @@ import android.widget.TextView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
-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.ui.DividerItemDecoration;
@@ -92,19 +91,9 @@ public class ComposeLanguageAlertViewController{
 			detectLanguage(detected, postText);
 		}
 
-		AccountLocalPreferences lp=session==null ? null : session.getLocalPreferences();
-		if(lp!=null){
-			for(String tag : lp.recentLanguages){
-				if(specialLocales.stream().anyMatch(l->l.language!=null && l.language.languageTag!=null
-						&& l.language.languageTag.equals(tag))) continue;
-				resolver.from(tag).ifPresent(lang->specialLocales.add(new SpecialLocaleInfo(
-						lang, lang.getDisplayName(context), null
-				)));
-			}
-			if(lp.bottomEncoding) {
+		if (session!=null && session.getLocalPreferences().bottomEncoding) {
 			specialLocales.add(new SpecialLocaleInfo(null, "\uD83E\uDD7A\uD83D\uDC49\uD83D\uDC48", "bottom"));
 		}
-		}
 
 		if(previouslySelected!=null){
 			if(previouslySelected.index!=-1 && ((previouslySelected.index<specialLocales.size() && Objects.equals(previouslySelected.language, specialLocales.get(previouslySelected.index).language)) ||
@@ -334,7 +323,7 @@ public class ComposeLanguageAlertViewController{
 		public void onClick(){
 			selectItem(getAbsoluteAdapterPosition());
 			selectedLocale=item.language;
-			selectedEncoding=item.title != null && item.title.equals("bottom") ? "bottom" : null;
+			selectedEncoding = item.title.equals("bottom") ? "bottom" : null;
 		}
 
 		@Override

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

@@ -1,11 +1,9 @@
 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;
@@ -47,7 +45,9 @@ public class TabBar extends LinearLayout{
 		listener.accept(v.getId());
 		if(v.getId()==selectedTabID)
 			return;
-		selectTab(v.getId());
+		findViewById(selectedTabID).setSelected(false);
+		v.setSelected(true);
+		selectedTabID=v.getId();
 	}
 
 	private boolean onChildLongClick(View v){
@@ -60,17 +60,8 @@ public class TabBar extends LinearLayout{
 	}
 
 	public void selectTab(int id){
-		toggleSelected(selectedTabID, false);
+		findViewById(selectedTabID).setSelected(false);
 		selectedTabID=id;
-		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));
-		}
+		findViewById(selectedTabID).setSelected(true);
 	}
 }

mastodon/src/main/res/color/bookmark_icon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/bookmark_selected" android:state_selected="true"/>
-	<item android:color="?colorM3OnSurfaceVariant"/>
+	<item android:color="?android:textColorSecondary"/>
 </selector>

mastodon/src/main/res/color/boost_icon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="?colorM3Primary" android:state_selected="true"/>
-	<item android:color="?colorM3OnSurfaceVariant" android:state_enabled="true"/>
+	<item android:color="?colorM3OnBackground" android:state_enabled="true"/>
 	<item android:color="@color/m3_on_background_alpha38" />
 </selector>

mastodon/src/main/res/color/favorite_icon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/favorite_selected" android:state_selected="true"/>
-	<item android:color="?colorM3OnSurfaceVariant"/>
+	<item android:color="?android:textColorSecondary"/>
 </selector>

mastodon/src/main/res/color/like_icon.xml

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

mastodon/src/main/res/color/poll_option_progress_inset.xml

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

mastodon/src/main/res/color/poll_option_text_inset.xml

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

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<color android:color="?colorM3SurfaceVariant"/>
-	</item>
-	<item android:drawable="?android:selectableItemBackground"/>
-</layer-list>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+	<item>
+		<shape>
+			<stroke android:width="1dp" android:color="?colorM3Outline"/>
+			<solid android:color="?colorM3Surface"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+	<item android:id="@android:id/mask">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<solid android:color="?colorM3Surface"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+	<item>
+		<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
+			<shape>
+				<solid android:color="@color/poll_option_progress_inset"/>
+				<corners android:radius="20dp"/>
+			</shape>
+		</scale>
+	</item>
+	<item>
+		<shape>
+			<stroke android:width="1dp" android:color="?colorM3Outline"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</layer-list>

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

@@ -0,0 +1,5 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,16 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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

@@ -0,0 +1,9 @@
+<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>