bump version

Currently translated at 100.0% (398 of 398 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/

mastodon/build.gradle

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

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

@@ -266,7 +266,7 @@ public class AudioPlayerService extends Service{
 	private void updateNotification(boolean dismissable, boolean removeNotification){
 		Notification.Builder bldr=new Notification.Builder(this)
 				.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentTitle(status.account.displayName)
+				.setContentTitle(status.account.getDisplayName())
 				.setContentText(HtmlParser.strip(status.content))
 				.setOngoing(!dismissable)
 				.setShowWhen(false)

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

@@ -51,7 +51,6 @@ public class GlobalUserPreferences{
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
-	public static boolean compactReblogReplyLine;
 	public static boolean allowRemoteLoading;
 	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
@@ -112,7 +111,6 @@ public class GlobalUserPreferences{
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		allowRemoteLoading=prefs.getBoolean("allowRemoteLoading", true);
 		autoRevealEqualSpoilers=AutoRevealMode.valueOf(prefs.getString("autoRevealEqualSpoilers", AutoRevealMode.THREADS.name()));
 		forwardReportDefault=prefs.getBoolean("forwardReportDefault", true);
@@ -170,7 +168,6 @@ public class GlobalUserPreferences{
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
 				.putBoolean("forwardReportDefault", forwardReportDefault)

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

@@ -120,6 +120,8 @@ public class CacheController{
 				values.put("time", s.createdAt.getEpochSecond());
 				db.insertWithOnConflict("home_timeline", null, values, SQLiteDatabase.CONFLICT_REPLACE);
 			}
+			if(!clear)
+				db.delete("home_timeline", "`id` NOT IN (SELECT `id` FROM `home_timeline` ORDER BY `time` DESC LIMIT ?)", new String[]{"100"});
 		});
 	}
 

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

@@ -53,9 +53,7 @@ public class MastodonAPIController{
 			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
 			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(5, TimeUnit.MINUTES)
-			.build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 
 	private AccountSession session;
 	private static List<String> badDomains = new ArrayList<>();
@@ -113,13 +111,13 @@ public class MastodonAPIController{
 				}
 
 				Request hreq=builder.build();
-				Call call=httpClient.newCall(hreq);
+				OkHttpClient client=req.timeout>0
+						? httpClient.newBuilder().readTimeout(req.timeout, TimeUnit.MILLISECONDS).build()
+						: httpClient;
+				Call call=client.newCall(hreq);
 				synchronized(req){
 					req.okhttpCall=call;
 				}
-				if(req.timeout>0){
-					call.timeout().timeout(req.timeout, TimeUnit.MILLISECONDS);
-				}
 
 				if(BuildConfig.DEBUG)
 					Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] Sending request: "+hreq);

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

@@ -153,8 +153,9 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 		headers.put(key, value);
 	}
 
-	protected void setTimeout(long timeout){
+	public MastodonAPIRequest<T> setTimeout(long timeout){
 		this.timeout=timeout;
+		return this;
 	}
 
 	protected String getPathPrefix(){

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

@@ -7,7 +7,10 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
@@ -48,7 +51,7 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -57,13 +60,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){
@@ -78,11 +81,15 @@ public class StatusInteractionController{
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Status reblog){
-						Status result = reblog.getContentStatus();
+						Status result=reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount + (reblogged ? 1 : -1));
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters){
+							E.post(new StatusCountersUpdatedEvent(result));
+							if(reblogged) E.post(new StatusCreatedEvent(reblog, accountID));
+							else E.post(new ReblogDeletedEvent(status.id, accountID));
+						}
 					}
 
 					@Override
@@ -91,13 +98,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
@@ -118,7 +125,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -127,12 +134,12 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningBookmarkRequests.put(status.id, req);
 		status.bookmarked=bookmarked;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

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

@@ -218,7 +218,7 @@ public class AccountSession{
 
 	public void savePreferencesIfPending(){
 		if(preferencesNeedSaving){
-			new UpdateAccountCredentialsPreferences(preferences, null, self.discoverable, self.source.indexable)
+			new UpdateAccountCredentialsPreferences(preferences, self.locked, self.discoverable, self.source.indexable)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Account result){

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.events;
+
+public class ReblogDeletedEvent{
+	public final String statusID;
+	public final String accountID;
+
+	public ReblogDeletedEvent(String statusID, String accountID){
+		this.statusID=statusID;
+		this.accountID=accountID;
+	}
+}

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

@@ -9,5 +9,6 @@ public class StatusCreatedEvent{
 	public StatusCreatedEvent(Status status, String accountID){
 		this.status=status;
 		this.accountID=accountID;
+		status.fromStatusCreated=true;
 	}
 }

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

@@ -465,12 +465,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public abstract void onItemClick(String id);
 
-	protected void updatePoll(String parentID, Status statusForContent, Poll poll){
-		statusForContent.poll=poll;
+	protected void updatePoll(String itemID, Status status, Poll poll){
+		status.poll=poll;
 		int firstOptionIndex=-1, footerIndex=-1;
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(item.contentStatusID.equals(statusForContent.id)){
+			if(item.parentID.equals(itemID)){
 				if(item instanceof PollOptionStatusDisplayItem && firstOptionIndex==-1){
 					firstOptionIndex=i;
 				}else if(item instanceof PollFooterStatusDisplayItem){
@@ -485,7 +485,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(parentID, statusForContent.id, this, poll, pollItems);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());

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

@@ -29,7 +29,6 @@ import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
-import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -111,11 +110,11 @@ import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -151,7 +150,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	public LinearLayout mainLayout;
 	private SizeListenerLinearLayout contentView;
-	private TextView selfName, selfUsername, selfExtraText, extraText, pronouns;
+	private TextView selfName, selfUsername, selfExtraText, extraText;
 	private ImageView selfAvatar;
 	private Account self;
 	private String instanceDomain;
@@ -327,7 +326,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		selfUsername=view.findViewById(R.id.self_username);
 		selfAvatar=view.findViewById(R.id.self_avatar);
 		selfExtraText=view.findViewById(R.id.self_extra_text);
-		HtmlParser.setTextWithCustomEmoji(selfName, self.displayName, self.emojis);
+		HtmlParser.setTextWithCustomEmoji(selfName, self.getDisplayName(), self.emojis);
 		selfUsername.setText('@'+self.username+'@'+instanceDomain);
 		if(self.avatar!=null)
 			ViewImageLoader.load(selfAvatar, null, new UrlImageLoaderRequest(self.avatar));
@@ -627,7 +626,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			});
 			View originalPost=view.findViewById(R.id.original_post);
 			extraText=view.findViewById(R.id.extra_text);
-			pronouns=view.findViewById(R.id.pronouns);
 			originalPost.setVisibility(View.VISIBLE);
 			originalPost.setOnClickListener(v->{
 				Bundle args=new Bundle();
@@ -667,7 +665,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			moreBtn.setBackground(null);
 
 			TextView name = view.findViewById(R.id.name);
-			name.setText(HtmlParser.parseCustomEmoji(status.account.displayName, status.account.emojis));
+			name.setText(HtmlParser.parseCustomEmoji(status.account.getDisplayName(), status.account.emojis));
 			UiUtils.loadCustomEmojiInTextView(name);
 
 			String time = status==null || status.editedAt==null
@@ -701,7 +699,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 			}
 
-			replyText.setText(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.displayName));
+			replyText.setText(getString(quote!=null? R.string.sk_quoting_user : R.string.in_reply_to, status.account.getDisplayName()));
 			int visibilityNameRes = switch (status.visibility) {
 				case PUBLIC -> R.string.visibility_public;
 				case UNLISTED -> R.string.sk_visibility_unlisted;
@@ -709,7 +707,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				case DIRECT -> R.string.visibility_private;
 				case LOCAL -> R.string.sk_local_only;
 			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.displayName) + ", " + getString(visibilityNameRes));
+			replyText.setContentDescription(getString(R.string.in_reply_to, status.account.getDisplayName()) + ", " + getString(visibilityNameRes));
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
@@ -798,6 +796,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		}
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(editingStatus==null ? R.menu.compose : R.menu.compose_edit, menu);
@@ -828,19 +827,34 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton = wrap.findViewById(R.id.language_btn);
 		languageButton.setOnClickListener(v->showLanguageAlert());
 		languageButton.setOnLongClickListener(v->{
-			languageButton.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
 			if(!getLocalPrefs().bottomEncoding){
 				getLocalPrefs().bottomEncoding=true;
 				getLocalPrefs().save();
 			}
 			return false;
 		});
+		publishButton.post(()->publishButton.setMinimumWidth(publishButton.getWidth()));
 
-		publishButton.setOnClickListener(v -> {
-			if(GlobalUserPreferences.altTextReminders && editingStatus==null)
-				checkAltTextsAndPublish();
-			else
-				publish();
+		publishButton.setOnClickListener(v->{
+			Consumer<Boolean> draftCheckComplete=(isDraft)->{
+				if(GlobalUserPreferences.altTextReminders && !isDraft) checkAltTextsAndPublish();
+				else publish();
+			};
+
+			boolean isAlreadyDraft=scheduledAt!=null && scheduledAt.isAfter(DRAFTS_AFTER_INSTANT);
+			if(editingStatus!=null && scheduledAt!=null && isAlreadyDraft) {
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.sk_save_draft)
+						.setMessage(R.string.sk_save_draft_message)
+						.setPositiveButton(R.string.save, (d, w)->draftCheckComplete.accept(isAlreadyDraft))
+						.setNegativeButton(R.string.publish, (d, w)->{
+							updateScheduledAt(null);
+							draftCheckComplete.accept(false);
+						})
+						.show();
+			}else{
+				draftCheckComplete.accept(isAlreadyDraft);
+			}
 		});
 		draftsBtn.setOnClickListener(v-> draftOptionsPopup.show());
 		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
@@ -852,8 +866,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				? languageResolver.fromOrFallback(prefs.postingDefaultLanguage)
 				: languageResolver.getDefault());
 
-		if (isInstancePixelfed()) spoilerBtn.setVisibility(View.GONE);
-		if (isInstancePixelfed() || (editingStatus != null && scheduledStatus == null)) {
+		if(isInstancePixelfed()) spoilerBtn.setVisibility(View.GONE);
+		if(isInstancePixelfed() || (editingStatus!=null && !redraftStatus)) {
 			// editing an already published post
 			draftsBtn.setVisibility(View.GONE);
 		}
@@ -977,7 +991,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	protected int getNavigationIconDrawableResource(){
-		return R.drawable.ic_baseline_close_24;
+		return R.drawable.ic_fluent_dismiss_24_regular;
 	}
 
 	@Override
@@ -1053,19 +1067,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void actuallyPublish(){
-		actuallyPublish(false);
-	}
-	private void actuallyPublish(boolean force){
 		String text=mainEditText.getText().toString();
 		CreateStatus.Request req=new CreateStatus.Request();
-		if ("bottom".equals(postLang.encoding)) {
-			text = new StatusTextEncoder(Bottom::encode).encode(text);
-			req.spoilerText = "bottom-encoded emoji spam";
+		if("bottom".equals(postLang.encoding)){
+			text=new StatusTextEncoder(Bottom::encode).encode(text);
+			req.spoilerText="bottom-encoded emoji spam";
 		}
-		if (localOnly &&
+		if(localOnly &&
 				AccountSessionManager.get(accountID).getLocalPreferences().glitchInstance &&
-				!GLITCH_LOCAL_ONLY_PATTERN.matcher(text).matches()) {
-			text += " " + GLITCH_LOCAL_ONLY_SUFFIX;
+				!GLITCH_LOCAL_ONLY_PATTERN.matcher(text).matches()){
+			text+=" "+GLITCH_LOCAL_ONLY_SUFFIX;
 		}
 		req.status=text;
 		req.localOnly=localOnly;
@@ -1079,19 +1090,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				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)) {
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.sk_save_draft)
-					.setMessage(R.string.sk_save_draft_message)
-					.setPositiveButton(R.string.save, (d, w) -> actuallyPublish(true))
-					.setNegativeButton(R.string.publish, (d, w) -> {
-						updateScheduledAt(null);
-						actuallyPublish();
-					})
-					.show();
-			return;
-		}
 		if(replyTo!=null || (editingStatus != null && editingStatus.inReplyToId!=null)){
 			req.inReplyToId=editingStatus!=null ? editingStatus.inReplyToId : replyTo.id;
 		}
@@ -1286,20 +1284,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void confirmDiscardDraftAndFinish(){
-		boolean attachmentsPending = mediaViewController.areAnyAttachmentsNotDone();
-		if (attachmentsPending) new M3AlertDialogBuilder(getActivity())
+		boolean attachmentsPending=mediaViewController.areAnyAttachmentsNotDone();
+		if(attachmentsPending) new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_unfinished_attachments)
 				.setMessage(R.string.sk_unfinished_attachments_message)
-				.setPositiveButton(R.string.edit, (d, w) -> {})
-				.setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
+				.setPositiveButton(R.string.ok, (d, w)->{})
+				.setNegativeButton(R.string.discard, (d, w)->Nav.finish(this))
 				.show();
 		else new M3AlertDialogBuilder(getActivity())
-				.setTitle(editingStatus != null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
-				.setPositiveButton(R.string.save, (d, w) -> {
-					updateScheduledAt(scheduledAt == null ? getDraftInstant() : scheduledAt);
+				.setTitle(editingStatus!=null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
+				.setPositiveButton(R.string.save, (d, w)->{
+					updateScheduledAt(scheduledAt==null ? getDraftInstant() : scheduledAt);
 					publish();
 				})
-				.setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
+				.setNegativeButton(R.string.discard, (d, w)->Nav.finish(this))
 				.show();
 	}
 
@@ -1456,8 +1454,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void updateHeaders() {
-		UiUtils.setExtraTextInfo(getContext(), selfExtraText, null, false, false, localOnly || statusVisibility==StatusPrivacy.LOCAL, null);
-		if (replyTo != null) UiUtils.setExtraTextInfo(getContext(), extraText, pronouns, true, false, replyTo.localOnly || replyTo.visibility==StatusPrivacy.LOCAL, replyTo.account);
+		UiUtils.setExtraTextInfo(getContext(), selfExtraText, false, false, localOnly, null);
+		if (replyTo != null) UiUtils.setExtraTextInfo(getContext(), extraText, true, false, replyTo.localOnly || replyTo.visibility==StatusPrivacy.LOCAL, replyTo.account);
 	}
 
 	private void buildVisibilityPopup(View v){

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

@@ -20,7 +20,6 @@ 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;
@@ -271,7 +270,7 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 			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);
+			UiUtils.setExtraTextInfo(getContext(), null, true, false, false, item.account);
 
 			if(relationship==null || !relationship.followedBy){
 				actionWrap.setVisibility(View.GONE);
@@ -366,9 +365,9 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 			if(account.emojis.isEmpty()){
-				parsedName=account.displayName;
+				parsedName= account.getDisplayName();
 			}else{
-				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
 			}
 		}

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

@@ -32,7 +32,6 @@ import org.joinmastodon.android.events.NotificationsMarkerUpdatedEvent;
 import org.joinmastodon.android.events.StatusDisplaySettingsChangedEvent;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
@@ -71,14 +70,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private TextView notificationsBadge;
 
 	private String accountID;
-	private boolean isAkkoma;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_app_name);
-		isAkkoma = getInstance().map(Instance::isAkkoma).orElse(false);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
@@ -89,7 +86,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			homeTabFragment=new HomeTabFragment();
 			homeTabFragment.setArguments(args);
 			args=new Bundle(args);
-			args.putBoolean("disableDiscover", isAkkoma);
 			args.putBoolean("noAutoLoad", true);
 			discoverFragment=new DiscoverFragment();
 			discoverFragment.setArguments(args);
@@ -296,7 +292,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if(tab==R.id.tab_profile){
 			ArrayList<String> options=new ArrayList<>();
 			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
-				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
+				options.add(session.self.getDisplayName()+"\n("+session.self.username+"@"+session.domain+")");
 			}
 			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;

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

@@ -233,21 +233,25 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 
 		ViewTreeObserver vto = getToolbar().getViewTreeObserver();
 		if (vto.isAlive()) {
-			vto.addOnGlobalLayoutListener(() -> {
-				Toolbar t = getToolbar();
-				if (t == null) return;
-				int toolbarWidth = t.getWidth();
-				if (toolbarWidth == 0) return;
+			vto.addOnGlobalLayoutListener(()->{
+				Toolbar t=getToolbar();
+				if(t==null) return;
+				int toolbarWidth=t.getWidth();
+				if(toolbarWidth==0) return;
 
-				int toolbarFrameWidth = toolbarFrame.getWidth();
-				int padding = toolbarWidth - toolbarFrameWidth;
-				FrameLayout parent = ((FrameLayout) toolbarShowNewPostsBtn.getParent());
-				if (padding == parent.getPaddingStart()) return;
+				int toolbarFrameWidth=toolbarFrame.getWidth();
+				int actionsWidth=toolbarWidth-toolbarFrameWidth;
+				// margin (4) + padding (12) + icon (24) + margin (8) + chevron (16) + padding (12)
+				int switcherWidth=V.dp(76);
+				FrameLayout parent=((FrameLayout) toolbarShowNewPostsBtn.getParent());
+				if(actionsWidth==parent.getPaddingStart()) return;
+				int paddingMax=Math.max(actionsWidth, switcherWidth);
+				int paddingEnd=(Math.max(0, switcherWidth-actionsWidth));
 
 				// toolbar frame goes from screen edge to beginning of right-aligned option buttons.
 				// centering button by applying the same space on the left
-				parent.setPaddingRelative(padding, 0, 0, 0);
-				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
+				parent.setPaddingRelative(paddingMax, 0, paddingEnd, 0);
+				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth-paddingMax*2);
 
 				switcher.setPivotX(V.dp(28)); // padding + half of icon
 				switcher.setPivotY(switcher.getHeight() / 2f);
@@ -400,9 +404,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		addListsToOverflowMenu();
 		addHashtagsToOverflowMenu();
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
 			m.setGroupDividerEnabled(true);
-		}
 	}
 
 	@Override

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

@@ -61,7 +61,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 						maxID=result.maxID;
 						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
 						onDataLoaded(result.items, !empty);
-						if(result.isFromCache())
+						if(result.isFromCache() && GlobalUserPreferences.loadNewPosts)
 							loadNewPosts();
 					}
 				});
@@ -74,7 +74,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				if(parent != null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+				if(parent!=null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
 					parent.hideNewPostsButton();
 				}
 			}
@@ -87,7 +87,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 		if(!getArguments().getBoolean("noAutoLoad")){
 			if(!loaded && !dataLoading){
 				loadData();
-			}else if(!dataLoading){
+			}else if(!dataLoading && GlobalUserPreferences.loadNewPosts){
 				loadNewPosts();
 			}
 		}
@@ -117,48 +117,54 @@ public class HomeTimelineFragment extends StatusListFragment {
 	}
 
 	public void onStatusCreated(Status status){
+		if(status.reblog!=null) return;
 		prependItems(Collections.singletonList(status), true);
 	}
 
 	private void loadNewPosts(){
-		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
+		// we only care about the data that was actually retrieved from the timeline api since
+		// user-created statuses are probably in the wrong position
+		List<Status> dataFromTimeline=data.stream().filter(s->!s.fromStatusCreated).collect(Collectors.toList());
 		// The idea here is that we request the timeline such that if there are fewer than `limit` posts,
 		// we'll get the currently topmost post as last in the response. This way we know there's no gap
 		// between the existing and newly loaded parts of the timeline.
-		String sinceID=data.size()>1 ? data.get(1).id : "1";
+		String sinceID=dataFromTimeline.size()>1 ? dataFromTimeline.get(1).id : "1";
 		currentRequest=new GetHomeTimeline(null, null, 20, sinceID, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
+						refreshDone();
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						Status last=result.get(result.size()-1);
 						List<Status> toAdd;
-						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
+						if(!dataFromTimeline.isEmpty() && last.id.equals(dataFromTimeline.get(0).id)){ // This part intersects with the existing one
 							toAdd=new ArrayList<>(result.subList(0, result.size()-1)); // Remove the already known last post
 						}else{
 							last.hasGapAfter=last.id;
 							toAdd=result;
 						}
+						if(!toAdd.isEmpty())
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(new ArrayList<>(toAdd), false);
+						// removing statuses that come up as duplicates (hopefully only posts and boosts that were locally created
+						// and thus were already prepended to the timeline earlier)
 						List<String> existingIds=data.stream().map(Status::getID).collect(Collectors.toList());
 						toAdd.removeIf(s->existingIds.contains(s.getID()));
-						List<Status> toAddUnfiltered=new ArrayList<>(toAdd);
 						AccountSessionManager.get(accountID).filterStatuses(toAdd, getFilterContext());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
 							if(parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
 						}
-						if(toAddUnfiltered.isEmpty())
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAddUnfiltered, false);
 					}
 
 					@Override
 					public void onError(ErrorResponse error){
 						currentRequest=null;
 						dataLoading=false;
+						refreshDone();
 					}
 				})
 				.exec(accountID);
@@ -325,8 +331,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 			currentRequest=null;
 			dataLoading=false;
 		}
-		if (parent != null) parent.hideNewPostsButton();
-		super.onRefresh();
+		if(parent!=null) parent.hideNewPostsButton();
+		loadNewPosts();
 	}
 
 	@Override

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

@@ -621,14 +621,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@SuppressLint("SetTextI18n")
 	private void bindHeaderView(){
-		setTitle(account.displayName);
+		setTitle(account.getDisplayName());
 		setSubtitle(getResources().getQuantityString(R.plurals.x_posts, (int)(account.statusesCount%1000), account.statusesCount));
 		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);
+		SpannableStringBuilder ssb=new SpannableStringBuilder(account.getDisplayName());
 		if(AccountSessionManager.get(accountID).getLocalPreferences().customEmojiInNames)
 			HtmlParser.parseCustomEmoji(ssb, account.emojis);
 		name.setText(ssb);
@@ -755,20 +755,21 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
 		openWithAccounts.setVisible(hasMultipleAccounts);
-		SubMenu accountsMenu = openWithAccounts.getSubMenu();
-		if (hasMultipleAccounts) {
+		SubMenu accountsMenu=openWithAccounts.getSubMenu();
+		if(hasMultipleAccounts){
 			accountsMenu.clear();
 			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
 					getActivity(), s.getID(), account.url, false
 			));
 		}
-		menu.findItem(R.id.share).setTitle(R.string.share_user);
+
 		if(isOwnProfile) {
 			if (isInstancePixelfed()) menu.findItem(R.id.scheduled).setVisible(false);
 			return;
 		}
 
-		MenuItem mute = menu.findItem(R.id.mute);
+		menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+		MenuItem mute=menu.findItem(R.id.mute);
 		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
 		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
 		UiUtils.insetPopupMenuIcon(getContext(), mute);
@@ -776,19 +777,22 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
 		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+		MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 		if (relationship.following) {
-			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			hideBoosts.setVisible(true);
 		} else {
-			menu.findItem(R.id.hide_boosts).setVisible(false);
+			hideBoosts.setVisible(false);
+		}
+		MenuItem blockDomain=menu.findItem(R.id.block_domain);
+		if(!account.isLocal()){
+			blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+			blockDomain.setVisible(true);
+		}else{
+			blockDomain.setVisible(false);
 		}
-		if(!account.isLocal())
-			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-		else
-			menu.findItem(R.id.block_domain).setVisible(false);
 	}
 
 	@Override
@@ -800,11 +804,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			intent.putExtra(Intent.EXTRA_TEXT, account.url);
 			startActivity(Intent.createChooser(intent, item.getTitle()));
 		}else if(id==R.id.mute){
-			confirmToggleMuted();
+			UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 		}else if(id==R.id.block){
-			confirmToggleBlocked();
+			UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
 		}else if(id==R.id.soft_block){
-			confirmSoftBlockUser();
+			UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -1101,7 +1105,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		updateMetadataHeight();
 
 		Toolbar toolbar=getToolbar();
-		Drawable close=getToolbarContext().getDrawable(R.drawable.ic_baseline_close_24).mutate();
+		Drawable close=getToolbarContext().getDrawable(R.drawable.ic_fluent_dismiss_24_regular).mutate();
 		close.setTint(UiUtils.getThemeColor(getToolbarContext(), R.attr.colorM3OnSurfaceVariant));
 		toolbar.setNavigationIcon(close);
 		toolbar.setNavigationContentDescription(R.string.discard);
@@ -1207,18 +1211,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.exec(accountID);
 	}
 
-	private void confirmToggleMuted(){
-		UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
-	}
-
-	private void confirmToggleBlocked(){
-		UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
-	}
-
-	private void confirmSoftBlockUser(){
-		UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
-	}
-
 	private void updateRelationship(Relationship r){
 		relationship=r;
 		updateRelationship();

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

@@ -119,6 +119,15 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 		}
 	}
 
+	@Override
+	protected void onShown(){
+		super.onShown();
+		// because, for some reason, when navigating back from compose fragment,
+		// match_parent would otherwise be incorrect (leaving a gap for the keyboard
+		// where there is none)
+		list.post(list::requestLayout);
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetScheduledStatuses(offset==0 ? null : nextMaxID, count)

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

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

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

@@ -9,10 +9,12 @@ import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
+import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
@@ -30,7 +32,10 @@ import org.parceler.Parcels;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -144,12 +149,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
-	protected Status getContentStatusByID(String id){
+	public Status getContentStatusByID(String id){
 		Status s=getStatusByID(id);
 		return s==null ? null : s.getContentStatus();
 	}
 
-	protected Status getStatusByID(String id){
+	public Status getStatusByID(String id){
 		for(Status s:data){
 			if(s.id.equals(id)){
 				return s;
@@ -176,57 +181,71 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		}
 	}
 
-	private void iterateRemoveStatus(List<Status> l, String id){
-		Iterator<Status> it=l.iterator();
-		while(it.hasNext()){
-			if(Objects.equals(it.next().getContentStatus().id, id)){
-				it.remove();
-			}
-		}
-	}
-
-	private int removeStatusDisplayItems(Status status, int index, int ancestorFirstIndex, int ancestorLastIndex, int indexOffset){
+	private boolean removeStatusDisplayItems(String parentID, int firstIndex, int ancestorFirstIndex, int ancestorLastIndex){
 		// did we find an ancestor that is also the status' neighbor?
-		if(ancestorFirstIndex>=0 && ancestorLastIndex==index-1){
-			for(int i=ancestorFirstIndex; i<=ancestorLastIndex; i++){
-				StatusDisplayItem item=displayItems.get(i);
-				// update ancestor to have no descendant anymore
-				if(item.contentStatusID.equals(status.inReplyToId)) item.hasDescendantNeighbor=false;
-			}
-			adapter.notifyItemRangeChanged(ancestorFirstIndex-indexOffset, ancestorLastIndex-ancestorFirstIndex+1);
+		if(ancestorFirstIndex>=0 && ancestorLastIndex==firstIndex-1){
+			// update ancestor to have no descendant anymore
+			displayItems.subList(ancestorFirstIndex, ancestorLastIndex+1).forEach(i->i.hasDescendantNeighbor=false);
+			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex-ancestorFirstIndex+1);
 		}
 
-		if(index==-1) return 0;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).contentStatusID.equals(status.id))
-				break;
+		if(firstIndex==-1) return false;
+		int lastIndex=firstIndex;
+		while(lastIndex<displayItems.size()){
+			if(!displayItems.get(lastIndex).parentID.equals(parentID)) break;
+			lastIndex++;
 		}
-		int count=lastIndex-index;
-		displayItems.subList(index-indexOffset, lastIndex-indexOffset).clear();
-		adapter.notifyItemRangeRemoved(index-indexOffset, lastIndex-index);
-		return count;
+		int count=lastIndex-firstIndex;
+		displayItems.subList(firstIndex, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(firstIndex, count);
+		return true;
 	}
 
 	protected void removeStatus(Status status){
-		Status contentStatus=status.getContentStatus();
-		String id=contentStatus.id;
-		iterateRemoveStatus(data, id);
-		iterateRemoveStatus(preloadedData, id);
+		final AccountSessionManager asm=AccountSessionManager.getInstance();
+		final CacheController cache=AccountSessionManager.get(accountID).getCacheController();
+		final boolean unReblogging=status.reblog!=null && asm.isSelf(accountID, status.account);
+		final Predicate<Status> isToBeRemovedReblog=item->item!=null && item.reblog!=null
+				&& item.reblog.id.equals(status.reblog.id)
+				&& asm.isSelf(accountID, item.account);
+		final BiPredicate<String, Supplier<String>> isToBeRemovedContent=(parentId, contentIdSupplier)->
+				parentId.equals(status.id) || contentIdSupplier.get().equals(status.id);
+
 		int ancestorFirstIndex=-1, ancestorLastIndex=-1;
-		int offset=0;
 		for(int i=0;i<displayItems.size();i++){
-			StatusDisplayItem item = displayItems.get(i);
-			if(id.equals(item.contentStatusID)){
-				offset+=removeStatusDisplayItems(contentStatus, i, ancestorFirstIndex, ancestorLastIndex, offset);
-				ancestorFirstIndex=ancestorLastIndex=-1;
-				continue;
-			}
+			StatusDisplayItem item=displayItems.get(i);
+			// we found a status that the to-be-removed status replies to!
+			// storing indices to maybe update its display items
 			if(item.parentID.equals(status.inReplyToId)){
 				if(ancestorFirstIndex==-1) ancestorFirstIndex=i;
 				ancestorLastIndex=i;
 			}
+			// if we're un-reblogging, we compare the reblogged status's id with the current status's
+			if(unReblogging
+					? isToBeRemovedReblog.test(getStatusByID(item.parentID))
+					: isToBeRemovedContent.test(item.parentID, item::getContentStatusID)){
+				// if statuses are removed from index i, the next iteration should be on the same index again
+				if(removeStatusDisplayItems(item.parentID, i, ancestorFirstIndex, ancestorLastIndex)) i--;
+				// resetting in case we find another occurrence of the same status that also has ancestors
+				// (we won't - unless the timeline is being especially weird)
+				ancestorFirstIndex=-1; ancestorLastIndex=-1;
+			}
 		}
+
+		Consumer<List<Status>> removeStatusFromData=(list)->{
+			Iterator<Status> it=list.iterator();
+			while(it.hasNext()){
+				Status s=it.next();
+				if(unReblogging
+						? isToBeRemovedReblog.test(s)
+						: isToBeRemovedContent.test(s.id, s::getContentStatusID)){
+					it.remove();
+					cache.deleteStatus(s.id);
+				}
+			}
+		};
+		removeStatusFromData.accept(data);
+		removeStatusFromData.accept(preloadedData);
 	}
 
 	@Override
@@ -295,6 +314,22 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 			removeStatus(status);
 		}
 
+		@Subscribe
+		public void onReblogDeleted(ReblogDeletedEvent ev){
+			AccountSessionManager asm=AccountSessionManager.getInstance();
+			if(!ev.accountID.equals(accountID))
+				return;
+			for(Status item : data){
+				boolean itemIsOwnReblog=item.reblog!=null
+						&& item.getContentStatusID().equals(ev.statusID)
+						&& asm.isSelf(accountID, item.account);
+				if(itemIsOwnReblog){
+					removeStatus(item);
+					break;
+				}
+			}
+		}
+
 		@Subscribe
 		public void onStatusCreated(StatusCreatedEvent ev){
 			if(!ev.accountID.equals(accountID))

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

@@ -64,7 +64,7 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 			knownAccounts.put(inReplyToAccount.id, inReplyToAccount);
 		data.add(mainStatus);
 		onAppendItems(Collections.singletonList(mainStatus));
-		setTitle(HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.displayName), mainStatus.account.emojis));
+		setTitle(HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.getDisplayName()), mainStatus.account.emojis));
 		transitionFinished = getArguments().getBoolean("noTransition", false);
 	}
 

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

@@ -4,6 +4,7 @@ import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -65,6 +66,8 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override
@@ -258,7 +261,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			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);
+			UiUtils.setExtraTextInfo(getContext(), null, true, false, false, item.account);
 
 			if(relationship==null){
 				actionWrap.setVisibility(View.GONE);
@@ -327,9 +330,9 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 			if(account.emojis.isEmpty()){
-				parsedName=account.displayName;
+				parsedName= account.getDisplayName();
 			}else{
-				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
 			}
 		}

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

@@ -13,8 +13,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.SimpleViewHolder;
@@ -155,7 +157,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 
-		disableDiscover=getArguments().getBoolean("disableDiscover");
+		disableDiscover=AccountSessionManager.get(accountID).getInstance().map(Instance::isAkkoma).orElse(false);
 		searchView=view.findViewById(R.id.search_fragment);
 		if(searchFragment==null){
 			searchFragment=new SearchFragment();

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

@@ -2,8 +2,8 @@ package org.joinmastodon.android.fragments.discover;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -14,14 +14,12 @@ import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.model.viewmodel.CardViewModel;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.drawables.BlurhashCrossfadeDrawable;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -32,11 +30,9 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.ListImageLoaderAdapter;
 import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
 import me.grishka.appkit.imageloader.RecyclerViewDelegate;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
@@ -60,6 +56,8 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<CardViewModel> im
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
 		bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS, accountID);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override

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

@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 public class SearchFragment extends BaseStatusListFragment<SearchResult>{
@@ -142,7 +143,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}*/
 		int offset=_offset;
 		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
-				.setCallback(new Callback<>(){
+				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){
 						ArrayList<SearchResult> results=new ArrayList<>();
@@ -165,16 +166,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 						unfilteredResults=results;
 						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
 					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						currentRequest=null;
-						Activity a=getActivity();
-						if(a==null)
-							return;
-						error.showToast(a);
-					}
 				})
+				.setTimeout(180000) // 3 minutes (searches can take a long time)
 				.exec(accountID);
 	}
 

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

@@ -115,7 +115,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 				onDataLoaded(results.stream().map(sr->{
 					SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, true);
 					if(sr.type==SearchResult.Type.HASHTAG){
-						vm.hashtagItem.onClick=()->openHashtag(sr);
+						vm.hashtagItem.setOnClick(i->openHashtag(sr));
 					}
 					return vm;
 				}).collect(Collectors.toList()), false);
@@ -132,7 +132,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 									.map(sr->{
 										SearchResultViewModel vm=new SearchResultViewModel(sr, accountID, false);
 										if(sr.type==SearchResult.Type.HASHTAG){
-											vm.hashtagItem.onClick=()->openHashtag(sr);
+											vm.hashtagItem.setOnClick(i->openHashtag(sr));
 										}
 										return vm;
 									})
@@ -429,11 +429,11 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		wrapSuicideDialog(()->deliverResult(currentQuery, null));
 	}
 
-	private void onOpenURLClick(){
+	private void onOpenURLClick(ListItem<?> item_){
 		UiUtils.openURL(getContext(), accountID, searchViewHelper.getQuery(), false);
 	}
 
-	private void onGoToHashtagClick(){
+	private void onGoToHashtagClick(ListItem<?> item_){
 		wrapSuicideDialog(()->{
 			String q=searchViewHelper.getQuery();
 			if(q.startsWith("#"))
@@ -442,7 +442,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		});
 	}
 
-	private void onGoToAccountClick(){
+	private void onGoToAccountClick(ListItem<?> item_){
 		String q=searchViewHelper.getQuery();
 		if(!q.startsWith("@")){
 			q="@"+q;
@@ -459,11 +459,11 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 		}).ifPresent(progress -> progress.wrapProgress((Activity) getContext(), R.string.loading, true));
 	}
 
-	private void onGoToStatusSearchClick(){
+	private void onGoToStatusSearchClick(ListItem<?> item_){
 		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.STATUS));
 	}
 
-	private void onGoToAccountSearchClick(){
+	private void onGoToAccountSearchClick(ListItem<?> item_){
 		wrapSuicideDialog(()->deliverResult(searchViewHelper.getQuery(), SearchResult.Type.ACCOUNT));
 	}
 

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,8 +10,6 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.HashtagChartView;
 
@@ -34,6 +33,8 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
+			setRetainInstance(true);
 	}
 
 	@Override

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

@@ -83,9 +83,10 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 	@Override
 	protected void updateFilteredList(){
-		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
+		String query=getCurrentSearchQuery();
+		boolean addFakeInstance=query.length()>0 && query.matches("^\\S+\\.[^\\.]+$");
 		if(addFakeInstance){
-			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
+			fakeInstance.domain=fakeInstance.normalizedDomain=query;
 			fakeInstance.description=getString(R.string.loading_instance);
 			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
 				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
@@ -99,12 +100,12 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		}
 		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
 		filteredData.clear();
-		if(currentSearchQuery.length()>0){
+		if(query.length()>0){
 			boolean foundExactMatch=false;
 			for(CatalogInstance inst:data){
-				if(inst.normalizedDomain.contains(currentSearchQuery)){
+				if(inst.normalizedDomain.contains(query)){
 					filteredData.add(inst);
-					if(inst.normalizedDomain.equals(currentSearchQuery))
+					if(inst.normalizedDomain.equals(query))
 						foundExactMatch=true;
 				}
 			}

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

@@ -93,10 +93,10 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
 		updateFilteredList();
 		searchEdit.removeCallbacks(searchDebouncer);
-		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
+		Instance instance=instancesCache.get(normalizeInstanceDomain(getCurrentSearchQuery()));
 		if(instance==null){
 			showProgressDialog();
-			loadInstanceInfo(currentSearchQuery, false);
+			loadInstanceInfo(getCurrentSearchQuery(), false);
 		}else{
 			proceedWithAuthOrSignup(instance);
 		}
@@ -106,7 +106,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 	protected void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase().trim();
 		updateFilteredList();
-		loadInstanceInfo(currentSearchQuery, false);
+		loadInstanceInfo(getCurrentSearchQuery(), false);
 	}
 
 	protected List<CatalogInstance> sortInstances(List<CatalogInstance> result){
@@ -126,9 +126,16 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 		instanceProgressDialog.show();
 	}
 
+	protected String getCurrentSearchQuery(){
+		String[] parts=currentSearchQuery.split("@");
+		return parts.length>0 ? parts[parts.length-1] : "";
+	}
+
 	protected String normalizeInstanceDomain(String _domain){
 		if(TextUtils.isEmpty(_domain))
 			return null;
+		String[] parts=_domain.split("@");
+		_domain=parts[parts.length - 1];
 		if(_domain.contains(":")){
 			try{
 				_domain=Uri.parse(_domain).getAuthority();
@@ -198,7 +205,7 @@ abstract class InstanceCatalogFragment extends MastodonRecyclerFragment<CatalogI
 					instanceProgressDialog=null;
 					proceedWithAuthOrSignup(result);
 				}
-				if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
+				if(Objects.equals(domain, getCurrentSearchQuery()) || Objects.equals(getCurrentSearchQuery(), redirects.get(domain)) || Objects.equals(getCurrentSearchQuery(), redirectsInverse.get(domain))){
 					boolean found=false;
 					for(CatalogInstance ci:filteredData){
 						if(ci.domain.equals(domain) && ci!=fakeInstance){

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments.onboarding;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -34,7 +34,6 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class ReportDoneFragment extends MastodonToolbarFragment{
@@ -227,7 +226,7 @@ public class ReportDoneFragment extends MastodonToolbarFragment{
 
 	@Override
 	protected int getNavigationIconDrawableResource(){
-		return R.drawable.ic_baseline_close_24;
+		return R.drawable.ic_fluent_dismiss_24_regular;
 	}
 
 	@Override

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

@@ -73,7 +73,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 				durationItem=new ListItem<>(R.string.settings_filter_duration, 0, this::onDurationClick),
 				wordsItem=new ListItem<>(R.string.settings_filter_muted_words, 0, this::onWordsClick),
 				contextItem=new ListItem<>(R.string.settings_filter_context, 0, this::onContextClick),
-				cwItem=new CheckableListItem<>(R.string.settings_filter_show_cw, R.string.settings_filter_show_cw_explanation, CheckableListItem.Style.SWITCH, filter==null || filter.filterAction==FilterAction.WARN, ()->toggleCheckableItem(cwItem))
+				cwItem=new CheckableListItem<>(R.string.settings_filter_show_cw, R.string.settings_filter_show_cw_explanation, CheckableListItem.Style.SWITCH, filter==null || filter.filterAction==FilterAction.WARN, this::toggleCheckableItem)
 		));
 
 		if(filter!=null){
@@ -113,7 +113,7 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		return 1;
 	}
 
-	private void onDurationClick(){
+	private void onDurationClick(ListItem<Void> item_){
 		int[] durationOptions={
 				1800,
 				3600,
@@ -182,21 +182,21 @@ public class EditFilterFragment extends BaseSettingsFragment<Void> implements On
 		alert.setOnDismissListener(dialog->callback.accept(null));
 	}
 
-	private void onWordsClick(){
+	private void onWordsClick(ListItem<Void> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putParcelableArrayList("words", (ArrayList<? extends Parcelable>) keywords.stream().map(Parcels::wrap).collect(Collectors.toCollection(ArrayList::new)));
 		Nav.goForResult(getActivity(), FilterWordsFragment.class, args, WORDS_RESULT, this);
 	}
 
-	private void onContextClick(){
+	private void onContextClick(ListItem<Void> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putSerializable("context", context);
 		Nav.goForResult(getActivity(), FilterContextFragment.class, args, CONTEXT_RESULT, this);
 	}
 
-	private void onDeleteClick(){
+	private void onDeleteClick(ListItem<Void> item_){
 		AlertDialog alert=new M3AlertDialogBuilder(getActivity())
 				.setTitle(getString(R.string.settings_delete_filter_title, filter.title))
 				.setMessage(R.string.settings_delete_filter_confirmation)

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

@@ -22,10 +22,9 @@ public class FilterContextFragment extends BaseSettingsFragment<FilterContext> i
 		setTitle(R.string.settings_filter_context);
 		context=(EnumSet<FilterContext>) getArguments().getSerializable("context");
 		onDataLoaded(Arrays.stream(FilterContext.values()).map(c->{
-			CheckableListItem<FilterContext> item=new CheckableListItem<>(c.getDisplayNameRes(), 0, CheckableListItem.Style.CHECKBOX, context.contains(c), null);
+			CheckableListItem<FilterContext> item=new CheckableListItem<>(c.getDisplayNameRes(), 0, CheckableListItem.Style.CHECKBOX, context.contains(c), this::toggleCheckableItem);
 			item.parentObject=c;
 			item.isEnabled=true;
-			item.onClick=()->toggleCheckableItem(item);
 			return item;
 		}).collect(Collectors.toList()));
 	}

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

@@ -1,11 +1,6 @@
 package org.joinmastodon.android.fragments.settings;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.IntEvaluator;
-import android.animation.ObjectAnimator;
 import android.app.AlertDialog;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -27,6 +22,7 @@ import org.joinmastodon.android.model.FilterKeyword;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
 import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.ActionModeHelper;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
@@ -37,7 +33,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
@@ -60,7 +55,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			FilterKeyword word=Parcels.unwrap(p);
 			ListItem<FilterKeyword> item=new ListItem<>(word.keyword, null, null, word);
 			item.isEnabled=true;
-			item.onClick=()->onWordClick(item);
+			item.setOnClick(this::onWordClick);
 			return item;
 		}).collect(Collectors.toList()));
 		setHasOptionsMenu(true);
@@ -114,7 +109,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.settings_filter_words, menu);
+		inflater.inflate(R.menu.selectable_list, menu);
 	}
 
 	@Override
@@ -174,7 +169,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 				w.keyword=input;
 				ListItem<FilterKeyword> item=new ListItem<>(w.keyword, null, null, w);
 				item.isEnabled=true;
-				item.onClick=()->onWordClick(item);
+				item.setOnClick(this::onWordClick);
 				data.add(item);
 				itemsAdapter.notifyItemInserted(data.size()-1);
 			}else{
@@ -228,29 +223,15 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			return;
 		V.setVisibilityAnimated(fab, View.GONE);
 
-		actionMode=getActivity().startActionMode(new ActionMode.Callback(){
+		actionMode=ActionModeHelper.startActionMode(this, ()->elevationOnScrollListener.getCurrentStatusBarColor(), new ActionMode.Callback(){
 			@Override
 			public boolean onCreateActionMode(ActionMode mode, Menu menu){
-				ObjectAnimator anim=ObjectAnimator.ofInt(getActivity().getWindow(), "statusBarColor", elevationOnScrollListener.getCurrentStatusBarColor(), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
-				anim.setEvaluator(new IntEvaluator(){
-					@Override
-					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
-						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
-					}
-				});
-				anim.start();
-				((FragmentStackActivity) getActivity()).invalidateSystemBarColors(FilterWordsFragment.this);
 				return true;
 			}
 
 			@Override
 			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
 				mode.getMenuInflater().inflate(R.menu.settings_filter_words_action_mode, menu);
-				for(int i=0;i<menu.size();i++){
-					Drawable icon=menu.getItem(i).getIcon().mutate();
-					icon.setTint(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnPrimary));
-					menu.getItem(i).setIcon(icon);
-				}
 				deleteItem=menu.findItem(R.id.delete);
 				return true;
 			}
@@ -266,21 +247,6 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			@Override
 			public void onDestroyActionMode(ActionMode mode){
 				leaveSelectionMode(true);
-				ObjectAnimator anim=ObjectAnimator.ofInt(getActivity().getWindow(), "statusBarColor", UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), elevationOnScrollListener.getCurrentStatusBarColor());
-				anim.setEvaluator(new IntEvaluator(){
-					@Override
-					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
-						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
-					}
-				});
-				anim.addListener(new AnimatorListenerAdapter(){
-					@Override
-					public void onAnimationEnd(Animator animation){
-						getActivity().getWindow().setStatusBarColor(0);
-					}
-				});
-				anim.start();
-				((FragmentStackActivity) getActivity()).invalidateSystemBarColors(FilterWordsFragment.this);
 			}
 		});
 
@@ -289,7 +255,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			ListItem<FilterKeyword> item=data.get(i);
 			CheckableListItem<FilterKeyword> newItem=new CheckableListItem<>(item.title, null, CheckableListItem.Style.CHECKBOX, selectAll, null);
 			newItem.isEnabled=true;
-			newItem.onClick=()->onSelectionModeWordClick(newItem);
+			newItem.setOnClick(this::onSelectionModeWordClick);
 			newItem.parentObject=item.parentObject;
 			if(selectAll)
 				selectedItems.add(newItem);
@@ -313,7 +279,7 @@ public class FilterWordsFragment extends BaseSettingsFragment<FilterKeyword> imp
 			ListItem<FilterKeyword> item=data.get(i);
 			ListItem<FilterKeyword> newItem=new ListItem<>(item.title, null, null);
 			newItem.isEnabled=true;
-			newItem.onClick=()->onWordClick(newItem);
+			newItem.setOnClick(this::onWordClick);
 			newItem.parentObject=item.parentObject;
 			data.set(i, newItem);
 		}

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

@@ -16,7 +16,6 @@ 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;
@@ -26,23 +25,32 @@ import me.grishka.appkit.utils.V;
 
 public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 	private ListItem<Void> mediaCacheItem;
+	private AccountSession session;
+	private boolean timelineCacheCleared=false;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setTitle(getString(R.string.about_app, getString(R.string.sk_app_name)));
-		AccountSession s=AccountSessionManager.get(accountID);
+		session=AccountSessionManager.get(accountID);
 		onDataLoaded(List.of(
-				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.openHashtagTimeline(getActivity(), accountID, getString(R.string.donate_hashtag))),
-				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),
-				mediaCacheItem=new ListItem<>(R.string.settings_clear_cache, 0, this::onClearMediaCacheClick)
+				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, i->UiUtils.openHashtagTimeline(getActivity(), accountID, getString(R.string.donate_hashtag))),
+				new ListItem<>(R.string.sk_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), getString(R.string.repo_url))),
+				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")),
+				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),
+				mediaCacheItem=new ListItem<>(R.string.settings_clear_cache, 0, this::onClearMediaCacheClick),
+				new ListItem<>(getString(R.string.sk_settings_clear_timeline_cache), session.domain, this::onClearTimelineCacheClick)
 		));
 
 		updateMediaCacheItem();
 	}
 
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+		if(timelineCacheCleared) getActivity().recreate();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){}
 
@@ -63,7 +71,7 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 		return adapter;
 	}
 
-	private void onClearMediaCacheClick(){
+	private void onClearMediaCacheClick(ListItem<?> item){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
 			ImageCache.getInstance(getActivity()).clear();
@@ -74,6 +82,12 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 		});
 	}
 
+	private void onClearTimelineCacheClick(ListItem<?> item){
+		session.getCacheController().putHomeTimeline(List.of(), true);
+		Toast.makeText(getContext(), R.string.sk_timeline_cache_cleared, Toast.LENGTH_SHORT).show();
+		timelineCacheCleared=true;
+	}
+
 	private void updateMediaCacheItem(){
 		long size=ImageCache.getInstance(getActivity()).getDiskCache().size();
 		mediaCacheItem.subtitle=UiUtils.formatFileSize(getActivity(), size, false);

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

@@ -46,20 +46,20 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 
 		List<ListItem<Void>> items = new ArrayList<>(List.of(
 				languageItem=new ListItem<>(getString(R.string.default_post_language), postLanguage!=null ? postLanguage.getDisplayName(getContext()) : null, R.drawable.ic_fluent_local_language_24_regular, this::onDefaultLanguageClick),
-				altTextItem=new CheckableListItem<>(R.string.settings_alt_text_reminders, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.altTextReminders, R.drawable.ic_fluent_image_alt_text_24_regular, ()->toggleCheckableItem(altTextItem)),
-				playGifsItem=new CheckableListItem<>(R.string.settings_gif, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.playGifs, R.drawable.ic_fluent_gif_24_regular, ()->toggleCheckableItem(playGifsItem)),
-				overlayMediaItem=new CheckableListItem<>(R.string.sk_settings_continues_playback, R.string.sk_settings_continues_playback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.overlayMedia, R.drawable.ic_fluent_play_circle_hint_24_regular, ()->toggleCheckableItem(overlayMediaItem)),
-				customTabsItem=new CheckableListItem<>(R.string.settings_custom_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.useCustomTabs, R.drawable.ic_fluent_link_24_regular, ()->toggleCheckableItem(customTabsItem)),
-				confirmUnfollowItem=new CheckableListItem<>(R.string.settings_confirm_unfollow, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmUnfollow, R.drawable.ic_fluent_person_delete_24_regular, ()->toggleCheckableItem(confirmUnfollowItem)),
-				confirmBoostItem=new CheckableListItem<>(R.string.settings_confirm_boost, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmBoost, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(confirmBoostItem)),
-				confirmDeleteItem=new CheckableListItem<>(R.string.settings_confirm_delete_post, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmDeletePost, R.drawable.ic_fluent_delete_24_regular, ()->toggleCheckableItem(confirmDeleteItem)),
+				altTextItem=new CheckableListItem<>(R.string.settings_alt_text_reminders, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.altTextReminders, R.drawable.ic_fluent_image_alt_text_24_regular, i->toggleCheckableItem(altTextItem)),
+				playGifsItem=new CheckableListItem<>(R.string.settings_gif, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.playGifs, R.drawable.ic_fluent_gif_24_regular, i->toggleCheckableItem(playGifsItem)),
+				overlayMediaItem=new CheckableListItem<>(R.string.sk_settings_continues_playback, R.string.sk_settings_continues_playback_summary, CheckableListItem.Style.SWITCH, GlobalUserPreferences.overlayMedia, R.drawable.ic_fluent_play_circle_hint_24_regular, i->toggleCheckableItem(overlayMediaItem)),
+				customTabsItem=new CheckableListItem<>(R.string.settings_custom_tabs, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.useCustomTabs, R.drawable.ic_fluent_link_24_regular, i->toggleCheckableItem(customTabsItem)),
+				confirmUnfollowItem=new CheckableListItem<>(R.string.settings_confirm_unfollow, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmUnfollow, R.drawable.ic_fluent_person_delete_24_regular, i->toggleCheckableItem(confirmUnfollowItem)),
+				confirmBoostItem=new CheckableListItem<>(R.string.settings_confirm_boost, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmBoost, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(confirmBoostItem)),
+				confirmDeleteItem=new CheckableListItem<>(R.string.settings_confirm_delete_post, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.confirmDeletePost, R.drawable.ic_fluent_delete_24_regular, i->toggleCheckableItem(confirmDeleteItem)),
 				prefixRepliesItem=new ListItem<>(R.string.sk_settings_prefix_reply_cw_with_re, getPrefixWithRepliesString(), R.drawable.ic_fluent_arrow_reply_24_regular, this::onPrefixRepliesClick),
-				forwardReportsItem=new CheckableListItem<>(R.string.sk_settings_forward_report_default, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.forwardReportDefault, R.drawable.ic_fluent_arrow_forward_24_regular, ()->toggleCheckableItem(forwardReportsItem)),
-				loadNewPostsItem=new CheckableListItem<>(R.string.sk_settings_load_new_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.loadNewPosts, R.drawable.ic_fluent_arrow_sync_24_regular, this::onLoadNewPostsClick),
-				seeNewPostsBtnItem=new CheckableListItem<>(R.string.sk_settings_see_new_posts_button, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNewPostsButton, R.drawable.ic_fluent_arrow_up_24_regular, ()->toggleCheckableItem(seeNewPostsBtnItem)),
-				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, ()->toggleCheckableItem(remoteLoadingItem), true),
-				showBoostsItem=new CheckableListItem<>(R.string.sk_settings_show_boosts, 0, CheckableListItem.Style.SWITCH, lp.showBoosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(showBoostsItem)),
-				showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, ()->toggleCheckableItem(showRepliesItem))
+				forwardReportsItem=new CheckableListItem<>(R.string.sk_settings_forward_report_default, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.forwardReportDefault, R.drawable.ic_fluent_arrow_forward_24_regular, i->toggleCheckableItem(forwardReportsItem)),
+				loadNewPostsItem=new CheckableListItem<>(R.string.sk_settings_load_new_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.loadNewPosts, R.drawable.ic_fluent_arrow_sync_24_regular, i->onLoadNewPostsClick()),
+				seeNewPostsBtnItem=new CheckableListItem<>(R.string.sk_settings_see_new_posts_button, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNewPostsButton, R.drawable.ic_fluent_arrow_up_24_regular, i->toggleCheckableItem(seeNewPostsBtnItem)),
+				remoteLoadingItem=new CheckableListItem<>(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation, CheckableListItem.Style.SWITCH, GlobalUserPreferences.allowRemoteLoading, R.drawable.ic_fluent_communication_24_regular, i->toggleCheckableItem(remoteLoadingItem), true),
+				showBoostsItem=new CheckableListItem<>(R.string.sk_settings_show_boosts, 0, CheckableListItem.Style.SWITCH, lp.showBoosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(showBoostsItem)),
+				showRepliesItem=new CheckableListItem<>(R.string.sk_settings_show_replies, 0, CheckableListItem.Style.SWITCH, lp.showReplies, R.drawable.ic_fluent_arrow_reply_24_regular, i->toggleCheckableItem(showRepliesItem))
 		));
 
 		if(isInstanceAkkoma()) items.add(
@@ -93,7 +93,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 	@Override
 	protected void doLoadData(int offset, int count){}
 
-	private void onDefaultLanguageClick(){
+	private void onDefaultLanguageClick(ListItem<?> item){
 		if (languageResolver == null) return;
 		ComposeLanguageAlertViewController vc=new ComposeLanguageAlertViewController(getActivity(), null, new ComposeLanguageAlertViewController.SelectedOption(postLanguage), null, languageResolver);
 		new M3AlertDialogBuilder(getActivity())
@@ -112,14 +112,14 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onPrefixRepliesClick(){
+	private void onPrefixRepliesClick(ListItem<?> item){
 		int selected=GlobalUserPreferences.prefixReplies.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_settings_prefix_reply_cw_with_re)
 				.setSingleChoiceItems((String[]) IntStream.of(R.string.sk_settings_prefix_replies_never, R.string.sk_settings_prefix_replies_always, R.string.sk_settings_prefix_replies_to_others).mapToObj(this::getString).toArray(String[]::new),
-						selected, (dlg, item)->newSelected[0]=item)
-				.setPositiveButton(R.string.ok, (dlg, item)->{
+						selected, (dlg, which)->newSelected[0]=which)
+				.setPositiveButton(R.string.ok, (dlg, which)->{
 					GlobalUserPreferences.prefixReplies=GlobalUserPreferences.PrefixRepliesMode.values()[newSelected[0]];
 					prefixRepliesItem.subtitleRes=getPrefixWithRepliesString();
 					rebindItem(prefixRepliesItem);
@@ -128,7 +128,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onReplyVisibilityClick(){
+	private void onReplyVisibilityClick(ListItem<?> item){
 		AccountLocalPreferences lp=getLocalPrefs();
 		int selected=lp.timelineReplyVisibility==null ? 2 : switch(lp.timelineReplyVisibility){
 			case "following" -> 0;
@@ -139,8 +139,8 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		new M3AlertDialogBuilder(getActivity())
 				.setTitle(R.string.sk_settings_prefix_reply_cw_with_re)
 				.setSingleChoiceItems((String[]) IntStream.of(R.string.sk_settings_reply_visibility_following, R.string.sk_settings_reply_visibility_self, R.string.sk_settings_reply_visibility_all).mapToObj(this::getString).toArray(String[]::new),
-						selected, (dlg, item)->newSelected[0]=item)
-				.setPositiveButton(R.string.ok, (dlg, item)->{
+						selected, (dlg, which)->newSelected[0]=which)
+				.setPositiveButton(R.string.ok, (dlg, which)->{
 					lp.timelineReplyVisibility=switch(newSelected[0]){
 						case 0 -> "following";
 						case 1 -> "self";
@@ -167,7 +167,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		GlobalUserPreferences.overlayMedia=overlayMediaItem.checked;
 		GlobalUserPreferences.useCustomTabs=customTabsItem.checked;
 		GlobalUserPreferences.altTextReminders=altTextItem.checked;
-		GlobalUserPreferences.confirmUnfollow=customTabsItem.checked;
+		GlobalUserPreferences.confirmUnfollow=confirmUnfollowItem.checked;
 		GlobalUserPreferences.confirmBoost=confirmBoostItem.checked;
 		GlobalUserPreferences.confirmDeletePost=confirmDeleteItem.checked;
 		GlobalUserPreferences.forwardReportDefault=forwardReportsItem.checked;
@@ -176,6 +176,8 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 		GlobalUserPreferences.allowRemoteLoading=remoteLoadingItem.checked;
 		GlobalUserPreferences.save();
 		AccountLocalPreferences lp=getLocalPrefs();
+		boolean restartPlease=lp.showBoosts!=showBoostsItem.checked
+				|| lp.showReplies!=showRepliesItem.checked;
 		lp.showBoosts=showBoostsItem.checked;
 		lp.showReplies=showRepliesItem.checked;
 		lp.save();
@@ -186,6 +188,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void> impleme
 			s.preferences.postingDefaultLanguage=newPostLanguage.language.getLanguage();
 			s.savePreferencesLater();
 		}
+		if(restartPlease) getActivity().recreate();
 	}
 
 	@Override

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

@@ -39,7 +39,7 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 	@Override
 	protected void doLoadData(int offset, int count){}
 
-	private void onTestEmailConfirmClick(){
+	private void onTestEmailConfirmClick(ListItem<?> item){
 		AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
 		sess.activated=false;
 		sess.activationInfo=new AccountActivationInfo("test@email", System.currentTimeMillis());
@@ -49,18 +49,18 @@ public class SettingsDebugFragment extends BaseSettingsFragment<Void>{
 		Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
 	}
 
-	private void onForceSelfUpdateClick(){
+	private void onForceSelfUpdateClick(ListItem<?> item){
 		GithubSelfUpdater.forceUpdate=true;
 		GithubSelfUpdater.getInstance().maybeCheckForUpdates();
 		restartUI();
 	}
 
-	private void onResetUpdaterClick(){
+	private void onResetUpdaterClick(ListItem<?> item){
 		GithubSelfUpdater.getInstance().reset();
 		restartUI();
 	}
 
-	private void onResetDiscoverBannersClick(){
+	private void onResetDiscoverBannersClick(ListItem<?> item){
 		DiscoverInfoBannerHelper.reset();
 		restartUI();
 	}

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

@@ -56,29 +56,29 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		onDataLoaded(List.of(
 				themeItem=new ListItem<>(R.string.settings_theme, getAppearanceValue(), R.drawable.ic_fluent_weather_moon_24_regular, this::onAppearanceClick),
 				colorItem=new ListItem<>(getString(R.string.sk_settings_color_palette), getColorPaletteValue(), R.drawable.ic_fluent_color_24_regular, this::onColorClick),
-				trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, this::onTrueBlackModeClick, true),
+				trueBlackModeItem=new CheckableListItem<>(R.string.sk_settings_true_black, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.trueBlackTheme, R.drawable.ic_fluent_dark_theme_24_regular, i->onTrueBlackModeClick(), true),
 				publishTextItem=new ListItem<>(getString(R.string.sk_settings_publish_button_text), getPublishButtonText(), R.drawable.ic_fluent_send_24_regular, this::onPublishTextClick),
 				autoRevealCWsItem=new ListItem<>(R.string.sk_settings_auto_reveal_equal_spoilers, getAutoRevealSpoilersText(), R.drawable.ic_fluent_eye_24_regular, this::onAutoRevealSpoilersClick),
-				revealCWsItem=new CheckableListItem<>(R.string.sk_settings_always_reveal_content_warnings, 0, CheckableListItem.Style.SWITCH, lp.revealCWs, R.drawable.ic_fluent_chat_warning_24_regular, ()->toggleCheckableItem(revealCWsItem)),
-				hideSensitiveMediaItem=new CheckableListItem<>(R.string.settings_hide_sensitive_media, 0, CheckableListItem.Style.SWITCH, lp.hideSensitiveMedia, R.drawable.ic_fluent_flag_24_regular, ()->toggleCheckableItem(hideSensitiveMediaItem)),
-				interactionCountsItem=new CheckableListItem<>(R.string.settings_show_interaction_counts, 0, CheckableListItem.Style.SWITCH, lp.showInteractionCounts, R.drawable.ic_fluent_number_row_24_regular, ()->toggleCheckableItem(interactionCountsItem)),
-				emojiInNamesItem=new CheckableListItem<>(R.string.settings_show_emoji_in_names, 0, CheckableListItem.Style.SWITCH, lp.customEmojiInNames, R.drawable.ic_fluent_emoji_24_regular, ()->toggleCheckableItem(emojiInNamesItem)),
-				marqueeItem=new CheckableListItem<>(R.string.sk_settings_enable_marquee, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.toolbarMarquee, R.drawable.ic_fluent_text_more_24_regular, ()->toggleCheckableItem(marqueeItem)),
-				reduceMotionItem=new CheckableListItem<>(R.string.sk_settings_reduce_motion, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.reduceMotion, R.drawable.ic_fluent_star_emphasis_24_regular, ()->toggleCheckableItem(reduceMotionItem)),
-				disableSwipeItem=new CheckableListItem<>(R.string.sk_settings_tabs_disable_swipe, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableSwipe, R.drawable.ic_fluent_swipe_right_24_regular, ()->toggleCheckableItem(disableSwipeItem)),
-				altIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showAltIndicator, R.drawable.ic_fluent_scan_text_24_regular, ()->toggleCheckableItem(altIndicatorItem)),
-				noAltIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_no_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNoAltIndicator, R.drawable.ic_fluent_important_24_regular, ()->toggleCheckableItem(noAltIndicatorItem)),
-				collapsePostsItem=new CheckableListItem<>(R.string.sk_settings_collapse_long_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.collapseLongPosts, R.drawable.ic_fluent_chevron_down_24_regular, ()->toggleCheckableItem(collapsePostsItem)),
-				spectatorModeItem=new CheckableListItem<>(R.string.sk_settings_hide_interaction, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.spectatorMode, R.drawable.ic_fluent_star_off_24_regular, ()->toggleCheckableItem(spectatorModeItem)),
-				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, ()->toggleCheckableItem(hideFabItem)),
-				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, ()->toggleCheckableItem(translateOpenedItem)),
-				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.likeIcon, R.drawable.ic_fluent_heart_24_regular, ()->toggleCheckableItem(likeIconItem)),
-				underlinedLinksItem=new CheckableListItem<>(R.string.sk_settings_underlined_links, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.underlinedLinks, R.drawable.ic_fluent_text_underline_24_regular, ()->toggleCheckableItem(underlinedLinksItem)),
-				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, ()->toggleCheckableItem(disablePillItem)),
-				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, ()->toggleCheckableItem(showNavigationLabelsItem), true),
-				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, ()->toggleCheckableItem(pronounsInTimelinesItem)),
-				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, ()->toggleCheckableItem(pronounsInThreadsItem)),
-				pronounsInUserListingsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_user_listings, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInUserListings, 0, ()->toggleCheckableItem(pronounsInUserListingsItem))
+				revealCWsItem=new CheckableListItem<>(R.string.sk_settings_always_reveal_content_warnings, 0, CheckableListItem.Style.SWITCH, lp.revealCWs, R.drawable.ic_fluent_chat_warning_24_regular, i->toggleCheckableItem(revealCWsItem)),
+				hideSensitiveMediaItem=new CheckableListItem<>(R.string.settings_hide_sensitive_media, 0, CheckableListItem.Style.SWITCH, lp.hideSensitiveMedia, R.drawable.ic_fluent_flag_24_regular, i->toggleCheckableItem(hideSensitiveMediaItem)),
+				interactionCountsItem=new CheckableListItem<>(R.string.settings_show_interaction_counts, 0, CheckableListItem.Style.SWITCH, lp.showInteractionCounts, R.drawable.ic_fluent_number_row_24_regular, i->toggleCheckableItem(interactionCountsItem)),
+				emojiInNamesItem=new CheckableListItem<>(R.string.settings_show_emoji_in_names, 0, CheckableListItem.Style.SWITCH, lp.customEmojiInNames, R.drawable.ic_fluent_emoji_24_regular, i->toggleCheckableItem(emojiInNamesItem)),
+				marqueeItem=new CheckableListItem<>(R.string.sk_settings_enable_marquee, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.toolbarMarquee, R.drawable.ic_fluent_text_more_24_regular, i->toggleCheckableItem(marqueeItem)),
+				reduceMotionItem=new CheckableListItem<>(R.string.sk_settings_reduce_motion, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.reduceMotion, R.drawable.ic_fluent_star_emphasis_24_regular, i->toggleCheckableItem(reduceMotionItem)),
+				disableSwipeItem=new CheckableListItem<>(R.string.sk_settings_tabs_disable_swipe, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableSwipe, R.drawable.ic_fluent_swipe_right_24_regular, i->toggleCheckableItem(disableSwipeItem)),
+				altIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showAltIndicator, R.drawable.ic_fluent_scan_text_24_regular, i->toggleCheckableItem(altIndicatorItem)),
+				noAltIndicatorItem=new CheckableListItem<>(R.string.sk_settings_show_no_alt_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNoAltIndicator, R.drawable.ic_fluent_important_24_regular, i->toggleCheckableItem(noAltIndicatorItem)),
+				collapsePostsItem=new CheckableListItem<>(R.string.sk_settings_collapse_long_posts, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.collapseLongPosts, R.drawable.ic_fluent_chevron_down_24_regular, i->toggleCheckableItem(collapsePostsItem)),
+				spectatorModeItem=new CheckableListItem<>(R.string.sk_settings_hide_interaction, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.spectatorMode, R.drawable.ic_fluent_star_off_24_regular, i->toggleCheckableItem(spectatorModeItem)),
+				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, i->toggleCheckableItem(hideFabItem)),
+				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, i->toggleCheckableItem(translateOpenedItem)),
+				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.likeIcon, R.drawable.ic_fluent_heart_24_regular, i->toggleCheckableItem(likeIconItem)),
+				underlinedLinksItem=new CheckableListItem<>(R.string.sk_settings_underlined_links, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.underlinedLinks, R.drawable.ic_fluent_text_underline_24_regular, i->toggleCheckableItem(underlinedLinksItem)),
+				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, i->toggleCheckableItem(disablePillItem)),
+				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, i->toggleCheckableItem(showNavigationLabelsItem), true),
+				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, i->toggleCheckableItem(pronounsInTimelinesItem)),
+				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, i->toggleCheckableItem(pronounsInThreadsItem)),
+				pronounsInUserListingsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_user_listings, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInUserListings, 0, i->toggleCheckableItem(pronounsInUserListingsItem))
 		));
 		trueBlackModeItem.checkedChangeListener=checked->onTrueBlackModeClick();
 	}
@@ -166,7 +166,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		maybeApplyNewThemeRightNow(null, null, prev);
 	}
 
-	private void onAppearanceClick(){
+	private void onAppearanceClick(ListItem<?> item_){
 		int selected=switch(GlobalUserPreferences.theme){
 			case LIGHT -> 0;
 			case DARK -> 1;
@@ -197,7 +197,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void onColorClick(){
+	private void onColorClick(ListItem<?> item_){
 		boolean multiple=AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 		int indexOffset=multiple ? 1 : 0;
 		int selected=lp.color==null ? 0 : lp.color.ordinal() + indexOffset;
@@ -234,7 +234,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 		alert.show();
 	}
 
-	private void onPublishTextClick(){
+	private void onPublishTextClick(ListItem<?> item_){
 		TextInputFrameLayout input = new TextInputFrameLayout(
 				getContext(),
 				getString(R.string.publish),
@@ -257,7 +257,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void onAutoRevealSpoilersClick(){
+	private void onAutoRevealSpoilersClick(ListItem<?> item_){
 		int selected=GlobalUserPreferences.autoRevealEqualSpoilers.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())

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

@@ -67,16 +67,14 @@ public class SettingsFiltersFragment extends BaseSettingsFragment<Filter>{
 		Nav.go(getActivity(), EditFilterFragment.class, args);
 	}
 
-	private void onAddFilterClick(){
+	private void onAddFilterClick(ListItem<?> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		Nav.go(getActivity(), EditFilterFragment.class, args);
 	}
 
 	private ListItem<Filter> makeListItem(Filter f){
-		ListItem<Filter> item=new ListItem<>(f.title, getString(f.isActive() ? R.string.filter_active : R.string.filter_inactive), null, f);
-		item.onClick=()->onFilterClick(item);
-		item.isEnabled=true;
+		ListItem<Filter> item=new ListItem<>(f.title, getString(f.isActive() ? R.string.filter_active : R.string.filter_inactive), this::onFilterClick, f);
 		return item;
 	}
 

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

@@ -19,6 +19,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import me.grishka.appkit.Nav;
@@ -36,15 +37,15 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		lp=s.getLocalPreferences();
 		onDataLoaded(List.of(
 				new ListItem<>(AccountSessionManager.get(accountID).domain, getString(R.string.settings_server_explanation), R.drawable.ic_fluent_server_24_regular, this::onServerClick),
-				new ListItem<>(R.string.sk_settings_profile, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/profile")),
-				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),
+				new ListItem<>(R.string.sk_settings_profile, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/profile")),
+				new ListItem<>(R.string.sk_settings_posting, 0, R.drawable.ic_fluent_open_24_regular, i->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/settings/preferences/other")),
+				new ListItem<>(R.string.sk_settings_auth, 0, R.drawable.ic_fluent_open_24_regular, i->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, i->onContentTypeClick()),
 				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),
+				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, i->onEmojiReactionsClick()),
 				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))
+				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, i->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, i->toggleCheckableItem(glitchModeItem))
 		));
 		contentTypesItem.checkedChangeListener=checked->onContentTypeClick();
 		defaultContentTypeItem.isEnabled=contentTypesItem.checked;
@@ -68,7 +69,7 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		E.post(new StatusDisplaySettingsChangedEvent(accountID));
 	}
 
-	private void onServerClick(){
+	private void onServerClick(ListItem<?> item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		Nav.go(getActivity(), SettingsServerFragment.class, args);
@@ -87,23 +88,23 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 		defaultContentTypeItem.subtitleRes=lp.defaultContentType.getName();
 	}
 
-	private void onDefaultContentTypeClick(){
-		int selected=lp.defaultContentType.ordinal();
-		int[] newSelected={selected};
-		ContentType[] supportedContentTypes=Arrays.stream(ContentType.values())
+	private void onDefaultContentTypeClick(ListItem<?> item_){
+		List<ContentType> supportedContentTypes=Arrays.stream(ContentType.values())
 				.filter(t->t.supportedByInstance(getInstance().orElse(null)))
-				.toArray(ContentType[]::new);
-		String[] names=Arrays.stream(supportedContentTypes)
+				.collect(Collectors.toList());
+		int selected=supportedContentTypes.indexOf(lp.defaultContentType);
+		int[] newSelected={selected};
+		String[] names=supportedContentTypes.stream()
 				.map(ContentType::getName)
 				.map(this::getString)
 				.toArray(String[]::new);
 
 		new M3AlertDialogBuilder(getActivity())
-				.setTitle(R.string.settings_theme)
+				.setTitle(R.string.sk_settings_default_content_type)
 				.setSingleChoiceItems(names,
 						selected, (dlg, item)->newSelected[0]=item)
 				.setPositiveButton(R.string.ok, (dlg, item)->{
-					ContentType type=supportedContentTypes[newSelected[0]];
+					ContentType type=supportedContentTypes.get(newSelected[0]);
 					lp.defaultContentType=type;
 					defaultContentTypeItem.subtitleRes=type.getName();
 					rebindItem(defaultContentTypeItem);
@@ -112,7 +113,7 @@ public class SettingsInstanceFragment extends BaseSettingsFragment<Void> impleme
 				.show();
 	}
 
-	private void onShowEmojiReactionsClick(){
+	private void onShowEmojiReactionsClick(ListItem<?> item_){
 		int selected=lp.showEmojiReactions.ordinal();
 		int[] newSelected={selected};
 		new M3AlertDialogBuilder(getActivity())

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

@@ -18,6 +18,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -49,7 +50,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		account = AccountSessionManager.get(accountID);
+		account=AccountSessionManager.get(accountID);
 		setTitle(R.string.settings);
 		setSubtitle(account.getFullUsername());
 		onDataLoaded(List.of(
@@ -59,15 +60,17 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 				new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_fluent_alert_24_regular, this::onNotificationsClick),
 				new ListItem<>(R.string.sk_settings_instance, 0, R.drawable.ic_fluent_server_24_regular, this::onInstanceClick),
 				new ListItem<>(getString(R.string.about_app, getString(R.string.sk_app_name)), null, R.drawable.ic_fluent_info_24_regular, this::onAboutClick, null, 0, true),
+				new ListItem<>(R.string.manage_accounts, 0, R.drawable.ic_fluent_person_swap_24_regular, this::onManageAccountsClick),
 				new ListItem<>(R.string.log_out, 0, R.drawable.ic_fluent_sign_out_24_regular, this::onLogOutClick, R.attr.colorM3Error, false)
 		));
 
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(account.domain);
-		if (!instance.isAkkoma())
+		Instance instance=AccountSessionManager.getInstance().getInstanceInfo(account.domain);
+		if(!instance.isAkkoma()){
 			data.add(3, new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_fluent_filter_24_regular, this::onFiltersClick));
+		}
 
 		if(BuildConfig.DEBUG || BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta")){
-			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, ()->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
+			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, i->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
 		}
 
 		AccountSession session=AccountSessionManager.get(accountID);
@@ -128,35 +131,39 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		return args;
 	}
 
-	private void onBehaviorClick(){
+	private void onBehaviorClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsBehaviorFragment.class, makeFragmentArgs());
 	}
 
-	private void onDisplayClick(){
+	private void onDisplayClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsDisplayFragment.class, makeFragmentArgs());
 	}
 
-	private void onPrivacyClick(){
+	private void onPrivacyClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsPrivacyFragment.class, makeFragmentArgs());
 	}
 
-	private void onFiltersClick(){
+	private void onFiltersClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsFiltersFragment.class, makeFragmentArgs());
 	}
 
-	private void onNotificationsClick(){
+	private void onNotificationsClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsNotificationsFragment.class, makeFragmentArgs());
 	}
 
-	private void onInstanceClick(){
+	private void onInstanceClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsInstanceFragment.class, makeFragmentArgs());
 	}
 
-	private void onAboutClick(){
+	private void onAboutClick(ListItem<?> item_){
 		Nav.go(getActivity(), SettingsAboutAppFragment.class, makeFragmentArgs());
 	}
 
-	private void onLogOutClick(){
+	private void onManageAccountsClick(ListItem<?> item){
+		new AccountSwitcherSheet(getActivity(), null).show();
+	}
+
+	private void onLogOutClick(ListItem<?> item_){
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		new M3AlertDialogBuilder(getActivity())
 				.setMessage(getString(R.string.confirm_log_out, session.getFullUsername()))

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

@@ -27,7 +27,6 @@ import org.joinmastodon.android.model.viewmodel.ListItem;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.HideableSingleViewRecyclerAdapter;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.unifiedpush.android.connector.RegistrationDialogContent;
 import org.unifiedpush.android.connector.UnifiedPush;
 
 import java.time.Instant;
@@ -73,21 +72,21 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		useUnifiedPush=!getDistributor(getContext()).isEmpty();
 
 		onDataLoaded(List.of(
-				pauseItem=new CheckableListItem<>(getString(R.string.pause_all_notifications), getPauseItemSubtitle(), CheckableListItem.Style.SWITCH, false, R.drawable.ic_fluent_alert_snooze_24_regular, ()->onPauseNotificationsClick(false)),
+				pauseItem=new CheckableListItem<>(getString(R.string.pause_all_notifications), getPauseItemSubtitle(), CheckableListItem.Style.SWITCH, false, R.drawable.ic_fluent_alert_snooze_24_regular, i->onPauseNotificationsClick(false)),
 				policyItem=new ListItem<>(R.string.settings_notifications_policy, 0, R.drawable.ic_fluent_people_24_regular, this::onNotificationsPolicyClick, 0, true),
 
-				mentionsItem=new CheckableListItem<>(R.string.notification_type_mentions_and_replies, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.mention, R.drawable.ic_fluent_mention_24_regular, ()->toggleCheckableItem(mentionsItem)),
-				boostsItem=new CheckableListItem<>(R.string.notification_type_reblog, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, ()->toggleCheckableItem(boostsItem)),
-				favoritesItem=new CheckableListItem<>(R.string.notification_type_favorite, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.favourite, R.drawable.ic_fluent_star_24_regular, ()->toggleCheckableItem(favoritesItem)),
-				followersItem=new CheckableListItem<>(R.string.notification_type_follow, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.follow, R.drawable.ic_fluent_person_add_24_regular, ()->toggleCheckableItem(followersItem)),
-				pollsItem=new CheckableListItem<>(R.string.notification_type_poll, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.poll, R.drawable.ic_fluent_poll_24_regular, ()->toggleCheckableItem(pollsItem)),
-				updateItem=new CheckableListItem<>(R.string.sk_notification_type_update, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.update, R.drawable.ic_fluent_history_24_regular, ()->toggleCheckableItem(updateItem)),
-				postsItem=new CheckableListItem<>(R.string.sk_notification_type_posts, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.status, R.drawable.ic_fluent_chat_24_regular, ()->toggleCheckableItem(postsItem), true),
+				mentionsItem=new CheckableListItem<>(R.string.notification_type_mentions_and_replies, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.mention, R.drawable.ic_fluent_mention_24_regular, i->toggleCheckableItem(mentionsItem)),
+				boostsItem=new CheckableListItem<>(R.string.notification_type_reblog, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, i->toggleCheckableItem(boostsItem)),
+				favoritesItem=new CheckableListItem<>(R.string.notification_type_favorite, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.favourite, R.drawable.ic_fluent_star_24_regular, i->toggleCheckableItem(favoritesItem)),
+				followersItem=new CheckableListItem<>(R.string.notification_type_follow, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.follow, R.drawable.ic_fluent_person_add_24_regular, i->toggleCheckableItem(followersItem)),
+				pollsItem=new CheckableListItem<>(R.string.notification_type_poll, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.poll, R.drawable.ic_fluent_poll_24_regular, i->toggleCheckableItem(pollsItem)),
+				updateItem=new CheckableListItem<>(R.string.sk_notification_type_update, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.update, R.drawable.ic_fluent_history_24_regular, i->toggleCheckableItem(updateItem)),
+				postsItem=new CheckableListItem<>(R.string.sk_notification_type_posts, 0, CheckableListItem.Style.CHECKBOX, pushSubscription.alerts.status, R.drawable.ic_fluent_chat_24_regular, i->toggleCheckableItem(postsItem), true),
 
-				uniformIconItem=new CheckableListItem<>(R.string.sk_settings_uniform_icon_for_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.uniformNotificationIcon, R.drawable.ic_ntf_logo, ()->toggleCheckableItem(uniformIconItem)),
-				deleteItem=new CheckableListItem<>(R.string.sk_settings_enable_delete_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enableDeleteNotifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, ()->toggleCheckableItem(deleteItem)),
-				onlyLatestItem=new CheckableListItem<>(R.string.sk_settings_single_notification, 0, CheckableListItem.Style.SWITCH, lp.keepOnlyLatestNotification, R.drawable.ic_fluent_convert_range_24_regular, ()->toggleCheckableItem(onlyLatestItem), true),
-				unifiedPushItem=new CheckableListItem<>(R.string.sk_settings_unifiedpush, 0, CheckableListItem.Style.SWITCH, useUnifiedPush, R.drawable.ic_fluent_alert_arrow_up_24_regular, this::onUnifiedPush, true)
+				uniformIconItem=new CheckableListItem<>(R.string.sk_settings_uniform_icon_for_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.uniformNotificationIcon, R.drawable.ic_ntf_logo, i->toggleCheckableItem(uniformIconItem)),
+				deleteItem=new CheckableListItem<>(R.string.sk_settings_enable_delete_notifications, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.enableDeleteNotifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, i->toggleCheckableItem(deleteItem)),
+				onlyLatestItem=new CheckableListItem<>(R.string.sk_settings_single_notification, 0, CheckableListItem.Style.SWITCH, lp.keepOnlyLatestNotification, R.drawable.ic_fluent_convert_range_24_regular, i->toggleCheckableItem(onlyLatestItem), true),
+				unifiedPushItem=new CheckableListItem<>(R.string.sk_settings_unifiedpush, 0, CheckableListItem.Style.SWITCH, useUnifiedPush, R.drawable.ic_fluent_alert_arrow_up_24_regular, i->onUnifiedPushClick(), true)
 		));
 
 		//only enable when distributors, who can receive notifications, are available
@@ -98,7 +97,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();
+		unifiedPushItem.checkedChangeListener=checked->onUnifiedPushClick();
 		updatePolicyItem(null);
 		updatePauseItem();
 	}
@@ -254,7 +253,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		alert.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
 	}
 
-	private void onNotificationsPolicyClick(){
+	private void onNotificationsPolicyClick(ListItem<?> item_){
 		String[] items=Stream.of(
 				R.string.notifications_policy_anyone,
 				R.string.notifications_policy_followed,
@@ -328,7 +327,7 @@ public class SettingsNotificationsFragment extends BaseSettingsFragment<Void>{
 		}
 	}
 
-	private void onUnifiedPush(){
+	private void onUnifiedPushClick(){
 		if(getDistributor(getContext()).isEmpty()){
 			List<String> distributors = UnifiedPush.getDistributors(getContext(), new ArrayList<>());
 			showUnifiedPushRegisterDialog(distributors);

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

@@ -2,40 +2,98 @@ package org.joinmastodon.android.fragments.settings;
 
 import android.os.Bundle;
 
+import androidx.annotation.StringRes;
+
 import org.joinmastodon.android.R;
+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.Instance;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+import org.joinmastodon.android.model.viewmodel.ListItem;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class SettingsPrivacyFragment extends BaseSettingsFragment<Void>{
-	private CheckableListItem<Void> discoverableItem, indexableItem;
+	private CheckableListItem<Void> discoverableItem, indexableItem, lockedItem;
+	private ListItem<Void> privacyItem;
+	private StatusPrivacy privacy=null;
+	private Instance instance;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setTitle(R.string.settings_privacy);
-		Account self=AccountSessionManager.get(accountID).self;
+		AccountSession session=AccountSessionManager.get(accountID);
+		Account self=session.self;
+		instance=AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		privacy=self.source.privacy;
 		onDataLoaded(List.of(
-			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_fluent_thumb_like_dislike_24_regular, ()->toggleCheckableItem(discoverableItem)),
-			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_fluent_search_24_regular, ()->toggleCheckableItem(indexableItem))
+				privacyItem=new ListItem<>(R.string.sk_settings_default_visibility, getPrivacyString(privacy), R.drawable.ic_fluent_eye_24_regular, this::onPrivacyClick, 0, true),
+				lockedItem=new CheckableListItem<>(R.string.sk_settings_lock_account, 0, CheckableListItem.Style.SWITCH, self.locked, R.drawable.ic_fluent_person_available_24_regular, i->toggleCheckableItem(lockedItem))
 		));
-		if(self.source.indexable==null)
-			indexableItem.isEnabled=false;
+
+		if(!instance.isAkkoma()){
+			data.addAll(List.of(
+					discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_fluent_thumb_like_dislike_24_regular, i->toggleCheckableItem(discoverableItem)),
+					indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_fluent_search_24_regular, i->toggleCheckableItem(indexableItem))
+			));
+			if(self.source.indexable==null)
+				indexableItem.isEnabled=false;
+		}
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){}
 
+	private @StringRes int getPrivacyString(StatusPrivacy p){
+		if(p==null) return R.string.visibility_public;
+		return switch(p){
+			case PUBLIC -> R.string.visibility_public;
+			case UNLISTED -> R.string.sk_visibility_unlisted;
+			case PRIVATE -> R.string.visibility_followers_only;
+			case DIRECT -> R.string.visibility_private;
+			case LOCAL -> R.string.sk_local_only;
+		};
+	}
+
+	private void onPrivacyClick(ListItem<?> item_){
+		Account self=AccountSessionManager.get(accountID).self;
+		List<StatusPrivacy> options=new ArrayList<>(List.of(StatusPrivacy.PUBLIC, StatusPrivacy.UNLISTED, StatusPrivacy.PRIVATE, StatusPrivacy.DIRECT));
+		if(instance.isAkkoma()) options.add(StatusPrivacy.LOCAL);
+		int selected=options.indexOf(self.source.privacy);
+		int[] newSelected={selected};
+		new M3AlertDialogBuilder(getActivity())
+				.setTitle(R.string.sk_settings_default_visibility)
+				.setSingleChoiceItems(options.stream().map(this::getPrivacyString).map(this::getString).toArray(String[]::new),
+						selected, (dlg, item)->newSelected[0]=item)
+				.setPositiveButton(R.string.ok, (dlg, item)->{
+					privacy=options.get(newSelected[0]);
+					privacyItem.subtitleRes=getPrivacyString(privacy);
+					rebindItem(privacyItem);
+				})
+				.setNegativeButton(R.string.cancel, null)
+				.show();
+	}
+
 	@Override
 	public void onPause(){
 		super.onPause();
-		Account self=AccountSessionManager.get(accountID).self;
-		if(self.discoverable!=discoverableItem.checked || (self.source.indexable!=null && self.source.indexable!=indexableItem.checked)){
-			self.discoverable=discoverableItem.checked;
-			self.source.indexable=indexableItem.checked;
-			AccountSessionManager.get(accountID).savePreferencesLater();
+		AccountSession s=AccountSessionManager.get(accountID);
+		Account self=s.self;
+		boolean savePlease=self.locked!=lockedItem.checked
+				|| self.source.privacy!=privacy
+				|| (discoverableItem!=null && self.discoverable!=discoverableItem.checked)
+				|| (indexableItem!=null && self.source.indexable!=null && self.source.indexable!=indexableItem.checked);
+		if(savePlease){
+			if(discoverableItem!=null) self.discoverable=discoverableItem.checked;
+			if(indexableItem!=null) self.source.indexable=indexableItem.checked;
+			self.locked=lockedItem.checked;
+			s.preferences.postingDefaultVisibility=privacy;
+			s.savePreferencesLater();
 		}
 	}
 }

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

@@ -145,7 +145,7 @@ public class SettingsServerAboutFragment extends LoaderFragment{
 		if(!TextUtils.isEmpty(instance.email)){
 			needDivider=true;
 			SimpleListItemViewHolder holder=new SimpleListItemViewHolder(getActivity(), scrollingLayout);
-			ListItem<Void> item=new ListItem<>(R.string.send_email_to_server_admin, 0, R.drawable.ic_fluent_mail_24_regular, ()->{});
+			ListItem<Void> item=new ListItem<>(R.string.send_email_to_server_admin, 0, R.drawable.ic_fluent_mail_24_regular, i->{});
 			holder.bind(item);
 			holder.itemView.setBackground(UiUtils.getThemeDrawable(getActivity(), android.R.attr.selectableItemBackground));
 			holder.itemView.setOnClickListener(v->openAdminEmail());

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

@@ -6,8 +6,6 @@ import android.text.TextUtils;
 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;
@@ -15,9 +13,6 @@ 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.
  */
@@ -163,26 +158,26 @@ public class Account extends BaseModel implements Searchable{
 		if(fields!=null){
 			for(AccountField f:fields)
 				f.postprocess();
-		} else {
-			fields = Collections.emptyList();
+		}else{
+			fields=Collections.emptyList();
 		}
 		if(emojis!=null){
 			for(Emoji e:emojis)
 				e.postprocess();
-		} else {
-			emojis = Collections.emptyList();
+		}else{
+			emojis=Collections.emptyList();
 		}
 		if(moved!=null)
 			moved.postprocess();
-		if(fqn == null) fqn = getFullyQualifiedName();
-		if(id == null) id = "";
-		if(username == null) 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 = "";
+			displayName=!TextUtils.isEmpty(username) ? username : "";
+		if(acct==null) acct="";
+		if(url==null) url="";
+		if(note==null) note="";
+		if(avatar==null) avatar="";
 	}
 
 	public boolean isLocal(){
@@ -212,6 +207,10 @@ public class Account extends BaseModel implements Searchable{
 		return fqn != null ? fqn : acct.split("@")[0] + "@" + getDomainFromURL();
 	}
 
+	public String getDisplayName(){
+		return '\u2068'+displayName+'\u2069';
+	}
+
 	@Override
 	public String toString(){
 		return "Account{"+

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

@@ -26,22 +26,13 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
-import org.joinmastodon.android.api.ObjectValidationException;
-import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.api.session.AccountSession;
 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.joinmastodon.android.utils.StatusTextEncoder;
-import org.parceler.Parcel;
 
 import java.lang.reflect.Type;
-import java.time.Instant;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 @Parcel
@@ -104,6 +95,7 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	private transient String strippedText;
 	public transient TranslationState translationState=TranslationState.HIDDEN;
 	public transient Translation translation;
+	public transient boolean fromStatusCreated;
 
 	public Status(){}
 
@@ -203,6 +195,10 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		return reblog!=null ? reblog : this;
 	}
 
+	public String getContentStatusID(){
+		return getContentStatus().id;
+	}
+
 	public String getStrippedText(){
 		if(strippedText==null)
 			strippedText=HtmlParser.strip(content);

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

@@ -33,9 +33,9 @@ public class AccountViewModel{
 				V.dp(50), V.dp(50));
 		emojiHelper=new CustomEmojiHelper();
 		if(session.getLocalPreferences().customEmojiInNames)
-			parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+			parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 		else
-			parsedName=account.displayName;
+			parsedName=account.getDisplayName();
 		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(parsedName);
 		ssb.append(parsedBio);

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

@@ -9,42 +9,42 @@ public class CheckableListItem<T> extends ListItem<T>{
 	public boolean checked;
 	public Consumer<Boolean> checkedChangeListener;
 
-	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Runnable onClick, T parentObject, boolean dividerAfter){
-		super(title, subtitle, iconRes, onClick, parentObject, 0, dividerAfter);
+	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Consumer<CheckableListItem<T>> onClick, T parentObject, boolean dividerAfter){
+		super(title, subtitle, iconRes, (Consumer<ListItem<T>>)(Object)onClick, parentObject, 0, dividerAfter);
 		this.style=style;
 		this.checked=checked;
 	}
 
-	public CheckableListItem(String title, String subtitle, Style style, boolean checked, Runnable onClick){
+	public CheckableListItem(String title, String subtitle, Style style, boolean checked, Consumer<CheckableListItem<T>> onClick){
 		this(title, subtitle, style, checked, 0, onClick, null, false);
 	}
 
-	public CheckableListItem(String title, String subtitle, Style style, boolean checked, Runnable onClick, T parentObject){
+	public CheckableListItem(String title, String subtitle, Style style, boolean checked, Consumer<CheckableListItem<T>> onClick, T parentObject){
 		this(title, subtitle, style, checked, 0, onClick, parentObject, false);
 	}
 
-	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Runnable onClick){
+	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Consumer<CheckableListItem<T>> onClick){
 		this(title, subtitle, style, checked, iconRes, onClick, null, false);
 	}
 
-	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Runnable onClick, T parentObject){
+	public CheckableListItem(String title, String subtitle, Style style, boolean checked, int iconRes, Consumer<CheckableListItem<T>> onClick, T parentObject){
 		this(title, subtitle, style, checked, iconRes, onClick, parentObject, false);
 	}
 
-	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, Runnable onClick){
+	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, Consumer<CheckableListItem<T>> onClick){
 		this(titleRes, subtitleRes, style, checked, 0, onClick, false);
 	}
 
-	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, Runnable onClick, boolean dividerAfter){
+	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, Consumer<CheckableListItem<T>> onClick, boolean dividerAfter){
 		this(titleRes, subtitleRes, style, checked, 0, onClick, dividerAfter);
 	}
 
-	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, int iconRes, Runnable onClick){
+	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, int iconRes, Consumer<CheckableListItem<T>> onClick){
 		this(titleRes, subtitleRes, style, checked, iconRes, onClick, false);
 	}
 
-	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, int iconRes, Runnable onClick, boolean dividerAfter){
-		super(titleRes, subtitleRes, iconRes, onClick, 0, dividerAfter);
+	public CheckableListItem(int titleRes, int subtitleRes, Style style, boolean checked, int iconRes, Consumer<CheckableListItem<T>> onClick, boolean dividerAfter){
+		super(titleRes, subtitleRes, iconRes, (Consumer<ListItem<T>>)(Object)onClick, 0, dividerAfter);
 		this.style=style;
 		this.checked=checked;
 	}

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

@@ -2,6 +2,8 @@ package org.joinmastodon.android.model.viewmodel;
 
 import org.joinmastodon.android.R;
 
+import java.util.function.Consumer;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 
@@ -16,11 +18,11 @@ public class ListItem<T>{
 	public int iconRes;
 	public int colorOverrideAttr;
 	public boolean dividerAfter;
-	public Runnable onClick;
+	private Consumer<ListItem<T>> onClick;
 	public boolean isEnabled=true;
 	public T parentObject;
 
-	public ListItem(String title, String subtitle, int iconRes, Runnable onClick, T parentObject, int colorOverrideAttr, boolean dividerAfter){
+	public ListItem(String title, String subtitle, int iconRes, Consumer<ListItem<T>> onClick, T parentObject, int colorOverrideAttr, boolean dividerAfter){
 		this.title=title;
 		this.subtitle=subtitle;
 		this.iconRes=iconRes;
@@ -32,45 +34,41 @@ public class ListItem<T>{
 			isEnabled=false;
 	}
 
-	public ListItem(String title, String subtitle, Runnable onClick){
+	public ListItem(String title, String subtitle, Consumer<ListItem<T>> onClick){
 		this(title, subtitle, 0, onClick, null, 0, false);
 	}
 
-	public ListItem(String title, String subtitle, Runnable onClick, T parentObject){
+	public ListItem(String title, String subtitle, Consumer<ListItem<T>> onClick, T parentObject){
 		this(title, subtitle, 0, onClick, parentObject, 0, false);
 	}
 
-	public ListItem(String title, String subtitle, @DrawableRes int iconRes, Runnable onClick){
+	public ListItem(String title, String subtitle, @DrawableRes int iconRes, Consumer<ListItem<T>> onClick){
 		this(title, subtitle, iconRes, onClick, null, 0, false);
 	}
 
-	public ListItem(String title, String subtitle, @DrawableRes int iconRes, Runnable onClick, boolean dividerAfter){
-		this(title, subtitle, iconRes, onClick, null, 0, dividerAfter);
-	}
-
-	public ListItem(String title, String subtitle, @DrawableRes int iconRes, Runnable onClick, T parentObject){
+	public ListItem(String title, String subtitle, @DrawableRes int iconRes, Consumer<ListItem<T>> onClick, T parentObject){
 		this(title, subtitle, iconRes, onClick, parentObject, 0, false);
 	}
 
-	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, Runnable onClick){
+	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, Consumer<ListItem<T>> onClick){
 		this(null, null, 0, onClick, null, 0, false);
 		this.titleRes=titleRes;
 		this.subtitleRes=subtitleRes;
 	}
 
-	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, Runnable onClick, int colorOverrideAttr, boolean dividerAfter){
+	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, Consumer<ListItem<T>> onClick, int colorOverrideAttr, boolean dividerAfter){
 		this(null, null, 0, onClick, null, colorOverrideAttr, dividerAfter);
 		this.titleRes=titleRes;
 		this.subtitleRes=subtitleRes;
 	}
 
-	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, Runnable onClick){
+	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, Consumer<ListItem<T>> onClick){
 		this(null, null, iconRes, onClick, null, 0, false);
 		this.titleRes=titleRes;
 		this.subtitleRes=subtitleRes;
 	}
 
-	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, Runnable onClick, int colorOverrideAttr, boolean dividerAfter){
+	public ListItem(@StringRes int titleRes, @StringRes int subtitleRes, @DrawableRes int iconRes, Consumer<ListItem<T>> onClick, int colorOverrideAttr, boolean dividerAfter){
 		this(null, null, iconRes, onClick, null, colorOverrideAttr, dividerAfter);
 		this.titleRes=titleRes;
 		this.subtitleRes=subtitleRes;
@@ -79,4 +77,13 @@ public class ListItem<T>{
 	public int getItemViewType(){
 		return colorOverrideAttr==0 ? R.id.list_item_simple : R.id.list_item_simple_tinted;
 	}
+
+	public void performClick(){
+		if(onClick!=null)
+			onClick.accept(this);
+	}
+
+	public <I extends ListItem<T>> void setOnClick(Consumer<I> onClick){
+		this.onClick=(Consumer<ListItem<T>>) onClick;
+	}
 }

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

@@ -8,7 +8,7 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Bundle;
+import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -27,6 +27,8 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.CheckableRelativeLayout;
 
@@ -40,7 +42,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -282,7 +283,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		@SuppressLint("SetTextI18n")
 		@Override
 		public void onBind(AccountSession item){
-			name.setText(item.self.displayName);
+			HtmlParser.setTextWithCustomEmoji(name, item.self.getDisplayName(), item.self.emojis);
 			username.setText(item.getFullUsername());
 			radioButton.setVisibility(externalShare ? View.GONE : View.VISIBLE);
 			extraBtnWrap.setVisibility(externalShare && openInApp ? View.VISIBLE : View.GONE);

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

@@ -71,7 +71,7 @@ public class SearchViewHelper{
 		searchLayout.addView(searchEdit, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1f));
 
 		clearSearchButton=new ImageButton(context);
-		clearSearchButton.setImageResource(R.drawable.ic_baseline_close_24);
+		clearSearchButton.setImageResource(R.drawable.ic_fluent_dismiss_24_regular);
 		clearSearchButton.setContentDescription(context.getString(R.string.clear));
 		clearSearchButton.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(context, R.attr.colorM3OnSurfaceVariant)));
 		clearSearchButton.setBackground(UiUtils.getThemeDrawable(toolbarContext, android.R.attr.actionBarItemBackground));

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

@@ -26,9 +26,7 @@ import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -43,7 +41,7 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	public CharSequence parsedName, parsedBio;
 
 	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Account account, Notification notification){
-		super(parentID, null, parentFragment);
+		super(parentID, parentFragment);
 		this.account=account;
 		this.notification=notification;
 		avaRequest=new UrlImageLoaderRequest(
@@ -53,9 +51,9 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
 		parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), parentFragment.getAccountID());
 		if(account.emojis.isEmpty()){
-			parsedName=account.displayName;
+			parsedName=account.getDisplayName();
 		}else{
-			parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+			parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
 			emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
 		}
 	}
@@ -149,7 +147,7 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			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);
-			UiUtils.setExtraTextInfo(item.parentFragment.getContext(), null, findViewById(R.id.pronouns), true, false, false, item.account);
+			UiUtils.setExtraTextInfo(item.parentFragment.getContext(), null,true, false, false, item.account);
 
 			if(item.notification.type==Notification.Type.FOLLOW_REQUEST && (relationship==null || !relationship.followedBy)){
 				actionWrap.setVisibility(View.GONE);

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

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

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

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

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

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

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

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

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

@@ -42,7 +42,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 	private static final DateTimeFormatter TIME_FORMATTER=DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT);
 
 	public ExtendedFooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, String accountID, Status status){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}

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

@@ -15,8 +15,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 public class FileStatusDisplayItem extends StatusDisplayItem{
     private final Attachment attachment;
 
-    public FileStatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
-        super(parentID, contentStatusID, parentFragment);
+    public FileStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Attachment attachment) {
+        super(parentID, parentFragment);
         this.attachment=attachment;
     }
 

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

@@ -43,7 +43,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public boolean hideCounts;
 
 	public FooterStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Status status, String accountID){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 		this.accountID=accountID;
 	}

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

@@ -21,7 +21,7 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 	private final Status status;
 
 	public GapStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status){
-		super(parentID, null, parentFragment);
+		super(parentID, parentFragment);
 		this.status=status;
 	}
 

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

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

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

@@ -86,7 +86,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private Consumer<String> consumeReadAnnouncement;
 
 	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, CharSequence extraText, Notification notification, ScheduledStatus scheduledStatus){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		AccountSession session = AccountSessionManager.get(accountID);
 		user=scheduledStatus != null ? session.self : user;
 		this.user=user;
@@ -96,7 +96,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 						GlobalUserPreferences.playGifs ? user.avatar : user.avatarStatic,
 				V.dp(50), V.dp(50));
 		this.accountID=accountID;
-		parsedName=new SpannableStringBuilder(user.displayName);
+		parsedName=new SpannableStringBuilder(user.getDisplayName());
 		this.status=status;
 		this.notification=notification;
 		this.scheduledStatus=scheduledStatus;
@@ -137,7 +137,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView name, time, username, extraText, pronouns;
+		private final TextView name, time, username, extraText;
 		private final View collapseBtn, timeUsernameSeparator;
 		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, markAsRead, collapseBtnIcon, botIcon;
 		private final PopupMenu optionsMenu;
@@ -164,7 +164,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			collapseBtn=findViewById(R.id.collapse_btn);
 			collapseBtnIcon=findViewById(R.id.collapse_btn_icon);
 			extraText=findViewById(R.id.extra_text);
-			pronouns=findViewById(R.id.pronouns);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
 			avatar.setClipToOutline(true);
@@ -209,7 +208,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					}else if(item.scheduledStatus!=null){
 						args.putString("sourceText", item.status.text);
 						args.putString("sourceSpoiler", item.status.spoilerText);
-						args.putBoolean("redraftStatus", true);
 						args.putParcelable("scheduledStatus", Parcels.wrap(item.scheduledStatus));
 						Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 					}else{
@@ -219,14 +217,14 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 									public void onSuccess(GetStatusSourceText.Response result){
 										args.putString("sourceText", result.text);
 										args.putString("sourceSpoiler", result.spoilerText);
-										if (result.contentType != null) {
+										if(result.contentType!=null){
 											args.putString("sourceContentType", result.contentType.name());
 										}
-										if (redraft) {
+										if(redraft){
 											UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{
 												Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 											}, true);
-										} else {
+										}else{
 											Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 										}
 									}
@@ -243,7 +241,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					if (item.scheduledStatus != null) {
 						UiUtils.confirmDeleteScheduledPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.scheduledStatus, ()->{});
 					} else {
-						UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+						UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{}, false);
 					}
 				}else if(id==R.id.pin || id==R.id.unpin) {
 					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
@@ -333,7 +331,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			if(TextUtils.isEmpty(item.extraText)){
 				if (item.status != null) {
 					boolean displayPronouns=item.parentFragment instanceof ThreadFragment ? GlobalUserPreferences.displayPronounsInThreads : GlobalUserPreferences.displayPronounsInTimelines;
-					UiUtils.setExtraTextInfo(item.parentFragment.getContext(), extraText, pronouns, displayPronouns, item.status.visibility==StatusPrivacy.DIRECT, item.status.localOnly || item.status.visibility==StatusPrivacy.LOCAL, item.status.account);
+					UiUtils.setExtraTextInfo(item.parentFragment.getContext(), extraText, displayPronouns, item.status.visibility==StatusPrivacy.DIRECT, item.status.localOnly || item.status.visibility==StatusPrivacy.LOCAL, item.status.account);
 				}
 			}else{
 				extraText.setVisibility(View.VISIBLE);

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

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

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

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

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

@@ -18,7 +18,6 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
@@ -49,7 +48,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	private final CharSequence timestamp;
 
 	public NotificationHeaderStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Notification notification, String accountID){
-		super(parentID, notification.status!=null ? notification.status.getContentStatus().id : null, parentFragment);
+		super(parentID, parentFragment);
 		this.notification=notification;
 		this.accountID=accountID;
 		this.timestamp=notification.createdAt==null ? null : UiUtils.formatRelativeTimestamp(context, notification.createdAt);
@@ -62,7 +61,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 					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);
+			SpannableStringBuilder parsedName=new SpannableStringBuilder(notification.account.getDisplayName());
 			HtmlParser.parseCustomEmoji(parsedName, notification.account.emojis);
 			String str = parentFragment.getString(switch(notification.type){
 				case FOLLOW -> R.string.user_followed_you;

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

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

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

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

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

@@ -10,10 +10,8 @@ import android.text.SpannableStringBuilder;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
@@ -40,7 +38,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	private StatusPrivacy visibility;
 	@DrawableRes
 	private int iconEnd;
-	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), fullTextEmojiHelper;
+	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private View.OnClickListener handleClick;
 	public boolean needBottomPadding;
 	ReblogOrReplyLineStatusDisplayItem extra;
@@ -52,27 +50,19 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText, Status status) {
-		super(parentID, status.getContentStatus().id, parentFragment);
+		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		if(AccountSessionManager.get(parentFragment.getAccountID()).getLocalPreferences().customEmojiInNames)
 			HtmlParser.parseCustomEmoji(ssb, emojis);
 		this.text=ssb;
 		emojiHelper.setText(ssb);
+		this.fullText=fullText;
 		this.icon=icon;
 		this.status=status;
 		this.handleClick=handleClick;
 		TypedValue outValue = new TypedValue();
 		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
 		updateVisibility(visibility);
-
-		if (fullText != null) {
-			fullTextEmojiHelper = new CustomEmojiHelper();
-			SpannableStringBuilder fullTextSsb = new SpannableStringBuilder(fullText);
-			HtmlParser.parseCustomEmoji(fullTextSsb, emojis);
-			this.fullText=fullTextSsb;
-			fullTextEmojiHelper.setText(fullTextSsb);
-		}
-
 	}
 
 	public void updateVisibility(StatusPrivacy visibility) {
@@ -92,34 +82,28 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public int getImageCount(){
-		return emojiHelper.getImageCount();
+		return emojiHelper.getImageCount() + (extra!=null ? extra.emojiHelper.getImageCount() : 0);
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
-		return emojiHelper.getImageRequest(index);
+		int firstHelperCount=emojiHelper.getImageCount();
+		CustomEmojiHelper helper=index<firstHelperCount ? emojiHelper : extra.emojiHelper;
+		return helper.getImageRequest(firstHelperCount>0 ? index%firstHelperCount : index);
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<ReblogOrReplyLineStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView text, extraText;
 		private final View separator;
-		private final ViewGroup parent;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_reblog_or_reply_line, parent);
-			this.parent = parent;
 			text=findViewById(R.id.text);
 			extraText=findViewById(R.id.extra_text);
 			separator=findViewById(R.id.separator);
-			if (GlobalUserPreferences.compactReblogReplyLine) {
-				parent.addOnLayoutChangeListener((v, l, t, right, b, ol, ot, oldRight, ob) -> {
-					if (right != oldRight) layoutLine();
-				});
-			}
 		}
 
 		private void bindLine(ReblogOrReplyLineStatusDisplayItem item, TextView text) {
-			if (item.fullText != null) text.setContentDescription(item.fullText);
 			text.setText(item.text);
 			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, item.iconEnd, 0);
 			text.setOnClickListener(item.handleClick);
@@ -133,7 +117,10 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 				case LOCAL -> R.string.sk_local_only;
 				default -> 0;
 			} : 0;
-			if (visibilityText != 0) text.setContentDescription(item.text + " (" + ctx.getString(visibilityText) + ")");
+			String visibilityDescription=visibilityText!=0 ? " (" + ctx.getString(visibilityText) + ")" : null;
+			text.setContentDescription(item.fullText==null && visibilityDescription==null ? null :
+					(item.fullText!=null ? item.fullText : item.text)
+							+ (visibilityDescription!=null ? visibilityDescription : ""));
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
 			text.setCompoundDrawableTintList(text.getTextColors());
@@ -146,31 +133,15 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 			extraText.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
 			separator.setVisibility(item.extra == null ? View.GONE : View.VISIBLE);
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
-			layoutLine();
-		}
-
-		private void layoutLine() {
-			// layout line only if above header, compact and has extra
-			if (!GlobalUserPreferences.compactReblogReplyLine || item.extra == null) return;
-			itemView.measure(
-					View.MeasureSpec.makeMeasureSpec(parent.getWidth(), View.MeasureSpec.EXACTLY),
-					View.MeasureSpec.UNSPECIFIED);
-			boolean isVertical = ((LinearLayout) itemView).getOrientation() == LinearLayout.VERTICAL;
-			extraText.setPaddingRelative(extraText.getPaddingStart(), item.extra != null && isVertical ? 0 : V.dp(16), extraText.getPaddingEnd(), extraText.getPaddingBottom());
-			separator.setVisibility(item.extra != null && !isVertical ? View.VISIBLE : View.GONE);
-			((LinearLayout) itemView).removeView(extraText);
-			if (isVertical) ((LinearLayout) itemView).addView(extraText);
-			else ((LinearLayout) itemView).addView(extraText, 0);
-			text.setText(isVertical ? item.fullText : item.text);
-			if (item.extra != null) {
-				extraText.setText(isVertical ? item.extra.fullText : item.extra.text);
-			}
 		}
 
 		@Override
 		public void setImage(int index, Drawable image){
-			item.emojiHelper.setImageDrawable(index, image);
+			int firstHelperCount=item.emojiHelper.getImageCount();
+			CustomEmojiHelper helper=index<firstHelperCount ? item.emojiHelper : item.extra.emojiHelper;
+			helper.setImageDrawable(firstHelperCount>0 ? index%firstHelperCount : index, image);
 			text.invalidate();
+			extraText.invalidate();
 		}
 
 		@Override

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

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

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

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

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

@@ -13,7 +13,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.joinmastodon.android.GlobalUserPreferences;
+import androidx.annotation.NonNull;
+
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -22,12 +23,12 @@ 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.StatusListFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.LegacyFilter;
-import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
 import org.joinmastodon.android.model.Notification;
@@ -38,7 +39,6 @@ import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -53,7 +53,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public abstract class StatusDisplayItem{
-	public final String parentID, contentStatusID;
+	public final String parentID;
 	public final BaseStatusListFragment<?> parentFragment;
 	public boolean inset;
 	public int index;
@@ -83,12 +83,21 @@ public abstract class StatusDisplayItem{
 		this.isDirectDescendant = isDirectDescendant;
 	}
 
-	public StatusDisplayItem(String parentID, String contentStatusID, BaseStatusListFragment<?> parentFragment){
+	public StatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment){
 		this.parentID=parentID;
-		this.contentStatusID=contentStatusID;
 		this.parentFragment=parentFragment;
 	}
 
+	@NonNull
+	public String getContentStatusID(){
+		if(parentFragment instanceof StatusListFragment slf){
+			Status s=slf.getContentStatusByID(parentID);
+			return s!=null ? s.id : parentID;
+		}else{
+			return parentID;
+		}
+	}
+
 	public abstract Type getType();
 
 	public int getImageCount(){
@@ -130,11 +139,11 @@ public abstract class StatusDisplayItem{
 		String parentID = parent.getID();
 		String text = threadReply ? fragment.getString(R.string.sk_show_thread)
 				: account == null ? fragment.getString(R.string.sk_in_reply)
-				: GlobalUserPreferences.compactReblogReplyLine && status.reblog != null ? account.displayName
-				: fragment.getString(R.string.in_reply_to, account.displayName);
+				: status.reblog != null ? account.getDisplayName()
+				: fragment.getString(R.string.in_reply_to, account.getDisplayName());
 		String fullText = threadReply ? fragment.getString(R.string.sk_show_thread)
 				: account == null ? fragment.getString(R.string.sk_in_reply)
-				: fragment.getString(R.string.in_reply_to, account.displayName);
+				: fragment.getString(R.string.in_reply_to, account.getDisplayName());
 		return new ReblogOrReplyLineStatusDisplayItem(
 				parentID, fragment, text, account == null ? List.of() : account.emojis,
 				R.drawable.ic_fluent_arrow_reply_20sp_filled, null, null, fullText, status
@@ -164,12 +173,11 @@ public abstract class StatusDisplayItem{
 
 			if(status.reblog!=null){
 				boolean isOwnPost = AccountSessionManager.getInstance().isSelf(fragment.getAccountID(), status.account);
-				String fullText = fragment.getString(R.string.user_boosted, status.account.displayName);
-				String text = GlobalUserPreferences.compactReblogReplyLine && replyLine != null ? status.account.displayName : fullText;
+				String text=fragment.getString(R.string.user_boosted, status.account.getDisplayName());
 				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, status));
+				}, null, status));
 			} else if (!(status.tags.isEmpty() ||
 					fragment instanceof HashtagTimelineFragment ||
 					fragment instanceof ListTimelineFragment
@@ -193,7 +201,7 @@ public abstract class StatusDisplayItem{
 						.map(ReblogOrReplyLineStatusDisplayItem.class::cast)
 						.findFirst();
 
-				if (primaryLine.isPresent() && GlobalUserPreferences.compactReblogReplyLine) {
+				if (primaryLine.isPresent()) {
 					primaryLine.get().extra = replyLine;
 				} else {
 					items.add(replyLine);
@@ -246,7 +254,7 @@ public abstract class StatusDisplayItem{
 		}else if(!hasSpoiler && header!=null){
 			header.needBottomPadding=true;
 		}else if(hasSpoiler){
-			contentItems.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment));
+			contentItems.add(new DummyStatusDisplayItem(parentID, fragment));
 		}
 
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
@@ -270,11 +278,11 @@ public abstract class StatusDisplayItem{
 				contentItems.add(new AudioStatusDisplayItem(parentID, fragment, statusForContent, att));
 			}
 			if(att.type==Attachment.Type.UNKNOWN){
-				contentItems.add(new FileStatusDisplayItem(parentID, statusForContent.id, fragment, att));
+				contentItems.add(new FileStatusDisplayItem(parentID, fragment, att));
 			}
 		}
 		if(statusForContent.poll!=null){
-			buildPollItems(parentID, statusForContent.id, fragment, statusForContent.poll, contentItems);
+			buildPollItems(parentID, fragment, statusForContent.poll, contentItems);
 		}
 		if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){
 			contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
@@ -301,7 +309,7 @@ public abstract class StatusDisplayItem{
 		boolean inset=(flags & FLAG_INSET)!=0;
 		// add inset dummy so last content item doesn't clip out of inset bounds
 		if((inset || footer==null) && (flags & FLAG_CHECKABLE)==0){
-			items.add(new DummyStatusDisplayItem(parentID, statusForContent.id, fragment));
+			items.add(new DummyStatusDisplayItem(parentID, fragment));
 			// in case we ever need the dummy to display a margin for the media grid again:
 			// (i forgot why we apparently don't need this anymore)
 			// !contentItems.isEmpty() && contentItems
@@ -322,13 +330,13 @@ public abstract class StatusDisplayItem{
 				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
 	}
 
-	public static void buildPollItems(String parentID, String contentStatusID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
+	public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
 		int i=0;
 		for(Poll.Option opt:poll.options){
-			items.add(new PollOptionStatusDisplayItem(parentID, contentStatusID, poll, i, fragment));
+			items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment));
 			i++;
 		}
-		items.add(new PollFooterStatusDisplayItem(parentID, contentStatusID, fragment, poll));
+		items.add(new PollFooterStatusDisplayItem(parentID, fragment, poll));
 	}
 
 	public enum Type{

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

@@ -42,7 +42,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	public final Status status;
 
 	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
-		super(parentID, status.id, parentFragment);
+		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
 		this.disableTranslate=disableTranslate;
@@ -210,9 +210,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				Translation existingTrans=item.status.getContentStatus().translation;
 				String existingTransLang=existingTrans!=null ? existingTrans.detectedSourceLanguage : null;
 				String lang=existingTransLang!=null ? existingTransLang : item.status.getContentStatus().language;
-				String displayLang=Locale.forLanguageTag(lang != null ? lang
-						: AccountSessionManager.get(item.parentFragment.getAccountID()).preferences.postingDefaultLanguage).getDisplayLanguage();
-				translationButton.setText(item.parentFragment.getString(R.string.translate_post, !displayLang.isBlank() ? displayLang : lang));
+				Locale locale=lang!=null ? Locale.forLanguageTag(lang) : null;
+				translationButton.setText(locale!=null
+						? item.parentFragment.getString(R.string.translate_post, locale.getDisplayLanguage())
+						: item.parentFragment.getString(R.string.sk_translate_post));
 				translationButton.setClickable(true);
 				translationButton.animate().alpha(1).setDuration(100).start();
 				translationInfo.setVisibility(View.GONE);

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

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

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

@@ -0,0 +1,88 @@
+package org.joinmastodon.android.ui.utils;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.IntEvaluator;
+import android.animation.ObjectAnimator;
+import android.graphics.drawable.Drawable;
+import android.view.ActionMode;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.joinmastodon.android.R;
+
+import java.util.function.IntSupplier;
+
+import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.fragments.AppKitFragment;
+
+public class ActionModeHelper{
+	public static ActionMode startActionMode(AppKitFragment fragment, IntSupplier statusBarColorSupplier, ActionMode.Callback callback){
+		FragmentStackActivity activity=(FragmentStackActivity) fragment.getActivity();
+		return activity.startActionMode(new ActionMode.Callback(){
+			@Override
+			public boolean onCreateActionMode(ActionMode mode, Menu menu){
+				if(!callback.onCreateActionMode(mode, menu))
+					return false;
+				ObjectAnimator anim=ObjectAnimator.ofInt(activity.getWindow(), "statusBarColor", statusBarColorSupplier.getAsInt(), UiUtils.getThemeColor(activity, R.attr.colorM3Primary));
+				anim.setEvaluator(new IntEvaluator(){
+					@Override
+					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
+						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
+					}
+				});
+				anim.start();
+				activity.invalidateSystemBarColors(fragment);
+				View fakeView=new View(activity);
+//				mode.setCustomView(fakeView);
+//				int buttonID=activity.getResources().getIdentifier("action_mode_close_button", "id", "android");
+//				View btn=activity.getWindow().getDecorView().findViewById(buttonID);
+//				if(btn!=null){
+//					((ViewGroup.MarginLayoutParams)btn.getLayoutParams()).setMarginEnd(0);
+//				}
+				return true;
+			}
+
+			@Override
+			public boolean onPrepareActionMode(ActionMode mode, Menu menu){
+				if(!callback.onPrepareActionMode(mode, menu))
+					return false;
+				for(int i=0;i<menu.size();i++){
+					Drawable icon=menu.getItem(i).getIcon();
+					if(icon!=null){
+						icon=icon.mutate();
+						icon.setTint(UiUtils.getThemeColor(activity, R.attr.colorM3OnPrimary));
+						menu.getItem(i).setIcon(icon);
+					}
+				}
+				return true;
+			}
+
+			@Override
+			public boolean onActionItemClicked(ActionMode mode, MenuItem item){
+				return callback.onActionItemClicked(mode, item);
+			}
+
+			@Override
+			public void onDestroyActionMode(ActionMode mode){
+				ObjectAnimator anim=ObjectAnimator.ofInt(activity.getWindow(), "statusBarColor", UiUtils.getThemeColor(activity, R.attr.colorM3Primary), statusBarColorSupplier.getAsInt());
+				anim.setEvaluator(new IntEvaluator(){
+					@Override
+					public Integer evaluate(float fraction, Integer startValue, Integer endValue){
+						return UiUtils.alphaBlendColors(startValue, endValue, fraction);
+					}
+				});
+				anim.addListener(new AnimatorListenerAdapter(){
+					@Override
+					public void onAnimationEnd(Animator animation){
+						activity.getWindow().setStatusBarColor(0);
+					}
+				});
+				anim.start();
+				activity.invalidateSystemBarColors(fragment);
+				callback.onDestroyActionMode(mode);
+			}
+		});
+	}
+}

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

@@ -480,7 +480,7 @@ public class UiUtils {
 
 	public static void confirmToggleBlockUser(Activity activity, String accountID, Account account, boolean currentlyBlocked, Consumer<Relationship> resultCallback) {
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_title : R.string.confirm_block_title),
-				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.displayName),
+				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.getDisplayName()),
 				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block),
 				R.drawable.ic_fluent_person_prohibited_28_regular,
 				() -> {
@@ -508,7 +508,7 @@ public class UiUtils {
 	public static void confirmSoftBlockUser(Activity activity, String accountID, Account account, Consumer<Relationship> resultCallback) {
 		showConfirmationAlert(activity,
 				activity.getString(R.string.sk_remove_follower),
-				activity.getString(R.string.sk_remove_follower_confirm, account.displayName),
+				activity.getString(R.string.sk_remove_follower_confirm, account.getDisplayName()),
 				activity.getString(R.string.sk_do_remove_follower),
 				R.drawable.ic_fluent_person_delete_24_regular,
 				() -> new SetAccountBlocked(account.id, true).setCallback(new Callback<>() {
@@ -566,7 +566,7 @@ public class UiUtils {
 		params.setMargins(0, V.dp(-12), 0, 0);
 		durationView.setLayoutParams(params);
 		Button button=durationView.findViewById(R.id.button);
-		((TextView) durationView.findViewById(R.id.message)).setText(context.getString(R.string.confirm_mute, account.displayName));
+		((TextView) durationView.findViewById(R.id.message)).setText(context.getString(R.string.confirm_mute, account.getDisplayName()));
 
 		AtomicReference<Duration> muteDuration=new AtomicReference<>(Duration.ZERO);
 
@@ -600,7 +600,7 @@ public class UiUtils {
 
 		new M3AlertDialogBuilder(context)
 				.setTitle(context.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title))
-				.setMessage(currentlyMuted ? context.getString(R.string.confirm_unmute, account.displayName) : null)
+				.setMessage(currentlyMuted ? context.getString(R.string.confirm_unmute, account.getDisplayName()) : null)
 				.setView(currentlyMuted ? null : durationView)
 				.setPositiveButton(context.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), (dlg, i)->{
 					new SetAccountMuted(account.id, !currentlyMuted, muteDuration.get().getSeconds())
@@ -626,10 +626,6 @@ public class UiUtils {
 				.show();
 	}
 
-	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback) {
-		confirmDeletePost(activity, accountID, status, resultCallback, false);
-	}
-
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft) {
 		Status s=status.getContentStatus();
 		showConfirmationAlert(activity,
@@ -642,11 +638,8 @@ public class UiUtils {
 							@Override
 							public void onSuccess(Status result) {
 								resultCallback.accept(result);
-								CacheController cache=AccountSessionManager.get(accountID).getCacheController();
-								cache.deleteStatus(s.id);
 								E.post(new StatusDeletedEvent(s.id, accountID));
 								if(status!=s){
-									cache.deleteStatus(status.id);
 									E.post(new StatusDeletedEvent(status.id, accountID));
 								}
 							}
@@ -804,25 +797,32 @@ public class UiUtils {
 		} else if (relationship.muting) {
 			confirmToggleMuteUser(activity, accountID, account, true, resultCallback);
 		} else {
-			progressCallback.accept(true);
-			new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true, false)
-					.setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(Relationship result) {
-							resultCallback.accept(result);
-							progressCallback.accept(false);
-							if(!result.following && !result.requested){
-								E.post(new RemoveAccountPostsEvent(accountID, account.id, true));
+			Runnable action=()->{
+				progressCallback.accept(true);
+				new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(Relationship result){
+								resultCallback.accept(result);
+								progressCallback.accept(false);
+								if(!result.following && !result.requested){
+									E.post(new RemoveAccountPostsEvent(accountID, account.id, true));
+								}
 							}
-						}
 
-						@Override
-						public void onError(ErrorResponse error) {
-							error.showToast(activity);
-							progressCallback.accept(false);
-						}
-					})
-					.exec(accountID);
+							@Override
+							public void onError(ErrorResponse error){
+								error.showToast(activity);
+								progressCallback.accept(false);
+							}
+						})
+						.exec(accountID);
+			};
+			if(relationship.following && GlobalUserPreferences.confirmUnfollow){
+				showConfirmationAlert(activity, null, activity.getString(R.string.unfollow_confirmation, account.getDisplayUsername()), activity.getString(R.string.unfollow), R.drawable.ic_fluent_person_delete_24_regular, action);
+			}else{
+				action.run();
+			}
 		}
 	}
 
@@ -1107,23 +1107,21 @@ public class UiUtils {
 		return back;
 	}
 
-	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);
-			pronouns.setVisibility(View.VISIBLE);
-		}else if(pronouns!=null){
-			pronouns.setVisibility(View.GONE);
-		}
+	public static boolean setExtraTextInfo(Context ctx, @Nullable TextView extraText, boolean displayPronouns, boolean mentionedOnly, boolean localOnly, @Nullable Account account) {
+		List<String> extraParts=new ArrayList<>();
+		Optional<String> p=!displayPronouns ? Optional.empty() : extractPronouns(ctx, account);
+
 		if(localOnly)
 			extraParts.add(ctx.getString(R.string.sk_inline_local_only));
 		if(mentionedOnly)
 			extraParts.add(ctx.getString(R.string.sk_inline_direct));
-		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);
+		if(p.isPresent() && extraParts.isEmpty())
+			extraParts.add(p.get());
+
+		if(extraText!=null && !extraParts.isEmpty()) {
+			String sepp=ctx.getString(R.string.sk_separator);
+			String text=String.join(" " + sepp + " ", extraParts);
+			if(account==null) extraText.setText(text);
 			else HtmlParser.setTextWithCustomEmoji(extraText, text, account.emojis);
 			extraText.setVisibility(View.VISIBLE);
 			return true;
@@ -1699,14 +1697,17 @@ public class UiUtils {
 
 		Matcher matcher=trimPronouns.matcher(text);
 		if(!matcher.find()) return null;
-		String matched=matcher.group(1);
+		String pronouns=matcher.group(1);
 		// crude fix to allow for pronouns like "it(/she)"
 		int missingClosingParens=0;
-		for(char c : matched.toCharArray()){
+		for(char c : pronouns.toCharArray()){
 			if(c=='(') missingClosingParens++;
 			if(c==')') missingClosingParens--;
 		}
-		return matched+")".repeat(Math.max(0, missingClosingParens));
+		pronouns+=")".repeat(Math.max(0, missingClosingParens));
+		// if ends with an un-closed custom emoji
+		if(pronouns.matches("^.*\\s+:[a-zA-Z_]+$")) pronouns+=':';
+		return pronouns;
 	}
 
 	// https://stackoverflow.com/questions/9475589/how-to-get-string-from-different-locales-in-android

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

@@ -4,11 +4,12 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
@@ -19,6 +20,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -27,8 +29,8 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -51,11 +53,8 @@ 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;
@@ -204,6 +203,15 @@ public class ComposeMediaViewController{
 		}
 	}
 
+	private void updateButton(ImageButton btn, @DrawableRes int drawableId, @StringRes int labelId){
+		btn.setImageResource(drawableId);
+		String label=fragment.getContext().getString(labelId);
+		btn.setContentDescription(label);
+		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+			btn.setTooltipText(label);
+		}
+	}
+
 	private View createMediaAttachmentView(DraftMediaAttachment draft){
 		View thumb=fragment.getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
 		ImageView img=thumb.findViewById(R.id.thumb);
@@ -231,12 +239,11 @@ public class ComposeMediaViewController{
 		draft.removeButton.setOnClickListener(this::onRemoveMediaAttachmentClick);
 		draft.editButton.setTag(draft);
 
-		thumb.setOutlineProvider(OutlineProviders.roundedRect(12));
+		thumb.setOutlineProvider(ViewOutlineProvider.BACKGROUND);
 		thumb.setClipToOutline(true);
 		img.setOutlineProvider(OutlineProviders.roundedRect(12));
 		img.setClipToOutline(true);
 
-		thumb.setBackgroundColor(UiUtils.getThemeColor(fragment.getActivity(), R.attr.colorM3Surface));
 		thumb.setOnLongClickListener(v->{
 			if(!v.hasTransientState() && attachments.size()>1){
 				attachmentsView.startDragging(v);
@@ -266,11 +273,11 @@ public class ComposeMediaViewController{
 			draft.subtitleView.setText(subtitleRes);
 		}
 		draft.titleView.setText(fragment.getString(R.string.attachment_x_percent_uploaded, 0));
-		draft.removeButton.setImageResource(R.drawable.ic_baseline_close_24);
+		updateButton(draft.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 
 		if(draft.state==AttachmentUploadState.ERROR){
 			draft.titleView.setText(R.string.upload_failed);
-			draft.editButton.setImageResource(R.drawable.ic_fluent_arrow_counterclockwise_24_regular);
+			updateButton(draft.removeButton, R.drawable.ic_fluent_arrow_counterclockwise_24_regular, R.string.retry);
 			draft.editButton.setOnClickListener(this::onRetryOrCancelMediaUploadClick);
 			draft.progressBar.setVisibility(View.GONE);
 			draft.setUseErrorColors(true);
@@ -280,7 +287,7 @@ public class ComposeMediaViewController{
 			draft.editButton.setOnClickListener(this::onEditMediaDescriptionClick);
 		}else{
 			draft.editButton.setVisibility(View.GONE);
-			draft.removeButton.setImageResource(R.drawable.ic_baseline_close_24);
+			updateButton(draft.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 			if(draft.state==AttachmentUploadState.PROCESSING){
 				draft.titleView.setText(R.string.upload_processing);
 			}else{
@@ -374,7 +381,7 @@ public class ComposeMediaViewController{
 //						attachment.retryButton.setContentDescription(fragment.getString(R.string.retry_upload));
 
 						V.setVisibilityAnimated(attachment.editButton, View.VISIBLE);
-						attachment.editButton.setImageResource(R.drawable.ic_fluent_arrow_counterclockwise_24_regular);
+						updateButton(attachment.editButton, R.drawable.ic_fluent_arrow_counterclockwise_24_regular, R.string.retry);
 						attachment.editButton.setOnClickListener(ComposeMediaViewController.this::onRetryOrCancelMediaUploadClick);
 						attachment.setUseErrorColors(true);
 						V.setVisibilityAnimated(attachment.progressBar, View.GONE);
@@ -478,8 +485,8 @@ public class ComposeMediaViewController{
 			throw new IllegalStateException("Unexpected state "+attachment.state);
 		attachment.uploadRequest=null;
 		attachment.state=AttachmentUploadState.DONE;
-		attachment.editButton.setImageResource(R.drawable.ic_fluent_edit_24_regular);
-		attachment.removeButton.setImageResource(R.drawable.ic_fluent_delete_24_regular);
+		updateButton(attachment.editButton, R.drawable.ic_fluent_edit_24_regular, R.string.sk_edit_alt_text);
+		updateButton(attachment.removeButton, R.drawable.ic_fluent_dismiss_24_regular, R.string.delete);
 		attachment.editButton.setOnClickListener(this::onEditMediaDescriptionClick);
 		V.setVisibilityAnimated(attachment.progressBar, View.GONE);
 		V.setVisibilityAnimated(attachment.editButton, View.VISIBLE);
@@ -708,18 +715,21 @@ public class ComposeMediaViewController{
 			if(errorTransitionAnimator!=null)
 				errorTransitionAnimator.cancel();
 			AnimatorSet set=new AnimatorSet();
-			int color1, color2, color3;
+			int defaultBg=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3Surface);
+			int errorBg=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3ErrorContainer);
+			int color2, color3;
 			if(use){
-				color1=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3ErrorContainer);
 				color2=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3Error);
 				color3=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3OnErrorContainer);
 			}else{
-				color1=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3Surface);
 				color2=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3OnSurface);
 				color3=UiUtils.getThemeColor(view.getContext(), R.attr.colorM3OnSurfaceVariant);
 			}
+			GradientDrawable bg=(GradientDrawable) view.getBackground().mutate();
+			ValueAnimator bgAnim=ValueAnimator.ofArgb(use ? defaultBg : errorBg, use ? errorBg : defaultBg);
+			bgAnim.addUpdateListener(anim->bg.setColor((Integer) anim.getAnimatedValue()));
 			set.playTogether(
-					ObjectAnimator.ofArgb(view, "backgroundColor", ((ColorDrawable)view.getBackground()).getColor(), color1),
+					bgAnim,
 					ObjectAnimator.ofArgb(titleView, "textColor", titleView.getCurrentTextColor(), color2),
 					ObjectAnimator.ofArgb(subtitleView, "textColor", subtitleView.getCurrentTextColor(), color3),
 					ObjectAnimator.ofArgb(removeButton.getDrawable(), "tint", subtitleView.getCurrentTextColor(), color3)

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

@@ -6,6 +6,7 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.style.TypefaceSpan;
@@ -25,6 +26,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ListsFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
@@ -98,6 +100,9 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		contextMenu=new PopupMenu(fragment.getActivity(), menuAnchor);
 		contextMenu.inflate(R.menu.profile);
 		contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
+		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.P && !UiUtils.isEMUI())
+			contextMenu.getMenu().setGroupDividerEnabled(true);
+		UiUtils.enablePopupMenuIcons(fragment.getContext(), contextMenu);
 
 		setStyle(AccessoryType.BUTTON, false);
 	}
@@ -212,14 +217,20 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		Menu menu=contextMenu.getMenu();
 		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()));
+		MenuItem mute=menu.findItem(R.id.mute);
+		mute.setTitle(fragment.getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
+		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
+		UiUtils.insetPopupMenuIcon(fragment.getContext(), mute);
+		menu.findItem(R.id.block).setTitle(fragment.getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
+		menu.findItem(R.id.report).setTitle(fragment.getString(R.string.report_user, account.getShortUsername()));
+		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
+		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 		MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 		if(relationship.following){
-			hideBoosts.setTitle(fragment.getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+			hideBoosts.setTitle(fragment.getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
+			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
+			UiUtils.insetPopupMenuIcon(fragment.getContext(), hideBoosts);
 			hideBoosts.setVisible(true);
 		}else{
 			hideBoosts.setVisible(false);
@@ -274,6 +285,8 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 			UiUtils.confirmToggleMuteUser(fragment.getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 		}else if(id==R.id.block){
 			UiUtils.confirmToggleBlockUser(fragment.getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
+		}else if(id==R.id.soft_block){
+			UiUtils.confirmSoftBlockUser(fragment.getActivity(), accountID, account, this::updateRelationship);
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -303,6 +316,12 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 					})
 					.wrapProgress(fragment.getActivity(), R.string.loading, false)
 					.exec(accountID);
+		}else if(id==R.id.manage_user_lists){
+			final Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putString("profileAccount", account.id);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			Nav.go(fragment.getActivity(), ListsFragment.class, args);
 		}
 		return true;
 	}

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

@@ -73,6 +73,6 @@ public abstract class ListItemViewHolder<T extends ListItem<?>> extends Bindable
 
 	@Override
 	public void onClick(){
-		item.onClick.run();
+		item.performClick();
 	}
 }

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

@@ -1,33 +1,40 @@
 package org.joinmastodon.android.ui.views;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import me.grishka.appkit.utils.V;
+import org.joinmastodon.android.R;
 
 /**
  * A LinearLayout for TextViews. First child TextView will get truncated if it doesn't fit, remaining will always wrap content.
  */
 public class HeaderSubtitleLinearLayout extends LinearLayout{
+	private float firstFraction;
+
 	public HeaderSubtitleLinearLayout(Context context){
-		super(context);
+		this(context, null);
 	}
 
 	public HeaderSubtitleLinearLayout(Context context, AttributeSet attrs){
-		super(context, attrs);
+		this(context, attrs, 0);
 	}
 
 	public HeaderSubtitleLinearLayout(Context context, AttributeSet attrs, int defStyleAttr){
 		super(context, attrs, defStyleAttr);
+		TypedArray ta=context.obtainStyledAttributes(attrs, R.styleable.HeaderSubtitleLinearLayout);
+		firstFraction=ta.getFraction(R.styleable.HeaderSubtitleLinearLayout_firstFraction, 1, 1, 0.5f);
+		ta.recycle();
 	}
 
 	@Override
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
 		if(getLayoutChildCount()>1){
-			int remainingWidth=MeasureSpec.getSize(widthMeasureSpec);
+			int fullWidth=MeasureSpec.getSize(widthMeasureSpec);
+			int remainingWidth=fullWidth;
 			for(int i=1;i<getChildCount();i++){
 				View v=getChildAt(i);
 				if(v.getVisibility()==GONE)
@@ -38,8 +45,7 @@ public class HeaderSubtitleLinearLayout extends LinearLayout{
 			}
 			View first=getChildAt(0);
 			if(first instanceof TextView){
-				// guaranteeing at least 64dp of width for the display name
-				((TextView) first).setMaxWidth(Math.max(remainingWidth, V.dp(64)));
+				((TextView) first).setMaxWidth(Math.max(remainingWidth, (int)(firstFraction*fullWidth)));
 			}
 		}else{
 			View first=getChildAt(0);
@@ -58,4 +64,12 @@ public class HeaderSubtitleLinearLayout extends LinearLayout{
 		}
 		return count;
 	}
+
+	public void setFirstFraction(float firstFraction){
+		this.firstFraction=firstFraction;
+	}
+
+	public float getFirstFraction(){
+		return firstFraction;
+	}
 }

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

@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center_vertical" android:height="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>

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

@@ -3,19 +3,13 @@
 	android:color="@color/m3_primary_overlay">
 	<item android:gravity="center" android:height="40dp" android:width="40dp">
 		<selector>
-			<item android:state_enabled="true" android:state_selected="true">
+			<item android:state_enabled="true">
 				<shape>
 					<solid android:color="?colorM3SecondaryContainer"/>
 					<corners android:radius="20dp"/>
 				</shape>
 			</item>
-			<item android:state_selected="false">
-				<shape>
-					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-			<item android:state_enabled="false">
+			<item>
 				<shape>
 					<solid android:color="?colorM3DisabledBackground"/>
 					<corners android:radius="20dp"/>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center" android:height="40dp" android:width="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center" android:height="40dp" android:width="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center_vertical" android:height="40dp">
+		<selector>
+			<item android:state_enabled="true" android:state_selected="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_selected="false">
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
-	<item>
-		<shape>
-			<solid android:color="?colorPrimary800"/>
-			<corners android:radius="16sp"/>
-			<padding android:left="16sp" android:right="16sp"/>
-		</shape>
-	</item>
-</ripple>

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

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

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

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

mastodon/src/main/res/drawable/ic_fluent_person_available_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="M17.5 12c3.038 0 5.5 2.463 5.5 5.5 0 3.038-2.462 5.5-5.5 5.5-3.037 0-5.5-2.462-5.5-5.5 0-3.037 2.463-5.5 5.5-5.5zm-2.646 5.147c-0.195-0.196-0.512-0.196-0.707 0-0.196 0.195-0.196 0.512 0 0.707l2 2c0.195 0.195 0.512 0.195 0.707 0l4-4c0.195-0.195 0.195-0.512 0-0.707-0.195-0.196-0.512-0.196-0.707 0L16.5 18.793l-1.646-1.646zM12.023 14c-0.297 0.463-0.537 0.966-0.709 1.5H4.253c-0.414 0-0.75 0.335-0.75 0.75v0.577c0 0.535 0.192 1.053 0.54 1.46 1.253 1.469 3.22 2.214 5.957 2.214 0.597 0 1.157-0.035 1.68-0.106 0.246 0.495 0.553 0.954 0.912 1.367-0.795 0.16-1.66 0.24-2.592 0.24-3.146 0-5.532-0.906-7.098-2.74-0.58-0.679-0.898-1.543-0.898-2.435v-0.578C2.004 15.007 3.01 14 4.253 14h7.77zM10 2.005c2.762 0 5 2.239 5 5s-2.238 5-5 5c-2.761 0-5-2.239-5-5s2.239-5 5-5zm0 1.5c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -5,8 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:paddingHorizontal="16dp"
-    android:paddingBottom="4dp">
+    android:paddingHorizontal="16dp">
 
     <Button
         android:id="@+id/language_btn"
@@ -18,14 +17,17 @@
         android:drawableStart="@drawable/ic_fluent_local_language_16_regular"
         android:drawablePadding="8dp"
         android:drawableTint="?colorM3OnSurfaceVariant"
+		android:contentDescription="@string/language"
+		android:tooltipText="@string/language"
         android:textColor="?colorM3OnSurfaceVariant" />
 
     <ImageButton
         android:id="@+id/drafts_btn"
         style="@style/Widget.Mastodon.M3.Button.Text"
         android:background="@drawable/bg_button_m3_text_circle"
-        android:layout_width="40dp"
+        android:layout_width="48dp"
         android:layout_height="match_parent"
+		android:layout_marginStart="-6dp"
         android:src="@drawable/ic_fluent_clock_20_regular"
         android:tint="?colorM3OnSurfaceVariant"
         android:contentDescription="@string/sk_schedule_or_draft"
@@ -37,7 +39,7 @@
         android:id="@+id/publish_btn"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="6dp"
         android:singleLine="true"
         android:ellipsize="end" />
 

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

@@ -3,7 +3,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:foreground="@drawable/fg_compose_attachment">
+	android:background="@drawable/bg_compose_attachment">
 
 	<View
 		android:id="@+id/drag_layer"
@@ -18,6 +18,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:layout_above="@id/title"
+		android:layout_margin="1dp"
 		android:scaleType="centerCrop"
 		android:importantForAccessibility="no"
 		tools:src="#0f0"/>
@@ -57,9 +58,11 @@
 		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_alignParentBottom="true"
-		android:layout_marginEnd="16dp"
-		android:layout_marginBottom="8dp"
-		android:src="@drawable/ic_fluent_delete_24_regular"
+		android:layout_marginEnd="4dp"
+		android:layout_marginBottom="4dp"
+		android:contentDescription="@string/delete"
+		android:tooltipText="@string/delete"
+		android:src="@drawable/ic_fluent_dismiss_24_regular"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:backgroundTint="?colorM3OnSurfaceVariant"
 		android:background="@drawable/bg_round_ripple"/>
@@ -70,8 +73,9 @@
 		android:layout_height="48dp"
 		android:layout_toStartOf="@id/delete"
 		android:layout_alignParentBottom="true"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_marginBottom="4dp"
+		android:contentDescription="@string/sk_edit_alt_text"
+		android:tooltipText="@string/sk_edit_alt_text"
 		android:src="@drawable/ic_fluent_edit_24_regular"
 		android:tint="?colorM3OnSurfaceVariant"
 		android:backgroundTint="?colorM3OnSurfaceVariant"

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

@@ -30,7 +30,7 @@
 				android:layout_height="wrap_content"
 				android:minHeight="48dp"
 				android:minWidth="48dp"
-				android:background="@drawable/bg_button_m3_tonal_circle"
+				android:background="@drawable/bg_button_m3_tonal_circle_selector"
 				android:tooltipText="@string/sk_button_react"
 				android:contentDescription="@string/sk_button_react"
 				android:src="@drawable/ic_fluent_add_24_filled" />

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

@@ -21,8 +21,7 @@
 				android:orientation="horizontal"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:paddingHorizontal="4dp">
-				<!-- avatar width (46sp) / 2 - button width (24dp) / 2 -->
+				android:paddingHorizontal="15dp">
 
 				<FrameLayout
 					android:layout_weight="1"

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:paddingHorizontal="16dp">
@@ -10,7 +11,7 @@
 		android:id="@+id/buttons"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="6dp"
+		android:layout_marginTop="5dp"
 		android:layout_alignParentTop="true"
 		android:layout_alignParentEnd="true">
 
@@ -107,6 +108,7 @@
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
+		app:firstFraction="60%"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_toEndOf="@id/avatar"
@@ -125,20 +127,6 @@
 			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"
@@ -146,8 +134,7 @@
 			android:layout_marginStart="8sp"
 			android:ellipsize="end"
 			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
-			android:fontFamily="sans-serif"
+			android:textAppearance="@style/m3_body_medium"
 			android:textAlignment="viewStart"
 			android:textColor="?colorM3OnSurface"
 			tools:text="boosted your cat picture" />

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	app:firstFraction="30%"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -45,6 +47,6 @@
 		android:drawableTint="?colorM3OnSurface"
 		android:drawablePadding="6dp"
 		android:singleLine="true"
-		android:ellipsize="end"/>
+		android:ellipsize="middle"/>
 
-</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
+</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>

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

@@ -49,7 +49,7 @@
 		<Button
 			android:id="@+id/advanced"
 			style="@style/Widget.Mastodon.M3.Button.Outlined"
-			android:background="@drawable/bg_button_m3_tonal"
+			android:background="@drawable/bg_button_m3_tonal_selector"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="24dp"

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

@@ -110,7 +110,7 @@
 							android:layout_marginStart="8sp"
 							android:ellipsize="end"
 							android:singleLine="true"
-							android:textAppearance="@style/m3_title_medium"
+							android:textAppearance="@style/m3_body_medium"
 							android:textAlignment="viewStart"
 							android:textColor="?colorM3OnSurface"
 							tools:text="@string/sk_inline_local_only" />
@@ -366,6 +366,7 @@
 
 				<Button
 					style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+					android:background="@drawable/bg_button_m3_tonal_selector"
 					android:id="@+id/sensitive_item"
 					android:orientation="horizontal"
 					android:layout_width="wrap_content"

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

@@ -93,7 +93,7 @@
 								android:layout_width="48dp"
 								android:layout_height="48dp"
 								style="@style/Widget.Mastodon.M3.Button.Tonal"
-								android:background="@drawable/bg_button_m3_tonal_circle"
+								android:background="@drawable/bg_button_m3_tonal_circle_selector"
 								android:paddingStart="12dp"
 								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
 

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

@@ -34,7 +34,7 @@
                 android:visibility="gone" />
             <TextView
                 android:id="@+id/timeline_title"
-                style="?android:attr/titleTextAppearance"
+                style="@style/action_bar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -47,22 +47,21 @@
         android:layout_height="match_parent">
         <Button
             android:id="@+id/show_new_posts_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="2dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="20dp"
-            android:minHeight="32sp"
-            android:maxLines="2"
+			style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@drawable/bg_button_m3_tonal_selector"
+            android:maxLines="1"
             android:ellipsize="end"
-            android:lineSpacingMultiplier="0.8"
-            android:textAppearance="@style/m3_title_medium"
-            android:textSize="16sp"
-            android:text="@string/see_new_posts"
-            android:textColor="@color/gray_25"
-            android:background="@drawable/bg_button_new_posts"
+			android:textAppearance="@style/m3_title_medium"
+			android:textSize="16sp"
+			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
-            android:drawablePadding="8dp"
             android:layout_gravity="center" />
+		<!--
+		using the selector background because..
+		the selected=false state's border looks better than the one from the outline style
+		(as per m3 spec) :( i should probably fix this at some point
+		-->
     </FrameLayout>
 </FrameLayout>

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

@@ -128,9 +128,9 @@
 			android:layout_weight="1"
 			android:layout_height="wrap_content"
 			android:layout_marginBottom="16dp"
+			android:layout_marginTop="6dp"
 			android:layout_marginStart="16dp"
-			android:layout_gravity="bottom"
-			android:paddingTop="6dp"
+			android:paddingTop="3dp"
 			android:gravity="center_vertical"
 			android:minHeight="44dp">
 
@@ -249,7 +249,7 @@
 			android:paddingStart="8dp"
 			android:paddingEnd="4dp"
 			android:clipToPadding="false"
-			android:paddingBottom="8dp"
+			android:paddingBottom="10dp"
 			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
@@ -286,7 +286,7 @@
 			android:paddingStart="4dp"
 			android:paddingEnd="16dp"
 			android:clipToPadding="false"
-			android:paddingBottom="8dp"
+			android:paddingBottom="10dp"
 			android:visibility="gone">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton
@@ -322,7 +322,7 @@
 			android:layout_gravity="bottom"
 			android:paddingStart="8dp"
 			android:paddingEnd="16dp"
-			android:paddingBottom="8dp"
+			android:paddingBottom="10dp"
 			android:clipToPadding="false">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton

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

@@ -23,5 +23,5 @@
 		android:layout_marginEnd="8dp"
 		android:drawableTint="@null"
 		android:drawableStart="@drawable/image_placeholder"
-		android:background="@drawable/bg_button_m3_tonal"/>
+		android:background="@drawable/bg_button_m3_tonal_selector"/>
 </FrameLayout>

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

@@ -35,7 +35,7 @@
 		android:layout_width="40dp"
 		android:layout_height="40dp"
 		android:layout_gravity="end|top"
-		android:src="@drawable/ic_baseline_close_24"
+		android:src="@drawable/ic_fluent_dismiss_24_regular"
 		android:tint="?colorM3DarkOnSurface"
 		android:background="?android:actionBarItemBackground"/>