boop verison

closes sk22#805

.github/FUNDING.yml

@@ -3,7 +3,6 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # mastodon
 open_collective: # Replace with a single Open Collective username e.g., user1
-ko_fi: xsk22
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username e.g., user1

mastodon/build.gradle

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

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

@@ -25,6 +25,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import androidx.annotation.StringRes;
+
 public class GlobalUserPreferences{
 	private static final String TAG="GlobalUserPreferences";
 
@@ -60,6 +62,7 @@ public class GlobalUserPreferences{
 	public static boolean showNavigationLabels;
 	public static boolean displayPronounsInTimelines, displayPronounsInThreads, displayPronounsInUserListings;
 	public static boolean overlayMedia;
+	public static boolean showSuicideHelp;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -119,6 +122,7 @@ public class GlobalUserPreferences{
 		displayPronounsInThreads=prefs.getBoolean("displayPronounsInThreads", true);
 		displayPronounsInUserListings=prefs.getBoolean("displayPronounsInUserListings", true);
 		overlayMedia=prefs.getBoolean("overlayMedia", false);
+		showSuicideHelp=prefs.getBoolean("showSuicideHelp", true);
 
 		if (prefs.contains("prefixRepliesWithRe")) {
 			prefixReplies = prefs.getBoolean("prefixRepliesWithRe", false)
@@ -177,6 +181,7 @@ public class GlobalUserPreferences{
 				.putBoolean("displayPronounsInThreads", displayPronounsInThreads)
 				.putBoolean("displayPronounsInUserListings", displayPronounsInUserListings)
 				.putBoolean("overlayMedia", overlayMedia)
+				.putBoolean("showSuicideHelp", showSuicideHelp)
 				.apply();
 	}
 

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

@@ -325,7 +325,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;
 
-		if (!notification.status.spoilerText.isEmpty() &&
+		if (notification.status.hasSpoiler() &&
 				(GlobalUserPreferences.prefixReplies == ALWAYS
 						|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(notification.status.account.id)))
 				&& !notification.status.spoilerText.startsWith("re: ")) {

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

@@ -27,9 +27,9 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 	public void onNewEndpoint(@NotNull Context context, @NotNull String endpoint, @NotNull String instance) {
 		// Called when a new endpoint be used for sending push messages
 		Log.d(TAG, "onNewEndpoint: New Endpoint " + endpoint + " for "+ instance);
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
-			account.getPushSubscriptionManager().registerAccountForPush(null);
+			account.getPushSubscriptionManager().registerAccountForPush(null, endpoint);
 	}
 
 	@Override
@@ -37,7 +37,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 		// called when the registration is not possible, eg. no network
 		Log.d(TAG, "onRegistrationFailed: " + instance);
 		//re-register for gcm
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
 			account.getPushSubscriptionManager().registerAccountForPush(null);
 	}
@@ -47,7 +47,7 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 		// called when this application is unregistered from receiving push messages
 		Log.d(TAG, "onUnregistered: " + instance);
 		//re-register for gcm
-		AccountSession account = AccountSessionManager.getInstance().getLastActiveAccount();
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
 		if (account != null)
 			account.getPushSubscriptionManager().registerAccountForPush(null);
 	}
@@ -55,7 +55,10 @@ public class UnifiedPushNotificationReceiver extends MessagingReceiver{
 	@Override
 	public void onMessage(@NotNull Context context, @NotNull byte[] message, @NotNull String instance) {
 		// Called when a new message is received. The message contains the full POST body of the push message
-		AccountSession account = AccountSessionManager.getInstance().getAccount(instance);
+		AccountSession account = AccountSessionManager.getInstance().tryGetAccount(instance);
+
+		if (account == null)
+		    return;
 
 		//this is stupid
 		// Mastodon stores the info to decrypt the message in the HTTP headers, which are not accessible in UnifiedPush,

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

@@ -97,7 +97,7 @@ public class PushSubscriptionManager{
 		deviceToken=getPrefs().getString("deviceToken", null);
 		int tokenVersion=getPrefs().getInt("version", 0);
 		if(!TextUtils.isEmpty(deviceToken) && tokenVersion==BuildConfig.VERSION_CODE){
-			registerAllAccountsForPush(false);
+			registerAllAccountsForPush(true); // TODO: revert this before release
 			return;
 		}
 		Log.i(TAG, "tryRegisterFCM: no token found or app was updated. Trying to get push token...");
@@ -125,17 +125,16 @@ public class PushSubscriptionManager{
 		// this function is used for registering push notifications using FCM
 		// to avoid NonFreeNet in F-Droid, this registration is disabled in it
 		// see https://github.com/LucasGGamerM/moshidon/issues/206 for more context
-		if(BuildConfig.BUILD_TYPE.equals("fdroidRelease"))
+		if(BuildConfig.BUILD_TYPE.equals("fdroidRelease") || TextUtils.isEmpty(deviceToken)){
+			Log.d(TAG, "Skipping registering for FCM push notifications");
 			return;
+		}
 
-		if(TextUtils.isEmpty(deviceToken))
-			throw new IllegalStateException("No device push token available");
-		String endpoint = "https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;
+		String endpoint = "https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/";
 		registerAccountForPush(subscription, endpoint);
 	}
 
 	public void registerAccountForPush(PushSubscription subscription, String endpoint){
-
 		MastodonAPIController.runInBackground(()->{
 			Log.d(TAG, "registerAccountForPush: started for "+accountID);
 			String encodedPublicKey, encodedAuthKey, pushAccountID;
@@ -164,7 +163,13 @@ public class PushSubscriptionManager{
 				Log.e(TAG, "registerAccountForPush: error generating encryption key", e);
 				return;
 			}
-			new RegisterForPushNotifications(endpoint,
+
+			//work-around for adding the randomAccountId
+			String newEndpoint = endpoint;
+			if (endpoint.startsWith("https://app.joinmastodon.org/relay-to/fcm/"))
+				newEndpoint += pushAccountID;
+
+			new RegisterForPushNotifications(newEndpoint,
 					encodedPublicKey,
 					encodedAuthKey,
 					subscription==null ? PushSubscription.Alerts.ofAll() : subscription.alerts,

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

@@ -11,13 +11,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CreateStatus extends MastodonAPIRequest<Status>{
-	public static final Instant DRAFTS_AFTER_INSTANT = Instant.ofEpochMilli(253370764799999L) /* end of 9998 */;
-	private static final float draftFactor = 31536000000f /* one year */ / 253370764799999f /* end of 9998 */;
+	public static long EPOCH_OF_THE_YEAR_FIVE_THOUSAND=95617584000000L;
+	public static final Instant DRAFTS_AFTER_INSTANT=Instant.ofEpochMilli(EPOCH_OF_THE_YEAR_FIVE_THOUSAND - 1) /* end of 4999 */;
 
 	public static Instant getDraftInstant() {
-		// returns an instant between 9999-01-01 00:00:00 and 9999-12-31 23:59:59
-		// yes, this is a weird implementation for something that hardly matters
-		return DRAFTS_AFTER_INSTANT.plusMillis(1 + (long) (System.currentTimeMillis() * draftFactor));
+		return DRAFTS_AFTER_INSTANT.plusMillis(System.currentTimeMillis());
 	}
 
 	public CreateStatus(CreateStatus.Request req, String uuid){
@@ -36,6 +34,7 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 
 	public static class Request{
 		public String status;
+		public List<MediaAttribute> mediaAttributes;
 		public List<String> mediaIds;
 		public Poll poll;
 		public String inReplyToId;
@@ -55,5 +54,17 @@ public class CreateStatus extends MastodonAPIRequest<Status>{
 			public boolean multiple;
 			public boolean hideTotals;
 		}
+
+		public static class MediaAttribute{
+			public String id;
+			public String description;
+			public String focus;
+
+			public MediaAttribute(String id, String description, String focus){
+				this.id=id;
+				this.description=description;
+				this.focus=focus;
+			}
+		}
 	}
 }

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

@@ -13,7 +13,6 @@ import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.List;
 
 public class AccountLocalPreferences{
 	private final SharedPreferences prefs;
@@ -39,7 +38,7 @@ public class AccountLocalPreferences{
 	public boolean keepOnlyLatestNotification;
 
 	public boolean emojiReactionsEnabled;
-	public boolean showEmojiReactionsInLists;
+	public ShowEmojiReactions showEmojiReactions;
 
 	private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
 	private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
@@ -66,7 +65,7 @@ public class AccountLocalPreferences{
 		timelineReplyVisibility=prefs.getString("timelineReplyVisibility", null);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
-		showEmojiReactionsInLists=prefs.getBoolean("showEmojiReactionsInLists", false);
+		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
 	}
 
 	public long getNotificationsPauseEndTime(){
@@ -99,7 +98,13 @@ public class AccountLocalPreferences{
 				.putString("timelineReplyVisibility", timelineReplyVisibility)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
-				.putBoolean("showEmojiReactionsInLists", showEmojiReactionsInLists)
+				.putString("showEmojiReactions", showEmojiReactions.name())
 				.apply();
 	}
+
+	public enum ShowEmojiReactions{
+		HIDE_EMPTY,
+		ONLY_OPENED,
+		ALWAYS
+	}
 }

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

@@ -146,6 +146,9 @@ public class AccountSession{
 					@Override
 					public void onError(ErrorResponse error){
 						Log.w(TAG, "Failed to load preferences for account "+getID()+": "+error);
+						if (preferences==null)
+							preferences=new Preferences();
+						preferencesFromAccountSource(self);
 					}
 				})
 				.exec(getID());
@@ -310,4 +313,10 @@ public class AccountSession{
 				.authority(getInstance().map(i -> i.normalizedUri).orElse(domain))
 				.build();
 	}
+
+	public String getDefaultAvatarUrl() {
+		return getInstance()
+				.map(instance->"https://"+domain+(instance.isAkkoma() ? "/images/avi.png" : "/avatars/original/missing.png"))
+				.orElse("");
+	}
 }

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

@@ -0,0 +1,19 @@
+package org.joinmastodon.android.events;
+
+import androidx.recyclerview.widget.RecyclerView;
+import org.joinmastodon.android.model.EmojiReaction;
+import java.util.List;
+
+public class EmojiReactionsUpdatedEvent{
+	public final String id;
+	public final List<EmojiReaction> reactions;
+	public final boolean updateTextPadding;
+	public RecyclerView.ViewHolder viewHolder;
+
+	public EmojiReactionsUpdatedEvent(String id, List<EmojiReaction> reactions, boolean updateTextPadding, RecyclerView.ViewHolder viewHolder){
+		this.id=id;
+		this.reactions=reactions;
+		this.updateTextPadding=updateTextPadding;
+		this.viewHolder=viewHolder;
+	}
+}

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

@@ -1,27 +1,14 @@
 package org.joinmastodon.android.events;
 
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.joinmastodon.android.api.CacheController;
-import org.joinmastodon.android.model.EmojiReaction;
 import org.joinmastodon.android.model.Status;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class StatusCountersUpdatedEvent{
 	public String id;
 	public long favorites, reblogs, replies;
 	public boolean favorited, reblogged, bookmarked, pinned;
-	public List<EmojiReaction> reactions;
 	public Status status;
-	public RecyclerView.ViewHolder viewHolder;
 
 	public StatusCountersUpdatedEvent(Status s){
-		this(s, null);
-	}
-
-	public StatusCountersUpdatedEvent(Status s, RecyclerView.ViewHolder vh){
 		id=s.id;
 		status=s;
 		favorites=s.favouritesCount;
@@ -31,7 +18,5 @@ public class StatusCountersUpdatedEvent{
 		reblogged=s.reblogged;
 		bookmarked=s.bookmarked;
 		pinned=s.pinned;
-		reactions=new ArrayList<>(s.reactions);
-		viewHolder=vh;
 	}
 }

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

@@ -71,11 +71,12 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 		Status fakeStatus = a.toStatus();
 		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
 		textItem.textSelectable = true;
-		return List.of(
-				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
-				textItem,
-				new EmojiReactionsStatusDisplayItem(a.id, this, fakeStatus, accountID, false, true)
-		);
+
+		List<StatusDisplayItem> items=new ArrayList<>();
+		items.add(HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead));
+		items.add(textItem);
+		if(!isInstanceAkkoma()) items.add(new EmojiReactionsStatusDisplayItem(a.id, this, fakeStatus, accountID, false, true));
+		return items;
 	}
 
 	public void onMarkAsRead(String id) {

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

@@ -617,7 +617,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 	}
 
-	public void onGapClick(GapStatusDisplayItem.Holder item){}
+	public void onGapClick(GapStatusDisplayItem.Holder item, boolean downwards){}
 
 	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
 		int startPos = warning.getAbsoluteAdapterPosition();

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

@@ -419,7 +419,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			hasSpoiler=true;
 			spoilerWrap.setVisibility(View.VISIBLE);
 			spoilerBtn.setSelected(true);
-		}else if(editingStatus!=null && !TextUtils.isEmpty(editingStatus.spoilerText)){
+		}else if(editingStatus!=null && editingStatus.hasSpoiler()){
 			hasSpoiler=true;
 			spoilerWrap.setVisibility(View.VISIBLE);
 			spoilerEdit.setText(getArguments().getString("sourceSpoiler", editingStatus.spoilerText));
@@ -673,11 +673,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					? UiUtils.formatRelativeTimestamp(getContext(), status.createdAt)
 					: getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), status.editedAt));
 
-			String sepp = getString(R.string.sk_separator);
-			String username = status.account.getDisplayUsername();
-			((TextView) view.findViewById(R.id.time_and_username)).setText(time == null ? username :
-					username + " " + sepp + " " + time);
-			if (status.spoilerText != null && !status.spoilerText.isBlank()) {
+			((TextView) view.findViewById(R.id.username)).setText(status.account.getDisplayUsername());
+			view.findViewById(R.id.separator).setVisibility(time==null ? View.GONE : View.VISIBLE);
+			view.findViewById(R.id.time).setVisibility(time==null ? View.GONE : View.VISIBLE);
+			if(time!=null) ((TextView) view.findViewById(R.id.time)).setText(time);
+
+			if (status.hasSpoiler()) {
 				TextView replyToSpoiler = view.findViewById(R.id.reply_to_spoiler);
 				replyToSpoiler.setVisibility(View.VISIBLE);
 				replyToSpoiler.setText(status.spoilerText);
@@ -1065,6 +1066,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.scheduledAt=scheduledAt;
 		if(!mediaViewController.isEmpty()){
 			req.mediaIds=mediaViewController.getAttachmentIDs();
+			if(editingStatus != null){
+				req.mediaAttributes=mediaViewController.getAttachmentAttributes();
+			}
 		}
 		// ask whether to publish now when editing an existing draft
 		if (!force && editingStatus != null && scheduledAt != null && scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)) {

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

@@ -344,7 +344,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
                         mainHashtag = name;
                         name = null;
                     }
-                    if (TextUtils.isEmpty(mainHashtag)) {
+                    if (TextUtils.isEmpty(mainHashtag) && (item != null && item.getType() == TimelineDefinition.TimelineType.HASHTAG)) {
                         Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
                         onSave.accept(null);
                         return;

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

@@ -45,8 +45,8 @@ public class FeaturedHashtagsListFragment extends BaseStatusListFragment<Hashtag
 	}
 
 	@Override
-	public void onItemClick(String id){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, id, data.stream().filter(h -> Objects.equals(h.name, id)).findAny().map(h -> h.following).orElse(null));
+	public void onItemClick(String hashtag){
+		UiUtils.openHashtagTimeline(getActivity(), accountID, hashtag, data.stream().filter(h -> Objects.equals(h.name, hashtag)).findAny().map(h -> h.following).orElse(null));
 	}
 
 	@Override

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

@@ -17,8 +17,10 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -201,7 +203,7 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 	}
 
 	// literally the same as AccountCardStatusDisplayItem and DiscoverAccountsFragment. code should be generalized
-	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.DisableableClickable{
 		private final ImageView cover, avatar;
 		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
 		private final ProgressBarButton actionButton, acceptButton, rejectButton;
@@ -233,15 +235,24 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 			rejectProgress=findViewById(R.id.reject_progress);
 			rejectWrap=findViewById(R.id.reject_btn_wrap);
 
-			itemView.setOutlineProvider(OutlineProviders.roundedRect(6));
-			itemView.setClipToOutline(true);
-			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(15));
 			avatar.setClipToOutline(true);
-			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
+			View border=findViewById(R.id.avatar_border);
+			border.setOutlineProvider(OutlineProviders.roundedRect(17));
+			border.setClipToOutline(true);
+			cover.setOutlineProvider(OutlineProviders.roundedRect(9));
 			cover.setClipToOutline(true);
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(12));
+			itemView.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
 			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
 			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
+			itemView.setOnClickListener(v->this.onClick());
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return false;
 		}
 
 		@Override
@@ -254,26 +265,23 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 			postsCount.setText(UiUtils.abbreviateNumber(item.account.statusesCount));
 			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
 			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
-			postsLabel.setText(getResources().getQuantityString(R.plurals.x_posts, (int)(item.account.statusesCount%1000), item.account.statusesCount));
+			postsLabel.setText(getResources().getQuantityString(R.plurals.sk_posts_count_label, (int)(item.account.statusesCount%1000), item.account.statusesCount));
 			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
-			if(relationship == null || !relationship.followedBy){
+			UiUtils.setExtraTextInfo(getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+
+			if(relationship==null || !relationship.followedBy){
 				actionWrap.setVisibility(View.GONE);
 				acceptWrap.setVisibility(View.VISIBLE);
 				rejectWrap.setVisibility(View.VISIBLE);
 			
-				// i hate that i wasn't able to do this in xml
 				acceptButton.setCompoundDrawableTintList(acceptButton.getTextColors());
 				acceptProgress.setIndeterminateTintList(acceptButton.getTextColors());
 				rejectButton.setCompoundDrawableTintList(rejectButton.getTextColors());
 				rejectProgress.setIndeterminateTintList(rejectButton.getTextColors());
-			}else if(relationship==null){
-				actionWrap.setVisibility(View.GONE);
-				acceptWrap.setVisibility(View.GONE);
-				rejectWrap.setVisibility(View.GONE);
 			}else{
 				actionWrap.setVisibility(View.VISIBLE);
 				acceptWrap.setVisibility(View.GONE);
@@ -351,8 +359,9 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 
 		public AccountWrapper(Account account){
 			this.account=account;
-			if(!TextUtils.isEmpty(account.avatar))
-				avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
+			avaRequest=new UrlImageLoaderRequest(
+					TextUtils.isEmpty(account.avatar) ? AccountSessionManager.get(getAccountID()).getDefaultAvatarUrl() : account.avatar,
+					V.dp(50), V.dp(50));
 			if(!TextUtils.isEmpty(account.header))
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);

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

@@ -13,25 +13,24 @@ import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment {
 	private HomeTabFragment parent;
@@ -176,15 +175,23 @@ public class HomeTimelineFragment extends StatusListFragment {
 	}
 
 	@Override
-	public void onGapClick(GapStatusDisplayItem.Holder item){
+	public void onGapClick(GapStatusDisplayItem.Holder item, boolean downwards){
 		if(dataLoading)
 			return;
-		item.getItem().loading=true;
-		V.setVisibilityAnimated(item.progress, View.VISIBLE);
-		V.setVisibilityAnimated(item.text, View.GONE);
 		GapStatusDisplayItem gap=item.getItem();
+		gap.loading=true;
 		dataLoading=true;
-		currentRequest=new GetHomeTimeline(item.getItemID(), null, 20, null, getLocalPrefs().timelineReplyVisibility)
+
+		String maxID = null;
+		String minID = null;
+		if (downwards) {
+			maxID = item.getItemID();
+		} else {
+			int gapPos=displayItems.indexOf(gap);
+			StatusDisplayItem nextItem=displayItems.get(gapPos + 1);
+			minID=nextItem.parentID;
+		}
+		currentRequest=new GetHomeTimeline(maxID, minID, 20, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<Status> result){
@@ -204,52 +211,96 @@ public class HomeTimelineFragment extends StatusListFragment {
 								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus), false);
 							}
 						}else{
-							Set<String> idsBelowGap=new HashSet<>();
-							boolean belowGap=false;
-							int gapPostIndex=0;
-							for(Status s:data){
-								if(belowGap){
-									idsBelowGap.add(s.id);
-								}else if(s.id.equals(gap.parentID)){
-									belowGap=true;
-									s.hasGapAfter=false;
-									AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
-								}else{
-									gapPostIndex++;
+							if(downwards) {
+								Set<String> idsBelowGap=new HashSet<>();
+								boolean belowGap=false;
+								int gapPostIndex=0;
+								for(Status s:data){
+									if(belowGap){
+										idsBelowGap.add(s.id);
+									}else if(s.id.equals(gap.parentID)){
+										belowGap=true;
+										s.hasGapAfter=false;
+										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(s), false);
+									}else{
+										gapPostIndex++;
+									}
 								}
-							}
-							int endIndex=0;
-							for(Status s:result){
-								endIndex++;
-								if(idsBelowGap.contains(s.id))
-									break;
-							}
-							if(endIndex==result.size()){
-								result.get(result.size()-1).hasGapAfter=true;
-							}else{
-								result=result.subList(0, endIndex);
-							}
-							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
-							targetList.clear();
-							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
-							for(Status s:result){
-								if(idsBelowGap.contains(s.id))
-									break;
-								if(typeFilterPredicate(s) && filterPredicate.test(s)){
+								int endIndex=0;
+								for(Status s:result){
+									endIndex++;
+									if(idsBelowGap.contains(s.id))
+										break;
+								}
+								if(endIndex==result.size()){
+									result.get(result.size()-1).hasGapAfter=true;
+								}else{
+									result=result.subList(0, endIndex);
+								}
+								AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
+								List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
+								targetList.clear();
+								List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
+								for(Status s:result){
+									if(idsBelowGap.contains(s.id))
+										break;
 									targetList.addAll(buildDisplayItems(s));
 									insertedPosts.add(s);
 								}
+								if(targetList.isEmpty()){
+									// oops. We didn't add new posts, but at least we know there are none.
+									adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
+								}else{
+									adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
+									adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
+								}
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
+							} else {
+								String aboveGapID = gap.parentID;
+								int gapPostIndex = 0;
+								for (;gapPostIndex<data.size();gapPostIndex++){
+									if (Objects.equals(aboveGapID, data.get(gapPostIndex).id)) {
+										break;
+									}
+								}
+								// find if there's an overlap between the new data and the current data
+								int indexOfGapInResponse = 0;
+								for (;indexOfGapInResponse<result.size();indexOfGapInResponse++){
+									if (Objects.equals(aboveGapID, result.get(indexOfGapInResponse).id)) {
+										break;
+									}
+								}
+								// there is an overlap between new and current data
+								List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
+								if(indexOfGapInResponse<result.size()){
+									result=result.subList(indexOfGapInResponse+1,result.size());
+									Optional<Status> gapStatus=data.stream()
+											.filter(s->Objects.equals(s.id, gap.parentID))
+											.findFirst();
+									if (gapStatus.isPresent()) {
+										gapStatus.get().hasGapAfter=false;
+										AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(Collections.singletonList(gapStatus.get()), false);
+									}
+									targetList.clear();
+								} else {
+									gap.loading=false;
+								}
+								List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
+								for(Status s:result){
+									targetList.addAll(buildDisplayItems(s));
+									insertedPosts.add(s);
+								}
+								AccountSessionManager.get(accountID).filterStatuses(insertedPosts, FilterContext.HOME);
+								if(targetList.isEmpty()){
+									// oops. We didn't add new posts, but at least we know there are none.
+									adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
+								}else{
+									adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
+									adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
+								}
+								list.scrollToPosition(getMainAdapterOffset()+gapPos+targetList.size());
+								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
 							}
-							AccountSessionManager.get(accountID).filterStatuses(insertedPosts, getFilterContext());
-							if(targetList.isEmpty()){
-								// oops. We didn't add new posts, but at least we know there are none.
-								adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
-							}else{
-								adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
-								adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
-							}
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(insertedPosts, false);
 						}
 					}
 

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

@@ -15,6 +15,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -27,10 +28,10 @@ import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.ElevationOnScrollListener;
 import org.joinmastodon.android.utils.ObjectIdComparator;
 import org.parceler.Parcels;
 
@@ -44,7 +45,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification> {
 	private boolean onlyMentions;
@@ -96,15 +96,13 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		if (n.type == Notification.Type.FOLLOW_REQUEST) {
 			ArrayList<StatusDisplayItem> items = new ArrayList<>();
 			items.add(titleItem);
-			items.add(new AccountCardStatusDisplayItem(n.id, this, n.account, n));
+			items.add(new AccountCardStatusDisplayItem(n.id, this, accountID, n.account, n));
 			return items;
 		}
 		if(n.status!=null){
 			int flags=titleItem==null ? 0 : (StatusDisplayItem.FLAG_NO_FOOTER | StatusDisplayItem.FLAG_INSET | StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS); // | StatusDisplayItem.FLAG_NO_HEADER);
 			if (GlobalUserPreferences.spectatorMode)
 				flags |= StatusDisplayItem.FLAG_NO_FOOTER;
-			if (!getLocalPrefs().showEmojiReactionsInLists)
-				flags |= StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS;
 			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, null, flags);
 			if(titleItem!=null)
 				items.add(0, titleItem);
@@ -249,8 +247,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	@Subscribe
 	public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
 		for(Notification n:data){
-			if (n.status == null) continue;
-			if(n.status.getContentStatus().id.equals(ev.id)){
+			if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
 				n.status.getContentStatus().update(ev);
 				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
 				for(int i=0;i<list.getChildCount();i++){
@@ -259,15 +256,36 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						footer.rebind();
 					}else if(holder instanceof ExtendedFooterStatusDisplayItem.Holder footer && footer.getItem().status==n.status.getContentStatus()){
 						footer.rebind();
-					}else if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && ev.viewHolder!=holder){
-						reactions.rebind();
 					}
 				}
 			}
 		}
 		for(Notification n:preloadedData){
-			if (n.status == null) continue;
-			if(n.status.getContentStatus().id.equals(ev.id)){
+			if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
+				n.status.getContentStatus().update(ev);
+				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
+			}
+		}
+	}
+
+	@Subscribe
+	public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){
+		for(Notification n : data){
+			if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
+				n.status.getContentStatus().update(ev);
+				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
+				for(int i=0; i<list.getChildCount(); i++){
+					RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+					if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==n.status.getContentStatus() && ev.viewHolder!=holder){
+						reactions.rebind();
+					}else if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(n.getID())){
+						text.rebind();
+					}
+				}
+			}
+		}
+		for(Notification n : preloadedData){
+			if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
 				n.status.getContentStatus().update(ev);
 				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
 			}

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

@@ -4,10 +4,12 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -131,6 +133,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private CoverImageView cover;
 	private View avatarBorder;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel;
+	private ImageView lockIcon, botIcon;
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
@@ -230,6 +233,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
 		username=content.findViewById(R.id.username);
+		lockIcon=content.findViewById(R.id.lock_icon);
+		botIcon=content.findViewById(R.id.bot_icon);
 		bio=content.findViewById(R.id.bio);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
@@ -258,6 +263,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		list=content.findViewById(R.id.metadata);
 		rolesView=content.findViewById(R.id.roles);
 
+		avatarBorder.setOutlineProvider(OutlineProviders.roundedRect(26));
+		avatarBorder.setClipToOutline(true);
 		avatar.setOutlineProvider(OutlineProviders.roundedRect(24));
 		avatar.setClipToOutline(true);
 
@@ -345,7 +352,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followersBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
-		username.setOnClickListener(v->{
+		content.findViewById(R.id.username_wrap).setOnClickListener(v->{
 			try {
 				new GetInstance()
 						.setCallback(new Callback<>(){
@@ -366,11 +373,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						.execRemote(Uri.parse(account.url).getHost());
 			} catch (NullPointerException ignored) {
 				// maybe the url was malformed?
-				Toast.makeText(getContext(), R.string.error, Toast.LENGTH_SHORT);
+				Toast.makeText(getContext(), R.string.error, Toast.LENGTH_SHORT).show();
 			}
 		});
 
-		username.setOnLongClickListener(v->{
+		content.findViewById(R.id.username_wrap).setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
 				usernameString+="@"+domain;
@@ -590,10 +597,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
+	@SuppressLint("SetTextI18n")
 	private void bindHeaderView(){
 		setTitle(account.displayName);
 		setSubtitle(getResources().getQuantityString(R.plurals.x_posts, (int)(account.statusesCount%1000), account.statusesCount));
-		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(100), V.dp(100)));
+		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(
+				TextUtils.isEmpty(account.avatar) ? getSession().getDefaultAvatarUrl() :
+						GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic,
+				V.dp(100), V.dp(100)));
 		ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.header : account.headerStatic, 1000, 1000));
 		SpannableStringBuilder ssb=new SpannableStringBuilder(account.displayName);
 		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames)
@@ -622,19 +633,15 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		String acct = ((isSelf || account.isRemote)
 					? account.getFullyQualifiedName()
 					: account.acct);
-		if(account.locked){
-			ssb=new SpannableStringBuilder("@");
-			ssb.append(acct);
-			ssb.append(" ");
-			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
-			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
-			lock.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
-			username.setText(ssb);
-		}else{
-			// noinspection SetTextI18n
-			username.setText('@'+acct);
-		}
+
+		username.setText('@'+acct);
+
+		lockIcon.setVisibility(account.locked ? View.VISIBLE : View.GONE);
+		lockIcon.setImageTintList(ColorStateList.valueOf(username.getCurrentTextColor()));
+
+		botIcon.setVisibility(account.bot ? View.VISIBLE : View.GONE);
+		botIcon.setImageTintList(ColorStateList.valueOf(username.getCurrentTextColor()));
+
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
@@ -1057,7 +1064,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		actionButton.setText(R.string.save_changes);
 		pager.setVisibility(View.GONE);
 		tabbar.setVisibility(View.GONE);
-		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay).mutate();
+		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay, getActivity().getTheme()).mutate();
 		avatar.setForeground(overlay);
 		updateMetadataHeight();
 
@@ -1225,7 +1232,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(ava==null)
 				return;
 			int radius=V.dp(25);
-			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(account.avatar, ava), 0,
+			currentPhotoViewer=new PhotoViewer(getActivity(), createFakeAttachments(TextUtils.isEmpty(account.avatar) ? getSession().getDefaultAvatarUrl() : account.avatar, ava), 0,
 					new SingleImagePhotoViewerListener(avatar, avatarBorder, new int[]{radius, radius, radius, radius}, this, ()->currentPhotoViewer=null, ()->ava, null, null));
 		}
 	}
@@ -1426,16 +1433,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
-	private class AboutViewHolder extends BaseViewHolder implements ImageLoaderViewHolder {
+	private class AboutViewHolder extends BaseViewHolder implements ImageLoaderViewHolder{
 		private final TextView title;
 		private final LinkedTextView value;
-//		private final ImageView verifiedIcon;
 
 		public AboutViewHolder(){
 			super(R.layout.item_profile_about);
 			title=findViewById(R.id.title);
 			value=findViewById(R.id.value);
-//			verifiedIcon=findViewById(R.id.verified_icon);
 		}
 
 		@Override
@@ -1443,7 +1448,18 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			super.onBind(item);
 			title.setText(item.parsedName);
 			value.setText(item.parsedValue);
-//			verifiedIcon.setVisibility(item.verifiedAt!=null ? View.VISIBLE : View.GONE);
+			if(item.verifiedAt!=null){
+				int textColor=UiUtils.isDarkTheme() ? 0xFF89bb9c : 0xFF5b8e63;
+				value.setTextColor(textColor);
+				value.setLinkTextColor(textColor);
+				Drawable check=getResources().getDrawable(R.drawable.ic_fluent_checkmark_starburst_20_regular, getActivity().getTheme()).mutate();
+				check.setTint(textColor);
+				value.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, check, null);
+			}else{
+				value.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
+				value.setLinkTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorAccent));
+				value.setCompoundDrawables(null, null, null, null);
+			}
 		}
 
 		@Override

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

@@ -2,8 +2,11 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.widget.ImageButton;
 
 import com.squareup.otto.Subscribe;
@@ -26,6 +29,7 @@ import java.util.List;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
 
 public class ScheduledStatusListFragment extends BaseStatusListFragment<ScheduledStatus> {
 	private String nextMaxID;
@@ -80,7 +84,10 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, false, true, null);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, null,
+				StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS |
+						StatusDisplayItem.FLAG_NO_FOOTER |
+						StatusDisplayItem.FLAG_NO_TRANSLATE);
 	}
 
 	@Override
@@ -183,6 +190,21 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		return null;
 	}
 
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		if(contentView!=null){
+			if(Build.VERSION.SDK_INT>=29 && insets.getTappableElementInsets().bottom==0){
+				int insetBottom=insets.getSystemWindowInsetBottom();
+				((ViewGroup.MarginLayoutParams) list.getLayoutParams()).bottomMargin=insetBottom;
+				((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16)+insetBottom;
+				insets=insets.inset(0, 0, 0, insetBottom);
+			}else{
+				((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(16);
+			}
+		}
+		super.onApplyWindowInsets(insets);
+	}
+
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
 		// TODO: adapt when frontends finally implement a scheduled posts list

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

@@ -9,6 +9,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.DummyStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
@@ -143,7 +144,8 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 				}
 			}
 			String sep = getString(R.string.sk_separator);
-			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null));
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null, s));
+			items.add(1, new DummyStatusDisplayItem(s.id, this));
 		}
 		return items;
 	}

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

@@ -1,5 +1,7 @@
 package org.joinmastodon.android.fragments;
 
+import static org.joinmastodon.android.api.session.AccountLocalPreferences.ShowEmojiReactions.ONLY_OPENED;
+
 import android.content.res.Configuration;
 import android.os.Bundle;
 
@@ -7,7 +9,9 @@ import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -20,6 +24,7 @@ import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -36,9 +41,10 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
 		boolean isMainThreadStatus = this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id);
 		int flags = 0;
+		AccountLocalPreferences lp=getLocalPrefs();
 		if (GlobalUserPreferences.spectatorMode)
 			flags |= StatusDisplayItem.FLAG_NO_FOOTER;
-		if (!getLocalPrefs().showEmojiReactionsInLists)
+		if (!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
 			flags |= StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS;
 		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), isMainThreadStatus ? 0 : flags);
 	}
@@ -223,8 +229,30 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 							footer.rebind();
 						}else if(holder instanceof ExtendedFooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
 							footer.rebind();
-						}else if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==s.getContentStatus() && ev.viewHolder!=holder){
+						}
+					}
+				}
+			}
+			for(Status s:preloadedData){
+				if(s.getContentStatus().id.equals(ev.id)){
+					s.getContentStatus().update(ev);
+					AccountSessionManager.get(accountID).getCacheController().updateStatus(s);
+				}
+			}
+		}
+
+		@Subscribe
+		public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){
+			for(Status s:data){
+				if(s.getContentStatus().id.equals(ev.id)){
+					s.getContentStatus().update(ev);
+					AccountSessionManager.get(accountID).getCacheController().updateStatus(s);
+					for(int i=0;i<list.getChildCount();i++){
+						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+						if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==s.getContentStatus() && ev.viewHolder!=holder){
 							reactions.rebind();
+						}else if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(s.getID())){
+							text.rebind();
 						}
 					}
 				}

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

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.MastodonRecyclerFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
@@ -197,7 +198,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 		}
 	}
 
-	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.DisableableClickable{
 		private final ImageView cover, avatar;
 		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
 		private final ProgressBarButton actionButton;
@@ -223,13 +224,22 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			actionProgress=findViewById(R.id.action_progress);
 			actionWrap=findViewById(R.id.action_btn_wrap);
 
-			itemView.setOutlineProvider(OutlineProviders.roundedRect(6));
-			itemView.setClipToOutline(true);
-			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(15));
 			avatar.setClipToOutline(true);
-			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
+			View border=findViewById(R.id.avatar_border);
+			border.setOutlineProvider(OutlineProviders.roundedRect(17));
+			border.setClipToOutline(true);
+			cover.setOutlineProvider(OutlineProviders.roundedRect(9));
 			cover.setClipToOutline(true);
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(12));
+			itemView.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
+			itemView.setOnClickListener(v->this.onClick());
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return false;
 		}
 
 		@Override
@@ -242,12 +252,14 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			postsCount.setText(UiUtils.abbreviateNumber(item.account.statusesCount));
 			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
 			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
-			postsLabel.setText(getResources().getQuantityString(R.plurals.x_posts, (int)(item.account.statusesCount%1000), item.account.statusesCount));
+			postsLabel.setText(getResources().getQuantityString(R.plurals.sk_posts_count_label, (int)(item.account.statusesCount%1000), item.account.statusesCount));
 			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
+			UiUtils.setExtraTextInfo(getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+
 			if(relationship==null){
 				actionWrap.setVisibility(View.GONE);
 			}else{
@@ -308,8 +320,9 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 
 		public AccountWrapper(Account account){
 			this.account=account;
-			if(!TextUtils.isEmpty(account.avatar))
-				avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
+			avaRequest=new UrlImageLoaderRequest(
+					TextUtils.isEmpty(account.avatar) ? AccountSessionManager.getInstance().getAccount(accountID).getDefaultAvatarUrl() : account.avatar,
+					V.dp(50), V.dp(50));
 			if(!TextUtils.isEmpty(account.header))
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);

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

@@ -70,7 +70,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, FilterContext.PUBLIC, !getLocalPrefs().showEmojiReactionsInLists ? StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS : 0);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, FilterContext.PUBLIC, 0);
 		};
 	}
 

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

@@ -10,7 +10,6 @@ import android.graphics.Outline;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -26,7 +25,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
-import org.joinmastodon.android.MainActivity;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -38,19 +37,16 @@ import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.model.viewmodel.SearchResultViewModel;
 import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.SearchViewHelper;
 import org.joinmastodon.android.ui.adapters.GenericListItemsAdapter;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
 import org.joinmastodon.android.ui.viewholders.SimpleListItemViewHolder;
-import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -381,16 +377,54 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void openHashtag(SearchResult res){
-		UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
-		AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
+		wrapSuicideDialog(()->{
+			UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
+			AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
+		});
 	}
 
 	private boolean isInRecentMode(){
 		return TextUtils.isEmpty(currentQuery);
 	}
 
+	private void wrapSuicideDialog(Runnable r){
+		if(!GlobalUserPreferences.showSuicideHelp || currentQuery==null){
+			r.run();
+			return;
+		}
+
+		String[] terms=getContext().getString(R.string.sk_suicide_search_terms).toLowerCase().split(",");
+		String query=currentQuery.trim().toLowerCase();
+		boolean termMatches=false;
+		for(String term : terms){
+			if(query.contains(term)){
+				termMatches=true;
+				break;
+			}
+		}
+
+		if(!termMatches){
+			r.run();
+			return;
+		}
+
+		String url=getContext().getString(R.string.sk_suicide_helplines_url);
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_search_suicide_title)
+				.setMessage(R.string.sk_search_suicide_message)
+				.setNegativeButton(R.string.sk_do_not_show_again, (dialog, which)->{
+					GlobalUserPreferences.showSuicideHelp = false;
+					GlobalUserPreferences.save();
+					r.run();
+				})
+				.setNeutralButton(R.string.sk_search_suicide_hotlines, (dialog, which)->UiUtils.launchWebBrowser(getContext(), url))
+				.setPositiveButton(R.string.ok, (dialog, which)->r.run())
+				.setOnDismissListener((dialog)->{})
+				.show();
+	}
+
 	private void onSearchViewEnter(){
-		deliverResult(currentQuery, null);
+		wrapSuicideDialog(()->deliverResult(currentQuery, null));
 	}
 
 	private void onOpenURLClick(){
@@ -398,10 +432,12 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onGoToHashtagClick(){
-		String q=searchViewHelper.getQuery();
-		if(q.startsWith("#"))
-			q=q.substring(1);
-		UiUtils.openHashtagTimeline(getActivity(), accountID, q, null);
+		wrapSuicideDialog(()->{
+			String q=searchViewHelper.getQuery();
+			if(q.startsWith("#"))
+				q=q.substring(1);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, q, null);
+		});
 	}
 
 	private void onGoToAccountClick(){
@@ -422,11 +458,11 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onGoToStatusSearchClick(){
-		deliverResult(searchViewHelper.getQuery(), SearchResult.Type.STATUS);
+		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.STATUS));
 	}
 
 	private void onGoToAccountSearchClick(){
-		deliverResult(searchViewHelper.getQuery(), SearchResult.Type.ACCOUNT);
+		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.ACCOUNT));
 	}
 
 	private void onClearRecentClick(){

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

@@ -139,7 +139,9 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		headerView.findViewById(R.id.more).setVisibility(View.GONE);
 		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
 		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
-		((TextView) headerView.findViewById(R.id.time_and_username)).setText(R.string.sk_app_username);
+		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
+		headerView.findViewById(R.id.time).setVisibility(View.GONE);
+		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
 		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
 		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);

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

@@ -83,7 +83,7 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 		reportStatus=Parcels.unwrap(getArguments().getParcelable("status"));
 		if(reportStatus!=null){
 			Status hiddenStatus=reportStatus.clone();
-			hiddenStatus.spoilerText=getString(R.string.post_hidden);
+			if(hiddenStatus.spoilerText==null) hiddenStatus.spoilerText=getString(R.string.post_hidden);
 			onDataLoaded(Collections.singletonList(hiddenStatus));
 			setTitle(R.string.report_title_post);
 		}else{
@@ -168,17 +168,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 		((UsableRecyclerView)list).setIncludeMarginsInItemHitbox(false);
 
 		if(reportStatus!=null){
-			list.addItemDecoration(new RecyclerView.ItemDecoration(){
-				@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 LinkCardStatusDisplayItem.Holder || holder instanceof MediaGridStatusDisplayItem.Holder){
-						outRect.left=V.dp(16);
-						outRect.right=V.dp(16);
-					}
-				}
-			});
-
 			list.addItemDecoration(new RecyclerView.ItemDecoration(){
 				private Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
 				{
@@ -222,10 +211,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 					if(holder instanceof StatusDisplayItem.Holder<?>){
 						outRect.left=outRect.right=V.dp(16);
 					}
-					int index=holder.getAbsoluteAdapterPosition()-mergeAdapter.getPositionForAdapter(adapter);
-					if(index==displayItems.size()){
-						outRect.top=V.dp(32);
-					}
 				}
 			});
 		}
@@ -251,18 +236,6 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 		return null;
 	}
 
-	@Override
-	protected void onModifyItemViewHolder(BindableViewHolder<StatusDisplayItem> holder){
-		if((Object)holder instanceof MediaGridStatusDisplayItem.Holder h){
-			View layout=h.getLayout();
-			layout.setOutlineProvider(OutlineProviders.roundedRect(8));
-			layout.setClipToOutline(true);
-			View overlay=h.getSensitiveOverlay();
-			overlay.setOutlineProvider(OutlineProviders.roundedRect(8));
-			overlay.setClipToOutline(true);
-		}
-	}
-
 	@Override
 	public void putRelationship(String id, Relationship rel){
 		super.putRelationship(id, rel);

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

@@ -16,6 +16,7 @@ import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.imageloader.ImageCache;
@@ -32,7 +33,7 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 		setTitle(getString(R.string.about_app, getString(R.string.sk_app_name)));
 		AccountSession s=AccountSessionManager.get(accountID);
 		onDataLoaded(List.of(
-				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.donate_url))),
+				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.openHashtagTimeline(getActivity(), accountID, getString(R.string.donate_hashtag), null)),
 				new ListItem<>(R.string.sk_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.repo_url))),
 				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/terms")),
 				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),

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

@@ -20,6 +20,7 @@ import org.joinmastodon.android.utils.MastodonLanguage;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> implements HasAccountID{
 	private ListItem<Void> languageItem;

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

@@ -2,10 +2,14 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.os.Bundle;
 
+import androidx.annotation.StringRes;
+
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.StatusDisplaySettingsChangedEvent;
 import org.joinmastodon.android.fragments.HasAccountID;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
@@ -15,12 +19,13 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import me.grishka.appkit.Nav;
 
 public class SettingsInstanceFragment extends BaseSettingsFragment<Void> implements HasAccountID{
-	private CheckableListItem<Void> contentTypesItem, emojiReactionsItem, emojiReactionsInListsItem, localOnlyItem, glitchModeItem;
-	private ListItem<Void> defaultContentTypeItem;
+	private CheckableListItem<Void> contentTypesItem, emojiReactionsItem, localOnlyItem, glitchModeItem;
+	private ListItem<Void> defaultContentTypeItem, showEmojiReactionsItem;
 	private AccountLocalPreferences lp;
 
 	@Override
@@ -35,16 +40,16 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 				new ListItem<>(R.string.sk_settings_posting, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/preferences/other")),
 				new ListItem<>(R.string.sk_settings_auth, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/auth/edit"), 0, true),
 				contentTypesItem=new CheckableListItem<>(R.string.sk_settings_content_types, R.string.sk_settings_content_types_explanation, CheckableListItem.Style.SWITCH, lp.contentTypesEnabled, R.drawable.ic_fluent_text_edit_style_24_regular, this::onContentTypeClick),
-				defaultContentTypeItem=new ListItem<>(R.string.sk_settings_default_content_type, lp.defaultContentType.getName(), R.drawable.ic_fluent_text_bold_24_regular, this::onDefaultContentTypeClick),
+				defaultContentTypeItem=new ListItem<>(R.string.sk_settings_default_content_type, lp.defaultContentType.getName(), R.drawable.ic_fluent_text_bold_24_regular, this::onDefaultContentTypeClick, 0, true),
 				emojiReactionsItem=new CheckableListItem<>(R.string.sk_settings_emoji_reactions, R.string.sk_settings_emoji_reactions_explanation, CheckableListItem.Style.SWITCH, lp.emojiReactionsEnabled, R.drawable.ic_fluent_emoji_laugh_24_regular, this::onEmojiReactionsClick),
-				emojiReactionsInListsItem=new CheckableListItem<>(R.string.sk_settings_emoji_reactions_in_lists, R.string.sk_settings_emoji_reactions_in_lists_explanation, CheckableListItem.Style.SWITCH, lp.showEmojiReactionsInLists, R.drawable.ic_fluent_emoji_24_regular, ()->toggleCheckableItem(emojiReactionsInListsItem)),
+				showEmojiReactionsItem=new ListItem<>(R.string.sk_settings_show_emoji_reactions, getShowEmojiReactionsString(), R.drawable.ic_fluent_emoji_24_regular, this::onShowEmojiReactionsClick, 0, true),
 				localOnlyItem=new CheckableListItem<>(R.string.sk_settings_support_local_only, R.string.sk_settings_local_only_explanation, CheckableListItem.Style.SWITCH, lp.localOnlySupported, R.drawable.ic_fluent_eye_24_regular, this::onLocalOnlyClick),
 				glitchModeItem=new CheckableListItem<>(R.string.sk_settings_glitch_instance, R.string.sk_settings_glitch_mode_explanation, CheckableListItem.Style.SWITCH, lp.glitchInstance, R.drawable.ic_fluent_eye_24_filled, ()->toggleCheckableItem(glitchModeItem))
 		));
 		contentTypesItem.checkedChangeListener=checked->onContentTypeClick();
 		defaultContentTypeItem.isEnabled=contentTypesItem.checked;
 		emojiReactionsItem.checkedChangeListener=checked->onEmojiReactionsClick();
-		emojiReactionsInListsItem.isEnabled=emojiReactionsItem.checked;
+		showEmojiReactionsItem.isEnabled=emojiReactionsItem.checked;
 		localOnlyItem.checkedChangeListener=checked->onLocalOnlyClick();
 		glitchModeItem.isEnabled=localOnlyItem.checked;
 	}
@@ -57,10 +62,10 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		super.onHidden();
 		lp.contentTypesEnabled=contentTypesItem.checked;
 		lp.emojiReactionsEnabled=emojiReactionsItem.checked;
-		lp.showEmojiReactionsInLists=emojiReactionsInListsItem.checked;
 		lp.localOnlySupported=localOnlyItem.checked;
 		lp.glitchInstance=glitchModeItem.checked;
 		lp.save();
+		E.post(new StatusDisplaySettingsChangedEvent(accountID));
 	}
 
 	private void onServerClick(){
@@ -107,11 +112,34 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
+	private void onShowEmojiReactionsClick(){
+		int selected=lp.showEmojiReactions.ordinal();
+		int[] newSelected={selected};
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_settings_show_emoji_reactions)
+				.setSingleChoiceItems((String[]) IntStream.of(R.string.sk_settings_show_emoji_reactions_hide_empty, R.string.sk_settings_show_emoji_reactions_only_opened, R.string.sk_settings_show_emoji_reactions_always).mapToObj(this::getString).toArray(String[]::new),
+						selected, (dlg, item)->newSelected[0]=item)
+				.setPositiveButton(R.string.ok, (dlg, item)->{
+					lp.showEmojiReactions=AccountLocalPreferences.ShowEmojiReactions.values()[newSelected[0]];
+					showEmojiReactionsItem.subtitleRes=getShowEmojiReactionsString();
+					rebindItem(showEmojiReactionsItem);
+				})
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
+	private @StringRes int getShowEmojiReactionsString(){
+		return switch(lp.showEmojiReactions){
+			case HIDE_EMPTY -> R.string.sk_settings_show_emoji_reactions_hide_empty;
+			case ONLY_OPENED -> R.string.sk_settings_show_emoji_reactions_only_opened;
+			case ALWAYS -> R.string.sk_settings_show_emoji_reactions_always;
+		};
+	}
+
 	private void onEmojiReactionsClick(){
 		toggleCheckableItem(emojiReactionsItem);
-		emojiReactionsInListsItem.checked=false;
-		emojiReactionsInListsItem.isEnabled=emojiReactionsItem.checked;
-		rebindItem(emojiReactionsInListsItem);
+		showEmojiReactionsItem.isEnabled=emojiReactionsItem.checked;
+		rebindItem(showEmojiReactionsItem);
 	}
 
 	private void onLocalOnlyClick(){

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

@@ -98,6 +98,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 
 		typeItems=List.of(mentionsItem, boostsItem, favoritesItem, followersItem, pollsItem, updateItem, postsItem);
 		pauseItem.checkedChangeListener=checked->onPauseNotificationsClick(true);
+		unifiedPushItem.checkedChangeListener=checked->onUnifiedPush();
 		updatePolicyItem(null);
 		updatePauseItem();
 	}
@@ -347,7 +348,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 
 	private void showUnifiedPushRegisterDialog(List<String> distributors){
 		new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_unifiedpush_choose).setItems(distributors.toArray(String[]::new),
-				(dialog, which) ->{
+				(dialog, which)->{
 					String userDistrib = distributors.get(which);
 					UnifiedPush.saveDistributor(getContext(), userDistrib);
 					UnifiedPush.registerApp(
@@ -358,6 +359,6 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 					);
 					unifiedPushItem.toggle();
 					rebindItem(unifiedPushItem);
-				}).show();
+				}).setOnCancelListener(d->rebindItem(unifiedPushItem)).show();
 	}
 }

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

@@ -7,12 +7,17 @@ import androidx.annotation.Nullable;
 
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.parceler.Parcel;
 
 import java.time.Instant;
 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.List;
 
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+
 /**
  * Represents a user of Mastodon and their associated profile.
  */
@@ -23,22 +28,22 @@ public class Account extends BaseModel implements Searchable{
 	/**
 	 * The account id
 	 */
-	@RequiredField
+//	@RequiredField
 	public String id;
 	/**
 	 * The username of the account, not including domain.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String username;
 	/**
 	 * The Webfinger account URI. Equal to username for local users, or username@domain for remote users.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String acct;
 	/**
 	 * The location of the user's profile page.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String url;
 
 	// Display attributes
@@ -51,12 +56,12 @@ public class Account extends BaseModel implements Searchable{
 	/**
 	 * The profile's bio / description.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String note;
 	/**
 	 * An image icon that is shown next to statuses and in the profile.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String avatar;
 	/**
 	 * A static version of the avatar. Equal to avatar if its value is a static image; different if avatar is an animated GIF.
@@ -157,16 +162,26 @@ public class Account extends BaseModel implements Searchable{
 		if(fields!=null){
 			for(AccountField f:fields)
 				f.postprocess();
+		} else {
+			fields = Collections.emptyList();
 		}
 		if(emojis!=null){
 			for(Emoji e:emojis)
 				e.postprocess();
+		} else {
+			emojis = Collections.emptyList();
 		}
 		if(moved!=null)
 			moved.postprocess();
-		if(TextUtils.isEmpty(displayName))
-			displayName=username;
 		if(fqn == null) fqn = getFullyQualifiedName();
+		if(id == null) id = "";
+		if(username == null) username = "";
+		if(TextUtils.isEmpty(displayName))
+			displayName = !TextUtils.isEmpty(username) ? username : "";
+		if(acct == null) acct = "";
+		if(url == null) url = "";
+		if(note == null) note = "";
+		if(avatar == null) avatar = "";
 	}
 
 	public boolean isLocal(){
@@ -191,6 +206,8 @@ public class Account extends BaseModel implements Searchable{
 	}
 
 	public String getFullyQualifiedName() {
+		if (TextUtils.isEmpty(acct))
+			return "";
 		return fqn != null ? fqn : acct.split("@")[0] + "@" + getDomainFromURL();
 	}
 

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

@@ -41,6 +41,12 @@ public class Emoji extends BaseModel{
 		this.staticUrl = staticUrl;
 	}
 
+	public String getUrl(boolean playGifs){
+		String idealUrl=playGifs ? url : staticUrl;
+		if(idealUrl==null) return url==null ? staticUrl : url;
+		return idealUrl;
+	}
+
 	@Override
 	public String toString(){
 		return "Emoji{"+

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.parceler.Parcel;
 
 import java.util.ArrayList;
@@ -22,6 +23,12 @@ public class EmojiReaction {
 
 	public transient ImageLoaderRequest request;
 
+	public String getUrl(boolean playGifs){
+		String idealUrl=playGifs ? url : staticUrl;
+		if(idealUrl==null) return url==null ? staticUrl : url;
+		return idealUrl;
+	}
+
 	public static EmojiReaction of(Emoji info, Account me){
 		EmojiReaction reaction=new EmojiReaction();
 		reaction.me=true;

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

@@ -14,6 +14,7 @@ public class FilterResult extends BaseModel {
     @Override
     public void postprocess() throws ObjectValidationException {
         super.postprocess();
-        if (filter != null) filter.postprocess();
+        if(filter!=null) filter.postprocess();
+		if(keywordMatches==null) keywordMatches=List.of();
     }
 }

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

@@ -13,10 +13,10 @@ 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;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.parceler.Parcel;
@@ -114,8 +114,8 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 			for(FilterResult fr:filtered)
 				fr.postprocess();
 
-		if(!TextUtils.isEmpty(spoilerText)) sensitive=true;
-		spoilerRevealed=TextUtils.isEmpty(spoilerText);
+		spoilerRevealed=!hasSpoiler();
+		if(!spoilerRevealed) sensitive=true;
 		sensitiveRevealed=!sensitive;
 		if(visibility.equals(StatusPrivacy.LOCAL)) localOnly=true;
 		if(emojiReactions!=null) reactions=emojiReactions;
@@ -175,6 +175,9 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		reblogged=ev.reblogged;
 		bookmarked=ev.bookmarked;
 		pinned=ev.pinned;
+	}
+
+	public void update(EmojiReactionsUpdatedEvent ev){
 		reactions=ev.reactions;
 	}
 
@@ -188,6 +191,10 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		return strippedText;
 	}
 
+	public boolean hasSpoiler(){
+		return !TextUtils.isEmpty(spoilerText);
+	}
+
 	@NonNull
 	@Override
 	public Status clone(){

mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java

@@ -1,8 +1,10 @@
 package org.joinmastodon.android.model.viewmodel;
 
 import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
 
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
@@ -24,9 +26,13 @@ public class AccountViewModel{
 
 	public AccountViewModel(Account account, String accountID){
 		this.account=account;
-		avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(50), V.dp(50));
+		AccountSession session = AccountSessionManager.get(accountID);
+		avaRequest=new UrlImageLoaderRequest(
+				TextUtils.isEmpty(account.avatar) ? session.getDefaultAvatarUrl() :
+						GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic,
+				V.dp(50), V.dp(50));
 		emojiHelper=new CustomEmojiHelper();
-		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames)
+		if(session.getLocalPreferences().customEmojiInNames)
 			parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
 		else
 			parsedName=account.displayName;

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

@@ -37,6 +37,16 @@ public class OutlineProviders{
 		}
 	};
 
+	private final static int BUTTON_BG_HEIGHT=V.dp(40);
+	public static final ViewOutlineProvider M3_BUTTON=new ViewOutlineProvider(){
+		@Override
+		public void getOutline(View view, Outline outline){
+			int viewHeight=view.getHeight();
+			int top=Math.floorDiv(viewHeight - BUTTON_BG_HEIGHT, 2);
+			outline.setRoundRect(0, top, view.getWidth(), top + BUTTON_BG_HEIGHT, V.dp(20));
+		}
+	};
+
 	public static ViewOutlineProvider roundedRect(int dp){
 		ViewOutlineProvider provider=roundedRects.get(dp);
 		if(provider!=null)

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
@@ -41,12 +42,13 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	public CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	public CharSequence parsedName, parsedBio;
 
-	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account, Notification notification){
+	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Account account, Notification notification){
 		super(parentID, parentFragment);
 		this.account=account;
 		this.notification=notification;
-		if(!TextUtils.isEmpty(account.avatar))
-			avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
+		avaRequest=new UrlImageLoaderRequest(
+				TextUtils.isEmpty(account.avatar) ? AccountSessionManager.get(accountID).getDefaultAvatarUrl() : account.avatar,
+				V.dp(50), V.dp(50));
 		if(!TextUtils.isEmpty(account.header))
 			coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), parentFragment.getAccountID());
@@ -111,15 +113,24 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			rejectWrap=findViewById(R.id.reject_btn_wrap);
 
 			View card=findViewById(R.id.card);
-			card.setOutlineProvider(OutlineProviders.roundedRect(6));
+			card.setOutlineProvider(OutlineProviders.roundedRect(12));
 			card.setClipToOutline(true);
-			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(15));
 			avatar.setClipToOutline(true);
-			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
+			View border=findViewById(R.id.avatar_border);
+			border.setOutlineProvider(OutlineProviders.roundedRect(17));
+			border.setClipToOutline(true);
+			cover.setOutlineProvider(OutlineProviders.roundedRect(9));
 			cover.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
 			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
 			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
+			card.setOnClickListener(v->onClick());
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return false;
 		}
 
 		@Override
@@ -132,18 +143,19 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			postsCount.setText(UiUtils.abbreviateNumber(item.account.statusesCount));
 			followersLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
 			followingLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
-			postsLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.x_posts, (int)(item.account.statusesCount%1000), item.account.statusesCount));
+			postsLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.sk_posts_count_label, (int)(item.account.statusesCount%1000), item.account.statusesCount));
 			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
 			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=item.parentFragment.getRelationship(item.account.id);
-			if(item.notification.type == Notification.Type.FOLLOW_REQUEST && (relationship == null || !relationship.followedBy)){
+			UiUtils.setExtraTextInfo(item.parentFragment.getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+
+			if(item.notification.type==Notification.Type.FOLLOW_REQUEST && (relationship==null || !relationship.followedBy)){
 				actionWrap.setVisibility(View.GONE);
 				acceptWrap.setVisibility(View.VISIBLE);
 				rejectWrap.setVisibility(View.VISIBLE);
 			
-				// i hate that i wasn't able to do this in xml
 				acceptButton.setCompoundDrawableTintList(acceptButton.getTextColors());
 				acceptProgress.setIndeterminateTintList(acceptButton.getTextColors());
 				rejectButton.setCompoundDrawableTintList(rejectButton.getTextColors());
@@ -163,7 +175,7 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 		private void onFollowRequestButtonClick(View v) {
 			itemView.setHasTransientState(true);
 			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), null, v == acceptButton, relationship, rel -> {
-				if(v.getContext()==null) return;
+				if(v.getContext()==null || rel==null) return;
 				itemView.setHasTransientState(false);
 				item.parentFragment.putRelationship(item.account.id, rel);
 				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();

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

@@ -17,9 +17,11 @@ import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.announcements.AddAnnouncementReaction;
@@ -30,11 +32,10 @@ import org.joinmastodon.android.api.requests.statuses.PleromaAddStatusReaction;
 import org.joinmastodon.android.api.requests.statuses.PleromaDeleteStatusReaction;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.account_list.StatusEmojiReactionsListFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiReaction;
 import org.joinmastodon.android.model.Status;
@@ -59,24 +60,24 @@ import me.grishka.appkit.views.UsableRecyclerView;
 public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 	public final Status status;
 	private final Drawable placeholder;
-	private final boolean hideAdd, forAnnouncement;
+	private final boolean hideEmpty, forAnnouncement, playGifs;
 	private final String accountID;
-	private boolean hidden;
+	private static final float ALPHA_DISABLED=0.55f;
 
-    public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, String accountID, boolean hideAdd, boolean forAnnouncement) {
+    public EmojiReactionsStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, String accountID, boolean hideEmpty, boolean forAnnouncement) {
 		super(parentID, parentFragment);
 		this.status=status;
-		this.hideAdd=hideAdd;
+		this.hideEmpty=hideEmpty;
 		this.forAnnouncement=forAnnouncement;
 		this.accountID=accountID;
 		placeholder=parentFragment.getContext().getDrawable(R.drawable.image_placeholder).mutate();
 		placeholder.setBounds(0, 0, V.sp(24), V.sp(24));
-		updateHidden();
+		playGifs=GlobalUserPreferences.playGifs;
     }
 
 	@Override
 	public int getImageCount(){
-		return (int) status.reactions.stream().filter(r->r.url != null).count();
+		return (int) status.reactions.stream().filter(r->r.getUrl(playGifs)!=null).count();
 	}
 
 	@Override
@@ -90,23 +91,18 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
     }
 
 	public boolean isHidden(){
-		return hidden;
-	}
-
-	private void updateHidden(){
-		hidden=status.reactions.isEmpty() && hideAdd;
+		return status.reactions.isEmpty() && hideEmpty;
 	}
 
 	// borrowed from ProfileFragment
 	private void setActionProgressVisible(Holder.EmojiReactionViewHolder vh, boolean visible){
 		if(vh==null) return;
 		vh.progress.setVisibility(visible ? View.VISIBLE : View.GONE);
-		if(visible)
-			vh.progress.setIndeterminateTintList(vh.btn.getTextColors());
 		vh.btn.setClickable(!visible);
+		vh.btn.setAlpha(visible ? ALPHA_DISABLED : 1);
 	}
 
-	private MastodonAPIRequest<?> createRequest(String name, int count, boolean delete, Holder.EmojiReactionViewHolder vh, Runnable cb){
+	private MastodonAPIRequest<?> createRequest(String name, int count, boolean delete, Holder.EmojiReactionViewHolder vh, Runnable cb, Runnable err){
 		setActionProgressVisible(vh, true);
 		boolean ak=parentFragment.isInstanceAkkoma();
 		boolean keepSpinning=delete && count == 1;
@@ -124,6 +120,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 				public void onError(ErrorResponse error){
 					setActionProgressVisible(vh, false);
 					error.showToast(parentFragment.getContext());
+					if(err!=null) err.run();
 				}
 			});
 		}else{
@@ -140,6 +137,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 				public void onError(ErrorResponse error){
 					setActionProgressVisible(vh, false);
 					error.showToast(parentFragment.getContext());
+					if(err!=null) err.run();
 				}
 			});
 		}
@@ -151,6 +149,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 		private CustomEmojiPopupKeyboard emojiKeyboard;
 		private final View space;
 		private final ImageButton addButton;
+		private final ProgressBar progress;
 		private final EmojiReactionsAdapter adapter;
 		private final ListImageLoaderWrapper imgLoader;
 
@@ -162,6 +161,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 			imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);
 			list.setAdapter(adapter=new EmojiReactionsAdapter(this, imgLoader));
 			addButton=findViewById(R.id.add_btn);
+			progress=findViewById(R.id.progress);
 			addButton.setOnClickListener(this::onReactClick);
 			space=findViewById(R.id.space);
 			list.setLayoutManager(new LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false));
@@ -171,8 +171,9 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
         public void onBind(EmojiReactionsStatusDisplayItem item) {
 			if(emojiKeyboard != null) root.removeView(emojiKeyboard.getView());
 			AccountSession session=item.parentFragment.getSession();
-			item.status.reactions.forEach(r->
-					r.request=r.url != null ? new UrlImageLoaderRequest(r.url, V.sp(24), V.sp(24)) : null);
+			item.status.reactions.forEach(r->r.request=r.getUrl(item.playGifs)!=null
+					? new UrlImageLoaderRequest(r.getUrl(item.playGifs), V.sp(24), V.sp(24))
+					: null);
 			emojiKeyboard=new CustomEmojiPopupKeyboard(
 					(Activity) item.parentFragment.getContext(),
 					AccountSessionManager.getInstance().getCustomEmojis(session.domain),
@@ -180,12 +181,12 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 			emojiKeyboard.setListener(this);
 			space.setVisibility(View.GONE);
 			root.addView(emojiKeyboard.getView());
-			item.updateHidden();
-			root.setVisibility(item.hidden ? View.GONE : View.VISIBLE);
-			line.setVisibility(item.hidden ? View.GONE : View.VISIBLE);
+			boolean hidden=item.isHidden();
+			root.setVisibility(hidden ? View.GONE : View.VISIBLE);
+			line.setVisibility(hidden ? View.GONE : View.VISIBLE);
 			line.setPadding(
 					list.getPaddingLeft(),
-					item.hidden ? 0 : V.dp(8),
+					hidden ? 0 : V.dp(8),
 					list.getPaddingRight(),
 					item.forAnnouncement ? V.dp(8) : 0
 			);
@@ -212,25 +213,51 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 		}
 
 		private void addEmojiReaction(String emoji, Emoji info) {
-			if(item.status.reactions.stream().filter(r->r.name.equals(emoji) && r.me).findAny().isPresent()) return;
+			int countBefore=item.status.reactions.size();
+			for(int i=0; i<item.status.reactions.size(); i++){
+				EmojiReaction r=item.status.reactions.get(i);
+				if(r.name.equals(emoji) && r.me){
+					RecyclerView.SmoothScroller scroller=new LinearSmoothScroller(list.getContext());
+					scroller.setTargetPosition(i);
+					list.getLayoutManager().startSmoothScroll(scroller);
+					return; // nothing to do, already added
+				}
+			}
 
+			progress.setVisibility(View.VISIBLE);
+			addButton.setClickable(false);
+			addButton.setAlpha(ALPHA_DISABLED);
+
+			Runnable resetBtn=()->{
+				progress.setVisibility(View.GONE);
+				addButton.setClickable(true);
+				addButton.setAlpha(1f);
+			};
 			Account me=AccountSessionManager.get(item.accountID).self;
 			EmojiReaction existing=null;
 			for(int i=0; i<item.status.reactions.size(); i++){
 				EmojiReaction r=item.status.reactions.get(i);
 				if(r.name.equals(emoji)){
 					existing=r;
-					r.add(me);
-					adapter.notifyItemChanged(i);
 					break;
 				}
 			}
-			if(existing==null){
-				item.status.reactions.add(0, info!=null ? EmojiReaction.of(info, me) : EmojiReaction.of(emoji, me));
-				adapter.notifyItemRangeInserted(0, 1);
-			}
-			E.post(new StatusCountersUpdatedEvent(item.status, adapter.parentHolder));
-			item.createRequest(emoji, existing==null ? 1 : existing.count, false, null, ()->{}).exec(item.accountID);
+			EmojiReaction finalExisting=existing;
+			item.createRequest(emoji, existing==null ? 1 : existing.count, false, null, ()->{
+				resetBtn.run();
+				if(finalExisting==null){
+					int pos=item.status.reactions.size();
+					item.status.reactions.add(pos, info!=null ? EmojiReaction.of(info, me) : EmojiReaction.of(emoji, me));
+					adapter.notifyItemRangeInserted(pos, 1);
+					RecyclerView.SmoothScroller scroller=new LinearSmoothScroller(list.getContext());
+					scroller.setTargetPosition(pos);
+					list.getLayoutManager().startSmoothScroll(scroller);
+				}else{
+					finalExisting.add(me);
+					adapter.notifyItemChanged(item.status.reactions.indexOf(finalExisting));
+				}
+				E.post(new EmojiReactionsUpdatedEvent(item.status.id, item.status.reactions, countBefore==0, adapter.parentHolder));
+			}, resetBtn).exec(item.accountID);
 		}
 
 		@Override
@@ -259,7 +286,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 		@Override
 		public void clearImage(int index){
-			if(item.status.reactions.get(index).url==null) return;
+			if(item.status.reactions.get(index).getUrl(item.playGifs)==null) return;
 			setImage(index, item.placeholder);
 		}
 
@@ -292,7 +319,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 
 			@Override
 			public int getImageCountForItem(int position){
-				return item.status.reactions.get(position).url == null ? 0 : 1;
+				return item.status.reactions.get(position).getUrl(item.playGifs)==null ? 0 : 1;
 			}
 
 			@Override
@@ -309,6 +336,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 				super(context, R.layout.item_emoji_reaction, list);
 				btn=findViewById(R.id.btn);
 				progress=findViewById(R.id.progress);
+				itemView.setClickable(true);
 			}
 
 			@Override
@@ -331,7 +359,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 				btn.setText(UiUtils.abbreviateNumber(reaction.count));
 				btn.setContentDescription(reaction.name);
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) btn.setTooltipText(reaction.name);
-				if(reaction.url==null){
+				if(reaction.getUrl(parent.playGifs)==null){
 					Paint p=new Paint();
 					p.setTextSize(V.sp(18));
 					TextDrawable drawable=new TextDrawable(p, reaction.name);
@@ -359,9 +387,13 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 							break;
 						}
 
-						E.post(new StatusCountersUpdatedEvent(parent.status, adapter.parentHolder));
+						if(parent.isHidden()){
+							adapter.parentHolder.root.setVisibility(View.GONE);
+							adapter.parentHolder.line.setVisibility(View.GONE);
+						}
+						E.post(new EmojiReactionsUpdatedEvent(parent.status.id, parent.status.reactions, parent.status.reactions.isEmpty(), adapter.parentHolder));
 						adapter.parentHolder.imgLoader.updateImages();
-					}).exec(parent.parentFragment.getAccountID());
+					}, null).exec(parent.parentFragment.getAccountID());
 				});
 
 				if (parent.parentFragment.isInstanceAkkoma()) {
@@ -373,7 +405,7 @@ public class EmojiReactionsStatusDisplayItem extends StatusDisplayItem {
 						args.putString("statusID", parent.status.id);
 						int atSymbolIndex = emojiReaction.name.indexOf("@");
 						args.putString("emoji", atSymbolIndex != -1 ? emojiReaction.name.substring(0, atSymbolIndex) : emojiReaction.name);
-						args.putString("url", emojiReaction.url);
+						args.putString("url", emojiReaction.getUrl(parent.playGifs));
 						args.putInt("count", emojiReaction.count);
 						Nav.go(parent.parentFragment.getActivity(), StatusEmojiReactionsListFragment.class, args);
 						return true;

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

@@ -1,5 +1,8 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import static org.joinmastodon.android.ui.utils.UiUtils.opacityIn;
+import static org.joinmastodon.android.ui.utils.UiUtils.opacityOut;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -12,8 +15,6 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
@@ -56,7 +57,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
 		private final TextView replies, boosts, favorites;
 		private final View reply, boost, favorite, share, bookmark;
-		private static final Animation opacityOut, opacityIn;
 
 		private View touchingView = null;
 		private boolean longClickPerformed = false;
@@ -77,18 +77,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			}
 		};
 
-		private static final float ALPHA_PRESSED=0.55f;
-
-		static {
-			opacityOut = new AlphaAnimation(1, ALPHA_PRESSED);
-			opacityOut.setDuration(300);
-			opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
-			opacityOut.setFillAfter(true);
-			opacityIn = new AlphaAnimation(ALPHA_PRESSED, 1);
-			opacityIn.setDuration(400);
-			opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		}
-
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_footer, parent);
 

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

@@ -8,14 +8,21 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.drawables.SawtoothTearDrawable;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.time.Instant;
+
+import me.grishka.appkit.utils.V;
 
-// Mind the gap!
 public class GapStatusDisplayItem extends StatusDisplayItem{
 	public boolean loading;
+	private Status status;
 
-	public GapStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment){
+	public GapStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status){
 		super(parentID, parentFragment);
+		this.status=status;
 	}
 
 	@Override
@@ -24,25 +31,53 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<GapStatusDisplayItem>{
-		public final ProgressBar progress;
-		public final TextView text;
+		public final ProgressBar progressTop, progressBottom;
+		public final TextView textTop, gap, textBottom;
+		public final View top, bottom;
 
 		public Holder(Context context, ViewGroup parent){
 			super(context, R.layout.display_item_gap, parent);
-			progress=findViewById(R.id.progress);
-			text=findViewById(R.id.text);
-			itemView.setForeground(new SawtoothTearDrawable(context));
+			progressTop=findViewById(R.id.progress_top);
+			progressBottom=findViewById(R.id.progress_bottom);
+			textTop=findViewById(R.id.text_top);
+			textBottom=findViewById(R.id.text_bottom);
+			top=findViewById(R.id.top);
+			top.setOnClickListener(this::onViewClick);
+			bottom=findViewById(R.id.bottom);
+			bottom.setOnClickListener(this::onViewClick);
+			gap=findViewById(R.id.gap);
+			gap.setForeground(new SawtoothTearDrawable(context));
 		}
 
 		@Override
 		public void onBind(GapStatusDisplayItem item){
-			text.setVisibility(item.loading ? View.GONE : View.VISIBLE);
-			progress.setVisibility(item.loading ? View.VISIBLE : View.GONE);
+			if(!item.loading){
+				progressBottom.setVisibility(View.GONE);
+				progressTop.setVisibility(View.GONE);
+			}
+			top.setClickable(!item.loading);
+			bottom.setClickable(!item.loading);
+			StatusDisplayItem next=getNextVisibleDisplayItem().orElse(null);
+			Instant dateBelow=next instanceof HeaderStatusDisplayItem h ? h.status.createdAt
+					: next instanceof ReblogOrReplyLineStatusDisplayItem l ? l.status.createdAt
+					: null;
+			String text=dateBelow!=null && item.status.createdAt!=null && dateBelow.isBefore(item.status.createdAt)
+					? UiUtils.formatPeriodBetween(item.parentFragment.getContext(), dateBelow, item.status.createdAt)
+					: null;
+			gap.setText(text);
+			int p=text==null ? V.dp(6) : V.dp(20);
+			gap.setPadding(p, p, p, p);
+		}
+
+		private void onViewClick(View v){
+			if(item.loading) return;
+			boolean isTop=v==top;
+			(isTop ? textTop : textBottom).startAnimation(UiUtils.opacityOut);
+			V.setVisibilityAnimated((isTop ? progressTop : progressBottom), View.VISIBLE);
+			item.parentFragment.onGapClick(this, isTop);
 		}
 
 		@Override
-		public void onClick(){
-			item.parentFragment.onGapClick(this);
-		}
+		public void onClick(){}
 	}
 }

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

@@ -86,10 +86,14 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 
 	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, CharSequence extraText, Notification notification, ScheduledStatus scheduledStatus){
 		super(parentID, parentFragment);
-		user=scheduledStatus != null ? AccountSessionManager.getInstance().getAccount(accountID).self : user;
+		AccountSession session = AccountSessionManager.get(accountID);
+		user=scheduledStatus != null ? session.self : user;
 		this.user=user;
 		this.createdAt=createdAt;
-		avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? user.avatar : user.avatarStatic, V.dp(50), V.dp(50));
+		avaRequest=new UrlImageLoaderRequest(
+				TextUtils.isEmpty(user.avatar) ? session.getDefaultAvatarUrl() :
+						GlobalUserPreferences.playGifs ? user.avatar : user.avatarStatic,
+				V.dp(50), V.dp(50));
 		this.accountID=accountID;
 		parsedName=new SpannableStringBuilder(user.displayName);
 		this.status=status;
@@ -132,9 +136,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView name, timeAndUsername, extraText, pronouns;
-		private final View collapseBtn;
-		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, markAsRead, collapseBtnIcon;
+		private final TextView name, time, username, extraText, pronouns;
+		private final View collapseBtn, timeUsernameSeparator;
+		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, markAsRead, collapseBtnIcon, botIcon;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -146,7 +150,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		protected Holder(Activity activity, @LayoutRes int layout, ViewGroup parent){
 			super(activity, layout, parent);
 			name=findViewById(R.id.name);
-			timeAndUsername=findViewById(R.id.time_and_username);
+			time=findViewById(R.id.time);
+			username=findViewById(R.id.username);
+			botIcon=findViewById(R.id.bot_icon);
+			timeUsernameSeparator=findViewById(R.id.separator);
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			visibility=findViewById(R.id.visibility);
@@ -190,7 +197,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 						}
 					}
 					boolean isPixelfed = item.parentFragment.isInstancePixelfed();
-					boolean textEmpty = TextUtils.isEmpty(item.status.content) && TextUtils.isEmpty(item.status.spoilerText);
+					boolean textEmpty = TextUtils.isEmpty(item.status.content) && !item.status.hasSpoiler();
 					if(!redraft && (isPixelfed || textEmpty)){
 						// pixelfed doesn't support /statuses/:id/source :/
 						if (isPixelfed) {
@@ -315,18 +322,26 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			else if (item.status != null && item.status.editedAt != null)
 				time=item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt));
 
-			String sepp = item.parentFragment.getString(R.string.sk_separator);
-			String username = "@" + item.user.acct;
-			timeAndUsername.setText(time == null ? username :
-				username + " " + sepp + " " + time);
+			this.username.setText(item.user.getDisplayUsername());
+			this.timeUsernameSeparator.setVisibility(time==null ? View.GONE : View.VISIBLE);
+			this.time.setVisibility(time==null ? View.GONE : View.VISIBLE);
+			if(time!=null) this.time.setText(time);
+
+			botIcon.setVisibility(item.user.bot ? View.VISIBLE : View.GONE);
+			botIcon.setColorFilter(username.getCurrentTextColor());
 
 			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if (item.hasVisibilityToggle){
-				boolean disabled = !item.status.sensitiveRevealed ||
-						(!TextUtils.isEmpty(item.status.spoilerText) &&
-								!item.status.spoilerRevealed);
-				visibility.setEnabled(!disabled);
-				V.setVisibilityAnimated(visibility, disabled ? View.INVISIBLE : View.VISIBLE);
+				boolean hidden = !item.status.sensitiveRevealed || (item.status.hasSpoiler() && !item.status.spoilerRevealed);
+
+				// doing this because V.setVisibilityAnimated ignores changes between INVISIBLE and GONE
+				int newVis=hidden ? View.INVISIBLE : View.VISIBLE;
+				if(newVis==View.INVISIBLE && visibility.getVisibility()==View.GONE)
+					visibility.setVisibility(newVis);
+				else
+					V.setVisibilityAnimated(visibility, newVis);
+
+				visibility.setEnabled(!hidden);
 				visibility.setContentDescription(item.parentFragment.getString(item.status.sensitiveRevealed ? R.string.spoiler_hide : R.string.spoiler_show));
 				if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
 					visibility.setTooltipText(visibility.getContentDescription());
@@ -419,6 +434,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onAvaClick(View v){
+			if (TextUtils.isEmpty(item.user.url))
+				return;
 			if (item.announcement != null) {
 				UiUtils.openURL(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.user.url);
 				return;

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

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -13,12 +14,14 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 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.V;
 
 public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 	private final Status status;
@@ -51,6 +54,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<LinkCardStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView title, description, domain;
 		private final ImageView photo;
+		private final View inner;
 		private BlurhashCrossfadeDrawable crossfadeDrawable=new BlurhashCrossfadeDrawable();
 		private boolean didClear;
 
@@ -60,7 +64,8 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 			description=findViewById(R.id.description);
 			domain=findViewById(R.id.domain);
 			photo=findViewById(R.id.photo);
-			findViewById(R.id.inner).setOnClickListener(this::onClick);
+			inner=findViewById(R.id.inner);
+			inner.setOnClickListener(this::onClick);
 		}
 
 		@Override
@@ -84,6 +89,15 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 				photo.setImageDrawable(crossfadeDrawable);
 				didClear=false;
 			}
+
+			// if there's no image, we don't want to cover the inset borders
+			FrameLayout.LayoutParams params=(FrameLayout.LayoutParams) inner.getLayoutParams();
+			int margin=item.inset && item.imgRequest == null ? V.dp(1) : 0;
+			params.setMargins(margin, 0, margin, margin);
+
+			boolean insetAndLast=item.inset && isLastDisplayItemForStatus();
+			inner.setClipToOutline(insetAndLast);
+			inner.setOutlineProvider(insetAndLast ? OutlineProviders.bottomRoundedRect(12) : null);
 		}
 
 		@Override

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

@@ -26,6 +26,7 @@ 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.OutlineProviders;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
@@ -210,6 +211,10 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 				sensitiveText.setText(R.string.media_hidden);
 			else
 				sensitiveText.setText(R.string.sensitive_content_explain);
+
+			boolean insetAndLast=item.inset && isLastDisplayItemForStatus();
+			wrapper.setClipToOutline(insetAndLast);
+			wrapper.setOutlineProvider(insetAndLast ? OutlineProviders.bottomRoundedRect(12) : null);
 		}
 
 		@Override

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

@@ -20,6 +20,8 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.model.Emoji;
@@ -53,7 +55,11 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 		if(notification.type==Notification.Type.POLL){
 			text=parentFragment.getString(R.string.poll_ended);
 		}else{
-			avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? notification.account.avatar : notification.account.avatarStatic, V.dp(50), V.dp(50));
+			AccountSession session = AccountSessionManager.get(accountID);
+			avaRequest=new UrlImageLoaderRequest(
+					TextUtils.isEmpty(notification.account.avatar) ? session.getDefaultAvatarUrl() :
+						GlobalUserPreferences.playGifs ? notification.account.avatar : notification.account.avatarStatic,
+					V.dp(50), V.dp(50));
 			SpannableStringBuilder parsedName=new SpannableStringBuilder(notification.account.displayName);
 			HtmlParser.parseCustomEmoji(parsedName, notification.account.emojis);
 			String str = parentFragment.getString(switch(notification.type){

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

@@ -79,7 +79,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 			progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate();
 			progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate();
 			itemView.setOnClickListener(this::onButtonClick);
-			button.setOutlineProvider(OutlineProviders.roundedRect(24));
+			button.setOutlineProvider(OutlineProviders.M3_BUTTON);
 			button.setClipToOutline(true);
 		}
 

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

@@ -17,6 +17,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
@@ -43,18 +44,20 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	public boolean needBottomPadding;
 	ReblogOrReplyLineStatusDisplayItem extra;
 	CharSequence fullText;
+	Status status;
 
-	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, text);
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, Status status) {
+		this(parentID, parentFragment, text, emojis, icon, visibility, handleClick, text, status);
 	}
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText) {
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText, Status status) {
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
 		this.text=ssb;
 		emojiHelper.setText(ssb);
 		this.icon=icon;
+		this.status=status;
 		this.handleClick=handleClick;
 		TypedValue outValue = new TypedValue();
 		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);

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

@@ -6,9 +6,9 @@ import android.graphics.drawable.LayerDrawable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+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.Status;
@@ -29,11 +29,13 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{
 	private final CharSequence parsedTitle;
 	private final CustomEmojiHelper emojiHelper;
 	private final Type type;
+	private final int attachmentCount;
 
 	public SpoilerStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, String title, Status statusForContent, Type type){
 		super(parentID, parentFragment);
 		this.status=statusForContent;
 		this.type=type;
+		this.attachmentCount=statusForContent.mediaAttachments.size();
 		if(TextUtils.isEmpty(title)){
 			parsedTitle=HtmlParser.parseCustomEmoji(statusForContent.spoilerText, statusForContent.emojis);
 			emojiHelper=new CustomEmojiHelper();
@@ -62,12 +64,14 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<SpoilerStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView title, action;
 		private final View button;
+		private final ImageView mediaIcon;
 
 		public Holder(Context context, ViewGroup parent, Type type){
 			super(context, R.layout.display_item_spoiler, parent);
 			title=findViewById(R.id.spoiler_title);
 			action=findViewById(R.id.spoiler_action);
 			button=findViewById(R.id.spoiler_button);
+			mediaIcon=findViewById(R.id.media_icon);
 
 			button.setOutlineProvider(OutlineProviders.roundedRect(8));
 			button.setClipToOutline(true);
@@ -94,6 +98,10 @@ public class SpoilerStatusDisplayItem extends StatusDisplayItem{
 					itemView.getPaddingRight(),
 					item.inset ? itemView.getPaddingTop() : 0
 			);
+			mediaIcon.setVisibility(item.attachmentCount > 0 ? View.VISIBLE : View.GONE);
+			mediaIcon.setImageResource(item.attachmentCount > 1
+					? R.drawable.ic_fluent_image_multiple_24_regular
+					: R.drawable.ic_fluent_image_24_regular);
 		}
 
 		@Override

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

@@ -1,5 +1,8 @@
 package org.joinmastodon.android.ui.displayitems;
 
+import static org.joinmastodon.android.api.session.AccountLocalPreferences.ShowEmojiReactions.ALWAYS;
+import static org.joinmastodon.android.api.session.AccountLocalPreferences.ShowEmojiReactions.ONLY_OPENED;
+
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
@@ -12,13 +15,13 @@ import android.view.ViewGroup;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountLocalPreferences;
 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.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
-import org.joinmastodon.android.fragments.ScheduledStatusListFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -51,7 +54,7 @@ import me.grishka.appkit.views.UsableRecyclerView;
 public abstract class StatusDisplayItem{
 	public final String parentID;
 	public final BaseStatusListFragment<?> parentFragment;
-	public boolean inset;
+	public boolean inset, insetPadding=true;
 	public int index;
 	public boolean
 			hasDescendantNeighbor = false,
@@ -121,19 +124,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 showReactions, boolean addFooter, boolean disableTranslate, FilterContext filterContext) {
-		int flags=0;
-		if(inset)
-			flags|=FLAG_INSET;
-		if(!addFooter)
-			flags|=FLAG_NO_FOOTER;
-		if (disableTranslate)
-			flags|=FLAG_NO_TRANSLATE;
-		if (!showReactions)
-			flags|=FLAG_NO_EMOJI_REACTIONS;
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, filterContext, flags);
-	}
-
 	public static ReblogOrReplyLineStatusDisplayItem buildReplyLine(BaseStatusListFragment<?> fragment, Status status, String accountID, DisplayItemsParent parent, Account account, boolean threadReply) {
 		String parentID = parent.getID();
 		String text = threadReply ? fragment.getString(R.string.sk_show_thread)
@@ -145,7 +135,7 @@ public abstract class StatusDisplayItem{
 				: fragment.getString(R.string.in_reply_to, account.displayName);
 		return new ReblogOrReplyLineStatusDisplayItem(
 				parentID, fragment, text, account == null ? List.of() : account.emojis,
-				R.drawable.ic_fluent_arrow_reply_20sp_filled, null, null, fullText
+				R.drawable.ic_fluent_arrow_reply_20sp_filled, null, null, fullText, status
 		);
 	}
 
@@ -177,7 +167,7 @@ public abstract class StatusDisplayItem{
 				items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, text, status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20sp_filled, isOwnPost ? status.visibility : null, i->{
 					args.putParcelable("profileAccount", Parcels.wrap(status.account));
 					Nav.go(fragment.getActivity(), ProfileFragment.class, args);
-				}, fullText));
+				}, fullText, status));
 			} else if (!(status.tags.isEmpty() ||
 					fragment instanceof HashtagTimelineFragment ||
 					fragment instanceof ListTimelineFragment
@@ -193,7 +183,7 @@ public abstract class StatusDisplayItem{
 								i -> {
 									args.putString("hashtag", hashtag.name);
 									Nav.go(fragment.getActivity(), HashtagTimelineFragment.class, args);
-								}
+								}, status
 						)));
 			}
 
@@ -227,7 +217,7 @@ public abstract class StatusDisplayItem{
 		}
 
 		ArrayList<StatusDisplayItem> contentItems;
-		if(!TextUtils.isEmpty(statusForContent.spoilerText)){
+		if(statusForContent.hasSpoiler()){
 			if (AccountSessionManager.get(accountID).getLocalPreferences().revealCWs) statusForContent.spoilerRevealed = true;
 			SpoilerStatusDisplayItem spoilerItem=new SpoilerStatusDisplayItem(parentID, fragment, null, statusForContent, Type.SPOILER);
 			items.add(spoilerItem);
@@ -291,10 +281,12 @@ public abstract class StatusDisplayItem{
 		if(contentItems!=items && statusForContent.spoilerRevealed){
 			items.addAll(contentItems);
 		}
-		if((flags & FLAG_NO_EMOJI_REACTIONS)==0
-				&& AccountSessionManager.get(accountID).getLocalPreferences().emojiReactionsEnabled){
+		AccountLocalPreferences lp=fragment.getLocalPrefs();
+		if((flags & FLAG_NO_EMOJI_REACTIONS)==0 && lp.emojiReactionsEnabled &&
+				(lp.showEmojiReactions!=ONLY_OPENED || fragment instanceof ThreadFragment)){
 			boolean isMainStatus=fragment instanceof ThreadFragment t && t.getMainStatus().id.equals(statusForContent.id);
-			items.add(new EmojiReactionsStatusDisplayItem(parentID, fragment, statusForContent, accountID, !isMainStatus, false));
+			boolean showAddButton=lp.showEmojiReactions==ALWAYS || isMainStatus;
+			items.add(new EmojiReactionsStatusDisplayItem(parentID, fragment, statusForContent, accountID, !showAddButton, false));
 		}
 		FooterStatusDisplayItem footer=null;
 		if((flags & FLAG_NO_FOOTER)==0){
@@ -302,12 +294,12 @@ public abstract class StatusDisplayItem{
 			footer.hideCounts=hideCounts;
 			items.add(footer);
 			if(status.hasGapAfter && !(fragment instanceof ThreadFragment))
-				items.add(new GapStatusDisplayItem(parentID, fragment));
+				items.add(new GapStatusDisplayItem(parentID, fragment, status));
 		}
 		int i=1;
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
-		if(inset || footer==null){
+		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
 			items.add(new DummyStatusDisplayItem(parentID, fragment));
 			// in case we ever need the dummy to display a margin for the media grid again:
 			// (i forgot why we apparently don't need this anymore)
@@ -389,6 +381,35 @@ public abstract class StatusDisplayItem{
 			item.parentFragment.onItemClick(item.parentID);
 		}
 
+		public Optional<StatusDisplayItem> getNextVisibleDisplayItem(){
+			Optional<StatusDisplayItem> next=getNextDisplayItem();
+			for(int offset=1; next.isPresent(); next=getDisplayItemOffset(++offset)){
+				if(!next.map(n->
+						(n instanceof EmojiReactionsStatusDisplayItem e && e.isHidden()) ||
+						(n instanceof DummyStatusDisplayItem)
+				).orElse(false)) return next;
+			}
+			return Optional.empty();
+		}
+
+		public Optional<StatusDisplayItem> getNextDisplayItem(){
+			return getDisplayItemOffset(1);
+		}
+
+		public Optional<StatusDisplayItem> getDisplayItemOffset(int offset){
+			int nextPos=getAbsoluteAdapterPosition() + offset;
+			List<StatusDisplayItem> displayItems=item.parentFragment.getDisplayItems();
+			return displayItems.size() > nextPos
+					? Optional.of(displayItems.get(nextPos))
+					: Optional.empty();
+		}
+
+		public boolean isLastDisplayItemForStatus(){
+			return getNextVisibleDisplayItem()
+					.map(n->!n.parentID.equals(item.parentID))
+					.orElse(true);
+		}
+
 		@Override
 		public boolean isEnabled(){
 			return item.parentFragment.isItemEnabled(item.parentID);

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

@@ -32,8 +32,6 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.utils.StatusTextEncoder;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
@@ -196,24 +194,12 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 			readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
 
-			// remove additional padding when (transparently padded) translate button is visible
-			int nextPos=getAbsoluteAdapterPosition() + 1;
-			int bottomPadding=V.dp(12);
-			List<StatusDisplayItem> displayItems=item.parentFragment.getDisplayItems();
-			if(displayItems.size() > nextPos){
-				StatusDisplayItem next=displayItems.get(nextPos);
-				if(next instanceof EmojiReactionsStatusDisplayItem e && e.isHidden()){
-					next=displayItems.size() > ++nextPos ? displayItems.get(nextPos) : null;
-				}
-
-				if(next instanceof FooterStatusDisplayItem){
-					bottomPadding=V.dp(6);
-					// why does java code always end up looking like this
-				} else if((!item.inset && next instanceof DummyStatusDisplayItem) ||
-						next instanceof EmojiReactionsStatusDisplayItem e && !e.isHidden()){
-					bottomPadding=0;
-				}
-			}
+			StatusDisplayItem next=getNextVisibleDisplayItem().orElse(null);
+			if(next!=null && !next.parentID.equals(item.parentID)) next=null;
+			int bottomPadding=next instanceof FooterStatusDisplayItem ? V.dp(6)
+					: item.inset ? V.dp(12)
+					: (next instanceof EmojiReactionsStatusDisplayItem || next==null) ? 0
+					: V.dp(12);
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), bottomPadding);
 
 			if (!GlobalUserPreferences.collapseLongPosts) {

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

@@ -23,9 +23,9 @@ import me.grishka.appkit.utils.V;
 public class SawtoothTearDrawable extends Drawable{
 	private final Paint topPaint, bottomPaint;
 
-	private static final int TOP_SAWTOOTH_HEIGHT=5;
-	private static final int BOTTOM_SAWTOOTH_HEIGHT=3;
-	private static final int STROKE_WIDTH=2;
+	private static final int TOP_SAWTOOTH_HEIGHT=4;
+	private static final int BOTTOM_SAWTOOTH_HEIGHT=4;
+	private static final int STROKE_WIDTH=1;
 	private static final int SAWTOOTH_PERIOD=14;
 
 	public SawtoothTearDrawable(Context context){

mastodon/src/main/java/org/joinmastodon/android/ui/tabs/TabLayout.java

@@ -1715,7 +1715,9 @@ public class TabLayout extends HorizontalScrollView implements CustomViewHelper{
                 child.getLayoutParams().height);
 
         int childWidthMeasureSpec =
-            MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.EXACTLY);
+            MeasureSpec.makeMeasureSpec(
+					getMeasuredWidth() - getPaddingLeft() - getPaddingRight(),
+					MeasureSpec.EXACTLY);
         child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
       }
     }

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

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.util.EnumSet;
 
@@ -44,7 +45,7 @@ public class DiscoverInfoBannerHelper{
 			banner=((Activity)list.getContext()).getLayoutInflater().inflate(R.layout.discover_info_banner, list, false);
 			TextView text=banner.findViewById(R.id.banner_text);
 			text.setText(switch(type){
-				case TRENDING_POSTS -> list.getResources().getString(R.string.trending_posts_info_banner);
+				case TRENDING_POSTS -> list.getResources().getString(R.string.sk_trending_posts_info_banner);
 				case TRENDING_LINKS -> list.getResources().getString(R.string.trending_links_info_banner);
 				case FEDERATED_TIMELINE -> list.getResources().getString(R.string.sk_federated_timeline_info_banner);
 				case POST_NOTIFICATIONS -> list.getResources().getString(R.string.sk_notify_posts_info_banner);
@@ -57,8 +58,10 @@ public class DiscoverInfoBannerHelper{
 				case TRENDING_POSTS -> R.drawable.ic_fluent_arrow_trending_24_regular;
 				case TRENDING_LINKS -> R.drawable.ic_fluent_news_24_regular;
 				case ACCOUNTS -> R.drawable.ic_fluent_people_add_24_regular;
-				// no icon because those are displayed as timelines - with icon in top left
-				case LOCAL_TIMELINE, FEDERATED_TIMELINE, BUBBLE_TIMELINE, POST_NOTIFICATIONS -> 0;
+				case LOCAL_TIMELINE -> TimelineDefinition.LOCAL_TIMELINE.getDefaultIcon().iconRes;
+				case FEDERATED_TIMELINE -> TimelineDefinition.FEDERATED_TIMELINE.getDefaultIcon().iconRes;
+				case BUBBLE_TIMELINE -> TimelineDefinition.BUBBLE_TIMELINE.getDefaultIcon().iconRes;
+				case POST_NOTIFICATIONS -> TimelineDefinition.POSTS_TIMELINE.getDefaultIcon().iconRes;
 			});
 			adapter.addAdapter(new SingleViewRecyclerAdapter(banner));
 		}

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

@@ -8,8 +8,6 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-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;
@@ -89,10 +87,10 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
 					pad=V.dp(16);
 //				else
 //					pad=V.dp(12);
-				boolean insetLeft=true, insetRight=true;
-				if(insetLeft)
+				boolean insetPadding=((StatusDisplayItem.Holder<?>) holder).getItem().insetPadding;
+				if(insetPadding)
 					outRect.left=pad;
-				if(insetRight)
+				if(insetPadding)
 					outRect.right=pad;
 
 				// had to comment this out because animations with offsets aren't handled properly.

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

@@ -54,6 +54,8 @@ import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
 import android.webkit.MimeTypeMap;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -96,7 +98,6 @@ import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
-import org.joinmastodon.android.fragments.settings.SettingsServerAboutFragment;
 import org.joinmastodon.android.fragments.settings.SettingsServerFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
@@ -173,6 +174,19 @@ public class UiUtils {
 	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT);
 	public static int MAX_WIDTH, SCROLL_TO_TOP_DELTA;
 
+	public static final float ALPHA_PRESSED=0.55f;
+	public static final Animation opacityOut, opacityIn;
+
+	static {
+		opacityOut = new AlphaAnimation(1, ALPHA_PRESSED);
+		opacityOut.setDuration(300);
+		opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		opacityOut.setFillAfter(true);
+		opacityIn = new AlphaAnimation(ALPHA_PRESSED, 1);
+		opacityIn.setDuration(400);
+		opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
+	}
+
 	private UiUtils() {
 	}
 
@@ -192,28 +206,33 @@ public class UiUtils {
 	}
 
 	public static String formatRelativeTimestamp(Context context, Instant instant) {
-		long t = instant.toEpochMilli();
-		long now = System.currentTimeMillis();
+		return formatPeriodBetween(context, instant, null);
+	}
+
+	public static String formatPeriodBetween(Context context, Instant since, Instant until) {
+		boolean ago = until == null;
+		long t = since.toEpochMilli();
+		long now = ago ? System.currentTimeMillis() : until.toEpochMilli();
 		long diff = now - t;
 		if(diff<1000L){
 			return context.getString(R.string.time_now);
 		}else if(diff<60_000L){
-			return context.getString(R.string.time_seconds_ago_short, diff/1000L);
+			return context.getString(ago ? R.string.time_seconds_ago_short : R.string.sk_time_seconds, diff/1000L);
 		}else if(diff<3600_000L){
-			return context.getString(R.string.time_minutes_ago_short, diff/60_000L);
+			return context.getString(ago ? R.string.time_minutes_ago_short : R.string.sk_time_minutes, diff/60_000L);
 		}else if(diff<3600_000L*24L){
-			return context.getString(R.string.time_hours_ago_short, diff/3600_000L);
+			return context.getString(ago ? R.string.time_hours_ago_short : R.string.sk_time_hours, diff/3600_000L);
 		} else {
 			int days = (int) (diff / (3600_000L * 24L));
-			if (days > 30) {
-				ZonedDateTime dt = instant.atZone(ZoneId.systemDefault());
+			if (ago && days > 30) {
+				ZonedDateTime dt = since.atZone(ZoneId.systemDefault());
 				if (dt.getYear() == ZonedDateTime.now().getYear()) {
 					return DATE_FORMATTER_SHORT.format(dt);
 				} else {
 					return DATE_FORMATTER_SHORT_WITH_YEAR.format(dt);
 				}
 			}
-			return context.getString(R.string.time_days_ago_short, days);
+			return context.getString(ago ? R.string.time_days_ago_short : R.string.sk_time_days, days);
 		}
 	}
 
@@ -747,9 +766,6 @@ public class UiUtils {
 		if(relationship.blocking){
 			button.setText(R.string.button_blocked);
 			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal_Error;
-		}else if(relationship.blockedBy){
-			button.setText(R.string.button_follow);
-			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
 		}else if(relationship.requested){
 			button.setText(R.string.button_follow_pending);
 			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
@@ -761,7 +777,6 @@ public class UiUtils {
 			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
 		}
 
-		button.setEnabled(!relationship.blockedBy);
 		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
 		button.setBackground(ta.getDrawable(0));
 		ta.recycle();
@@ -1073,8 +1088,8 @@ public class UiUtils {
 		return back;
 	}
 
-	public static boolean setExtraTextInfo(Context ctx, TextView extraText, TextView pronouns, boolean displayPronouns, boolean mentionedOnly, boolean localOnly, @Nullable Account account) {
-		List<String> extraParts = new ArrayList<>();
+	public static boolean setExtraTextInfo(Context ctx, @Nullable TextView extraText, @Nullable TextView pronouns, boolean displayPronouns, boolean mentionedOnly, boolean localOnly, @Nullable Account account) {
+		List<String> extraParts = extraText!=null && (localOnly || mentionedOnly) ? new ArrayList<>() : null;
 		Optional<String> p=pronouns==null || !displayPronouns ? Optional.empty() : extractPronouns(ctx, account);
 		if(p.isPresent()) {
 			HtmlParser.setTextWithCustomEmoji(pronouns, p.get(), account.emojis);
@@ -1086,7 +1101,7 @@ public class UiUtils {
 			extraParts.add(ctx.getString(R.string.sk_inline_local_only));
 		if(mentionedOnly)
 			extraParts.add(ctx.getString(R.string.sk_inline_direct));
-		if(!extraParts.isEmpty()) {
+		if(extraText!=null && extraParts!=null && !extraParts.isEmpty()) {
 			String sepp = ctx.getString(R.string.sk_separator);
 			String text = String.join(" " + sepp + " ", extraParts);
 			if(account == null) extraText.setText(text);
@@ -1094,7 +1109,7 @@ public class UiUtils {
 			extraText.setVisibility(View.VISIBLE);
 			return true;
 		}else{
-			extraText.setVisibility(View.GONE);
+			if(extraText!=null) extraText.setVisibility(View.GONE);
 			return false;
 		}
 	}

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

@@ -27,10 +27,14 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.ProgressListener;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetAttachmentByID;
 import org.joinmastodon.android.api.requests.statuses.UpdateAttachment;
 import org.joinmastodon.android.api.requests.statuses.UploadAttachment;
@@ -47,8 +51,11 @@ import org.parceler.Parcel;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -550,6 +557,14 @@ public class ComposeMediaViewController{
 	public List<String> getAttachmentIDs(){
 		return attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 	}
+
+	public List<CreateStatus.Request.MediaAttribute> getAttachmentAttributes(){
+		List<CreateStatus.Request.MediaAttribute> mediaAttributes = new ArrayList<>();
+		for (DraftMediaAttachment att:attachments){
+			 mediaAttributes.add(new CreateStatus.Request.MediaAttribute(att.serverAttachment.id, att.description, null));
+		}
+		return mediaAttributes;
+	}
 	
 	public boolean isEmpty(){
 		return attachments.isEmpty();
@@ -592,7 +607,7 @@ public class ComposeMediaViewController{
 	public void saveAltTextsBeforePublishing(Runnable onSuccess, Consumer<ErrorResponse> onError){
 		ArrayList<UpdateAttachment> updateAltTextRequests=new ArrayList<>();
 		for(DraftMediaAttachment att:attachments){
-			if(!att.descriptionSaved){
+			if(!att.descriptionSaved && (fragment.editingStatus==null || !fragment.editingStatus.mediaAttachments.contains(att.serverAttachment))){
 				UpdateAttachment req=new UpdateAttachment(att.serverAttachment.id, att.description);
 				req.setCallback(new Callback<>(){
 							@Override

mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java

@@ -213,6 +213,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		Account account=item.account;
 
 		menu.findItem(R.id.share).setTitle(fragment.getString(R.string.share_user, account.getDisplayUsername()));
+		menu.findItem(R.id.manage_user_lists).setTitle(fragment.getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		menu.findItem(R.id.mute).setTitle(fragment.getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(fragment.getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(fragment.getString(R.string.report_user, account.getDisplayUsername()));

mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/ListItemViewHolder.java

@@ -40,11 +40,9 @@ public abstract class ListItemViewHolder<T extends ListItem<?>> extends Bindable
 
 		if(TextUtils.isEmpty(item.subtitle) && item.subtitleRes==0){
 			subtitle.setVisibility(View.GONE);
-			title.setMaxLines(2);
 			view.setMinimumHeight(V.dp(56));
 		}else{
 			subtitle.setVisibility(View.VISIBLE);
-			title.setMaxLines(1);
 			view.setMinimumHeight(V.dp(72));
 			if(TextUtils.isEmpty(item.subtitle))
 				subtitle.setText(item.subtitleRes);

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_enabled="true">
 		<ripple android:color="@color/m3_on_secondary_container_overlay">
-			<item>
+			<item android:gravity="center_vertical" android:height="40dp">
 				<shape>
 					<solid android:color="?colorM3ErrorContainer"/>
 					<corners android:radius="20dp"/>
@@ -11,9 +11,13 @@
 		</ripple>
 	</item>
 	<item>
-		<shape>
-			<solid android:color="?colorM3DisabledBackground"/>
-			<corners android:radius="20dp"/>
-		</shape>
+		<layer-list>
+			<item android:gravity="center_vertical" android:height="40dp">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</layer-list>
 	</item>
 </selector>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<color android:color="?colorM3Surface"/>
+	</item>
+	<item>
+		<shape android:tint="?colorM3Primary">
+			<solid android:color="?colorFilledCardAlpha"/>
+		</shape>
+	</item>
+	<item>
+		<ripple android:color="@color/m3_on_surface_variant_overlay">
+			<item android:id="@android:id/mask">
+				<shape>
+					<solid android:color="#000"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+</layer-list>

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

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

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:left="-1dp" android:right="-1dp">
+		<shape android:shape="rectangle">
+			<solid android:color="?colorM3Surface" />
+			<stroke android:color="?colorM3OutlineVariant" android:width="1dp" />
+		</shape>
+	</item>
+</layer-list>

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

@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12,1.996C16.05,1.996 19.357,5.191 19.496,9.245L19.5,9.496V13.593L20.88,16.749C20.949,16.907 20.985,17.077 20.985,17.25C20.985,17.94 20.425,18.5 19.735,18.5L15,18.501C15,20.158 13.657,21.501 12,21.501C10.402,21.501 9.096,20.252 9.005,18.678L9,18.499L4.275,18.5C4.104,18.5 3.934,18.465 3.777,18.396C3.144,18.121 2.853,17.385 3.128,16.752L4.5,13.594V9.496C4.501,5.341 7.852,1.996 12,1.996ZM13.5,18.499L10.5,18.501C10.5,19.33 11.172,20.001 12,20.001C12.78,20.001 13.421,19.406 13.493,18.646L13.5,18.499ZM12,3.496C8.68,3.496 6.001,6.17 6,9.496V13.906L4.656,17H19.353L18,13.907L18,9.509L17.997,9.284C17.885,6.05 15.242,3.496 12,3.496Z"
-      android:fillColor="#212121"/>
+	  android:fillColor="@color/fluent_default_icon_tint"/>
   <path
       android:pathData="M8.083,9.969A0.508,0.508 0,0 0,8.807 10.682L11.494,7.955L11.494,14.897a0.508,0.508 0,1 0,1.016 0L12.509,7.958L15.193,10.682A0.508,0.508 45,0 0,15.917 9.969L12.452,6.453a0.635,0.635 0,0 0,-0.904 0z"
-      android:fillColor="#212121"/>
+	  android:fillColor="@color/fluent_default_icon_tint"/>
 </vector>

mastodon/src/main/res/drawable/ic_fluent_arrow_maximize_vertical_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="M13.72 5.78c0.293 0.293 0.767 0.293 1.06 0 0.293-0.293 0.293-0.767 0-1.06l-2.5-2.5c-0.293-0.293-0.767-0.293-1.06 0l-2.5 2.5c-0.293 0.293-0.293 0.767 0 1.06 0.293 0.293 0.767 0.293 1.06 0L11 4.56v4.19c0 0.414 0.336 0.75 0.75 0.75s0.75-0.336 0.75-0.75V4.56l1.22 1.22zM4 11.75C4 11.336 4.336 11 4.75 11h14.5c0.414 0 0.75 0.336 0.75 0.75s-0.336 0.75-0.75 0.75H4.75C4.336 12.5 4 12.164 4 11.75zm8.5 3c0-0.414-0.336-0.75-0.75-0.75S11 14.336 11 14.75v4.69l-1.22-1.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l2.5 2.5c0.293 0.293 0.767 0.293 1.06 0l2.5-2.5c0.293-0.293 0.293-0.767 0-1.06-0.293-0.293-0.767-0.293-1.06 0l-1.22 1.22v-4.69z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M14.69 11.503c1 0 1.81 0.81 1.81 1.81v0.689h-0.005c-0.034 0.78-0.248 1.757-1.123 2.555C14.416 17.43 12.765 18 10 18c-2.766 0-4.416-0.57-5.372-1.443-0.875-0.798-1.089-1.776-1.123-2.555H3.5v-0.69c0-0.999 0.81-1.809 1.81-1.809h9.38zM6.5 3C5.672 3 5 3.672 5 4.5v4C5 9.328 5.672 10 6.5 10h7c0.828 0 1.5-0.672 1.5-1.5v-4C15 3.672 14.328 3 13.5 3h-3V2.5C10.5 2.191 10.276 2 10 2S9.5 2.23 9.5 2.5V3h-3zM7 6.5c0-0.552 0.448-1 1-1s1 0.448 1 1-0.448 1-1 1-1-0.448-1-1zm4 0c0-0.552 0.448-1 1-1s1 0.448 1 1-0.448 1-1 1-1-0.448-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M8.46 1.897l0.99 0.39c0.353 0.138 0.746 0.138 1.099 0l0.99-0.39c1.21-0.477 2.582 0.091 3.102 1.285l0.424 0.975c0.151 0.348 0.429 0.626 0.777 0.777l0.975 0.424c1.194 0.52 1.762 1.891 1.285 3.103l-0.39 0.99c-0.139 0.352-0.139 0.745 0 1.098l0.39 0.99c0.477 1.21-0.091 2.582-1.285 3.102l-0.975 0.424c-0.348 0.151-0.626 0.429-0.777 0.777l-0.424 0.975c-0.52 1.194-1.891 1.762-3.103 1.285l-0.99-0.39c-0.352-0.139-0.745-0.139-1.098 0l-0.99 0.39c-1.21 0.477-2.582-0.091-3.102-1.285l-0.424-0.975c-0.151-0.348-0.429-0.626-0.777-0.777l-0.975-0.424c-1.194-0.52-1.762-1.891-1.285-3.103l0.39-0.99c0.138-0.352 0.138-0.745 0-1.098l-0.39-0.99C1.42 7.25 1.988 5.878 3.182 5.358l0.975-0.424c0.348-0.151 0.626-0.429 0.777-0.777l0.424-0.975C5.878 1.988 7.25 1.42 8.461 1.897zm3.445 0.93l-0.99 0.39c-0.588 0.232-1.243 0.232-1.831 0l-0.99-0.39C7.384 2.549 6.58 2.881 6.275 3.582L5.851 4.556C5.599 5.136 5.136 5.6 4.556 5.851L3.581 6.275c-0.7 0.305-1.033 1.109-0.753 1.82l0.389 0.989c0.232 0.588 0.232 1.243 0 1.831l-0.39 0.99c-0.279 0.71 0.054 1.514 0.754 1.819l0.975 0.424c0.58 0.252 1.043 0.715 1.295 1.295l0.424 0.975c0.305 0.7 1.109 1.033 1.82 0.753l0.989-0.39c0.588-0.23 1.243-0.23 1.831 0l0.99 0.39c0.71 0.28 1.514-0.053 1.819-0.753l0.424-0.975c0.252-0.58 0.715-1.043 1.295-1.295l0.975-0.424c0.7-0.305 1.033-1.11 0.753-1.82l-0.39-0.989c-0.23-0.588-0.23-1.243 0-1.831l0.39-0.99c0.28-0.71-0.053-1.514-0.753-1.819l-0.975-0.424c-0.58-0.252-1.043-0.715-1.295-1.295l-0.424-0.975c-0.305-0.7-1.11-1.033-1.82-0.753zm-2.927 8.944l3.648-4.104c0.183-0.206 0.5-0.225 0.706-0.041 0.183 0.163 0.218 0.43 0.095 0.633l-0.054 0.073-4 4.5c-0.17 0.19-0.451 0.22-0.655 0.081l-0.072-0.06-2-2c-0.195-0.195-0.195-0.512 0-0.707 0.173-0.174 0.443-0.193 0.638-0.058l0.069 0.058 1.625 1.625 3.648-4.104-3.648 4.104z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M15.794 8.733c0.286 0.3 0.274 0.774-0.026 1.06l-5.25 5.001c-0.29 0.276-0.745 0.276-1.035 0l-5.25-5c-0.3-0.287-0.312-0.761-0.026-1.061 0.286-0.3 0.76-0.312 1.06-0.026l4.734 4.508 4.733-4.508c0.3-0.286 0.774-0.274 1.06 0.026zm0-4c0.286 0.3 0.274 0.774-0.026 1.06l-5.25 5.001c-0.29 0.276-0.745 0.276-1.035 0l-5.25-5c-0.3-0.287-0.312-0.761-0.026-1.061 0.286-0.3 0.76-0.312 1.06-0.026l4.734 4.509 4.733-4.51c0.3-0.285 0.774-0.273 1.06 0.027z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M4.207 15.267c-0.286-0.3-0.274-0.774 0.026-1.06l5.25-5.002c0.29-0.275 0.745-0.275 1.034 0l5.25 5.002c0.3 0.286 0.312 0.76 0.026 1.06-0.286 0.3-0.76 0.312-1.06 0.026L10 10.784l-4.733 4.51c-0.3 0.285-0.774 0.273-1.06-0.027zm0-4.998c-0.286-0.3-0.274-0.775 0.026-1.06l5.25-5.002c0.29-0.276 0.745-0.276 1.034 0l5.25 5.001c0.3 0.286 0.312 0.76 0.026 1.06-0.286 0.3-0.76 0.312-1.06 0.026L10 5.786l-4.733 4.508c-0.3 0.286-0.774 0.275-1.06-0.025z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_image_multiple_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="M13.748 8.996c0.69 0 1.248-0.559 1.248-1.248 0-0.69-0.559-1.248-1.248-1.248-0.69 0-1.248 0.559-1.248 1.248 0 0.69 0.559 1.248 1.248 1.248zM6.25 3C4.455 3 3 4.455 3 6.25v9c0 1.795 1.455 3.25 3.25 3.25h9c1.795 0 3.25-1.455 3.25-3.25v-9C18.5 4.455 17.045 3 15.25 3h-9zM4.5 6.25c0-0.966 0.784-1.75 1.75-1.75h9C16.216 4.5 17 5.284 17 6.25v9c0 0.231-0.045 0.452-0.126 0.654l-4.587-4.291c-0.865-0.81-2.21-0.81-3.075 0l-4.586 4.29C4.545 15.701 4.5 15.481 4.5 15.25v-9zm6.762 6.458l4.505 4.214C15.604 16.972 15.43 17 15.25 17h-9c-0.18 0-0.354-0.027-0.518-0.078l4.505-4.214c0.289-0.27 0.737-0.27 1.025 0zM8.75 21c-1.15 0-2.162-0.598-2.74-1.5h9.74c2.071 0 3.75-1.679 3.75-3.75V6.011C20.402 6.59 21 7.6 21 8.751v7C21 18.65 18.65 21 15.75 21h-7z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-	<group android:translateX="-2" android:translateY="-1">
-		<path android:pathData="M10 2c1.657 0 3 1.343 3 3v1h1c1.105 0 2 0.895 2 2v7c0 1.105-0.895 2-2 2H6c-1.105 0-2-0.895-2-2V8c0-1.105 0.895-2 2-2h1V5c0-1.657 1.343-3 3-3zm0 8.5c-0.552 0-1 0.448-1 1s0.448 1 1 1 1-0.448 1-1-0.448-1-1-1zM10 4C9.448 4 9 4.448 9 5v1h2V5c0-0.552-0.448-1-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
-	</group>
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,19Q4.875,19 4.438,18.562Q4,18.125 4,17.5V9.5Q4,8.875 4.438,8.438Q4.875,8 5.5,8H6V6Q6,4.333 7.167,3.167Q8.333,2 10,2Q11.667,2 12.833,3.167Q14,4.333 14,6V8H14.5Q15.125,8 15.562,8.438Q16,8.875 16,9.5V17.5Q16,18.125 15.562,18.562Q15.125,19 14.5,19ZM7.5,8H12.5V6Q12.5,4.958 11.771,4.229Q11.042,3.5 10,3.5Q8.958,3.5 8.229,4.229Q7.5,4.958 7.5,6ZM10,15Q10.625,15 11.062,14.562Q11.5,14.125 11.5,13.5Q11.5,12.875 11.062,12.438Q10.625,12 10,12Q9.375,12 8.938,12.438Q8.5,12.875 8.5,13.5Q8.5,14.125 8.938,14.562Q9.375,15 10,15Z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<corners android:radius="26dp"/>
-	<stroke android:width="4dp" android:color="?colorM3Surface"/>
-</shape>

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

@@ -15,7 +15,7 @@
 		android:layout_width="32dp"
 		android:layout_height="32dp"
 		android:layout_marginEnd="16dp"
-		android:tint="?colorM3OnPrimaryContainer"
+		android:tint="?colorM3Primary"
 		android:scaleType="center"
 		android:importantForAccessibility="no"
 		tools:src="@drawable/ic_fluent_arrow_trending_24_regular"/>

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

@@ -9,17 +9,32 @@
 		android:layout_height="wrap_content"
 		android:orientation="horizontal">
 
-		<ImageButton
-			android:id="@+id/add_btn"
-			android:layout_width="wrap_content"
+		<FrameLayout
+			android:id="@+id/add_btn_wrap"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="2dp"
-			android:minHeight="48dp"
-			android:minWidth="48dp"
-			android:background="@drawable/bg_button_m3_tonal_circle"
-			android:tooltipText="@string/sk_button_react"
-			android:contentDescription="@string/sk_button_react"
-			android:src="@drawable/ic_fluent_add_24_filled" />
+			android:layout_width="wrap_content"
+			android:layout_marginStart="2dp">
+			<ProgressBar
+				android:id="@+id/progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone"/>
+			<ImageButton
+				android:id="@+id/add_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:minHeight="48dp"
+				android:minWidth="48dp"
+				android:background="@drawable/bg_button_m3_tonal_circle"
+				android:tooltipText="@string/sk_button_react"
+				android:contentDescription="@string/sk_button_react"
+				android:src="@drawable/ic_fluent_add_24_filled" />
+		</FrameLayout>
 
 		<org.joinmastodon.android.ui.views.EmojiReactionsRecyclerView
 			android:id="@+id/list"
@@ -28,6 +43,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="-4dp"
 			android:paddingStart="8dp"
+			android:paddingEnd="3dp"
 			android:clipToPadding="false"
 			android:requiresFadingEdge="horizontal"
 			android:fadingEdgeLength="24dp" />

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

@@ -1,24 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="75dp"
-	android:background="@drawable/bg_timeline_gap">
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:background="@drawable/bg_timeline_gap_border">
 
-	<TextView
-		android:id="@+id/text"
+	<FrameLayout
+		android:id="@+id/top"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="center_vertical"
-		android:gravity="center_horizontal"
-		android:textAppearance="@style/m3_body_large"
-		android:textColor="?android:textColorSecondary"
-		android:text="@string/load_missing_posts"/>
+		android:layout_marginBottom="4dp"
+		android:background="?android:selectableItemBackground">
 
-	<ProgressBar
-		android:id="@+id/progress"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:layout_gravity="center"
-		android:visibility="gone"/>
+		<ProgressBar
+			android:id="@+id/progress_top"
+			android:layout_width="24dp"
+			android:layout_height="24dp"
+			android:layout_gravity="center"
+			android:visibility="gone"/>
 
-</FrameLayout>
+		<TextView
+			android:id="@+id/text_top"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:paddingHorizontal="16dp"
+			android:paddingTop="24dp"
+			android:paddingBottom="20dp"
+			android:drawablePadding="16dp"
+			android:drawableEnd="@drawable/ic_fluent_chevron_double_down_20_filled"
+			android:textAppearance="@style/m3_title_medium"
+			android:textColor="?android:textColorSecondary"
+			android:text="@string/sk_load_missing_posts_below"/>
+
+	</FrameLayout>
+
+	<TextView
+		android:id="@+id/gap"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="20dp"
+		android:gravity="center"
+		android:textStyle="italic"
+		android:textColor="?colorM3Primary"
+		android:textAppearance="@style/m3_label_large"
+		android:background="@drawable/bg_timeline_gap"/>
+
+	<FrameLayout
+		android:id="@+id/bottom"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="4dp"
+		android:background="?android:selectableItemBackground">
+
+		<ProgressBar
+			android:id="@+id/progress_bottom"
+			android:layout_width="24dp"
+			android:layout_height="24dp"
+			android:layout_gravity="center"
+			android:visibility="gone"/>
+
+		<TextView
+			android:id="@+id/text_bottom"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:paddingHorizontal="16dp"
+			android:paddingTop="20dp"
+			android:paddingBottom="24dp"
+			android:drawablePadding="16dp"
+			android:drawableEnd="@drawable/ic_fluent_chevron_double_up_20_filled"
+			android:textAppearance="@style/m3_title_medium"
+			android:textColor="?android:textColorSecondary"
+			android:text="@string/sk_load_missing_posts_above"/>
+
+	</FrameLayout>
+
+</LinearLayout>

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

@@ -152,20 +152,62 @@
 
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
 
-	<TextView
-		android:id="@+id/time_and_username"
+	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:id="@+id/time_and_username"
 		android:layout_alignBottom="@id/avatar"
 		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/buttons"
 		android:layout_toEndOf="@id/avatar"
-		android:layout_marginBottom="3sp"
-		android:textAlignment="viewStart"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:textAppearance="@style/m3_body_medium"
-		android:textColor="?colorM3OnSurfaceVariant"
-		tools:text="9h ago · \@Gargron@mastodon.social"/>
+		android:layout_marginBottom="3sp">
+
+		<TextView
+			android:id="@+id/username"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAlignment="viewStart"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="\@Gargron@mastodon.social"/>
+
+		<ImageView
+			android:id="@+id/bot_icon"
+			android:layout_width="16sp"
+			android:layout_height="16sp"
+			android:layout_marginStart="4sp"
+			android:layout_gravity="center_vertical"
+			android:visibility="gone"
+			android:importantForAccessibility="no"
+			android:contentDescription="@string/sk_icon_bot"
+			android:src="@drawable/ic_fluent_bot_20_filled" />
+
+		<TextView
+			android:id="@+id/separator"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="4sp"
+			android:textAlignment="viewStart"
+			android:importantForAccessibility="no"
+			android:singleLine="true"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			android:text="@string/sk_separator"/>
+
+
+		<TextView
+			android:id="@+id/time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAlignment="viewStart"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:textAppearance="@style/m3_body_medium"
+			android:textColor="?colorM3OnSurfaceVariant"
+			tools:text="9h ago"/>
+
+	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
 
 </RelativeLayout>

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

@@ -8,83 +8,33 @@
 	android:paddingLeft="16dp"
 	android:clipToPadding="false">
 
-	<View
-		android:id="@+id/checkbox"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:layout_marginStart="-4dp"
-		android:layout_marginTop="-8dp"
-		android:layout_marginEnd="12dp"
-		android:duplicateParentState="true"/>
+	<FrameLayout
+		android:id="@+id/checkbox_wrap"
+		android:layout_width="wrap_content"
+		android:layout_height="46sp"
+		android:duplicateParentState="true">
 
-	<ImageView
-		android:id="@+id/more"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentEnd="true"
-		android:layout_marginTop="-2dp"
-		android:layout_marginEnd="-2dp"
-		android:background="?android:selectableItemBackgroundBorderless"
-		android:scaleType="center"
-		android:tint="?colorM3OnSurfaceVariant"
-		android:contentDescription="@string/more_options"
-		android:src="@drawable/ic_fluent_more_vertical_20_filled" />
+		<View
+			android:id="@+id/checkbox"
+			android:layout_gravity="center_vertical"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:layout_marginStart="-4dp"
+			android:layout_marginTop="0dp"
+			android:layout_marginEnd="12dp"
+			android:duplicateParentState="true"/>
 
-	<ImageView
-		android:id="@+id/avatar"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
-		android:layout_alignParentTop="true"
-		android:layout_toEndOf="@id/checkbox"
-		android:layout_marginTop="2dp"
-		android:layout_marginEnd="8dp" />
+	</FrameLayout>
 
-	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
-		android:id="@+id/name_wrap"
+	<FrameLayout
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_toStartOf="@id/more"
-		android:layout_marginEnd="8dp">
+		android:layout_height="wrap_content"
+		android:layout_marginTop="-16dp"
+		android:layout_marginStart="-16dp"
+		android:layout_toEndOf="@id/checkbox_wrap">
 
-		<TextView
-			android:id="@+id/name"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:textColor="?colorM3OnSurface"
-			android:gravity="start|center_vertical"
-			tools:text="Eugen" />
+		<include layout="@layout/display_item_header" />
 
-		<TextView
-			android:id="@+id/extra_text"
-			android:layout_width="wrap_content"
-			android:layout_height="24dp"
-			android:layout_marginStart="8dp"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:fontFamily="sans-serif"
-			android:textAlignment="viewStart"
-			android:textColor="?colorM3OnSurface"
-			tools:text="boosted your cat picture" />
-
-	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
-
-	<TextView
-		android:id="@+id/time_and_username"
-		android:layout_width="match_parent"
-		android:layout_height="20dp"
-		android:layout_below="@id/name_wrap"
-		android:layout_toEndOf="@id/avatar"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:textAppearance="@style/m3_title_small"
-		android:gravity="center_vertical"
-		android:textColor="?colorM3OnSurfaceVariant"
-		tools:text="9h ago · \@Gargron@mastodon.social"/>
+	</FrameLayout>
 
 </org.joinmastodon.android.ui.views.CheckableRelativeLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:orientation="horizontal"
 	android:layout_width="match_parent"
@@ -8,7 +8,7 @@
 	android:paddingTop="16dp"
 	android:paddingRight="16dp">
 
-	<LinearLayout
+	<RelativeLayout
 		android:id="@+id/spoiler_button"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -18,12 +18,27 @@
 		android:paddingTop="8dp"
 		android:paddingRight="12dp"
 		android:paddingBottom="8dp">
-		
+
+		<ImageView
+			android:id="@+id/media_icon"
+			android:layout_width="28dp"
+			android:layout_height="28dp"
+			android:layout_marginHorizontal="8dp"
+			android:layout_centerVertical="true"
+			android:layout_alignParentEnd="true"
+			android:scaleType="center"
+			android:contentDescription="@string/sk_post_contains_media"
+			android:src="@drawable/ic_fluent_image_24_regular"
+			android:tint="?colorM3OnSecondaryContainer" />
+
 		<TextView
 			android:id="@+id/spoiler_title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="4dp"
+			android:layout_alignParentStart="true"
+			android:layout_alignParentTop="true"
+			android:layout_toStartOf="@id/media_icon"
 			android:textAppearance="@style/m3_body_large"
 			android:textColor="?colorM3OnSecondaryContainer"
 			tools:text="Spoilery stuff"/>
@@ -32,21 +47,14 @@
 			android:id="@+id/spoiler_action"
 			android:layout_width="match_parent"
 			android:layout_height="20dp"
+			android:layout_below="@id/spoiler_title"
+			android:layout_toStartOf="@id/media_icon"
 			android:textAppearance="@style/m3_label_large"
 			android:singleLine="true"
 			android:gravity="center_vertical"
 			android:textColor="?colorM3Primary"
 			tools:text="Re-hide"/>
 
-	</LinearLayout>
+	</RelativeLayout>
 
-	<ImageView
-		android:id="@+id/media_icon"
-		android:layout_width="36dp"
-		android:layout_height="36dp"
-		android:background="?android:actionBarItemBackground"
-		android:scaleType="center"
-		android:src="@drawable/ic_fluent_image_24_regular"
-		android:tint="?android:textColorSecondary" />
-
-</LinearLayout>
+</FrameLayout>

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

@@ -45,6 +45,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:orientation="vertical">
+
 		<org.joinmastodon.android.ui.tabs.TabLayout
 			android:id="@+id/tabbar"
 			android:layout_width="match_parent"
@@ -56,6 +57,8 @@
 			app:tabIndicatorFullWidth="false"
 			app:tabMinWidth="90dp"
 			app:tabMode="scrollable"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
 			android:background="?colorM3Surface"/>
 
 		<View

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

@@ -62,8 +62,7 @@
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="12dp"
 						android:layout_marginTop="-44dp"
-						android:background="@drawable/profile_ava_bg"
-						android:outlineProvider="@null">
+						android:background="?colorM3Surface">
 
 						<ImageView
 							android:id="@+id/avatar"
@@ -168,17 +167,51 @@
 
 				</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
-				<TextView
-					android:id="@+id/username"
+				<LinearLayout
+					android:id="@+id/username_wrap"
+					android:orientation="horizontal"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginLeft="16dp"
-					android:paddingTop="2dp"
-					android:paddingBottom="8dp"
-					android:layout_marginRight="16dp"
-					android:textAppearance="@style/m3_title_small"
-					android:textColor="?colorM3OnSurfaceVariant"
-					tools:text="\@Gargron" />
+					android:layout_marginStart="16dp"
+					android:layout_marginEnd="12dp"
+					android:layout_marginTop="2dp"
+					android:layout_marginBottom="8dp">
+
+					<TextView
+						android:id="@+id/username"
+						android:layout_width="0dp"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:layout_marginEnd="4dp"
+						android:maxLines="1"
+						android:ellipsize="end"
+						android:textAppearance="@style/m3_title_small"
+						android:textColor="?colorM3OnSurfaceVariant"
+						tools:text="\@Gargron" />
+
+					<ImageView
+						android:id="@+id/lock_icon"
+						android:layout_width="18sp"
+						android:layout_height="18sp"
+						android:layout_marginEnd="4dp"
+						android:layout_gravity="center_vertical"
+						android:visibility="gone"
+						android:importantForAccessibility="no"
+						android:contentDescription="@string/manually_approves_followers"
+						android:src="@drawable/ic_fluent_lock_closed_20_filled" />
+
+					<ImageView
+						android:id="@+id/bot_icon"
+						android:layout_width="18sp"
+						android:layout_height="18sp"
+						android:layout_marginEnd="4dp"
+						android:layout_gravity="center_vertical"
+						android:visibility="gone"
+						android:importantForAccessibility="no"
+						android:contentDescription="@string/sk_icon_bot"
+						android:src="@drawable/ic_fluent_bot_20_filled" />
+
+				</LinearLayout>
 
 				<org.joinmastodon.android.ui.views.LinkedTextView
 					android:id="@+id/bio"
@@ -351,11 +384,12 @@
 					android:layout_width="match_parent"
 					android:layout_height="48dp"
 					android:background="@drawable/bg_onboarding_panel"
+					android:clipToPadding="false"
+					android:paddingHorizontal="4dp"
 					app:tabGravity="start"
 					app:tabIndicator="@drawable/tab_indicator_m3"
 					app:tabIndicatorAnimationMode="elastic"
 					app:tabIndicatorColor="?colorM3Primary"
-					android:paddingHorizontal="4dp"
 					app:tabIndicatorFullWidth="false"
 					app:tabMinWidth="0dp"
 					app:tabMode="scrollable" />

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

@@ -91,50 +91,6 @@
 
 			</RelativeLayout>
 
-			<LinearLayout
-				android:id="@+id/forward_report"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="16dp"
-				android:paddingHorizontal="8dp"
-				android:paddingVertical="8dp"
-				android:gravity="center_vertical"
-				android:layoutDirection="locale"
-				android:background="?android:selectableItemBackground">
-
-				<ImageView
-					android:id="@+id/icon"
-					android:layout_width="24dp"
-					android:layout_height="24dp"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="32dp"
-					android:importantForAccessibility="no"
-					android:tint="?android:textColorPrimary"
-					android:src="@drawable/ic_fluent_arrow_forward_24_regular"/>
-
-				<TextView
-					android:id="@+id/forward_report_text"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:paddingVertical="8dp"
-					android:textSize="16sp"
-					android:text="@string/sk_forward_report_to"
-					android:textColor="?android:textColorPrimary" />
-
-				<Switch
-					android:id="@+id/forward_report_switch"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:duplicateParentState="true"
-					android:layout_marginStart="16dp"
-					android:layout_marginEnd="12dp"
-					android:focusable="false"
-					android:clickable="false"/>
-
-			</LinearLayout>
-
 		</LinearLayout>
 
 	</ScrollView>

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

@@ -3,74 +3,114 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?colorM3SurfaceVariant"
-	android:elevation="2dp"
-	android:paddingBottom="0dp">
+	android:background="@drawable/bg_filled_card">
 
 	<ImageView
 		android:id="@+id/cover"
 		android:layout_width="match_parent"
 		android:layout_height="128dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginLeft="4dp"
-		android:layout_marginRight="4dp"
+		android:layout_marginTop="6dp"
+		android:layout_marginLeft="6dp"
+		android:layout_marginRight="6dp"
 		android:scaleType="centerCrop"
 		tools:src="#0f0"/>
 
-	<View
-		android:id="@+id/avatar_border"
-		android:layout_width="60dp"
-		android:layout_height="60dp"
+	<FrameLayout
+		android:id="@+id/avatar_wrap"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
 		android:layout_below="@id/cover"
 		android:layout_alignParentStart="true"
-		android:layout_marginTop="-6dp"
-		android:layout_marginStart="14dp"
-		android:background="@drawable/discover_ava_bg"/>
+		android:layout_marginTop="-12dp"
+		android:layout_marginStart="13dp"
+		android:layout_marginEnd="12dp">
 
-	<ImageView
-		android:id="@+id/avatar"
-		android:layout_width="56dp"
-		android:layout_height="56dp"
-		android:layout_below="@id/cover"
-		android:layout_alignParentStart="true"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="-4dp"
-		android:scaleType="centerCrop"
-		tools:src="#f00" />
+		<View
+			android:id="@+id/avatar_border"
+			android:layout_gravity="center"
+			android:layout_width="66dp"
+			android:layout_height="66dp"
+			android:background="@drawable/bg_filled_card"/>
 
-	<TextView
-		android:id="@+id/name"
+		<ImageView
+			android:id="@+id/avatar"
+			android:layout_gravity="center"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:scaleType="centerCrop"
+			tools:src="#f00" />
+
+	</FrameLayout>
+
+
+	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
+		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_below="@id/cover"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="8dp"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/avatar_wrap"
 		android:layout_marginEnd="16dp"
-		android:singleLine="true"
-		android:ellipsize="end"
-		android:gravity="center_vertical"
-		android:textAppearance="@style/m3_title_medium"
-		tools:text="Eugen"/>
+		android:layout_above="@+id/username">
+
+		<TextView
+			android:id="@+id/name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="@style/m3_title_medium"
+			android:textColor="?colorM3OnSurface"
+			android:gravity="start|center_vertical"
+			tools:text="Eugen" />
+
+		<TextView
+			android:id="@+id/pronouns"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8sp"
+			android:maxWidth="161sp"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="@style/m3_title_medium"
+			android:fontFamily="sans-serif"
+			android:textAlignment="viewStart"
+			android:textColor="?colorM3OnSurface"
+			tools:text="they/them" />
+
+		<TextView
+			android:id="@+id/extra_text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8sp"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="@style/m3_title_medium"
+			android:fontFamily="sans-serif"
+			android:textAlignment="viewStart"
+			android:textColor="?colorM3OnSurface"
+			tools:text="boosted your cat picture" />
+
+	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
 
 	<TextView
 		android:id="@+id/username"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_alignStart="@id/name"
-		android:layout_alignEnd="@id/name"
-		android:layout_below="@id/name"
+		android:layout_alignBottom="@id/avatar_wrap"
+		android:layout_marginEnd="16dp"
+		android:layout_toEndOf="@id/avatar_wrap"
+		android:layout_marginBottom="3sp"
+		android:textAlignment="viewStart"
 		android:singleLine="true"
 		android:ellipsize="end"
-		android:gravity="center_vertical"
-		android:textAppearance="@style/m3_title_small"
+		android:textAppearance="@style/m3_body_medium"
+		android:textColor="?colorM3OnSurfaceVariant"
 		tools:text="\@Gargron@mastodon.social"/>
 
 	<TextView
 		android:id="@+id/bio"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_below="@id/avatar"
+		android:layout_below="@id/avatar_wrap"
 		android:layout_marginLeft="16dp"
 		android:layout_marginRight="16dp"
 		android:layout_marginTop="8dp"

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

@@ -3,14 +3,13 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_height="wrap_content"
 	android:layout_width="wrap_content"
-	android:orientation="vertical"
-	android:paddingEnd="8dp"
 	tools:ignore="RtlSymmetry">
 	<ProgressBar
 		android:id="@+id/progress"
 		style="?android:progressBarStyleSmall"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
 		android:layout_gravity="center"
 		android:elevation="10dp"
 		android:indeterminate="true"
@@ -21,6 +20,7 @@
 		style="@style/Widget.Mastodon.M3.Button.Outlined.Icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
 		android:drawableTint="@null"
 		android:drawableStart="@drawable/image_placeholder"
 		android:background="@drawable/bg_button_m3_tonal"/>

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

@@ -5,7 +5,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:paddingTop="8dp"
-	android:paddingEnd="16dp"
 	android:clipToPadding="false"
 	android:background="?colorM3Background"
 	tools:ignore="RtlSymmetry">
@@ -26,6 +25,7 @@
 		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_marginStart="8dp"
+		android:layout_marginEnd="8dp"
 		android:scaleType="center"
 		android:tint="?colorM3OnSurface"
 		android:background="?android:actionBarItemBackground"

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

@@ -13,8 +13,6 @@
 		android:id="@+id/tabbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingTop="12dp"
-		android:paddingBottom="16dp"
 		android:paddingHorizontal="8dp">
 
 		<LinearLayout
@@ -23,6 +21,8 @@
 			android:layout_height="match_parent"
 			android:layout_weight="1"
 			android:layout_marginEnd="8dp"
+			android:paddingTop="12dp"
+			android:paddingBottom="16dp"
 			android:orientation="vertical">
 
 			<FrameLayout
@@ -61,6 +61,8 @@
 			android:layout_height="match_parent"
 			android:layout_weight="1"
 			android:layout_marginEnd="8dp"
+			android:paddingTop="12dp"
+			android:paddingBottom="16dp"
 			android:orientation="vertical">
 
 			<FrameLayout
@@ -99,6 +101,8 @@
 			android:layout_height="match_parent"
 			android:layout_weight="1"
 			android:layout_marginEnd="8dp"
+			android:paddingTop="12dp"
+			android:paddingBottom="16dp"
 			android:orientation="vertical">
 
 			<RelativeLayout
@@ -155,6 +159,8 @@
 			android:layout_height="match_parent"
 			android:layout_weight="1"
 			android:layout_marginEnd="8dp"
+			android:paddingTop="12dp"
+			android:paddingBottom="16dp"
 			android:orientation="vertical">
 
 			<FrameLayout

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

@@ -182,7 +182,7 @@
 	<string name="report_reason_spam">إنه غير مرغوب فيه</string>
 	<string name="report_reason_spam_subtitle">روابط خبيثة أو تفاعل كاذب أو ردود متكررة</string>
 	<string name="report_reason_violation">ينتهك قواعد الخادم</string>
-	<string name="report_reason_violation_subtitle">تعلم أنه ينتهك قواعد محددة</string>
+	<string name="report_reason_violation_subtitle">أنت مُدرك لانتهاكه قواعد مُحَدَّدَة</string>
 	<string name="report_reason_other">إنَّهُ شَيءٌ آخَر</string>
 	<string name="report_reason_other_subtitle">لا تندرج هذه المشكلة ضمن فئات أخرى</string>
 	<string name="report_choose_rule">ما هي القواعد المنتهكة؟</string>
@@ -362,7 +362,7 @@
 		<item quantity="zero">منذ %d ثانية</item>
 		<item quantity="one">منذ ثانية</item>
 		<item quantity="two">منذ ثانيتان</item>
-		<item quantity="few">%d ثواني</item>
+		<item quantity="few">%d ثوانٍ</item>
 		<item quantity="many">منذ %d ثانية</item>
 		<item quantity="other">%d ثواني مضت</item>
 	</plurals>
@@ -463,7 +463,7 @@
 	<string name="welcome_to_mastodon">أهلًا بك على ماستدون</string>
 	<string name="welcome_paragraph1">ماستدون شبكة اجتماعية لامركزية، بمعنى أنه ليس هناك شركة واحدة تتحكم فيها. وهي تتألف من العديد من الخوادم التي تدار بشكل مستقل، وجميعها متصلة معا.</string>
 	<string name="what_are_servers">ما هي الخوادم؟</string>
-	<string name="welcome_paragraph2"><![CDATA[تتم استضافة كل حساب ماستدون على خادم - ولكل منها قيمه وقواعده ومسؤوليه الخاصين. بغض النظر عن الشخص الذي تختاره ، يمكنك متابعة الأشخاص والتفاعل معهم على أي خادم.]]></string>
+	<string name="welcome_paragraph2">تتم استضافة كل حساب ماستدون على خادم - ولكل خادم قيمه وقواعده ومسؤوليه الخاصين. مهما اخترت أي خادم، يمكنك متابعة الأشخاص والتفاعل معهم على أي خادم آخر.</string>
 	<string name="opening_link">رابط الافتتاح…</string>
 	<string name="link_not_supported">هذا الرابط غير مدعوم في التطبيق</string>
 	<string name="log_out_all_accounts">تسجيل الخروج من جميع الحسابات</string>
@@ -694,8 +694,8 @@
 	<string name="posts_matching_string">منشورات تحتوي على “%s”</string>
 	<string name="accounts_matching_string">أشخاص لديهم \"%s\"</string>
 	<!-- Shown in the post header. Please keep it short -->
-	<string name="time_seconds_ago_short">مُنذُ %dث</string>
-	<string name="time_minutes_ago_short">مُنذُ %dش</string>
-	<string name="time_hours_ago_short">مُنذُ %dس</string>
-	<string name="time_days_ago_short">مُنذُ %dي</string>
+	<string name="time_seconds_ago_short">مُنذُ %dثا</string>
+	<string name="time_minutes_ago_short">مُنذُ %dد</string>
+	<string name="time_hours_ago_short">مُنذُ %dسا</string>
+	<string name="time_days_ago_short">مُنذُ %d أيام</string>
 </resources>

mastodon/src/main/res/values-ar/strings_sk.xml

@@ -31,4 +31,222 @@
     <string name="sk_user_post_notifications_off">عطل إشعارات النشر لـ %s</string>
     <string name="sk_check_for_update">تحقق من وجود تحديثات</string>
     <string name="sk_no_update_available">لا يتوفر تحديث</string>
+    <string name="sk_duration_hours_1">ساعة واحدة</string>
+    <string name="sk_duration_hours_6">6 ساعات</string>
+    <string name="sk_duration_days_1">يوم واحد</string>
+    <string name="sk_duration_days_3">3 أيام</string>
+    <string name="sk_duration_days_7">7 أيام</string>
+    <string name="sk_federated_timeline">الفديرالية</string>
+    <string name="sk_timeline_local">المحلي</string>
+    <string name="sk_tab_notifications">الإشعارات</string>
+    <string name="sk_mute_label">المدة</string>
+    <string name="sk_settings_show_boosts">إظهار المعاد نشرها</string>
+    <string name="sk_duration_minutes_5">5 دقائق</string>
+    <string name="sk_timeline_home">الرئيسي</string>
+    <string name="sk_duration_minutes_30">30 دقيقة</string>
+    <string name="sk_tab_home">الرئيسي</string>
+    <string name="sk_edit_timeline_tag_main">المنشورات التي تحتوي على الوسم …</string>
+    <string name="sk_post_edited">عُدِّل</string>
+    <string name="sk_notification_type_update">المنشورات المُعدَّلة</string>
+    <string name="sk_settings_publish_button_text">نص زر النشر</string>
+    <string name="sk_delete_notification_confirm_action">حذف الإشعار</string>
+    <string name="sk_settings_translation_availability_note_available">إنَّ %s يدعم خدمة الترجمة!</string>
+    <string name="sk_reply_as">رُدّ بواسطة حساب آخَر</string>
+    <string name="sk_confirm_save_changes">أتريد حفظ التعديلات؟</string>
+    <string name="sk_list_replies_policy_none">لا أحد</string>
+    <string name="sk_unpinned_timeline">تم فك التثبيت مِن الرئيسي</string>
+    <string name="sk_settings_hide_interaction">إخفاء أزرار التفاعلات</string>
+    <string name="sk_list_exclusive_switch">جعلُ القائمة حصرية</string>
+    <string name="sk_favorite_as">أضفه إلى المفضلة بحساب آخَر</string>
+    <string name="sk_timeline_bubble">فقاعة</string>
+    <string name="sk_icon_bot">حساب آلي</string>
+    <string name="sk_icon_keyboard">لوحة المفاتيح الموسيقية</string>
+    <string name="sk_local_only">الخادم المحلي فقط</string>
+    <string name="sk_settings_disable_alt_text_reminder">تعطيل تذكيري لإضافة نص بديل</string>
+    <string name="sk_no_remote_info_hint">المعلومات البُعدية غير متوفرة</string>
+    <string name="sk_advanced_options_show">إظهار الميزات المتقدمة</string>
+    <string name="sk_content_type">نوع المحتوى</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_list">القائمة</string>
+    <string name="sk_edit_timelines">تعديل الخيوط الزمنية</string>
+    <string name="sk_icon_feed">موجز اخباري</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_inline_local_only">المحلي فقط</string>
+    <string name="sk_settings_reply_visibility">مدى ظهور الردود</string>
+    <string name="sk_settings_show_interaction_counts">إظهار عدد التفاعلات</string>
+    <string name="sk_settings_app_version">Megalodon نسخة %1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">تعيين الوسائط كحساسة</string>
+    <string name="sk_update_available">ميگالودون %s متوفّر للتنزيل.</string>
+    <string name="sk_welcome_text">القِرش يحييك! للبداية ، رجاءً قم بإدخال اسم نطاق خادمك الخاص هنا.</string>
+    <string name="sk_color_palette_material3">النظام</string>
+    <string name="sk_color_palette_pink">وردي</string>
+    <string name="sk_color_palette_purple">أرجواني</string>
+    <string name="sk_color_palette_green">أخضر</string>
+    <string name="sk_color_palette_blue">أزرق</string>
+    <string name="sk_color_palette_brown">قهوي</string>
+    <string name="sk_color_palette_red">أحمر</string>
+    <string name="sk_color_palette_yellow">أصفر</string>
+    <string name="sk_poll_allow_multiple">السماح بخيارات متعددة</string>
+    <string name="sk_translate_post">ترجمة</string>
+    <string name="sk_translate_show_original">إظهار الأصلي</string>
+    <string name="sk_translated_using">تُرجِم بواسطة %s</string>
+    <string name="sk_post_language">اللغة: %s</string>
+    <string name="sk_available_languages">اللغات المتوفرة</string>
+    <string name="sk_clear_recent_languages">مسح آخر اللغات المستخدَمة</string>
+    <string name="sk_welcome_title">مرحبًا!</string>
+    <string name="sk_example_domain">example.social</string>
+    <string name="sk_settings_profile">إعداد الملف التعريفي</string>
+    <string name="sk_settings_posting">تفضيلات النشر</string>
+    <string name="sk_settings_filters">ضبط عوامل التصفية</string>
+    <string name="sk_settings_auth">إعدادات الأمان</string>
+    <string name="sk_settings_rules">القواعد</string>
+    <string name="sk_settings_about">عن التطبيق</string>
+    <string name="sk_settings_donate">التبرع</string>
+    <string name="sk_delete_notification">حذف الإشعار</string>
+    <string name="sk_clear_all_notifications">حذف كافة الإشعارات</string>
+    <string name="sk_clear_all_notifications_confirm_action">حذف الكل</string>
+    <string name="sk_settings_publish_button_text_title">تخصيص نص زر النشر</string>
+    <string name="sk_settings_translate_only_opened">ترجمة المنشورات المفتوحة فقط</string>
+    <string name="sk_loading_fediverse_resource_title">البحث عنه في الفديفرس</string>
+    <string name="sk_loading_resource_on_instance_title">البحث في %s</string>
+    <string name="sk_quote_post">أنشُر حول الموضوع</string>
+    <string name="sk_hashtags_you_follow">الوسوم التي تتبعها</string>
+    <string name="sk_copy_link_to_post">انسخ رابط المنشور</string>
+    <string name="sk_open_with_account">افتحه بواسطة حساب آخَر</string>
+    <string name="sk_unsent_posts">المنشورات غير المُرسَلَة</string>
+    <string name="sk_draft">المسودة</string>
+    <string name="sk_schedule">برمجة</string>
+    <string name="sk_confirm_delete_draft_title">احذف المسودّة</string>
+    <string name="sk_draft_saved">تم حفظ المسودّة</string>
+    <string name="sk_confirm_save_draft">أتريد حفظ المسودّة؟</string>
+    <string name="sk_settings_translation_availability_note_unavailable">لا يبدو أنّ %s يدعم الترجمة.</string>
+    <string name="sk_bookmark_as">أضفه إلى الفواصل المرجعية بحساب آخَر</string>
+    <string name="sk_forward_report_to">إعادة التوجيه إلى %s</string>
+    <string name="sk_compose_draft">سيُحفَظ المنشور كمسودّة.</string>
+    <string name="sk_mark_as_draft">تعيينه كمسودّة</string>
+    <string name="sk_schedule_post">برمَجة المنشور</string>
+    <string name="sk_edit_list_title">تعديل القائمة</string>
+    <string name="sk_your_lists">قوائمك</string>
+    <string name="sk_announcements">الإعلانات</string>
+    <string name="sk_mark_as_read">تعيينه كمقروء</string>
+    <string name="sk_settings_about_instance">عن مثيل الخادم</string>
+    <string name="sk_create">إنشاء</string>
+    <string name="sk_create_list_title">إنشاء قائمة</string>
+    <string name="sk_list_name_hint">اسم القائمة</string>
+    <string name="sk_list_replies_policy_list">أعضاء القائمة</string>
+    <string name="sk_list_replies_policy_followed">المستخدِمون المتابَعون</string>
+    <string name="sk_delete_list">احذف القائمة</string>
+    <string name="sk_timeline_federated">الفديرالية</string>
+    <string name="sk_settings_single_notification">إظهار إشعار واحد فقط</string>
+    <string name="sk_settings_unifiedpush">استخدم UnifiedPush</string>
+    <string name="sk_settings_unifiedpush_choose">اختر مُزوِّدًا</string>
+    <string name="sk_delete_list_confirm">أمُتأكد مِن أنك تُريد حذف قائمة \"%s\"؟</string>
+    <string name="sk_recent_searches_placeholder">أكتب شيئا ما لمواصلة البحث</string>
+    <string name="sk_changelog">سِجِلّ التغييرات</string>
+    <string name="sk_alt_text_missing_title">ينقصه نص بديل</string>
+    <string name="sk_publish_anyway">أنشُره على أي حال</string>
+    <string name="sk_timelines">الخيوط الزمنية</string>
+    <string name="sk_timeline_posts">المنشورات</string>
+    <string name="sk_timelines_add">إضافة</string>
+    <string name="sk_remove_follower">تنحية من بين متابعيك</string>
+    <string name="sk_pinned_timeline">مثبَّت على الرئيسي</string>
+    <string name="sk_edit_timeline_tag_any">… أو أي من هذه</string>
+    <string name="sk_edit_timeline_tag_hint">أدخِل الوسم …</string>
+    <string name="sk_edit_timeline_tags_hint">أدخِل الوسوم …</string>
+    <string name="sk_timeline">الخيط الزمني</string>
+    <string name="sk_hashtag">الوسم</string>
+    <string name="sk_pin_timeline">تثبيت الخيط الزمني</string>
+    <string name="sk_unpin_timeline">فكّ تثبيت الخيط الزمني</string>
+    <string name="sk_remove">حذف</string>
+    <string name="sk_timeline_icon">أيقونة</string>
+    <string name="sk_icon_heart">قلب</string>
+    <string name="sk_icon_star">نجمة</string>
+    <string name="sk_icon_city">مدينة</string>
+    <string name="sk_icon_cat">قط</string>
+    <string name="sk_icon_dog">كلب</string>
+    <string name="sk_icon_rabbit">أرنب</string>
+    <string name="sk_icon_turtle">سلحفاة</string>
+    <string name="sk_icon_bed">سرير</string>
+    <string name="sk_icon_recycle_bin">سلة مهملات</string>
+    <string name="sk_icon_doctor">طبيب</string>
+    <string name="sk_add_timeline">إضافة خيط زمني</string>
+    <string name="sk_icon_balloon">كرة</string>
+    <string name="sk_icon_image">صورة</string>
+    <string name="sk_icon_language">اللغة</string>
+    <string name="sk_icon_location">المكان</string>
+    <string name="sk_icon_microphone">المايكروفون</string>
+    <string name="sk_icon_microscope">مجهر</string>
+    <string name="sk_icon_coffee">قهوة</string>
+    <string name="sk_icon_laugh">ضحك</string>
+    <string name="sk_icon_news">أخبار</string>
+    <string name="sk_icon_stethoscope">سمّاعة</string>
+    <string name="sk_icon_weather">الطقس</string>
+    <string name="sk_icon_games">ألعاب</string>
+    <string name="sk_icon_diamond">ألماس</string>
+    <string name="sk_icon_umbrella">مطرية</string>
+    <string name="sk_hashtag_timeline_local_only_switch">أتريد إظهار المنشورات المحلية فقط؟</string>
+    <string name="sk_alt_button">ALT</string>
+    <string name="sk_attach_file">أرفِق ملفًا</string>
+    <string name="sk_searching">البحث…</string>
+    <string name="sk_no_alt_text">لا نص بديل متوفر</string>
+    <string name="sk_separator">·</string>
+    <string name="sk_instance_features">ميزات مثيل الخادم</string>
+    <string name="sk_reported">تم الإبلاغ عنه</string>
+    <string name="sk_settings_server_version">إصدار الخادم: %s</string>
+    <string name="sk_expand">توسيع</string>
+    <string name="sk_follow_as">متابعته بواسطة حساب آخَر</string>
+    <string name="sk_settings_default_content_type">النوع المبدئي للمحتوى</string>
+    <string name="sk_open_in_app">افتحه بواسطة التطبيق</string>
+    <string name="sk_exclusive_list">قائمة حصرية</string>
+    <string name="sk_advanced_options_hide">إخفاء الميزات المتقدمة</string>
+    <string name="sk_spoiler_show">إظهار المحتوى</string>
+    <string name="sk_pronouns_label">الضمائر</string>
+    <string name="sk_no_results">لا نتائج</string>
+    <string name="sk_save_draft">أتريد حفظ المسودّة؟</string>
+    <string name="sk_content_type_unspecified">غير محدد</string>
+    <string name="sk_external_share_title">شاركه عبر حساب</string>
+    <string name="sk_settings_auto_reveal_author">ردود مِن نفس الناشر</string>
+    <string name="sk_settings_instance">مثيل الخادم</string>
+    <string name="sk_settings_true_black">الوضع الأسود الداكن</string>
+    <string name="sk_settings_display_pronouns_in_timelines">إظهار الضمائر على الخيوط الزمنية</string>
+    <string name="sk_settings_display_pronouns_in_threads">إظهار الضمائر على خيوط المحادثات</string>
+    <string name="sk_tab_search">البحث</string>
+    <string name="sk_tab_profile">الملف التعريفي</string>
+    <string name="sk_settings_confirm_before_reblog">التأكيد قبل إعادة النشر</string>
+    <string name="sk_language_name">%1$s (%2$s)</string>
+    <string name="sk_undo_reblog">إلغاء إعادة النشر</string>
+    <string name="sk_reblog_with_visibility">أعد النشر بمدى الظهور التالي</string>
+    <string name="sk_reblog_as">أعد النشر بحساب آخَر</string>
+    <string name="sk_reblogged_as">تمت إعادة النشر كـ %s</string>
+    <string name="sk_show_thread">إظهار خيط المحادثة</string>
+    <string name="sk_new_reports">إبلاغات جديدة</string>
+    <string name="sk_collapse">اطوي</string>
+    <string name="sk_settings_always_reveal_content_warnings">الكشف عن تحذيرات المحتوى دائما</string>
+    <string name="sk_notification_type_status">المنشورات</string>
+    <string name="sk_update_ready">تم تنزيل ميگالودون %s وهو جاهز للتنصيب.</string>
+    <string name="sk_edit_timeline">تعديل الخيط الزمني</string>
+    <string name="sk_icon_pin">دبوس</string>
+    <string name="sk_icon_leaves">أوراق شجر</string>
+    <string name="sk_icon_sport">رياضة</string>
+    <string name="sk_icon_music">موسيقى</string>
+    <string name="sk_icon_people">ناس</string>
+    <string name="sk_icon_health">صحة</string>
+    <string name="sk_icon_important">مهم</string>
+    <string name="sk_icon_chat">دردشة</string>
+    <string name="sk_icon_human">إنسان</string>
+    <string name="sk_icon_globe">كرة أرضية</string>
+    <string name="sk_icon_light_bulb">مصباح</string>
+    <string name="sk_icon_train">قطار</string>
+    <string name="sk_icon_shield">درع</string>
+    <string name="sk_icon_book">كتاب</string>
+    <string name="sk_icon_bicycle">دراجة هوائية</string>
+    <string name="sk_icon_map">خريطة</string>
+    <string name="sk_icon_fire">نار</string>
+    <string name="sk_icon_bug">حشرة</string>
+    <string name="sk_icon_pizza">بيتزا</string>
+    <string name="sk_icon_gavel">مطرقة</string>
+    <string name="sk_icon_headphones">سمّاعات</string>
+    <string name="sk_notify_poll_results">نتيجة استطلاع الرأي</string>
+    <string name="sk_filtered">تمت تصفيته: %s</string>
+    <string name="sk_search_fediverse">البحث في الفديفرس</string>
 </resources>

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

@@ -404,7 +404,6 @@
 	<string name="welcome_to_mastodon">Вітаем у Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon - гэта дэцэнтралізаваная сацыяльная сетка, што азначае, што ні адна кампанія не кантралюе яе. Яна складаецца з мноства незалежна працуючых сервераў, злучаных разам.</string>
 	<string name="what_are_servers">Што такое серверы?</string>
-	<string name="welcome_paragraph2"><![CDATA[Кожны акаўнт Mastodon размяшчаецца на серверы - кожны са сваімі каштоўнасцямі, правіламі і адміністратарамі. Незалежна ад таго, які сервер вы вылучыце, вы можаце сачыць і ўзаемадзейнічаць з людзьмі на любым серверы.]]></string>
 	<string name="retry">Паўтарыць</string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<string name="attachment_type_video">Відэа</string>

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

@@ -2,6 +2,7 @@
 <resources>
 	<string name="log_in">লগ ইন করুন</string>
 	<string name="next">এরপর</string>
+	<string name="loading_instance">সার্ভারের তথ্য পুনরূদ্ধার করা হচ্ছে…</string>
 	<string name="error">কোনো ত্রুটি ঘটেছে</string>
 	<string name="ok">ঠিক আছে</string>
 	<string name="preparing_auth">প্রমাণীকরণের জন্য প্রস্তুত হচ্ছে...</string>
@@ -65,6 +66,10 @@
 		<item quantity="one">%d দিন বাকি</item>
 		<item quantity="other">%d দিন বাকি</item>
 	</plurals>
+	<plurals name="x_votes">
+		<item quantity="one">%,d ভোট</item>
+		<item quantity="other">%,d ভোট</item>
+	</plurals>
 	<string name="poll_closed">বন্ধ</string>
 	<string name="confirm_mute_title">অ্যাকাউন্টটি মিউট করুন</string>
 	<string name="do_mute">মিউট করুন</string>
@@ -123,6 +128,8 @@
 	<string name="category_tech">তথ্য-প্রযুক্তি</string>
 	<string name="confirm_email_title">আপনার ইনবক্স দেখুন</string>
 	<!-- %s is the email address -->
+	<string name="open_email_app">ই-মেইল অ্যাপ খুলুন</string>
+	<string name="resent_email">নিশ্চিতকরনের ই-মেইল পাঠানো হয়েছে</string>
 	<string name="visibility_followers_only">ফলোয়ারদের জন্য</string>
 	<string name="notification_type_follow">নতুন ফলোয়াররা</string>
 	<string name="err_not_logged_in">Mastodon-এ প্রথমে লগ ইন করুন</string>
@@ -181,7 +188,6 @@
 	<string name="welcome_to_mastodon">Mastodon - এ আপনাকে স্বাগত জানাই</string>
 	<string name="welcome_paragraph1">Mastodon হল একটি বিকেন্দ্রীভূত সামাজিক নেটওয়ার্ক, যার মানে কোনো একক কোম্পানি এটিকে নিয়ন্ত্রণ করে না। এটি অনেকগুলি স্বাধীনভাবে চালিত সার্ভারের সমন্বয়ে গঠিত, যেখানে সব সার্ভারগুলি একসাথে সংযুক্ত৷</string>
 	<string name="what_are_servers">সার্ভার কি?</string>
-	<string name="welcome_paragraph2"><![CDATA[প্রতিটি Mastodon অ্যাকাউন্টকে একটি সার্ভারে হোস্ট করা হয় — প্রত্যেকটির নিজস্ব মান, নিয়ম এবং প্রশাসক (অ্যাডমিন) রয়েছে। আপনি যে কোনো সার্ভারই বেছে নিন না কেন তা বিবেচ্য নয়, আপনি যেকোনো সার্ভারের লোকেদের সাথে যোগাযোগ করতে এবং তাদের ফলো করতে পারেন।]]></string>
 	<!-- %s is formatted file size ("467 KB image") -->
 	<!-- %s is the server domain -->
 	<!-- Shown on the "stamp" on the screen that appears after you report a post/user. Please keep the translation short, preferably a single word -->

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

@@ -34,7 +34,7 @@
     <string name="sk_list_timelines">Llistes</string>
     <string name="sk_follow_requests">Sol·licituds de seguiment</string>
     <string name="sk_reject_follow_request">Rebutja la sol·licitud</string>
-    <string name="sk_lists_with_user">Edita les llistes amb %s</string>
+    <string name="sk_lists_with_user">Llistes amb %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
     <string name="sk_settings_contribute">Contribueix a Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
@@ -246,11 +246,134 @@
     <string name="sk_searching">Cercant…</string>
     <string name="sk_save_draft">Voleu desar l\'esborrany\?</string>
     <string name="sk_settings_show_no_alt_indicator">Indicador dels textos alternatius inexistents</string>
-    <string name="sk_settings_prefix_reply_cw_with_re">Afegeix «re:» a les respostes als avisos de contingut</string>
+    <string name="sk_settings_prefix_reply_cw_with_re">Afig «re:» en respondre als avisos de contingut</string>
     <string name="sk_filtered">Filtrat: %s</string>
     <string name="sk_expand">Amplia</string>
     <string name="sk_collapse">Tanca</string>
     <string name="sk_settings_collapse_long_posts">Acurta les publicacions llargues</string>
     <string name="sk_signed_up">registrat</string>
     <string name="sk_spectator_mode">Mode d\'espectador</string>
+    <string name="sk_button_react">Reacciona amb un emoji</string>
+    <string name="sk_enter_emoji_hint">Escriviu per a reaccionar amb un emoji</string>
+    <string name="sk_duration_minutes_5">5 minuts</string>
+    <string name="sk_duration_minutes_30">30 minuts</string>
+    <string name="sk_duration_hours_1">1 hora</string>
+    <string name="sk_duration_hours_6">6 hores</string>
+    <string name="sk_duration_indefinite">Indefinida</string>
+    <string name="sk_mute_label">Durada</string>
+    <string name="sk_enter_emoji_toast">Heu d\'escriure un emoji</string>
+    <string name="sk_again_for_system_keyboard">Toqueu una altra vegada per a obrir el teclat del sistema</string>
+    <string name="sk_duration_days_1">1 dia</string>
+    <string name="sk_duration_days_3">3 dies</string>
+    <string name="sk_duration_days_7">7 dies</string>
+    <string name="sk_notification_mention">%s t\'ha mencionat</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Mostra els mateixos avisos de contingut en respostes</string>
+    <string name="sk_settings_auto_reveal_nobody">Mai</string>
+    <string name="sk_settings_auto_reveal_author">Respostes del mateix autor</string>
+    <string name="sk_open_in_app_failed">No s\'ha pogut obrir</string>
+    <string name="sk_no_remote_info_hint">La informació remota no està disponible</string>
+    <string name="sk_error_loading_profile">No s\'ha pogut carregar el perfil via %s</string>
+    <string name="sk_settings_prefix_replies_to_others">Només en resposta a altres</string>
+    <string name="sk_settings_prefix_replies_always">Responent a qualsevol</string>
+    <string name="sk_settings_prefix_replies_never">Mai</string>
+    <string name="sk_content_type_unspecified">Sense especificar</string>
+    <string name="sk_content_type_plain">Text pla</string>
+    <string name="sk_content_type_html">HTML</string>
+    <string name="sk_content_type">Tipus de contingut</string>
+    <string name="sk_content_type_mfm">MFM</string>
+    <string name="sk_settings_default_content_type">Contingut per defecte</string>
+    <string name="sk_timeline_bubble">Bombolla</string>
+    <string name="sk_in_reply">Resposta</string>
+    <string name="sk_followed_as">Seguit a %s</string>
+    <string name="sk_follow_as">Segueix des d\'un altre compte</string>
+    <string name="sk_icon_feed">Línia del temps</string>
+    <string name="sk_edit_timeline_tag_main">Publicacions amb l\'etiqueta…</string>
+    <string name="sk_edit_timeline_tags_explanation">Tingueu en compte que el servidor gestiona aquestes operacions. És possible que no s\'admeta combinar-les.</string>
+    <string name="sk_new_reports">Denúncies noves</string>
+    <string name="sk_unfinished_attachments_message">Alguns fitxers adjunts no han acabat de pujar-se\'n.</string>
+    <string name="sk_settings_hide_fab">Amaga automàticament el botó de redacció</string>
+    <string name="sk_settings_confirm_before_reblog">Confirma abans d\'impulsar</string>
+    <string name="sk_settings_content_types">Activa la formatació de text</string>
+    <string name="sk_settings_content_types_explanation">Permet establir un format de contingut com Markdown en crear una publicació. Tingueu en compte que no totes les instàncies són compatibles.</string>
+    <string name="sk_settings_default_content_type_explanation">Això permet preseleccionar un tipus de contingut en crear publicacions noves, substituint el valor establert a «Preferències de publicació».</string>
+    <string name="sk_settings_emoji_reactions">Activa les reaccions d\'emojis</string>
+    <string name="sk_settings_emoji_reactions_explanation">Mostra les reaccions d\'emojis a les publicacions i us permet interactuar amb elles. Algunes versions modificades de Mastodon són compatibles, però Mastodon no.</string>
+    <string name="sk_settings_emoji_reactions_in_lists">Mostra les reaccions d\'emojis a les línies de temps</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Un usuari ha reaccionat amb %2$s</item>
+        <item quantity="other">%1$,d usuaris han reaccionat amb %2$s</item>
+    </plurals>
+    <string name="sk_settings_emoji_reactions_in_lists_explanation">Si les reaccions d\'emojis s\'han de mostrar a les línies de temps. Si l\'opció està desactivada, les reaccions d\'emojis només es mostraran quan es visualitze un fil.</string>
+    <string name="sk_settings_unifiedpush">Utilitza UnifiedPush</string>
+    <string name="sk_list_exclusive_switch">Fes la llista exclusiva</string>
+    <string name="sk_settings_unifiedpush_choose">Tria un distribuïdor</string>
+    <string name="sk_list_exclusive_switch_explanation">Els membres d\'una llista exclusiva no apareixeran a la línia de temps de l\'inici (si la vostra instància és compatible).</string>
+    <string name="sk_settings_unifiedpush_no_distributor_body">Heu d\'instal·lar un distribuïdor perquè funcionen les notificacions UnifiedPush. Per a més informació, visita https://unifiedpush.org/</string>
+    <string name="sk_settings_allow_remote_loading">Carrega la informació de les instàncies remotes</string>
+    <string name="sk_settings_forward_report_default">Activa per defecte «Reenvia la denúncia»</string>
+    <string name="sk_gif_badge">GIF</string>
+    <string name="sk_quoting_user">Citant %s</string>
+    <string name="sk_settings_reply_visibility">Visibilitat de la resposta</string>
+    <string name="sk_settings_reply_visibility_all">Totes les respostes</string>
+    <string name="sk_settings_reply_visibility_following">Respostes als meus seguits</string>
+    <string name="sk_settings_reply_visibility_self">Respostes a mi</string>
+    <string name="sk_notification_action_replied">S\'ha enviat la resposta a %s</string>
+    <string name="sk_settings_continues_playback">Superposició d\'àudio</string>
+    <string name="sk_settings_continues_playback_summary">Permet que els fitxers multimèdia que ja s\'estan reproduint continuen reproduint-se en la superposició el reproductor nou</string>
+    <string name="sk_settings_unifiedpush_no_distributor">No s\'ha trobat cap distribuïdor</string>
+    <string name="sk_icon_bed">Llit</string>
+    <string name="sk_icon_recycle_bin">Paperera de reciclatge</string>
+    <string name="sk_icon_verified">Verificat</string>
+    <string name="sk_icon_doctor">Metge</string>
+    <string name="sk_icon_diamond">Diamant</string>
+    <string name="sk_icon_umbrella">Paraigua</string>
+    <string name="sk_add_timeline">Afig línia de temps</string>
+    <string name="sk_edit_timeline_tag_any">…o alguna d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_all">…i cada una d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_none">…però cap d\'aquestes</string>
+    <string name="sk_edit_timeline_tag_hint">Introduïu l\'etiqueta…</string>
+    <string name="sk_edit_timeline_tags_hint">Introduïu etiquetes…</string>
+    <string name="sk_icon_beaker">Vas científic</string>
+    <string name="sk_hashtag_timeline_local_only_switch">Mostra només publicacions locals\?</string>
+    <string name="sk_add_timeline_tag_error_empty">L\'etiqueta no pot ser buida</string>
+    <string name="sk_reported">denunciat</string>
+    <string name="sk_unfinished_attachments">Voleu arreglar els adjunts\?</string>
+    <string name="sk_reply_line_above_avatar">Text «En resposta a» damunt de l\'avatar</string>
+    <string name="sk_compact_reblog_reply_line">Text compacte d\'impuls/resposta</string>
+    <string name="sk_content_type_markdown">Markdown</string>
+    <string name="sk_content_type_bbcode">BBCode</string>
+    <string name="sk_instance_info_unavailable">La informació de la instància no està disponible temporalment</string>
+    <string name="sk_open_in_app">Obri en l\'aplicació</string>
+    <string name="sk_external_share_title">Comparteix amb un compte</string>
+    <string name="sk_external_share_or_open_title">Comparteix o obri amb un compte</string>
+    <string name="sk_settings_show_labels_in_navigation_bar">Mostra els noms de les pestanyes a la barra de navegació</string>
+    <string name="sk_tab_profile">Perfil</string>
+    <string name="sk_tab_notifications">Notificacions</string>
+    <string name="sk_tab_search">Cerca</string>
+    <string name="sk_tab_home">Inici</string>
+    <string name="sk_settings_display_pronouns_in_user_listings">Mostra els pronoms als llistats d\'usuaris</string>
+    <string name="sk_settings_display_pronouns_in_threads">Mostra els pronoms als fils</string>
+    <string name="sk_settings_display_pronouns_in_timelines">Mostra els pronoms a les línies de temps</string>
+    <string name="sk_settings_instance">Instància</string>
+    <string name="sk_switch_timeline">Canvia de línia de temps</string>
+    <string name="sk_pronouns_label">Pronoms</string>
+    <string name="sk_spoiler_show">Mostra el contingut</string>
+    <string name="sk_exclusive_list">Llista exclusiva</string>
+    <string name="sk_settings_allow_remote_loading_explanation">Prova d\'obtenir llistes més precises de seguidors, m\'agrada i impulsos carregant la informació de la instància d\'origen.</string>
+    <string name="sk_settings_auto_reveal_anyone">Respostes de tothom</string>
+    <string name="sk_advanced_options_show">Mostra les opcions avançades</string>
+    <string name="sk_advanced_options_hide">Amaga les opcions avançades</string>
+    <string name="sk_disable_pill_shaped_active_indicator">Desactiva l\'indicador en forma de pastilla de pestanya activa</string>
+    <string name="sk_settings_true_black">Mode de negre pur</string>
+    <string name="sk_reacted_with">%1$s ha reaccionat amb %2$s</string>
+    <string name="sk_reacted">%s ha reaccionat</string>
+    <string name="sk_settings_hide_interaction">Amaga els botons d\'interacció</string>
+    <string name="sk_show_thread">Mostra el fil</string>
+    <string name="sk_bubble_timeline_info_banner">Aquestes són les publicacions més recents de la xarxa seleccionades per l\'administració de la instància.</string>
+    <string name="sk_icon_gauge">Indicador</string>
+    <string name="sk_search_fediverse">Cerca al fedivers</string>
+    <plurals name="sk_posts_count_label">
+        <item quantity="one">publicació</item>
+        <item quantity="other">publicacions</item>
+    </plurals>
 </resources>

mastodon/src/main/res/values-cs-rCZ/strings.xml

@@ -425,7 +425,6 @@
 	<string name="welcome_to_mastodon">Vítejte na Mastodonu</string>
 	<string name="welcome_paragraph1">Mastodon je decentralizovaná sociální síť, což znamená, že ji neovládá žádná jednotlivá společnost. Skládá se z mnoha nezávisle spravovaných serverů, všechny jsou propojeny dohromady.</string>
 	<string name="what_are_servers">Co jsou to servery?</string>
-	<string name="welcome_paragraph2"><![CDATA[Každý účet Mastodon je hostován na serveru - každý s vlastními hodnotami, pravidly a správci. Bez ohledu na to, který si vyberete, můžete sledovat a komunikovat s lidmi na jakémkoliv serveru.]]></string>
 	<string name="opening_link">Odkaz se otevírá…</string>
 	<string name="link_not_supported">Tento odkaz není v aplikaci podporovaný</string>
 	<string name="log_out_all_accounts">Odhlásit se ze všech účtů</string>

mastodon/src/main/res/values-da-rDK/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Velkommen til Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon er et decentraliseret socialt netværk, hvilket betyder at ingen enkelt virksomhed styrer det. Det består af mange uafhængige servere, alle forbundet sammen.</string>
 	<string name="what_are_servers">Hvad er servere?</string>
-	<string name="welcome_paragraph2"><![CDATA[Alle Mastodon-konti har plads på en server. Hver server har sine egne værdier, regler og administratorer. Ligegyldigt hvilken server du vælger, kan du følge og interagere med folk på alle andre servere.]]></string>
 	<string name="opening_link">Åbner link…</string>
 	<string name="link_not_supported">Linket er ikke understøttet i appen</string>
 	<string name="log_out_all_accounts">Log ud af alle konti</string>

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

@@ -348,4 +348,45 @@
     <string name="sk_tab_search">Suche</string>
     <string name="sk_tab_notifications">Benachrichtigungen</string>
     <string name="sk_tab_profile">Profil</string>
+    <string name="sk_enter_emoji_toast">Bitte geben Sie ein Emoji ein</string>
+    <string name="sk_settings_emoji_reactions">Emoji-Reaktionen einschalten</string>
+    <string name="sk_settings_emoji_reactions_explanation">Zeigt Emoji-Reaktionen zu Beiträgen an und lässt dich eigene hinzufügen. Einige Fediverse-Server unterstützen das, Mastodon jedoch nicht.</string>
+    <string name="sk_button_react">Mit Emoji reagieren</string>
+    <string name="sk_mute_label">Dauer</string>
+    <string name="sk_settings_show_emoji_reactions">Emoji-Reaktionen in Timelines anzeigen</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">Nur wenn der Beitrag geöffnet ist</string>
+    <string name="sk_duration_days_3">3 Tage</string>
+    <string name="sk_search_suicide_message">Wenn du auf ein Zeichen wartest, keinen Suizid zu begehen – das hier ist es. Bitte ziehe in Erwägung, eine Suizid-Hotline zu kontaktieren, wenn du Hilfe brauchst.</string>
+    <string name="sk_settings_show_emoji_reactions_hide_empty">Leere Emoji-Reaktionen verbergen</string>
+    <string name="sk_settings_show_emoji_reactions_always">Hinzufügen-Button immer anzeigen</string>
+    <string name="sk_enter_emoji_hint">Emoji zum Reagieren eintippen</string>
+    <string name="sk_duration_indefinite">Unbestimmt</string>
+    <string name="sk_duration_minutes_5">5 Minuten</string>
+    <string name="sk_duration_minutes_30">30 Minuten</string>
+    <string name="sk_duration_hours_1">1 Stunde</string>
+    <string name="sk_duration_hours_6">6 Stunden</string>
+    <string name="sk_duration_days_1">1 Tag</string>
+    <string name="sk_duration_days_7">7 Tage</string>
+    <string name="sk_notification_mention">Du wurdest von %s erwähnt</string>
+    <string name="sk_suicide_search_terms">Suizid</string>
+    <string name="sk_search_suicide_title">Falls es dir schlecht geht…</string>
+    <string name="sk_search_suicide_hotlines">Hotline finden</string>
+    <string name="sk_do_not_show_again">Nicht mehr anzeigen</string>
+    <string name="sk_post_contains_media">Beitrag enthält Medien</string>
+    <plurals name="sk_users_reacted_with">
+        <item quantity="one">Ein User hat mit %2$s reagiert</item>
+        <item quantity="other">%1$,d User haben mit %2$s reagiert</item>
+    </plurals>
+    <plurals name="sk_posts_count_label">
+        <item quantity="one">Beitrag</item>
+        <item quantity="other">Beiträge</item>
+    </plurals>
+    <string name="sk_settings_show_labels_in_navigation_bar">Tab-Bezeichnungen in der Navigationsleiste anzeigen</string>
+    <string name="sk_time_seconds">%d Sekunden</string>
+    <string name="sk_time_minutes">%d Minuten</string>
+    <string name="sk_time_hours">%d Stunden</string>
+    <string name="sk_time_days">%d Tage</string>
+    <string name="sk_suicide_helplines_url">https://findahelpline.com</string>
+    <string name="sk_load_missing_posts_below">Ältere Beiträge laden</string>
+    <string name="sk_load_missing_posts_above">Neuere Beiträge laden</string>
 </resources>

mastodon/src/main/res/values-el-rGR/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
 	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
 	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
-	<string name="welcome_paragraph2"><![CDATA[Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες και διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.]]></string>
 	<string name="opening_link">Άνοιγμα συνδέσμου…</string>
 	<string name="link_not_supported">Αυτός ο σύνδεσμος δεν υποστηρίζεται στην εφαρμογή</string>
 	<string name="log_out_all_accounts">Αποσύνδεση από όλους τους λογαριασμούς</string>

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

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Bienvenido/da a Mastodon</string>
 	<string name="welcome_paragraph1">Mastodon es una red social descentralizada, lo que significa que no la controla una sola compañía. Está formada por muchos servidores independientes, todos juntos conectados.</string>
 	<string name="what_are_servers">¿Qué son los servidores?</string>
-	<string name="welcome_paragraph2"><![CDATA[Cada cuenta de Mastodon está alojada en un servidor — cada uno con sus propios valores, reglas y administradores. No importa cual elijas, puede seguir e interactuar con personas en cualquier servidor.]]></string>
 	<string name="opening_link">Abriendo enlace…</string>
 	<string name="link_not_supported">Este enlace no es compatible con la aplicación</string>
 	<string name="log_out_all_accounts">Cerrar sesión en todas las cuentas</string>

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

@@ -331,10 +331,10 @@
     <string name="sk_gif_badge">GIF</string>
     <string name="sk_spoiler_show">Mostrar el contenido</string>
     <string name="sk_pronouns_label">Pronombres</string>
-    <string name="sk_switch_timeline">Cambiar la línea de tiempo</string>
+    <string name="sk_switch_timeline">Cambiar la cronología</string>
     <string name="sk_settings_instance">Instancia</string>
     <string name="sk_disable_pill_shaped_active_indicator">Desactivar el indicador de pestaña activa en forma de pastilla</string>
-    <string name="sk_settings_true_black">Modo negro intenso</string>
+    <string name="sk_settings_true_black">Usar tema negro</string>
     <string name="sk_search_fediverse">Buscar en el Fediverso</string>
     <string name="sk_settings_unifiedpush_choose">Selecciona un distribuidor</string>
     <string name="sk_settings_unifiedpush_no_distributor">No se ha encontrado ningún distribuidor</string>
@@ -373,4 +373,21 @@
     <string name="sk_settings_emoji_reactions_in_lists_explanation">Las reacciones con los emoticonos deben mostrarse en las líneas de tiempo. Si esta opción está desactivada, las reacciones con los emoticonos solo se mostrarán al ver un hilo.</string>
     <string name="sk_button_react">Reacciona con un emoticono</string>
     <string name="sk_again_for_system_keyboard">Pulsa de nuevo para el Teclado del sistema</string>
+    <plurals name="sk_posts_count_label">
+        <item quantity="one">tema</item>
+        <item quantity="many">temas</item>
+        <item quantity="other">temas</item>
+    </plurals>
+    <string name="sk_settings_show_emoji_reactions_hide_empty">Ocultar emoji vacíos</string>
+    <string name="sk_settings_show_emoji_reactions_only_opened">Sólo cuando se abre un tema</string>
+    <string name="sk_settings_show_emoji_reactions_always">Mostrar siempre el botón de añadir</string>
+    <string name="sk_search_suicide_hotlines">Encontrar un teléfono de ayuda</string>
+    <string name="sk_do_not_show_again">No mostrar de nuevo</string>
+    <string name="sk_post_contains_media">El tema contiene medios</string>
+    <string name="sk_load_missing_posts_oldest_first">El más antiguo primero (hacia arriba)</string>
+    <string name="sk_settings_show_emoji_reactions">Mostrar los emoji en las líneas de tiempo</string>
+    <string name="sk_search_suicide_title">En caso de que estés en apuros…</string>
+    <string name="sk_suicide_helplines_url">https://findahelpline.com</string>
+    <string name="sk_settings_load_missing_posts">Cargar los mensajes que faltan</string>
+    <string name="sk_load_missing_posts_newest_first">Lo más nuevo primero (hacia abajo)</string>
 </resources>

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

@@ -11,6 +11,10 @@
 	<string name="user_boosted">%s(e)k bultzatu du</string>
 	<string name="in_reply_to">%s-(r)i erantzunez</string>
 	<string name="notifications">Jakinarazpenak</string>
+	<string name="user_followed_you">%s(e)k jarraitu zaitu</string>
+	<string name="user_sent_follow_request">%s-(e)k jarraitzeko eskaera bidali dizu</string>
+	<string name="user_favorited">%s(e)k zure bidalketa gogoko du</string>
+	<string name="notification_boosted">%s(e)k zure bidalketa bultzatu du</string>
 	<string name="share_toot_title">Partekatu</string>
 	<string name="settings">Ezarpenak</string>
 	<string name="publish">Argitaratu</string>
@@ -32,6 +36,7 @@
 	<string name="button_follow">Jarraitu</string>
 	<string name="button_following">Jarraitzen</string>
 	<string name="edit_profile">Editatu profila</string>
+	<string name="share_user">Partekatu profila</string>
 	<string name="mute_user">Mututu %s</string>
 	<string name="unmute_user">Desmututu %s</string>
 	<string name="block_user">Blokeatu %s</string>