don't remove badge if loaded from cache

closes sk22#471

mastodon/build.gradle

@@ -9,10 +9,10 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 76
-		versionName "1.1.5+fork.76"
+		versionCode 80
+		versionName "1.2.0+fork.80"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+		resConfigs "ar-rSA", "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", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {

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

@@ -43,6 +43,9 @@ public class GlobalUserPreferences{
 	public static boolean bottomEncoding;
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
+	public static boolean autoHideFab;
+	public static boolean replyLineAboveHeader;
+	public static boolean compactReblogReplyLine;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -54,6 +57,11 @@ public class GlobalUserPreferences{
 	public static Set<String> accountsWithLocalOnlySupport;
 	public static Set<String> accountsInGlitchMode;
 
+	/**
+	 * Pleroma
+	 */
+	public static String replyVisibility;
+
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
@@ -91,12 +99,16 @@ public class GlobalUserPreferences{
 		bottomEncoding=prefs.getBoolean("bottomEncoding", false);
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
+		autoHideFab=prefs.getBoolean("autoHideFab", true);
+		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
+		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", null), recentLanguagesType, new HashMap<>());
 		pinnedTimelines=fromJson(prefs.getString("pinnedTimelines", null), pinnedTimelinesType, new HashMap<>());
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
+		replyVisibility=prefs.getString("replyVisibility", null);
 
 		try {
 			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
@@ -131,14 +143,18 @@ public class GlobalUserPreferences{
 				.putBoolean("prefixRepliesWithRe", prefixRepliesWithRe)
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
+				.putBoolean("autoHideFab", autoHideFab)
+				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
+				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
 				.putString("pinnedTimelines", gson.toJson(pinnedTimelines))
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
+				.putString("replyVisibility", replyVisibility)
 				.apply();
 	}
 

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

@@ -5,6 +5,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -16,15 +17,26 @@ import android.util.Log;
 
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
+import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
+import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.NotificationAction;
+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.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
@@ -37,10 +49,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 
 	public static final int NOTIFICATION_ID=178;
+	private static final String ACTION_KEY_TEXT_REPLY = "ACTION_KEY_TEXT_REPLY";
+
+	private static final int SUMMARY_ID = 791;
 	private static int notificationId = 0;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
+		UiUtils.setUserPreferredTheme(context);
 		if(BuildConfig.DEBUG){
 			Log.e(TAG, "received: "+intent);
 			Bundle extras=intent.getExtras();
@@ -70,6 +86,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
+						E.post(new NotificationReceivedEvent(accountID, pn.notificationId+""));
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){
 									@Override
@@ -91,6 +108,35 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				Log.w(TAG, "onReceive: invalid push notification format");
 			}
 		}
+		if(intent.getBooleanExtra("fromNotificationAction", false)){
+			String accountID=intent.getStringExtra("accountID");
+			int notificationId=intent.getIntExtra("notificationId", -1);
+
+			if (notificationId >= 0){
+				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+				notificationManager.cancel(accountID, notificationId);
+			}
+
+			if(intent.hasExtra("notification")){
+				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+				String statusID=notification.status.id;
+				if (statusID != null) {
+					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
+					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;
+
+					switch (NotificationAction.values()[intent.getIntExtra("notificationAction", 0)]) {
+						case FAVORITE -> new SetStatusFavorited(statusID, true).exec(accountID);
+						case BOOKMARK -> new SetStatusBookmarked(statusID, true).exec(accountID);
+						case REBLOG -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
+						case UNDO_REBLOG -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
+						case REPLY -> handleReplyAction(context, accountID, intent, notification, notificationId, preferences);
+						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
+					}
+				}
+			}else{
+				Log.e(TAG, "onReceive: Failed to load notification");
+			}
+		}
 	}
 
 	private void notify(Context context, PushNotification pn, String accountID, org.joinmastodon.android.model.Notification notification){
@@ -142,7 +188,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.primary_700));
+				.setColor(UiUtils.getThemeColor(context, android.R.attr.colorAccent));
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
@@ -164,6 +210,108 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++, builder.build());
+
+		int id = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++;
+
+		if (notification != null){
+			switch (pn.notificationType){
+				case MENTION, STATUS -> {
+					if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
+						builder.addAction(buildReplyAction(context, id, accountID, notification));
+					}
+					builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_favorite), NotificationAction.FAVORITE));
+					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.add_bookmark), NotificationAction.BOOKMARK));
+					if(notification.status.visibility != StatusPrivacy.DIRECT) {
+						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_reblog), NotificationAction.REBLOG));
+					}
+				}
+				case UPDATE -> {
+					if(notification.status.reblogged)
+						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNDO_REBLOG));
+				}
+			}
+		}
+
+		nm.notify(accountID, id, builder.build());
+	}
+
+	private Notification.Action buildNotificationAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification, String title, NotificationAction action){
+		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
+		notificationIntent.putExtra("notificationId", notificationId);
+		notificationIntent.putExtra("fromNotificationAction", true);
+		notificationIntent.putExtra("accountID", accountID);
+		notificationIntent.putExtra("notificationAction", action.ordinal());
+		notificationIntent.putExtra("notification", Parcels.wrap(notification));
+		PendingIntent actionPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT);
+
+		return new Notification.Action.Builder(null, title, actionPendingIntent).build();
+	}
+
+	private Notification.Action buildReplyAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification){
+		String replyLabel = context.getResources().getString(R.string.button_reply);
+		RemoteInput remoteInput = new RemoteInput.Builder(ACTION_KEY_TEXT_REPLY)
+				.setLabel(replyLabel)
+				.build();
+
+		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
+		notificationIntent.putExtra("notificationId", notificationId);
+		notificationIntent.putExtra("fromNotificationAction", true);
+		notificationIntent.putExtra("accountID", accountID);
+		notificationIntent.putExtra("notificationAction", NotificationAction.REPLY.ordinal());
+		notificationIntent.putExtra("notification", Parcels.wrap(notification));
+
+		int flags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT : PendingIntent.FLAG_UPDATE_CURRENT;
+		PendingIntent replyPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent,flags);
+		return new Notification.Action.Builder(null, replyLabel, replyPendingIntent).addRemoteInput(remoteInput).build();
+	}
+
+	private void handleReplyAction(Context context, String accountID, Intent intent, org.joinmastodon.android.model.Notification notification, int notificationId, Preferences preferences) {
+		Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+		if (remoteInput == null) {
+			Log.e(TAG, "handleReplyAction: Could not get reply input");
+			return;
+		}
+		CharSequence input = remoteInput.getCharSequence(ACTION_KEY_TEXT_REPLY);
+
+		CreateStatus.Request req=new CreateStatus.Request();
+		req.status = input.toString();
+		req.language = preferences.postingDefaultLanguage;
+		req.visibility = preferences.postingDefaultVisibility;
+		req.inReplyToId = notification.status.id;
+		if(!notification.status.spoilerText.isEmpty() && GlobalUserPreferences.prefixRepliesWithRe && !notification.status.spoilerText.startsWith("re: ")){
+			req.spoilerText = "re: " + notification.status.spoilerText;
+		}
+
+		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<Status>() {
+			@Override
+			public void onSuccess(Status status) {
+				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+				Notification.Builder builder = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ?
+						new Notification.Builder(context, accountID+"_"+notification.type) :
+						new Notification.Builder(context)
+								.setPriority(Notification.PRIORITY_DEFAULT)
+								.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+
+				notification.status = status;
+				Intent contentIntent=new Intent(context, MainActivity.class);
+				contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+				contentIntent.putExtra("fromNotification", true);
+				contentIntent.putExtra("accountID", accountID);
+				contentIntent.putExtra("notification", Parcels.wrap(notification));
+
+				Notification repliedNotification = builder.setSmallIcon(R.drawable.ic_ntf_logo)
+						.setContentTitle(context.getString(R.string.sk_notification_action_replied, notification.status.account.displayName))
+						.setContentText(status.getStrippedText())
+						.setCategory(Notification.CATEGORY_SOCIAL)
+						.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+						.build();
+				notificationManager.notify(accountID, notificationId, repliedNotification);
+			}
+
+			@Override
+			public void onError(ErrorResponse errorResponse) {
+
+			}
+		}).exec(accountID);
 	}
 }

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

@@ -11,7 +11,7 @@ public class ApiUtils{
 		//no instance
 	}
 
-	public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
+public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
 		return e.stream().map(ev->{
 			try{
 				SerializedName annotation=cls.getField(ev.name()).getAnnotation(SerializedName.class);

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

@@ -13,9 +13,11 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
@@ -126,11 +128,12 @@ public class CacheController{
 		});
 	}
 
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<CacheablePaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
-				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
+				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(accountID);
+				List<Filter> filters=accountSession.wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
@@ -153,18 +156,19 @@ public class CacheController{
 								result.add(ntf);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							uiHandler.post(()->callback.onSuccess(new PaginatedResponse<>(result, _newMaxID)));
+							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
 					}catch(IOException x){
 						Log.w(TAG, "getNotifications: corrupted notification object in database", x);
 					}
 				}
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
+				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
-								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
 										for(Filter filter:filters){
 											if(filter.matches(ntf.status)){
@@ -173,7 +177,7 @@ public class CacheController{
 										}
 									}
 									return true;
-								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
+								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
 

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

@@ -16,6 +16,7 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.model.Status;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -40,12 +41,15 @@ import okhttp3.ResponseBody;
 
 public class MastodonAPIController{
 	private static final String TAG="MastodonAPIController";
-	public static final Gson gson=new GsonBuilder()
+	public static final Gson gsonWithoutDeserializer = new GsonBuilder()
 			.disableHtmlEscaping()
 			.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
 			.registerTypeAdapter(Instant.class, new IsoInstantTypeAdapter())
 			.registerTypeAdapter(LocalDate.class, new IsoLocalDateTypeAdapter())
 			.create();
+	public static final Gson gson = gsonWithoutDeserializer.newBuilder()
+			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
+			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
 	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 

mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.markers;
+
+import org.joinmastodon.android.api.ApiUtils;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Marker;
+import org.joinmastodon.android.model.Markers;
+
+import java.util.EnumSet;
+
+public class GetMarkers extends MastodonAPIRequest<Markers> {
+	public GetMarkers(EnumSet<Marker.Type> timelines) {
+		super(HttpMethod.GET, "/markers", Markers.class);
+		for (String type : ApiUtils.enumSetToStrings(timelines, Marker.Type.class)){
+			addQueryParameter("timeline[]", type);
+		}
+	}
+}

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

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.api.requests.notifications;
 
-import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.ApiUtils;
@@ -11,18 +10,24 @@ import java.util.EnumSet;
 import java.util.List;
 
 public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
-	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes){
+	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes, boolean isPleromaInstance){
 		super(HttpMethod.GET, "/notifications", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 		if(includeTypes!=null){
-			for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
-				addQueryParameter("types[]", type);
-			}
-			for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
-				addQueryParameter("exclude_types[]", type);
+			if(!isPleromaInstance) {
+				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
+					addQueryParameter("types[]", type);
+				}
+				for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
+					addQueryParameter("exclude_types[]", type);
+				}
+			}else{
+				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
+					addQueryParameter("include_types[]", type);
+				}
 			}
 		}
 		removeUnsupportedItems=true;

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java

@@ -45,6 +45,8 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 		public Instant scheduledAt;
 		public String language;
 
+		public String quoteId;
+
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();
 			public int expiresIn;

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHomeTimeline.java

@@ -2,6 +2,7 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -18,5 +19,7 @@ public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
+		if(GlobalUserPreferences.replyVisibility != null)
+			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

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

@@ -7,6 +7,7 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.Token;
@@ -31,6 +32,7 @@ public class AccountSession{
 	public String pushAccountID;
 	public Preferences preferences;
 	public AccountActivationInfo activationInfo;
+	public Markers markers;
 	private transient MastodonAPIController apiController;
 	private transient StatusInteractionController statusInteractionController, remoteStatusInteractionController;
 	private transient CacheController cacheController;

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

@@ -25,6 +25,7 @@ import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
 import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
+import org.joinmastodon.android.api.requests.markers.GetMarkers;
 import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
 import org.joinmastodon.android.events.EmojiUpdatedEvent;
 import org.joinmastodon.android.model.Account;
@@ -33,6 +34,8 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.Marker;
+import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Token;
 
@@ -46,6 +49,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -255,6 +259,7 @@ public class AccountSessionManager{
 //			if(now-session.filtersLastUpdated>3600_000L){
 			updateSessionWordFilters(session);
 //			}
+			updateSessionMarkers(session);
 		}
 		if(loadedInstances){
 			maybeUpdateCustomEmojis(domains);
@@ -271,6 +276,15 @@ public class AccountSessionManager{
 		}
 	}
 
+	private void preferencesFromSource(AccountSession session, Account account) {
+		if (account != null && account.source != null && session.preferences != null) {
+			if (account.source.privacy != null)
+				session.preferences.postingDefaultVisibility = account.source.privacy;
+			if (account.source.language != null)
+				session.preferences.postingDefaultLanguage = account.source.language;
+		}
+	}
+
 	private void updateSessionLocalInfo(AccountSession session){
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
@@ -278,13 +292,12 @@ public class AccountSessionManager{
 					public void onSuccess(Account result){
 						session.self=result;
 						session.infoLastUpdated=System.currentTimeMillis();
+						preferencesFromSource(session, result);
 						writeAccountsFile();
 					}
 
 					@Override
-					public void onError(ErrorResponse error){
-
-					}
+					public void onError(ErrorResponse error){}
 				})
 				.exec(session.getID());
 	}
@@ -294,10 +307,14 @@ public class AccountSessionManager{
 			@Override
 			public void onSuccess(Preferences preferences) {
 				session.preferences=preferences;
+				preferencesFromSource(session, session.self);
 			}
 
 			@Override
-			public void onError(ErrorResponse error) {}
+			public void onError(ErrorResponse error) {
+				session.preferences = new Preferences();
+				preferencesFromSource(session, session.self);
+			}
 		}).exec(session.getID());
 	}
 
@@ -319,6 +336,21 @@ public class AccountSessionManager{
 				.exec(session.getID());
 	}
 
+	private void updateSessionMarkers(AccountSession session) {
+		new GetMarkers(EnumSet.allOf(Marker.Type.class)).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Markers markers) {
+				session.markers = markers;
+				writeAccountsFile();
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+
+			}
+		}).exec(session.getID());
+	}
+
 	public void updateInstanceInfo(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){

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

@@ -0,0 +1,4 @@
+package org.joinmastodon.android.events;
+
+public class AllNotificationsSeenEvent {
+}

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

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.events;
+
+public class NotificationReceivedEvent {
+	public String account, id;
+	public NotificationReceivedEvent(String account, String id) {
+		this.account = account;
+		this.id = id;
+	}
+}

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

@@ -3,6 +3,10 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
+import android.view.animation.TranslateAnimation;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;

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

@@ -16,6 +16,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.Toolbar;
 
@@ -31,12 +32,10 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-import org.joinmastodon.android.ui.TileGridLayoutManager;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -44,8 +43,10 @@ import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
+import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout;
+import org.joinmastodon.android.ui.views.MediaGridLayout;
+import org.joinmastodon.android.utils.TypedObjectPool;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -56,13 +57,11 @@ import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -70,15 +69,17 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends BaseRecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
 	protected PhotoViewer currentPhotoViewer;
+	protected ImageButton fab;
+	protected int scrollDiff = 0;
 	protected HashMap<String, Account> knownAccounts=new HashMap<>();
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
-	protected ImageButton fab;
+	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -188,21 +189,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	@Override
-	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex){
-		final Status status=_status.reblog!=null ? _status.reblog : _status;
+	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
+		final Status status=_status.getContentStatus();
 		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
-			private ImageStatusDisplayItem.Holder<?> transitioningHolder;
+			private MediaAttachmentViewController transitioningHolder;
 
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					holder.photo.setAlpha(visible ? 1f : 0f);
 			}
 
 			@Override
 			public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
 				if(holder!=null){
 					transitioningHolder=holder;
 					View view=transitioningHolder.photo;
@@ -210,7 +211,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					view.getLocationOnScreen(pos);
 					outRect.set(pos[0], pos[1], pos[0]+view.getWidth(), pos[1]+view.getHeight());
 					list.setClipChildren(false);
-					transitioningHolder.itemView.setElevation(1f);
+					gridHolder.setClipChildren(false);
+					transitioningHolder.view.setElevation(1f);
 					return true;
 				}
 				return false;
@@ -237,15 +239,16 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				view.setTranslationY(0f);
 				view.setScaleX(1f);
 				view.setScaleY(1f);
-				transitioningHolder.itemView.setElevation(0f);
+				transitioningHolder.view.setElevation(0f);
 				if(list!=null)
 					list.setClipChildren(true);
+				gridHolder.setClipChildren(true);
 				transitioningHolder=null;
 			}
 
 			@Override
 			public Drawable getPhotoViewCurrentDrawable(int index){
-				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
+				MediaAttachmentViewController holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					return holder.photo.getDrawable();
 				return null;
@@ -261,23 +264,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				requestPermissions(permissions, PhotoViewer.PERMISSION_REQUEST);
 			}
 
-			private ImageStatusDisplayItem.Holder<?> findPhotoViewHolder(int index){
-				if(list==null)
-					return null;
-				int offset=0;
-				for(StatusDisplayItem item:displayItems){
-					if(item.parentID.equals(parentID)){
-						if(item instanceof ImageStatusDisplayItem){
-							RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(getMainAdapterOffset()+offset+index);
-							if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
-								return imgHolder;
-							}
-							return null;
-						}
-					}
-					offset++;
-				}
-				return null;
+			private MediaAttachmentViewController findPhotoViewHolder(int index){
+				return gridHolder.getViewController(index);
 			}
 		});
 	}
@@ -285,11 +273,40 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
+
+				if (fab!=null && GlobalUserPreferences.autoHideFab) {
+					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
+						TranslateAnimation animate = new TranslateAnimation(
+								0,
+								0,
+								0,
+								fab.getHeight() * 2);
+						animate.setDuration(300);
+						fab.startAnimation(animate);
+						fab.setVisibility(View.INVISIBLE);
+						scrollDiff = 0;
+					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
+						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
+							fab.setVisibility(View.VISIBLE);
+							TranslateAnimation animate = new TranslateAnimation(
+									0,
+									0,
+									fab.getHeight() * 2,
+									0);
+							animate.setDuration(300);
+							fab.startAnimation(animate);
+							scrollDiff = 0;
+						} else {
+							scrollDiff += Math.abs(dy);
+						}
+					}
+				}
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());
@@ -327,38 +344,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		updateToolbar();
 
 		if (withComposeButton()) {
-			fab = view.findViewById(R.id.fab);
 			fab.setVisibility(View.VISIBLE);
 			fab.setOnClickListener(this::onFabClick);
 			fab.setOnLongClickListener(this::onFabLongClick);
 		}
 	}
 
-	@Override
-	protected RecyclerView.LayoutManager onCreateLayoutManager(){
-		GridLayoutManager lm=new TileGridLayoutManager(getActivity(), 1000);
-		lm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup(){
-			@Override
-			public int getSpanSize(int position){
-				position-=getMainAdapterOffset();
-				if(position>=0 && position<displayItems.size()){
-					StatusDisplayItem item=displayItems.get(position);
-					if(item instanceof ImageStatusDisplayItem imgItem){
-						PhotoLayoutHelper.TiledLayoutResult layout=imgItem.tiledLayout;
-						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgItem.thisTile;
-						int spans=0;
-						for(int i=0;i<tile.colSpan;i++){
-							spans+=layout.columnSizes[tile.startCol+i];
-						}
-						return spans;
-					}
-				}
-				return 1000;
-			}
-		});
-		return lm;
-	}
-
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
 		super.onConfigurationChanged(newConfig);
@@ -477,7 +468,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		revealSpoiler(status, holder.getItemID());
 	}
 
-	public void onRevealSpoilerClick(ImageStatusDisplayItem.Holder<?> holder){
+	public void onRevealSpoilerClick(MediaGridStatusDisplayItem.Holder holder){
 		Status status=holder.getItem().status;
 		revealSpoiler(status, holder.getItemID());
 	}
@@ -511,7 +502,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			holder.getItem().status.textExpandable = expandable;
 			HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
 			if (header != null) header.rebind();
-			holder.rebind();
 		}
 	}
 
@@ -525,13 +515,14 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	protected void updateImagesSpoilerState(Status status, String itemID){
 		ArrayList<Integer> updatedPositions=new ArrayList<>();
-		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
-			photo.setRevealed(status.spoilerRevealed);
-			updatedPositions.add(photo.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		MediaGridStatusDisplayItem.Holder mediaGrid=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+		if(mediaGrid!=null){
+			mediaGrid.setRevealed(status.spoilerRevealed);
+			updatedPositions.add(mediaGrid.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		}
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(itemID.equals(item.parentID) && item instanceof ImageStatusDisplayItem && !updatedPositions.contains(i)){
+			if(itemID.equals(item.parentID) && item instanceof MediaGridStatusDisplayItem && !updatedPositions.contains(i)){
 				adapter.notifyItemChanged(i);
 			}
 			i++;
@@ -674,6 +665,15 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		return UiUtils.pickAccountForCompose(getActivity(), accountID);
 	}
 
+	private MediaAttachmentViewController makeNewMediaAttachmentView(MediaGridStatusDisplayItem.GridItemType type){
+		return new MediaAttachmentViewController(getActivity(), type);
+	}
+
+	public TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> getAttachmentViewsPool(){
+		return attachmentViewsPool;
+	}
+
+
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
 
 		public DisplayItemsAdapter(){
@@ -711,16 +711,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		public ImageLoaderRequest getImageRequest(int position, int image){
 			return displayItems.get(position).getImageRequest(image);
 		}
-
-//		@Override
-//		public void onViewDetachedFromWindow(@NonNull BindableViewHolder<StatusDisplayItem> holder){
-//			if(holder instanceof ImageLoaderViewHolder){
-//				int count=holder.getItem().getImageCount();
-//				for(int i=0;i<count;i++){
-//					((ImageLoaderViewHolder) holder).clearImage(i);
-//				}
-//			}
-//		}
 	}
 
 	private class StatusListItemDecoration extends RecyclerView.ItemDecoration{
@@ -754,25 +744,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 						hiddenMediaPaint.setColor(0x80000000);
-						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
-						float hGap=tile.startCol>0 ? V.dp(1) : 0;
-						float vGap=tile.startRow>0 ? V.dp(1) : 0;
-						c.drawRect(child.getX()-hGap, child.getY()-vGap, child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
+						c.drawRect(child.getX(), child.getY(), child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
 					}
 				}
 			}
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed){
-						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
-						if(tile.startCol==0 && tile.startRow==0 && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
+						if(TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 							int listWidth=getListWidthForMediaLayout();
-							int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
+							int width=Math.min(listWidth, V.dp(MediaGridLayout.MAX_WIDTH));
 							if(currentMediaHiddenLayoutsWidth!=width)
 								rebuildMediaHiddenLayouts(width-V.dp(32));
 							c.save();
@@ -797,47 +783,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 		}
 
-		@Override
-		public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-			RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
-			if(holder instanceof ImageStatusDisplayItem.Holder){
-				int listWidth=getListWidthForMediaLayout();
-				int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
-				PhotoLayoutHelper.TiledLayoutResult layout=((ImageStatusDisplayItem.Holder<?>) holder).getItem().tiledLayout;
-				PhotoLayoutHelper.TiledLayoutResult.Tile tile=((ImageStatusDisplayItem.Holder<?>) holder).getItem().thisTile;
-				if(tile.startCol+tile.colSpan<layout.columnSizes.length){
-					outRect.right=V.dp(1);
-				}
-				if(tile.startRow+tile.rowSpan<layout.rowSizes.length){
-					outRect.bottom=V.dp(1);
-				}
-
-				// For a view that spans rows, compensate its additional height so the row it's in stays the right height
-				if(tile.rowSpan>1){
-					outRect.bottom=-(Math.round(tile.height/1000f*width)-Math.round(layout.rowSizes[tile.startRow]/1000f*width));
-				}
-				// ...and for its siblings, offset those on rows below first to the right where they belong
-				if(tile.startCol>0 && layout.tiles[0].rowSpan>1 && tile.startRow>layout.tiles[0].startRow){
-					int xOffset=Math.round(layout.tiles[0].width/1000f*listWidth);
-					outRect.left=xOffset;
-					outRect.right=-xOffset;
-				}
-
-				// If the width of the media block is smaller than that of the RecyclerView, offset the views horizontally to center them
-				if(listWidth>width){
-					outRect.left+=(listWidth-V.dp(ImageAttachmentFrameLayout.MAX_WIDTH))/2;
-					if(tile.startCol>0){
-						int spanOffset=0;
-						for(int i=0;i<tile.startCol;i++){
-							spanOffset+=layout.columnSizes[i];
-						}
-						outRect.left-=Math.round(spanOffset/1000f*listWidth);
-						outRect.left+=Math.round(spanOffset/1000f*width);
-					}
-				}
-			}
-		}
-
 		private void rebuildMediaHiddenLayouts(int width){
 			currentMediaHiddenLayoutsWidth=width;
 			String title=getString(R.string.sensitive_content);

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

@@ -109,7 +109,7 @@ import org.joinmastodon.android.ui.text.ComposeAutocompleteSpan;
 import org.joinmastodon.android.ui.text.ComposeHashtagOrMentionSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.ui.utils.TransferSpeedTracker;
+import org.joinmastodon.android.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ComposeEditText;
 import org.joinmastodon.android.ui.views.ComposeMediaLayout;
@@ -204,6 +204,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private List<EmojiCategory> customEmojis;
 	private CustomEmojiPopupKeyboard emojiKeyboard;
 	private Status replyTo;
+	private Status quote;
 	private String initialText;
 	private String uuid;
 	private int pollDuration=24*3600;
@@ -252,6 +253,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
 		if(getArguments().containsKey("replyTo"))
 			replyTo=Parcels.unwrap(getArguments().getParcelable("replyTo"));
+		if(getArguments().containsKey("quote"))
+			quote=Parcels.unwrap(getArguments().getParcelable("quote"));
 		if(instance==null){
 			Nav.finish(this);
 			return;
@@ -333,7 +336,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		scheduleTimeBtn=view.findViewById(R.id.scheduled_time_btn);
 		sensitiveIcon=view.findViewById(R.id.sensitive_icon);
 		sensitiveItem=view.findViewById(R.id.sensitive_item);
-		replyText=view.findViewById(R.id.reply_text);
+		replyText=view.findViewById(GlobalUserPreferences.replyLineAboveHeader ? R.id.reply_text : R.id.reply_text_below);
+		view.findViewById(GlobalUserPreferences.replyLineAboveHeader ? R.id.reply_text_below : R.id.reply_text)
+				.setVisibility(View.GONE);
 
 		if (isPhotoPickerAvailable()) {
 			PopupMenu attachPopup = new PopupMenu(getContext(), mediaBtn);
@@ -605,7 +610,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		});
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
-		if(replyTo!=null){
+		if(replyTo!=null || quote!=null){
+			Status status = quote!=null ? quote : replyTo;
 			View replyWrap = view.findViewById(R.id.reply_wrap);
 			scrollView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
 				int scrollHeight = scrollView.getHeight();
@@ -631,13 +637,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			originalPost.setOnClickListener(v->{
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				args.putParcelable("status", Parcels.wrap(replyTo));
+				args.putParcelable("status", Parcels.wrap(status));
 				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ThreadFragment.class, args);
 			});
 
 			ImageView avatar = view.findViewById(R.id.avatar);
-			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(replyTo.account.avatar));
+			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(status.account.avatar));
 			ViewOutlineProvider roundCornersOutline=new ViewOutlineProvider(){
 				@Override
 				public void getOutline(View view, Outline outline){
@@ -649,15 +655,15 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			avatar.setOnClickListener(v->{
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
-				args.putParcelable("profileAccount", Parcels.wrap(replyTo.account));
+				args.putParcelable("profileAccount", Parcels.wrap(status.account));
 				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			});
 
-			((TextView) view.findViewById(R.id.name)).setText(replyTo.account.displayName);
-			((TextView) view.findViewById(R.id.username)).setText(replyTo.account.getDisplayUsername());
+			((TextView) view.findViewById(R.id.name)).setText(status.account.displayName);
+			((TextView) view.findViewById(R.id.username)).setText(status.account.getDisplayUsername());
 			view.findViewById(R.id.visibility).setVisibility(View.GONE);
-			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
+			Drawable visibilityIcon = getActivity().getDrawable(switch(status.visibility){
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular;
 				case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled;
@@ -668,36 +674,37 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			moreBtn.setImageDrawable(visibilityIcon);
 			moreBtn.setBackground(null);
 			TextView timestamp = view.findViewById(R.id.timestamp);
-			if (replyTo.editedAt==null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), replyTo.createdAt));
-			else timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), replyTo.editedAt)));
-			if (replyTo.spoilerText != null && !replyTo.spoilerText.isBlank()) {
+			if (status.editedAt!=null) timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), status.editedAt)));
+			else if (status.createdAt!=null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), status.createdAt));
+			else timestamp.setText("");
+			if (status.spoilerText != null && !status.spoilerText.isBlank()) {
 				view.findViewById(R.id.spoiler_header).setVisibility(View.VISIBLE);
-				((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(replyTo.spoilerText);
+				((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(status.spoilerText);
 			}
 
-			SpannableStringBuilder content = HtmlParser.parse(replyTo.content, replyTo.emojis, replyTo.mentions, replyTo.tags, accountID);
+			SpannableStringBuilder content = HtmlParser.parse(status.content, status.emojis, status.mentions, status.tags, accountID);
 			LinkedTextView text = view.findViewById(R.id.text);
 			if (content.length() > 0) text.setText(content);
 			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 
-			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			int visibilityNameRes = switch (replyTo.visibility) {
+			replyText.setText(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.displayName));
+			int visibilityNameRes = switch (status.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
 				case DIRECT -> R.string.visibility_private;
 				case LOCAL -> R.string.sk_local_only;
 			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
+			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
 
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
-			if(!replyTo.account.id.equals(ownID))
-				mentions.add('@'+replyTo.account.acct);
-			for(Mention mention:replyTo.mentions){
+			if(!status.account.id.equals(ownID))
+				mentions.add('@'+status.account.acct);
+			for(Mention mention:status.mentions){
 				if(mention.id.equals(ownID))
 					continue;
 				String m='@'+mention.acct;
@@ -710,17 +717,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				ignoreSelectionChanges=true;
 				mainEditText.setSelection(mainEditText.length());
 				ignoreSelectionChanges=false;
-				if(!TextUtils.isEmpty(replyTo.spoilerText)){
+				if(!TextUtils.isEmpty(status.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
-					if(GlobalUserPreferences.prefixRepliesWithRe && !replyTo.spoilerText.startsWith("re: ")){
-						spoilerEdit.setText("re: " + replyTo.spoilerText);
+					if(GlobalUserPreferences.prefixRepliesWithRe && !status.spoilerText.startsWith("re: ")){
+						spoilerEdit.setText("re: " + status.spoilerText);
 					}else{
-						spoilerEdit.setText(replyTo.spoilerText);
+						spoilerEdit.setText(status.spoilerText);
 					}
 					spoilerBtn.setSelected(true);
 				}
-				if (replyTo.language != null && !replyTo.language.isEmpty()) updateLanguage(replyTo.language);
+				if (status.language != null && !status.language.isEmpty()) updateLanguage(status.language);
 			}
 		}else if (editingStatus==null || editingStatus.inReplyToId==null){
 			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
@@ -971,9 +978,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onCustomEmojiClick(Emoji emoji){
-		int start=mainEditText.getSelectionStart();
-		String prefix=start>0 && !Character.isWhitespace(mainEditText.getText().charAt(start-1)) ? " :" : ":";
-		mainEditText.getText().replace(start, mainEditText.getSelectionEnd(), prefix+emoji.shortcode+':');
+		if(getActivity().getCurrentFocus() instanceof EditText edit){
+			int start=edit.getSelectionStart();
+			String prefix=start>0 && !Character.isWhitespace(edit.getText().charAt(start-1)) ? " :" : ":";
+			edit.getText().replace(start, edit.getSelectionEnd(), prefix+emoji.shortcode+':');
+		}
 	}
 
 	@Override
@@ -1085,6 +1094,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(hasSpoiler && spoilerEdit.length()>0){
 			req.spoilerText=spoilerEdit.getText().toString();
 		}
+		if(quote != null){
+			req.quoteId=quote.id;
+		}
 		if(uuid==null)
 			uuid=UUID.randomUUID().toString();
 
@@ -1117,7 +1129,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					}else{
 						E.post(new StatusUpdatedEvent(result));
 					}
-					Nav.finish(ComposeFragment.this);
+					if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !isStateSaved()) {
+						Nav.finish(ComposeFragment.this);
+					}
 					if (getArguments().getBoolean("navigateToStatus", false)) {
 						Bundle args=new Bundle();
 						args.putString("account", accountID);

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

@@ -47,11 +47,10 @@ import java.util.Map;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class EditTimelinesFragment extends BaseRecyclerFragment<TimelineDefinition> implements ScrollableToTop {
+public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition> implements ScrollableToTop {
     private String accountID;
     private TimelinesAdapter adapter;
     private final ItemTouchHelper itemTouchHelper;

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

@@ -38,7 +38,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -47,7 +46,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
+public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;

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

@@ -16,11 +16,10 @@ import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop {
+public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop {
     private String nextMaxID;
     private String accountId;
 

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

@@ -16,21 +16,34 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.AllNotificationsSeenEvent;
+import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
+
+import com.squareup.otto.Subscribe;
+
 import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
@@ -48,6 +61,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private TabBar tabBar;
 	private View tabBarWrap;
 	private ImageView tabBarAvatar;
+	private ImageView notificationTabIcon;
 	@IdRes
 	private int currentTab=R.id.tab_home;
 
@@ -56,6 +70,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_app_name);
 
@@ -108,6 +123,9 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28)));
 
+		notificationTabIcon=content.findViewById(R.id.tab_notifications);
+		updateNotificationBadge();
+
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.fragment_wrap, homeTabFragment)
@@ -267,4 +285,46 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
 		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
+
+	public void updateNotificationBadge() {
+		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
+		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+
+		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.pleroma != null)
+				.setCallback(new Callback<>() {
+					@Override
+					public void onSuccess(List<Notification> notifications) {
+						if (notifications.size() > 0) {
+							try {
+								long newestId = Long.parseLong(notifications.get(0).id);
+								long lastSeenId = Long.parseLong(session.markers.notifications.lastReadId);
+								setNotificationBadge(newestId > lastSeenId);
+							} catch (Exception ignored) {
+								setNotificationBadge(false);
+							}
+						}
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						setNotificationBadge(false);
+					}
+				}).exec(accountID);
+	}
+
+	public void setNotificationBadge(boolean badge) {
+		notificationTabIcon.setImageResource(badge
+				? R.drawable.ic_fluent_alert_28_selector_badged
+				: R.drawable.ic_fluent_alert_28_selector);
+	}
+
+	@Subscribe
+	public void onNotificationReceived(NotificationReceivedEvent notificationReceivedEvent) {
+		if (notificationReceivedEvent.account.equals(accountID)) setNotificationBadge(true);
+	}
+
+	@Subscribe
+	public void onAllNotificationsSeen(AllNotificationsSeenEvent allNotificationsSeenEvent) {
+		setNotificationBadge(false);
+	}
 }

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

@@ -358,7 +358,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		addListsToOverflowMenu();
 		addHashtagsToOverflowMenu();
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
 			m.setGroupDividerEnabled(true);
 		}
 	}

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

@@ -166,6 +166,10 @@ public class HomeTimelineFragment extends StatusListFragment {
 					}
 				})
 				.exec(accountID);
+
+		if (parent.getParentFragment() instanceof HomeFragment homeFragment) {
+			homeFragment.updateNotificationBadge();
+		}
 	}
 
 	@Override

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

@@ -37,11 +37,10 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
+public class ListTimelinesFragment extends RecyclerFragment<ListTimeline> implements ScrollableToTop {
 	private String accountId;
 	private String profileAccountId;
 	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();

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

@@ -232,7 +232,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
+			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
 			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);

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

@@ -11,17 +11,17 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
@@ -40,7 +40,6 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.V;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
@@ -97,14 +96,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		};
 		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, extraText, n, null) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS, titleItem);
-			if(titleItem!=null){
-				for(StatusDisplayItem item:items){
-					if(item instanceof ImageStatusDisplayItem imgItem){
-						imgItem.horizontalInset=V.dp(32);
-					}
-				}
-			}
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS);
+			if(titleItem!=null)
+				items.add(0, titleItem);
 			return items;
 		}else if(titleItem!=null){
 			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this,
@@ -125,6 +119,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			knownAccounts.put(s.account.id, s.account);
 		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
 			knownAccounts.put(s.status.account.id, s.status.account);
+		if(s.status!=null && s.status.reblog!=null && !knownAccounts.containsKey(s.status.reblog.account.id))
+			knownAccounts.put(s.status.reblog.account.id, s.status.reblog.account);
 	}
 
 	@Override
@@ -133,7 +129,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
-					public void onSuccess(PaginatedResponse<List<Notification>> result){
+					public void onSuccess(CacheablePaginatedResponse<List<Notification>> result){
 						if (getActivity() == null) return;
 						if(refreshing)
 							relationships.clear();
@@ -145,8 +141,12 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
 
-						if(offset==0 && !result.items.isEmpty()){
+						if(offset==0 && !result.items.isEmpty() && !result.isFromCache()){
+							E.post(new AllNotificationsSeenEvent());
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
+							AccountSessionManager.getInstance().getAccount(accountID).markers
+									.notifications.lastReadId = result.items.get(0).id;
+							AccountSessionManager.getInstance().writeAccountsFile();
 						}
 					}
 				});

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

@@ -19,24 +19,30 @@ import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
+import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.GlobalUserPreferences;
@@ -142,10 +148,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Uri editNewAvatar, editNewCover;
 	private String profileAccountID;
 	private boolean refreshing;
-	private View fab;
+	private ImageButton fab;
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
+	protected int scrollDiff = 0;
 
 	private static final int MAX_FIELDS=4;
 
@@ -298,6 +305,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 
 		actionButton.setOnClickListener(this::onActionButtonClick);
+		actionButton.setOnLongClickListener(this::onActionButtonLongClick);
 		notifyButton.setOnClickListener(this::onNotifyButtonClick);
 		avatar.setOnClickListener(this::onAvatarClick);
 		cover.setOnClickListener(this::onCoverClick);
@@ -431,6 +439,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
+		RecyclerFragment.setRefreshLayoutColors(refreshLayout);
 	}
 
 	@Override
@@ -489,8 +498,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			for (Account.Role role : account.roles) {
 				TextView roleText = new TextView(getActivity(), null, 0, R.style.role_label);
 				roleText.setText(role.name);
-				GradientDrawable bg = (GradientDrawable) roleText.getBackground().mutate();
-				bg.setStroke(V.dp(2), Color.parseColor(role.color));
+				if (!TextUtils.isEmpty(role.color) && role.color.startsWith("#")) try {
+					GradientDrawable bg = (GradientDrawable) roleText.getBackground().mutate();
+					bg.setStroke(V.dp(2), Color.parseColor(role.color));
+				} catch (Exception ignored) {}
 				rolesView.addView(roleText);
 			}
 		}
@@ -540,10 +551,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		fields.clear();
 
-		AccountField joined=new AccountField();
-		joined.parsedName=joined.name=getString(R.string.profile_joined);
-		joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
-		fields.add(joined);
+		if (account.createdAt != null) {
+			AccountField joined=new AccountField();
+			joined.parsedName=joined.name=getString(R.string.profile_joined);
+			joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
+			fields.add(joined);
+		}
 
 		for(AccountField field:account.fields){
 			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
@@ -599,6 +612,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
 		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
+		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
+		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
+		openWithAccounts.setVisible(hasMultipleAccounts);
+		SubMenu accountsMenu = openWithAccounts.getSubMenu();
+		if (hasMultipleAccounts) {
+			accountsMenu.clear();
+			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
+					getActivity(), s.getID(), account.url, false
+			));
+		}
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
 		if(isOwnProfile)
 			return;
@@ -734,6 +757,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
+	public ImageButton getFab() {
+		return fab;
+	}
+
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){
@@ -764,6 +791,35 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(currentPhotoViewer!=null){
 			currentPhotoViewer.offsetView(0, oldScrollY-scrollY);
 		}
+
+		if (GlobalUserPreferences.autoHideFab) {
+			int dy = scrollY - oldScrollY;
+			if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
+				TranslateAnimation animate = new TranslateAnimation(
+						0,
+						0,
+						0,
+						fab.getHeight() * 2);
+				animate.setDuration(300);
+				fab.startAnimation(animate);
+				fab.setVisibility(View.INVISIBLE);
+				scrollDiff = 0;
+			} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
+				if (v.getScrollY() == 0 || scrollDiff > 400) {
+					fab.setVisibility(View.VISIBLE);
+					TranslateAnimation animate = new TranslateAnimation(
+							0,
+							0,
+							fab.getHeight() * 2,
+							0);
+					animate.setDuration(300);
+					fab.startAnimation(animate);
+					scrollDiff = 0;
+				} else {
+					scrollDiff += Math.abs(dy);
+				}
+			}
+		}
 	}
 
 	private Fragment getFragmentForPage(int page){
@@ -792,6 +848,31 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
+	private boolean onActionButtonLongClick(View v) {
+		if (isOwnProfile || AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
+		UiUtils.pickAccount(getActivity(), accountID, R.string.sk_follow_as, R.drawable.ic_fluent_person_add_28_regular, session -> {
+			UiUtils.lookupAccount(getActivity(), account, session.getID(), accountID, acc -> {
+				if (acc == null) return;
+				new SetAccountFollowed(acc.id, true, true).setCallback(new Callback<>() {
+					@Override
+					public void onSuccess(Relationship relationship) {
+						Toast.makeText(
+								getActivity(),
+								getString(R.string.sk_followed_as, session.self.getShortUsername()),
+								Toast.LENGTH_SHORT
+						).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(getActivity());
+					}
+				}).exec(session.getID());
+			});
+		}, null);
+		return true;
+	}
+
 	private void setActionProgressVisible(boolean visible){
 		actionButton.setTextVisible(!visible);
 		actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -1055,7 +1136,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
+			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
 			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);

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

@@ -0,0 +1,50 @@
+package org.joinmastodon.android.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+
+
+public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
+	public RecyclerFragment(int perPage) {
+		super(perPage);
+	}
+
+	public RecyclerFragment(int layout, int perPage) {
+		super(layout, perPage);
+	}
+
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		if (refreshLayout != null) setRefreshLayoutColors(refreshLayout);
+	}
+
+	public static void setRefreshLayoutColors(SwipeRefreshLayout l) {
+		List<Integer> colors = new ArrayList<>(Arrays.asList(
+				R.color.primary_600,
+				R.color.red_primary_600,
+				R.color.green_primary_600,
+				R.color.blue_primary_600,
+				R.color.purple_600
+		));
+		int primary = UiUtils.getThemeColorRes(l.getContext(), R.attr.colorPrimary600);
+		if (!colors.contains(primary)) colors.add(0, primary);
+		int offset = colors.indexOf(primary);
+		int[] sorted = new int[colors.size()];
+		for (int i = 0; i < colors.size(); i++) {
+			sorted[i] = colors.get((i + offset) % colors.size());
+		}
+		l.setColorSchemeResources(sorted);
+	}
+}

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

@@ -80,7 +80,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private ArrayList<Item> items=new ArrayList<>();
 	private ThemeItem themeItem;
 	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsButtonItem, glitchModeItem;
+	private SwitchItem showNewPostsButtonItem, glitchModeItem, compactReblogReplyLineItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
 	private boolean needAppRestart;
@@ -213,6 +213,22 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		if (instance.pleroma != null) {
+			items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
+				PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+				popupMenu.inflate(R.menu.reply_visibility);
+				popupMenu.setOnMenuItemClickListener(item -> this.onReplyVisibilityChanged(item, b));
+				b.setOnTouchListener(popupMenu.getDragToOpenListener());
+				b.setOnClickListener(v->popupMenu.show());
+				b.setText(GlobalUserPreferences.replyVisibility == null ?
+						R.string.sk_settings_reply_visibility_all :
+						switch(GlobalUserPreferences.replyVisibility){
+							case "following" -> R.string.sk_settings_reply_visibility_following;
+							case "self" -> R.string.sk_settings_reply_visibility_self;
+							default -> R.string.sk_settings_reply_visibility_all;
+						});
+			}));
+		}
 		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
 			GlobalUserPreferences.showBoosts=i.checked;
 			GlobalUserPreferences.save();
@@ -248,6 +264,26 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_hide_fab, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
+			GlobalUserPreferences.autoHideFab=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+		items.add(new SwitchItem(R.string.sk_reply_line_above_avatar, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.replyLineAboveHeader, i->{
+			GlobalUserPreferences.replyLineAboveHeader=i.checked;
+			GlobalUserPreferences.compactReblogReplyLine=i.checked;
+			compactReblogReplyLineItem.enabled=i.checked;
+			compactReblogReplyLineItem.checked= GlobalUserPreferences.replyLineAboveHeader;
+			if (list.findViewHolderForAdapterPosition(items.indexOf(compactReblogReplyLineItem)) instanceof SwitchViewHolder svh) svh.rebind();
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+		items.add(compactReblogReplyLineItem=new SwitchItem(R.string.sk_compact_reblog_reply_line, R.drawable.ic_fluent_re_order_24_regular, GlobalUserPreferences.compactReblogReplyLine, i->{
+			GlobalUserPreferences.compactReblogReplyLine=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+		compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
 		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
 			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
 			GlobalUserPreferences.save();
@@ -460,6 +496,25 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
+		String pref = null;
+		int id = item.getItemId();
+
+		if (id == R.id.reply_visibility_following) pref = "following";
+		else if (id == R.id.reply_visibility_self) pref = "self";
+
+		GlobalUserPreferences.replyVisibility=pref;
+		GlobalUserPreferences.save();
+		btn.setText(GlobalUserPreferences.replyVisibility == null ?
+				R.string.sk_settings_reply_visibility_all :
+				switch(GlobalUserPreferences.replyVisibility){
+					case "following" -> R.string.sk_settings_reply_visibility_following;
+					case "self" -> R.string.sk_settings_reply_visibility_self;
+					default -> R.string.sk_settings_reply_visibility_all;
+				});
+		return true;
+	}
+
 	private void restartActivityToApplyNewTheme(){
 		// Calling activity.recreate() causes a black screen for like half a second.
 		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.

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

@@ -41,6 +41,8 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected void addAccountToKnown(Status s){
 		if(!knownAccounts.containsKey(s.account.id))
 			knownAccounts.put(s.account.id, s.account);
+		if(s.reblog!=null && !knownAccounts.containsKey(s.reblog.account.id))
+			knownAccounts.put(s.reblog.account.id, s.reblog.account);
 	}
 
 	@Override

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

@@ -5,9 +5,12 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusContext;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
@@ -19,6 +22,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -68,6 +72,30 @@ public class ThreadFragment extends StatusListFragment{
 							data.add(mainStatus);
 							onAppendItems(Collections.singletonList(mainStatus));
 						}
+						AccountSession account=AccountSessionManager.getInstance().getAccount(accountID);
+						Instance instance=AccountSessionManager.getInstance().getInstanceInfo(account.domain);
+						if(instance.pleroma != null){
+							List<String> threadIds=new ArrayList<>();
+							threadIds.add(mainStatus.id);
+							for(Status s:result.descendants){
+								if(threadIds.contains(s.inReplyToId)){
+									threadIds.add(s.id);
+								}
+							}
+							threadIds.add(mainStatus.inReplyToId);
+							for(int i=result.ancestors.size()-1; i >= 0; i--){
+								Status s=result.ancestors.get(i);
+								if(s.inReplyToId != null && threadIds.contains(s.id)){
+									threadIds.add(s.inReplyToId);
+								}
+							}
+
+							result.ancestors=result.ancestors.stream().filter(s -> threadIds.contains(s.id)).collect(Collectors.toList());
+							result.descendants=getDescendantsOrdered(mainStatus.id,
+									result.descendants.stream()
+											.filter(s -> threadIds.contains(s.id))
+											.collect(Collectors.toList()));
+						}
 						result.descendants=filterStatuses(result.descendants);
 						result.ancestors=filterStatuses(result.ancestors);
 						if(footerProgress!=null)
@@ -90,6 +118,24 @@ public class ThreadFragment extends StatusListFragment{
 				.exec(accountID);
 	}
 
+	private List<Status> getDescendantsOrdered(String id, List<Status> statuses){
+		List<Status> out=new ArrayList<>();
+		for(Status s:getDirectDescendants(id, statuses)){
+			out.add(s);
+			getDirectDescendants(s.id, statuses).forEach(d ->{
+				out.add(d);
+				out.addAll(getDescendantsOrdered(d.id, statuses));
+			});
+		}
+		return out;
+	}
+
+	private List<Status> getDirectDescendants(String id, List<Status> statuses){
+		return statuses.stream()
+				.filter(s -> s.inReplyToId.equals(id))
+				.collect(Collectors.toList());
+	}
+
 	private List<Status> filterStatuses(List<Status> statuses){
 		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
 		return statuses.stream()

mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java

@@ -25,6 +25,7 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Relationship;
@@ -48,7 +49,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -57,7 +57,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseAccountListFragment.AccountItem>{
+public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccountListFragment.AccountItem> {
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected String accountID;
 	protected ArrayList<APIRequest<?>> relationshipsRequests=new ArrayList<>();
@@ -295,7 +295,6 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
 			menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
@@ -309,7 +308,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
-				manageUserLists.setVisible(true);
+				manageUserLists.setVisible(false);
 			}
 			menu.findItem(R.id.block_domain).setVisible(false);
 

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

@@ -17,6 +17,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FollowSuggestion;
@@ -40,7 +41,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -49,7 +49,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop {
+public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;

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

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
 import org.joinmastodon.android.fragments.IsOnTop;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -26,7 +27,6 @@ import java.util.stream.Collectors;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -35,7 +35,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements ScrollableToTop, IsOnTop {
+public class DiscoverNewsFragment extends RecyclerFragment<Card> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private List<ImageLoaderRequest> imageRequests=Collections.emptyList();
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS);

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

@@ -247,7 +247,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult> impleme
 	}
 
 	public void setQuery(String q){
-		if(Objects.equals(q, currentQuery))
+		if(Objects.equals(q, currentQuery) || q.isBlank())
 			return;
 		if(currentRequest!=null){
 			currentRequest.cancel();

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

@@ -8,6 +8,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
 import org.joinmastodon.android.fragments.IsOnTop;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -20,11 +21,10 @@ import java.util.List;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop {
+public class TrendingHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS);
 

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -17,6 +17,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -44,7 +45,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -52,7 +52,7 @@ import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
 
-abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
+abstract class InstanceCatalogFragment extends RecyclerFragment<CatalogInstance> {
 	protected RecyclerView.Adapter adapter;
 	protected MergeRecyclerAdapter mergeAdapter;
 	protected CatalogInstance chosenInstance;
@@ -75,7 +75,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	private static final double DUNBAR=Math.log(800);
 
 	public InstanceCatalogFragment(int layout, int perPage){
-		super(layout, perPage);
+	super(layout, perPage);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java

@@ -21,6 +21,7 @@ import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.RecyclerFragment;
 import org.joinmastodon.android.model.FollowSuggestion;
 import org.joinmastodon.android.model.ParsedAccount;
 import org.joinmastodon.android.model.Relationship;
@@ -43,7 +44,6 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -52,7 +52,7 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class OnboardingFollowSuggestionsFragment extends BaseRecyclerFragment<ParsedAccount>{
+public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<ParsedAccount> {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;

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

@@ -22,10 +22,8 @@ import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -132,22 +130,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 				if(holder.getAbsoluteAdapterPosition()==0)
 					return;
 				outRect.left=V.dp(40);
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
-					PhotoLayoutHelper.TiledLayoutResult layout=imgHolder.getItem().tiledLayout;
-					PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
-					String siblingID;
-					if(holder.getAbsoluteAdapterPosition()<parent.getAdapter().getItemCount()-1){
-						siblingID=displayItems.get(holder.getAbsoluteAdapterPosition()-getMainAdapterOffset()+1).parentID;
-					}else{
-						siblingID=null;
-					}
-					if(tile.startCol>0)
-						outRect.left=0;
-					outRect.left+=V.dp(16);
-					outRect.right=V.dp(16);
-					if(!imgHolder.getItemID().equals(siblingID) || tile.startRow+tile.rowSpan==layout.rowSizes.length)
-						outRect.bottom=V.dp(16);
-				}else if(holder instanceof AudioStatusDisplayItem.Holder){
+				if(holder instanceof AudioStatusDisplayItem.Holder){
 					outRect.bottom=V.dp(16);
 				}else if(holder instanceof LinkCardStatusDisplayItem.Holder){
 					outRect.bottom=V.dp(16);
@@ -166,10 +149,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 						parent.getDecoratedBoundsWithMargins(child, tmpRect);
 						String id=sdiHolder.getItemID();
 						int height=tmpRect.height();
-						if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
-							if(imgHolder.getItem().thisTile.startCol+imgHolder.getItem().thisTile.colSpan<imgHolder.getItem().tiledLayout.columnSizes.length)
-								height=0;
-						}
 						if(!(holder instanceof HeaderStatusDisplayItem.Holder) && !(holder instanceof ReblogOrReplyLineStatusDisplayItem.Holder))
 							postsWithKnownNonHeaderHeights.add(id);
 						knownDisplayItemHeights.put(holder.getAbsoluteAdapterPosition(), height);
@@ -236,17 +215,6 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 		return adapter;
 	}
 
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
-		for(StatusDisplayItem item:items){
-			if(item instanceof ImageStatusDisplayItem isdi){
-				isdi.horizontalInset=V.dp(40+32);
-			}
-		}
-		return items;
-	}
-
 	protected void drawDivider(View child, View bottomSibling, RecyclerView.ViewHolder holder, RecyclerView.ViewHolder siblingHolder, RecyclerView parent, Canvas c, Paint paint){
 		parent.getDecoratedBoundsWithMargins(child, tmpRect);
 		tmpRect.offset(0, Math.round(child.getTranslationY()));

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

@@ -14,7 +14,7 @@ import java.util.List;
  * Represents a user of Mastodon and their associated profile.
  */
 @Parcel
-public class Account extends BaseModel{
+public class Account extends BaseModel implements Searchable{
 	// Base attributes
 
 	/**
@@ -43,7 +43,7 @@ public class Account extends BaseModel{
 	/**
 	 * The profile's display name.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String displayName;
 	/**
 	 * The profile's bio / description.
@@ -86,7 +86,7 @@ public class Account extends BaseModel{
 	/**
 	 * When the account was created.
 	 */
-	@RequiredField
+//	@RequiredField
 	public Instant createdAt;
 	/**
 	 * When the most recent status was posted.
@@ -135,6 +135,11 @@ public class Account extends BaseModel{
 
 	public List<Role> roles;
 
+	@Override
+	public String getQuery() {
+		return url;
+	}
+
 	@Parcel
 	public static class Role {
 		public String name;

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

@@ -121,7 +121,7 @@ public class Instance extends BaseModel{
 		ci.domain=uri;
 		ci.normalizedDomain=IDN.toUnicode(uri);
 		ci.description=Html.fromHtml(shortDescription).toString().trim();
-		if(languages!=null){
+		if(languages!=null && languages.size() > 0){
 			ci.language=languages.get(0);
 			ci.languages=languages;
 		}else{

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

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.model;
 
+import com.google.gson.annotations.SerializedName;
+
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 
 import java.time.Instant;
@@ -18,4 +20,11 @@ public class Marker extends BaseModel{
 				", updatedAt="+updatedAt+
 				'}';
 	}
+
+	public enum Type {
+		@SerializedName("home")
+		HOME,
+		@SerializedName("notifications")
+		NOTIFICATIONS
+	}
 }

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

@@ -0,0 +1,14 @@
+package org.joinmastodon.android.model;
+
+public class Markers {
+	public Marker notifications;
+	public Marker home;
+
+	@Override
+	public String toString() {
+		return "Markers{" +
+				"notifications=" + notifications +
+				", home=" + home +
+				'}';
+	}
+}

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

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.model;
+
+public enum NotificationAction {
+    FAVORITE,
+    REBLOG,
+    UNDO_REBLOG,
+    BOOKMARK,
+    REPLY,
+}

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

@@ -16,12 +16,13 @@ public class Poll extends BaseModel{
 	private boolean expired;
 	public boolean multiple;
 	public int votersCount;
+	public int votesCount;
 	public boolean voted;
-	@RequiredField
+//	@RequiredField
 	public List<Integer> ownVotes;
 	@RequiredField
 	public List<Option> options;
-	@RequiredField
+//	@RequiredField
 	public List<Emoji> emojis;
 
 	public transient ArrayList<Option> selectedOptions;
@@ -29,6 +30,8 @@ public class Poll extends BaseModel{
 	@Override
 	public void postprocess() throws ObjectValidationException{
 		super.postprocess();
+		if (emojis == null) emojis = List.of();
+		if (ownVotes == null) ownVotes = List.of();
 		for(Emoji e:emojis)
 			e.postprocess();
 	}
@@ -41,10 +44,12 @@ public class Poll extends BaseModel{
 				", expired="+expired+
 				", multiple="+multiple+
 				", votersCount="+votersCount+
+				", votesCount="+votesCount+
 				", voted="+voted+
 				", ownVotes="+ownVotes+
 				", options="+options+
 				", emojis="+emojis+
+				", selectedOptions="+selectedOptions+
 				'}';
 	}
 

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

@@ -0,0 +1,5 @@
+package org.joinmastodon.android.model;
+
+public interface Searchable {
+	String getQuery();
+}

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

@@ -1,5 +1,14 @@
 package org.joinmastodon.android.model;
 
+import static org.joinmastodon.android.api.MastodonAPIController.gson;
+import static org.joinmastodon.android.api.MastodonAPIController.gsonWithoutDeserializer;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
@@ -7,16 +16,17 @@ import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.parceler.Parcel;
 
+import java.lang.reflect.Type;
 import java.time.Instant;
 import java.util.List;
 
 @Parcel
-public class Status extends BaseModel implements DisplayItemsParent{
+public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	@RequiredField
 	public String id;
 	@RequiredField
 	public String uri;
-	@RequiredField
+//	@RequiredField // sometimes null on calckey
 	public Instant createdAt;
 	@RequiredField
 	public Account account;
@@ -58,14 +68,21 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public boolean bookmarked;
 	public boolean pinned;
 
+	public Status quote; // can be boolean in calckey
+
 	public transient boolean filterRevealed;
 	public transient boolean spoilerRevealed;
 	public transient boolean textExpanded, textExpandable;
 	public transient boolean hasGapAfter;
+	public transient TranslatedStatus translation;
+	public transient boolean translationShown;
 	private transient String strippedText;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
+		if(spoilerText!=null && !spoilerText.isEmpty() && !sensitive)
+			sensitive=true;
+
 		super.postprocess();
 		if(application!=null)
 			application.postprocess();
@@ -163,4 +180,33 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		s.filtered = List.of();
 		return s;
 	}
+
+	@Override
+	public String getQuery() {
+		return url;
+	}
+
+	public static class StatusDeserializer implements JsonDeserializer<Status> {
+
+		@Override
+		public Status deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+			JsonObject obj = json.getAsJsonObject();
+
+			Status quote = null;
+			if (obj.has("quote") && obj.get("quote").isJsonObject())
+				quote = gson.fromJson(obj.get("quote"), Status.class);
+			obj.remove("quote");
+
+			Status reblog = null;
+			if (obj.has("reblog"))
+				reblog = gson.fromJson(obj.get("reblog"), Status.class);
+			obj.remove("reblog");
+
+			Status status = gsonWithoutDeserializer.fromJson(json, Status.class);
+			status.quote = quote;
+			status.reblog = reblog;
+
+			return status;
+		}
+	}
 }

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

@@ -11,8 +11,14 @@ import java.util.List;
 import androidx.annotation.NonNull;
 
 public class PhotoLayoutHelper{
+	public static final int MAX_WIDTH=1000;
+	public static final int MAX_HEIGHT=1910;
+
 	@NonNull
-	public static TiledLayoutResult processThumbs(int _maxW, int _maxH, List<Attachment> thumbs){
+	public static TiledLayoutResult processThumbs(List<Attachment> thumbs){
+		int _maxW=MAX_WIDTH;
+		int _maxH=MAX_HEIGHT;
+
 		TiledLayoutResult result=new TiledLayoutResult();
 		if(thumbs.size()==1){
 			Attachment att=thumbs.get(0);
@@ -45,13 +51,8 @@ public class PhotoLayoutHelper{
 		float avgRatio=!ratios.isEmpty() ? sum(ratios)/ratios.size() : 1.0f;
 
 		float maxW, maxH, marginW=0, marginH=0;
-		if(_maxW>0){
-			maxW=_maxW;
-			maxH=_maxH;
-		}else{
-			maxW=510;
-			maxH=510;
-		}
+		maxW=_maxW;
+		maxH=_maxH;
 
 		float maxRatio=maxW/maxH;
 

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

@@ -79,10 +79,10 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 			}else{
 				editHistory.setVisibility(View.GONE);
 			}
-			String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
+			String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null;
 			
 			if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
-				time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, ""));
+				time.setText(timeStr != null ? item.parentFragment.getString(R.string.timestamp_via_app, timeStr, "") : "");
 				applicationName.setText(item.status.application.name);
 				if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) {
 					applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website));

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

@@ -26,6 +26,7 @@ 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.ComposeFragment;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -190,6 +191,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				String accountID = session.getID();
 				args.putString("account", accountID);
 				UiUtils.lookupStatus(v.getContext(), item.status, accountID, item.accountID, status -> {
+					if (status == null) return;
 					args.putParcelable("replyTo", Parcels.wrap(status));
 					Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 				});
@@ -280,12 +282,18 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 				v.startAnimation(opacityIn);
 				Bundle args=new Bundle();
 				args.putString("account", item.accountID);
-				StringBuilder prefilledText = new StringBuilder().append("\n\n");
-				String ownID = AccountSessionManager.getInstance().getAccount(item.accountID).self.id;
-				if (!item.status.account.id.equals(ownID)) prefilledText.append('@').append(item.status.account.acct).append(' ');
-				prefilledText.append(item.status.url);
-				args.putString("prefilledText", prefilledText.toString());
-				args.putInt("selectionStart", 0);
+				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(item.accountID);
+				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
+				if(instance.pleroma == null){
+					StringBuilder prefilledText = new StringBuilder().append("\n\n");
+					String ownID = AccountSessionManager.getInstance().getAccount(item.accountID).self.id;
+					if (!item.status.account.id.equals(ownID)) prefilledText.append('@').append(item.status.account.acct).append(' ');
+					prefilledText.append(item.status.url);
+					args.putString("prefilledText", prefilledText.toString());
+					args.putInt("selectionStart", 0);
+				}else{
+					args.putParcelable("quote", Parcels.wrap(item.status));
+				}
 				Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 			});
 

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

@@ -1,42 +0,0 @@
-package org.joinmastodon.android.ui.displayitems;
-
-import android.app.Activity;
-import android.graphics.Outline;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-
-public class GifVStatusDisplayItem extends ImageStatusDisplayItem{
-	public GifVStatusDisplayItem(String parentID, Status status, Attachment attachment, BaseStatusListFragment parentFragment, int index, int totalPhotos, PhotoLayoutHelper.TiledLayoutResult tiledLayout, PhotoLayoutHelper.TiledLayoutResult.Tile thisTile){
-		super(parentID, parentFragment, attachment, status, index, totalPhotos, tiledLayout, thisTile);
-		request=new UrlImageLoaderRequest(attachment.previewUrl, 1000, 1000);
-	}
-
-	@Override
-	public Type getType(){
-		return Type.GIFV;
-	}
-
-	public static class Holder extends ImageStatusDisplayItem.Holder<GifVStatusDisplayItem>{
-
-		public Holder(Activity activity, ViewGroup parent){
-			super(activity, R.layout.display_item_gifv, parent);
-			View play=findViewById(R.id.play_button);
-			play.setOutlineProvider(new ViewOutlineProvider(){
-				@Override
-				public void getOutline(View view, Outline outline){
-					outline.setOval(0, 0, view.getWidth(), view.getHeight());
-					outline.setAlpha(.99f); // fixes shadow rendering
-				}
-			});
-		}
-	}
-}

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

@@ -1,8 +1,12 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.graphics.Outline;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -264,7 +268,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 							progress.dismiss();
 					}, rel->{
 						relationship=rel;
-						Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : R.string.unfollowed_user, account.getShortUsername()), Toast.LENGTH_SHORT).show();
+						Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : rel.requested ? R.string.following_user_requested : R.string.unfollowed_user, account.getDisplayUsername()), Toast.LENGTH_SHORT).show();
 					});
 				}else if(id==R.id.block_domain){
 					UiUtils.confirmToggleBlockDomain(activity, item.parentFragment.getAccountID(), account.getDomain(), relationship!=null && relationship.domainBlocking, ()->{});
@@ -455,12 +459,15 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			if (hasMultipleAccounts && accountsMenu != null) {
 				openWithAccounts.setVisible(true);
 				accountsMenu.clear();
-				populateAccountsMenu(accountsMenu);
+				UiUtils.populateAccountsMenu(item.accountID, accountsMenu, s-> UiUtils.openURL(
+						item.parentFragment.getActivity(), s.getID(), item.status.url, false
+				));
 			} else if (openWithAccounts != null) {
 				openWithAccounts.setVisible(false);
 			}
 
 			Account account=item.user;
+			String username = account.getShortUsername();
 			boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);
 			boolean isPostScheduled=item.scheduledStatus!=null;
 			menu.findItem(R.id.open_with_account).setVisible(!isPostScheduled && hasMultipleAccounts);
@@ -496,14 +503,15 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				manageUserLists.setVisible(false);
 			}else{
 				mute.setVisible(true);
-				block.setVisible(true);
+				// hiding when following to keep menu item count equal (trading it for user lists)
+				block.setVisible(relationship == null || !relationship.following);
 				report.setVisible(true);
 				follow.setVisible(relationship==null || relationship.following || (!relationship.blocking && !relationship.blockedBy && !relationship.domainBlocking && !relationship.muting));
-				mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
+				mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, username));
 				mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
 				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), mute);
-				block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
-				report.setTitle(item.parentFragment.getString(R.string.report_user, account.getShortUsername()));
+				block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, username));
+				report.setTitle(item.parentFragment.getString(R.string.report_user, username));
 				// disabled in megalodon. domain blocks from a post clutters the context menu and looks out of place
 //				if(!account.isLocal()){
 //					blockDomain.setVisible(true);
@@ -512,12 +520,53 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					blockDomain.setVisible(false);
 //				}
 				boolean following = relationship!=null && relationship.following;
-				follow.setTitle(item.parentFragment.getString(following ? R.string.unfollow_user : R.string.follow_user, account.getShortUsername()));
+				follow.setTitle(item.parentFragment.getString(following ? R.string.unfollow_user : R.string.follow_user, username));
 				follow.setIcon(following ? R.drawable.ic_fluent_person_delete_24_regular : R.drawable.ic_fluent_person_add_24_regular);
 				manageUserLists.setVisible(relationship != null && relationship.following);
-				manageUserLists.setTitle(item.parentFragment.getString(R.string.sk_lists_with_user, account.getShortUsername()));
+				manageUserLists.setTitle(item.parentFragment.getString(R.string.sk_lists_with_user, username));
 				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), follow);
 			}
+
+			workaroundChangingMenuItemWidths(menu, username);
+		}
+
+		// ugliest piece of code you'll see in a while: i measure the menu items' text widths to
+		// determine the biggest one, because it's probably not being displayed at first
+		// (before the relationship loaded). i take the largest one's size and add a space to the
+		// last item ("open in browser") until it takes up as much space as the largest item.
+		// goal: no more ugly ellipsis after the relationship loads in when opening the context menu
+		// of a post
+		private void workaroundChangingMenuItemWidths(Menu menu, String username) {
+			String openInBrowserText = item.parentFragment.getString(R.string.open_in_browser);
+			if (relationship == null) {
+				float largestWidth = 0;
+				Paint paint = new Paint();
+				paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
+				String[] otherStrings = new String[] {
+						item.parentFragment.getString(R.string.unfollow_user, username),
+						item.parentFragment.getString(R.string.unblock_user, username),
+						item.parentFragment.getString(R.string.unmute_user, username),
+						item.parentFragment.getString(R.string.sk_lists_with_user, username),
+				};
+				for (int i = 0; i < menu.size(); i++) {
+					MenuItem item = menu.getItem(i);
+					if (item.getItemId() == R.id.open_in_browser || !item.isVisible()) continue;
+					float width = paint.measureText(menu.getItem(i).getTitle().toString());
+					if (width > largestWidth) largestWidth = width;
+				}
+				for (String str : otherStrings) {
+					float width = paint.measureText(str);
+					if (width > largestWidth) largestWidth = width;
+				}
+				float textWidth = paint.measureText(openInBrowserText);
+				float missingWidth = Math.max(0, largestWidth - textWidth);
+				float singleSpaceWidth = paint.measureText(" ");
+				int howManySpaces = (int) Math.ceil(missingWidth / singleSpaceWidth);
+				String enlargedText = openInBrowserText + " ".repeat(howManySpaces);
+				menu.findItem(R.id.open_in_browser).setTitle(enlargedText);
+			} else {
+				menu.findItem(R.id.open_in_browser).setTitle(openInBrowserText);
+			}
 		}
 	}
 }

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

@@ -1,244 +0,0 @@
-package org.joinmastodon.android.ui.displayitems;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
-import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
-import org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout;
-
-import androidx.annotation.LayoutRes;
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-
-public abstract class ImageStatusDisplayItem extends StatusDisplayItem{
-	public final int index;
-	public final int totalPhotos;
-	protected Attachment attachment;
-	protected ImageLoaderRequest request;
-	public final Status status;
-	public final PhotoLayoutHelper.TiledLayoutResult tiledLayout;
-	public final PhotoLayoutHelper.TiledLayoutResult.Tile thisTile;
-	public int horizontalInset;
-
-	public ImageStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Attachment photo, Status status, int index, int totalPhotos, PhotoLayoutHelper.TiledLayoutResult tiledLayout, PhotoLayoutHelper.TiledLayoutResult.Tile thisTile){
-		super(parentID, parentFragment);
-		this.attachment=photo;
-		this.status=status;
-		this.index=index;
-		this.totalPhotos=totalPhotos;
-		this.tiledLayout=tiledLayout;
-		this.thisTile=thisTile;
-	}
-
-	@Override
-	public int getImageCount(){
-		return 1;
-	}
-
-	@Override
-	public ImageLoaderRequest getImageRequest(int index){
-		return request;
-	}
-
-	public static abstract class Holder<T extends ImageStatusDisplayItem> extends StatusDisplayItem.Holder<T> implements ImageLoaderViewHolder{
-		public final ImageView photo;
-		private ImageAttachmentFrameLayout layout;
-		private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
-		private boolean didClear;
-
-		private AnimatorSet currentAnim;
-		private final FrameLayout altTextWrapper;
-		private final TextView altTextButton;
-		private final ImageView noAltTextButton;
-		private final View altTextScroller;
-		private final ImageButton altTextClose;
-		private final TextView altText, noAltText;
-
-		private View altOrNoAltButton;
-		private boolean altTextShown;
-
-		public Holder(Activity activity, @LayoutRes int layout, ViewGroup parent){
-			super(activity, layout, parent);
-			photo=findViewById(R.id.photo);
-			photo.setOnClickListener(this::onViewClick);
-			this.layout=(ImageAttachmentFrameLayout)itemView;
-
-			altTextWrapper=findViewById(R.id.alt_text_wrapper);
-			altTextButton=findViewById(R.id.alt_button);
-			noAltTextButton=findViewById(R.id.no_alt_button);
-			altTextScroller=findViewById(R.id.alt_text_scroller);
-			altTextClose=findViewById(R.id.alt_text_close);
-			altText=findViewById(R.id.alt_text);
-			noAltText=findViewById(R.id.no_alt_text);
-
-			altTextButton.setOnClickListener(this::onShowHideClick);
-			noAltTextButton.setOnClickListener(this::onShowHideClick);
-			altTextClose.setOnClickListener(this::onShowHideClick);
-//			altTextScroller.setNestedScrollingEnabled(true);
-		}
-
-		@Override
-		public void onBind(ImageStatusDisplayItem item){
-			layout.setLayout(item.tiledLayout, item.thisTile, item.horizontalInset);
-			crossfadeDrawable.setSize(item.attachment.getWidth(), item.attachment.getHeight());
-			crossfadeDrawable.setBlurhashDrawable(item.attachment.blurhashPlaceholder);
-			crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
-			photo.setImageDrawable(null);
-			photo.setImageDrawable(crossfadeDrawable);
-			photo.setContentDescription(TextUtils.isEmpty(item.attachment.description) ? item.parentFragment.getString(R.string.media_no_description) : item.attachment.description);
-			didClear=false;
-
-			if (currentAnim != null) currentAnim.cancel();
-
-			boolean altTextMissing = TextUtils.isEmpty(item.attachment.description);
-			altOrNoAltButton = altTextMissing ? noAltTextButton : altTextButton;
-			altTextShown=false;
-
-			altTextScroller.setVisibility(View.GONE);
-			altTextClose.setVisibility(View.GONE);
-			altTextButton.setVisibility(View.VISIBLE);
-			noAltTextButton.setVisibility(View.VISIBLE);
-			altTextButton.setAlpha(1f);
-			noAltTextButton.setAlpha(1f);
-			altTextWrapper.setVisibility(View.VISIBLE);
-
-			if (altTextMissing){
-				if (GlobalUserPreferences.showNoAltIndicator) {
-					noAltTextButton.setVisibility(View.VISIBLE);
-					noAltText.setVisibility(View.VISIBLE);
-					altTextWrapper.setBackgroundResource(R.drawable.bg_image_no_alt_overlay);
-					altTextButton.setVisibility(View.GONE);
-					altText.setVisibility(View.GONE);
-				} else {
-					altTextWrapper.setVisibility(View.GONE);
-				}
-			}else{
-				if (GlobalUserPreferences.showAltIndicator) {
-					noAltTextButton.setVisibility(View.GONE);
-					noAltText.setVisibility(View.GONE);
-					altTextWrapper.setBackgroundResource(R.drawable.bg_image_alt_overlay);
-					altTextButton.setVisibility(View.VISIBLE);
-					altTextButton.setText(R.string.sk_alt_button);
-					altText.setVisibility(View.VISIBLE);
-					altText.setText(item.attachment.description);
-					altText.setPadding(0, 0, 0, 0);
-				} else {
-					altTextWrapper.setVisibility(View.GONE);
-				}
-			}
-		}
-
-		private void onShowHideClick(View v){
-			boolean show=v.getId()==R.id.alt_button || v.getId()==R.id.no_alt_button;
-
-			if(altTextShown==show)
-				return;
-			if(currentAnim!=null)
-				currentAnim.cancel();
-
-			altTextShown=show;
-			if(show){
-				altTextScroller.setVisibility(View.VISIBLE);
-				altTextClose.setVisibility(View.VISIBLE);
-			}else{
-				altOrNoAltButton.setVisibility(View.VISIBLE);
-				// Hide these views temporarily so FrameLayout measures correctly
-				altTextScroller.setVisibility(View.GONE);
-				altTextClose.setVisibility(View.GONE);
-			}
-
-			// This is the current size...
-			int prevLeft=altTextWrapper.getLeft();
-			int prevRight=altTextWrapper.getRight();
-			int prevTop=altTextWrapper.getTop();
-			altTextWrapper.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
-				@Override
-				public boolean onPreDraw(){
-					altTextWrapper.getViewTreeObserver().removeOnPreDrawListener(this);
-
-					// ...and this is after the layout pass, right now the FrameLayout has its final size, but we animate that change
-					if(!show){
-						// Show these views again so they're visible for the duration of the animation.
-						// No one would notice they were missing during measure/layout.
-						altTextScroller.setVisibility(View.VISIBLE);
-						altTextClose.setVisibility(View.VISIBLE);
-					}
-					AnimatorSet set=new AnimatorSet();
-					set.playTogether(
-							ObjectAnimator.ofInt(altTextWrapper, "left", prevLeft, altTextWrapper.getLeft()),
-							ObjectAnimator.ofInt(altTextWrapper, "right", prevRight, altTextWrapper.getRight()),
-							ObjectAnimator.ofInt(altTextWrapper, "top", prevTop, altTextWrapper.getTop()),
-							ObjectAnimator.ofFloat(altOrNoAltButton, View.ALPHA, show ? 1f : 0f, show ? 0f : 1f),
-							ObjectAnimator.ofFloat(altTextScroller, View.ALPHA, show ? 0f : 1f, show ? 1f : 0f),
-							ObjectAnimator.ofFloat(altTextClose, View.ALPHA, show ? 0f : 1f, show ? 1f : 0f)
-					);
-					set.setDuration(300);
-					set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-					set.addListener(new AnimatorListenerAdapter(){
-						@Override
-						public void onAnimationEnd(Animator animation){
-							if(show){
-								altOrNoAltButton.setVisibility(View.GONE);
-							}else{
-								altTextScroller.setVisibility(View.GONE);
-								altTextClose.setVisibility(View.GONE);
-							}
-							currentAnim=null;
-						}
-					});
-					set.start();
-					currentAnim=set;
-
-					return true;
-				}
-			});
-		}
-
-		@Override
-		public void setImage(int index, Drawable drawable){
-			crossfadeDrawable.setImageDrawable(drawable);
-			if(didClear && item.status.spoilerRevealed)
-				crossfadeDrawable.animateAlpha(0f);
-		}
-
-		@Override
-		public void clearImage(int index){
-			crossfadeDrawable.setCrossfadeAlpha(1f);
-			crossfadeDrawable.setImageDrawable(null);
-			didClear=true;
-		}
-
-		private void onViewClick(View v){
-			if(!item.status.spoilerRevealed){
-				item.parentFragment.onRevealSpoilerClick(this);
-			}else if(item.parentFragment instanceof PhotoViewerHost){
-				Status contentStatus=item.status.reblog!=null ? item.status.reblog : item.status;
-				((PhotoViewerHost) item.parentFragment).openPhotoViewer(item.parentID, item.status, contentStatus.mediaAttachments.indexOf(item.attachment));
-			}
-		}
-
-		public void setRevealed(boolean revealed){
-			crossfadeDrawable.animateAlpha(revealed ? 0f : 1f);
-		}
-	}
-}

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

@@ -0,0 +1,311 @@
+package org.joinmastodon.android.ui.displayitems;
+
+import static org.joinmastodon.android.ui.utils.MediaAttachmentViewController.altWrapPadding;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.PhotoLayoutHelper;
+import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
+import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
+import org.joinmastodon.android.ui.views.FrameLayoutThatOnlyMeasuresFirstChild;
+import org.joinmastodon.android.ui.views.MediaGridLayout;
+import org.joinmastodon.android.utils.TypedObjectPool;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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;
+
+public class MediaGridStatusDisplayItem extends StatusDisplayItem{
+	private static final String TAG="MediaGridDisplayItem";
+
+	private final PhotoLayoutHelper.TiledLayoutResult tiledLayout;
+	private final TypedObjectPool<GridItemType, MediaAttachmentViewController> viewPool;
+	private final List<Attachment> attachments;
+	private final ArrayList<ImageLoaderRequest> requests=new ArrayList<>();
+	public final Status status;
+
+	public MediaGridStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, PhotoLayoutHelper.TiledLayoutResult tiledLayout, List<Attachment> attachments, Status status){
+		super(parentID, parentFragment);
+		this.tiledLayout=tiledLayout;
+		this.viewPool=parentFragment.getAttachmentViewsPool();
+		this.attachments=attachments;
+		this.status=status;
+		for(Attachment att:attachments){
+			requests.add(new UrlImageLoaderRequest(switch(att.type){
+				case IMAGE -> att.url;
+				case VIDEO, GIFV -> att.previewUrl;
+				default -> throw new IllegalStateException("Unexpected value: "+att.type);
+			}, 1000, 1000));
+		}
+	}
+
+	@Override
+	public Type getType(){
+		return Type.MEDIA_GRID;
+	}
+
+	@Override
+	public int getImageCount(){
+		return requests.size();
+	}
+
+	@Override
+	public ImageLoaderRequest getImageRequest(int index){
+		return requests.get(index);
+	}
+
+	public enum GridItemType{
+		PHOTO,
+		VIDEO,
+		GIFV
+	}
+
+	public static class Holder extends StatusDisplayItem.Holder<MediaGridStatusDisplayItem> implements ImageLoaderViewHolder{
+		private final FrameLayout wrapper;
+		private final MediaGridLayout layout;
+		private final View.OnClickListener clickListener=this::onViewClick, altTextClickListener=this::onAltTextClick;
+		private final ArrayList<MediaAttachmentViewController> controllers=new ArrayList<>();
+
+		private final FrameLayout altTextWrapper;
+		private final TextView altTextButton;
+		private final ImageView noAltTextButton;
+		private final View altTextScroller;
+		private final ImageButton altTextClose;
+		private final TextView altText, noAltText;
+
+		private int altTextIndex=-1;
+		private Animator altTextAnimator;
+
+		public Holder(Activity activity, ViewGroup parent){
+			super(new FrameLayoutThatOnlyMeasuresFirstChild(activity));
+			wrapper=(FrameLayout)itemView;
+			layout=new MediaGridLayout(activity);
+			wrapper.addView(layout);
+
+			activity.getLayoutInflater().inflate(R.layout.overlay_image_alt_text, wrapper);
+			altTextWrapper=findViewById(R.id.alt_text_wrapper);
+			altTextButton=findViewById(R.id.alt_button);
+			noAltTextButton=findViewById(R.id.no_alt_button);
+			altTextScroller=findViewById(R.id.alt_text_scroller);
+			altTextClose=findViewById(R.id.alt_text_close);
+			altText=findViewById(R.id.alt_text);
+			noAltText=findViewById(R.id.no_alt_text);
+			altTextClose.setOnClickListener(this::onAltTextCloseClick);
+		}
+
+		@Override
+		public void onBind(MediaGridStatusDisplayItem item){
+			if(altTextAnimator!=null)
+				altTextAnimator.cancel();
+
+			layout.setTiledLayout(item.tiledLayout);
+			for(MediaAttachmentViewController c:controllers){
+				item.viewPool.reuse(c.type, c);
+			}
+			layout.removeAllViews();
+			controllers.clear();
+			int i=0;
+			for(Attachment att:item.attachments){
+				MediaAttachmentViewController c=item.viewPool.obtain(switch(att.type){
+					case IMAGE -> GridItemType.PHOTO;
+					case VIDEO -> GridItemType.VIDEO;
+					case GIFV -> GridItemType.GIFV;
+					default -> throw new IllegalStateException("Unexpected value: "+att.type);
+				});
+				if(c.view.getLayoutParams()==null)
+					c.view.setLayoutParams(new MediaGridLayout.LayoutParams(item.tiledLayout.tiles[i]));
+				else
+					((MediaGridLayout.LayoutParams) c.view.getLayoutParams()).tile=item.tiledLayout.tiles[i];
+				layout.addView(c.view);
+				c.view.setOnClickListener(clickListener);
+				c.view.setTag(i);
+				if(c.btnsWrap!=null){
+					c.btnsWrap.setOnClickListener(altTextClickListener);
+					c.btnsWrap.setTag(i);
+					c.btnsWrap.setAlpha(1f);
+				}
+				controllers.add(c);
+				c.bind(att, item.status);
+				i++;
+			}
+			altTextButton.setVisibility(View.VISIBLE);
+			noAltTextButton.setVisibility(View.VISIBLE);
+			altTextWrapper.setVisibility(View.GONE);
+			altTextIndex=-1;
+		}
+
+		@Override
+		public void setImage(int index, Drawable drawable){
+			controllers.get(index).setImage(drawable);
+		}
+
+		@Override
+		public void clearImage(int index){
+			controllers.get(index).clearImage();
+		}
+
+		private void onViewClick(View v){
+			int index=(Integer)v.getTag();
+			if(!item.status.spoilerRevealed){
+				item.parentFragment.onRevealSpoilerClick(this);
+			}else if(item.parentFragment instanceof PhotoViewerHost){
+				((PhotoViewerHost) item.parentFragment).openPhotoViewer(item.parentID, item.status, index, this);
+			}
+		}
+
+		private void onAltTextClick(View v){
+			if(altTextAnimator!=null)
+				altTextAnimator.cancel();
+			v.setVisibility(View.INVISIBLE);
+			int index=(Integer)v.getTag();
+			altTextIndex=index;
+			Attachment att=item.attachments.get(index);
+			boolean hasAltText = !TextUtils.isEmpty(att.description);
+			altTextButton.setVisibility(hasAltText && GlobalUserPreferences.showAltIndicator ? View.VISIBLE : View.GONE);
+			noAltTextButton.setVisibility(!hasAltText && GlobalUserPreferences.showNoAltIndicator ? View.VISIBLE : View.GONE);
+			altText.setVisibility(hasAltText && GlobalUserPreferences.showAltIndicator ? View.VISIBLE : View.GONE);
+			noAltText.setVisibility(!hasAltText && GlobalUserPreferences.showNoAltIndicator ? View.VISIBLE : View.GONE);
+			altText.setText(att.description);
+			altTextWrapper.setVisibility(View.VISIBLE);
+			altTextWrapper.setBackgroundResource(hasAltText ? R.drawable.bg_image_alt_overlay : R.drawable.bg_image_no_alt_overlay);
+			altTextWrapper.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
+				@Override
+				public boolean onPreDraw(){
+					altTextWrapper.getViewTreeObserver().removeOnPreDrawListener(this);
+
+					int[] loc={0, 0};
+					v.getLocationInWindow(loc);
+					int btnL=loc[0], btnT=loc[1];
+					wrapper.getLocationInWindow(loc);
+					btnL-=loc[0];
+					btnT-=loc[1];
+
+					ArrayList<Animator> anims=new ArrayList<>();
+					anims.add(ObjectAnimator.ofFloat(altTextButton, View.ALPHA, 1, 0));
+					anims.add(ObjectAnimator.ofFloat(noAltTextButton, View.ALPHA, 1, 0));
+					anims.add(ObjectAnimator.ofFloat(altTextScroller, View.ALPHA, 0, 1));
+					anims.add(ObjectAnimator.ofFloat(altTextClose, View.ALPHA, 0, 1));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+altWrapPadding[0], altTextWrapper.getLeft()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+altWrapPadding[1], altTextWrapper.getTop()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+v.getWidth()-altWrapPadding[2], altTextWrapper.getRight()));
+					anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+v.getHeight()-altWrapPadding[3], altTextWrapper.getBottom()));
+					for(Animator a:anims)
+						a.setDuration(300);
+
+					for(MediaAttachmentViewController c:controllers){
+						if(c.btnsWrap!=null && c.btnsWrap!=v){
+							anims.add(ObjectAnimator.ofFloat(c.btnsWrap, View.ALPHA, 1, 0).setDuration(150));
+						}
+					}
+
+					AnimatorSet set=new AnimatorSet();
+					set.playTogether(anims);
+					set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+					set.addListener(new AnimatorListenerAdapter(){
+						@Override
+						public void onAnimationEnd(Animator animation){
+							altTextAnimator=null;
+							for(MediaAttachmentViewController c:controllers){
+								if(c.btnsWrap!=null){
+									c.btnsWrap.setVisibility(View.INVISIBLE);
+								}
+							}
+						}
+					});
+					altTextAnimator=set;
+					set.start();
+
+					return true;
+				}
+			});
+		}
+
+		private void onAltTextCloseClick(View v){
+			if(altTextAnimator!=null)
+				altTextAnimator.cancel();
+
+			View btn=controllers.get(altTextIndex).btnsWrap;
+			for(MediaAttachmentViewController c:controllers){
+				if(c.btnsWrap!=null && c.btnsWrap!=btn) {
+					c.btnsWrap.setVisibility(View.VISIBLE);
+				}
+			}
+
+			int[] loc={0, 0};
+			btn.getLocationInWindow(loc);
+			int btnL=loc[0], btnT=loc[1];
+			wrapper.getLocationInWindow(loc);
+			btnL-=loc[0];
+			btnT-=loc[1];
+
+			ArrayList<Animator> anims=new ArrayList<>();
+			anims.add(ObjectAnimator.ofFloat(altTextButton, View.ALPHA, 1));
+			anims.add(ObjectAnimator.ofFloat(noAltTextButton, View.ALPHA, 1));
+			anims.add(ObjectAnimator.ofFloat(altTextScroller, View.ALPHA, 0));
+			anims.add(ObjectAnimator.ofFloat(altTextClose, View.ALPHA, 0));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "left", btnL+altWrapPadding[0]));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "top", btnT+altWrapPadding[1]));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "right", btnL+btn.getWidth()-altWrapPadding[2]));
+			anims.add(ObjectAnimator.ofInt(altTextWrapper, "bottom", btnT+btn.getHeight()-altWrapPadding[3]));
+			for(Animator a:anims)
+				a.setDuration(300);
+
+			for(MediaAttachmentViewController c:controllers){
+//				if(c.btnsWrap!=null && c.btnsWrap!=btn){
+					anims.add(ObjectAnimator.ofFloat(c.btnsWrap, View.ALPHA, 1).setDuration(150));
+//				}
+			}
+
+			AnimatorSet set=new AnimatorSet();
+			set.playTogether(anims);
+			set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+			set.addListener(new AnimatorListenerAdapter(){
+				@Override
+				public void onAnimationEnd(Animator animation){
+					altTextAnimator=null;
+					altTextWrapper.setVisibility(View.GONE);
+					btn.setVisibility(View.VISIBLE);
+				}
+			});
+			altTextAnimator=set;
+			set.start();
+		}
+
+		public void setRevealed(boolean revealed){
+			for(MediaAttachmentViewController c:controllers){
+				c.setRevealed(revealed);
+			}
+		}
+
+		public MediaAttachmentViewController getViewController(int index){
+			return controllers.get(index);
+		}
+
+		public void setClipChildren(boolean clip){
+			layout.setClipChildren(clip);
+			wrapper.setClipChildren(clip);
+		}
+	}
+}

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

@@ -1,45 +0,0 @@
-package org.joinmastodon.android.ui.displayitems;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-import me.grishka.appkit.utils.V;
-
-public class PhotoStatusDisplayItem extends ImageStatusDisplayItem{
-	public PhotoStatusDisplayItem(String parentID, Status status, Attachment photo, BaseStatusListFragment parentFragment, int index, int totalPhotos, PhotoLayoutHelper.TiledLayoutResult tiledLayout, PhotoLayoutHelper.TiledLayoutResult.Tile thisTile){
-		super(parentID, parentFragment, photo, status, index, totalPhotos, tiledLayout, thisTile);
-		request=new UrlImageLoaderRequest(photo.url, 1000, 1000);
-	}
-
-	@Override
-	public Type getType(){
-		return Type.PHOTO;
-	}
-
-	public static class Holder extends ImageStatusDisplayItem.Holder<PhotoStatusDisplayItem> {
-		public Holder(Activity activity, ViewGroup parent) {
-			super(activity, R.layout.display_item_photo, parent);
-		}
-	}
-}

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

@@ -35,8 +35,9 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		text=HtmlParser.parseCustomEmoji(option.title, poll.emojis);
 		emojiHelper.setText(text);
 		showResults=poll.isExpired() || poll.voted;
-		if(showResults && option.votesCount!=null && poll.votersCount>0){
-			votesFraction=(float)option.votesCount/(float)poll.votersCount;
+		int total=poll.votersCount>0 ? poll.votersCount : poll.votesCount;
+		if(showResults && option.votesCount!=null && total>0){
+			votesFraction=(float)option.votesCount/(float)total;
 			int mostVotedCount=0;
 			for(Poll.Option opt:poll.options)
 				mostVotedCount=Math.max(mostVotedCount, opt.votesCount);

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

@@ -10,8 +10,10 @@ import android.text.SpannableStringBuilder;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Emoji;
@@ -27,6 +29,7 @@ import androidx.annotation.Nullable;
 
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.utils.V;
 
 public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
@@ -37,8 +40,15 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	private int iconEnd;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private View.OnClickListener handleClick;
+	boolean belowHeader, needBottomPadding;
+	ReblogOrReplyLineStatusDisplayItem extra;
+	String fullText;
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick){
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick) {
+		this(parentID, parentFragment, text, emojis, icon, visibility, handleClick, null);
+	}
+
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, String fullText) {
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
@@ -49,6 +59,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		TypedValue outValue = new TypedValue();
 		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
 		updateVisibility(visibility);
+		this.fullText = fullText;
 	}
 
 	public void updateVisibility(StatusPrivacy visibility) {
@@ -77,29 +88,77 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<ReblogOrReplyLineStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView text;
+		private final TextView text, extraText;
+		private final View separator;
+		private final ViewGroup parent;
+
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_reblog_or_reply_line, parent);
+			this.parent = parent;
 			text=findViewById(R.id.text);
+			extraText=findViewById(R.id.extra_text);
+			separator=findViewById(R.id.separator);
+			if (GlobalUserPreferences.replyLineAboveHeader && GlobalUserPreferences.compactReblogReplyLine) {
+				parent.addOnLayoutChangeListener((v, l, t, right, b, ol, ot, oldRight, ob) -> {
+					if (right != oldRight) layoutLine();
+				});
+			}
 		}
 
-		@Override
-		public void onBind(ReblogOrReplyLineStatusDisplayItem item){
+		private void bindLine(ReblogOrReplyLineStatusDisplayItem item, TextView text) {
+			if (item.fullText != null) text.setContentDescription(item.fullText);
 			text.setText(item.text);
 			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, item.iconEnd, 0);
-			if(item.handleClick!=null) text.setOnClickListener(item.handleClick);
-			text.setEnabled(!item.inset);
-			text.setClickable(!item.inset);
+			text.setOnClickListener(item.handleClick);
+			text.setEnabled(!item.inset && item.handleClick != null);
+			text.setClickable(!item.inset && item.handleClick != null);
 			Context ctx = itemView.getContext();
 			int visibilityText = item.visibility != null ? switch (item.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
+				case LOCAL -> R.string.sk_local_only;
 				default -> 0;
 			} : 0;
 			if (visibilityText != 0) text.setContentDescription(item.text + " (" + ctx.getString(visibilityText) + ")");
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
+			text.setTextAppearance(item.belowHeader ? R.style.m3_label_large : R.style.m3_title_small);
+			text.setCompoundDrawableTintList(text.getTextColors());
+		}
+
+		@Override
+		public void onBind(ReblogOrReplyLineStatusDisplayItem item){
+			bindLine(item, text);
+			if (item.extra != null) bindLine(item.extra, extraText);
+			extraText.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
+			separator.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
+			ViewGroup.MarginLayoutParams params = new ViewGroup.MarginLayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+			params.bottomMargin = item.belowHeader ? V.dp(-6) : V.dp(-12);
+			params.topMargin = item.belowHeader ? V.dp(-6) : 0;
+			itemView.setLayoutParams(params);
+			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
+			layoutLine();
+		}
+
+		private void layoutLine() {
+			// layout line only if above header, compact and has extra
+			if (!GlobalUserPreferences.replyLineAboveHeader
+					|| !GlobalUserPreferences.compactReblogReplyLine
+					|| item.extra == null) return;
+			itemView.measure(
+					View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY),
+					View.MeasureSpec.UNSPECIFIED);
+			boolean isVertical = ((LinearLayout) itemView).getOrientation() == LinearLayout.VERTICAL;
+			extraText.setPaddingRelative(extraText.getPaddingStart(), item.extra != null && isVertical ? 0 : V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom());
+			separator.setVisibility(item.extra != null && !isVertical ? View.VISIBLE : View.GONE);
+			((LinearLayout) itemView).removeView(extraText);
+			if (isVertical) ((LinearLayout) itemView).addView(extraText);
+			else ((LinearLayout) itemView).addView(extraText, 0);
+			text.setText(isVertical ? item.fullText : item.text);
+			if (item.extra != null) {
+				extraText.setText(isVertical ? item.extra.fullText : item.extra.text);
+			}
 		}
 
 		@Override

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

@@ -7,12 +7,12 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.HomeTabFragment;
-import org.joinmastodon.android.fragments.HomeTimelineFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
@@ -20,7 +20,6 @@ import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.ScheduledStatus;
@@ -31,10 +30,8 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -69,10 +66,7 @@ public abstract class StatusDisplayItem{
 			case HEADER -> new HeaderStatusDisplayItem.Holder(activity, parent);
 			case REBLOG_OR_REPLY_LINE -> new ReblogOrReplyLineStatusDisplayItem.Holder(activity, parent);
 			case TEXT -> new TextStatusDisplayItem.Holder(activity, parent);
-			case PHOTO -> new PhotoStatusDisplayItem.Holder(activity, parent);
-			case GIFV -> new GifVStatusDisplayItem.Holder(activity, parent);
 			case AUDIO -> new AudioStatusDisplayItem.Holder(activity, parent);
-			case VIDEO -> new VideoStatusDisplayItem.Holder(activity, parent);
 			case POLL_OPTION -> new PollOptionStatusDisplayItem.Holder(activity, parent);
 			case POLL_FOOTER -> new PollFooterStatusDisplayItem.Holder(activity, parent);
 			case CARD -> new LinkCardStatusDisplayItem.Holder(activity, parent);
@@ -82,6 +76,7 @@ public abstract class StatusDisplayItem{
 			case HASHTAG -> new HashtagStatusDisplayItem.Holder(activity, parent);
 			case GAP -> new GapStatusDisplayItem.Holder(activity, parent);
 			case EXTENDED_FOOTER -> new ExtendedFooterStatusDisplayItem.Holder(activity, parent);
+			case MEDIA_GRID -> new MediaGridStatusDisplayItem.Holder(activity, parent);
 			case WARNING -> new WarningFilteredStatusDisplayItem.Holder(activity, parent);
 		};
 	}
@@ -99,10 +94,6 @@ public abstract class StatusDisplayItem{
 	}
 
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, disableTranslate, filterContext, null);
-	}
-
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext, StatusDisplayItem titleItem){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 
@@ -119,24 +110,37 @@ public abstract class StatusDisplayItem{
 			statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
 		}
 
+		ReblogOrReplyLineStatusDisplayItem replyLine = null;
+		boolean threadReply = statusForContent.inReplyToAccountId != null &&
+				statusForContent.inReplyToAccountId.equals(statusForContent.account.id);
+
+		if(statusForContent.inReplyToAccountId!=null && !(threadReply && fragment instanceof ThreadFragment)){
+			Account account = knownAccounts.get(statusForContent.inReplyToAccountId);
+			String text = threadReply ? fragment.getString(R.string.sk_show_thread)
+					: account == null ? fragment.getString(R.string.sk_in_reply)
+					: GlobalUserPreferences.compactReblogReplyLine && status.reblog != null ? account.displayName
+					: fragment.getString(R.string.in_reply_to, account.displayName);
+			String fullText = threadReply ? fragment.getString(R.string.sk_show_thread)
+					: account == null ? fragment.getString(R.string.sk_in_reply)
+					: fragment.getString(R.string.in_reply_to, account.displayName);
+			replyLine = new ReblogOrReplyLineStatusDisplayItem(
+					parentID, fragment, text, account == null ? List.of() : account.emojis,
+					R.drawable.ic_fluent_arrow_reply_20_filled, null, null, fullText
+			);
+		}
+
 		if(status.reblog!=null){
 			boolean isOwnPost = AccountSessionManager.getInstance().isSelf(fragment.getAccountID(), status.account);
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, isOwnPost ? status.visibility : null, i->{
+			String fullText = fragment.getString(R.string.user_boosted, status.account.displayName);
+			String text = GlobalUserPreferences.compactReblogReplyLine && replyLine != null ? status.account.displayName : fullText;
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, text, status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, isOwnPost ? status.visibility : null, i->{
 				args.putParcelable("profileAccount", Parcels.wrap(status.account));
 				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
-			}));
-		}else if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId)){
-			Account account=Objects.requireNonNull(knownAccounts.get(status.inReplyToAccountId));
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled, null, i->{
-				args.putParcelable("profileAccount", Parcels.wrap(account));
-				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
-			}));
-		} else if (
-				!(status.tags.isEmpty() ||
-						fragment instanceof HashtagTimelineFragment ||
-						fragment instanceof ListTimelineFragment
-				) && fragment.getParentFragment() instanceof HomeTabFragment home
-		) {
+			}, fullText));
+		} else if (!(status.tags.isEmpty() ||
+				fragment instanceof HashtagTimelineFragment ||
+				fragment instanceof ListTimelineFragment
+		) && fragment.getParentFragment() instanceof HomeTabFragment home) {
 			home.getHashtags().stream()
 					.filter(followed -> status.tags.stream()
 							.anyMatch(hashtag -> followed.name.equalsIgnoreCase(hashtag.name)))
@@ -151,28 +155,38 @@ public abstract class StatusDisplayItem{
 							}
 					)));
 		}
+
+		if (replyLine != null && GlobalUserPreferences.replyLineAboveHeader) {
+			Optional<ReblogOrReplyLineStatusDisplayItem> primaryLine = items.stream()
+					.filter(i -> i instanceof ReblogOrReplyLineStatusDisplayItem)
+					.map(ReblogOrReplyLineStatusDisplayItem.class::cast)
+					.findFirst();
+
+			if (primaryLine.isPresent() && GlobalUserPreferences.compactReblogReplyLine) {
+				primaryLine.get().extra = replyLine;
+			} else {
+				items.add(replyLine);
+			}
+		}
+
 		HeaderStatusDisplayItem header;
 		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, notification, scheduledStatus));
+
+		if (replyLine != null && !GlobalUserPreferences.replyLineAboveHeader) {
+			replyLine.belowHeader = true;
+			items.add(replyLine);
+		}
+
 		if(!TextUtils.isEmpty(statusForContent.content))
 			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent, disableTranslate));
+		else if (!GlobalUserPreferences.replyLineAboveHeader && replyLine != null)
+			replyLine.needBottomPadding=true;
 		else
 			header.needBottomPadding=true;
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
 		if(!imageAttachments.isEmpty()){
-			int photoIndex=0;
-			PhotoLayoutHelper.TiledLayoutResult layout=PhotoLayoutHelper.processThumbs(1000, 1910, imageAttachments);
-			for(Attachment attachment:imageAttachments){
-				if(attachment.type==Attachment.Type.IMAGE){
-					items.add(new PhotoStatusDisplayItem(parentID, statusForContent, attachment, fragment, photoIndex, imageAttachments.size(), layout, layout.tiles[photoIndex]));
-				}else if(attachment.type==Attachment.Type.GIFV){
-					items.add(new GifVStatusDisplayItem(parentID, statusForContent, attachment, fragment, photoIndex, imageAttachments.size(), layout, layout.tiles[photoIndex]));
-				}else if(attachment.type==Attachment.Type.VIDEO){
-					items.add(new VideoStatusDisplayItem(parentID, statusForContent, attachment, fragment, photoIndex, imageAttachments.size(), layout, layout.tiles[photoIndex]));
-				}else{
-					throw new IllegalStateException("This isn't supposed to happen, type is "+attachment.type);
-				}
-				photoIndex++;
-			}
+			PhotoLayoutHelper.TiledLayoutResult layout=PhotoLayoutHelper.processThumbs(imageAttachments);
+			items.add(new MediaGridStatusDisplayItem(parentID, fragment, layout, imageAttachments, statusForContent));
 		}
 		for(Attachment att:statusForContent.mediaAttachments){
 			if(att.type==Attachment.Type.AUDIO){
@@ -196,8 +210,6 @@ public abstract class StatusDisplayItem{
 			item.index=i++;
 		}
 
-		if (titleItem != null) items.add(0, titleItem);
-
 		if (!statusForContent.filterRevealed) {
 			return new ArrayList<>(List.of(
 					new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items)
@@ -218,9 +230,6 @@ public abstract class StatusDisplayItem{
 		HEADER,
 		REBLOG_OR_REPLY_LINE,
 		TEXT,
-		PHOTO,
-		VIDEO,
-		GIFV,
 		AUDIO,
 		POLL_OPTION,
 		POLL_FOOTER,
@@ -230,8 +239,9 @@ public abstract class StatusDisplayItem{
 		ACCOUNT,
 		HASHTAG,
 		GAP,
-		WARNING,
-		EXTENDED_FOOTER
+		EXTENDED_FOOTER,
+		MEDIA_GRID,
+		WARNING
 	}
 
 	public static abstract class Holder<T extends StatusDisplayItem> extends BindableViewHolder<T> implements UsableRecyclerView.DisableableClickable{

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

@@ -31,6 +31,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.utils.StatusTextEncoder;
 
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 import me.grishka.appkit.api.Callback;
@@ -47,9 +48,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
-	public boolean disableTranslate;
-	public boolean translated = false;
-	public TranslatedStatus translation = null;
+	public boolean disableTranslate, translationShown;
 	private AccountSession session;
 	public static final Pattern BOTTOM_TEXT_PATTERN = Pattern.compile("(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️)(?:\uD83D\uDC49\uD83D\uDC48(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️))*\uD83D\uDC49\uD83D\uDC48");
 
@@ -58,6 +57,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		this.text=text;
 		this.status=status;
 		this.disableTranslate=disableTranslate;
+		this.translationShown=status.translationShown;
 		emojiHelper.setText(text);
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
@@ -67,6 +67,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		session = AccountSessionManager.getInstance().getAccount(parentFragment.getAccountID());
 	}
 
+	public void setTranslationShown(boolean translationShown) {
+		this.translationShown = translationShown;
+		status.translationShown = translationShown;
+	}
+
 	@Override
 	public Type getType(){
 		return Type.TEXT;
@@ -97,9 +102,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		private final float textMaxHeight, textCollapsedHeight;
 		private final LinearLayout.LayoutParams collapseParams, wrapParams;
+		private final ViewGroup parent;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
+			this.parent=parent;
 			text=findViewById(R.id.text);
 			spoilerTitle=findViewById(R.id.spoiler_title);
 			spoilerTitleInline=findViewById(R.id.spoiler_title_inline);
@@ -127,8 +134,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
-			text.setText(item.translated
-							? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
+			text.setText(item.translationShown
+							? HtmlParser.parse(item.status.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
 							: item.text);
 			text.setTextIsSelectable(item.textSelectable);
 			if (item.textSelectable) {
@@ -165,26 +172,33 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			boolean translateEnabled = !item.disableTranslate && instanceInfo != null &&
 					instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null &&
 					instanceInfo.v2.configuration.translation.enabled;
+			String bottomText = null;
+			try {
+				bottomText = BOTTOM_TEXT_PATTERN.matcher(item.status.getStrippedText()).find()
+						? new StatusTextEncoder(Bottom::decode).decode(item.status.getStrippedText(), BOTTOM_TEXT_PATTERN)
+						: null;
+			} catch (TranslationError ignored) {}
 
-			boolean isBottomText = BOTTOM_TEXT_PATTERN.matcher(item.status.getStrippedText()).find();
-			boolean translateVisible = (isBottomText || (
+			boolean translateVisible = (bottomText != null || (
 					translateEnabled &&
 							!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&
 							item.status.language != null &&
-							(item.session.preferences == null || !item.status.language.equalsIgnoreCase(item.session.preferences.postingDefaultLanguage))))
+							// todo: compare to mastodon locale instead (how do i query that?!)
+							!item.status.language.equalsIgnoreCase(Locale.getDefault().getLanguage())))
 					&& (!GlobalUserPreferences.translateButtonOpenedOnly || item.textSelectable);
 			translateWrap.setVisibility(translateVisible ? View.VISIBLE : View.GONE);
-			translateButton.setText(item.translated ? R.string.sk_translate_show_original : R.string.sk_translate_post);
-			translateInfo.setText(item.translated ? itemView.getResources().getString(R.string.sk_translated_using, isBottomText ? "bottom-java" : item.translation.provider) : "");
+			translateButton.setText(item.translationShown ? R.string.sk_translate_show_original : R.string.sk_translate_post);
+			translateInfo.setText(item.translationShown ? itemView.getResources().getString(R.string.sk_translated_using, bottomText != null ? "bottom-java" : item.status.translation.provider) : "");
+			String finalBottomText = bottomText;
 			translateButton.setOnClickListener(v->{
-				if (item.translation == null) {
-					if (isBottomText) {
+				if (item.status.translation == null) {
+					if (finalBottomText != null) {
 						try {
-							item.translation = new TranslatedStatus();
-							item.translation.content = new StatusTextEncoder(Bottom::decode).decode(item.status.getStrippedText(), BOTTOM_TEXT_PATTERN);
-							item.translated = true;
+							item.status.translation = new TranslatedStatus();
+							item.status.translation.content = finalBottomText;
+							item.setTranslationShown(true);
 						} catch (TranslationError err) {
-							item.translation = null;
+							item.status.translation = null;
 							Toast.makeText(itemView.getContext(), err.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
 						}
 						rebind();
@@ -196,8 +210,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 					new TranslateStatus(item.status.id).setCallback(new Callback<>() {
 						@Override
 						public void onSuccess(TranslatedStatus translatedStatus) {
-							item.translation = translatedStatus;
-							item.translated = true;
+							item.status.translation = translatedStatus;
+							item.setTranslationShown(true);
 							if (item.parentFragment.getActivity() == null) return;
 							translateProgress.setVisibility(View.GONE);
 							translateButton.setClickable(true);
@@ -214,7 +228,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 						}
 					}).exec(item.parentFragment.getAccountID());
 				} else {
-					item.translated = !item.translated;
+					item.setTranslationShown(!item.translationShown);
 					rebind();
 				}
 			});
@@ -227,13 +241,16 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				readMore.setVisibility(View.GONE);
 			}
 
-			if (GlobalUserPreferences.collapseLongPosts) text.post(() -> {
+			text.measure(
+					View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY),
+					View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+
+			if (GlobalUserPreferences.collapseLongPosts && !item.status.textExpandable) {
 				boolean tooBig = text.getMeasuredHeight() > textMaxHeight;
-				boolean inTimeline = !item.textSelectable;
 				boolean hasSpoiler = !TextUtils.isEmpty(item.status.spoilerText);
-				boolean expandable = inTimeline && tooBig && !hasSpoiler;
-				item.parentFragment.onEnableExpandable(this, expandable);
-			});
+				boolean expandable = tooBig && !hasSpoiler;
+				item.parentFragment.onEnableExpandable(Holder.this, expandable);
+			}
 
 			readMore.setVisibility(item.status.textExpandable && !item.status.textExpanded ? View.VISIBLE : View.GONE);
 			textScrollView.setLayoutParams(item.status.textExpandable && !item.status.textExpanded ? collapseParams : wrapParams);

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

@@ -1,42 +0,0 @@
-package org.joinmastodon.android.ui.displayitems;
-
-import android.app.Activity;
-import android.graphics.Outline;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-
-public class VideoStatusDisplayItem extends ImageStatusDisplayItem{
-	public VideoStatusDisplayItem(String parentID, Status status, Attachment attachment, BaseStatusListFragment parentFragment, int index, int totalPhotos, PhotoLayoutHelper.TiledLayoutResult tiledLayout, PhotoLayoutHelper.TiledLayoutResult.Tile thisTile){
-		super(parentID, parentFragment, attachment, status, index, totalPhotos, tiledLayout, thisTile);
-		request=new UrlImageLoaderRequest(attachment.previewUrl, 1000, 1000);
-	}
-
-	@Override
-	public Type getType(){
-		return Type.VIDEO;
-	}
-
-	public static class Holder extends ImageStatusDisplayItem.Holder<VideoStatusDisplayItem>{
-
-		public Holder(Activity activity, ViewGroup parent){
-			super(activity, R.layout.display_item_video, parent);
-			View play=findViewById(R.id.play_button);
-			play.setOutlineProvider(new ViewOutlineProvider(){
-				@Override
-				public void getOutline(View view, Outline outline){
-					outline.setOval(0, 0, view.getWidth(), view.getHeight());
-					outline.setAlpha(.99f); // fixes shadow rendering
-				}
-			});
-		}
-	}
-}

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

@@ -1,7 +1,8 @@
 package org.joinmastodon.android.ui.photoviewer;
 
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
 
 public interface PhotoViewerHost{
-	void openPhotoViewer(String parentID, Status status, int attachmentIndex);
+	void openPhotoViewer(String parentID, Status status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder);
 }

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

@@ -8,24 +8,25 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.text.Layout;
 import android.text.Spanned;
+import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
-import android.view.View;
-import android.view.ViewConfiguration;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
+import org.joinmastodon.android.ui.utils.UiUtils;
+
 import me.grishka.appkit.utils.V;
 
 public class ClickableLinksDelegate {
 
-	private Paint hlPaint;
+	private final Paint hlPaint;
 	private Path hlPath;
 	private LinkSpan selectedSpan;
-	private TextView view;
+	private final TextView view;
 
-	private final Runnable longClickRunnable = () -> {
-		if (selectedSpan != null) selectedSpan.onLongClick(view);
-	};
+	private final GestureDetector gestureDetector;
 
 	public ClickableLinksDelegate(TextView view) {
 		this.view=view;
@@ -33,11 +34,45 @@ public class ClickableLinksDelegate {
 		hlPaint.setAntiAlias(true);
 		hlPaint.setPathEffect(new CornerPathEffect(V.dp(3)));
 //        view.setHighlightColor(view.getResources().getColor(android.R.color.holo_blue_light));
+		gestureDetector = new GestureDetector(view.getContext(), new LinkGestureListener(), view.getHandler());
 	}
 
 	public boolean onTouch(MotionEvent event) {
-		long eventDuration = event.getEventTime() - event.getDownTime();
-		if(event.getAction()==MotionEvent.ACTION_DOWN){
+		if(event.getAction()==MotionEvent.ACTION_CANCEL){
+			// the gestureDetector does not provide a callback for CANCEL, therefore:
+			// remove background color of view before passing event to gestureDetector
+			resetAndInvalidate();
+		}
+		return gestureDetector.onTouchEvent(event);
+	}
+
+	/**
+	 * remove highlighting from span and let the system redraw the view
+	 */
+	private void resetAndInvalidate() {
+		hlPath=null;
+		selectedSpan=null;
+		view.invalidate();
+	}
+
+	public void onDraw(Canvas canvas){
+		if(hlPath!=null){
+			canvas.save();
+			canvas.translate(0, view.getPaddingTop());
+			canvas.drawPath(hlPath, hlPaint);
+			canvas.restore();
+		}
+	}
+
+	/**
+	 * GestureListener for spans that represent URLs.
+	 * onDown: on start of touch event, set highlighting
+	 * onSingleTapUp: when there was a (short) tap, call onClick and reset highlighting
+	 * onLongPress: copy URL to clipboard, let user know, reset highlighting
+	 */
+	private class LinkGestureListener extends GestureDetector.SimpleOnGestureListener {
+		@Override
+		public boolean onDown(@NonNull MotionEvent event) {
 			int line=-1;
 			Rect rect=new Rect();
 			Layout l=view.getLayout();
@@ -52,8 +87,7 @@ public class ClickableLinksDelegate {
 				return false;
 			}
 			CharSequence text=view.getText();
-			if(text instanceof Spanned){
-				Spanned s=(Spanned)text;
+			if(text instanceof Spanned s){
 				LinkSpan[] spans=s.getSpans(0, s.length()-1, LinkSpan.class);
 				if(spans.length>0){
 					for(LinkSpan span:spans){
@@ -70,7 +104,6 @@ public class ClickableLinksDelegate {
 							}
 							hlPath=new Path();
 							selectedSpan=span;
-							view.postDelayed(longClickRunnable, ViewConfiguration.getLongPressTimeout());
 							hlPaint.setColor((span.getColor() & 0x00FFFFFF) | 0x33000000);
 							//l.getSelectionPath(start, end, hlPath);
 							for(int j=lstart;j<=lend;j++){
@@ -96,35 +129,26 @@ public class ClickableLinksDelegate {
 					}
 				}
 			}
+			return super.onDown(event);
 		}
-		if(event.getAction()==MotionEvent.ACTION_UP && selectedSpan!=null){
-			if (eventDuration <= ViewConfiguration.getLongPressTimeout()) {
+
+		@Override
+		public boolean onSingleTapUp(@NonNull MotionEvent event) {
+			if(selectedSpan!=null){
 				view.playSoundEffect(SoundEffectConstants.CLICK);
 				selectedSpan.onClick(view.getContext());
+				resetAndInvalidate();
+				return true;
 			}
-			view.removeCallbacks(longClickRunnable);
-			hlPath=null;
-			selectedSpan=null;
-			view.invalidate();
 			return false;
 		}
-		if(event.getAction()==MotionEvent.ACTION_CANCEL){
-			hlPath=null;
-			selectedSpan=null;
-			view.removeCallbacks(longClickRunnable);
-			view.invalidate();
-			return false;
-		}
-		return false;
-	}
-	
-	public void onDraw(Canvas canvas){
-		if(hlPath!=null){
-			canvas.save();
-			canvas.translate(0, view.getPaddingTop());
-			canvas.drawPath(hlPath, hlPaint);
-			canvas.restore();
-		}
-	}
 
+		@Override
+		public void onLongPress(@NonNull MotionEvent event) {
+			if (selectedSpan == null) return;
+			UiUtils.copyText(view, selectedSpan.getType() == LinkSpan.Type.URL ? selectedSpan.getLink() : selectedSpan.getText());
+			//reset view
+			resetAndInvalidate();
+		}
+	}
 }

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

@@ -46,14 +46,14 @@ public class LinkSpan extends CharacterStyle {
 		}
 	}
 
-	public void onLongClick(View view) {
-		UiUtils.copyText(view, getType() == Type.URL ? link : text);
-	}
-
 	public String getLink(){
 		return link;
 	}
 
+	public String getText() {
+		return text;
+	}
+
 	public Type getType(){
 		return type;
 	}

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

@@ -8,10 +8,8 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.fragments.NotificationsListFragment;
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.LinkCardStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 
 import java.util.List;
@@ -87,21 +85,11 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
 				boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
 				boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
 				int pad;
-				if(holder instanceof ImageStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder)
+				if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder)
 					pad=V.dp(16);
 				else
 					pad=V.dp(12);
 				boolean insetLeft=true, insetRight=true;
-				if(holder instanceof ImageStatusDisplayItem.Holder<?> img){
-					PhotoLayoutHelper.TiledLayoutResult layout=img.getItem().tiledLayout;
-					PhotoLayoutHelper.TiledLayoutResult.Tile tile=img.getItem().thisTile;
-					// only inset those items that are on the edges of the layout
-					insetLeft=tile.startCol==0;
-					insetRight=tile.startCol+tile.colSpan==layout.columnSizes.length;
-					// inset all items in the bottom row
-					if(tile.startRow+tile.rowSpan==layout.rowSizes.length)
-						bottomSiblingInset=false;
-				}
 				if(insetLeft)
 					outRect.left=pad;
 				if(insetRight)

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

@@ -0,0 +1,77 @@
+package org.joinmastodon.android.ui.utils;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
+import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
+
+public class MediaAttachmentViewController{
+	public final View view;
+	public final MediaGridStatusDisplayItem.GridItemType type;
+	public final ImageView photo;
+	public final View altButton, noAltButton, btnsWrap;
+	public static int[] altWrapPadding = null;
+	private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
+	private final Context context;
+	private boolean didClear;
+	private Status status;
+
+	public MediaAttachmentViewController(Context context, MediaGridStatusDisplayItem.GridItemType type){
+		view=context.getSystemService(LayoutInflater.class).inflate(switch(type){
+				case PHOTO -> R.layout.display_item_photo;
+				case VIDEO -> R.layout.display_item_video;
+				case GIFV -> R.layout.display_item_gifv;
+			}, null);
+		photo=view.findViewById(R.id.photo);
+		altButton=view.findViewById(R.id.alt_button);
+		noAltButton=view.findViewById(R.id.no_alt_button);
+		btnsWrap=view.findViewById(R.id.alt_badges);
+		this.type=type;
+		this.context=context;
+		if (altWrapPadding == null) {
+			altWrapPadding = new int[] { btnsWrap.getPaddingLeft(), btnsWrap.getPaddingTop(), btnsWrap.getPaddingRight(), btnsWrap.getPaddingBottom() };
+		}
+	}
+
+	public void bind(Attachment attachment, Status status){
+		this.status=status;
+		crossfadeDrawable.setSize(attachment.getWidth(), attachment.getHeight());
+		crossfadeDrawable.setBlurhashDrawable(attachment.blurhashPlaceholder);
+		crossfadeDrawable.setCrossfadeAlpha(status.spoilerRevealed ? 0f : 1f);
+		photo.setImageDrawable(null);
+		photo.setImageDrawable(crossfadeDrawable);
+		boolean hasAltText = !TextUtils.isEmpty(attachment.description);
+		photo.setContentDescription(!hasAltText ? context.getString(R.string.media_no_description) : attachment.description);
+		if(btnsWrap!=null){
+			btnsWrap.setVisibility(View.VISIBLE);
+			altButton.setVisibility(hasAltText && GlobalUserPreferences.showAltIndicator ? View.VISIBLE : View.GONE);
+			noAltButton.setVisibility(!hasAltText && GlobalUserPreferences.showNoAltIndicator ? View.VISIBLE : View.GONE);
+		}
+		didClear=false;
+	}
+
+	public void setImage(Drawable drawable){
+		crossfadeDrawable.setImageDrawable(drawable);
+		if(didClear && status.spoilerRevealed)
+			 crossfadeDrawable.animateAlpha(0f);
+	}
+
+	public void clearImage(){
+		crossfadeDrawable.setCrossfadeAlpha(1f);
+		crossfadeDrawable.setImageDrawable(null);
+		didClear=true;
+	}
+
+	public void setRevealed(boolean revealed){
+		crossfadeDrawable.animateAlpha(revealed ? 0f : 1f);
+	}
+}

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

@@ -87,6 +87,7 @@ import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.SearchResults;
+import org.joinmastodon.android.model.Searchable;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -107,8 +108,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -335,12 +338,21 @@ public class UiUtils {
 	}
 
 	public static int getThemeColor(Context context, @AttrRes int attr) {
+		if (context == null) return 0xff00ff00;
 		TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
 		int color = ta.getColor(0, 0xff00ff00);
 		ta.recycle();
 		return color;
 	}
 
+	public static int getThemeColorRes(Context context, @AttrRes int attr) {
+		if (context == null) return 0xff00ff00;
+		TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
+		int color = ta.getResourceId(0, R.color.black);
+		ta.recycle();
+		return color;
+	}
+
 	public static void openProfileByID(Context context, String selfID, String id) {
 		Bundle args = new Bundle();
 		args.putString("account", selfID);
@@ -691,6 +703,9 @@ public class UiUtils {
 		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
 		button.setBackground(ta.getDrawable(0));
 		ta.recycle();
+		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		button.setTextColor(ta.getColorStateList(0));
+		ta.recycle();
 	}
 
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback) {
@@ -706,7 +721,7 @@ public class UiUtils {
 						public void onSuccess(Relationship result) {
 							resultCallback.accept(result);
 							progressCallback.accept(false);
-							if (!result.following) {
+							if(!result.following && !result.requested){
 								E.post(new RemoveAccountPostsEvent(accountID, account.id, true));
 							}
 						}
@@ -982,6 +997,8 @@ public class UiUtils {
 	public static void pickInteractAs(Context context, String accountID, Status sourceStatus, Predicate<Status> checkInteracted, InteractionPerformer interactionPerformer, @StringRes int interactAsRes, @StringRes int interactedAsAccountRes, @StringRes int alreadyInteractedRes, @DrawableRes int iconRes) {
 		pickAccount(context, accountID, interactAsRes, iconRes, session -> {
 			lookupStatus(context, sourceStatus, session.getID(), accountID, status -> {
+				if (status == null) return;
+
 				if (checkInteracted.test(status)) {
 					Toast.makeText(context, alreadyInteractedRes, Toast.LENGTH_SHORT).show();
 					return;
@@ -997,18 +1014,33 @@ public class UiUtils {
 		}, null);
 	}
 
-	public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> statusConsumer) {
+	public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> resultConsumer) {
+		lookup(context, queryStatus, targetAccountID, sourceAccountID, GetSearchResults.Type.STATUSES, resultConsumer, results ->
+			!results.statuses.isEmpty() ? Optional.of(results.statuses.get(0)) : Optional.empty()
+		);
+	}
+
+	public static void lookupAccount(Context context, Account queryAccount, String targetAccountID, @Nullable String sourceAccountID, Consumer<Account> resultConsumer) {
+		lookup(context, queryAccount, targetAccountID, sourceAccountID, GetSearchResults.Type.ACCOUNTS, resultConsumer, results ->
+				!results.accounts.isEmpty() ? Optional.of(results.accounts.get(0)) : Optional.empty()
+		);
+	}
+
+	public static <T extends Searchable> void lookup(Context context, T query, String targetAccountID, @Nullable String sourceAccountID, @Nullable GetSearchResults.Type type, Consumer<T> resultConsumer, Function<SearchResults, Optional<T>> extractResult) {
 		if (sourceAccountID != null && targetAccountID.startsWith(sourceAccountID.substring(0, sourceAccountID.indexOf('_')))) {
-			statusConsumer.accept(queryStatus);
+			resultConsumer.accept(query);
 			return;
 		}
 
-		new GetSearchResults(queryStatus.url, GetSearchResults.Type.STATUSES, true).setCallback(new Callback<>() {
+		new GetSearchResults(query.getQuery(), type, true).setCallback(new Callback<>() {
 					@Override
 					public void onSuccess(SearchResults results) {
-						if (!results.statuses.isEmpty()) statusConsumer.accept(results.statuses.get(0));
-						else
+						Optional<T> result = extractResult.apply(results);
+						if (result.isPresent()) resultConsumer.accept(result.get());
+						else {
 							Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+							resultConsumer.accept(null);
+						}
 					}
 
 					@Override
@@ -1123,6 +1155,10 @@ public class UiUtils {
 		return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code"));
 	}
 
+	public static boolean isEMUI() {
+		return !TextUtils.isEmpty(getSystemProperty("ro.build.version.emui"));
+	}
+
 	public static int alphaBlendColors(int color1, int color2, float alpha) {
 		float alpha0 = 1f - alpha;
 		int r = Math.round(((color1 >> 16) & 0xFF) * alpha0 + ((color2 >> 16) & 0xFF) * alpha);
@@ -1245,6 +1281,17 @@ public class UiUtils {
 		return intent;
 	}
 
+	public static void populateAccountsMenu(String excludeAccountID, Menu menu, Consumer<AccountSession> onClick) {
+		List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
+		sessions.stream().filter(s -> !s.getID().equals(excludeAccountID)).forEach(s -> {
+			String username = "@"+s.self.username+"@"+s.domain;
+			menu.add(username).setOnMenuItemClickListener((c) -> {
+				onClick.accept(s);
+				return true;
+			});
+		});
+	}
+
 	/**
 	 * Wraps a View.OnClickListener to filter multiple clicks in succession.
 	 * Useful for buttons that perform some action that changes their state asynchronously.

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

@@ -0,0 +1,29 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+public class FrameLayoutThatOnlyMeasuresFirstChild extends FrameLayout{
+	public FrameLayoutThatOnlyMeasuresFirstChild(Context context){
+		this(context, null);
+	}
+
+	public FrameLayoutThatOnlyMeasuresFirstChild(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public FrameLayoutThatOnlyMeasuresFirstChild(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
+		if(getChildCount()==0)
+			return;
+		View child0=getChildAt(0);
+		measureChild(child0, widthMeasureSpec, heightMeasureSpec);
+		super.onMeasure(child0.getMeasuredWidth() | MeasureSpec.EXACTLY, child0.getMeasuredHeight() | MeasureSpec.EXACTLY);
+	}
+}

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

@@ -1,54 +0,0 @@
-package org.joinmastodon.android.ui.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import org.joinmastodon.android.ui.PhotoLayoutHelper;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import me.grishka.appkit.utils.V;
-
-public class ImageAttachmentFrameLayout extends FrameLayout{
-	public static final int MAX_WIDTH=400; // dp
-
-	private PhotoLayoutHelper.TiledLayoutResult tileLayout;
-	private PhotoLayoutHelper.TiledLayoutResult.Tile tile;
-	private int horizontalInset;
-
-	public ImageAttachmentFrameLayout(@NonNull Context context){
-		super(context);
-	}
-
-	public ImageAttachmentFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs){
-		super(context, attrs);
-	}
-
-	public ImageAttachmentFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr){
-		super(context, attrs, defStyleAttr);
-	}
-
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
-		if(isInEditMode()){
-			super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-			return;
-		}
-		int w=Math.min(((View)getParent()).getMeasuredWidth(), V.dp(MAX_WIDTH))-horizontalInset;
-		int actualHeight=Math.round(tile.height/1000f*w)+V.dp(1)*(tile.rowSpan-1);
-		int actualWidth=Math.round(tile.width/1000f*w);
-		if(tile.startCol+tile.colSpan<tileLayout.columnSizes.length)
-			actualWidth-=V.dp(1);
-		heightMeasureSpec=actualHeight | MeasureSpec.EXACTLY;
-		widthMeasureSpec=actualWidth | MeasureSpec.EXACTLY;
-		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-	}
-
-	public void setLayout(PhotoLayoutHelper.TiledLayoutResult layout, PhotoLayoutHelper.TiledLayoutResult.Tile tile, int horizontalInset){
-		tileLayout=layout;
-		this.tile=tile;
-		this.horizontalInset=horizontalInset;
-	}
-}

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

@@ -0,0 +1,105 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.joinmastodon.android.ui.PhotoLayoutHelper;
+
+import me.grishka.appkit.utils.V;
+
+public class MediaGridLayout extends ViewGroup{
+	private static final String TAG="MediaGridLayout";
+
+	public static final int MAX_WIDTH=400; // dp
+	private static final int GAP=1; // dp
+	private PhotoLayoutHelper.TiledLayoutResult tiledLayout;
+	private int[] columnStarts=new int[10], columnEnds=new int[10], rowStarts=new int[10], rowEnds=new int[10];
+
+	public MediaGridLayout(Context context){
+		this(context, null);
+	}
+
+	public MediaGridLayout(Context context, AttributeSet attrs){
+		this(context, attrs, 0);
+	}
+
+	public MediaGridLayout(Context context, AttributeSet attrs, int defStyle){
+		super(context, attrs, defStyle);
+
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
+		if(tiledLayout==null){
+			setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), 0);
+			return;
+		}
+		int width=Math.min(V.dp(MAX_WIDTH), MeasureSpec.getSize(widthMeasureSpec));
+		int height=Math.round(width*(tiledLayout.height/(float)PhotoLayoutHelper.MAX_WIDTH));
+
+		int offset=0;
+		for(int i=0;i<tiledLayout.columnSizes.length;i++){
+			columnStarts[i]=offset;
+			offset+=Math.round(tiledLayout.columnSizes[i]/(float)tiledLayout.width*width);
+			columnEnds[i]=offset;
+			offset+=V.dp(GAP);
+		}
+		columnEnds[tiledLayout.columnSizes.length-1]=width;
+		offset=0;
+		for(int i=0;i<tiledLayout.rowSizes.length;i++){
+			rowStarts[i]=offset;
+			offset+=Math.round(tiledLayout.rowSizes[i]/(float)tiledLayout.height*height);
+			rowEnds[i]=offset;
+			offset+=V.dp(GAP);
+		}
+		rowEnds[tiledLayout.rowSizes.length-1]=height;
+
+		for(int i=0;i<getChildCount();i++){
+			View child=getChildAt(i);
+			LayoutParams lp=(LayoutParams) child.getLayoutParams();
+			int colSpan=Math.max(1, lp.tile.colSpan)-1;
+			int rowSpan=Math.max(1, lp.tile.rowSpan)-1;
+			int w=columnEnds[lp.tile.startCol+colSpan]-columnStarts[lp.tile.startCol];
+			int h=rowEnds[lp.tile.startRow+rowSpan]-rowStarts[lp.tile.startRow];
+			child.measure(w | MeasureSpec.EXACTLY, h | MeasureSpec.EXACTLY);
+		}
+
+		setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height);
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b){
+		if(tiledLayout==null)
+			return;
+
+		int maxWidth=V.dp(MAX_WIDTH);
+		int xOffset=0;
+		if(r-l>maxWidth){
+			xOffset=(r-l)/2-maxWidth/2;
+		}
+
+		for(int i=0;i<getChildCount();i++){
+			View child=getChildAt(i);
+			LayoutParams lp=(LayoutParams) child.getLayoutParams();
+			int colSpan=Math.max(1, lp.tile.colSpan)-1;
+			int rowSpan=Math.max(1, lp.tile.rowSpan)-1;
+			child.layout(columnStarts[lp.tile.startCol]+xOffset, rowStarts[lp.tile.startRow], columnEnds[lp.tile.startCol+colSpan]+xOffset, rowEnds[lp.tile.startRow+rowSpan]);
+		}
+	}
+
+	public void setTiledLayout(PhotoLayoutHelper.TiledLayoutResult tiledLayout){
+		this.tiledLayout=tiledLayout;
+		requestLayout();
+	}
+
+	public static class LayoutParams extends ViewGroup.LayoutParams{
+		public PhotoLayoutHelper.TiledLayoutResult.Tile tile;
+
+		public LayoutParams(PhotoLayoutHelper.TiledLayoutResult.Tile tile){
+			super(WRAP_CONTENT, WRAP_CONTENT);
+			this.tile=tile;
+		}
+	}
+}

mastodon/src/main/java/org/joinmastodon/android/utils/TransferSpeedTracker.java

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.ui.utils;
+package org.joinmastodon.android.utils;
 
 import android.os.SystemClock;
 

mastodon/src/main/java/org/joinmastodon/android/utils/TypedObjectPool.java

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.utils;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Objects;
+import java.util.function.Function;
+
+public class TypedObjectPool<K, V>{
+	private final Function<K, V> producer;
+	private final HashMap<K, LinkedList<V>> pool=new HashMap<>();
+
+	public TypedObjectPool(Function<K, V> producer){
+		this.producer=producer;
+	}
+
+	public V obtain(K type){
+		LinkedList<V> tp=pool.get(type);
+		if(tp==null)
+			pool.put(type, tp=new LinkedList<>());
+
+		V value=tp.poll();
+		if(value==null)
+			value=producer.apply(type);
+		return value;
+	}
+
+	public void reuse(K type, V obj){
+		Objects.requireNonNull(obj);
+		Objects.requireNonNull(type);
+
+		LinkedList<V> tp=pool.get(type);
+		if(tp==null)
+			pool.put(type, tp=new LinkedList<>());
+		tp.add(obj);
+	}
+}

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

@@ -4,5 +4,5 @@
     android:shape="rectangle">
     <corners android:radius="4sp" />
     <solid android:color="?colorBackgroundLight" />
-    <stroke android:width="2dp" android:color="#00ff00" />
+    <stroke android:width="2dp" android:color="?android:colorAccent" />
 </shape>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_fluent_alert_28_filled" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
+	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
+		<shape android:shape="oval">
+			<stroke android:color="?toolbarBackground" android:width="2dp"/>
+			<solid android:color="?android:colorAccent"/>
+		</shape>
+	</item>
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_fluent_alert_28_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
+	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
+		<shape android:shape="oval">
+			<stroke android:color="?toolbarBackground" android:width="2dp"/>
+			<solid android:color="?android:colorAccent"/>
+		</shape>
+	</item>
+</layer-list>

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

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

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M15.114 25.719c-0.396-0.408-0.746-0.861-1.04-1.35C13.418 24.453 12.725 24.5 12 24.5c-5.111 0-8.5-2.111-8.5-4.785V19l0.007-0.145C3.58 18.095 4.22 17.5 5 17.5h8.624c0.234-0.535 0.529-1.038 0.875-1.5H5c-1.657 0-3 1.343-3 3v0.715C2 23.433 6.21 26 12 26c1.101 0 2.145-0.098 3.114-0.281zM18 8c0-3.314-2.686-6-6-6S6 4.686 6 8s2.686 6 6 6 6-2.686 6-6zM7.5 8c0-2.485 2.015-4.5 4.5-4.5s4.5 2.015 4.5 4.5-2.015 4.5-4.5 4.5S7.5 10.485 7.5 8zm13 19c3.59 0 6.5-2.91 6.5-6.5S24.09 14 20.5 14 14 16.91 14 20.5s2.91 6.5 6.5 6.5zm0-11c0.276 0 0.5 0.224 0.5 0.5V20h3.5c0.276 0 0.5 0.224 0.5 0.5S24.776 21 24.5 21H21v3.5c0 0.276-0.224 0.5-0.5 0.5S20 24.776 20 24.5V21h-3.5c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H20v-3.5c0-0.276 0.224-0.5 0.5-0.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M2.75 13.25h18.5c0.414 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743L21.25 14.75H2.75C2.336 14.75 2 14.414 2 14c0-0.38 0.282-0.694 0.648-0.743L2.75 13.25h18.5-18.5zm0-4h18.5C21.664 9.25 22 9.586 22 10c0 0.38-0.282 0.694-0.648 0.743L21.25 10.75H2.75C2.336 10.75 2 10.414 2 10c0-0.38 0.282-0.694 0.648-0.743L2.75 9.25h18.5-18.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/layout/alt_badge.xml

@@ -1,79 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This is hidden from screenreaders because that same alt text is set as content description on the ImageView -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/alt_text_wrapper"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start|bottom"
-    android:layout_margin="12dp"
-    android:importantForAccessibility="noHideDescendants"
-    android:background="@drawable/bg_image_alt_overlay">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/alt_badges"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_gravity="start|bottom"
+	android:padding="12dp"
+	android:importantForAccessibility="noHideDescendants">
 
-    <ImageView
-        android:id="@+id/no_alt_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="4dp"
-        android:src="@drawable/ic_fluent_important_20_filled"
-        android:tint="?colorGray25" />
+	<ImageView
+		android:id="@+id/no_alt_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:padding="4dp"
+		android:src="@drawable/ic_fluent_important_20_filled"
+		android:background="@drawable/bg_image_no_alt_overlay"
+		android:tint="?colorGray25" />
 
-    <TextView
-        android:id="@+id/alt_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/m3_label_large"
-        android:textColor="?colorGray25"
-        android:gravity="center"
-        android:includeFontPadding="false"
-        android:paddingHorizontal="5dp"
-        android:paddingVertical="1dp"
-        android:text="@string/sk_alt_button"/>
-
-    <ImageButton
-        android:id="@+id/alt_text_close"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="end|top"
-        android:src="@drawable/ic_baseline_close_24"
-        android:tint="#FFF"
-        android:background="?android:actionBarItemBackground"/>
-
-    <org.joinmastodon.android.ui.views.NestableScrollView
-        android:id="@+id/alt_text_scroller"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="40dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/alt_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:textAppearance="@style/m3_body_medium"
-                android:textColor="?colorGray25"
-                tools:text="Alt text goes here"/>
-
-            <TextView
-                android:id="@+id/no_alt_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginVertical="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginStart="14dp"
-                android:textAppearance="@style/m3_label_large"
-                android:textColor="?colorGray25"
-                android:text="@string/sk_no_alt_text"/>
-
-        </LinearLayout>
-
-    </org.joinmastodon.android.ui.views.NestableScrollView>
+	<TextView
+		android:id="@+id/alt_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:textAppearance="@style/m3_label_large"
+		android:textColor="?colorGray25"
+		android:gravity="center"
+		android:includeFontPadding="false"
+		android:paddingHorizontal="5dp"
+		android:paddingVertical="1dp"
+		android:background="@drawable/bg_image_alt_overlay"
+		android:text="@string/sk_alt_button"/>
 
 </FrameLayout>

mastodon/src/main/res/layout/display_item_gifv.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -27,4 +27,4 @@
 
 	<include layout="@layout/alt_badge" />
 
-</org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout>
+</FrameLayout>

mastodon/src/main/res/layout/display_item_header.xml

@@ -27,6 +27,7 @@
 		android:visibility="gone"
 		android:background="?android:actionBarItemBackground"
 		android:contentDescription="@string/sk_delete_notification"
+		android:tooltipText="@string/sk_delete_notification"
 		android:scaleType="center"
 		android:src="@drawable/ic_fluent_dismiss_20_filled"
 		android:tint="?android:textColorSecondary" />

mastodon/src/main/res/layout/display_item_photo.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -12,4 +13,4 @@
 
 	<include layout="@layout/alt_badge" />
 
-</org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout>
+</FrameLayout>

mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml

@@ -1,14 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:paddingHorizontal="16dp"
 	android:layout_marginBottom="-12dp">
 
+	<TextView
+		android:id="@+id/extra_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="16dp"
+		android:paddingBottom="6dp"
+		android:textAppearance="@style/m3_title_small"
+		android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
+		android:drawableTint="?android:textColorSecondary"
+		android:drawablePadding="6dp"
+		android:singleLine="true"
+		android:ellipsize="end"/>
+
+	<TextView
+		android:id="@+id/separator"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="6dp"
+		android:paddingTop="16dp"
+		android:paddingHorizontal="1dp"
+		android:textAppearance="@style/m3_title_small"
+		android:gravity="center_horizontal"
+		android:importantForAccessibility="no"
+		android:includeFontPadding="false"
+		android:text="@string/sk_separator" />
+
 	<TextView
 		android:id="@+id/text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingHorizontal="16dp"
 		android:paddingTop="16dp"
 		android:paddingBottom="6dp"
 		android:textAppearance="@style/m3_title_small"
@@ -18,4 +46,4 @@
 		android:singleLine="true"
 		android:ellipsize="end"/>
 
-</FrameLayout>
+</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>

mastodon/src/main/res/layout/display_item_video.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -20,4 +20,4 @@
 
 	<include layout="@layout/alt_badge" />
 
-</org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout>
+</FrameLayout>

mastodon/src/main/res/layout/fragment_compose.xml

@@ -64,10 +64,10 @@
 					android:paddingBottom="6dp"
 					android:textAppearance="@style/m3_title_small"
 					android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
-					tools:drawableEnd="@drawable/ic_fluent_earth_20_regular"
 					android:drawableTint="?android:textColorSecondary"
 					android:drawablePadding="6dp"
 					android:singleLine="true"
+					android:text="@string/sk_in_reply"
 					android:ellipsize="end"/>
 
 				<RelativeLayout
@@ -101,9 +101,9 @@
 						android:id="@+id/self_extra_text"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_marginTop="2sp"
 						android:layout_marginStart="8sp"
 						android:layout_toEndOf="@id/self_name"
+						android:paddingTop="4sp"
 						android:ellipsize="end"
 						android:fontFamily="sans-serif"
 						android:singleLine="true"
@@ -125,6 +125,23 @@
 
 				</RelativeLayout>
 
+				<TextView
+					android:id="@+id/reply_text_below"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="-6dp"
+					android:layout_marginBottom="-6dp"
+					android:layout_marginStart="16dp"
+					android:paddingTop="16dp"
+					android:paddingBottom="6dp"
+					android:textAppearance="@style/m3_title_small"
+					android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
+					android:drawableTint="?android:textColorSecondary"
+					android:drawablePadding="6dp"
+					android:singleLine="true"
+					android:text="@string/sk_in_reply"
+					android:ellipsize="end"/>
+
 				<FrameLayout
 					android:id="@+id/toot_text_wrap"
 					android:layout_width="match_parent"

mastodon/src/main/res/layout/header_welcome_custom.xml

@@ -36,7 +36,7 @@
 		android:layout_marginTop="16dp"
 		android:layout_marginBottom="8dp"
 		android:layout_marginHorizontal="16dp"
-		android:inputType="textFilter|textNoSuggestions"
+		android:inputType="textUri|textNoSuggestions"
 		android:singleLine="true"
 		android:imeOptions="actionGo"
 		android:drawableStart="@drawable/ic_fluent_globe_20_regular"

mastodon/src/main/res/layout/overlay_image_alt_text.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/alt_text_wrapper"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_gravity="start|bottom"
+	android:layout_margin="12dp"
+	android:importantForAccessibility="noHideDescendants"
+	android:background="@drawable/bg_image_alt_overlay">
+
+	<ImageView
+		android:id="@+id/no_alt_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:padding="4dp"
+		android:src="@drawable/ic_fluent_important_20_filled"
+		android:tint="?colorGray25" />
+
+	<TextView
+		android:id="@+id/alt_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="@style/m3_label_large"
+		android:textColor="?colorGray25"
+		android:gravity="center"
+		android:includeFontPadding="false"
+		android:paddingHorizontal="5dp"
+		android:paddingVertical="1dp"
+		android:text="@string/sk_alt_button"/>
+
+	<ImageButton
+		android:id="@+id/alt_text_close"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:layout_gravity="end|top"
+		android:src="@drawable/ic_baseline_close_24"
+		android:tint="#FFF"
+		android:background="?android:actionBarItemBackground"/>
+
+	<org.joinmastodon.android.ui.views.NestableScrollView
+		android:id="@+id/alt_text_scroller"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="40dp">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/alt_text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp"
+				android:textAppearance="@style/m3_body_medium"
+				android:textColor="#FFF"
+				tools:text="Alt text goes here"/>
+
+			<TextView
+				android:id="@+id/no_alt_text"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginVertical="8dp"
+				android:layout_marginEnd="8dp"
+				android:layout_marginStart="14dp"
+				android:textAppearance="@style/m3_label_large"
+				android:textColor="?colorGray25"
+				android:text="@string/sk_no_alt_text"/>
+
+		</LinearLayout>
+
+	</org.joinmastodon.android.ui.views.NestableScrollView>
+
+</FrameLayout>

mastodon/src/main/res/layout/tab_bar.xml

@@ -51,7 +51,6 @@
 			android:scaleType="center"
 			android:contentDescription="@string/notifications"
 			android:background="?android:selectableItemBackgroundBorderless"
-			android:tint="?android:colorPrimary"
 			android:src="@drawable/ic_fluent_alert_28_selector"/>
 
 		<Space

mastodon/src/main/res/menu/post.xml

@@ -8,11 +8,11 @@
 	<item android:id="@+id/delete_and_redraft" android:title="@string/sk_delete_and_redraft" android:icon="@drawable/ic_fluent_arrow_clockwise_24_regular" />
 	<item android:id="@+id/pin" android:title="@string/sk_pin_post" android:icon="@drawable/ic_fluent_pin_24_regular"/>
 	<item android:id="@+id/unpin" android:title="@string/sk_unpin_post" android:icon="@drawable/ic_fluent_pin_off_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
+	<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>
 	<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
-	<item android:id="@+id/follow" android:title="@string/follow_user" android:icon="@drawable/ic_fluent_person_add_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/bookmark" android:title="@string/add_bookmark" android:icon="@drawable/ic_fluent_bookmark_24_regular"/>
 	<item android:id="@+id/copy_link" android:title="@string/sk_copy_link_to_post" android:icon="@drawable/ic_fluent_link_24_regular"/>

mastodon/src/main/res/menu/profile.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:visible="false" android:icon="@drawable/ic_fluent_person_swap_24_regular">
+		<menu android:id="@+id/accounts" />
+	</item>
 	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
 	<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
-	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/soft_block" android:title="@string/sk_remove_follower" android:icon="@drawable/ic_fluent_person_delete_24_regular"/>
+	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>

mastodon/src/main/res/menu/profile_own.xml

@@ -2,6 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:icon="@drawable/ic_fluent_person_swap_24_regular">
+		<menu android:id="@+id/accounts" />
+	</item>
 	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_24_regular"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_folder_open_24_regular"/>

mastodon/src/main/res/menu/reply_visibility.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/reply_visibility_all" android:title="@string/sk_settings_reply_visibility_all"/>
+    <item android:id="@+id/reply_visibility_following" android:title="@string/sk_settings_reply_visibility_following"/>
+    <item android:id="@+id/reply_visibility_self" android:title="@string/sk_settings_reply_visibility_self"/>
+</menu>

mastodon/src/main/res/values-ar-rSA/strings.xml

@@ -16,7 +16,7 @@
 	<string name="user_followed_you">بَدَأ بِمُتابَعَتِك</string>
 	<string name="user_sent_follow_request">أرسَلَ طَلَبًا لِمُتابَعَتِك</string>
 	<string name="user_favorited">فَضَّلَ مَنشُورَك</string>
-	<string name="notification_boosted">أعادَ تَدوينَ مَنشُورَك</string>
+	<string name="notification_boosted">أعادَ تَدوينَ مَنشُورِك</string>
 	<string name="poll_ended">انتهى استطلاعُ الرأي</string>
 	<string name="time_seconds">%d ثا</string>
 	<string name="time_minutes">%d د</string>
@@ -57,7 +57,7 @@
 	<string name="media">وسائط</string>
 	<string name="profile_about">حَول</string>
 	<string name="button_follow">تابِع</string>
-	<string name="button_following">يُتابِع</string>
+	<string name="button_following">مُتابَع</string>
 	<string name="edit_profile">حرّر الملف الشخصي</string>
 	<string name="mention_user">ذِكر @%s</string>
 	<string name="share_user">مُشارَكَةُ %s</string>
@@ -82,7 +82,7 @@
 	<string name="field_label">التسمية</string>
 	<string name="field_content">المحتوى</string>
 	<string name="saving">يحفظ…</string>
-	<string name="post_from_user">نُشر من %s</string>
+	<string name="post_from_user">مَنشور مِن %s</string>
 	<string name="poll_option_hint">الخيار %d</string>
 	<plurals name="x_minutes">
 		<item quantity="zero">أقل من دقيقة</item>
@@ -249,7 +249,7 @@
 	<string name="category_games">ألعاب</string>
 	<string name="category_general">عام</string>
 	<string name="category_journalism">صحافة</string>
-	<string name="category_lgbt">LGBT</string>
+	<string name="category_lgbt">مجتمع الميم</string>
 	<string name="category_music">موسيقى</string>
 	<string name="category_regional">إقليمي</string>
 	<string name="category_tech">تقني</string>
@@ -311,7 +311,7 @@
 	<string name="notify_favorites">بِالإعْجاب بِمَنشوري</string>
 	<string name="notify_follow">بمتابعتي</string>
 	<string name="notify_reblog">بإعادة تدوين مَنشوري</string>
-	<string name="notify_mention">ذكرني</string>
+	<string name="notify_mention">بِالإشارَةِ إليّ</string>
 	<string name="settings_boring">المنطِقَةُ المُملَّة</string>
 	<string name="settings_account">إعدادات الحساب</string>
 	<string name="settings_contribute">ساهم في ماستدون</string>
@@ -432,7 +432,7 @@
 		<item quantity="many">منذ %d دقائق</item>
 		<item quantity="other">منذ %d دقائق</item>
 	</plurals>
-	<string name="edited_timestamp">عُدّل في %s</string>
+	<string name="edited_timestamp">عُدّل منذ %s</string>
 	<string name="edit_original_post">المنشور الأصلي</string>
 	<string name="edit_text_edited">تم تعديل النص</string>
 	<string name="edit_spoiler_added">تم إضافة تحذير المحتوى</string>
@@ -508,7 +508,7 @@
 	<string name="server_rules_disagree">لا أوافق</string>
 	<string name="privacy_policy_explanation">بالمختصر: نحن لا نجمع أو نعالج أي شيء.</string>
 	<!-- %s is server domain -->
-	<string name="server_policy_disagree">لايتفق مع %s</string>
+	<string name="server_policy_disagree">لا أوافق %s</string>
 	<string name="profile_bio">نبذة عنك</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<string name="sending_follows">متابعة المستخدمين…</string>

mastodon/src/main/res/values-be-rBY/strings.xml

@@ -26,7 +26,7 @@
 	<string name="settings">Налады</string>
 	<string name="publish">Апублікаваць</string>
 	<string name="discard_draft">Скасаваць чарнавік?</string>
-	<string name="discard">Скасаваць</string>
+	<string name="discard">Выйсці</string>
 	<string name="cancel">Скасаваць</string>
 	<plurals name="followers">
 		<item quantity="one">падпісчык</item>
@@ -201,7 +201,15 @@
 	<string name="back">Назад</string>
 	<string name="instance_catalog_title">Mastodon складаецца з карыстальнікаў на розных серверах.</string>
 	<string name="instance_catalog_subtitle">Выбірайце сервер у залежнасці ад вашых інтарэсаў, рэгіёна або выберыце сервер агульнага прызначэння. Вы па-ранейшаму можаце ўзаемадзейнічаць з усімі, незалежна ад сервера.</string>
+	<string name="search_communities">Назва сервера або URL</string>
+	<string name="instance_rules_title">Правілы сервера</string>
+	<string name="signup_title">Стварыць уліковы запіс</string>
 	<string name="edit_photo">рэдагаваць</string>
+	<string name="display_name">Імя</string>
+	<string name="username">Імя карыстальніка</string>
+	<string name="email">Электронная пошта</string>
+	<string name="password">Пароль</string>
+	<string name="confirm_password">Пацвердзіць пароль</string>
 	<string name="password_note">Выкарыстоўвайце вялікія літары, спецыяльныя сімвалы і лічбы, каб павялічыць надзейнасць пароля.</string>
 	<string name="category_academia">Акадэмія</string>
 	<string name="category_activism">Актывізм</string>
@@ -216,6 +224,7 @@
 	<string name="category_music">Музыка</string>
 	<string name="category_regional">Рэгіянальныя</string>
 	<string name="category_tech">Тэхналогіі</string>
+	<string name="confirm_email_title">Праверце паштовую скрыню</string>
 	<!-- %s is the email address -->
 	<string name="resend">Адправіць паўторна</string>
 	<string name="open_email_app">Адкрыць праграму для пошты</string>
@@ -426,7 +435,15 @@
 	<string name="welcome_page2_text">Ваш ідэнтыфікатар можа быць @gothgirl654@example.social, але вы ўсё яшчэ можаце падпісвацца, пашыраць і перапісвацца з @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Як выбраць сервер?</string>
 	<string name="welcome_page3_text">Розныя людзі выбіраюць розныя серверы па розных прычынах. art.example з\'яўляецца выдатным месцам для мастакоў, у той час як glasgow.example можа быць добрым выбарам для шатландцаў.\n\nВы не памыліцеся ні з адным з нашых рэкамендаваных сервераў, так што незалежна ад таго, які вы выбераце (або калі ўведзяце ваш уласны ў радку пошуку сервера), вы нідзе нічога не прапусціце.</string>
+	<string name="server_filter_any_language">Любая мова</string>
+	<string name="server_filter_region_europe">Еўропа</string>
+	<string name="server_filter_region_north_america">Паўночная Амерыка</string>
+	<string name="server_filter_region_south_america">Паўднёвая Амерыка</string>
+	<string name="server_filter_region_africa">Афрыка</string>
+	<string name="server_filter_region_asia">Азія</string>
+	<string name="server_filter_region_oceania">Акіянія</string>
 	<!-- %s is server domain -->
 	<!-- Shown in a progress dialog when you tap "follow all" -->
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_username_taken">Гэта імя карыстальніка занята.</string>
 </resources>

mastodon/src/main/res/values-bn-rBD/strings.xml

@@ -1,42 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="get_started">অ্যাকাউন্ট তৈরি করুন</string>
+	<string name="already_have_account">আমার আগে থেকেই একটি অ্যাকাউন্ট আছে</string>
 	<string name="log_in">লগ ইন করুন</string>
-	<string name="next">পরবর্তী</string>
+	<string name="next">এরপর</string>
+	<string name="error">কোনো ত্রুটি ঘটেছে</string>
 	<string name="ok">ঠিক আছে</string>
 	<string name="preparing_auth">প্রমাণীকরণের জন্য প্রস্তুত হচ্ছে...</string>
-	<string name="notifications">বিজ্ঞপ্তি</string>
-	<string name="user_followed_you">অনুসরণ করে</string>
-	<string name="user_sent_follow_request">অনুসরণের জন্য অনুরোধ পাঠানো হয়েছে</string>
-	<string name="user_favorited">পোস্টটি পছন্দ করা হয়েছে</string>
+	<string name="in_reply_to">%s কে উত্তর দিন</string>
+	<string name="notifications">নোটিফিকেশন</string>
+	<string name="user_followed_you">আপনাকে ফলো করেছেন</string>
+	<string name="user_sent_follow_request">ফলো করার জন্য অনুরোধ পাঠানো হয়েছে</string>
+	<string name="user_favorited">আপনার পোস্টটি পছন্দ করেছেন</string>
 	<string name="notification_boosted">আপনার পোস্টের প্রচার করা হয়েছে</string>
 	<string name="poll_ended">ভোট শেষ</string>
+	<string name="time_seconds">%d সে.</string>
+	<string name="time_minutes">%d মি.</string>
+	<string name="time_hours">%d ঘ.</string>
+	<string name="time_days">%d দি.</string>
+	<string name="share_toot_title">শেয়ার করুন</string>
+	<string name="settings">সেটিংস</string>
+	<string name="cancel">বাতিল করুন</string>
+	<plurals name="posts">
+		<item quantity="one">পোস্ট</item>
+		<item quantity="other">পোস্টগুলো</item>
+	</plurals>
+	<string name="posts">পোস্টগুলো</string>
+	<string name="share_user">%s -কে শেয়ার করুন</string>
+	<string name="mute_user">%s -কে মিউট করুন</string>
+	<string name="unmute_user">%s -কে আনমিউট করুন</string>
+	<string name="block_user">%s -কে ব্লক করুন</string>
+	<string name="unblock_user">%s -কে আনব্লক করুন</string>
+	<string name="report_user">%s -এর নামে রিপোর্ট করুন</string>
+	<string name="block_domain">%s -কে ব্লক করুন</string>
+	<string name="unblock_domain">%s -কে আনব্লক করুন</string>
+	<plurals name="x_posts">
+		<item quantity="one">%,d টি পোস্ট</item>
+		<item quantity="other">%,d টি পোস্ট</item>
+	</plurals>
+	<string name="profile_joined">যুক্ত হয়েছেন</string>
+	<string name="done">হয়ে গেছে</string>
+	<string name="loading">লোড হচ্ছে…</string>
+	<string name="saving">সেভ হচ্ছে…</string>
+	<plurals name="x_minutes">
+		<item quantity="one">%d মিনিট</item>
+		<item quantity="other">%d মিনিট</item>
+	</plurals>
+	<plurals name="x_hours">
+		<item quantity="one">%d ঘণ্টা</item>
+		<item quantity="other">%d ঘণ্টা</item>
+	</plurals>
+	<plurals name="x_days">
+		<item quantity="one">%d দিন</item>
+		<item quantity="other">%d দিন</item>
+	</plurals>
 	<string name="poll_closed">বন্ধ</string>
-	<string name="confirm_mute_title">অ্যাকাউন্ট টি মিউট করুন</string>
+	<string name="confirm_mute_title">অ্যাকাউন্টটি মিউট করুন</string>
 	<string name="do_mute">মিউট করুন</string>
 	<string name="confirm_unmute_title">অ্যাকাউন্ট টি আনমিউট করুন</string>
 	<string name="confirm_unmute">%s আনমিউট নিশ্চিত করুন</string>
 	<string name="do_unmute">মিউট</string>
-	<string name="confirm_block_title">অ্যাকাউন্ট টি ব্লক করুন</string>
+	<string name="confirm_block_title">অ্যাকাউন্টটি ব্লক করুন</string>
+	<string name="confirm_block_domain_title">ওয়েবসাইটটি ব্লক করুন</string>
 	<string name="do_block">ব্লক করুন</string>
+	<string name="confirm_unblock_title">অ্যাকাউন্ট আনব্লক করুন</string>
 	<string name="confirm_unblock">%s আনব্লক নিশ্চিত করুন</string>
 	<string name="do_unblock">আনব্লক করুন</string>
 	<string name="button_muted">মিউট করা হয়েছে</string>
-	<string name="tap_to_reveal">ট্যাপ করে দেখুন</string>
+	<string name="button_blocked">ব্লক করা আছে</string>
+	<string name="action_vote">ভোট</string>
+	<string name="tap_to_reveal">দেখার জন্য টিপুন</string>
 	<string name="delete">মুছে ফেলুন</string>
 	<string name="confirm_delete_title">পোস্ট মুছে ফেলুন</string>
 	<string name="confirm_delete">আপনি কি এই পোস্টটি মুছে ফেলতে চান?</string>
-	<string name="deleting">মুছে ফেলা হচ্ছে</string>
+	<string name="deleting">মুছে ফেলা হচ্ছে…</string>
 	<string name="notification_channel_audio_player">অডিও প্লেব্যাক</string>
 	<string name="play">চালান</string>
-	<string name="pause">বিরতি</string>
-	<string name="log_out">সাইন আউট</string>
-	<string name="add_account">অ্যাকাউন্ট খুলুন</string>
-	<string name="search_hint">সন্ধান</string>
-	<string name="hashtags">হ্যাশট্যাগ</string>
-	<string name="news">সংবাদ</string>
+	<string name="pause">থামান</string>
+	<string name="log_out">সাইন-আউট করুন</string>
+	<string name="add_account">অ্যাকাউন্ট যোগ করুন</string>
+	<string name="search_hint">খুঁজুন</string>
+	<string name="hashtags">হ্যাশট্যাগগুলো</string>
+	<string name="news">খবর</string>
 	<string name="for_you">আপনার জন্য</string>
 	<string name="all_notifications">সকল</string>
 	<string name="mentions">উল্লেখ</string>
+	<plurals name="x_people_talking">
+		<item quantity="one">%d জন ব্যক্তি বলছেন</item>
+		<item quantity="other">%d jon ব্যক্তিরা বলছেন</item>
+	</plurals>
 	<!-- %s is the email address -->
 	<!-- translators: %,d is a valid placeholder, it formats the number with locale-dependent grouping separators -->
 	<!-- %s is version like 1.2.3 -->

mastodon/src/main/res/values-de-rDE/strings_sk.xml

@@ -258,4 +258,13 @@
     <string name="sk_unfinished_attachments">Anhänge richtig stellen\?</string>
     <string name="sk_settings_hide_interaction">Interaktions-Buttons verstecken</string>
     <string name="sk_unfinished_attachments_message">Einige Anhänge sind nicht fertig hochgeladen.</string>
+    <string name="sk_followed_as">Mit %s gefolgt</string>
+    <string name="sk_settings_hide_fab">Verfassen-Button automatisch ausblenden</string>
+    <string name="sk_follow_as">Mit anderem Account folgen</string>
+    <string name="sk_in_reply">Als Antwort</string>
+    <string name="sk_settings_reply_visibility">Antwort-Sichtbarkeit</string>
+    <string name="sk_settings_reply_visibility_all">Alle Antworten</string>
+    <string name="sk_settings_reply_visibility_following">Antworten auf Follows</string>
+    <string name="sk_settings_reply_visibility_self">Antworten an mich</string>
+    <string name="sk_quoting_user">Zitiere %s</string>
 </resources>

mastodon/src/main/res/values-es-rES/strings.xml

@@ -173,7 +173,16 @@
 	<string name="back">Atrás</string>
 	<string name="instance_catalog_title">Mastodon está hecho por usuarios den diferentes servidores.</string>
 	<string name="instance_catalog_subtitle">Selecciona un servidor basado en tus intereses, región o un propósito general. Aun así puedes conectarte con todo el mundo, sin importar el servidor.</string>
+	<string name="search_communities">Nombre del servidor o URL</string>
+	<string name="instance_rules_title">Reglas del servidor</string>
+	<string name="instance_rules_subtitle">Al continuar, aceptas seguir las siguientes reglas establecidas y aplicadas por los %s moderadores.</string>
+	<string name="signup_title">Crear cuenta</string>
 	<string name="edit_photo">editar</string>
+	<string name="display_name">Nombre</string>
+	<string name="username">Nombre de usuario</string>
+	<string name="email">Correo electrónico</string>
+	<string name="password">Contraseña</string>
+	<string name="confirm_password">Confirmar contraseña</string>
 	<string name="password_note">Incluye letras mayúsculas, caracteres especiales y números para aumentar la fuerza de tu contraseña.</string>
 	<string name="category_academia">Académico</string>
 	<string name="category_activism">Activismo</string>
@@ -188,7 +197,10 @@
 	<string name="category_music">Música</string>
 	<string name="category_regional">Regional</string>
 	<string name="category_tech">Tecnología</string>
+	<string name="confirm_email_title">Revisa tu bandeja de entrada</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Pulsa el enlace que te hemos enviado para verificar %s. Esperaremos aquí mismo.</string>
+	<string name="confirm_email_didnt_get">¿No recibiste un enlace?</string>
 	<string name="resend">Reenviar</string>
 	<string name="open_email_app">Abrir aplicación de email</string>
 	<string name="resent_email">Correo de confirmación enviado</string>
@@ -276,6 +288,7 @@
 	<string name="open_in_browser">Abrir en el navegador</string>
 	<string name="hide_boosts_from_user">Ocultar reblogueos de %s</string>
 	<string name="show_boosts_from_user">Mostrar reblogueos de %s</string>
+	<string name="signup_reason">¿Por qué quieres unirte?</string>
 	<string name="signup_reason_note">Esto nos ayudará a revisar su solicitud.</string>
 	<string name="clear">Borrar</string>
 	<string name="profile_header">Imagen de cabecera</string>
@@ -368,6 +381,8 @@
 	<!-- %s is file size -->
 	<string name="download_update">Descargar (%s)</string>
 	<string name="install_update">Instalar</string>
+	<string name="privacy_policy_title">Tu privacidad</string>
+	<string name="privacy_policy_subtitle">Aunque la aplicación Mastodon no recoge ningún dato, el servidor al que se registra puede tener una política diferente.\n\nSi no está de acuerdo con la política para %s, puede volver atrás y elegir un servidor diferente.</string>
 	<string name="i_agree">Acepto</string>
 	<string name="empty_list">Esta lista está vacía</string>
 	<string name="instance_signup_closed">Este servidor no acepta altas nuevas.</string>
@@ -379,12 +394,41 @@
 	<string name="login_title">Qué bueno verle de nuevo</string>
 	<string name="login_subtitle">Inicie sesión con el servidor donde creó su cuenta.</string>
 	<string name="server_url">URL del servidor</string>
+	<string name="welcome_page1_title">¿Qué es Mastodon?</string>
 	<string name="welcome_page1_text">Imagina que tienes una dirección de correo electrónico que termina con @ejemplo.com.\n\nPuedes enviar y recibir correos electrónicos de cualquier persona, incluso si su correo electrónico termina en @gmail.com o @icloud.com o @ejemplo.com.</string>
 	<string name="welcome_page2_title">Mastodon es parecido.</string>
 	<string name="welcome_page2_text">Tu cuenta puede ser @gothgirl654@example.social, pero puedes seguir, rebloguear, y chatear con @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">¿Cómo elijo un servidor?</string>
 	<string name="welcome_page3_text">Diferentes personas eligen diferentes servidores por diferentes motivos. Por ejemplo, art.example es un buen lugar para artistas, mientras que madrid.example puede ser una buena elección para los madrileños.\n\nNo te equivocarás con ninguno de nuestros servidores recomendados, por lo que independientemente del que escojas (o si introduces tu propio servidor en la barra de búsqueda), no te perderás ni una en ningún lugar.</string>
+	<string name="signup_random_server_explain">Seleccionaremos un servidor basado en tu idioma si continúas sin hacer una selección.</string>
+	<string name="server_filter_any_language">Cualquier idioma</string>
+	<string name="server_filter_instant_signup">Registro instantáneo</string>
+	<string name="server_filter_manual_review">Revisión manual</string>
+	<string name="server_filter_any_signup_speed">Cualquier velocidad de registro</string>
+	<string name="server_filter_region_europe">Europa</string>
+	<string name="server_filter_region_north_america">Norteamérica</string>
+	<string name="server_filter_region_south_america">Suramérica</string>
+	<string name="server_filter_region_africa">África</string>
+	<string name="server_filter_region_asia">Asia</string>
+	<string name="server_filter_region_oceania">Oceanía</string>
+	<string name="not_accepting_new_members">No se aceptan nuevos miembros</string>
+	<string name="category_special_interests">Intereses especiales</string>
+	<string name="signup_passwords_dont_match">Las contraseñas no coinciden</string>
+	<string name="pick_server_for_me">Elegir por mí</string>
+	<string name="profile_add_row">Añadir fila</string>
+	<string name="profile_setup">Configuración del perfil</string>
+	<string name="profile_setup_subtitle">Siempre puedes completar esto más tarde en la pestaña Perfil.</string>
+	<string name="profile_setup_explanation">Puedes añadir hasta cuatro campos de perfil para todo lo que quieras. Ubicación, enlaces, pronombres — el cielo es el límite.</string>
+	<string name="popular_on_mastodon">Popular en Mastodon</string>
+	<string name="follow_all">Seguir a todos</string>
+	<string name="server_rules_disagree">En desacuerdo</string>
+	<string name="privacy_policy_explanation">TL;DR: No recogemos o procesamos nada.</string>
 	<!-- %s is server domain -->
+	<string name="server_policy_disagree">En desacuerdo con %s</string>
+	<string name="profile_bio">Biografía</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Siguiendo usuarios…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s no permite registros desde %2$s. Prueba uno diferente o &lt;a&gt;elige un servidor diferente&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Este nombre de usuario ya existe.</string>
 </resources>

mastodon/src/main/res/values-es-rES/strings_sk.xml

@@ -252,10 +252,15 @@
     <string name="sk_notify_poll_results">Resultado de encuestas</string>
     <string name="sk_filtered">Filtrado: %s</string>
     <string name="sk_expand">Ampliar</string>
-    <string name="sk_collapse">Reducir</string>
-    <string name="sk_settings_collapse_long_posts">Acortar publicaciones largas</string>
+    <string name="sk_collapse">Minimizar</string>
+    <string name="sk_settings_collapse_long_posts">Minimizar publicaciones largas</string>
     <string name="sk_unfinished_attachments">¿Corregir adjuntos\?</string>
     <string name="sk_unfinished_attachments_message">Algunos adjuntos no han terminado de subirse.</string>
     <string name="sk_settings_prefix_reply_cw_with_re">Añadir \"re:\" a respuestas a Advertencias de Contenido</string>
     <string name="sk_spectator_mode">Modo espectador</string>
+    <string name="sk_settings_hide_interaction">Ocultar los botones de interacción</string>
+    <string name="sk_follow_as">Seguir desde otra cuenta</string>
+    <string name="sk_followed_as">Seguido desde %s</string>
+    <string name="sk_settings_hide_fab">Ocultar automáticamente el botón Redactar</string>
+    <string name="sk_in_reply">Respondiendo a</string>
 </resources>

mastodon/src/main/res/values-eu-rES/strings_sk.xml

@@ -72,7 +72,7 @@
     <string name="sk_settings_translation_availability_note_available">%s-k itzulpena onartzen du!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s ez da itzulpena onartzen duten instantzien artean ageri.</string>
     <string name="sk_clear_all_notifications">Ezabatu jakinarazpen guztiak</string>
-    <string name="sk_clear_all_notifications_confirm_action">Ezabatu dena</string>
+    <string name="sk_clear_all_notifications_confirm_action">Ezabatu denak</string>
     <string name="sk_clear_all_notifications_confirm">Ziur al zaude jakinarazpen guztiak ezabatu nahi dituzula\?</string>
     <string name="sk_loading_fediverse_resource_title">Fedibertsoan bilatzen</string>
     <string name="sk_undo_reblog">Bultzada desegin</string>
@@ -146,7 +146,7 @@
     <string name="sk_changelog">Aldaketen zerrenda</string>
     <string name="sk_alt_text_missing">Eranskin batek gutxienez ez du deskribapenik.</string>
     <string name="sk_publish_anyway">Argitaratu hala ere</string>
-    <string name="sk_settings_disable_alt_text_reminder">Desgaitu testu alternatiboaren jakinarazpena</string>
+    <string name="sk_settings_disable_alt_text_reminder">Desgaitu gogorarazlea testu alternatiboa gehitzeko</string>
     <string name="sk_timelines">Denbora-lerroak</string>
     <string name="sk_timeline_posts">Bidalketak</string>
     <string name="sk_timelines_add">Gehitu</string>
@@ -218,7 +218,7 @@
     <string name="sk_edit_timelines">Denbora-lerroak editatu</string>
     <string name="sk_alt_button">ALT</string>
     <string name="sk_post_edited">Editatua</string>
-    <string name="sk_notification_type_update">Bidalketa editatua</string>
+    <string name="sk_notification_type_update">Editatutako argitalpenak</string>
     <string name="sk_notify_update">Bultzatutako bidalketa editatu</string>
     <string name="sk_no_results">Emaitzarik ez</string>
     <string name="sk_save_draft">Zirriborroa gorde\?</string>
@@ -232,4 +232,33 @@
     <string name="sk_alt_text_missing_title">Testu alternatiboa falta da</string>
     <string name="sk_searching">Bilatzen…</string>
     <string name="sk_save_draft_message">Zirriborro honetako aldaketak gorde edo argitaratu nahi dituzu\?</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Gehitu \"re:\" hasieran edukiaren abisuen erantzunetan</string>
+    <string name="sk_filtered">Iragazita: %s</string>
+    <string name="sk_expand">Zabaldu</string>
+    <string name="sk_collapse">Itxi</string>
+    <string name="sk_settings_collapse_long_posts">Itxi argitalpen oso luzeak</string>
+    <string name="sk_unfinished_attachments">Finkatu eranskinak\?</string>
+    <string name="sk_unfinished_attachments_message">Eranskin batzuk ez dira igo oraindik.</string>
+    <string name="sk_notify_posts_info_banner">Pertsona batzuen argitalpenen jakinarazpenak gaitzen badituzu, beraien argitalpen berriak hemen ageriko dira.</string>
+    <string name="sk_updater_enable_pre_releases">Gaitu beta bertsioak</string>
+    <string name="sk_inline_direct">aipamenak soilik</string>
+    <string name="sk_separator">·</string>
+    <string name="sk_instance_features">Instantziaren ezaugarriak</string>
+    <string name="sk_settings_local_only_explanation">Zure jatorriko instantziak bertan soilik argitaratzea baimendu behar du hau ibili dadin. Aldatutako Mastodon bertsio askok darabilte, baina Mastodonek ez.</string>
+    <string name="sk_inline_local_only">bertan soilik</string>
+    <string name="sk_settings_support_local_only">Zerbitzariak bertan soilik argitaratzea baimentzen du</string>
+    <string name="sk_settings_glitch_instance">Glitch bertan soilik modua</string>
+    <string name="sk_settings_glitch_mode_explanation">Gaitu hau zure jatorrizko instantziak Glitch badarabil. Ez da beharrezkoa Hometown edo Akkomarako.</string>
+    <string name="sk_signed_up">izena emanda</string>
+    <string name="sk_reported">salatuta</string>
+    <string name="sk_sign_ups">Erabiltzaileen izen-ematea</string>
+    <string name="sk_new_reports">Salaketa berriak</string>
+    <string name="sk_local_only">Bertako instantzia soilik</string>
+    <string name="sk_settings_see_new_posts_button">\"Ikusi argitalpen berriak\" botoia</string>
+    <string name="sk_settings_server_version">Zerbitzariaren bertsioa: %s</string>
+    <string name="sk_notify_poll_results">Bozketaren emaitzak</string>
+    <string name="sk_settings_hide_interaction">Ezkutatu interakzio-botoiak</string>
+    <string name="sk_follow_as">Jarraitu beste kontu batetik</string>
+    <string name="sk_followed_as">%s-(d/t)ik jarraitua</string>
+    <string name="sk_settings_hide_fab">Automatikoki ezkutatu Idatzi botoia</string>
 </resources>

mastodon/src/main/res/values-fr-rFR/strings.xml

@@ -175,6 +175,7 @@
 	<string name="instance_catalog_subtitle">Choisissez un serveur en fonction de vos intérêts, de votre région ou alors rejoignez un serveur général. Vous pouvez toujours vous connecter avec tout le monde, quel que soit le serveur.</string>
 	<string name="search_communities">Nom ou URL du serveur</string>
 	<string name="instance_rules_title">Règles du serveur</string>
+	<string name="instance_rules_subtitle">En continuant, vous acceptez de respecter les règles suivantes définies et appliquées par les modérateurs de %s.</string>
 	<string name="signup_title">Créer un compte</string>
 	<string name="edit_photo">modifier</string>
 	<string name="display_name">Nom</string>
@@ -198,6 +199,7 @@
 	<string name="category_tech">Technologie</string>
 	<string name="confirm_email_title">Consultez votre boîte de réception</string>
 	<!-- %s is the email address -->
+	<string name="confirm_email_subtitle">Cliquez sur le lien que nous vous avons envoyé pour vérifier %s. Nous vous attendons ici.</string>
 	<string name="confirm_email_didnt_get">Vous n\'avez pas reçu de lien ?</string>
 	<string name="resend">Renvoyer</string>
 	<string name="open_email_app">Ouvrir l’application courriel</string>
@@ -380,6 +382,7 @@
 	<string name="download_update">Téléchargement (%s)</string>
 	<string name="install_update">Installer</string>
 	<string name="privacy_policy_title">Votre Confidentialité</string>
+	<string name="privacy_policy_subtitle">Bien que l\'application Mastodon ne collecte aucune donnée, le serveur auquel vous vous inscrivez peut avoir une politique différente.\n\nSi vous n\'êtes pas d\'accord avec la politique de %s, vous pouvez revenir en arrière et choisir un serveur différent.</string>
 	<string name="i_agree">J’accepte</string>
 	<string name="empty_list">Cette liste est vide</string>
 	<string name="instance_signup_closed">Ce serveur n\'accepte pas les nouvelles inscriptions.</string>
@@ -397,9 +400,11 @@
 	<string name="welcome_page2_text">Votre identifiant devrait être @gothgirl654@example.social, mais vous pouvez toujours suivre, rebloguer et discuter avec @fallout5ever@example.online.</string>
 	<string name="welcome_page3_title">Comment choisir un serveur?</string>
 	<string name="welcome_page3_text">Différentes personnes choisissent différents serveurs pour un certain nombre de raisons. art.example est un lieu idéal pour les artistes, tandis que glasgow.example pourrait être un bon choix pour les Écossais.\n\nVous ne pouvez pas vous tromper avec l\'un de nos serveurs recommandés et ainsi, quel que soit celui que vous choisissez (ou si vous entrez le vôtre dans la barre de recherche du serveur), vous ne manquerez jamais une info quelque part.</string>
+	<string name="signup_random_server_explain">Nous choisirons un serveur basé sur votre langue si vous continuez sans faire de sélection.</string>
 	<string name="server_filter_any_language">N\'importe quelle langue</string>
 	<string name="server_filter_instant_signup">Inscription instantanée</string>
 	<string name="server_filter_manual_review">Approbation manuelle</string>
+	<string name="server_filter_any_signup_speed">Toute vitesse d\'inscription</string>
 	<string name="server_filter_region_europe">Europe</string>
 	<string name="server_filter_region_north_america">Amérique du Nord</string>
 	<string name="server_filter_region_south_america">Amérique du Sud</string>
@@ -412,6 +417,9 @@
 	<string name="pick_server_for_me">Choisir pour moi</string>
 	<string name="profile_add_row">Ajouter une ligne</string>
 	<string name="profile_setup">Configuration du profil</string>
+	<string name="profile_setup_subtitle">Vous pourrez toujours compléter cela plus tard dans l\'onglet Profil.</string>
+	<string name="profile_setup_explanation">Vous pouvez ajouter jusqu\'à quatre champs de profil pour tout ce que vous souhaitez. Localisation, liens, surnoms — le ciel est la limite.</string>
+	<string name="popular_on_mastodon">Populaire sur Mastodon</string>
 	<string name="follow_all">Tout suivre</string>
 	<string name="server_rules_disagree">Refuser</string>
 	<string name="privacy_policy_explanation">TL;DR : Nous ne collectons ni ne traitons rien.</string>
@@ -419,5 +427,8 @@
 	<string name="server_policy_disagree">En désaccord avec %s</string>
 	<string name="profile_bio">Biographie</string>
 	<!-- Shown in a progress dialog when you tap "follow all" -->
+	<string name="sending_follows">Utilisateurs suivants…</string>
 	<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
+	<string name="signup_email_domain_blocked">%1$s n\'autorise pas les inscriptions de %2$s. Essayez-en un autre ou &lt;a&gt;choisissez un autre serveur&lt;/a&gt;.</string>
+	<string name="signup_username_taken">Ce nom d\'utilisateur est déjà pris.</string>
 </resources>

mastodon/src/main/res/values-fr-rFR/strings_sk.xml

@@ -260,4 +260,8 @@
     <string name="sk_unfinished_attachments_message">Certaines pièces jointes n\'ont pas fini de se télécharger.</string>
     <string name="sk_spectator_mode">Mode spectateur</string>
     <string name="sk_settings_hide_interaction">Masquer les boutons d\'interaction</string>
+    <string name="sk_follow_as">Suivre depuis un autre compte</string>
+    <string name="sk_followed_as">Suivi depuis %s</string>
+    <string name="sk_settings_hide_fab">Masquer automatiquement le bouton Composer</string>
+    <string name="sk_in_reply">En réponse</string>
 </resources>