Now its fixed for good. That was easier than I thought

(cherry picked from commit 2076818220)

README.md

@@ -140,6 +140,4 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-[Official matrix chatroom:](https://matrix.to/#/#moshidon:matrix.org) https://matrix.to/#/#moshidon:matrix.org
-
 <a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>

mastodon/build.gradle

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

mastodon/src/main/assets/blocks.tsv

@@ -1,85 +0,0 @@
-#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
-#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
-#	This list contains domains of toxic mastodon instances
-#	Last-Modified:	1672044500
-
-#	gab - a neonazi social network
-gab.ai
-gab.com
-gab.protohype.net
-
-#	consequence-free speech
-social.unzensiert.to
-freeatlantis.com
-
-#	reactionary bigotry and hatespeech against magrinalized groups
-poa.st
-freespeechextremist.com
-rdrama.cc
-outpoa.st
-anime.website
-gameliberty.club
-social.byoblu.com
-yggdrasil.social
-smuglo.li
-dogeposting.social
-unsafe.space
-freezepeach.xyz
-
-#	+ CSAM
-rojogato.com
-
-#	antivaxxer shitposting & fearmongering
-shadowsocial.org
-
-#	Kiwifarms
-kiwifarms.net
-kiwifarms.cc
-kiwifarms.is
-kiwifarms.pleroma.net
-
-
-# https://mastodon.art/@Curator/109649354849593592
-
-poa.st antisemitic racist homophobic
-nicecrew.digital antisemitic
-beefyboys.win antisemitic racist homophobic harassment
-cawfee.club antisemitic racist homophobic
-comfyboy.club antisemitic racist homophobic
-freespeechextremist.com racist homophobic
-cum.salon racist misogynist
-bae.st racist
-natehiggers.online racist
-rapemeat.solutions misogynist
-rapist.town misogynist
-rapefeminists.network misogynist
-kiwifarms.cc harassment
-noagendasocial.com noagenda
-posting.lolicon.rocks underage
-urchan.org harassment homophobic racist
-ryona.agency harassment
-yggdrasil.social antisemitic homophobic racist
-genderheretics.xyz transphobic
-baraag.net underage
-lolison.top underage
-shota.house underage
-shota.social underage
-aethy.com underage
-taullo.social underage
-childpawn.shop underage
-posting.lolicon.rocks underage
-loli.best underage
-gothloli.club underage
-smuglo.li underage
-youjo.love underage
-pedo.school underage
-lolison.network underage
-freak.university underage
-mirr0r.city underage
-xhais.love underage
-refusal.biz underage
-refusal.llc underage
-mirr0r.city underage
-nnia.space underage
-ignorelist.com malicious
-repl.co malicious

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

@@ -53,10 +53,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
 		String subject = "";
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
-			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-			if (!subject.isBlank()) builder.append(subject).append("\n\n");
-		}
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n\n");
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;

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

@@ -16,8 +16,7 @@ import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -34,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomWelcomeFragment());
+				showFragmentClearingBackStack(new CustomLoginFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;

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

@@ -37,8 +37,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 
 	public static final int NOTIFICATION_ID=178;
-	private static final int SUMMARY_ID = 791;
-	private static int notificationId = 0;
+
+	private static int notificationID;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
@@ -99,7 +99,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		String accountName="@"+self.username+"@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 		Notification.Builder builder;
-		Notification.Builder summaryNotification;
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
 			boolean hasGroup=false;
 			List<NotificationChannelGroup> channelGroups=nm.getNotificationChannelGroups();
@@ -122,36 +121,31 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				nm.createNotificationChannels(channels);
 			}
 			builder=new Notification.Builder(context, accountID+"_"+pn.notificationType);
-//			summaryNotification=new Notification.Builder(context, accountID);
 		}else{
 			builder=new Notification.Builder(context)
 					.setPriority(Notification.PRIORITY_DEFAULT)
 					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
-			summaryNotification=new Notification.Builder(context)
-					.setPriority(Notification.PRIORITY_DEFAULT)
-					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 		}
 		Drawable avatar=ImageCache.getInstance(context).get(new UrlImageLoaderRequest(pn.icon, V.dp(50), V.dp(50)));
+
+		notificationID = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : (int)System.currentTimeMillis();
+
 		Intent contentIntent=new Intent(context, MainActivity.class);
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationId);
+		contentIntent.putExtra("notificationID", notificationID);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
-
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
-				.setContentTitle(pn.title)
-				.setStyle(new Notification.InboxStyle()
-						.addLine(pn.body))
-				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
+				.setContentIntent(PendingIntent.getActivity(context, notificationID, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setGroup(accountID)
 				.setColor(context.getColor(R.color.shortcut_icon_background));
 		if(!GlobalUserPreferences.uniformNotificationIcon){
 			switch (pn.notificationType) {
@@ -172,9 +166,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-
-		notificationId++;
-		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build());
-
+		nm.notify(accountID, notificationID, builder.build());
 	}
 }

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

@@ -12,14 +12,11 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -50,26 +47,9 @@ public class MastodonAPIController{
 	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 
 	private AccountSession session;
-	private static List<String> badDomains = new ArrayList<>();
 
 	static{
 		thread.start();
-		try {
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.tsv")
-			));
-			String line;
-			while ((line = reader.readLine()) != null) {
-				if (line.isBlank() || line.startsWith("#")) continue;
-				String[] parts = line.replaceAll("\"", "").split("[\s,;]");
-				if (parts.length == 0) continue;
-				String domain = parts[0].toLowerCase().trim();
-				if (domain.isBlank()) continue;
-				badDomains.add(domain);
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
 	}
 
 	public MastodonAPIController(@Nullable AccountSession session){
@@ -77,11 +57,8 @@ public class MastodonAPIController{
 	}
 
 	public <T> void submitRequest(final MastodonAPIRequest<T> req){
-		final String host = req.getURL().getHost();
-		final boolean isBad = host == null || badDomains.stream().anyMatch(h -> h.equalsIgnoreCase(host) || host.toLowerCase().endsWith("." + h));
 		thread.postRunnable(()->{
 			try{
-				if (isBad) throw new IllegalArgumentException();
 				if(req.canceled)
 					return;
 				Request.Builder builder=new Request.Builder()

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

@@ -162,8 +162,6 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								result.serverKey=result.serverKey.replace('/','_');
-								result.serverKey=result.serverKey.replace('+','-');
 								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java

@@ -1,19 +0,0 @@
-package org.joinmastodon.android.api.requests.accounts;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Relationship;
-
-public class SetPrivateNote extends MastodonAPIRequest<Relationship>{
-    public SetPrivateNote(String id, String comment){
-        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", Relationship.class);
-        Request req = new Request(comment);
-        setRequestBody(req);
-    }
-
-    private static class Request{
-        public String comment;
-        public Request(String comment){
-            this.comment=comment;
-        }
-    }
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java

@@ -1,10 +0,0 @@
-package org.joinmastodon.android.api.requests.announcements;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-
-public class DismissAnnouncement extends MastodonAPIRequest<Object>{
-	public DismissAnnouncement(String id){
-		super(HttpMethod.POST, "/announcements/" + id + "/dismiss", Object.class);
-		setRequestBody(new Object());
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java

@@ -1,15 +0,0 @@
-package org.joinmastodon.android.api.requests.announcements;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Announcement;
-
-import java.util.List;
-
-public class GetAnnouncements extends MastodonAPIRequest<List<Announcement>> {
-    public GetAnnouncements(boolean withDismissed) {
-        super(MastodonAPIRequest.HttpMethod.GET, "/announcements", new TypeToken<>(){});
-        addQueryParameter("with_dismissed", withDismissed ? "true" : "false");
-    }
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java

@@ -1,19 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class CreateList extends MastodonAPIRequest<ListTimeline> {
-	public CreateList(String title, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.POST, "/lists", ListTimeline.class);
-		Request req = new Request();
-		req.title = title;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
-	}
-
-	public static class Request {
-		public String title;
-		public ListTimeline.RepliesPolicy repliesPolicy;
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java

@@ -1,10 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class DeleteList extends MastodonAPIRequest<Object> {
-	public DeleteList(String id) {
-		super(HttpMethod.DELETE, "/lists/" + id, Object.class);
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java

@@ -1,14 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class UpdateList extends MastodonAPIRequest<ListTimeline> {
-	public UpdateList(String id, String title, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.PUT, "/lists/" + id, ListTimeline.class);
-		CreateList.Request req = new CreateList.Request();
-		req.title = title;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/tags/GetFollowedHashtags.java

@@ -9,10 +9,6 @@ import org.joinmastodon.android.model.Hashtag;
 import java.util.List;
 
 public class GetFollowedHashtags extends HeaderPaginationRequest<Hashtag> {
-    public GetFollowedHashtags() {
-        this(null, null, -1, null);
-    }
-
     public GetFollowedHashtags(String maxID, String minID, int limit, String sinceID){
         super(HttpMethod.GET, "/followed_tags", new TypeToken<>(){});
         if(maxID!=null)

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

@@ -1,22 +0,0 @@
-package org.joinmastodon.android.api.requests.timelines;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Status;
-
-import java.util.List;
-
-public class GetConversationsTimeline extends MastodonAPIRequest<List<Status>>{
-    public GetConversationsTimeline(String maxID, String minID, int limit, String sinceID){
-        super(HttpMethod.GET, "/conversations", new TypeToken<>(){});
-        if(maxID!=null)
-            addQueryParameter("max_id", maxID);
-        if(minID!=null)
-            addQueryParameter("min_id", minID);
-        if(sinceID!=null)
-            addQueryParameter("since_id", sinceID);
-        if(limit>0)
-            addQueryParameter("limit", ""+limit);
-    }
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java

@@ -8,11 +8,9 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetTrendingStatuses extends MastodonAPIRequest<List<Status>>{
-	public GetTrendingStatuses(int offset, int limit){
+	public GetTrendingStatuses(int limit){
 		super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){});
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
-		if(offset>0)
-			addQueryParameter("offset", ""+offset);
 	}
 }

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

@@ -3,10 +3,6 @@ package org.joinmastodon.android.fragments;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.view.animation.TranslateAnimation;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
@@ -71,7 +67,6 @@ public class AccountTimelineFragment extends StatusListFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab = ((ProfileFragment) getParentFragment()).getFab();
 	}
 
 	@Override

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

@@ -1,109 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static java.util.stream.Collectors.toList;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageButton;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
-import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Announcement;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.ScheduledStatus;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.PaginatedList;
-import me.grishka.appkit.api.SimpleCallback;
-
-public class AnnouncementsFragment extends BaseStatusListFragment<Announcement> {
-	private Instance instance;
-	private AccountSession session;
-	private List<String> unreadIDs = null;
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		setTitle(R.string.sk_announcements);
-		session = AccountSessionManager.getInstance().getAccount(accountID);
-		instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		loadData();
-	}
-
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(Announcement a) {
-		if(TextUtils.isEmpty(a.content)) return List.of();
-		Account instanceUser = new Account();
-		instanceUser.id = instanceUser.acct = instanceUser.username = session.domain;
-		instanceUser.displayName = instance.title;
-		instanceUser.url = "https://"+session.domain+"/about";
-		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
-		instanceUser.emojis = List.of();
-		Status fakeStatus = a.toStatus();
-		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
-		textItem.textSelectable = true;
-		return List.of(
-				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
-				textItem
-		);
-	}
-
-	public void onMarkAsRead(String id) {
-		if (unreadIDs == null) return;
-		unreadIDs.remove(id);
-		if (unreadIDs.size() == 0) setResult(true, null);
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-	}
-
-	@Override
-	protected void addAccountToKnown(Announcement s) {}
-
-	@Override
-	public void onItemClick(String id) {}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAnnouncements(true)
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(List<Announcement> result){
-						List<Announcement> unread = result.stream().filter(a -> !a.read).collect(toList());
-						List<Announcement> read = result.stream().filter(a -> a.read).collect(toList());
-						onDataLoaded(unread, true);
-						onDataLoaded(read, false);
-						unreadIDs = unread.stream().map(a -> a.id).collect(toList());
-					}
-				})
-				.exec(accountID);
-	}
-}

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

@@ -13,12 +13,9 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
-import android.view.animation.TranslateAnimation;
-import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
@@ -74,8 +71,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
 	protected PhotoViewer currentPhotoViewer;
-	protected ImageButton fab;
-	protected boolean isScrollingUp = false;
 	protected HashMap<String, Account> knownAccounts=new HashMap<>();
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
@@ -278,42 +273,11 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab=view.findViewById(R.id.fab);
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
-
-				if (fab!=null) {
-					if (dy >= 0 ) {
-						if (isScrollingUp) {
-							fab.setVisibility(View.INVISIBLE);
-							TranslateAnimation animate = new TranslateAnimation(
-									0,
-									0,
-									0,
-									fab.getHeight() * 2);
-							animate.setDuration(300);
-							animate.setFillAfter(true);
-							fab.startAnimation(animate);
-							isScrollingUp = false;
-						}
-					} else {
-						if (!isScrollingUp) {
-							fab.setVisibility(View.VISIBLE);
-							TranslateAnimation animate = new TranslateAnimation(
-									0,
-									0,
-									fab.getHeight() * 2,
-									0);
-							animate.setDuration(300);
-							animate.setFillAfter(true);
-							fab.startAnimation(animate);
-							isScrollingUp = true;
-						}
-					}
-				}
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());

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

@@ -1,7 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-import static android.os.ext.SdkExtensions.getExtensionVersion;
-
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
@@ -31,7 +29,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -310,14 +307,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			draftsBtn=view.findViewById(R.id.drafts_btn);
 			draftsBtn.setVisibility(View.VISIBLE);
-		} else {
-			charCounter=view.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
 		}
 
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
+		charCounter=view.findViewById(R.id.char_counter);
+		charCounter.setText(String.valueOf(charLimit));
 		scrollView=view.findViewById(R.id.scroll_view);
 
 		selfName=view.findViewById(R.id.self_name);
@@ -435,13 +430,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
-		sensitive = savedInstanceState==null && editingStatus != null ? editingStatus.sensitive
-				: savedInstanceState!=null && savedInstanceState.getBoolean("sensitive", false);
-		if (sensitive) {
-			sensitiveItem.setVisibility(View.VISIBLE);
-			sensitiveIcon.setSelected(true);
-		}
-
 		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
 			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
 			for(Parcelable a:serializedAttachments){
@@ -527,8 +515,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		mainEditText.setSelectionListener(this);
 		mainEditText.addTextChangedListener(new TextWatcher(){
-			private int lastChangeStart, lastChangeCount;
-
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count, int after){
 
@@ -538,16 +524,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onTextChanged(CharSequence s, int start, int before, int count){
 				if(s.length()==0)
 					return;
-				lastChangeStart=start;
-				lastChangeCount=count;
-			}
-
-			@Override
-			public void afterTextChanged(Editable s){
-				if(s.length()==0)
-					return;
-				int start=lastChangeStart;
-				int count=lastChangeCount;
 				// offset one char back to catch an already typed '@' or '#' or ':'
 				int realStart=start;
 				start=Math.max(0, start-1);
@@ -593,7 +569,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						editable.removeSpan(span);
 					}
 				}
+			}
 
+			@Override
+			public void afterTextChanged(Editable s){
 				updateCharCounter();
 			}
 		});
@@ -609,10 +588,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						scrollView.post(() -> {
 							int bottom = scrollView.getChildAt(0).getBottom();
 							int delta = bottom - (scrollView.getScrollY() + scrollView.getHeight());
-							int space = GlobalUserPreferences.reduceMotion ? 0 : Math.min(V.dp(70), delta);
+							int space = GlobalUserPreferences.reduceMotion ? 0 : Math.min(V.dp(120), delta);
 							scrollView.scrollBy(0, delta - space);
 							if (!GlobalUserPreferences.reduceMotion) {
-								scrollView.postDelayed(() -> scrollView.smoothScrollBy(0, space), 130);
+								scrollView.postDelayed(() -> scrollView.smoothScrollBy(0, space), 100);
 							}
 						});
 					}
@@ -642,7 +621,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
 				args.putParcelable("profileAccount", Parcels.wrap(replyTo.account));
-				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			});
 
@@ -672,14 +650,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
-			replyText.setOnClickListener(v->{
-				scrollView.smoothScrollTo(0, 0);
-			});
-			replyText.setOnClickListener(v->{
-				scrollView.smoothScrollTo(0, 0);
-			});
-
+			int visibilityNameRes = switch (replyTo.visibility) {
+				case PUBLIC -> R.string.visibility_public;
+				case UNLISTED -> R.string.sk_visibility_unlisted;
+				case PRIVATE -> R.string.visibility_followers_only;
+				case DIRECT -> R.string.visibility_private;
+			};
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
 
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
@@ -724,7 +701,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						DraftMediaAttachment da=new DraftMediaAttachment();
 						da.serverAttachment=att;
 						da.description=att.description;
-						da.uri=att.previewUrl!=null ? Uri.parse(att.previewUrl) : null;
+						da.uri=Uri.parse(att.previewUrl);
 						da.state=AttachmentUploadState.DONE;
 						attachmentsView.addView(createMediaAttachmentView(da));
 						attachments.add(da);
@@ -777,10 +754,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			draftsBtn = wrap.findViewById(R.id.drafts_btn);
 			draftsBtn.setVisibility(View.VISIBLE);
-		}else{
-			charCounter = wrap.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
 		}
 
 //		draftsBtn = wrap.findViewById(R.id.drafts_btn);
@@ -1185,50 +1158,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				.show();
 	}
 
-	/**
-	 * Check to see if Android platform photopicker is available on the device\
-	 * @return whether the device supports photopicker intents.
-	 */
-	private boolean isPhotoPickerAvailable() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-			return true;
-		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			return getExtensionVersion(Build.VERSION_CODES.R) >= 2;
-		} else
-			return false;
-	}
-
-	/**
-	 * Builds the correct intent for the device version to select media.
-	 *
-	 * <p>For Device version > T or R_SDK_v2, use the android platform photopicker via
-	 * {@link MediaStore#ACTION_PICK_IMAGES}
-	 *
-	 * <p>For earlier versions use the built in docs ui via {@link Intent#ACTION_GET_CONTENT}
-	 */
 	private void openFilePicker(){
-		Intent intent;
-		boolean usePhotoPicker = isPhotoPickerAvailable();
-		if (usePhotoPicker) {
-			intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
-			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
-		} else {
-			intent = new Intent(Intent.ACTION_GET_CONTENT);
-			intent.addCategory(Intent.CATEGORY_OPENABLE);
-			intent.setType("*/*");
-		}
-		if (!usePhotoPicker && instance.configuration != null &&
-				instance.configuration.mediaAttachments != null &&
-				instance.configuration.mediaAttachments.supportedMimeTypes != null &&
-				!instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()) {
-			intent.putExtra(Intent.EXTRA_MIME_TYPES,
-					instance.configuration.mediaAttachments.supportedMimeTypes.toArray(
-							new String[0]));
-		} else {
-			if (!usePhotoPicker) {
-				// If photo picker is being used these are the default mimetypes.
-				intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
-			}
+		Intent intent=new Intent(Intent.ACTION_GET_CONTENT);
+		intent.addCategory(Intent.CATEGORY_OPENABLE);
+		intent.setType("*/*");
+		if(instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.supportedMimeTypes!=null && !instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()){
+			intent.putExtra(Intent.EXTRA_MIME_TYPES, instance.configuration.mediaAttachments.supportedMimeTypes.toArray(new String[0]));
+		}else{
+			intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
 		}
 		intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
 		startActivityForResult(intent, MEDIA_RESULT);
@@ -1311,8 +1248,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		View thumb=getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
 		ImageView img=thumb.findViewById(R.id.thumb);
 		if(draft.serverAttachment!=null){
-			if(draft.serverAttachment.previewUrl!=null)
-				ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
+			ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
 		}else{
 			if(draft.mimeType.startsWith("image/")){
 				ViewImageLoader.load(img, null, new UrlImageLoaderRequest(draft.uri, V.dp(250), V.dp(250)));

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

@@ -1,253 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.api.requests.timelines.GetConversationsTimeline;
-import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.StatusCreatedEvent;
-import org.joinmastodon.android.model.CacheablePaginatedResponse;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.V;
-
-public class ConversationsTimelineFragment extends FabStatusListFragment {
-    private HomeTabFragment parent;
-    private String maxID;
-
-    @Override
-    public void onAttach(Activity activity){
-        super.onAttach(activity);
-        if (getParentFragment() instanceof HomeTabFragment home) parent = home;
-        loadData();
-    }
-
-    private List<Status> filterPosts(List<Status> items) {
-//        Disabling this for DMs, because there are no boosts on DMs, and most of them are replies
-        return items.stream().filter(i ->
-                (i.visibility == StatusPrivacy.DIRECT)
-        ).collect(Collectors.toList());
-//        return items;
-    }
-
-    @Override
-    protected void doLoadData(int offset, int count){
-        AccountSessionManager.getInstance()
-                .getAccount(accountID).getCacheController()
-                .getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
-                    @Override
-                    public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
-                        if(getActivity()==null)
-                            return;
-                        List<Status> filteredItems = filterPosts(result.items);
-                        onDataLoaded(filteredItems, !result.items.isEmpty());
-                        maxID=result.maxID;
-                        if(result.isFromCache())
-                            loadNewPosts();
-                    }
-                });
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState){
-        super.onViewCreated(view, savedInstanceState);
-
-        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()){
-                    parent.hideNewPostsButton();
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void onShown(){
-        super.onShown();
-        if(!getArguments().getBoolean("noAutoLoad")){
-            if(!loaded && !dataLoading){
-                loadData();
-            }else if(!dataLoading){
-                loadNewPosts();
-            }
-        }
-    }
-
-    public void onStatusCreated(StatusCreatedEvent ev){
-        prependItems(Collections.singletonList(ev.status), true);
-    }
-
-    private void loadNewPosts(){
-        if (!GlobalUserPreferences.loadNewPosts) return;
-        dataLoading=true;
-        // 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";
-        currentRequest=new GetConversationsTimeline(null, null, 20, sinceID)
-                .setCallback(new Callback<>(){
-                    @Override
-                    public void onSuccess(List<Status> result){
-                        currentRequest=null;
-                        dataLoading=false;
-                        result = filterPosts(result);
-                        if(result.isEmpty() || getActivity()==null)
-                            return;
-                        Status last=result.get(result.size()-1);
-                        List<Status> toAdd;
-                        if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
-                            toAdd=result.subList(0, result.size()-1); // Remove the already known last post
-                        }else{
-                            result.get(result.size()-1).hasGapAfter=true;
-                            toAdd=result;
-                        }
-                        StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
-                        toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
-                        if(!toAdd.isEmpty()){
-                            prependItems(toAdd, true);
-                            if (parent != null) parent.showNewPostsButton();
-//                            AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomTimeline(toAdd, false);
-                        }
-                    }
-
-                    @Override
-                    public void onError(ErrorResponse error){
-                        currentRequest=null;
-                        dataLoading=false;
-                    }
-                })
-                .exec(accountID);
-    }
-
-    @Override
-    public void onGapClick(GapStatusDisplayItem.Holder item){
-        if(dataLoading)
-            return;
-        item.getItem().loading=true;
-        V.setVisibilityAnimated(item.progress, View.VISIBLE);
-        V.setVisibilityAnimated(item.text, View.GONE);
-        GapStatusDisplayItem gap=item.getItem();
-        dataLoading=true;
-        currentRequest=new GetConversationsTimeline(item.getItemID(), null, 20, null)
-                .setCallback(new Callback<>(){
-                    @Override
-                    public void onSuccess(List<Status> result){
-                        currentRequest=null;
-                        dataLoading=false;
-                        if(getActivity()==null)
-                            return;
-                        int gapPos=displayItems.indexOf(gap);
-                        if(gapPos==-1)
-                            return;
-                        if(result.isEmpty()){
-                            displayItems.remove(gapPos);
-                            adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
-                            Status gapStatus=getStatusByID(gap.parentID);
-                            if(gapStatus!=null){
-                                gapStatus.hasGapAfter=false;
-//                                AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putConversationsTimeline(Collections.singletonList(gapStatus), false);
-                            }
-                        }else{
-                            Set<String> idsBelowGap=new HashSet<>();
-                            boolean belowGap=false;
-                            int gapPostIndex=0;
-                            for(Status s:data){
-                                if(belowGap){
-                                    idsBelowGap.add(s.id);
-                                }else if(s.id.equals(gap.parentID)){
-                                    belowGap=true;
-                                    s.hasGapAfter=false;
-//                                    AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putConversationsTimeline(Collections.singletonList(s), false);
-                                }else{
-                                    gapPostIndex++;
-                                }
-                            }
-                            int endIndex=0;
-                            for(Status s:result){
-                                endIndex++;
-                                if(idsBelowGap.contains(s.id))
-                                    break;
-                            }
-                            if(endIndex==result.size()){
-                                result.get(result.size()-1).hasGapAfter=true;
-                            }else{
-                                result=result.subList(0, endIndex);
-                            }
-                            List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
-                            targetList.clear();
-                            List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-                            StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
-                            for(Status s:result){
-                                if(idsBelowGap.contains(s.id))
-                                    break;
-                                if(filterPredicate.test(s)){
-                                    targetList.addAll(buildDisplayItems(s));
-                                    insertedPosts.add(s);
-                                }
-                            }
-                            if(targetList.isEmpty()){
-                                // oops. We didn't add new posts, but at least we know there are none.
-                                adapter.notifyItemRemoved(getMainAdapterOffset()+gapPos);
-                            }else{
-                                adapter.notifyItemChanged(getMainAdapterOffset()+gapPos);
-                                adapter.notifyItemRangeInserted(getMainAdapterOffset()+gapPos+1, targetList.size()-1);
-                            }
-//                            AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putConversationsTimeline(insertedPosts, false);
-                        }
-                    }
-
-                    @Override
-                    public void onError(ErrorResponse error){
-                        currentRequest=null;
-                        dataLoading=false;
-                        gap.loading=false;
-                        Activity a=getActivity();
-                        if(a!=null){
-                            error.showToast(a);
-                            int gapPos=displayItems.indexOf(gap);
-                            if(gapPos>=0)
-                                adapter.notifyItemChanged(gapPos);
-                        }
-                    }
-                })
-                .exec(accountID);
-
-    }
-
-    @Override
-    public void onRefresh(){
-        if(currentRequest!=null){
-            currentRequest.cancel();
-            currentRequest=null;
-            dataLoading=false;
-        }
-        if (parent != null) parent.hideNewPostsButton();
-        super.onRefresh();
-    }
-
-    @Override
-    protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
-        return true;
-    }
-}

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

@@ -1,37 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageButton;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import me.grishka.appkit.Nav;
-
-public abstract class FabStatusListFragment extends StatusListFragment {
-    protected ImageButton fab;
-
-    public FabStatusListFragment() {
-        setListLayoutId(R.layout.recycler_fragment_with_fab);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        fab = view.findViewById(R.id.fab);
-        fab.setOnClickListener(this::onFabClick);
-        fab.setOnLongClickListener(this::onFabLongClick);
-    }
-
-    protected void onFabClick(View v){
-        Bundle args=new Bundle();
-        args.putString("account", accountID);
-        Nav.go(getActivity(), ComposeFragment.class, args);
-    }
-
-    protected boolean onFabLongClick(View v) {
-        return UiUtils.pickAccountForCompose(getActivity(), accountID);
-    }
-}

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -12,7 +11,6 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import me.grishka.appkit.api.SimpleCallback;
@@ -43,12 +41,6 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
             loadData();
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-    }
-
     @Override
     protected void doLoadData(int offset, int count){
         currentRequest=new GetFollowedHashtags(offset==0 ? null : nextMaxID, null, count, null)

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

@@ -5,7 +5,6 @@ import android.app.NotificationManager;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,11 +41,7 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
 	private FragmentRootLinearLayout content;
-
-	private HomeTabFragment homeTabFragment;
-
-//	private HomeTimelineFragment homeTimelineFragment;
-
+	private HomeTimelineFragment homeTimelineFragment;
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
@@ -70,13 +65,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-
-			homeTabFragment=new HomeTabFragment();
-			homeTabFragment.setArguments(args);
-
-//			homeTimelineFragment=new HomeTimelineFragment();
-//			homeTimelineFragment.setArguments(args);
-
+			homeTimelineFragment=new HomeTimelineFragment();
+			homeTimelineFragment.setArguments(args);
 			args=new Bundle(args);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
@@ -120,19 +110,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.fragment_wrap, homeTabFragment)
+					.add(R.id.fragment_wrap, homeTimelineFragment)
 					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
 					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
 					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 
-//			getChildFragmentManager().beginTransaction()
-//					.add(R.id.fragment_wrap, homeTimelineFragment)
-//					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
-//					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
-//					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
-//					.commit();
-
 			String defaultTab=getArguments().getString("tab");
 			if("notifications".equals(defaultTab)){
 				tabBar.selectTab(R.id.tab_notifications);
@@ -153,36 +136,21 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onViewStateRestored(Bundle savedInstanceState){
 		super.onViewStateRestored(savedInstanceState);
-
-		if(savedInstanceState==null) return;
-
-//		if(savedInstanceState==null || homeTimelineFragment!=null)
-//			return;
-
-		homeTabFragment=(HomeTabFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTabFragment");
-
-//		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
+		if(savedInstanceState==null || homeTimelineFragment!=null)
+			return;
+		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
 		searchFragment=(DiscoverFragment) getChildFragmentManager().getFragment(savedInstanceState, "searchFragment");
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
 		Fragment current=fragmentForTab(currentTab);
-
 		getChildFragmentManager().beginTransaction()
-				.hide(homeTabFragment)
+				.hide(homeTimelineFragment)
 				.hide(searchFragment)
 				.hide(notificationsFragment)
 				.hide(profileFragment)
 				.show(current)
 				.commit();
-
-		//		getChildFragmentManager().beginTransaction()
-//				.hide(homeTimelineFragment)
-//				.hide(searchFragment)
-//				.hide(notificationsFragment)
-//				.hide(profileFragment)
-//				.show(current)
-//				.commit();
 		maybeTriggerLoading(current);
 	}
 
@@ -212,11 +180,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
 		WindowInsets topOnlyInsets=insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), 0, 0);
-
-		homeTabFragment.onApplyWindowInsets(topOnlyInsets);
-
-//		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
-
+		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
 		searchFragment.onApplyWindowInsets(topOnlyInsets);
 		notificationsFragment.onApplyWindowInsets(topOnlyInsets);
 		profileFragment.onApplyWindowInsets(topOnlyInsets);
@@ -224,10 +188,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	private Fragment fragmentForTab(@IdRes int tab){
 		if(tab==R.id.tab_home){
-			return homeTabFragment;
-
-		//		if(tab==R.id.tab_home){
-//			return homeTimelineFragment;
+			return homeTimelineFragment;
 		}else if(tab==R.id.tab_search){
 			return searchFragment;
 		}else if(tab==R.id.tab_notifications){
@@ -272,11 +233,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			((NotificationsFragment) newFragment).loadData();
 			// TODO make an interface?
 			NotificationManager nm=getActivity().getSystemService(NotificationManager.class);
-			for (StatusBarNotification notification : nm.getActiveNotifications()) {
-				if (accountID.equals(notification.getTag())) {
-					nm.cancel(accountID, notification.getId());
-				}
-			}
+			nm.cancel(accountID, PushNotificationReceiver.NOTIFICATION_ID);
 		}
 	}
 
@@ -308,24 +265,17 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			tabBar.selectTab(R.id.tab_home);
 			onTabSelected(R.id.tab_home);
 			return true;
-		} else {
-			return homeTabFragment.onBackPressed();
 		}
+		return false;
 	}
 
 	@Override
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-
-		if (homeTabFragment.isAdded()) getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
-		if (searchFragment.isAdded()) getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
-
-//		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
-//		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-//		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-//		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
+		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
 }

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

@@ -1,556 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static org.joinmastodon.android.GlobalUserPreferences.showFederatedTimeline;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.ViewTreeObserver;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.PopupMenu;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
-import org.joinmastodon.android.api.requests.lists.GetLists;
-import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.discover.FederatedTimelineFragment;
-import org.joinmastodon.android.fragments.discover.LocalTimelineFragment;
-import org.joinmastodon.android.model.Announcement;
-import org.joinmastodon.android.model.Hashtag;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.ui.SimpleViewHolder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-import me.grishka.appkit.utils.V;
-
-public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener {
-	private static final int ANNOUNCEMENTS_RESULT = 654;
-
-	private String accountID;
-	private MenuItem announcements;
-	//	private ImageView toolbarLogo;
-	private Button toolbarShowNewPostsBtn;
-	private boolean newPostsBtnShown;
-	private AnimatorSet currentNewPostsAnim;
-	private ViewPager2 pager;
-	private final List<Fragment> fragments = new ArrayList<>();
-	private final List<FrameLayout> tabViews = new ArrayList<>();
-	private View switcher;
-	private FrameLayout toolbarFrame;
-	private ImageView timelineIcon;
-	private ImageView collapsedChevron;
-	private TextView timelineTitle;
-	private PopupMenu switcherPopup;
-	private final Map<Integer, ListTimeline> listItems = new HashMap<>();
-	private final Map<Integer, Hashtag> hashtagsItems = new HashMap<>();
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		accountID = getArguments().getString("account");
-	}
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		setHasOptionsMenu(true);
-	}
-
-	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-		FrameLayout view = new FrameLayout(getContext());
-		pager = new ViewPager2(getContext());
-		toolbarFrame = (FrameLayout) LayoutInflater.from(getContext()).inflate(R.layout.home_toolbar, getToolbar(), false);
-
-		if (fragments.size() == 0) {
-			Bundle args = new Bundle();
-			args.putString("account", accountID);
-			args.putBoolean("__is_tab", true);
-
-			fragments.add(new HomeTimelineFragment());
-			fragments.add(new LocalTimelineFragment());
-			if (showFederatedTimeline) fragments.add(new FederatedTimelineFragment());
-			args=new Bundle(args);
-			args.putBoolean("onlyPosts", true);
-			NotificationsListFragment postsFragment=new NotificationsListFragment();
-			postsFragment.setArguments(args);
-			fragments.add(postsFragment);
-
-			FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-			for (int i = 0; i < fragments.size(); i++) {
-				fragments.get(i).setArguments(args);
-				FrameLayout tabView = new FrameLayout(getActivity());
-				tabView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-				tabView.setVisibility(View.GONE);
-				tabView.setId(i + 1);
-				transaction.add(i + 1, fragments.get(i));
-				view.addView(tabView);
-				tabViews.add(tabView);
-			}
-			transaction.commit();
-		}
-
-		view.addView(pager, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
-		return view;
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-
-		timelineIcon = toolbarFrame.findViewById(R.id.timeline_icon);
-		timelineTitle = toolbarFrame.findViewById(R.id.timeline_title);
-		collapsedChevron = toolbarFrame.findViewById(R.id.collapsed_chevron);
-		switcher = toolbarFrame.findViewById(R.id.switcher_btn);
-		switcherPopup = new PopupMenu(getContext(), switcher);
-		switcherPopup.inflate(R.menu.home_switcher);
-		switcherPopup.setOnMenuItemClickListener(this::onSwitcherItemSelected);
-		UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
-		switcher.setOnClickListener(v->{
-			updateSwitcherMenu();
-			switcherPopup.show();
-		});
-		View.OnTouchListener listener = switcherPopup.getDragToOpenListener();
-		switcher.setOnTouchListener((v, m)-> {
-			updateSwitcherMenu();
-			return listener.onTouch(v, m);
-		});
-
-		UiUtils.reduceSwipeSensitivity(pager);
-		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
-		pager.setAdapter(new HomePagerAdapter());
-		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
-			@Override
-			public void onPageSelected(int position){
-				updateSwitcherIcon(position);
-				if (position==0) return;
-				hideNewPostsButton();
-				if (fragments.get(position) instanceof BaseRecyclerFragment<?> page){
-					if(!page.loaded && !page.isDataLoading()) page.loadData();
-				}
-			}
-		});
-
-		if (!GlobalUserPreferences.reduceMotion) {
-			pager.setPageTransformer((v, pos) -> {
-				if (tabViews.get(pager.getCurrentItem()) != v) return;
-				float scaleFactor = Math.max(0.85f, 1 - Math.abs(pos) * 0.06f);
-				switcher.setScaleY(scaleFactor);
-				switcher.setScaleX(scaleFactor);
-				switcher.setAlpha(Math.max(0.65f, 1 - Math.abs(pos)));
-			});
-		}
-
-		updateToolbarLogo();
-
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.register(this);
-			updateUpdateState(GithubSelfUpdater.getInstance().getState());
-		}
-
-		new GetLists().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(List<ListTimeline> lists) {
-				addItemsToMap(lists, listItems);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
-
-		new GetFollowedHashtags().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(HeaderPaginationList<Hashtag> hashtags) {
-				addItemsToMap(hashtags, hashtagsItems);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
-	}
-
-	public void updateToolbarLogo(){
-		Toolbar toolbar = getToolbar();
-		ViewParent parentView = toolbarFrame.getParent();
-		if (parentView == toolbar) return;
-		if (parentView instanceof Toolbar parentToolbar) parentToolbar.removeView(toolbarFrame);
-		toolbar.addView(toolbarFrame, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-		toolbar.setOnClickListener(v->scrollToTop());
-		toolbar.setNavigationContentDescription(R.string.back);
-		toolbar.setContentInsetsAbsolute(0, toolbar.getContentInsetRight());
-
-		updateSwitcherIcon(pager.getCurrentItem());
-
-//		toolbarLogo=new ImageView(getActivity());
-//		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-//		toolbarLogo.setImageResource(R.drawable.logo);
-//		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
-
-		toolbarShowNewPostsBtn=toolbarFrame.findViewById(R.id.show_new_posts_btn);
-		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N) UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
-		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
-
-		if(newPostsBtnShown){
-			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-			collapsedChevron.setVisibility(View.VISIBLE);
-			collapsedChevron.setAlpha(1f);
-			timelineTitle.setVisibility(View.GONE);
-			timelineTitle.setAlpha(0f);
-		}else{
-			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-			toolbarShowNewPostsBtn.setAlpha(0f);
-			collapsedChevron.setVisibility(View.GONE);
-			collapsedChevron.setAlpha(0f);
-			toolbarShowNewPostsBtn.setScaleX(.8f);
-			toolbarShowNewPostsBtn.setScaleY(.8f);
-			timelineTitle.setVisibility(View.VISIBLE);
-		}
-
-		ViewTreeObserver vto = toolbar.getViewTreeObserver();
-		if (vto.isAlive()) {
-			vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-				@Override
-				public void onGlobalLayout() {
-					Toolbar t = getToolbar();
-					if (t == null) return;
-					int toolbarWidth = t.getWidth();
-					if (toolbarWidth == 0) return;
-					t.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-					int toolbarFrameWidth = toolbarFrame.getWidth();
-					int padding = toolbarWidth - toolbarFrameWidth;
-					// toolbar frame goes from screen edge to beginning of right-aligned option buttons.
-					// centering button by applying the same space on the left
-					((FrameLayout) toolbarShowNewPostsBtn.getParent()).setPaddingRelative(padding, 0, 0, 0);
-					toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
-
-					switcher.setPivotX(V.dp(28)); // padding + half of icon
-					switcher.setPivotY(switcher.getHeight() / 2f);
-					timelineTitle.setPivotX(timelineTitle.getWidth() - V.dp(8));
-					timelineTitle.setPivotY(timelineTitle.getHeight() / 2f);
-				}
-			});
-		}
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.home, menu);
-		announcements = menu.findItem(R.id.announcements);
-
-		new GetAnnouncements(false).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(List<Announcement> result) {
-				boolean hasUnread = result.stream().anyMatch(a -> !a.read);
-				announcements.setIcon(hasUnread ? R.drawable.ic_announcements_24_badged : R.drawable.ic_fluent_megaphone_24_regular);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
-	private <T> void addItemsToMap(List<T> addItems, Map<Integer, T> items) {
-		if (addItems.size() == 0) return;
-		for (int i = 0; i < addItems.size(); i++) items.put(View.generateViewId(), addItems.get(i));
-		updateSwitcherMenu();
-	}
-
-	private void updateSwitcherMenu() {
-		Context context = getContext();
-		switcherPopup.getMenu().findItem(R.id.federated).setVisible(showFederatedTimeline);
-
-		if (!listItems.isEmpty()) {
-			MenuItem listsItem = switcherPopup.getMenu().findItem(R.id.lists);
-			listsItem.setVisible(true);
-			SubMenu listsMenu = listsItem.getSubMenu();
-			listsMenu.clear();
-			listItems.forEach((id, list) -> {
-				MenuItem item = listsMenu.add(Menu.NONE, id, Menu.NONE, list.title);
-				item.setIcon(R.drawable.ic_fluent_people_list_24_regular);
-				UiUtils.insetPopupMenuIcon(context, item);
-			});
-		}
-
-		if (!hashtagsItems.isEmpty()) {
-			MenuItem hashtagsItem = switcherPopup.getMenu().findItem(R.id.followed_hashtags);
-			hashtagsItem.setVisible(true);
-			SubMenu hashtagsMenu = hashtagsItem.getSubMenu();
-			hashtagsMenu.clear();
-			hashtagsItems.forEach((id, hashtag) -> {
-				MenuItem item = hashtagsMenu.add(Menu.NONE, id, Menu.NONE, hashtag.name);
-				item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
-				UiUtils.insetPopupMenuIcon(context, item);
-			});
-		}
-	}
-
-	private boolean onSwitcherItemSelected(MenuItem item) {
-		int id = item.getItemId();
-		ListTimeline list;
-		Hashtag hashtag;
-		if (id == R.id.home) {
-			navigateTo(0);
-			return true;
-		} else if (id == R.id.local) {
-			navigateTo(1);
-			return true;
-		} else if (id == R.id.federated) {
-			navigateTo(2);
-			return true;
-		} else if (id == R.id.post_notifications) {
-			navigateTo(showFederatedTimeline ? 3 : 2);
-		} else if ((list = listItems.get(id)) != null) {
-			Bundle args = new Bundle();
-			args.putString("account", accountID);
-			args.putString("listID", list.id);
-			args.putString("listTitle", list.title);
-			args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
-			Nav.go(getActivity(), ListTimelineFragment.class, args);
-		} else if ((hashtag = hashtagsItems.get(id)) != null) {
-			UiUtils.openHashtagTimeline(getActivity(), accountID, hashtag.name, hashtag.following);
-		}
-		return false;
-	}
-
-	private void navigateTo(int i) {
-		navigateTo(i, !GlobalUserPreferences.reduceMotion);
-	}
-
-	private void navigateTo(int i, boolean smooth) {
-		pager.setCurrentItem(i, smooth);
-		updateSwitcherIcon(i);
-	}
-
-	private void updateSwitcherIcon(int i) {
-		// todo: refactor when implementing pinned tabs
-		if (i == (showFederatedTimeline ? 3 : 2)) {
-			timelineIcon.setImageResource(R.drawable.ic_fluent_alert_24_regular);
-			timelineTitle.setText(R.string.sk_notify_posts);
-		} else {
-			timelineIcon.setImageResource(switch (i) {
-				default -> R.drawable.ic_fluent_home_24_regular;
-				case 1 -> R.drawable.ic_fluent_people_community_24_regular;
-				case 2 -> R.drawable.ic_fluent_earth_24_regular;
-			});
-			timelineTitle.setText(switch (i) {
-				default -> R.string.sk_timeline_home;
-				case 1 -> R.string.sk_timeline_local;
-				case 2 -> R.string.sk_timeline_federated;
-			});
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		if (item.getItemId() == R.id.settings) Nav.go(getActivity(), SettingsFragment.class, args);
-		if (item.getItemId() == R.id.announcements) {
-			Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
-		}
-		return true;
-	}
-
-	@Override
-	public void scrollToTop(){
-		((ScrollableToTop) fragments.get(pager.getCurrentItem())).scrollToTop();
-	}
-
-	public void hideNewPostsButton(){
-		if(!newPostsBtnShown)
-			return;
-		newPostsBtnShown=false;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		timelineTitle.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(timelineTitle, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_Y, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f),
-				ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 0f)
-		);
-		set.setDuration(GlobalUserPreferences.reduceMotion ? 0 : 300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-				collapsedChevron.setVisibility(View.GONE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	public void showNewPostsButton(){
-		if(newPostsBtnShown || pager == null || pager.getCurrentItem() != 0)
-			return;
-		newPostsBtnShown=true;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-		collapsedChevron.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(timelineTitle, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_Y, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f),
-				ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 1f)
-		);
-		set.setDuration(GlobalUserPreferences.reduceMotion ? 0 : 300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				timelineTitle.setVisibility(View.GONE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	public boolean isNewPostsBtnShown() {
-		return newPostsBtnShown;
-	}
-
-	private void onNewPostsBtnClick(View view) {
-		if(newPostsBtnShown){
-			hideNewPostsButton();
-			scrollToTop();
-		}
-	}
-
-	@Override
-	public void onFragmentResult(int reqCode, boolean noMoreUnread, Bundle result){
-		if (reqCode == ANNOUNCEMENTS_RESULT && noMoreUnread) {
-			announcements.setIcon(R.drawable.ic_fluent_megaphone_24_regular);
-		}
-	}
-
-	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
-		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
-			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
-	}
-
-	@Subscribe
-	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-		updateUpdateState(ev.state);
-	}
-
-	@Override
-	public boolean onBackPressed(){
-		if(pager.getCurrentItem() > 0){
-			navigateTo(0);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.unregister(this);
-		}
-	}
-
-	@Override
-	public void onViewStateRestored(Bundle savedInstanceState) {
-		super.onViewStateRestored(savedInstanceState);
-		if (savedInstanceState == null) return;
-		navigateTo(savedInstanceState.getInt("selectedTab"), false);
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putInt("selectedTab", pager.getCurrentItem());
-	}
-
-	private class HomePagerAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
-		@NonNull
-		@Override
-		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-			FrameLayout tabView = tabViews.get(viewType % getItemCount());
-			((ViewGroup)tabView.getParent()).removeView(tabView);
-			tabView.setVisibility(View.VISIBLE);
-			return new SimpleViewHolder(tabView);
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){}
-
-		@Override
-		public int getItemCount(){
-			return fragments.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return position;
-		}
-	}
-}

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

@@ -1,21 +1,45 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.app.Activity;
+import android.content.res.ColorStateList;
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
@@ -24,19 +48,30 @@ import java.util.List;
 import java.util.Set;
 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.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class HomeTimelineFragment extends FabStatusListFragment {
-	private HomeTabFragment parent;
+public class HomeTimelineFragment extends StatusListFragment{
+	private ImageButton fab;
+	private ImageView toolbarLogo;
+	private Button toolbarShowNewPostsBtn;
+	private boolean newPostsBtnShown;
+	private AnimatorSet currentNewPostsAnim;
+
 	private String maxID;
 
+	public HomeTimelineFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		if (getParentFragment() instanceof HomeTabFragment home) parent = home;
+		setHasOptionsMenu(true);
 		loadData();
 	}
 
@@ -68,15 +103,43 @@ public class HomeTimelineFragment extends FabStatusListFragment {
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setOnClickListener(this::onFabClick);
+		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID));
 
+		updateToolbarLogo();
 		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()){
-					parent.hideNewPostsButton();
+				if(newPostsBtnShown && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+					hideNewPostsButton();
 				}
 			}
 		});
+
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.register(this);
+			updateUpdateState(GithubSelfUpdater.getInstance().getState());
+		}
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.home, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), SettingsFragment.class, args);
+		return true;
+	}
+
+	@Override
+	public void onConfigurationChanged(Configuration newConfig){
+		super.onConfigurationChanged(newConfig);
+		updateToolbarLogo();
 	}
 
 	@Override
@@ -95,6 +158,12 @@ public class HomeTimelineFragment extends FabStatusListFragment {
 		prependItems(Collections.singletonList(ev.status), true);
 	}
 
+	private void onFabClick(View v){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), ComposeFragment.class, args);
+	}
+
 	private void loadNewPosts(){
 		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
@@ -119,11 +188,13 @@ public class HomeTimelineFragment extends FabStatusListFragment {
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
-						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
+						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+						if(!filters.isEmpty()){
+							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
+						}
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							if (parent != null) parent.showNewPostsButton();
+							showNewPostsButton();
 							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
 					}
@@ -239,10 +310,132 @@ public class HomeTimelineFragment extends FabStatusListFragment {
 			currentRequest=null;
 			dataLoading=false;
 		}
-		if (parent != null) parent.hideNewPostsButton();
 		super.onRefresh();
 	}
 
+	private void updateToolbarLogo(){
+		toolbarLogo=new ImageView(getActivity());
+		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+		toolbarLogo.setImageResource(R.drawable.logo);
+		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+//		toolbarLogo =new TextView(getActivity());
+//		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+//		toolbarLogo.setTextAppearance(R.style.app_title);
+
+		toolbarShowNewPostsBtn=new Button(getActivity());
+		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
+		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
+		toolbarShowNewPostsBtn.setStateListAnimator(null);
+		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
+		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
+		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
+		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
+		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
+		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
+			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
+		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
+
+		if(newPostsBtnShown){
+			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+			toolbarLogo.setVisibility(View.INVISIBLE);
+			toolbarLogo.setAlpha(0f);
+		}else{
+			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+			toolbarShowNewPostsBtn.setAlpha(0f);
+			toolbarShowNewPostsBtn.setScaleX(.8f);
+			toolbarShowNewPostsBtn.setScaleY(.8f);
+			toolbarLogo.setVisibility(View.VISIBLE);
+		}
+
+		FrameLayout logoWrap=new FrameLayout(getActivity());
+		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
+		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
+
+		Toolbar toolbar=getToolbar();
+		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+	}
+
+	private void showNewPostsButton(){
+		if(newPostsBtnShown)
+			return;
+		newPostsBtnShown=true;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarLogo.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void hideNewPostsButton(){
+		if(!newPostsBtnShown)
+			return;
+		newPostsBtnShown=false;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarLogo.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void onNewPostsBtnClick(View v){
+		if(newPostsBtnShown){
+			hideNewPostsButton();
+			scrollToTop();
+		}
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.unregister(this);
+		}
+	}
+
+	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
+		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
+			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
+	}
+
+	@Subscribe
+	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
+		updateUpdateState(ev.state);
+	}
+
 	@Override
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;

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

@@ -4,26 +4,18 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.lists.CreateList;
-import org.joinmastodon.android.api.requests.lists.UpdateList;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
-import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
 import java.util.List;
 
 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;
 
@@ -31,7 +23,6 @@ import me.grishka.appkit.utils.V;
 public class ListTimelineFragment extends StatusListFragment {
     private String listID;
     private String listTitle;
-    private ListTimeline.RepliesPolicy repliesPolicy;
     private ImageButton fab;
 
     public ListTimelineFragment() {
@@ -41,11 +32,8 @@ public class ListTimelineFragment extends StatusListFragment {
     @Override
     public void onAttach(Activity activity){
         super.onAttach(activity);
-        Bundle args = getArguments();
-        listID = args.getString("listID");
-        listTitle = args.getString("listTitle");
-        repliesPolicy = ListTimeline.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
-
+        listID=getArguments().getString("listID");
+        listTitle=getArguments().getString("listTitle");
         setTitle(listTitle);
         setHasOptionsMenu(true);
     }
@@ -53,48 +41,8 @@ public class ListTimelineFragment extends StatusListFragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.list, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        Bundle args = new Bundle();
-        args.putString("listID", listID);
-        if (item.getItemId() == R.id.edit) {
-            ListTimelineEditor editor = new ListTimelineEditor(getContext());
-            editor.applyList(listTitle, repliesPolicy);
-            new M3AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.sk_edit_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
-                    .setView(editor)
-                    .setPositiveButton(R.string.save, (d, which) -> {
-                        new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
-                            @Override
-                            public void onSuccess(ListTimeline list) {
-                                setTitle(list.title);
-                                listTitle = list.title;
-                                repliesPolicy = list.repliesPolicy;
-                                args.putString("listTitle", listTitle);
-                                args.putInt("repliesPolicy", repliesPolicy.ordinal());
-                                setResult(true, args);
-                            }
-
-                            @Override
-                            public void onError(ErrorResponse error) {
-                                error.showToast(getContext());
-                            }
-                        }).exec(accountID);
-                    })
-                    .setNegativeButton(R.string.cancel, (d, which) -> {})
-                    .show();
-        } else if (item.getItemId() == R.id.delete) {
-            UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
-                args.putBoolean("deleted", true);
-                setResult(true, args);
-                Nav.finish(this);
-            });
-        }
-        return true;
+        // TODO: implement edit, delete
+        // inflater.inflate(R.menu.list, menu);
     }
 
     @Override

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

@@ -1,9 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
@@ -15,37 +12,28 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
-import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.views.ListTimelineEditor;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
-    private static final int LIST_CHANGED_RESULT = 987;
-
     private String accountId;
     private String profileAccountId;
     private String profileDisplayUsername;
     private HashMap<String, Boolean> userInListBefore = new HashMap<>();
     private HashMap<String, Boolean> userInList = new HashMap<>();
     private int inProgress = 0;
-    private ListsAdapter adapter;
 
     public ListTimelinesFragment() {
         super(10);
@@ -56,14 +44,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
-        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-        } else {
-            setTitle(R.string.sk_your_lists);
+//            setHasOptionsMenu(true);
         }
     }
 
@@ -74,45 +60,20 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             loadData();
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_list, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.create) {
-            ListTimelineEditor editor = new ListTimelineEditor(getContext());
-            new M3AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.sk_create_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
-                    .setView(editor)
-                    .setPositiveButton(R.string.sk_create, (d, which) -> {
-                        new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
-                            @Override
-                            public void onSuccess(ListTimeline list) {
-                                saveListMembership(list.id, true);
-                                data.add(0, list);
-                                adapter.notifyItemRangeInserted(0, 1);
-                            }
-
-                            @Override
-                            public void onError(ErrorResponse error) {
-                                error.showToast(getContext());
-                            }
-                        }).exec(accountId);
-                    })
-                    .setNegativeButton(R.string.cancel, (d, which) -> {})
-                    .show();
-        }
-        return true;
-    }
+//    @Override
+//    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+//        Button saveButton=new Button(getActivity());
+//        saveButton.setText(R.string.save);
+//        saveButton.setOnClickListener(this::onSaveClick);
+//        LinearLayout wrap=new LinearLayout(getActivity());
+//        wrap.setOrientation(LinearLayout.HORIZONTAL);
+//        wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+//        wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
+//        wrap.setClipToPadding(false);
+//        MenuItem item=menu.add(R.string.save);
+//        item.setActionView(wrap);
+//        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+//    }
 
     private void saveListMembership(String listId, boolean isMember) {
         userInList.put(listId, isMember);
@@ -157,29 +118,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     }
 
     @Override
-    public void onFragmentResult(int reqCode, boolean listChanged, Bundle result){
-        if (reqCode == LIST_CHANGED_RESULT && listChanged) {
-            String listID = result.getString("listID");
-            for (int i = 0; i < data.size(); i++) {
-                ListTimeline item = data.get(i);
-                if (item.id.equals(listID)) {
-                    if (result.getBoolean("deleted")) {
-                        data.remove(i);
-                        adapter.notifyItemRemoved(i);
-                    } else {
-                        item.title = result.getString("listTitle", item.title);
-                        item.repliesPolicy = ListTimeline.RepliesPolicy.values()[result.getInt("repliesPolicy")];
-                        adapter.notifyItemChanged(i);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
-        return adapter = new ListsAdapter();
+    protected RecyclerView.Adapter getAdapter() {
+        return new ListsAdapter();
     }
 
     @Override
@@ -218,7 +158,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
@@ -235,12 +175,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
         @Override
         public void onClick() {
-            Bundle args=new Bundle();
-            args.putString("account", accountId);
-            args.putString("listID", item.id);
-            args.putString("listTitle", item.title);
-            args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
-            Nav.goForResult(getActivity(), ListTimelineFragment.class, args, LIST_CHANGED_RESULT, ListTimelinesFragment.this);
+            UiUtils.openListTimeline(getActivity(), accountId, item);
         }
     }
 }

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

@@ -44,7 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 
-	private NotificationsListFragment allNotificationsFragment, mentionsFragment, conversationsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
 
 	private String accountID;
 
@@ -102,7 +102,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
-		UiUtils.reduceSwipeSensitivity(pager);
 
 		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
@@ -151,14 +150,14 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment.setArguments(args);
 
 			args=new Bundle(args);
-			args.putBoolean("onlyConversations", true);
-			conversationsFragment =new NotificationsListFragment();
-			conversationsFragment.setArguments(args);
+			args.putBoolean("onlyPosts", true);
+			postsFragment=new NotificationsListFragment();
+			postsFragment.setArguments(args);
 
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
-					.add(R.id.notifications_posts, conversationsFragment)
+					.add(R.id.notifications_posts, postsFragment)
 					.commit();
 		}
 
@@ -168,7 +167,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
-					case 2 -> R.string.sk_conversations;
+					case 2 -> R.string.posts;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -217,7 +216,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
-			case 2 -> conversationsFragment;
+			case 2 -> postsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}

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

@@ -11,21 +11,17 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
-import org.joinmastodon.android.api.requests.timelines.GetConversationsTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
-import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -38,16 +34,12 @@ import java.util.stream.Stream;
 
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
 	private boolean onlyPosts;
-
-	private boolean onlyConversations;
 	private String maxID;
 
 	@Override
@@ -67,7 +59,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		super.onAttach(activity);
 		onlyMentions=getArguments().getBoolean("onlyMentions", false);
 		onlyPosts=getArguments().getBoolean("onlyPosts", false);
-		onlyConversations=getArguments().getBoolean("onlyConversations", false);
 	}
 
 	@Override
@@ -119,29 +110,28 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 
 	@Override
 	protected void doLoadData(int offset, int count){
-			AccountSessionManager.getInstance()
-					.getAccount(accountID).getCacheController()
-					.getNotifications(offset > 0 ? maxID : null, count, onlyMentions, onlyPosts || onlyConversations, refreshing, new SimpleCallback<>(this) {
-						@Override
-						public void onSuccess(PaginatedResponse<List<Notification>> result) {
-							if (getActivity() == null)
-								return;
-							if (refreshing)
-								relationships.clear();
-							onDataLoaded(result.items.stream().filter(n -> n.type != null || (onlyConversations &&)).collect(Collectors.toList()), !result.items.isEmpty());
-							Set<String> needRelationships = result.items.stream()
-									.filter(ntf -> ntf.status == null && !relationships.containsKey(ntf.account.id))
-									.map(ntf -> ntf.account.id)
-									.collect(Collectors.toSet());
-							loadRelationships(needRelationships);
-							maxID = result.maxID;
+		AccountSessionManager.getInstance()
+				.getAccount(accountID).getCacheController()
+				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(PaginatedResponse<List<Notification>> result){
+						if(getActivity()==null)
+							return;
+						if(refreshing)
+							relationships.clear();
+						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
+						Set<String> needRelationships=result.items.stream()
+								.filter(ntf->ntf.status==null && !relationships.containsKey(ntf.account.id))
+								.map(ntf->ntf.account.id)
+								.collect(Collectors.toSet());
+						loadRelationships(needRelationships);
+						maxID=result.maxID;
 
-							if (offset == 0 && !result.items.isEmpty()) {
-								new SaveMarkers(null, result.items.get(0).id).exec(accountID);
-							}
+						if(offset==0 && !result.items.isEmpty()){
+							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
 						}
-					});
-
+					}
+				});
 	}
 
 	@Override

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

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -13,23 +12,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.model.AccountField;
-import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
@@ -39,8 +26,11 @@ import org.joinmastodon.android.ui.views.LinkedTextView;
 import java.util.Collections;
 import java.util.List;
 
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
@@ -56,11 +46,6 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 	private static final int MAX_FIELDS=4;
 
 	public UsableRecyclerView list;
-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String accountID;
-	private String profileAccountID;
-	private String note;
 	private List<AccountField> fields=Collections.emptyList();
 	private AboutAdapter adapter;
 	private Paint dividerPaint=new Paint();
@@ -79,49 +64,11 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 			adapter.notifyDataSetChanged();
 	}
 
-	public void setNote(String note, String accountID, String profileAccountID){
-		this.note=note;
-		this.accountID=accountID;
-		this.profileAccountID=profileAccountID;
-//		noteWrap.setVisibility(View.VISIBLE);
-//		noteEdit.setVisibility(View.VISIBLE);
-//		noteEdit.setText(note);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
-		View view = inflater.inflate(R.layout.fragment_profile_about, null);
-
-		noteEdit = view.findViewById(R.id.note_edit);
-		noteWrap = view.findViewById(R.id.note_edit_wrap);
-		ImageButton noteEditConfirm = view.findViewById(R.id.note_edit_confirm);
-
-
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
-
-		list = view.findViewById(R.id.list);
+		list=new UsableRecyclerView(getActivity());
+		list.setId(R.id.list);
 		list.setItemAnimator(new BetterItemAnimator());
 		list.setDrawSelectorOnTop(true);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -148,20 +95,8 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 				}
 			}
 		});
-		return view;
+		return list;
 	}
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse result) {
-				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
-			}
-		}).exec(accountID);
-	}
-
 
 	public void enterEditMode(List<AccountField> editableFields){
 		isInEditMode=true;

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

@@ -17,29 +17,23 @@ import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
@@ -54,7 +48,6 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -122,9 +115,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
 
-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String note;
 	private Account account;
 	private String accountID;
 	private Relationship relationship;
@@ -136,11 +126,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Uri editNewAvatar, editNewCover;
 	private String profileAccountID;
 	private boolean refreshing;
-	private ImageButton fab;
+	private View fab;
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
-	private boolean isScrollingUp = false;
 
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
@@ -211,10 +200,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 
-		noteEdit = content.findViewById(R.id.note_edit);
-		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
-
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
 			public void getOutline(View view, Outline outline){
@@ -223,31 +208,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);
 
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				fab.setVisibility(View.GONE);
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				fab.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
-
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -274,7 +234,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
-		UiUtils.reduceSwipeSensitivity(pager);
 		pager.setOffscreenPageLimit(5);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new ProfilePagerAdapter());
@@ -327,6 +286,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followersBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
+		if (account != null && account.bot) {
+			username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_bot_24_filled, 0, 0, 0);
+		}
+
 		username.setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
@@ -339,25 +302,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
-	public void setNote(String note){
-		this.note=note;
-		noteWrap.setVisibility(View.VISIBLE);
-		noteEdit.setVisibility(View.VISIBLE);
-		noteEdit.setText(note);
-	}
-
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse result) {
-				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
-			}
-		}).exec(accountID);
-	}
-
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -386,11 +330,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 							if(mediaFragment.loaded)
 								mediaFragment.onRefresh();
 						}
-//						if(noteEdit.hasFocus()){
-//							V.setVisibilityAnimated(fab, View.GONE);
-//						}else{
-//							V.setVisibilityAnimated(fab, View.VISIBLE);
-//						}
+						V.setVisibilityAnimated(fab, View.VISIBLE);
 					}
 				})
 				.exec(accountID);
@@ -509,7 +449,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
-
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
 			ssb.append(account.acct);
@@ -523,19 +462,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
-		}else if(account.bot){
-			ssb=new SpannableStringBuilder("@");
-			ssb.append(account.acct);
-			if(isSelf){
-				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
-			}
-			ssb.append(" ");
-			Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, getActivity().getTheme()).mutate();
-			botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
-			botIcon.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
-			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
@@ -547,8 +473,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setVisibility(View.VISIBLE);
 			bio.setText(parsedBio);
 		}
-
-
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -629,7 +553,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
 		if(isOwnProfile){
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.manage_user_lists, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
 		}else{
 			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
 		}
@@ -644,16 +568,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
-		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		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()));
+			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			manageUserLists.setVisible(true);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			manageUserLists.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()));
@@ -673,8 +598,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			confirmToggleMuted();
 		}else if(id==R.id.block){
 			confirmToggleBlocked();
-		}else if(id==R.id.soft_block){
-			confirmSoftBlockUser();
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -713,10 +636,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			if (!isOwnProfile) {
-				args.putString("profileAccount", profileAccountID);
-				args.putString("profileDisplayUsername", account.getDisplayUsername());
-			}
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
@@ -764,17 +685,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		if (!isOwnProfile) {
-			setNote(relationship.note);
-			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
-		}
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
-	public ImageButton getFab() {
-		return fab;
-	}
-
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){
@@ -989,10 +902,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		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();
@@ -1000,9 +909,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public boolean onBackPressed(){
-		if(noteEdit.hasFocus()) {
-			savePrivateNote();
-		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;

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

@@ -69,7 +69,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null);
 	}
 
 	@Override

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

@@ -53,7 +53,6 @@ import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.parceler.Parcels;
 
@@ -85,8 +84,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private PushSubscription pushSubscription;
 
 	private ImageView themeTransitionWindowView;
-	private TextItem checkForUpdateItem, clearImageCacheItem;
-	private ImageCache imageCache;
+	private TextItem checkForUpdateItem;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -94,7 +92,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		setTitle(R.string.settings);
-		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
@@ -115,15 +112,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
-			GlobalUserPreferences.uniformNotificationIcon=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
 		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
 			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 			popupMenu.inflate(R.menu.color_palettes);
@@ -151,32 +139,39 @@ public class SettingsFragment extends MastodonToolbarFragment{
 							Toast.LENGTH_LONG).show();
 				});
 			} else {
-				b.setOnClickListener(l -> {
-					FrameLayout inputWrap = new FrameLayout(getContext());
-					EditText input = new EditText(getContext());
-					input.setHint(R.string.publish);
-					input.setText(GlobalUserPreferences.publishButtonText.trim());
-					FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-					params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-					input.setLayoutParams(params);
-					inputWrap.addView(input);
-					new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-							.setPositiveButton(R.string.save, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNeutralButton(R.string.clear, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = "";
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNegativeButton(R.string.cancel, (d, which) -> {
-							})
-							.show();
-				});}
+			b.setOnClickListener(l -> {
+				FrameLayout inputWrap = new FrameLayout(getContext());
+				EditText input = new EditText(getContext());
+				input.setHint(R.string.publish);
+				input.setText(GlobalUserPreferences.publishButtonText.trim());
+				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+				params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
+				input.setLayoutParams(params);
+				inputWrap.addView(input);
+				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
+						.setPositiveButton(R.string.save, (d, which) -> {
+							GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
+							GlobalUserPreferences.save();
+							updatePublishText(b);
+						})
+						.setNeutralButton(R.string.clear, (d, which) -> {
+							GlobalUserPreferences.publishButtonText = "";
+							GlobalUserPreferences.save();
+							updatePublishText(b);
+						})
+						.setNegativeButton(R.string.cancel, (d, which) -> {
+						})
+						.show();
+			});}
+		}));
+		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
+			GlobalUserPreferences.uniformNotificationIcon=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
+			GlobalUserPreferences.reduceMotion=i.checked;
+			GlobalUserPreferences.save();
 		}));
-
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
@@ -248,7 +243,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked)));
 		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
 		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
-		items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
+		items.add(new SwitchItem(R.string.sk_keep_only_latest_notification, R.drawable.ic_fluent_custom_alert_latest_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
 			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -265,7 +260,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			args.putParcelable("instance", Parcels.wrap(instance));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
 		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
-		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
@@ -284,9 +278,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
-//		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
-		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
-		items.add(clearImageCacheItem);
+		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
@@ -535,13 +527,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private void clearImageCache(){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
-			imageCache.clear();
+			ImageCache.getInstance(getActivity()).clear();
 			Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
 		});
-		if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
-			clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
-			tvh.rebind();
-		}
 	}
 
 	@Subscribe
@@ -672,29 +660,27 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 	private class TextItem extends Item{
 		private String text;
-		private String secondaryText;
 		private Runnable onClick;
 		private boolean loading;
 		private int icon;
 
 		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, null, onClick, false, 0);
+			this(text, onClick, false, 0);
+		}
+
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading) {
+			this(text, onClick, loading, 0);
 		}
 
 		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, null, onClick, false, icon);
+			this(text, onClick, false, icon);
 		}
 
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
-			this(text, secondaryText, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading, @DrawableRes int icon){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
 			this.icon=icon;
-			this.secondaryText = secondaryText;
 		}
 
 		@Override
@@ -946,27 +932,22 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	}
 
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
-		private final TextView text, secondaryText;
+		private final TextView text;
 		private final ProgressBar progress;
 		private final ImageView icon;
 
 		public TextViewHolder(){
 			super(getActivity(), R.layout.item_settings_text, list);
 			text = itemView.findViewById(R.id.text);
-			secondaryText = itemView.findViewById(R.id.secondary_text);
 			progress = itemView.findViewById(R.id.progress);
 			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
-			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
-			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
-
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
-			icon.setImageResource(item.icon);
-			secondaryText.setText(item.secondaryText);
+			if (item.icon != 0) icon.setImageDrawable(getActivity().getTheme().getDrawable(item.icon));
 		}
 
 		@Override

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

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-import android.content.res.Configuration;
 import android.os.Bundle;
 
 import com.squareup.otto.Subscribe;
@@ -172,12 +171,6 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
-	@Override
-	public void onConfigurationChanged(Configuration newConfig){
-		super.onConfigurationChanged(newConfig);
-		if (getParentFragment() instanceof HomeTabFragment home) home.updateToolbarLogo();
-	}
-
 	public class EventListener{
 
 		@Subscribe

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

@@ -225,7 +225,6 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			contextMenu=new PopupMenu(getActivity(), menuAnchor);
 			contextMenu.inflate(R.menu.profile);
 			contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
-			UiUtils.enablePopupMenuIcons(getActivity(), contextMenu);
 		}
 
 		@Override
@@ -284,32 +283,29 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			Menu menu=contextMenu.getMenu();
 			Account account=item.account;
 
-			menu.findItem(R.id.share).setTitle(getString(R.string.share_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);
-
-			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
-			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
-			menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
+			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername())).setVisible(relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 			if(relationship.following){
-				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);
+				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
 				hideBoosts.setVisible(true);
-				UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-
-				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
 				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
 				manageUserLists.setVisible(true);
 			}
-			menu.findItem(R.id.block_domain).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);
+			}
 
 			menuAnchor.setTranslationX(x);
 			menuAnchor.setTranslationY(y);
@@ -350,8 +346,6 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 			}else if(id==R.id.block){
 				UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
-			}else if(id==R.id.soft_block){
-				UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
 			}else if(id==R.id.report){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);

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

@@ -81,30 +81,20 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-//		tabViews=new FrameLayout[noFederated ? 5 : 6];
-		tabViews=new FrameLayout[4];
+		tabViews=new FrameLayout[noFederated ? 6 : 7];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
-
-///			int switchIndex = noFederated && i > 0 ? i + 1 : i;
-//			tabView.setId(switch(switchIndex){
-//				case 0 -> R.id.discover_local_timeline;
-//				case 1 -> R.id.discover_federated_timeline;
-//				case 2 -> R.id.discover_hashtags;
-//				case 3 -> R.id.discover_posts;
-//				case 4 -> R.id.discover_news;
-//				case 5 -> R.id.discover_users;
-//				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
-//			});
-
-			tabView.setId(switch(i){
-				case 0 -> R.id.discover_hashtags;
-				case 1 -> R.id.discover_posts;
-				case 2 -> R.id.discover_news;
-				case 3 -> R.id.discover_users;
-				default -> throw new IllegalStateException("Unexpected value: "+i);
+			int switchIndex = noFederated && i > 0 ? i + 1 : i;
+			tabView.setId(switch(switchIndex){
+				case 0 -> R.id.discover_local_timeline;
+				case 1 -> R.id.discover_federated_timeline;
+				case 2 -> R.id.discover_lists;
+				case 3 -> R.id.discover_hashtags;
+				case 4 -> R.id.discover_posts;
+				case 5 -> R.id.discover_news;
+				case 6 -> R.id.discover_users;
+				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
-
 			tabView.setVisibility(View.GONE);
 			view.addView(tabView); // needed so the fragment manager will have somewhere to restore the tab fragment
 			tabViews[i]=tabView;
@@ -113,7 +103,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout.setTabTextSize(V.dp(16));
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
 
-		UiUtils.reduceSwipeSensitivity(pager);
 		pager.setOffscreenPageLimit(4);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new DiscoverPagerAdapter());
@@ -130,7 +119,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 
-		if(localTimelineFragment==null || hashtagsFragment==null){
+		if(localTimelineFragment==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
@@ -150,56 +139,39 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
-//			listTimelinesFragment=new ListTimelinesFragment();
-//			listTimelinesFragment.setArguments(args);
-//
-//			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
-//					.add(R.id.discover_posts, postsFragment)
-//					.add(R.id.discover_local_timeline, localTimelineFragment)
-//					.add(R.id.discover_hashtags, hashtagsFragment)
-//					.add(R.id.discover_news, newsFragment)
-//					.add(R.id.discover_users, accountsFragment)
-//					.add(R.id.discover_lists, listTimelinesFragment);
-//
-//			if (!noFederated) {
-//				federatedTimelineFragment=new FederatedTimelineFragment();
-//				federatedTimelineFragment.setArguments(args);
-//				transaction.add(R.id.discover_federated_timeline, federatedTimelineFragment);
-//			}
-//
-//			transaction.commit();
+			listTimelinesFragment=new ListTimelinesFragment();
+			listTimelinesFragment.setArguments(args);
 
-			getChildFragmentManager().beginTransaction()
+			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
+					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
-					.commit();
+					.add(R.id.discover_lists, listTimelinesFragment);
+
+			if (!noFederated) {
+				federatedTimelineFragment=new FederatedTimelineFragment();
+				federatedTimelineFragment.setArguments(args);
+				transaction.add(R.id.discover_federated_timeline, federatedTimelineFragment);
+			}
+
+			transaction.commit();
 		}
 
 		tabLayoutMediator=new TabLayoutMediator(tabLayout, pager, new TabLayoutMediator.TabConfigurationStrategy(){
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
-
-//				if (noFederated && position > 0) position++;
-
-//				tab.setText(switch(position){
-//					case 0 -> R.string.local_timeline;
-//					case 1 -> R.string.sk_federated_timeline;
-//					case 2 -> R.string.sk_list_timelines;
-//					case 3 -> R.string.hashtags;
-//					case 4 -> R.string.posts;
-//					case 5 -> R.string.news;
-//					case 6 -> R.string.for_you;
-//
-//					default -> throw new IllegalStateException("Unexpected value: "+position);
-//				});
-
+				if (noFederated && position > 0) position++;
 				tab.setText(switch(position){
-					case 0 -> R.string.hashtags;
-					case 1 -> R.string.posts;
-					case 2 -> R.string.news;
-					case 3 -> R.string.for_you;
+					case 0 -> R.string.local_timeline;
+					case 1 -> R.string.sk_federated_timeline;
+					case 2 -> R.string.sk_list_timelines;
+					case 3 -> R.string.hashtags;
+					case 4 -> R.string.posts;
+					case 5 -> R.string.news;
+					case 6 -> R.string.for_you;
+
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -285,11 +257,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	}
 
 	public void loadData(){
-		if(hashtagsFragment!=null && !hashtagsFragment.loaded && !hashtagsFragment.dataLoading)
-			hashtagsFragment.loadData();
-
-//		if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
-//			localTimelineFragment.loadData();
+		if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
+			localTimelineFragment.loadData();
 	}
 
 	private void onSearchEditFocusChanged(View v, boolean hasFocus){
@@ -325,23 +294,14 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 
 	private Fragment getFragmentForPage(int page){
 		if (noFederated && page > 0) page++;
-
-//		return switch(page){
-//			case 0 -> localTimelineFragment;
-//			case 1 -> federatedTimelineFragment;
-//			case 2 -> hashtagsFragment;
-//			case 3 -> postsFragment;
-//			case 4 -> newsFragment;
-//			case 5 -> accountsFragment;
-//			case 6 -> listTimelinesFragment;
-//			default -> throw new IllegalStateException("Unexpected value: "+page);
-//		};
-
 		return switch(page){
-			case 0 -> hashtagsFragment;
-			case 1 -> postsFragment;
-			case 2 -> newsFragment;
-			case 3 -> accountsFragment;
+			case 0 -> localTimelineFragment;
+			case 1 -> federatedTimelineFragment;
+			case 2 -> hashtagsFragment;
+			case 3 -> postsFragment;
+			case 4 -> newsFragment;
+			case 5 -> accountsFragment;
+			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}

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

@@ -17,11 +17,11 @@ public class DiscoverPostsFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetTrendingStatuses(offset, count)
+		currentRequest=new GetTrendingStatuses(count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						onDataLoaded(result, !result.isEmpty());
+						onDataLoaded(result, false);
 					}
 				}).exec(accountID);
 	}

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

@@ -3,9 +3,7 @@ package org.joinmastodon.android.fragments.discover;
 import android.os.Bundle;
 import android.view.View;
 
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.fragments.FabStatusListFragment;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -17,7 +15,7 @@ import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class FederatedTimelineFragment extends FabStatusListFragment {
+public class FederatedTimelineFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.FEDERATED_TIMELINE);
 	private String maxID;
 

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

@@ -3,9 +3,7 @@ package org.joinmastodon.android.fragments.discover;
 import android.os.Bundle;
 import android.view.View;
 
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.fragments.FabStatusListFragment;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -17,7 +15,7 @@ import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class LocalTimelineFragment extends FabStatusListFragment {
+public class LocalTimelineFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE);
 	private String maxID;
 

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

@@ -36,10 +36,10 @@ import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class CustomWelcomeFragment extends InstanceCatalogFragment {
+public class CustomLoginFragment extends InstanceCatalogFragment {
 	private View headerView;
 
-	public CustomWelcomeFragment() {
+	public CustomLoginFragment() {
 		super(R.layout.fragment_welcome_custom, 1);
 	}
 
@@ -55,9 +55,9 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		dataLoaded();
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 
 		if (!canGoBack()) {
 			ImageView toolbarLogo=new ImageView(getActivity());
@@ -137,11 +137,9 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 		headerView.findViewById(R.id.more).setVisibility(View.GONE);
 		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
-		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
-		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
-		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
-		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
+		((TextView) headerView.findViewById(R.id.username)).setText("@moshidon");
 		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
+		((TextView) headerView.findViewById(R.id.timestamp)).setText(R.string.time_now);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
 		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
 
@@ -170,7 +168,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		return mergeAdapter;
 	}
 
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder> {
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
 		public InstancesAdapter(){
 			super(imgLoader);
 		}
@@ -206,6 +204,11 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 		public InstanceViewHolder(){
 			super(getActivity(), R.layout.item_instance_custom, list);
+
+//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
+//			TypedValue value = new TypedValue();
+//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
+//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
 			userCount=findViewById(R.id.user_count);

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

@@ -1,63 +0,0 @@
-package org.joinmastodon.android.model;
-
-import org.joinmastodon.android.api.RequiredField;
-import org.parceler.Parcel;
-
-import java.time.Instant;
-import java.util.List;
-
-@Parcel
-public class Announcement extends BaseModel implements DisplayItemsParent {
-    @RequiredField
-    public String id;
-    @RequiredField
-    public String content;
-    public Instant startsAt;
-    public Instant endsAt;
-    public boolean published;
-    public boolean allDay;
-    public Instant publishedAt;
-    public Instant updatedAt;
-    public boolean read;
-    public List<Emoji> emojis;
-    public List<Mention> mentions;
-    public List<Hashtag> tags;
-
-    @Override
-    public String toString() {
-        return "Announcement{" +
-                "id='" + id + '\'' +
-                ", content='" + content + '\'' +
-                ", startsAt=" + startsAt +
-                ", endsAt=" + endsAt +
-                ", published=" + published +
-                ", allDay=" + allDay +
-                ", publishedAt=" + publishedAt +
-                ", updatedAt=" + updatedAt +
-                ", read=" + read +
-                ", emojis=" + emojis +
-                ", mentions=" + mentions +
-                ", tags=" + tags +
-                '}';
-    }
-
-    public Status toStatus() {
-        Status s = new Status();
-        s.id = id;
-        s.mediaAttachments = List.of();
-        s.createdAt = startsAt != null ? startsAt : publishedAt;
-        if (updatedAt != null) s.editedAt = updatedAt;
-        s.content = s.text = content;
-        s.spoilerText = "";
-        s.visibility = StatusPrivacy.PUBLIC;
-        s.mentions = List.of();
-        s.tags = List.of();
-        s.emojis = List.of();
-        return s;
-    }
-
-    @Override
-    public String getID() {
-        return id;
-    }
-}

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

@@ -14,11 +14,9 @@ import org.parceler.Parcel;
 import org.parceler.ParcelConstructor;
 import org.parceler.ParcelProperty;
 
-import java.util.UUID;
-
 @Parcel
 public class Attachment extends BaseModel{
-//	@RequiredField
+	@RequiredField
 	public String id;
 	@RequiredField
 	public Type type;
@@ -87,12 +85,6 @@ public class Attachment extends BaseModel{
 			if(placeholder!=null)
 				blurhashPlaceholder=new BlurHashDrawable(placeholder, getWidth(), getHeight());
 		}
-
-		if (id == null) {
-			// akkoma servers doesn't provide IDs for attachments,
-			// but IDs are needed by the AudioPlayerService
-			id = "" + this.hashCode();
-		}
 	}
 
 	@Override

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

@@ -27,7 +27,7 @@ public class Instance extends BaseModel{
 	/**
 	 * Admin-defined description of the Mastodon site.
 	 */
-//	@RequiredField
+	@RequiredField
 	public String description;
 	/**
 	 * A shorter description defined by the admin.
@@ -37,7 +37,7 @@ public class Instance extends BaseModel{
 	/**
 	 * An email that may be contacted for any inquiries.
 	 */
-//	@RequiredField
+	@RequiredField
 	public String email;
 	/**
 	 * The version of Mastodon installed on the instance.

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

@@ -66,12 +66,10 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         s.id = id;
         s.mediaAttachments = mediaAttachments;
         s.createdAt = scheduledAt;
-        s.inReplyToId = params.inReplyToId > 0 ? "" + params.inReplyToId : null;
         s.content = s.text = params.text;
         s.spoilerText = params.spoilerText;
         s.visibility = params.visibility;
         s.language = params.language;
-        s.sensitive = params.sensitive;
         s.mentions = List.of();
         s.tags = List.of();
         s.emojis = List.of();

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

@@ -23,8 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -78,7 +77,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, CustomWelcomeFragment.class, null);
+			Nav.go(activity, CustomLoginFragment.class, null);
 			dismiss();
 		}));
 

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.SystemClock;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +9,6 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import org.joinmastodon.android.AudioPlayerService;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Attachment;
@@ -128,10 +126,6 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 				lastKnownPositionTime=SystemClock.uptimeMillis();
 				this.playing=playing;
 				playPauseBtn.setImageResource(playing ? R.drawable.ic_fluent_pause_circle_24_filled : R.drawable.ic_fluent_play_circle_24_filled);
-				playPauseBtn.setContentDescription(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play));
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					playPauseBtn.setTooltipText(playPauseBtn.getContentDescription());
-				}
 				if(!playing){
 					lastRemainingSeconds=-1;
 					time.setText(formatDuration((int) item.attachment.getDuration()));

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -101,11 +100,6 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
 				case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
 			});
-
-			visibility.setContentDescription(UiUtils.getVisibilityText(s));
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				visibility.setTooltipText(visibility.getContentDescription());
-			}
 		}
 
 		@Override

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

@@ -9,9 +9,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.ImageSpan;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
@@ -26,7 +24,6 @@ import android.widget.Toast;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
-import org.joinmastodon.android.api.requests.announcements.DismissAnnouncement;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -38,7 +35,6 @@ import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
@@ -56,7 +52,6 @@ import java.time.format.FormatStyle;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
-import java.util.function.Consumer;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
@@ -80,8 +75,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private String extraText;
 	private Notification notification;
 	private ScheduledStatus scheduledStatus;
-	private Announcement announcement;
-	private Consumer<String> consumeReadAnnouncement;
 
 	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText, Notification notification, ScheduledStatus scheduledStatus){
 		super(parentID, parentFragment);
@@ -110,13 +103,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		this.extraText=extraText;
 	}
 
-	public static HeaderStatusDisplayItem fromAnnouncement(Announcement a, Status fakeStatus, Account instanceUser, BaseStatusListFragment parentFragment, String accountID, Consumer<String> consumeReadID) {
-		HeaderStatusDisplayItem item = new HeaderStatusDisplayItem(a.id, instanceUser, a.startsAt, parentFragment, accountID, fakeStatus, null, null, null);
-		item.announcement = a;
-		item.consumeReadAnnouncement = consumeReadID;
-		return item;
-	}
-
 	@Override
 	public Type getType(){
 		return Type.HEADER;
@@ -136,8 +122,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView name, username, timestamp, extraText, separator;
-		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, botIcon;
+		private final TextView name, username, timestamp, extraText;
+		private final ImageView avatar, more, visibility, deleteNotification;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -153,14 +139,11 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			super(activity, R.layout.display_item_header, parent);
 			name=findViewById(R.id.name);
 			username=findViewById(R.id.username);
-			separator=findViewById(R.id.separator);
 			timestamp=findViewById(R.id.timestamp);
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			visibility=findViewById(R.id.visibility);
 			deleteNotification=findViewById(R.id.delete_notification);
-			unreadIndicator=findViewById(R.id.unread_indicator);
-			botIcon=findViewById(R.id.bot_icon);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
@@ -285,23 +268,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(HeaderStatusDisplayItem item){
 			name.setText(item.parsedName);
 			username.setText('@'+item.user.acct);
-			botIcon.setVisibility(item.user.bot ? View.VISIBLE : View.GONE);
-			botIcon.setColorFilter(username.getCurrentTextColor());
-			separator.setVisibility(View.VISIBLE);
 
-//			if(item.user.bot){
-//				SpannableStringBuilder ssb = new SpannableStringBuilder();
-//				ssb.append('@'+item.user.acct);
-//				ssb.append(" ");
-//				Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, itemView.getContext().getTheme()).mutate();
-//				botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
-//				botIcon.setTint(username.getCurrentTextColor());
-//				ssb.append(itemView.getContext().getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
-//				username.setPaddingRelative(0,0,16,0);
-//				username.setText(ssb);
-//			}
-
-//			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
+			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
 
 			if (item.scheduledStatus!=null)
 				if (item.scheduledStatus.scheduledAt.isAfter(CreateStatus.DRAFTS_AFTER_INSTANT)) {
@@ -310,14 +278,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault());
 					timestamp.setText(item.scheduledStatus.scheduledAt.atZone(ZoneId.systemDefault()).format(formatter));
 				}
-			else if ((item.status==null || item.status.editedAt==null) && item.createdAt != null)
+			else if(item.status==null || item.status.editedAt==null)
 				timestamp.setText(UiUtils.formatRelativeTimestamp(itemView.getContext(), item.createdAt));
-			else if (item.status != null && item.status.editedAt != null)
+			else
 				timestamp.setText(item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)));
-			else {
-				separator.setVisibility(View.GONE);
-				timestamp.setText("");
-			}
 			visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE);
 			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if(item.hasVisibilityToggle){
@@ -341,44 +305,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				currentRelationshipRequest.cancel();
 			}
 			relationship=null;
-
-			String desc;
-			if (item.announcement != null) {
-				if (unreadIndicator.getVisibility() == View.GONE) {
-					more.setAlpha(0f);
-					unreadIndicator.setAlpha(0f);
-					unreadIndicator.setVisibility(View.VISIBLE);
-				}
-				float alpha = item.announcement.read ? 0 : 1;
-				more.setImageResource(R.drawable.ic_fluent_checkmark_20_filled);
-				desc = item.parentFragment.getString(R.string.sk_mark_as_read);
-				more.animate().alpha(alpha);
-				unreadIndicator.animate().alpha(alpha);
-				more.setEnabled(!item.announcement.read);
-				more.setOnClickListener(v -> {
-					if (item.announcement.read) return;
-					new DismissAnnouncement(item.announcement.id).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(Object o) {
-							item.consumeReadAnnouncement.accept(item.announcement.id);
-							item.announcement.read = true;
-							rebind();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							error.showToast(item.parentFragment.getActivity());
-						}
-					}).exec(item.accountID);
-				});
-			} else {
-				more.setImageResource(R.drawable.ic_fluent_more_vertical_20_filled);
-				desc = item.parentFragment.getString(R.string.more_options);
-				more.setOnClickListener(this::onMoreClick);
-			}
-
-			more.setContentDescription(desc);
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) more.setTooltipText(desc);
 		}
 
 		@Override
@@ -399,10 +325,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onAvaClick(View v){
-			if (item.announcement != null) {
-				UiUtils.openURL(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.user.url);
-				return;
-			}
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(item.user));
@@ -434,7 +356,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void updateOptionsMenu(){
-			if (item.announcement != null) return;
 			boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 			Menu menu=optionsMenu.getMenu();
 

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

@@ -73,12 +73,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 
 			photo.setImageDrawable(null);
 			if(item.imgRequest!=null){
-				if (card.width > 0) {
-					// akkoma servers don't provide width and height
-					crossfadeDrawable.setSize(card.width, card.height);
-				} else {
-					crossfadeDrawable.setSize(itemView.getWidth(), itemView.getHeight());
-				}
+				crossfadeDrawable.setSize(card.width, card.height);
 				crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
 				crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
 				photo.setImageDrawable(crossfadeDrawable);

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

@@ -77,10 +77,6 @@ public abstract class StatusDisplayItem{
 	}
 
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false);
-	}
-
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
@@ -104,7 +100,7 @@ public abstract class StatusDisplayItem{
 		HeaderStatusDisplayItem header;
 		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, notification, scheduledStatus));
 		if(!TextUtils.isEmpty(statusForContent.content))
-			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent, disableTranslate));
+			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent));
 		else
 			header.needBottomPadding=true;
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());

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

@@ -40,16 +40,14 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
-	public boolean disableTranslate;
 	public boolean translated = false;
 	public TranslatedStatus translation = null;
 	private AccountSession session;
 
-	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
+	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status){
 		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
-		this.disableTranslate=disableTranslate;
 		emojiHelper.setText(text);
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
@@ -145,8 +143,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			}
 
 			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
-			boolean translateEnabled = !item.disableTranslate && instanceInfo.v2 != null &&
-					instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
+			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
 
 			translateWrap.setVisibility(translateEnabled &&
 					!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&

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

@@ -31,7 +31,6 @@ import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -53,7 +52,6 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
 import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
-import org.joinmastodon.android.api.requests.lists.DeleteList;
 import org.joinmastodon.android.api.requests.notifications.DismissNotification;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
@@ -88,7 +86,6 @@ import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.parceler.Parcels;
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -113,8 +110,6 @@ import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -344,6 +339,14 @@ public class UiUtils{
 		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
 	}
 
+	public static void openListTimeline(Context context, String accountID, ListTimeline list){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putString("listID", list.id);
+		args.putString("listTitle", list.title);
+		Nav.go((Activity)context, ListTimelineFragment.class, args);
+	}
+
 	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, Runnable onConfirmed){
 		showConfirmationAlert(context, title, message, confirmButton, 0, onConfirmed);
 	}
@@ -366,7 +369,7 @@ public class UiUtils{
 		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.do_unblock : R.string.do_block),
-				R.drawable.ic_fluent_person_prohibited_28_regular,
+				currentlyBlocked ? R.drawable.ic_fluent_person_28_regular : R.drawable.ic_fluent_person_prohibited_28_regular,
 				()->{
 					new SetAccountBlocked(account.id, !currentlyBlocked)
 							.setCallback(new Callback<>(){
@@ -388,38 +391,6 @@ 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_do_remove_follower),
-				R.drawable.ic_fluent_person_delete_24_regular,
-				() -> new SetAccountBlocked(account.id, true).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(Relationship relationship) {
-							new SetAccountBlocked(account.id, false).setCallback(new Callback<>() {
-								@Override
-								public void onSuccess(Relationship relationship) {
-									Toast.makeText(activity, R.string.sk_remove_follower_success, Toast.LENGTH_SHORT).show();
-									resultCallback.accept(relationship);
-								}
-
-								@Override
-								public void onError(ErrorResponse error) {
-									error.showToast(activity);
-									resultCallback.accept(relationship);
-								}
-							}).exec(accountID);
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							error.showToast(activity);
-						}
-					}).exec(accountID)
-		);
-	}
-
 	public static void confirmToggleBlockDomain(Activity activity, String accountID, String domain, boolean currentlyBlocked, Runnable resultCallback){
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_domain_title : R.string.confirm_block_domain_title),
 				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, domain),
@@ -527,7 +498,7 @@ public class UiUtils{
 				pinned ? R.string.sk_confirm_pin_post_title : R.string.sk_confirm_unpin_post_title,
 				pinned ? R.string.sk_confirm_pin_post : R.string.sk_confirm_unpin_post,
 				pinned ? R.string.sk_pin_post : R.string.sk_unpin_post,
-				pinned ? R.drawable.ic_fluent_pin_28_regular : R.drawable.ic_fluent_pin_off_28_regular,
+				pinned ? R.drawable.ic_fluent_pin_off_28_regular : R.drawable.ic_fluent_pin_28_regular,
 				()->{
 					new SetStatusPinned(status.id, pinned)
 							.setCallback(new Callback<>() {
@@ -570,27 +541,6 @@ public class UiUtils{
 		);
 	}
 
-	public static void confirmDeleteList(Activity activity, String accountID, String listID, String listTitle, Runnable callback) {
-		showConfirmationAlert(activity,
-				activity.getString(R.string.sk_delete_list),
-				activity.getString(R.string.sk_delete_list_confirm, listTitle),
-				activity.getString(R.string.delete),
-				R.drawable.ic_fluent_delete_28_regular,
-				() -> new DeleteList(listID).setCallback(new Callback<>() {
-							@Override
-							public void onSuccess(Object o) {
-								callback.run();
-							}
-
-							@Override
-							public void onError(ErrorResponse error) {
-								error.showToast(activity);
-							}
-						})
-						.wrapProgress(activity, R.string.deleting, false)
-						.exec(accountID));
-	}
-
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		setRelationshipToActionButton(relationship, button, false);
 	}
@@ -1054,28 +1004,4 @@ public class UiUtils{
 			return false;
 		}
 	}
-
-	public static String getVisibilityText(Status status) {
-		return MastodonApp.context.getString(switch (status.visibility) {
-			case PUBLIC -> R.string.visibility_public;
-			case UNLISTED -> R.string.sk_visibility_unlisted;
-			case PRIVATE -> R.string.visibility_followers_only;
-			case DIRECT -> R.string.visibility_private;
-		});
-	}
-
-	// https://github.com/tuskyapp/Tusky/pull/3148
-	public static void reduceSwipeSensitivity(ViewPager2 pager) {
-		try {
-			Field recyclerViewField = ViewPager2.class.getDeclaredField("mRecyclerView");
-			recyclerViewField.setAccessible(true);
-			RecyclerView recyclerView = (RecyclerView) recyclerViewField.get(pager);
-			Field touchSlopField = RecyclerView.class.getDeclaredField("mTouchSlop");
-			touchSlopField.setAccessible(true);
-			int touchSlop = touchSlopField.getInt(recyclerView);
-			touchSlopField.set(recyclerView, touchSlop * 3);
-		} catch (Exception ex) {
-			Log.e("reduceSwipeSensitivity", Log.getStackTraceString(ex));
-		}
-	}
 }

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

@@ -1,84 +0,0 @@
-package org.joinmastodon.android.ui.views;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class ListTimelineEditor extends LinearLayout {
-    private ListTimeline.RepliesPolicy policy = null;
-    private final TextInputFrameLayout input;
-    private final Button button;
-
-    @SuppressLint("ClickableViewAccessibility")
-    public ListTimelineEditor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        LayoutInflater.from(context).inflate(R.layout.list_timeline_editor, this);
-
-        button = findViewById(R.id.button);
-        input = findViewById(R.id.input);
-
-        PopupMenu popupMenu = new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL);
-        popupMenu.inflate(R.menu.list_reply_policies);
-        popupMenu.setOnMenuItemClickListener(this::onMenuItemClick);
-
-        button.setOnTouchListener(popupMenu.getDragToOpenListener());
-        button.setOnClickListener(v->popupMenu.show());
-        input.getEditText().setHint(context.getString(R.string.sk_list_name_hint));
-
-        setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
-    }
-
-    public void applyList(String title, ListTimeline.RepliesPolicy policy) {
-        input.getEditText().setText(title);
-        setRepliesPolicy(policy);
-    }
-
-    public String getTitle() {
-        return input.getEditText().getText().toString();
-    }
-
-    public ListTimeline.RepliesPolicy getRepliesPolicy() {
-        return policy;
-    }
-
-    public void setRepliesPolicy(ListTimeline.RepliesPolicy policy) {
-        this.policy = policy;
-        switch (policy) {
-            case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed);
-            case LIST -> button.setText(R.string.sk_list_replies_policy_list);
-            case NONE -> button.setText(R.string.sk_list_replies_policy_none);
-        }
-    }
-
-    private boolean onMenuItemClick(MenuItem i) {
-        if (i.getItemId() == R.id.reply_policy_none) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.NONE);
-        } else if (i.getItemId() == R.id.reply_policy_followed) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.FOLLOWED);
-        } else if (i.getItemId() == R.id.reply_policy_list) {
-            setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
-        }
-        return true;
-    }
-
-    public ListTimelineEditor(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    public ListTimelineEditor(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public ListTimelineEditor(Context context) {
-        this(context, null);
-    }
-}

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

@@ -1,51 +0,0 @@
-package org.joinmastodon.android.ui.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import me.grishka.appkit.utils.V;
-
-public class TextInputFrameLayout extends FrameLayout {
-    private final EditText editText;
-
-    public TextInputFrameLayout(@NonNull Context context, CharSequence hint, CharSequence text) {
-        this(context, null, 0, 0, hint, text);
-    }
-
-    public TextInputFrameLayout(@NonNull Context context) {
-        this(context, null);
-    }
-
-    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        this(context, attrs, defStyleAttr, defStyleRes, null, null);
-    }
-
-    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes, CharSequence hint, CharSequence text) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        editText = new EditText(context);
-        editText.setHint(hint);
-        editText.setText(text);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(V.dp(24), V.dp(4), V.dp(24), V.dp(16));
-        editText.setLayoutParams(params);
-        addView(editText);
-    }
-
-    public EditText getEditText() {
-        return editText;
-    }
-}

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

@@ -2,9 +2,9 @@
 <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"/>
+			<solid android:color="?android:colorAccent"/>
+			<corners android:radius="16dp"/>
+			<padding android:left="16dp" android:right="16dp"/>
 		</shape>
 	</item>
 </ripple>

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

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

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

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

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

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

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M11.754,9.203C12.551,9.203 13.199,9.852 13.199,10.648L13.199,11.203L13.195,11.203C13.168,11.824 12.996,12.605 12.297,13.246C11.531,13.945 10.211,14.398 8,14.398C5.789,14.398 4.469,13.945 3.703,13.246C3.004,12.605 2.832,11.824 2.805,11.203L2.801,11.203L2.801,10.648C2.801,9.852 3.449,9.203 4.246,9.203ZM5.199,2.398C4.539,2.398 4,2.938 4,3.602L4,6.801C4,7.461 4.539,8 5.199,8L10.801,8C11.461,8 12,7.461 12,6.801L12,3.602C12,2.938 11.461,2.398 10.801,2.398L8.398,2.398C8.398,2.398 8.398,2.246 8.398,2C8.398,1.754 8.223,1.602 8,1.602C7.777,1.602 7.602,1.785 7.602,2C7.602,2.215 7.602,2.398 7.602,2.398ZM5.602,5.199C5.602,4.758 5.957,4.398 6.398,4.398C6.844,4.398 7.199,4.758 7.199,5.199C7.199,5.641 6.844,6 6.398,6C5.957,6 5.602,5.641 5.602,5.199ZM8.801,5.199C8.801,4.758 9.156,4.398 9.602,4.398C10.043,4.398 10.398,4.758 10.398,5.199C10.398,5.641 10.043,6 9.602,6C9.156,6 8.801,5.641 8.801,5.199ZM8.801,5.199"
-      android:fillColor="?android:textColorPrimary" />
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M17.75 3c1.733 0 3.15 1.356 3.245 3.066L21 6.25v5.772c-0.463-0.297-0.966-0.536-1.5-0.709V6.25c0-0.918-0.707-1.671-1.606-1.744L17.75 4.5H6.25c-0.6 0-1.13 0.302-1.445 0.763C4.491 5.095 4.132 5 3.75 5 3.57 5 3.393 5.021 3.224 5.062 3.677 3.909 4.77 3.078 6.066 3.005L6.25 3h11.5zm-6.437 16.5c0.173 0.534 0.412 1.037 0.709 1.5H6.25c-1.733 0-3.15-1.357-3.245-3.066L3 17.75V9.372C3.235 9.455 3.487 9.5 3.75 9.5S4.266 9.455 4.5 9.372v8.378c0 0.918 0.707 1.671 1.607 1.744L6.25 19.5h5.063zm0.418-4.997c0.286-0.55 0.65-1.056 1.076-1.5h-4.06l-0.1 0.007c-0.367 0.05-0.65 0.363-0.65 0.743 0 0.414 0.337 0.75 0.75 0.75h2.984zm3.521-5.007c0.415 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743l-0.102 0.007H8.748c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.693 0.648-0.743l0.102-0.007h6.504zM3.75 6C4.44 6 5 6.56 5 7.25S4.44 8.5 3.75 8.5 2.5 7.94 2.5 7.25 3.06 6 3.75 6zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M9.562,3C5.419,3 2.062,6.358 2.062,10.5C2.062,11.633 2.313,12.709 2.764,13.673C2.51,14.671 2.226,15.784 2.04,16.515C1.807,17.428 2.629,18.259 3.544,18.039C4.294,17.859 5.447,17.582 6.474,17.337C7.417,17.763 8.462,18 9.562,18C13.704,18 17.062,14.642 17.062,10.5C17.062,6.358 13.704,3 9.562,3ZM3.562,10.5C3.562,7.186 6.248,4.5 9.562,4.5C12.875,4.5 15.562,7.186 15.562,10.5C15.562,13.814 12.875,16.5 9.562,16.5C8.601,16.5 7.695,16.275 6.892,15.875L6.648,15.754L6.384,15.817C5.461,16.036 4.395,16.292 3.596,16.484C3.795,15.705 4.058,14.672 4.286,13.776L4.356,13.5L4.226,13.247C3.801,12.425 3.562,11.491 3.562,10.5ZM14.562,21C12.592,21 10.8,20.241 9.462,19C9.495,19 9.528,19 9.562,19C10.28,19 10.977,18.911 11.643,18.743C12.507,19.225 13.502,19.5 14.562,19.5C15.522,19.5 16.428,19.275 17.232,18.875L17.475,18.754L17.74,18.817C18.661,19.036 19.705,19.263 20.479,19.426C20.304,18.676 20.065,17.671 19.837,16.776L19.767,16.5L19.897,16.247C20.322,15.425 20.562,14.491 20.562,13.5C20.562,11.385 19.468,9.526 17.815,8.458C17.636,7.734 17.365,7.048 17.015,6.411C19.952,7.427 22.062,10.217 22.062,13.5C22.062,14.633 21.81,15.709 21.359,16.674C21.612,17.682 21.868,18.774 22.03,19.477C22.235,20.362 21.455,21.163 20.563,20.977C19.836,20.825 18.693,20.581 17.649,20.337C16.707,20.763 15.661,21 14.562,21Z"
-        android:fillColor="@color/fluent_default_icon_tint" />
-    <path
-        android:pathData="M7.297,8.312L11.85,8.312A0.75,0.75 0,0 1,12.6 9.062L12.6,9.062A0.75,0.75 0,0 1,11.85 9.812L7.297,9.812A0.75,0.75 0,0 1,6.547 9.062L6.547,9.062A0.75,0.75 0,0 1,7.297 8.312z"
-        android:fillColor="@color/fluent_default_icon_tint" />
-    <path
-        android:pathData="M7.297,11.312L10.323,11.312A0.75,0.75 0,0 1,11.073 12.062L11.073,12.062A0.75,0.75 0,0 1,10.323 12.812L7.297,12.812A0.75,0.75 0,0 1,6.547 12.062L6.547,12.062A0.75,0.75 0,0 1,7.297 11.312z"
-        android:fillColor="@color/fluent_default_icon_tint" />
-</vector>

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

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

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M7.032 13.907l-3.471-3.905C3.285 9.692 2.81 9.664 2.5 9.939 2.193 10.215 2.165 10.69 2.44 11l4 4.5c0.287 0.322 0.786 0.336 1.091 0.031l10.5-10.5c0.293-0.293 0.293-0.767 0-1.06-0.293-0.293-0.767-0.293-1.06 0l-9.938 9.937z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:pathData="M3.2 5.74C3.482 5.436 3.957 5.419 4.26 5.7L8 9.226 11.74 5.7c0.303-0.281 0.778-0.264 1.06 0.04 0.281 0.303 0.264 0.778-0.04 1.06l-4.25 4c-0.287 0.267-0.733 0.267-1.02 0l-4.25-4C2.936 6.518 2.919 6.043 3.2 5.74z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M13 10c0 1.657-1.343 3-3 3s-3-1.343-3-3 1.343-3 3-3 3 1.343 3 3z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M6.25 3C5.007 3 4 4.007 4 5.25v2.5C4 8.993 5.007 10 6.25 10h9.5C16.993 10 18 8.993 18 7.75v-2.5C18 4.007 16.993 3 15.75 3h-9.5zM5.5 5.25c0-0.414 0.336-0.75 0.75-0.75h9.5c0.414 0 0.75 0.336 0.75 0.75v2.5c0 0.414-0.336 0.75-0.75 0.75h-9.5C5.836 8.5 5.5 8.164 5.5 7.75v-2.5zM8.7 16C8.313 16 8 16.336 8 16.75s0.313 0.75 0.7 0.75h4.6c0.387 0 0.7-0.336 0.7-0.75S13.687 16 13.3 16H8.7zm8.653 0.445L17.28 16.53c-0.266 0.267-0.683 0.29-0.976 0.073L16.22 16.53l-2-2c-0.267-0.266-0.29-0.682-0.073-0.976l0.073-0.084 2-2c0.293-0.293 0.767-0.293 1.06 0 0.267 0.266 0.29 0.683 0.073 0.976L17.28 12.53l-0.719 0.721h1.5c0.647 0 1.18-0.492 1.243-1.122L19.311 12V9.75c0-0.415 0.335-0.75 0.75-0.75 0.38 0 0.693 0.282 0.743 0.648L20.81 9.75V12c0 1.462-1.142 2.658-2.583 2.745L18.06 14.75h-1.499l0.718 0.719c0.267 0.266 0.29 0.683 0.073 0.976zM18 19.25v-2.026l-0.013 0.012c-0.405 0.406-0.96 0.57-1.487 0.495v1.519c0 0.414-0.336 0.75-0.75 0.75h-9.5c-0.414 0-0.75-0.336-0.75-0.75v-5c0-0.414 0.336-0.75 0.75-0.75h6.822c0.058-0.192 0.148-0.376 0.272-0.543l0.022-0.03 0.12-0.14L14.275 12H6.25C5.007 12 4 13.007 4 14.25v5c0 1.243 1.007 2.25 2.25 2.25h9.5c1.243 0 2.25-1.007 2.25-2.25z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M10.946 2.047l0.005 0.007C11.296 2.02 11.646 2 12 2c5.522 0 10 4.477 10 10s-4.478 10-10 10c-3.21 0-6.066-1.512-7.896-3.862H4.102v-0.003C2.786 16.441 2 14.312 2 12c0-5.162 3.911-9.41 8.932-9.944l0.014-0.009zM12 3.5c-0.053 0-0.106 0-0.16 0.002 0.123 0.244 0.255 0.532 0.374 0.85 0.347 0.921 0.666 2.28 0.1 3.486-0.522 1.113-1.424 1.4-2.09 1.573L10.14 9.432c-0.657 0.17-0.91 0.235-1.093 0.514-0.17 0.257-0.144 0.582 0.061 1.25l0.046 0.148c0.082 0.258 0.18 0.57 0.23 0.863 0.064 0.364 0.082 0.827-0.152 1.275-0.231 0.444-0.538 0.747-0.9 0.945-0.341 0.185-0.694 0.256-0.958 0.302l-0.093 0.017c-0.515 0.09-0.761 0.134-1 0.39-0.187 0.2-0.307 0.553-0.377 1.079-0.029 0.214-0.046 0.427-0.064 0.646l-0.01 0.117c-0.02 0.242-0.044 0.521-0.099 0.76v0.002c1.554 1.696 3.787 2.76 6.27 2.76 1.576 0 3.053-0.43 4.319-1.178-0.099-0.1-0.205-0.218-0.31-0.35-0.34-0.428-0.786-1.164-0.631-2.033 0.074-0.418 0.298-0.768 0.515-1.036 0.22-0.274 0.486-0.526 0.72-0.74l0.158-0.146c0.179-0.163 0.33-0.301 0.46-0.437 0.172-0.18 0.21-0.262 0.212-0.267 0.068-0.224-0.015-0.384-0.106-0.454-0.046-0.035-0.107-0.06-0.19-0.061-0.084 0-0.22 0.024-0.401 0.14-0.21 0.132-0.515 0.214-0.836 0.085-0.267-0.108-0.415-0.314-0.486-0.432-0.144-0.237-0.225-0.546-0.278-0.772-0.04-0.174-0.08-0.372-0.115-0.553l-0.04-0.206c-0.05-0.25-0.094-0.428-0.134-0.54l-0.02-0.037c-0.014-0.027-0.035-0.062-0.064-0.105-0.058-0.089-0.133-0.192-0.227-0.317l-0.11-0.143c-0.16-0.212-0.353-0.463-0.516-0.712-0.196-0.298-0.417-0.688-0.487-1.104-0.037-0.22-0.036-0.475 0.055-0.734 0.094-0.264 0.265-0.482 0.487-0.649 0.483-0.362 1.193-1.172 1.823-1.959 0.288-0.359 0.544-0.695 0.736-0.95C15.222 3.98 13.667 3.5 12 3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M10.55 2.534c0.837-0.707 2.063-0.707 2.9 0L20.2 8.23C20.708 8.657 21 9.286 21 9.95v9.802c0 0.967-0.784 1.75-1.75 1.75h-3c-0.966 0-1.75-0.783-1.75-1.75v-5c0-0.414-0.336-0.75-0.75-0.75h-3.5c-0.414 0-0.75 0.336-0.75 0.75v5c0 0.967-0.784 1.75-1.75 1.75h-3c-0.966 0-1.75-0.783-1.75-1.75V9.948c0-0.663 0.292-1.292 0.8-1.72l6.75-5.694z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M10.55 2.532c0.837-0.707 2.063-0.707 2.9 0l6.75 5.692c0.507 0.428 0.8 1.057 0.8 1.72v9.803c0 0.966-0.784 1.75-1.75 1.75h-3.5c-0.966 0-1.75-0.784-1.75-1.75v-5.5c0-0.138-0.112-0.25-0.25-0.25h-3.5c-0.138 0-0.25 0.112-0.25 0.25v5.5c0 0.966-0.784 1.75-1.75 1.75h-3.5c-0.966 0-1.75-0.784-1.75-1.75V9.944c0-0.663 0.293-1.293 0.8-1.72l6.75-5.692zm1.933 1.147c-0.279-0.236-0.687-0.236-0.966 0L4.767 9.37C4.596 9.513 4.5 9.723 4.5 9.944v9.803c0 0.138 0.112 0.25 0.25 0.25h3.5c0.138 0 0.25-0.112 0.25-0.25v-5.5c0-0.967 0.784-1.75 1.75-1.75h3.5c0.966 0 1.75 0.783 1.75 1.75v5.5c0 0.138 0.112 0.25 0.25 0.25h3.5c0.138 0 0.25-0.112 0.25-0.25V9.944c0-0.221-0.098-0.43-0.267-0.573l-6.75-5.692z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999zm0 1.5c-4.695 0-8.502 3.806-8.502 8.502 0 4.695 3.807 8.501 8.502 8.501s8.502-3.806 8.502-8.501c0-4.696-3.807-8.502-8.502-8.502zm-0.004 7c0.38 0 0.694 0.282 0.744 0.648l0.007 0.102 0.004 5.502c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.744-0.648l-0.006-0.101-0.004-5.502c0-0.414 0.335-0.75 0.75-0.75zm0.005-3.497c0.551 0 0.998 0.447 0.998 0.999 0 0.551-0.447 0.998-0.998 0.998-0.552 0-1-0.447-1-0.998 0-0.552 0.448-1 1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M21.907 5.622C21.969 5.83 22 6.046 22 6.263V17.74c0 1.242-1.007 2.25-2.25 2.25-0.217 0-0.433-0.032-0.641-0.094l-5.514-1.64C12.938 19.602 11.558 20.5 10 20.5c-2.142 0-3.891-1.683-3.995-3.8L6 16.5 5.999 16l-2.39-0.711C2.655 15.004 2 14.127 2 13.131V10.87c0-0.995 0.655-1.873 1.61-2.156l15.5-4.606c1.19-0.355 2.443 0.324 2.797 1.515zM7.499 16.445L7.5 16.499C7.5 17.88 8.62 19 10 19c0.885 0 1.678-0.464 2.124-1.179l-4.625-1.375zm12.037-10.9l-15.5 4.605C3.718 10.245 3.5 10.537 3.5 10.87v2.261c0 0.332 0.218 0.625 0.536 0.72l15.5 4.607c0.07 0.02 0.142 0.03 0.214 0.03 0.414 0 0.75-0.335 0.75-0.75V6.264c0-0.072-0.01-0.144-0.031-0.213-0.118-0.397-0.536-0.624-0.933-0.506z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M10 6.5c-0.966 0-1.75-0.784-1.75-1.75S9.034 3 10 3s1.75 0.784 1.75 1.75S10.966 6.5 10 6.5zM10 17c-0.966 0-1.75-0.784-1.75-1.75S9.034 13.5 10 13.5s1.75 0.784 1.75 1.75S10.966 17 10 17zm-1.75-7c0 0.966 0.784 1.75 1.75 1.75s1.75-0.784 1.75-1.75S10.966 8.25 10 8.25 8.25 9.034 8.25 10z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M7.5,7C7.224,7 7,7.224 7,7.5C7,7.776 7.224,8 7.5,8H12.5C12.776,8 13,7.776 13,7.5C13,7.224 12.776,7 12.5,7H7.5ZM7,10.5C7,10.224 7.224,10 7.5,10H12.5C12.776,10 13,10.224 13,10.5C13,10.776 12.776,11 12.5,11H7.5C7.224,11 7,10.776 7,10.5ZM7.5,13C7.224,13 7,13.224 7,13.5C7,13.776 7.224,14 7.5,14H9.5C9.776,14 10,13.776 10,13.5C10,13.224 9.776,13 9.5,13H7.5ZM6.5,2C6.224,2 6,2.224 6,2.5V3H5.5C4.672,3 4,3.672 4,4.5V16.5C4,17.328 4.672,18 5.5,18H11.5C11.633,18 11.76,17.947 11.854,17.854L15.854,13.854C15.947,13.76 16,13.633 16,13.5V4.5C16,3.672 15.328,3 14.5,3H14V2.5C14,2.224 13.776,2 13.5,2C13.224,2 13,2.224 13,2.5V3H10.5V2.5C10.5,2.224 10.276,2 10,2C9.724,2 9.5,2.224 9.5,2.5V3H7V2.5C7,2.224 6.776,2 6.5,2ZM14.5,4C14.776,4 15,4.224 15,4.5V13H12.5C11.672,13 11,13.672 11,14.5V17H5.5C5.224,17 5,16.776 5,16.5V4.5C5,4.224 5.224,4 5.5,4H14.5ZM14.293,14L12,16.293V14.5C12,14.224 12.224,14 12.5,14H14.293Z"
-      android:fillColor="#212121"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M14.75 15c0.966 0 1.75 0.784 1.75 1.75l-0.001 0.962c0.117 2.19-1.511 3.297-4.432 3.297-2.91 0-4.567-1.09-4.567-3.259v-1C7.5 15.784 8.284 15 9.25 15h5.5zm-11-5h4.376C8.044 10.32 8 10.655 8 11c0 1.116 0.457 2.124 1.193 2.85L9.355 14H9.25c-0.301 0-0.591 0.049-0.863 0.138-0.864 0.286-1.54 0.988-1.786 1.87L6.567 16.01C3.657 16.009 2 14.919 2 12.75v-1C2 10.784 2.784 10 3.75 10zm16.5 0c0.966 0 1.75 0.784 1.75 1.75l-0.001 0.962c0.117 2.19-1.511 3.297-4.432 3.297l-0.169-0.002c-0.238-0.854-0.88-1.54-1.705-1.841-0.235-0.086-0.486-0.14-0.746-0.16L14.75 14l-0.105 0.001C15.475 13.268 16 12.195 16 11c0-0.345-0.044-0.68-0.126-1h4.376zM12 8c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3zM6.5 3c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3zm11 0c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M8 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm9 0c1.657 0 3-1.343 3-3s-1.343-3-3-3-3 1.343-3 3 1.343 3 3 3zM4.25 14C3.007 14 2 15.007 2 16.25v0.25S2 21 8 21c1.855 0 3.136-0.43 4.021-1.024 0.06-0.38 0.242-0.719 0.504-0.976C12.201 18.682 12 18.24 12 17.75s0.201-0.932 0.525-1.25C12.201 16.182 12 15.74 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm9.5 0.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
@@ -19,8 +18,6 @@
 
     <ImageView
         android:id="@+id/send_error"
-        android:tooltipText="@string/sk_sending_error"
-        android:contentDescription="@string/sk_sending_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
@@ -55,16 +52,6 @@
         android:contentDescription="@string/sk_schedule_or_draft"
         android:tooltipText="@string/sk_schedule_or_draft" />
 
-    <TextView
-        android:id="@+id/char_counter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/m3_body_large"
-        android:textColor="?android:textColorSecondary"
-        android:layout_marginHorizontal="8dp"
-        android:visibility="gone"
-        tools:text="500"/>
-
     <Button
         android:id="@+id/publish_btn"
         android:layout_width="wrap_content"

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

@@ -28,8 +28,6 @@
 			android:layout_marginTop="2dp"
 			android:layout_marginStart="2dp"
 			android:background="?android:selectableItemBackgroundBorderless"
-			android:contentDescription="@string/delete"
-			android:tooltipText="@string/delete"
 			android:tint="#D92C2C"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
@@ -103,11 +101,11 @@
 			<TextView
 				android:id="@+id/state_title"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="16dp"
 				android:layout_below="@id/retry_or_cancel_upload"
 				android:layout_marginTop="16dp"
 				android:textColor="?colorGray200"
-				android:textSize="14sp"
+				android:textSize="14dp"
 				android:gravity="center_horizontal"
 				android:singleLine="true"
 				android:ellipsize="end"
@@ -118,7 +116,7 @@
 			<TextView
 				android:id="@+id/state_text"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="32dp"
 				android:layout_below="@id/state_title"
 				android:includeFontPadding="false"
 				android:textColor="?colorGray200"
@@ -139,7 +137,6 @@
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="#D92C2C"
 			android:contentDescription="@string/delete"
-			android:tooltipText="@string/delete"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
 	</FrameLayout>

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

@@ -20,7 +20,6 @@
 			android:layout_height="24dp"
 			android:layout_margin="16dp"
 			android:tint="?colorDarkIcon"
-			android:importantForAccessibility="no"
 			android:src="@drawable/ic_fluent_circle_24_regular"/>
 		<EditText
 			android:id="@+id/edit"
@@ -42,7 +41,6 @@
 		android:layout_height="56dp"
 		android:scaleType="center"
 		android:tint="?colorDarkIcon"
-		android:contentDescription="@string/reorder"
 		android:src="@drawable/ic_fluent_re_order_dots_vertical_24_regular"/>
 
 </LinearLayout>

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

@@ -8,7 +8,7 @@
 	android:layout_gravity="top"
 	android:elevation="1dp"
 	android:outlineProvider="background"
-	android:background="?colorBackgroundLight">
+	android:background="?colorWindowBackground">
 
 	<TextView
 		android:id="@+id/banner_text"

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

@@ -17,7 +17,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="24dp"
 			android:layout_gravity="center"
-			android:drawableStart="@drawable/ic_fluent_chat_multiple_24_selector_text"
+			android:drawableStart="@drawable/ic_fluent_chat_multiple_24_regular"
 			android:drawablePadding="8dp"
 			android:drawableTint="?android:textColorSecondary"
 			android:gravity="center_vertical"

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

@@ -18,7 +18,7 @@
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:contentDescription="@string/more_options"
 		android:scaleType="center"
-		android:src="@drawable/ic_fluent_more_vertical_20_filled"
+		android:src="@drawable/ic_post_more"
 		android:tint="?android:textColorSecondary" />
 
 	<ImageView
@@ -47,21 +47,10 @@
 		android:src="@drawable/ic_visibility"
 		android:tint="?android:textColorSecondary" />
 
-	<ImageView
-		android:id="@+id/unread_indicator"
-		android:layout_width="36dp"
-		android:layout_height="36dp"
-		android:layout_marginTop="-6dp"
-		android:layout_toStartOf="@id/visibility"
-		android:visibility="gone"
-		android:tint="?android:colorAccent"
-		android:scaleType="center"
-		android:src="@drawable/ic_fluent_circle_small_20_filled" />
-
 	<ImageView
 		android:id="@+id/avatar"
-		android:layout_width="46sp"
-		android:layout_height="46sp"
+		android:layout_width="46dp"
+		android:layout_height="46dp"
 		android:layout_alignParentStart="true"
 		android:layout_alignParentTop="true"
 		android:layout_marginEnd="12dp" />
@@ -69,17 +58,15 @@
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="24dp"
 		android:layout_marginEnd="12dp"
-		android:layout_marginTop="2sp"
-		android:layout_toStartOf="@id/unread_indicator"
-		android:layout_toEndOf="@id/avatar"
-		android:minHeight="24sp">
+		android:layout_toStartOf="@id/visibility"
+		android:layout_toEndOf="@id/avatar">
 
 		<TextView
 			android:id="@+id/name"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="24dp"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAlignment="viewStart"
@@ -89,7 +76,7 @@
 		<TextView
 			android:id="@+id/extra_text"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="24dp"
 			android:layout_marginStart="8dp"
 			android:ellipsize="end"
 			android:fontFamily="sans-serif"
@@ -102,38 +89,29 @@
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="20dp"
 		android:layout_below="@id/name_wrap"
 		android:layout_marginEnd="8dp"
-		android:layout_toStartOf="@id/unread_indicator"
+		android:layout_toStartOf="@id/visibility"
 		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
-		android:minHeight="20sp"
 		android:orientation="horizontal">
 
 		<TextView
 			android:id="@+id/username"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="20dp"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
 			tools:text="\@Gargron" />
 
-		<ImageView
-			android:id="@+id/bot_icon"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:importantForAccessibility="no"
-			android:layout_marginTop="2dp"
-			android:src="@drawable/ic_fluent_bot_16_filled" />
-
 		<TextView
 			android:id="@+id/separator"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="4sp"
-			android:layout_marginRight="4sp"
+			android:layout_height="20dp"
+			android:layout_marginLeft="4dp"
+			android:layout_marginRight="4dp"
 			android:importantForAccessibility="no"
 			android:text="·"
 			android:textAppearance="@style/m3_title_small" />
@@ -141,7 +119,7 @@
 		<TextView
 			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="20dp"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
 			tools:text="3h" />

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

@@ -56,10 +56,10 @@
 
 				<TextView
 					android:id="@+id/reply_text"
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="-12dp"
-					android:layout_marginStart="16dp"
+					android:paddingHorizontal="16dp"
 					android:paddingTop="16dp"
 					android:paddingBottom="6dp"
 					android:textAppearance="@style/m3_title_small"
@@ -68,7 +68,8 @@
 					android:drawableTint="?android:textColorSecondary"
 					android:drawablePadding="6dp"
 					android:singleLine="true"
-					android:ellipsize="end"/>
+					android:ellipsize="end"
+					android:background="?android:selectableItemBackground"/>
 
 				<RelativeLayout
 					android:layout_width="match_parent"
@@ -79,8 +80,8 @@
 
 					<ImageView
 						android:id="@+id/self_avatar"
-						android:layout_width="46sp"
-						android:layout_height="46sp"
+						android:layout_width="46dp"
+						android:layout_height="46dp"
 						android:layout_alignParentStart="true"
 						android:layout_alignParentTop="true"
 						android:layout_marginEnd="12dp" />
@@ -88,10 +89,8 @@
 					<TextView
 						android:id="@+id/self_name"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
+						android:layout_height="24dp"
 						android:layout_toEndOf="@id/self_avatar"
-						android:layout_marginTop="2sp"
-						android:minHeight="24sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_medium"
@@ -100,10 +99,9 @@
 					<TextView
 						android:id="@+id/self_username"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
+						android:layout_height="20dp"
 						android:layout_below="@id/self_name"
 						android:layout_toEndOf="@id/self_avatar"
-						android:minHeight="20sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_small"
@@ -155,7 +153,6 @@
 						android:layout_marginBottom="8dp"
 						android:background="@drawable/bg_poll_option_clickable"
 						android:outlineProvider="background"
-						android:contentDescription="@string/sk_poll_option_add"
 						android:elevation="2dp">
 						<ImageView
 							android:id="@+id/add_poll_option_icon"
@@ -163,7 +160,6 @@
 							android:layout_height="24dp"
 							android:layout_margin="16dp"
 							android:tint="?colorDarkIcon"
-							android:importantForAccessibility="no"
 							android:src="@drawable/ic_fluent_add_circle_24_regular"/>
 					</LinearLayout>
 					<TextView
@@ -424,7 +420,6 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_body_large"
 				android:textColor="?android:textColorSecondary"
-				android:visibility="gone"
 				tools:text="500"/>
 
 			<Button
@@ -434,7 +429,6 @@
 				android:layout_marginStart="12dp"
 				android:visibility="gone"
 				android:tooltipText="@string/publish"
-				android:contentDescription="@string/publish"
 				android:drawableStart="@drawable/ic_fluent_send_24_selector"
 				/>
 

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

@@ -36,7 +36,7 @@
 				android:hint="@string/search_hint"
 				android:textColorHint="?colorSearchHint"
 				android:textColor="?android:textColorPrimary"
-				android:textSize="16sp"
+				android:textSize="16dp"
 				android:singleLine="true"
 				android:inputType="textFilter"
 				android:imeOptions="actionSearch"

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

@@ -45,7 +45,7 @@
 						android:textColor="?colorGray50t"
 						android:textAllCaps="true"
 						android:fontFamily="sans-serif-medium"
-						android:textSize="14sp"
+						android:textSize="14dp"
 						android:gravity="center"
 						android:background="@drawable/bg_profile_follows_you"
 						android:visibility="gone"
@@ -253,53 +253,11 @@
 						android:textColor="?android:textColorSecondary"
 						tools:text="\@Gargron" />
 
-					<FrameLayout
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/username"
-						android:id="@+id/note_edit_wrap"
-						android:layout_marginTop="4dp"
-						android:layout_marginBottom="16dp"
-						android:layout_marginHorizontal="16dp"
-						android:visibility="gone">
-
-						<EditText
-							android:id="@+id/note_edit"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:paddingVertical="16dp"
-							android:inputType="textMultiLine|textCapSentences"
-							android:singleLine="false"
-							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
-							android:drawablePadding="12dp"
-							android:drawableTint="?android:textColorSecondary"
-							android:background="@drawable/bg_note_edit"
-							android:paddingEnd="48dp"
-							android:paddingHorizontal="16dp"
-							android:elevation="0dp"
-							android:visibility="gone"
-							android:hint="@string/sk_personal_note"/>
-
-						<Button
-							android:id="@+id/note_edit_confirm"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_marginEnd="8dp"
-							android:paddingHorizontal="8dp"
-							android:visibility="invisible"
-							android:backgroundTint="?colorBackgroundLightest"
-							android:layout_gravity="right|center_vertical"
-							android:tooltipText="@string/sk_personal_note_confirm"
-							android:contentDescription="@string/sk_personal_note_confirm"
-							android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
-							/>
-					</FrameLayout>
-
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/note_edit_wrap"
+						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
@@ -360,11 +318,7 @@
 			</LinearLayout>
 		</org.joinmastodon.android.ui.views.NestedRecyclerScrollView>
 
-		<ImageButton
-			android:tooltipText="@string/sk_fab_compose"
-			android:contentDescription="@string/sk_fab_compose"
-			android:id="@+id/fab"
-			style="@style/Widget.Mastodon.Button.Compose"/>
+		<ImageButton android:id="@+id/fab" style="@style/Widget.Mastodon.Button.Compose"/>
 	</FrameLayout>
 
 </me.grishka.appkit.views.RecursiveSwipeRefreshLayout>

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

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/note_edit_wrap"
-        android:visibility="gone">
-
-        <EditText
-            android:id="@+id/note_edit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingVertical="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="4dp"
-            android:layout_marginHorizontal="16dp"
-            android:inputType="textMultiLine|textCapSentences"
-            android:singleLine="false"
-            android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
-            android:drawablePadding="12dp"
-            android:drawableTint="?android:textColorSecondary"
-            android:background="@drawable/bg_note_edit"
-            android:paddingHorizontal="16dp"
-            android:elevation="0dp"
-            android:visibility="gone"
-            android:hint="@string/sk_personal_note"/>
-
-        <ImageButton
-            android:id="@+id/note_edit_confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_fluent_checkmark_24_filled"
-            android:backgroundTint="#00000000"
-            android:layout_marginTop="2dp"
-            android:visibility="invisible"
-            android:layout_marginEnd="20dp"
-            android:layout_gravity="right|center_vertical"
-            android:tooltipText="@string/sk_personal_note_confirm"
-            android:contentDescription="@string/sk_personal_note_confirm" />
-
-    </FrameLayout>
-
-    <me.grishka.appkit.views.UsableRecyclerView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical"
-        android:clipToPadding="false"/>
-
-</LinearLayout>

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

@@ -14,7 +14,8 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginVertical="12dp"
-		android:text="@string/sk_welcome_title" />
+		android:text="@string/sk_welcome_title"
+		/>
 
 	<TextView
 		style="@style/m3_body_large"

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

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout
-        android:id="@+id/switcher_btn"
-        android:background="?android:selectableItemBackgroundBorderless"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical|start"
-        android:paddingHorizontal="16dp">
-        <ImageView
-            android:id="@+id/timeline_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_fluent_home_24_regular" />
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <ImageView
-                android:id="@+id/collapsed_chevron"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_fluent_chevron_down_16_filled"
-                android:visibility="gone" />
-            <TextView
-                android:id="@+id/timeline_title"
-                style="?android:attr/titleTextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:drawablePadding="8dp"
-                android:drawableEnd="@drawable/ic_fluent_chevron_down_16_filled" />
-        </FrameLayout>
-    </LinearLayout>
-    <FrameLayout
-        android:layout_width="match_parent"
-        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:minHeight="32sp"
-            android:lineSpacingMultiplier="0.8"
-            android:textAppearance="@style/m3_title_medium"
-            android:text="@string/see_new_posts"
-            android:textColor="@color/gray_25"
-            android:background="@drawable/bg_button_new_posts"
-            android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
-            android:drawablePadding="8dp"
-            android:layout_gravity="center" />
-    </FrameLayout>
-</FrameLayout>

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

@@ -19,7 +19,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_marginStart="24dp"
-		android:textSize="16sp"
+		android:textSize="16dp"
 		android:textColor="?android:textColorPrimary"
 		android:singleLine="true"
 		android:ellipsize="end"/>

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

@@ -6,7 +6,7 @@
 	android:singleLine="true"
 	android:ellipsize="end"
 	android:fontFamily="sans-serif-medium"
-	android:textSize="12sp"
+	android:textSize="12dp"
 	android:textColor="?android:textColorSecondary"
 	android:textAllCaps="true"
 	android:paddingTop="24dp"

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

@@ -11,7 +11,6 @@
 		android:id="@+id/emoji"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:importantForAccessibility="no"
 		android:layout_marginBottom="6dp"
 		android:layout_gravity="center_horizontal"/>
 
@@ -23,7 +22,7 @@
 		android:textAllCaps="true"
 		android:textColor="?android:textColorPrimary"
 		android:fontFamily="sans-serif-medium"
-		android:textSize="14sp"
+		android:textSize="14dp"
 		android:gravity="center_vertical"
 		android:singleLine="true"
 		android:ellipsize="end"

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

@@ -6,7 +6,7 @@
 
 	<TextView
 		android:layout_width="0dp"
-		android:layout_height="wrap_content"
+		android:layout_height="28dp"
 		android:layout_weight="1"
 		android:layout_marginTop="12dp"
 		android:layout_marginStart="16dp"
@@ -22,7 +22,6 @@
 		android:layout_height="44dp"
 		android:layout_marginTop="4dp"
 		android:layout_marginEnd="6dp"
-		android:layout_gravity="center_vertical"
 		android:tint="?android:textColorSecondary"
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:contentDescription="@string/clear"

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

@@ -11,7 +11,6 @@
 		android:layout_height="24dp"
 		android:layout_alignParentStart="true"
 		android:layout_centerVertical="true"
-		android:importantForAccessibility="no"
 		android:tint="?android:textColorSecondary"
 		android:src="@drawable/ic_round_checkbox"/>
 

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

@@ -12,13 +12,13 @@
 	
 	<TextView
 		android:id="@+id/number"
-		android:layout_width="24sp"
-		android:layout_height="wrap_content"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
 		android:layout_marginEnd="16dp"
 		android:textColor="?android:colorAccent"
 		android:fontFamily="sans-serif-condensed"
 		android:textStyle="bold"
-		android:textSize="22sp"
+		android:textSize="22dp"
 		android:gravity="center"
 		android:includeFontPadding="false"
 		tools:text="1"/>