Merge remote-tracking branch 'upstream/l10n_master'

Currently translated at 100.0% (18 of 18 strings)

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

mastodon/build.gradle

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

mastodon/src/main/assets/blocks.txt

@@ -1,56 +1,43 @@
 13bells.com
 1611.social
 4aem.com
+5dollah.click
 adachi.party
-anime.website
+adtension.com
 annihilation.social
 anon-kenkai.com
 asbestos.cafe
 bae.st
-bajax.us
 banepo.st
-baraag.net
 bassam.social
+battlepenguin.video
 beefyboys.win
-beepboop.ga
-berserker.town
-bikeshed.party
-boks.moe
 boymoder.biz
 brainsoap.net
 breastmilk.club
 brighteon.social
-bungle.online
+cachapa.xyz
+canary.fedinuke.example.com
+catgirl.life
 cawfee.club
+childlove.space
 clew.lol
 clubcyberia.co
-collapsitarian.io
-comfyboy.club
 contrapointsfan.club
+crucible.world
 cum.camp
 cum.salon
-darknight-coffee.org
 decayable.ink
 dembased.xyz
-desupost.soy
 detroitriotcity.com
-eatthebugs.social
+djsumdog.com
 eientei.org
-elementality.org
 eveningzoo.club
-firedragonstudios.com
-firefaithfellowship.com
 fluf.club
-foxfam.club
 freak.university
 freeatlantis.com
-freedomstrike.org
-freesoftwareextremist.com
-freespeech.group
 freespeechextremist.com
-freetalklive.com
 froth.zone
-fulltermprivacy.com
 gameliberty.club
 gearlandia.haus
 genderheretics.xyz
@@ -59,42 +46,34 @@ gleasonator.com
 glee.li
 glindr.org
 goyim.app
-goyslop.cafe
+h5q.net
 haeder.net
 handholding.io
 hitchhiker.social
-hunk.city
 iddqd.social
-intkos.link
-justicewarrior.social
-kawa-kun.com
 kitsunemimi.club
 kiwifarms.cc
-kompost.cz
 kurosawa.moe
+kyaruc.moe
 leafposter.club
-leftychan.net
 lewdieheaven.com
 liberdon.com
 ligma.pro
 lolicon.rocks
+lolison.network
 lolison.top
 lovingexpressions.net
-mahodou.moe
 makemysarcophagus.com
-maladaptive.art
 marsey.moe
-masochi.st
 mastinator.com
 merovingian.club
 midwaytrades.com
 mirr0r.city
-moa.st
+morale.ch
 mouse.services
 mugicha.club
 narrativerry.xyz
 natehiggers.online
-neckbeard.xyz
 needs.vodka
 neenster.org
 nicecrew.digital
@@ -103,18 +82,18 @@ noagendasocial.com
 noagendasocial.nl
 noagendatube.com
 nobodyhasthe.biz
-nukem.biz
-obo.sh
+norwoodzero.net
+nyanide.com
 onionfarms.org
 pawlicker.com
 pawoo.net
 pedo.school
+peervideo.club
 piazza.today
 pibvt.net
 pieville.net
 pisskey.io
 plagu.ee
-pmth.us
 poa.st
 poast.org
 poast.tv
@@ -123,17 +102,18 @@ prospeech.space
 quodverum.com
 r18.social
 rakket.app
+rapemeat.express
 rapemeat.solutions
-rdrama.cc
+rayci.st
 rebelbase.site
-retardedniggers.forsale
-rojogato.com
 ryona.agency
+sad.cab
 schwartzwelt.xyz
 seal.cafe
+shaw.app
 shigusegubu.club
 shitpost.cloud
-shota.house
+shortstacksran.ch
 silliness.observer
 skinheads.eu
 skinheads.io
@@ -148,23 +128,20 @@ sneed.social
 sonichu.com
 spinster.xyz
 springbo.cc
-starnix.network
 strelizia.net
-syspxl.xyz
 tastingtraffic.net
 teci.world
 theapex.social
+thechimp.zone
+thenobody.club
 thepostearthdestination.com
 tkammer.de
 trumpislovetrumpis.life
 truthsocial.co.in
-urchan.org
+usualsuspects.lol
 varishangout.net
-whinge.house
-whinge.town
-wideboys.org
+vtuberfan.social
 wolfgirl.bar
 xn--p1abe3d.xn--80asehdb
 yggdrasil.social
 youjo.love
-zztails.gay

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

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

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

@@ -57,7 +57,6 @@ public class GlobalUserPreferences{
 	public static boolean allowRemoteLoading;
 	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
-	public static ColorPreference color;
 	public static boolean disableM3PillActiveIndicator;
 	public static boolean showNavigationLabels;
 	public static boolean displayPronounsInTimelines, displayPronounsInThreads, displayPronounsInUserListings;
@@ -133,14 +132,8 @@ public class GlobalUserPreferences{
 					.apply();
 		}
 
-		try {
-			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
-		} catch (IllegalArgumentException|ClassCastException ignored) {
-			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PINK;
-		}
-
 		if(prefs.getInt("migrationLevel", 0) < 61) migrateToUpstreamVersion61();
+		if(prefs.getInt("migrationLevel", 0) < 101) migrateToVersion101();
 	}
 
 	public static void save(){
@@ -171,7 +164,6 @@ public class GlobalUserPreferences{
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
-				.putString("color", color.name())
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
 				.putBoolean("forwardReportDefault", forwardReportDefault)
@@ -185,6 +177,16 @@ public class GlobalUserPreferences{
 				.apply();
 	}
 
+	private static void migrateToVersion101(){
+		Log.d(TAG, "Migrating preferences to version 101!! (copy current theme to local preferences)");
+
+		AccountSessionManager asm=AccountSessionManager.getInstance();
+		for(AccountSession session : asm.getLoggedInAccounts()){
+			String accountID=session.getID();
+			AccountLocalPreferences localPrefs=session.getLocalPreferences();
+		}
+	}
+
 	private static void migrateToUpstreamVersion61(){
 		Log.d(TAG, "Migrating preferences to upstream version 61!!");
 
@@ -235,30 +237,6 @@ public class GlobalUserPreferences{
 		prefs.edit().putInt("migrationLevel", 61).apply();
 	}
 
-	public enum ColorPreference{
-		MATERIAL3,
-		PINK,
-		PURPLE,
-		GREEN,
-		BLUE,
-		BROWN,
-		RED,
-		YELLOW;
-
-		public @StringRes int getName() {
-			return switch(this){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-			};
-		}
-	}
-
 	public enum ThemePreference{
 		AUTO,
 		LIGHT,

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

@@ -39,54 +39,12 @@ import me.grishka.appkit.api.ErrorResponse;
 public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
-		UiUtils.setUserPreferredTheme(this);
+		AccountSession session=getCurrentSession();
+		UiUtils.setUserPreferredTheme(this, session);
 		super.onCreate(savedInstanceState);
 
 		if(savedInstanceState==null){
-			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomWelcomeFragment());
-			}else{
-				AccountSession session;
-				Bundle args=new Bundle();
-				Intent intent=getIntent();
-				if(intent.hasExtra("fromExternalShare")) {
-					AccountSessionManager.getInstance()
-							.setLastActiveAccountID(intent.getStringExtra("account"));
-					AccountSessionManager.getInstance().maybeUpdateLocalInfo(
-							AccountSessionManager.getInstance().getLastActiveAccount());
-					showFragmentForExternalShare(intent.getExtras());
-					return;
-				}
-
-				boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
-				boolean hasNotification = intent.hasExtra("notification");
-				if(fromNotification){
-					String accountID=intent.getStringExtra("accountID");
-					try{
-						session=AccountSessionManager.getInstance().getAccount(accountID);
-						if(!hasNotification) args.putString("tab", "notifications");
-					}catch(IllegalStateException x){
-						session=AccountSessionManager.getInstance().getLastActiveAccount();
-					}
-				}else{
-					session=AccountSessionManager.getInstance().getLastActiveAccount();
-				}
-				AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
-				args.putString("account", session.getID());
-				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
-				fragment.setArguments(args);
-				if(fromNotification && hasNotification){
-					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-					showFragmentForNotification(notification, session.getID());
-				} else if (intent.getBooleanExtra("compose", false)){
-					showCompose();
-				} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
-					handleURL(intent.getData(), null);
-				} else {
-					showFragmentClearingBackStack(fragment);
-					maybeRequestNotificationsPermission();
-				}
-			}
+			restartHomeFragment();
 		}
 
 		if(GithubSelfUpdater.needSelfUpdating()){
@@ -143,7 +101,7 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 	}
 
 	public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){
-		new GetSearchResults(q, null, true)
+		new GetSearchResults(q, null, true, null, 0, 0)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -259,4 +217,81 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		Fragment fragment = getCurrentFragment();
 		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
 	}
+
+	public AccountSession getCurrentSession(){
+		AccountSession session;
+		Bundle args=new Bundle();
+		Intent intent=getIntent();
+		if(intent.hasExtra("fromExternalShare")) {
+			return AccountSessionManager.getInstance()
+					.getAccount(intent.getStringExtra("account"));
+		}
+
+		boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
+		boolean hasNotification = intent.hasExtra("notification");
+		if(fromNotification){
+			String accountID=intent.getStringExtra("accountID");
+			try{
+				session=AccountSessionManager.getInstance().getAccount(accountID);
+				if(!hasNotification) args.putString("tab", "notifications");
+			}catch(IllegalStateException x){
+				session=AccountSessionManager.getInstance().getLastActiveAccount();
+			}
+		}else{
+			session=AccountSessionManager.getInstance().getLastActiveAccount();
+		}
+		return session;
+	}
+
+	public void restartActivity(){
+		finish();
+		startActivity(new Intent(this, MainActivity.class));
+	}
+
+	public void restartHomeFragment(){
+		if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
+			showFragmentClearingBackStack(new CustomWelcomeFragment());
+		}else{
+			AccountSession session;
+			Bundle args=new Bundle();
+			Intent intent=getIntent();
+			if(intent.hasExtra("fromExternalShare")) {
+				AccountSessionManager.getInstance()
+						.setLastActiveAccountID(intent.getStringExtra("account"));
+				AccountSessionManager.getInstance().maybeUpdateLocalInfo(
+						AccountSessionManager.getInstance().getLastActiveAccount());
+				showFragmentForExternalShare(intent.getExtras());
+				return;
+			}
+
+			boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
+			boolean hasNotification = intent.hasExtra("notification");
+			if(fromNotification){
+				String accountID=intent.getStringExtra("accountID");
+				try{
+					session=AccountSessionManager.getInstance().getAccount(accountID);
+					if(!hasNotification) args.putString("tab", "notifications");
+				}catch(IllegalStateException x){
+					session=AccountSessionManager.getInstance().getLastActiveAccount();
+				}
+			}else{
+				session=AccountSessionManager.getInstance().getLastActiveAccount();
+			}
+			AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
+			args.putString("account", session.getID());
+			Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
+			fragment.setArguments(args);
+			if(fromNotification && hasNotification){
+				Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+				showFragmentForNotification(notification, session.getID());
+			} else if (intent.getBooleanExtra("compose", false)){
+				showCompose();
+			} else if (Intent.ACTION_VIEW.equals(intent.getAction())){
+				handleURL(intent.getData(), null);
+			} else {
+				showFragmentClearingBackStack(fragment);
+				maybeRequestNotificationsPermission();
+			}
+		}
+	}
 }

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

@@ -176,6 +176,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				List<NotificationChannel> channels=Arrays.stream(PushNotification.Type.values())
 						.map(type->{
 							NotificationChannel channel=new NotificationChannel(accountID+"_"+type, context.getString(type.localizedName), NotificationManager.IMPORTANCE_DEFAULT);
+							channel.setLightColor(context.getColor(R.color.primary_700));
+							channel.enableLights(true);
 							channel.setGroup(accountID);
 							return channel;
 						})
@@ -205,6 +207,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
+				.setLights(UiUtils.getThemeColor(context, android.R.attr.colorAccent), 500, 1000)
 				.setColor(UiUtils.getThemeColor(context, android.R.attr.colorAccent));
 
 		if (!GlobalUserPreferences.uniformNotificationIcon) {
@@ -321,8 +324,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 		CreateStatus.Request req=new CreateStatus.Request();
 		req.status = initialText + input.toString();
-		req.language = preferences.postingDefaultLanguage;
-		req.visibility = preferences.postingDefaultVisibility;
+		req.language = notification.status.language;
+		req.visibility = notification.status.visibility;
 		req.inReplyToId = notification.status.id;
 
 		if (notification.status.hasSpoiler() &&

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

@@ -74,7 +74,6 @@ public class CacheController{
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.HOME);
 							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
 							return;
 						}
@@ -86,9 +85,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								ArrayList<Status> filtered=new ArrayList<>(result);
-								AccountSessionManager.get(accountID).filterStatuses(filtered, FilterContext.HOME);
-								callback.onSuccess(new CacheablePaginatedResponse<>(filtered, result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result, result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 

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

@@ -97,7 +97,7 @@ public class PushSubscriptionManager{
 		deviceToken=getPrefs().getString("deviceToken", null);
 		int tokenVersion=getPrefs().getInt("version", 0);
 		if(!TextUtils.isEmpty(deviceToken) && tokenVersion==BuildConfig.VERSION_CODE){
-			registerAllAccountsForPush(true); // TODO: revert this before release
+			registerAllAccountsForPush(false);
 			return;
 		}
 		Log.i(TAG, "tryRegisterFCM: no token found or app was updated. Trying to get push token...");

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

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetAccountBlocks extends HeaderPaginationRequest<Account>{
+	public GetAccountBlocks(String maxID, int limit){
+		super(HttpMethod.GET, "/blocks", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

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

@@ -0,0 +1,16 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.model.Account;
+
+public class GetAccountMutes extends HeaderPaginationRequest<Account>{
+	public GetAccountMutes(String maxID, int limit){
+		super(HttpMethod.GET, "/mutes/", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(limit>0)
+			addQueryParameter("limit", limit+"");
+	}
+}

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

@@ -6,18 +6,19 @@ import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.StatusPrivacy;
 
 public class UpdateAccountCredentialsPreferences extends MastodonAPIRequest<Account>{
-	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable){
+	public UpdateAccountCredentialsPreferences(Preferences preferences, Boolean locked, Boolean discoverable, Boolean indexable){
 		super(HttpMethod.PATCH, "/accounts/update_credentials", Account.class);
-		setRequestBody(new Request(locked, discoverable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
+		setRequestBody(new Request(locked, discoverable, indexable, new RequestSource(preferences.postingDefaultVisibility, preferences.postingDefaultLanguage)));
 	}
 
 	private static class Request{
-		public Boolean locked, discoverable;
+		public Boolean locked, discoverable, indexable;
 		public RequestSource source;
 
-		public Request(Boolean locked, Boolean discoverable, RequestSource source){
+		public Request(Boolean locked, Boolean discoverable, Boolean indexable, RequestSource source){
 			this.locked=locked;
 			this.discoverable=discoverable;
+			this.indexable=indexable;
 			this.source=source;
 		}
 	}

mastodon/src/main/java/org/joinmastodon/android/api/requests/filters/FilterRequest.java

@@ -6,6 +6,9 @@ import org.joinmastodon.android.model.FilterContext;
 import java.util.EnumSet;
 import java.util.List;
 
+import androidx.annotation.Keep;
+
+@Keep
 class FilterRequest{
 	public String title;
 	public EnumSet<FilterContext> context;

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

@@ -13,7 +13,7 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
-    private String maxID;
+    private final String maxID;
     public PleromaMarkNotificationsRead(String maxID) {
         super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
         this.maxID = maxID;

mastodon/src/main/java/org/joinmastodon/android/api/requests/search/GetSearchResults.java

@@ -4,13 +4,19 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.SearchResults;
 
 public class GetSearchResults extends MastodonAPIRequest<SearchResults>{
-	public GetSearchResults(String query, Type type, boolean resolve){
+	public GetSearchResults(String query, Type type, boolean resolve, String maxID, int offset, int count){
 		super(HttpMethod.GET, "/search", SearchResults.class);
 		addQueryParameter("q", query);
 		if(type!=null)
 			addQueryParameter("type", type.name().toLowerCase());
 		if(resolve)
 			addQueryParameter("resolve", "true");
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(offset>0)
+			addQueryParameter("offset", String.valueOf(offset));
+		if(count>0)
+			addQueryParameter("limit", String.valueOf(count));
 	}
 
 	public GetSearchResults limit(int limit){

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

@@ -1,11 +1,13 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.TranslatedStatus;
+import org.joinmastodon.android.model.Translation;
 
-public class TranslateStatus extends MastodonAPIRequest<TranslatedStatus> {
-    public TranslateStatus(String id) {
-        super(HttpMethod.POST, "/statuses/"+id+"/translate", TranslatedStatus.class);
-        setRequestBody(new Object());
-    }
+import java.util.Map;
+
+public class TranslateStatus extends MastodonAPIRequest<Translation>{
+	public TranslateStatus(String id, String lang){
+		super(HttpMethod.POST, "/statuses/"+id+"/translate", Translation.class);
+		setRequestBody(Map.of("lang", lang));
+	}
 }

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetTag extends MastodonAPIRequest<Hashtag>{
+	public GetTag(String tag){
+		super(HttpMethod.GET, "/tags/"+tag, Hashtag.class);
+	}
+}

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class SetTagFollowed extends MastodonAPIRequest<Hashtag>{
+	public SetTagFollowed(String tag, boolean followed){
+		super(HttpMethod.POST, "/tags/"+tag+(followed ? "/follow" : "/unfollow"), Hashtag.class);
+		setRequestBody(new Object());
+	}
+}

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

@@ -6,9 +6,13 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.SharedPreferences;
 
+import androidx.annotation.StringRes;
+
 import com.google.gson.reflect.TypeToken;
 
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ContentType;
+import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
@@ -36,12 +40,15 @@ public class AccountLocalPreferences{
 	public String publishButtonText;
 	public String timelineReplyVisibility; // akkoma-only
 	public boolean keepOnlyLatestNotification;
-
 	public boolean emojiReactionsEnabled;
 	public ShowEmojiReactions showEmojiReactions;
+	public ColorPreference color;
+	public boolean likeIcon;
+	public ArrayList<Emoji> recentCustomEmoji;
 
-	private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
-	private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentLanguagesType=new TypeToken<ArrayList<String>>() {}.getType();
+	private final static Type timelinesType=new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
+	private final static Type recentCustomEmojiType=new TypeToken<ArrayList<Emoji>>() {}.getType();
 
 	public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		this.prefs=prefs;
@@ -66,6 +73,9 @@ public class AccountLocalPreferences{
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
 		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
+		color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
+		likeIcon=prefs.getBoolean("likeIcon", false);
+		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());
 	}
 
 	public long getNotificationsPauseEndTime(){
@@ -99,9 +109,36 @@ public class AccountLocalPreferences{
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
 				.putString("showEmojiReactions", showEmojiReactions.name())
+				.putString("color", color.name())
+				.putBoolean("likeIcon", likeIcon)
+				.putString("recentCustomEmoji", gson.toJson(recentCustomEmoji))
 				.apply();
 	}
 
+	public enum ColorPreference{
+		MATERIAL3,
+		PINK,
+		PURPLE,
+		GREEN,
+		BLUE,
+		BROWN,
+		RED,
+		YELLOW;
+
+		public @StringRes int getName() {
+			return switch(this){
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case RED -> R.string.sk_color_palette_red;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+			};
+		}
+	}
+
 	public enum ShowEmojiReactions{
 		HIDE_EMPTY,
 		ONLY_OPENED,

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

@@ -40,7 +40,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -219,7 +218,7 @@ public class AccountSession{
 
 	public void savePreferencesIfPending(){
 		if(preferencesNeedSaving){
-			new UpdateAccountCredentialsPreferences(preferences, null, null)
+			new UpdateAccountCredentialsPreferences(preferences, null, self.discoverable, self.source.indexable)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Account result){
@@ -255,52 +254,66 @@ public class AccountSession{
 		filterStatusContainingObjects(objects, extractor, context, null);
 	}
 
-	public <T> void filterStatusContainingObjects(List<T> objects, Function<T, Status> extractor, FilterContext context, Account profile){
-		Predicate<Status> statusIsOnOwnProfile = (s) -> self != null && profile != null && s.account != null
+	private boolean statusIsOnOwnProfile(Status s, Account profile){
+		return self != null && profile != null && s.account != null
 				&& Objects.equals(self.id, profile.id) && Objects.equals(self.id, s.account.id);
+	}
 
-		if(getLocalPreferences().serverSideFiltersSupported){
-			// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
-			objects.removeIf(o->{
-				Status s=extractor.apply(o);
-				if(s==null)
-					return false;
-				if(s.filtered==null)
-					return false;
-				// don't hide own posts in own profile
-				if (statusIsOnOwnProfile.test(s))
-					return false;
-				for(FilterResult filter:s.filtered){
-					if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
-						return true;
-				}
-				return false;
-			});
-			return;
-		}
-		if(wordFilters==null)
-			return;
-		for(T obj:objects){
+	private boolean isFilteredType(Status s){
+		return (!localPreferences.showReplies && s.inReplyToId != null)
+				|| (!localPreferences.showBoosts && s.reblog != null);
+	}
+
+	public <T> void filterStatusContainingObjects(List<T> objects, Function<T, Status> extractor, FilterContext context, Account profile){
+		if(!localPreferences.serverSideFiltersSupported) for(T obj:objects){
 			Status s=extractor.apply(obj);
 			if(s!=null && s.filtered!=null){
-				getLocalPreferences().serverSideFiltersSupported=true;
-				getLocalPreferences().save();
-				return;
+				localPreferences.serverSideFiltersSupported=true;
+				localPreferences.save();
 			}
 		}
-		objects.removeIf(o->{
-			Status s=extractor.apply(o);
-			if(s==null)
-				return false;
-			// don't hide own posts in own profile
-			if (statusIsOnOwnProfile.test(s))
-				return false;
-			for(LegacyFilter filter:wordFilters){
+
+		List<T> removeUs=new ArrayList<>();
+		for(int i=0; i<objects.size(); i++){
+			T o=objects.get(i);
+			if(filterStatusContainingObject(o, extractor, context, profile)){
+				Status s=extractor.apply(o);
+				removeUs.add(o);
+				if(s!=null && s.hasGapAfter && i > 0){
+					Status prev=extractor.apply(objects.get(i - 1));
+					if(prev!=null) prev.hasGapAfter=true;
+				}
+			}
+		}
+		objects.removeAll(removeUs);
+	}
+
+	public <T> boolean filterStatusContainingObject(T object, Function<T, Status> extractor, FilterContext context, Account profile){
+		Status s=extractor.apply(object);
+		if(s==null)
+			return false;
+		// don't hide own posts in own profile
+		if(statusIsOnOwnProfile(s, profile))
+			return false;
+		if(isFilteredType(s) && (context == FilterContext.HOME || context == FilterContext.PUBLIC))
+			return true;
+		// Even with server-side filters, clients are expected to remove statuses that match a filter that hides them
+		if(localPreferences.serverSideFiltersSupported){
+			for(FilterResult filter : s.filtered){
+				if(filter.filter.isActive() && filter.filter.filterAction==FilterAction.HIDE)
+					return true;
+			}
+		}else if(wordFilters!=null){
+			for(LegacyFilter filter : wordFilters){
 				if(filter.context.contains(context) && filter.matches(s) && filter.isActive())
 					return true;
 			}
-			return false;
-		});
+		}
+		return false;
+	}
+
+	public void updateAccountInfo(){
+		AccountSessionManager.getInstance().updateSessionLocalInfo(this);
 	}
 
 	public Optional<Instance> getInstance() {

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

@@ -303,8 +303,7 @@ public class AccountSessionManager{
 		}
 	}
 
-
-	private void updateSessionLocalInfo(AccountSession session){
+	/*package*/ void updateSessionLocalInfo(AccountSession session){
 		new GetOwnAccount()
 				.setCallback(new Callback<>(){
 					@Override

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

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

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

@@ -97,7 +97,7 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Announcement> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 
 						// get unread items first
 						List<Announcement> data = result.stream().filter(a -> !a.read).collect(toList());

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

@@ -9,7 +9,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -22,6 +21,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
+import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
@@ -29,7 +29,9 @@ import org.joinmastodon.android.model.DisplayItemsParent;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.EmojiReactionsStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
@@ -55,6 +57,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -86,6 +89,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected Rect tmpRect=new Rect();
 	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
 	protected boolean currentlyScrolling;
+	protected String maxID;
 
 	public BaseStatusListFragment(){
 		super(20);
@@ -152,6 +156,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	protected String getMaxID(){
+		if(refreshing) return null;
+		if(maxID!=null) return maxID;
 		if(!preloadedData.isEmpty())
 			return preloadedData.get(preloadedData.size()-1).getID();
 		else if(!data.isEmpty())
@@ -160,6 +166,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			return null;
 	}
 
+	protected boolean applyMaxID(List<Status> result){
+		boolean empty=result.isEmpty();
+		if(!empty) maxID=result.get(result.size()-1).id;
+		return !empty;
+	}
+
 	protected abstract List<StatusDisplayItem> buildDisplayItems(T s);
 	protected abstract void addAccountToKnown(T s);
 
@@ -555,12 +567,12 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			// to do this if the media grid is not bound, tho - so, doing it ourselves here
 			status.sensitiveRevealed = !status.sensitiveRevealed;
 		}
-		holder.rebind();
+		if(holder.getItem().hasVisibilityToggle) holder.animateVisibilityToggle(false);
 	}
 
 	public void onSensitiveRevealed(MediaGridStatusDisplayItem.Holder holder) {
 		HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-		if(header != null) header.rebind();
+		if(header != null && header.getItem().hasVisibilityToggle) header.animateVisibilityToggle(true);
 	}
 
 	protected void toggleSpoiler(Status status, String itemID){
@@ -772,6 +784,61 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
 	}
 
+	public void togglePostTranslation(Status status, String itemID){
+		switch(status.translationState){
+			case LOADING -> {
+				return;
+			}
+			case SHOWN -> {
+				status.translationState=Status.TranslationState.HIDDEN;
+			}
+			case HIDDEN -> {
+				if(status.translation!=null){
+					status.translationState=Status.TranslationState.SHOWN;
+				}else{
+					status.translationState=Status.TranslationState.LOADING;
+					new TranslateStatus(status.getContentStatus().id, Locale.getDefault().getLanguage())
+							.setCallback(new Callback<>(){
+								@Override
+								public void onSuccess(Translation result){
+									if(getActivity()==null)
+										return;
+									status.translation=result;
+									status.translationState=Status.TranslationState.SHOWN;
+									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+									if(text!=null){
+										text.updateTranslation(true);
+										imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+									}
+								}
+
+								@Override
+								public void onError(ErrorResponse error){
+									if(getActivity()==null)
+										return;
+									status.translationState=Status.TranslationState.HIDDEN;
+									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+									if(text!=null){
+										text.updateTranslation(true);
+									}
+									new M3AlertDialogBuilder(getActivity())
+											.setTitle(R.string.error)
+											.setMessage(R.string.translation_failed)
+											.setPositiveButton(R.string.ok, null)
+											.show();
+								}
+							})
+							.exec(accountID);
+				}
+			}
+		}
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null){
+			text.updateTranslation(true);
+			imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
+		}
+	}
+
 	public void rebuildAllDisplayItems(){
 		displayItems.clear();
 		for(T item:data){
@@ -787,7 +854,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		if(getContext()==null) return;
 		super.onDataLoaded(d, more);
 		// more available, but the page isn't even full yet? seems wrong, let's load some more
-		if(more && d.size() < itemsPerPage){
+		if(more && data.size() < itemsPerPage){
 			preloader.onScrolledToLastItem();
 		}
 	}

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

@@ -28,7 +28,7 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else

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

@@ -29,6 +29,7 @@ import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
+import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -161,7 +162,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton, scheduleTimeBtn;
-	private PopupMenu languagePopup, contentTypePopup, visibilityPopup, draftOptionsPopup;
+	private PopupMenu contentTypePopup, visibilityPopup, draftOptionsPopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, draftsBtn, scheduleDraftDismiss, contentTypeBtn;
 	private View sensitiveBtn;
 	private TextView replyText;
@@ -293,7 +294,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
-		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain);
+		emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), accountID, customEmojis, instanceDomain);
 		emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
 			@Override
 			public void onEmojiSelected(Emoji emoji){
@@ -826,6 +827,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		publishButton = wrap.findViewById(R.id.publish_btn);
 		languageButton = wrap.findViewById(R.id.language_btn);
 		languageButton.setOnClickListener(v->showLanguageAlert());
+		languageButton.setOnLongClickListener(v->{
+			languageButton.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+			if(!getLocalPrefs().bottomEncoding){
+				getLocalPrefs().bottomEncoding=true;
+				getLocalPrefs().save();
+			}
+			return false;
+		});
 
 		publishButton.setOnClickListener(v -> {
 			if(GlobalUserPreferences.altTextReminders && editingStatus==null)
@@ -1308,7 +1317,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		boolean usePhotoPicker=photoPicker && UiUtils.isPhotoPickerAvailable();
 		if(usePhotoPicker){
 			intent=new Intent(MediaStore.ACTION_PICK_IMAGES);
-			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
+			if(mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount()>1)
+				intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, mediaViewController.getMaxAttachments()-mediaViewController.getMediaAttachmentsCount());
 		}else{
 			intent=new Intent(Intent.ACTION_GET_CONTENT);
 			intent.addCategory(Intent.CATEGORY_OPENABLE);

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

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

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

@@ -169,7 +169,7 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
     }
 
     private void updateOptionsMenu() {
-        if (getActivity() == null) return;
+        if(getActivity()==null) return;
         optionsMenu.clear();
         timelineByMenuItem.clear();
 
@@ -239,16 +239,21 @@ public class EditTimelinesFragment extends MastodonRecyclerFragment<TimelineDefi
 
     private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags) {
         if (tags == null || tags.isEmpty()) return false;
-        editText.setText(String.join(",", tags));
-        editText.chipifyAllUnterminatedTokens();
+		editText.setText(tags);
+		editText.chipifyAllUnterminatedTokens();
         return true;
     }
 
     private NachoTextView prepareChipTextView(NachoTextView nacho) {
-        nacho.addChipTerminator(',', BEHAVIOR_CHIPIFY_ALL);
-        nacho.addChipTerminator('\n', BEHAVIOR_CHIPIFY_ALL);
-        nacho.addChipTerminator(' ', BEHAVIOR_CHIPIFY_ALL);
-        nacho.addChipTerminator(';', BEHAVIOR_CHIPIFY_ALL);
+		//I’ll Be Back
+		nacho.setChipTerminators(
+				Map.of(
+						',', BEHAVIOR_CHIPIFY_ALL,
+						'\n', BEHAVIOR_CHIPIFY_ALL,
+						' ', BEHAVIOR_CHIPIFY_ALL,
+						';', BEHAVIOR_CHIPIFY_ALL
+				)
+		);
         nacho.enableEditChipOnTouch(true, true);
         nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens());
         return nacho;

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

@@ -27,7 +27,7 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else

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

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

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

@@ -83,7 +83,7 @@ public class FollowRequestsListFragment extends MastodonRecyclerFragment<FollowR
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Account> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else

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

@@ -56,7 +56,7 @@ public class FollowedHashtagsFragment extends MastodonRecyclerFragment<Hashtag>
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(HeaderPaginationList<Hashtag> result){
-                        if (getActivity() == null) return;
+                        if(getActivity()==null) return;
                         if(result.nextPageUri!=null)
                             nextMaxID=result.nextPageUri.getQueryParameter("max_id");
                         else
@@ -121,7 +121,7 @@ public class FollowedHashtagsFragment extends MastodonRecyclerFragment<Hashtag>
 
         @Override
         public void onClick() {
-            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
+            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name);
         }
     }
 }

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

@@ -1,46 +1,65 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
 import android.view.HapticFeedbackConstants;
 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 android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.tags.GetHashtag;
-import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
+import org.joinmastodon.android.api.MastodonErrorResponse;
+import org.joinmastodon.android.api.requests.tags.GetTag;
+import org.joinmastodon.android.api.requests.tags.SetTagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
-import org.joinmastodon.android.events.HashtagUpdatedEvent;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.TimelineDefinition;
+import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
+import org.joinmastodon.android.ui.views.ProgressBarButton;
+import org.parceler.Parcels;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
+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.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
-public class HashtagTimelineFragment extends PinnableStatusListFragment {
-	private String hashtag;
+public class HashtagTimelineFragment extends PinnableStatusListFragment{
+	private Hashtag hashtag;
+	private String hashtagName;
+	private TextView headerTitle, headerSubtitle;
+	private ProgressBarButton followButton;
+	private ProgressBar followProgress;
+	private MenuItem followMenuItem, pinMenuItem;
+	private boolean followRequestRunning;
+	private boolean toolbarContentVisible;
+
 	private List<String> any;
 	private List<String> all;
 	private List<String> none;
 	private boolean following;
 	private boolean localOnly;
-	private MenuItem followButton;
+	private Menu optionsMenu;
+	private MenuInflater optionsMenuInflater;
 
 	@Override
 	protected boolean wantsComposeButton() {
@@ -50,89 +69,36 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		updateTitle(getArguments().getString("hashtag"));
 		following=getArguments().getBoolean("following", false);
 		localOnly=getArguments().getBoolean("localOnly", false);
 		any=getArguments().getStringArrayList("any");
 		all=getArguments().getStringArrayList("all");
 		none=getArguments().getStringArrayList("none");
-		setHasOptionsMenu(true);
-	}
-
-	private void updateTitle(String hashtagName) {
-		hashtag = hashtagName;
-		setTitle('#'+hashtag);
-	}
-
-	private void updateFollowingState(boolean newFollowing) {
-		this.following = newFollowing;
-		followButton.setTitle(getString(newFollowing ? R.string.unfollow_user : R.string.follow_user, "#" + hashtag));
-		followButton.setIcon(newFollowing ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
-		E.post(new HashtagUpdatedEvent(hashtag, following));
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.hashtag_timeline, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-		followButton = menu.findItem(R.id.follow_hashtag);
-		updateFollowingState(following);
-
-		new GetHashtag(hashtag).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Hashtag hashtag) {
-				if (getActivity() == null) return;
-				updateTitle(hashtag.name);
-				updateFollowingState(hashtag.following);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (super.onOptionsItemSelected(item)) return true;
-		if (item.getItemId() == R.id.follow_hashtag) {
-			updateFollowingState(!following);
-			getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
-			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
-				@Override
-				public void onSuccess(Hashtag i) {
-					if (getActivity() == null) return;
-					if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
-					updateFollowingState(i.following);
-				}
-
-				@Override
-				public void onError(ErrorResponse error) {
-					error.showToast(getActivity());
-					updateFollowingState(!following);
-				}
-			}).exec(accountID);
-			return true;
+		if(getArguments().containsKey("hashtag")){
+			hashtag=Parcels.unwrap(getArguments().getParcelable("hashtag"));
+			hashtagName=hashtag.name;
+		}else{
+			hashtagName=getArguments().getString("hashtagName");
 		}
-		return false;
+		setTitle('#'+hashtagName);
+		setHasOptionsMenu(true);
 	}
 
 	@Override
 	protected TimelineDefinition makeTimelineDefinition() {
-		return TimelineDefinition.ofHashtag(hashtag);
+		return TimelineDefinition.ofHashtag(hashtagName);
 	}
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetHashtagTimeline(hashtagName, getMaxID(), null, count, any, all, none, localOnly, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
-						onDataLoaded(result, !result.isEmpty());
+						if(getActivity()==null) return;
+						boolean more=applyMaxID(result);
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, more);
 					}
 				})
 				.exec(accountID);
@@ -146,15 +112,40 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	}
 
 	@Override
-	public boolean onFabLongClick(View v) {
-		return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' ');
+	public void loadData(){
+		reloadTag();
+		super.loadData();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setOnClickListener(this::onFabClick);
+
+		if(getParentFragment() instanceof HomeTabFragment) return;
+
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				View topChild=recyclerView.getChildAt(0);
+				int firstChildPos=recyclerView.getChildAdapterPosition(topChild);
+				float newAlpha=firstChildPos>0 ? 1f : Math.min(1f, -topChild.getTop()/(float)headerTitle.getHeight());
+				toolbarTitleView.setAlpha(newAlpha);
+				boolean newToolbarVisibility=newAlpha>0.5f;
+				if(newToolbarVisibility!=toolbarContentVisible){
+					toolbarContentVisible=newToolbarVisibility;
+					createOptionsMenu();
+				}
+			}
+		});
 	}
 
 	@Override
 	public void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putString("prefilledText", '#'+hashtag+' ');
+		args.putString("prefilledText", '#'+hashtagName+' ');
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
@@ -170,6 +161,202 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 
 	@Override
 	public Uri getWebUri(Uri.Builder base) {
-		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags") + hashtag).build();
+		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags/") + hashtag).build();
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		View header=getActivity().getLayoutInflater().inflate(R.layout.header_hashtag_timeline, list, false);
+		headerTitle=header.findViewById(R.id.title);
+		headerSubtitle=header.findViewById(R.id.subtitle);
+		followButton=header.findViewById(R.id.profile_action_btn);
+		followProgress=header.findViewById(R.id.action_progress);
+
+		headerTitle.setText("#"+hashtagName);
+		followButton.setVisibility(View.GONE);
+		followButton.setOnClickListener(v->{
+			if(hashtag==null)
+				return;
+			setFollowed(!hashtag.following);
+		});
+		followButton.setOnLongClickListener(v->{
+			if(hashtag==null) return false;
+			UiUtils.pickAccount(getActivity(), accountID, R.string.sk_follow_as, R.drawable.ic_fluent_person_add_28_regular, session -> {
+				new SetTagFollowed(hashtagName, true).setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag hashtag) {
+						Toast.makeText(
+								getActivity(),
+								getString(R.string.sk_followed_as, session.self.getShortUsername()),
+								Toast.LENGTH_SHORT
+						).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(getActivity());
+					}
+				}).exec(session.getID());
+			}, null);
+			return true;
+		});
+		updateHeader();
+
+		MergeRecyclerAdapter mergeAdapter=new MergeRecyclerAdapter();
+		if(!(getParentFragment() instanceof HomeTabFragment)){
+			mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(header));
+		}
+		mergeAdapter.addAdapter(super.getAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	protected int getMainAdapterOffset(){
+		return 1;
+	}
+
+	private void createOptionsMenu(){
+		optionsMenu.clear();
+		optionsMenuInflater.inflate(R.menu.hashtag_timeline, optionsMenu);
+		followMenuItem=optionsMenu.findItem(R.id.follow_hashtag);
+		pinMenuItem=optionsMenu.findItem(R.id.pin);
+		followMenuItem.setVisible(toolbarContentVisible);
+		pinMenuItem.setShowAsAction(toolbarContentVisible ? MenuItem.SHOW_AS_ACTION_NEVER : MenuItem.SHOW_AS_ACTION_ALWAYS);
+		super.updatePinButton(pinMenuItem);
+		if(toolbarContentVisible){
+			UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu);
+		}else{
+			UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu, R.id.pin);
+		}
+	}
+
+	@Override
+	public void updatePinButton(MenuItem pin){
+		super.updatePinButton(pin);
+		if(toolbarContentVisible) UiUtils.insetPopupMenuIcon(getContext(), pin);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.hashtag_timeline, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+		optionsMenu=menu;
+		optionsMenuInflater=inflater;
+		createOptionsMenu();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		if (super.onOptionsItemSelected(item)) return true;
+		if (item.getItemId() == R.id.follow_hashtag && hashtag!=null) {
+			setFollowed(!hashtag.following);
+		}
+		return true;
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		toolbarTitleView.setAlpha(toolbarContentVisible ? 1f : 0f);
+		createOptionsMenu();
+	}
+
+	private void updateHeader(){
+		if(hashtag==null || getActivity()==null)
+			return;
+
+		if(hashtag.history!=null && !hashtag.history.isEmpty()){
+			int weekPosts=hashtag.history.stream().mapToInt(h->h.uses).sum();
+			int todayPosts=hashtag.history.get(0).uses;
+			int numAccounts=hashtag.history.stream().mapToInt(h->h.accounts).sum();
+			int hSpace=V.dp(8);
+			SpannableStringBuilder ssb=new SpannableStringBuilder();
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts, weekPosts, weekPosts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_participants, numAccounts, numAccounts));
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append('·');
+			ssb.append(" ", new SpacerSpan(hSpace, 0), 0);
+			ssb.append(getResources().getQuantityString(R.plurals.x_posts_today, todayPosts, todayPosts));
+			headerSubtitle.setText(ssb);
+		}
+
+		int styleRes;
+		followButton.setVisibility(View.VISIBLE);
+		if(hashtag.following){
+			followButton.setText(R.string.button_following);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
+		}else{
+			followButton.setText(R.string.button_follow);
+			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
+		}
+		TypedArray ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
+		followButton.setBackground(ta.getDrawable(0));
+		ta.recycle();
+		ta=followButton.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
+		followButton.setTextColor(ta.getColorStateList(0));
+		followProgress.setIndeterminateTintList(ta.getColorStateList(0));
+		ta.recycle();
+
+		followButton.setTextVisible(true);
+		followProgress.setVisibility(View.GONE);
+		if(followMenuItem!=null){
+			followMenuItem.setTitle(getString(hashtag.following ? R.string.unfollow_user : R.string.follow_user, "#"+hashtagName));
+			followMenuItem.setIcon(hashtag.following ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
+			UiUtils.insetPopupMenuIcon(getContext(), followMenuItem);
+		}
+	}
+
+	private void reloadTag(){
+		new GetTag(hashtagName)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						hashtag=result;
+						updateHeader();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+
+					}
+				})
+				.exec(accountID);
+	}
+
+	private void setFollowed(boolean followed){
+		if(followRequestRunning)
+			return;
+		getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+		followButton.setTextVisible(false);
+		followProgress.setVisibility(View.VISIBLE);
+		followRequestRunning=true;
+		new SetTagFollowed(hashtagName, followed)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(Hashtag result){
+						if(getActivity()==null)
+							return;
+						hashtag=result;
+						updateHeader();
+						followRequestRunning=false;
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						if(getActivity()==null)
+							return;
+						if(error instanceof MastodonErrorResponse er && "Duplicate record".equals(er.error)){
+							hashtag.following=true;
+						}else{
+							error.showToast(getActivity());
+						}
+						updateHeader();
+						followRequestRunning=false;
+					}
+				})
+				.exec(accountID);
 	}
 }

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

@@ -184,6 +184,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 				});
 			}
 		}
+		tabBar.selectTab(currentTab);
 
 		return content;
 	}

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

@@ -287,7 +287,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		new GetAnnouncements(false).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(List<Announcement> result) {
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				if (result.stream().anyMatch(a -> !a.read)) {
 					announcementsBadged = true;
 					announcements.setVisible(false);
@@ -381,7 +381,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 	}
 
 	private void updateOverflowMenu() {
-		if (getActivity() == null) return;
+		if(getActivity()==null) return;
 		Menu m = overflowPopup.getMenu();
 		m.clear();
 		overflowPopup.inflate(R.menu.home_overflow);
@@ -524,9 +524,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 			if (list.repliesPolicy != null) args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
 			Nav.go(getActivity(), ListTimelineFragment.class, args);
 		} else if ((hashtag = hashtagsItems.get(id)) != null) {
-			args.putString("hashtag", hashtag.name);
-			args.putBoolean("following", hashtag.following);
-			Nav.go(getActivity(), HashtagTimelineFragment.class, args);
+			UiUtils.openHashtagTimeline(getContext(), accountID, hashtag);
 		}
 		return true;
 	}

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

@@ -11,7 +11,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountLocalPreferences;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.FilterContext;
@@ -20,6 +19,7 @@ import org.joinmastodon.android.model.TimelineMarkers;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -49,16 +49,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 		loadData();
 	}
 
-	private boolean typeFilterPredicate(Status s) {
-		AccountLocalPreferences lp=getLocalPrefs();
-		return (lp.showReplies || s.inReplyToId == null) &&
-				(lp.showBoosts || s.reblog == null);
-	}
-
-	private List<Status> filterPosts(List<Status> items) {
-		return items.stream().filter(this::typeFilterPredicate).collect(Collectors.toList());
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
@@ -66,10 +56,11 @@ public class HomeTimelineFragment extends StatusListFragment {
 				.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);
+						if(getActivity()==null) return;
+						boolean empty=result.items.isEmpty();
 						maxID=result.maxID;
-						onDataLoaded(filteredItems, !result.items.isEmpty());
+						AccountSessionManager.get(accountID).filterStatuses(result.items, getFilterContext());
+						onDataLoaded(result.items, !empty);
 						if(result.isFromCache())
 							loadNewPosts();
 					}
@@ -142,23 +133,26 @@ public class HomeTimelineFragment extends StatusListFragment {
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
-						result = filterPosts(result);
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						Status last=result.get(result.size()-1);
 						List<Status> toAdd;
 						if(!data.isEmpty() && last.id.equals(data.get(0).id)){ // This part intersects with the existing one
-							toAdd=result.subList(0, result.size()-1); // Remove the already known last post
+							toAdd=new ArrayList<>(result.subList(0, result.size()-1)); // Remove the already known last post
 						}else{
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
+						List<String> existingIds=data.stream().map(Status::getID).collect(Collectors.toList());
+						toAdd.removeIf(s->existingIds.contains(s.getID()));
+						List<Status> toAddUnfiltered=new ArrayList<>(toAdd);
 						AccountSessionManager.get(accountID).filterStatuses(toAdd, getFilterContext());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							if (parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
+							if(parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
 						}
+						if(toAddUnfiltered.isEmpty())
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAddUnfiltered, false);
 					}
 
 					@Override

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

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

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

@@ -140,7 +140,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 				.setCallback(new SimpleCallback<>(this) {
 					@Override
 					public void onSuccess(List<ListTimeline> lists) {
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
 						userInList.putAll(userInListBefore);
 						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
@@ -149,7 +149,7 @@ public class ListsFragment extends MastodonRecyclerFragment<ListTimeline> implem
 						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
 							@Override
 							public void onSuccess(List<ListTimeline> allLists) {
-								if (getActivity() == null) return;
+								if(getActivity()==null) return;
 								List<ListTimeline> newLists = new ArrayList<>();
 								for (ListTimeline l : allLists) {
 									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);

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

@@ -254,7 +254,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		new GetFollowRequests(null, 1).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(HeaderPaginationList<Account> accounts) {
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
 			}
 

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

@@ -134,6 +134,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 							return;
 						maxID=result.maxID;
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
+						if(bannerHelper!=null) bannerHelper.onBannerBecameVisible();
 						reloadingFromCache=false;
 						if (getParentFragment() instanceof NotificationsFragment nf) {
 							nf.updateMarkAllReadButton();

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

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

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

@@ -23,7 +23,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.ImageSpan;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
 import android.transition.TransitionManager;
@@ -60,8 +59,10 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.account_list.BlockedAccountsListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
 import org.joinmastodon.android.fragments.account_list.FollowingListFragment;
+import org.joinmastodon.android.fragments.account_list.MutedAccountsListFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.fragments.settings.SettingsServerFragment;
 import org.joinmastodon.android.model.Account;
@@ -132,6 +133,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ImageView avatar;
 	private CoverImageView cover;
 	private View avatarBorder;
+	private View usernameWrap;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel;
 	private ImageView lockIcon, botIcon;
 	private ProgressBarButton actionButton, notifyButton;
@@ -232,6 +234,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		cover=content.findViewById(R.id.cover);
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
+		usernameWrap=content.findViewById(R.id.username_wrap);
 		username=content.findViewById(R.id.username);
 		lockIcon=content.findViewById(R.id.lock_icon);
 		botIcon=content.findViewById(R.id.bot_icon);
@@ -304,6 +307,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		tabbar.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant), UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary));
 		tabbar.setTabTextSize(V.dp(14));
+		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, (tab, position)->tab.setText(switch(position){
+			case 0 -> R.string.profile_featured;
+			case 1 -> R.string.profile_timeline;
+			case 2 -> R.string.profile_about;
+			default -> throw new IllegalStateException();
+		}));
 		tabLayoutMediator=new TabLayoutMediator(tabbar, pager, new TabLayoutMediator.TabConfigurationStrategy(){
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
@@ -317,6 +326,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				if (position == 4) tab.view.setVisibility(View.GONE);
 			}
 		});
+		tabbar.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
+			@Override
+			public void onTabSelected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+				if(getFragmentForPage(tab.getPosition()) instanceof ScrollableToTop stt)
+					stt.scrollToTop();
+			}
+		});
 
 		cover.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
@@ -460,7 +482,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(Account result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onAccountLoaded(result);
 					}
 				})
@@ -827,6 +849,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				args.putString("profileDisplayUsername", account.getDisplayUsername());
 			}
 			Nav.go(getActivity(), ListsFragment.class, args);
+		}else if(id==R.id.muted_accounts){
+			final Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), MutedAccountsListFragment.class, args);
+		}else if(id==R.id.blocked_accounts){
+			final Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("targetAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), BlockedAccountsListFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -862,7 +894,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void updateRelationship(){
-		if (getActivity() == null) return;
+		if(getActivity()==null) return;
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
 		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);
@@ -1084,7 +1116,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		name.setVisibility(View.GONE);
 		rolesView.setVisibility(View.GONE);
-		username.setVisibility(View.GONE);
+		usernameWrap.setVisibility(View.GONE);
 		bio.setVisibility(View.GONE);
 		countersLayout.setVisibility(View.GONE);
 
@@ -1133,7 +1165,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEditWrap.setVisibility(View.GONE);
 		name.setVisibility(View.VISIBLE);
 		rolesView.setVisibility(View.VISIBLE);
-		username.setVisibility(View.VISIBLE);
+		usernameWrap.setVisibility(View.VISIBLE);
 		bio.setVisibility(View.VISIBLE);
 		countersLayout.setVisibility(View.VISIBLE);
 		refreshLayout.setEnabled(true);
@@ -1159,7 +1191,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 						savingEdits=false;
 						account=result;
 						AccountSessionManager.getInstance().updateAccountInfo(accountID, account);
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						exitEditMode();
 						setActionProgressVisible(false);
 					}
@@ -1304,9 +1336,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=tabViews[viewType];
-			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
-			view.setVisibility(View.VISIBLE);
+			FrameLayout view=new FrameLayout(parent.getContext());
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
@@ -1314,8 +1344,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
 			Fragment fragment=getFragmentForPage(position);
+			FrameLayout fragmentView=tabViews[position];
+			fragmentView.setVisibility(View.VISIBLE);
+			if(fragmentView.getParent() instanceof ViewGroup parent)
+				parent.removeView(fragmentView);
+			((FrameLayout)holder.itemView).addView(fragmentView);
 			if(!fragment.isAdded()){
-				getChildFragmentManager().beginTransaction().add(holder.itemView.getId(), fragment).commit();
+				getChildFragmentManager().beginTransaction().add(fragmentView.getId(), fragment).commit();
 				holder.itemView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 					@Override
 					public boolean onPreDraw(){

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

@@ -129,7 +129,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
 							nextMaxID=null;
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onDataLoaded(result, nextMaxID!=null);
 					}
 				})

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

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

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

@@ -48,8 +48,8 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
 						Collections.sort(result, Comparator.comparing((Status s)->s.createdAt).reversed());
-						if (getActivity() == null) return;
 						onDataLoaded(result, false);
 					}
 				})

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

@@ -42,10 +42,12 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		boolean isMainThreadStatus = this instanceof ThreadFragment t && s.id.equals(t.mainStatus.id);
 		int flags = 0;
 		AccountLocalPreferences lp=getLocalPrefs();
-		if (GlobalUserPreferences.spectatorMode)
+		if(GlobalUserPreferences.spectatorMode)
 			flags |= StatusDisplayItem.FLAG_NO_FOOTER;
-		if (!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
+		if(!lp.emojiReactionsEnabled || lp.showEmojiReactions==ONLY_OPENED)
 			flags |= StatusDisplayItem.FLAG_NO_EMOJI_REACTIONS;
+		if(GlobalUserPreferences.translateButtonOpenedOnly)
+			flags |= StatusDisplayItem.FLAG_NO_TRANSLATE;
 		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, getFilterContext(), isMainThreadStatus ? 0 : flags);
 	}
 

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

@@ -13,8 +13,8 @@ import org.joinmastodon.android.GlobalUserPreferences.AutoRevealMode;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
-import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.FilterContext;
@@ -24,13 +24,13 @@ import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.SpoilerStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.ArrayDeque;
@@ -105,6 +105,12 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 					text.textSelectable=true;
 				else if(item instanceof FooterStatusDisplayItem footer)
 					footer.hideCounts=true;
+				else if(item instanceof SpoilerStatusDisplayItem spoiler){
+					for(StatusDisplayItem subItem:spoiler.contentItems){
+						if(subItem instanceof TextStatusDisplayItem text)
+							text.textSelectable=true;
+					}
+				}
 			}
 		}
     
@@ -188,8 +194,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 		// TODO: figure out how this code works
 		if (isInstanceAkkoma()) sortStatusContext(mainStatus, result);
 
-		result.descendants=filterStatuses(result.descendants);
-		result.ancestors=filterStatuses(result.ancestors);
+		filterStatuses(result.descendants);
+		filterStatuses(result.ancestors);
 		restoreStatusStates(result.descendants, oldData);
 		restoreStatusStates(result.ancestors, oldData);
 
@@ -325,11 +331,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				.collect(Collectors.toList());
 	}
 
-	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,getFilterContext());
-		return statuses.stream()
-				.filter(statusFilterPredicate)
-				.collect(Collectors.toList());
+	private void filterStatuses(List<Status> statuses){
+		AccountSessionManager.get(accountID).filterStatuses(statuses, getFilterContext());
 	}
 
 	@Override

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

@@ -83,7 +83,7 @@ public abstract class BaseAccountListFragment extends MastodonRecyclerFragment<A
 						for(Relationship rel:result){
 							relationships.put(rel.id, rel);
 						}
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						if(list==null)
 							return;
 						for(int i=0;i<list.getChildCount();i++){

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

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountBlocks;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class BlockedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_blocked_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountBlocks(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/blocks").build();
+	}
+}

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

@@ -48,7 +48,7 @@ public class ComposeAccountSearchFragment extends BaseAccountListFragment{
 	@Override
 	protected void doLoadData(int offset, int count){
 		refreshing=true;
-		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false)
+		currentRequest=new GetSearchResults(currentQuery, GetSearchResults.Type.ACCOUNTS, false, null, 0, 0)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(SearchResults result){

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

@@ -0,0 +1,36 @@
+package org.joinmastodon.android.fragments.account_list;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
+import org.joinmastodon.android.api.requests.accounts.GetAccountMutes;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.viewholders.AccountViewHolder;
+
+public class MutedAccountsListFragment extends AccountRelatedAccountListFragment{
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.sk_muted_accounts);
+	}
+
+	@Override
+	public HeaderPaginationRequest<Account> onCreateRequest(String maxID, int count){
+		return new GetAccountMutes(maxID, count);
+	}
+
+	@Override
+	protected void onConfigureViewHolder(AccountViewHolder holder){
+		super.onConfigureViewHolder(holder);
+		holder.setStyle(AccountViewHolder.AccessoryType.NONE, false);
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return super.getWebUri(base).buildUpon()
+				.appendPath("/mutes").build();
+	}
+}

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

@@ -133,7 +133,7 @@ public abstract class PaginatedAccountListFragment<T> extends BaseAccountListFra
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
 							nextMaxID=null;
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						List<AccountViewModel> items = result.stream()
 								.filter(a -> d.size() > 1000 || d.stream()
 										.noneMatch(i -> i.account.url.equals(a.url)))

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

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

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

@@ -77,7 +77,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<FollowSuggestion> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null) return;
 						onDataLoaded(result.stream().map(fs->new AccountWrapper(fs.account)).collect(Collectors.toList()), false);
 						loadRelationships();
 					}
@@ -112,7 +112,7 @@ public class DiscoverAccountsFragment extends MastodonRecyclerFragment<DiscoverA
 			public void onSuccess(List<Relationship> result){
 				relationshipsRequest=null;
 				relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity()));
-				if (getActivity() == null) return;
+				if(getActivity()==null) return;
 				if(list==null)
 					return;
 				for(int i=0;i<list.getChildCount();i++){

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

@@ -289,15 +289,19 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
-			view.setVisibility(View.VISIBLE);
+			FrameLayout view=new FrameLayout(parent.getContext());
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
 
 		@Override
-		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){}
+		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
+			FrameLayout view=tabViews[position];
+			if(view.getParent() instanceof ViewGroup parent)
+				parent.removeView(view);
+			view.setVisibility(View.VISIBLE);
+			((FrameLayout)holder.itemView).addView(view, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		}
 
 		@Override
 		public int getItemCount(){

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

@@ -4,6 +4,7 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
@@ -17,6 +18,7 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 
 public class DiscoverPostsFragment extends StatusListFragment{
 	private DiscoverInfoBannerHelper bannerHelper;
+	private int offset;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -25,12 +27,17 @@ public class DiscoverPostsFragment extends StatusListFragment{
 	}
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int o, int count){
+		if(refreshing) offset=0;
 		currentRequest=new GetTrendingStatuses(offset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						onDataLoaded(result, !result.isEmpty());
+						if(getActivity()==null) return;
+						boolean empty=result.isEmpty();
+						offset+=result.size();
+						AccountSessionManager.get(accountID).filterStatuses(result, getFilterContext());
+						onDataLoaded(result, !empty);
 						bannerHelper.onBannerBecameVisible();
 					}
 				}).exec(accountID);

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

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

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

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

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

@@ -23,7 +23,6 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HashtagStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
@@ -31,7 +30,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
@@ -97,7 +96,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();
@@ -113,7 +112,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	}
 
 	@Override
-	protected void doLoadData(int offset, int count){
+	protected void doLoadData(int _offset, int count){
 		GetSearchResults.Type type;
 		if(currentFilter.size()==1){
 			type=switch(currentFilter.iterator().next()){
@@ -128,7 +127,21 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			dataLoaded();
 			return;
 		}
-		currentRequest=new GetSearchResults(currentQuery, type, true)
+		String maxID=null;
+		// TODO server-side bug
+		/*int offset=0;
+		if(_offset>0){
+			if(type==GetSearchResults.Type.STATUSES){
+				if(!preloadedData.isEmpty())
+					maxID=preloadedData.get(preloadedData.size()-1).status.id;
+				else if(!data.isEmpty())
+					maxID=data.get(data.size()-1).status.id;
+			}else{
+				offset=_offset;
+			}
+		}*/
+		int offset=_offset;
+		currentRequest=new GetSearchResults(currentQuery, type, type==null, maxID, offset, type==null ? 0 : count)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(SearchResults result){
@@ -142,12 +155,15 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 								results.add(new SearchResult(tag));
 						}
 						if(result.statuses!=null){
-							for(Status status:result.statuses)
-								results.add(new SearchResult(status));
+							Set<String> alreadyLoadedStatuses=data.stream().filter(r->r.type==SearchResult.Type.STATUS).map(r->r.status.id).collect(Collectors.toSet());
+							for(Status status:result.statuses){
+								if(!alreadyLoadedStatuses.contains(status.id))
+									results.add(new SearchResult(status));
+							}
 						}
 						prevDisplayItems=new ArrayList<>(displayItems);
 						unfilteredResults=results;
-						onDataLoaded(filterSearchResults(results), false);
+						onDataLoaded(filterSearchResults(results), type!=null && !results.isEmpty());
 					}
 
 					@Override

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

@@ -122,7 +122,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 				recentsHeader.setVisible(!data.isEmpty());
 			});
 		}else{
-			currentRequest=new GetSearchResults(currentQuery, null, false)
+			currentRequest=new GetSearchResults(currentQuery, null, false, null, 0, 0)
 					.limit(2)
 					.setCallback(new SimpleCallback<>(this){
 						@Override
@@ -378,7 +378,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 
 	private void openHashtag(SearchResult res){
 		wrapSuicideDialog(()->{
-			UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag);
 			AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putRecentSearch(res);
 		});
 	}
@@ -424,6 +424,8 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onSearchViewEnter(){
+		if(TextUtils.isEmpty(currentQuery) || currentQuery.trim().isEmpty())
+			return;
 		wrapSuicideDialog(()->deliverResult(currentQuery, null));
 	}
 
@@ -436,7 +438,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 			String q=searchViewHelper.getQuery();
 			if(q.startsWith("#"))
 				q=q.substring(1);
-			UiUtils.openHashtagTimeline(getActivity(), accountID, q, null);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, q);
 		});
 	}
 

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

@@ -105,7 +105,7 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 
 		@Override
 		public void onClick(){
-			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, item);
 		}
 	}
 }

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

@@ -165,9 +165,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 	private void tryGetAccount(){
 		if(AccountSessionManager.getInstance().tryGetAccount(accountID)==null){
 			uiHandler.removeCallbacks(pollRunnable);
-			getActivity().finish();
-			Intent intent=new Intent(getActivity(), MainActivity.class);
-			startActivity(intent);
+			((MainActivity)getActivity()).restartHomeFragment();
 			return;
 		}
 		currentRequest=new GetOwnAccount()

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

@@ -271,7 +271,7 @@ public class SignupFragment extends ToolbarFragment{
 						@Override
 						public void tail(Node node, int depth){
 							if(node instanceof Element){
-								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+								ssb.setSpan(new LinkSpan("", SignupFragment.this::onGoBackLinkClick, LinkSpan.Type.CUSTOM, null, null, null), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 								ssb.setSpan(new TypefaceSpan("sans-serif-medium"), spanStart, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 							}
 						}

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

@@ -83,10 +83,11 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAccountStatuses(reportAccount.id, offset>0 ? getMaxID() : null, null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
+		currentRequest=new GetAccountStatuses(reportAccount.id, getMaxID(), null, count, GetAccountStatuses.Filter.OWN_POSTS_AND_REPLIES)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
+						if(getActivity()==null) return;
 						for(Status s:result){
 							s.sensitive=true;
 						}

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

@@ -33,7 +33,7 @@ public class SettingsAboutAppFragment extends BaseSettingsFragment<Void>{
 		setTitle(getString(R.string.about_app, getString(R.string.sk_app_name)));
 		AccountSession s=AccountSessionManager.get(accountID);
 		onDataLoaded(List.of(
-				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.openHashtagTimeline(getActivity(), accountID, getString(R.string.donate_hashtag), null)),
+				new ListItem<>(R.string.sk_settings_donate, 0, R.drawable.ic_fluent_heart_24_regular, ()->UiUtils.openHashtagTimeline(getActivity(), accountID, getString(R.string.donate_hashtag))),
 				new ListItem<>(R.string.sk_settings_contribute, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.repo_url))),
 				new ListItem<>(R.string.settings_tos, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+s.domain+"/terms")),
 				new ListItem<>(R.string.settings_privacy_policy, 0, R.drawable.ic_fluent_open_24_regular, ()->UiUtils.launchWebBrowser(getActivity(), getString(R.string.privacy_policy_url)), 0, true),

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

@@ -17,6 +17,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountLocalPreferences;
+import org.joinmastodon.android.api.session.AccountLocalPreferences.ColorPreference;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusDisplaySettingsChangedEvent;
@@ -37,7 +38,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	private CheckableListItem<Void> revealCWsItem, hideSensitiveMediaItem, interactionCountsItem, emojiInNamesItem;
 
 	// MEGALODON
-	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem;
+	private CheckableListItem<Void> trueBlackModeItem, marqueeItem, disableSwipeItem, reduceMotionItem, altIndicatorItem, noAltIndicatorItem, collapsePostsItem, spectatorModeItem, hideFabItem, translateOpenedItem, disablePillItem, showNavigationLabelsItem, likeIconItem;
 	private ListItem<Void> colorItem, publishTextItem, autoRevealCWsItem;
 	private CheckableListItem<Void> pronounsInUserListingsItem, pronounsInTimelinesItem, pronounsInThreadsItem;
 
@@ -69,6 +70,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				hideFabItem=new CheckableListItem<>(R.string.sk_settings_hide_fab, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.autoHideFab, R.drawable.ic_fluent_edit_24_regular, ()->toggleCheckableItem(hideFabItem)),
 				translateOpenedItem=new CheckableListItem<>(R.string.sk_settings_translate_only_opened, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.translateButtonOpenedOnly, R.drawable.ic_fluent_translate_24_regular, ()->toggleCheckableItem(translateOpenedItem)),
 				disablePillItem=new CheckableListItem<>(R.string.sk_disable_pill_shaped_active_indicator, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.disableM3PillActiveIndicator, R.drawable.ic_fluent_pill_24_regular, ()->toggleCheckableItem(disablePillItem)),
+				likeIconItem=new CheckableListItem<>(R.string.sk_settings_like_icon, 0, CheckableListItem.Style.SWITCH, lp.likeIcon, R.drawable.ic_fluent_heart_24_regular, ()->toggleCheckableItem(likeIconItem)),
 				showNavigationLabelsItem=new CheckableListItem<>(R.string.sk_settings_show_labels_in_navigation_bar, 0, CheckableListItem.Style.SWITCH, GlobalUserPreferences.showNavigationLabels, R.drawable.ic_fluent_tag_24_regular, ()->toggleCheckableItem(showNavigationLabelsItem), true),
 				pronounsInTimelinesItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_timelines, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInTimelines, 0, ()->toggleCheckableItem(pronounsInTimelinesItem)),
 				pronounsInThreadsItem=new CheckableListItem<>(R.string.sk_settings_display_pronouns_in_threads, 0, CheckableListItem.Style.CHECKBOX, GlobalUserPreferences.displayPronounsInThreads, 0, ()->toggleCheckableItem(pronounsInThreadsItem)),
@@ -96,12 +98,14 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 
 		boolean restartPlease=
 				GlobalUserPreferences.disableM3PillActiveIndicator!=disablePillItem.checked ||
-				GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked;
+				GlobalUserPreferences.showNavigationLabels!=showNavigationLabelsItem.checked ||
+				lp.likeIcon!=likeIconItem.checked;
 
 		lp.revealCWs=revealCWsItem.checked;
 		lp.hideSensitiveMedia=hideSensitiveMediaItem.checked;
 		lp.showInteractionCounts=interactionCountsItem.checked;
 		lp.customEmojiInNames=emojiInNamesItem.checked;
+		lp.likeIcon=likeIconItem.checked;
 		lp.save();
 		GlobalUserPreferences.toolbarMarquee=marqueeItem.checked;
 		GlobalUserPreferences.reduceMotion=reduceMotionItem.checked;
@@ -131,7 +135,7 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	}
 
 	private @StringRes int getColorPaletteValue(){
-		return switch(GlobalUserPreferences.color){
+		return switch(AccountSessionManager.get(accountID).getLocalPreferences().color){
 			case MATERIAL3 -> R.string.sk_color_palette_material3;
 			case PINK -> R.string.sk_color_palette_pink;
 			case PURPLE -> R.string.sk_color_palette_purple;
@@ -196,18 +200,18 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 	}
 
 	private void onColorClick(){
-		int selected=GlobalUserPreferences.color.ordinal();
+		int selected=lp.color.ordinal();
 		int[] newSelected={selected};
-		String[] names=Arrays.stream(GlobalUserPreferences.ColorPreference.values()).map(GlobalUserPreferences.ColorPreference::getName).map(this::getString).toArray(String[]::new);
+		String[] names=Arrays.stream(ColorPreference.values()).map(ColorPreference::getName).map(this::getString).toArray(String[]::new);
 		new M3AlertDialogBuilder(getActivity())
-				.setTitle(R.string.settings_theme)
+				.setTitle(R.string.sk_settings_color_palette)
 				.setSingleChoiceItems(names,
 						selected, (dlg, item)->newSelected[0]=item)
 				.setPositiveButton(R.string.ok, (dlg, item)->{
-					GlobalUserPreferences.ColorPreference pref=GlobalUserPreferences.ColorPreference.values()[newSelected[0]];
-					if(pref!=GlobalUserPreferences.color){
-						GlobalUserPreferences.ColorPreference prev=GlobalUserPreferences.color;
-						GlobalUserPreferences.color=pref;
+					ColorPreference pref=ColorPreference.values()[newSelected[0]];
+					if(pref!=lp.color){
+						ColorPreference prev=lp.color;
+						lp.color=pref;
 						GlobalUserPreferences.save();
 						colorItem.subtitleRes=getColorPaletteValue();
 						rebindItem(colorItem);
@@ -257,17 +261,17 @@ public class SettingsDisplayFragment extends BaseSettingsFragment<Void>{
 				.show();
 	}
 
-	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, GlobalUserPreferences.ColorPreference prevColor, Boolean prevTrueBlack){
+	private void maybeApplyNewThemeRightNow(GlobalUserPreferences.ThemePreference prevTheme, ColorPreference prevColor, Boolean prevTrueBlack){
 		if(prevTheme==null) prevTheme=GlobalUserPreferences.theme;
 		if(prevTrueBlack==null) prevTrueBlack=GlobalUserPreferences.trueBlackTheme;
-		if(prevColor==null) prevColor=GlobalUserPreferences.color;
+		if(prevColor==null) prevColor=lp.color;
 
 		boolean isCurrentDark=prevTheme==GlobalUserPreferences.ThemePreference.DARK ||
 				(prevTheme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewDark=GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK ||
 				(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO && Build.VERSION.SDK_INT>=30 && getResources().getConfiguration().isNightModeActive());
 		boolean isNewBlack=GlobalUserPreferences.trueBlackTheme;
-		if(isCurrentDark!=isNewDark || prevColor!=GlobalUserPreferences.color || (isNewDark && prevTrueBlack!=isNewBlack)){
+		if(isCurrentDark!=isNewDark || prevColor!=lp.color || (isNewDark && prevTrueBlack!=isNewBlack)){
 			restartActivityToApplyNewTheme();
 		}
 	}

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

@@ -55,6 +55,8 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		onDataLoaded(List.of(
 				new ListItem<>(R.string.settings_behavior, 0, R.drawable.ic_fluent_settings_24_regular, this::onBehaviorClick),
 				new ListItem<>(R.string.settings_display, 0, R.drawable.ic_fluent_color_24_regular, this::onDisplayClick),
+				new ListItem<>(R.string.settings_privacy, 0, R.drawable.ic_privacy_tip_24px, this::onPrivacyClick),
+				new ListItem<>(R.string.settings_filters, 0, R.drawable.ic_filter_alt_24px, this::onFiltersClick),
 				new ListItem<>(R.string.settings_notifications, 0, R.drawable.ic_fluent_alert_24_regular, this::onNotificationsClick),
 				new ListItem<>(R.string.sk_settings_instance, 0, R.drawable.ic_fluent_server_24_regular, this::onInstanceClick),
 				new ListItem<>(getString(R.string.about_app, getString(R.string.sk_app_name)), null, R.drawable.ic_fluent_info_24_regular, this::onAboutClick, null, 0, true),
@@ -69,7 +71,9 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 			data.add(0, new ListItem<>("Debug settings", null, R.drawable.ic_fluent_wrench_screwdriver_24_regular, ()->Nav.go(getActivity(), SettingsDebugFragment.class, makeFragmentArgs()), null, 0, true));
 		}
 
-		account.reloadPreferences(null);
+		AccountSession session=AccountSessionManager.get(accountID);
+		session.reloadPreferences(null);
+		session.updateAccountInfo();
 		E.register(this);
 	}
 
@@ -133,6 +137,10 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 		Nav.go(getActivity(), SettingsDisplayFragment.class, makeFragmentArgs());
 	}
 
+	private void onPrivacyClick(){
+		Nav.go(getActivity(), SettingsPrivacyFragment.class, makeFragmentArgs());
+	}
+
 	private void onFiltersClick(){
 		Nav.go(getActivity(), SettingsFiltersFragment.class, makeFragmentArgs());
 	}
@@ -155,9 +163,7 @@ public class SettingsMainFragment extends BaseSettingsFragment<Void>{
 				.setMessage(getString(R.string.confirm_log_out, session.getFullUsername()))
 				.setPositiveButton(R.string.log_out, (dialog, which)->account.logOut(getActivity(), ()->{
 					loggedOut=true;
-					getActivity().finish();
-					Intent intent=new Intent(getActivity(), MainActivity.class);
-					startActivity(intent);
+					((MainActivity)getActivity()).restartActivity();
 				}))
 				.setNegativeButton(R.string.cancel, null)
 				.show();

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

@@ -0,0 +1,41 @@
+package org.joinmastodon.android.fragments.settings;
+
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.viewmodel.CheckableListItem;
+
+import java.util.List;
+
+public class SettingsPrivacyFragment extends BaseSettingsFragment<Void>{
+	private CheckableListItem<Void> discoverableItem, indexableItem;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		setTitle(R.string.settings_privacy);
+		Account self=AccountSessionManager.get(accountID).self;
+		onDataLoaded(List.of(
+			discoverableItem=new CheckableListItem<>(R.string.settings_discoverable, 0, CheckableListItem.Style.SWITCH, self.discoverable, R.drawable.ic_thumbs_up_down_24px, ()->toggleCheckableItem(discoverableItem)),
+			indexableItem=new CheckableListItem<>(R.string.settings_indexable, 0, CheckableListItem.Style.SWITCH, self.source.indexable!=null ? self.source.indexable : true, R.drawable.ic_search_24px, ()->toggleCheckableItem(indexableItem))
+		));
+		if(self.source.indexable==null)
+			indexableItem.isEnabled=false;
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){}
+
+	@Override
+	public void onPause(){
+		super.onPause();
+		Account self=AccountSessionManager.get(accountID).self;
+		if(self.discoverable!=discoverableItem.checked || (self.source.indexable!=null && self.source.indexable!=indexableItem.checked)){
+			self.discoverable=discoverableItem.checked;
+			self.source.indexable=indexableItem.checked;
+			AccountSessionManager.get(accountID).savePreferencesLater();
+		}
+	}
+}

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

@@ -153,18 +153,21 @@ public class SettingsServerFragment extends AppKitFragment{
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=tabViews[viewType];
-			((ViewGroup)view.getParent()).removeView(view);
-			view.setVisibility(View.VISIBLE);
+			FrameLayout view=new FrameLayout(parent.getContext());
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
 
 		@Override
 		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
+			FrameLayout view=tabViews[position];
+			if(view.getParent() instanceof ViewGroup parent)
+				parent.removeView(view);
+			view.setVisibility(View.VISIBLE);
+			((FrameLayout)holder.itemView).addView(view, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			Fragment fragment=getFragmentForPage(position);
 			if(!fragment.isAdded()){
-				getChildFragmentManager().beginTransaction().add(holder.itemView.getId(), fragment).commit();
+				getChildFragmentManager().beginTransaction().add(view.getId(), fragment).commit();
 				holder.itemView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 					@Override
 					public boolean onPreDraw(){

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

@@ -139,6 +139,7 @@ public class Account extends BaseModel implements Searchable{
 	 * When a timed mute will expire, if applicable.
 	 */
 	public Instant muteExpiresAt;
+	public boolean noindex;
 
 	public List<Role> roles;
 
@@ -238,6 +239,7 @@ public class Account extends BaseModel implements Searchable{
 				", source="+source+
 				", suspended="+suspended+
 				", muteExpiresAt="+muteExpiresAt+
+				", noindex="+noindex+
 				'}';
 	}
 }

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

@@ -46,26 +46,34 @@ public class Attachment extends BaseModel{
 
 	public int getWidth(){
 		if(meta==null)
-			return 0;
+			return 1920;
 		if(meta.width>0)
 			return meta.width;
 		if(meta.original!=null && meta.original.width>0)
 			return meta.original.width;
 		if(meta.small!=null && meta.small.width>0)
 			return meta.small.width;
-		return 0;
+		return 1920;
 	}
 
 	public int getHeight(){
 		if(meta==null)
-			return 0;
+			return 1080;
 		if(meta.height>0)
 			return meta.height;
 		if(meta.original!=null && meta.original.height>0)
 			return meta.original.height;
 		if(meta.small!=null && meta.small.height>0)
 			return meta.small.height;
-		return 0;
+		return 1080;
+	}
+
+	public boolean hasKnownDimensions(){
+		return meta!=null && (
+				(meta.height>0 && meta.width>0)
+				|| (meta.original!=null && meta.original.height>0 && meta.original.width>0)
+				|| (meta.small!=null && meta.small.height>0 && meta.small.width>0)
+				);
 	}
 
 	public double getDuration(){

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EmojiCategory{
@@ -10,4 +11,8 @@ public class EmojiCategory{
 		this.title=title;
 		this.emojis=emojis;
 	}
+	public EmojiCategory(EmojiCategory category){
+		this.title = category.title;
+		this.emojis = new ArrayList<>(category.emojis);
+	}
 }

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

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

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

@@ -23,6 +23,7 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 				", following="+following+
 				", history="+history+
 				", statusesCount="+statusesCount+
+				", following="+following+
 				'}';
 	}
 
@@ -30,4 +31,19 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 	public String getID(){
 		return name;
 	}
+
+	@Override
+	public boolean equals(Object o){
+		if(this==o) return true;
+		if(o==null || getClass()!=o.getClass()) return false;
+
+		Hashtag hashtag=(Hashtag) o;
+
+		return name.equals(hashtag.name);
+	}
+
+	@Override
+	public int hashCode(){
+		return name.hashCode();
+	}
 }

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

@@ -20,4 +20,22 @@ public class Mention extends BaseModel{
 				", url='"+url+'\''+
 				'}';
 	}
+
+	@Override
+	public boolean equals(Object o){
+		if(this==o) return true;
+		if(o==null || getClass()!=o.getClass()) return false;
+
+		Mention mention=(Mention) o;
+
+		if(!id.equals(mention.id)) return false;
+		return url.equals(mention.url);
+	}
+
+	@Override
+	public int hashCode(){
+		int result=id.hashCode();
+		result=31*result+url.hashCode();
+		return result;
+	}
 }

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

@@ -37,6 +37,8 @@ public class Source extends BaseModel{
 	 * The number of pending follow requests.
 	 */
 	public int followRequestCount;
+	public Boolean indexable;
+	public boolean hideCollections;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
@@ -54,6 +56,8 @@ public class Source extends BaseModel{
 				", sensitive="+sensitive+
 				", language='"+language+'\''+
 				", followRequestCount="+followRequestCount+
+				", indexable="+indexable+
+				", hideCollections="+hideCollections+
 				'}';
 	}
 }

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

@@ -5,8 +5,21 @@ import static org.joinmastodon.android.api.MastodonAPIController.gsonWithoutDese
 
 import android.text.TextUtils;
 
+import org.joinmastodon.android.api.ObjectValidationException;
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.parceler.Parcel;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
 import androidx.annotation.NonNull;
 
+import com.github.bottomSoftwareFoundation.bottom.Bottom;
+import com.github.bottomSoftwareFoundation.bottom.TranslationError;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -15,16 +28,21 @@ import com.google.gson.JsonParseException;
 
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.utils.StatusTextEncoder;
 import org.parceler.Parcel;
 
 import java.lang.reflect.Type;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.regex.Pattern;
 
 @Parcel
 public class Status extends BaseModel implements DisplayItemsParent, Searchable{
@@ -83,9 +101,9 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 	public transient boolean sensitiveRevealed;
 	public transient boolean textExpanded, textExpandable;
 	public transient boolean hasGapAfter;
-	public transient TranslatedStatus translation;
-	public transient boolean translationShown;
 	private transient String strippedText;
+	public transient TranslationState translationState=TranslationState.HIDDEN;
+	public transient Translation translation;
 
 	public Status(){}
 
@@ -201,6 +219,38 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
 		return (Status) super.clone();
 	}
 
+	public static final Pattern BOTTOM_TEXT_PATTERN = Pattern.compile("(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️)(?:\uD83D\uDC49\uD83D\uDC48(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️))*\uD83D\uDC49\uD83D\uDC48");
+	public boolean isEligibleForTranslation(AccountSession session){
+		Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		boolean translateEnabled = instanceInfo != null &&
+				instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null &&
+				instanceInfo.v2.configuration.translation.enabled;
+
+		try {
+			String bottomText = BOTTOM_TEXT_PATTERN.matcher(getStrippedText()).find()
+					? new StatusTextEncoder(Bottom::decode).decode(getStrippedText(), BOTTOM_TEXT_PATTERN)
+					: null;
+			if(bottomText==null || bottomText.length()==0 || bottomText.equals("\u0005")) bottomText=null;
+			if(bottomText!=null){
+				translation=new Translation();
+				translation.content=bottomText;
+				translation.detectedSourceLanguage="\uD83E\uDD7A\uD83D\uDC49\uD83D\uDC48";
+				translation.provider="bottom-java";
+				return true;
+			}
+		} catch (TranslationError ignored) {}
+
+		return translateEnabled && !TextUtils.isEmpty(content) && !TextUtils.isEmpty(language)
+				&& !Objects.equals(Locale.getDefault().getLanguage(), language)
+				&& (visibility==StatusPrivacy.PUBLIC || visibility==StatusPrivacy.UNLISTED);
+	}
+
+	public enum TranslationState{
+		HIDDEN,
+		SHOWN,
+		LOADING
+	}
+
 	public boolean isReblogPermitted(String accountID){
 		return visibility.isReblogPermitted(account.id.equals(
 				AccountSessionManager.getInstance().getAccount(accountID).self.id

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

@@ -219,7 +219,7 @@ public class TimelineDefinition {
             args.putString("listID", listId);
             args.putBoolean("listIsExclusive", listIsExclusive);
         } else if (type == TimelineType.HASHTAG) {
-            args.putString("hashtag", hashtagName);
+            args.putString("hashtagName", hashtagName);
             args.putBoolean("localOnly", hashtagLocalOnly);
             args.putStringArrayList("any", hashtagAny == null ? new ArrayList<>() : new ArrayList<>(hashtagAny));
             args.putStringArrayList("all", hashtagAll == null ? new ArrayList<>() : new ArrayList<>(hashtagAll));

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

@@ -1,7 +0,0 @@
-package org.joinmastodon.android.model;
-
-public class TranslatedStatus extends BaseModel {
-  public String content;
-  public String detectedSourceLanguage;
-  public String provider;
-}

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.AllFieldsAreRequired;
+
+@AllFieldsAreRequired
+public class Translation extends BaseModel{
+	public String content;
+	public String detectedSourceLanguage;
+	public String provider;
+}

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

@@ -8,6 +8,7 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -39,6 +40,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
+import me.grishka.appkit.FragmentStackActivity;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -144,21 +146,9 @@ public class AccountSwitcherSheet extends BottomSheet{
 	}
 
 	private void logOut(String accountID){
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(Object result){
-						onLoggedOut(accountID);
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						onLoggedOut(accountID);
-					}
-				})
-				.wrapProgress(activity, R.string.loading, false)
-				.exec(accountID);
+		AccountSessionManager.get(accountID).logOut(activity, ()->{
+			((MainActivity)activity).restartActivity();
+		});
 	}
 
 	private void logOutAll(){
@@ -331,10 +321,10 @@ public class AccountSwitcherSheet extends BottomSheet{
 				onClick.accept(item.getID(), false);
 				return;
 			}
-			if(AccountSessionManager.getInstance().tryGetAccount(item.getID())!=null)
+			if(AccountSessionManager.getInstance().tryGetAccount(item.getID())!=null){
 				AccountSessionManager.getInstance().setLastActiveAccountID(item.getID());
-			activity.finish();
-			activity.startActivity(new Intent(activity, MainActivity.class));
+				((MainActivity)activity).restartActivity();
+			}
 		}
 
 		@Override

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

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

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

@@ -14,6 +14,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.StatusEditHistoryFragment;
 import org.joinmastodon.android.fragments.account_list.StatusFavoritesListFragment;
@@ -74,6 +76,9 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(ExtendedFooterStatusDisplayItem item){
 			Status s=item.status;
+			AccountSession session=AccountSessionManager.get(item.accountID);
+			boolean like=session!=null && session.getLocalPreferences().likeIcon;
+			favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(like ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
 			favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount));
 			reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int) (s.reblogsCount % 1000), s.reblogsCount));
 			reblogs.setVisibility(s.visibility != StatusPrivacy.DIRECT ? View.VISIBLE : View.GONE);

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

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

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

@@ -72,7 +72,7 @@ public class GapStatusDisplayItem extends StatusDisplayItem{
 		private void onViewClick(View v){
 			if(item.loading) return;
 			boolean isTop=v==top;
-			(isTop ? textTop : textBottom).startAnimation(UiUtils.opacityOut);
+			UiUtils.opacityOut(isTop ? textTop : textBottom);
 			V.setVisibilityAnimated((isTop ? progressTop : progressBottom), View.VISIBLE);
 			item.parentFragment.onGapClick(this, isTop);
 		}

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

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

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

@@ -46,11 +46,13 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 	private final String accountID;
 	private final CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private final CharSequence text;
+	private final CharSequence timestamp;
 
 	public NotificationHeaderStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Notification notification, String accountID){
 		super(parentID, parentFragment);
 		this.notification=notification;
 		this.accountID=accountID;
+		this.timestamp=notification.createdAt==null ? null : UiUtils.formatRelativeTimestamp(context, notification.createdAt);
 
 		if(notification.type==Notification.Type.POLL){
 			text=parentFragment.getString(R.string.poll_ended);
@@ -112,7 +114,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<NotificationHeaderStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final ImageView icon, avatar;
-		private final TextView text;
+		private final TextView text, timestamp;
 		private final int selectableItemBackground;
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -120,6 +122,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 			icon=findViewById(R.id.icon);
 			avatar=findViewById(R.id.avatar);
 			text=findViewById(R.id.text);
+			timestamp=findViewById(R.id.timestamp);
 
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(8));
 			avatar.setClipToOutline(true);
@@ -152,6 +155,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(NotificationHeaderStatusDisplayItem item){
 			text.setText(item.text);
+			timestamp.setText(item.timestamp);
 			avatar.setVisibility(item.notification.type==Notification.Type.POLL ? View.GONE : View.VISIBLE);
 			icon.setImageResource(switch(item.notification.type){
 				case FAVORITE -> R.drawable.ic_fluent_star_24_filled;

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

@@ -68,7 +68,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		private final TextView text, percent;
 		private final View button;
 		private final ImageView icon;
-		private final Drawable progressBg, progressBgInset;
+		private final Drawable progressBg;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_poll_option, parent);
@@ -77,9 +77,8 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 			icon=findViewById(R.id.icon);
 			button=findViewById(R.id.button);
 			progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate();
-			progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate();
 			itemView.setOnClickListener(this::onButtonClick);
-			button.setOutlineProvider(OutlineProviders.M3_BUTTON);
+			button.setOutlineProvider(OutlineProviders.roundedRect(20));
 			button.setClipToOutline(true);
 		}
 
@@ -93,22 +92,17 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 					item.showResults ? R.drawable.ic_poll_option_button : R.drawable.ic_fluent_radio_button_24_selector
 			));
 			if(item.showResults){
-				Drawable bg=item.inset ? progressBgInset : progressBg;
+				Drawable bg=progressBg;
 				bg.setLevel(Math.round(10000f*item.votesFraction));
 				button.setBackground(bg);
 				itemView.setSelected(item.poll.ownVotes!=null && item.poll.ownVotes.contains(item.optionIndex));
 				percent.setText(String.format(Locale.getDefault(), "%d%%", Math.round(item.votesFraction*100f)));
 			}else{
 				itemView.setSelected(item.poll.selectedOptions!=null && item.poll.selectedOptions.contains(item.option));
-				button.setBackgroundResource(item.inset ? R.drawable.bg_poll_option_clickable_inset : R.drawable.bg_poll_option_clickable);
-			}
-			if(item.inset){
-				text.setTextColor(itemView.getContext().getColorStateList(R.color.poll_option_text_inset));
-				percent.setTextColor(itemView.getContext().getColorStateList(R.color.poll_option_text_inset));
-			}else{
-				text.setTextColor(UiUtils.getThemeColor(itemView.getContext(), android.R.attr.textColorPrimary));
-				percent.setTextColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3OnSecondaryContainer));
+				button.setBackgroundResource(R.drawable.bg_poll_option_clickable);
 			}
+			text.setTextColor(UiUtils.getThemeColor(itemView.getContext(), android.R.attr.textColorPrimary));
+			percent.setTextColor(UiUtils.getThemeColor(itemView.getContext(), R.attr.colorM3OnSecondaryContainer));
 		}
 
 		@Override

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Status;
@@ -53,7 +54,8 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick, CharSequence fullText, Status status) {
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
-		HtmlParser.parseCustomEmoji(ssb, emojis);
+		if(AccountSessionManager.get(parentFragment.getAccountID()).getLocalPreferences().customEmojiInNames)
+			HtmlParser.parseCustomEmoji(ssb, emojis);
 		this.text=ssb;
 		emojiHelper.setText(ssb);
 		this.icon=icon;

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

@@ -54,7 +54,7 @@ import me.grishka.appkit.views.UsableRecyclerView;
 public abstract class StatusDisplayItem{
 	public final String parentID;
 	public final BaseStatusListFragment<?> parentFragment;
-	public boolean inset, insetPadding=true;
+	public boolean inset;
 	public int index;
 	public boolean
 			hasDescendantNeighbor = false,
@@ -180,10 +180,8 @@ public abstract class StatusDisplayItem{
 						.ifPresent(hashtag -> items.add(new ReblogOrReplyLineStatusDisplayItem(
 								parentID, fragment, hashtag.name, List.of(),
 								R.drawable.ic_fluent_number_symbol_20sp_filled, null,
-								i -> {
-									args.putString("hashtag", hashtag.name);
-									Nav.go(fragment.getActivity(), HashtagTimelineFragment.class, args);
-								}, status
+								i->UiUtils.openHashtagTimeline(fragment.getActivity(), accountID, hashtag),
+								status
 						)));
 			}
 
@@ -206,11 +204,12 @@ public abstract class StatusDisplayItem{
 				items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, null, scheduledStatus));
 		}
 
-		boolean filtered=false;
+		LegacyFilter applyingFilter=null;
 		if(status.filtered!=null){
 			for(FilterResult filter:status.filtered){
-				if(filter.filter.isActive()){
-					filtered=true;
+				LegacyFilter f=filter.filter;
+				if(f.isActive() && filterContext != null && f.context.contains(filterContext)){
+					applyingFilter=f;
 					break;
 				}
 			}
@@ -317,14 +316,7 @@ public abstract class StatusDisplayItem{
 			}
 		}
 
-		LegacyFilter applyingFilter = null;
-		if (!statusForContent.filterRevealed) {
-			StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, FilterAction.WARN);
-			statusForContent.filterRevealed = predicate.test(status);
-			applyingFilter = predicate.getApplyingFilter();
-		}
-
-		return statusForContent.filterRevealed ? items :
+		return applyingFilter==null ? items :
 				new ArrayList<>(List.of(new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, items, applyingFilter)));
 	}
 
@@ -397,10 +389,11 @@ public abstract class StatusDisplayItem{
 		}
 
 		public Optional<StatusDisplayItem> getDisplayItemOffset(int offset){
-			int nextPos=getAbsoluteAdapterPosition() + offset;
 			List<StatusDisplayItem> displayItems=item.parentFragment.getDisplayItems();
-			return displayItems.size() > nextPos
-					? Optional.of(displayItems.get(nextPos))
+			int thisPos=displayItems.indexOf(item);
+			int offsetPos=thisPos + offset;
+			return displayItems.size() > offsetPos && thisPos >= 0 && offsetPos >= 0
+					? Optional.of(displayItems.get(offsetPos))
 					: Optional.empty();
 		}
 

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

@@ -3,40 +3,28 @@ package org.joinmastodon.android.ui.displayitems;
 import android.app.Activity;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewStub;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import com.github.bottomSoftwareFoundation.bottom.Bottom;
-import com.github.bottomSoftwareFoundation.bottom.TranslationError;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
-import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.fragments.ThreadFragment;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.model.TranslatedStatus;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
-import org.joinmastodon.android.utils.StatusTextEncoder;
 
 import java.util.Locale;
-import java.util.regex.Pattern;
 
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -46,26 +34,19 @@ import me.grishka.appkit.utils.V;
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private CharSequence translatedText;
+	private CustomEmojiHelper translationEmojiHelper=new CustomEmojiHelper();
 	public boolean textSelectable;
 	public boolean reduceTopPadding;
+	public boolean disableTranslate;
 	public final Status status;
-	public boolean disableTranslate, translationShown;
-	private AccountSession session;
-	public static final Pattern BOTTOM_TEXT_PATTERN = Pattern.compile("(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️)(?:\uD83D\uDC49\uD83D\uDC48(?:[\uD83E\uDEC2\uD83D\uDC96✨\uD83E\uDD7A,]+|❤️))*\uD83D\uDC49\uD83D\uDC48");
 
 	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
 		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
 		this.disableTranslate=disableTranslate;
-		this.translationShown=status.translationShown;
 		emojiHelper.setText(text);
-		session = AccountSessionManager.getInstance().getAccount(parentFragment.getAccountID());
-	}
-
-	public void setTranslationShown(boolean translationShown) {
-		this.translationShown = translationShown;
-		status.translationShown = translationShown;
 	}
 
 	@Override
@@ -75,38 +56,47 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	@Override
 	public int getImageCount(){
-		return emojiHelper.getImageCount();
+		return getCurrentEmojiHelper().getImageCount();
 	}
 
 	@Override
 	public ImageLoaderRequest getImageRequest(int index){
-		return emojiHelper.getImageRequest(index);
+		return getCurrentEmojiHelper().getImageRequest(index);
+	}
+
+	public void setTranslatedText(String text){
+		Status statusForContent=status.getContentStatus();
+		translatedText=HtmlParser.parse(text, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, parentFragment.getAccountID());
+		translationEmojiHelper.setText(translatedText);
+	}
+
+	private CustomEmojiHelper getCurrentEmojiHelper(){
+		return status.translationState==Status.TranslationState.SHOWN ? translationEmojiHelper : emojiHelper;
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
-		private final TextView translateInfo, readMore;
-		private final View textWrap, translateWrap, translateProgress;
-		private final Button translateButton;
-		private final ScrollView textScrollView;
+		private final ViewStub translationFooterStub;
+		private View translationFooter, translationButtonWrap;
+		private TextView translationInfo;
+		private Button translationButton;
+		private ProgressBar translationProgress;
 
-		private final float textMaxHeight, textCollapsedHeight;
+		private final float textMaxHeight;
 		private final LinearLayout.LayoutParams collapseParams, wrapParams;
 		private final ViewGroup parent;
+		private final TextView readMore;
+		private final ScrollView textScrollView;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
 			this.parent=parent;
 			text=findViewById(R.id.text);
-			textWrap = (LinearLayout) itemView;
-			translateWrap=findViewById(R.id.translate_wrap);
-			translateButton=findViewById(R.id.translate_btn);
-			translateInfo=findViewById(R.id.translate_info);
-			translateProgress=findViewById(R.id.translate_progress);
+			translationFooterStub=findViewById(R.id.translation_info);
 			textScrollView=findViewById(R.id.text_scroll_view);
 			readMore=findViewById(R.id.read_more);
 			textMaxHeight=activity.getResources().getDimension(R.dimen.text_max_height);
-			textCollapsedHeight=activity.getResources().getDimension(R.dimen.text_collapsed_height);
+			float textCollapsedHeight=activity.getResources().getDimension(R.dimen.text_collapsed_height);
 			collapseParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) textCollapsedHeight);
 			wrapParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 			readMore.setOnClickListener(v -> item.parentFragment.onToggleExpanded(item.status, getItemID()));
@@ -114,83 +104,21 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
-			boolean hasSpoiler = !TextUtils.isEmpty(item.status.spoilerText);
-			text.setText(item.translationShown
-							? HtmlParser.parse(item.status.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
-							: item.text);
-			text.setTextIsSelectable(item.textSelectable);
-			if (item.textSelectable) {
-				textScrollView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+			if(item.status.translationState==Status.TranslationState.SHOWN){
+				if(item.translatedText==null){
+					item.setTranslatedText(item.status.translation.content);
+				}
+				text.setText(item.translatedText);
+			}else{
+				text.setText(item.text);
 			}
+			text.setTextIsSelectable(false);
+			if(item.textSelectable) itemView.post(() -> text.setTextIsSelectable(true));
 			text.setInvalidateOnEveryFrame(false);
 			itemView.setClickable(false);
 			itemView.setPadding(itemView.getPaddingLeft(), item.reduceTopPadding ? V.dp(6) : V.dp(12), itemView.getPaddingRight(), itemView.getPaddingBottom());
 			text.setTextColor(UiUtils.getThemeColor(text.getContext(), item.inset ? R.attr.colorM3OnSurfaceVariant : R.attr.colorM3OnSurface));
-
-			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
-			boolean translateEnabled = !item.disableTranslate && instanceInfo != null &&
-					instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null &&
-					instanceInfo.v2.configuration.translation.enabled;
-			String bottomText = null;
-			try {
-				bottomText = BOTTOM_TEXT_PATTERN.matcher(item.status.getStrippedText()).find()
-						? new StatusTextEncoder(Bottom::decode).decode(item.status.getStrippedText(), BOTTOM_TEXT_PATTERN)
-						: null;
-			} catch (TranslationError ignored) {}
-
-			boolean translateVisible = (bottomText != null || (
-					translateEnabled &&
-							!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&
-							item.status.language != null &&
-							// todo: compare to mastodon locale instead (how do i query that?!)
-							!item.status.language.equalsIgnoreCase(Locale.getDefault().getLanguage())))
-					&& (!GlobalUserPreferences.translateButtonOpenedOnly || item.textSelectable);
-			translateWrap.setVisibility(translateVisible ? View.VISIBLE : View.GONE);
-			translateButton.setText(item.translationShown ? R.string.sk_translate_show_original : R.string.sk_translate_post);
-			translateInfo.setText(item.translationShown ? itemView.getResources().getString(R.string.sk_translated_using, bottomText != null ? "bottom-java" : item.status.translation.provider) : "");
-			String finalBottomText = bottomText;
-			translateButton.setOnClickListener(v->{
-				if (item.status.translation == null) {
-					if (finalBottomText != null) {
-						try {
-							item.status.translation = new TranslatedStatus();
-							item.status.translation.content = finalBottomText;
-							item.setTranslationShown(true);
-						} catch (TranslationError err) {
-							item.status.translation = null;
-							Toast.makeText(itemView.getContext(), err.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
-						}
-						rebind();
-						return;
-					}
-					translateProgress.setVisibility(View.VISIBLE);
-					translateButton.setClickable(false);
-					translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
-					new TranslateStatus(item.status.id).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(TranslatedStatus translatedStatus) {
-							item.status.translation = translatedStatus;
-							item.setTranslationShown(true);
-							if (item.parentFragment.getActivity() == null) return;
-							translateProgress.setVisibility(View.GONE);
-							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
-							rebind();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							translateProgress.setVisibility(View.GONE);
-							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
-							error.showToast(itemView.getContext());
-						}
-					}).exec(item.parentFragment.getAccountID());
-				} else {
-					item.setTranslationShown(!item.translationShown);
-					rebind();
-				}
-			});
+			updateTranslation(false);
 
 			readMore.setText(item.status.textExpanded ? R.string.sk_collapse : R.string.sk_expand);
 
@@ -224,18 +152,19 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 			if (GlobalUserPreferences.collapseLongPosts && !item.status.textExpandable) {
 				boolean tooBig = text.getMeasuredHeight() > textMaxHeight;
-				boolean expandable = tooBig && !hasSpoiler;
+				boolean expandable = tooBig && !item.status.hasSpoiler();
 				item.parentFragment.onEnableExpandable(Holder.this, expandable);
 			}
 
 			boolean expandButtonShown=item.status.textExpandable && !item.status.textExpanded;
-			translateWrap.setPadding(0, V.dp(expandButtonShown ? 0 : 4), 0, 0);
+			if(translationFooter!=null)
+				translationFooter.setPadding(0, V.dp(expandButtonShown ? 0 : 4), 0, 0);
 			readMore.setVisibility(expandButtonShown ? View.VISIBLE : View.GONE);
 			textScrollView.setLayoutParams(item.status.textExpandable && !item.status.textExpanded ? collapseParams : wrapParams);
 
 			// compensate for spoiler's bottom margin
 			ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) itemView.getLayoutParams();
-			params.setMargins(params.leftMargin, item.inset && hasSpoiler ? V.dp(-16) : 0,
+			params.setMargins(params.leftMargin, item.inset && item.status.hasSpoiler() ? V.dp(-16) : 0,
 					params.rightMargin, params.bottomMargin);
 		}
 
@@ -259,5 +188,61 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		private CustomEmojiHelper getEmojiHelper(){
 			return item.emojiHelper;
 		}
+
+		public void updateTranslation(boolean updateText){
+			if(item.status==null)
+				return;
+			boolean translateEnabled=!item.disableTranslate && item.status.isEligibleForTranslation(item.parentFragment.getSession());
+			if(translationFooter==null && translateEnabled){
+				translationFooter=translationFooterStub.inflate();
+				translationInfo=findViewById(R.id.translation_info_text);
+				translationButton=findViewById(R.id.translation_btn);
+				translationButtonWrap=findViewById(R.id.translation_btn_wrap);
+				translationProgress=findViewById(R.id.translation_progress);
+				translationButton.setOnClickListener(v->item.parentFragment.togglePostTranslation(item.status, item.parentID));
+			}
+			if(translationButton!=null) translationButton.animate().cancel();
+			if(item.status.translationState==Status.TranslationState.HIDDEN){
+				if(updateText) text.setText(item.text);
+				if(translationFooter==null) return;
+				translationFooter.setVisibility(translateEnabled ? View.VISIBLE : View.GONE);
+				translationProgress.setVisibility(View.GONE);
+				Translation existingTrans=item.status.getContentStatus().translation;
+				String existingTransLang=existingTrans!=null ? existingTrans.detectedSourceLanguage : null;
+				String lang=existingTransLang!=null ? existingTransLang : item.status.getContentStatus().language;
+				String displayLang=Locale.forLanguageTag(lang != null ? lang
+						: AccountSessionManager.get(item.parentFragment.getAccountID()).preferences.postingDefaultLanguage).getDisplayLanguage();
+				translationButton.setText(item.parentFragment.getString(R.string.translate_post, !displayLang.isBlank() ? displayLang : lang));
+				translationButton.setClickable(true);
+				translationButton.animate().alpha(1).setDuration(100).start();
+				translationInfo.setVisibility(View.GONE);
+				UiUtils.beginLayoutTransition((ViewGroup) translationButtonWrap);
+			}else{
+				translationFooter.setVisibility(View.VISIBLE);
+				if(item.status.translationState==Status.TranslationState.SHOWN){
+					translationProgress.setVisibility(View.GONE);
+					translationButton.setText(R.string.translation_show_original);
+					translationButton.setClickable(true);
+					translationButton.animate().alpha(1).setDuration(200).start();
+					translationInfo.setVisibility(View.VISIBLE);
+					translationButton.setVisibility(View.VISIBLE);
+					String displayLang=Locale.forLanguageTag(item.status.translation.detectedSourceLanguage).getDisplayLanguage();
+					translationInfo.setText(translationInfo.getContext().getString(R.string.post_translated, !displayLang.isBlank() ? displayLang : item.status.translation.detectedSourceLanguage, item.status.translation.provider));
+					UiUtils.beginLayoutTransition((ViewGroup) translationButtonWrap);
+					if(updateText){
+						if(item.translatedText==null){
+							item.setTranslatedText(item.status.translation.content);
+						}
+						text.setText(item.translatedText);
+					}
+				}else{ // LOADING
+					translationProgress.setVisibility(View.VISIBLE);
+					translationButton.setClickable(false);
+					translationButton.animate().alpha(UiUtils.ALPHA_PRESSED).setStartDelay(50).setDuration(300).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
+					translationInfo.setVisibility(View.INVISIBLE);
+					UiUtils.beginLayoutTransition((ViewGroup) translationButton.getParent());
+				}
+			}
+		}
 	}
 }

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

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

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

@@ -66,6 +66,10 @@ public class BlurhashCrossfadeDrawable extends Drawable{
 
 	public void setImageDrawable(Drawable imageDrawable){
 		this.imageDrawable=imageDrawable;
+		if(imageDrawable!=null){
+			width=imageDrawable.getIntrinsicWidth();
+			height=imageDrawable.getIntrinsicHeight();
+		}
 		invalidateSelf();
 	}
 

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

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

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

@@ -119,6 +119,11 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 
 		int width=right-left;
 		int height=bottom-top;
+		if(width==0 || height==0 || child.getWidth()==0 || child.getWidth()==0){
+			matrix.reset();
+			return;
+		}
+
 		float scale=Math.min(width/(float)child.getWidth(), height/(float)child.getHeight());
 		minScale=scale;
 		maxScale=Math.max(3f, height/(float)child.getHeight());
@@ -306,8 +311,6 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 				}, 1f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_ALPHA));
 			}
 		}else{
-			if(animatingTransition)
-				Log.w(TAG, "updateViewTransform: ", new Throwable().fillInStackTrace());
 			child.setScaleX(matrixValues[Matrix.MSCALE_X]);
 			child.setScaleY(matrixValues[Matrix.MSCALE_Y]);
 			child.setTranslationX(matrixValues[Matrix.MTRANS_X]);

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

@@ -100,9 +100,10 @@ public class HtmlParser{
 			}
 		}
 
-		Map<String, String> idsByUrl=mentions.stream().collect(Collectors.toMap(m->m.url, m->m.id));
+		Map<String, String> idsByUrl=mentions.stream().distinct().collect(Collectors.toMap(m->m.url, m->m.id));
 		// Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
 //		Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
+		Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
 
 		final SpannableStringBuilder ssb=new SpannableStringBuilder();
 		Jsoup.parseBodyFragment(source).body().traverse(new NodeVisitor(){
@@ -115,6 +116,7 @@ public class HtmlParser{
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
+							Object linkObject=null;
 							String href=el.attr("href");
 							LinkSpan.Type linkType;
 							String text=el.text();
@@ -122,6 +124,7 @@ public class HtmlParser{
 								if(text.startsWith("#")){
 									linkType=LinkSpan.Type.HASHTAG;
 									href=text.substring(1);
+									linkObject=tagsByTag.get(text.substring(1).toLowerCase());
 								}else{
 									linkType=LinkSpan.Type.URL;
 								}
@@ -136,7 +139,7 @@ public class HtmlParser{
 							}else{
 								linkType=LinkSpan.Type.URL;
 							}
-							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID), ssb.length(), el));
+							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID, linkObject, text), ssb.length(), el));
 						}
 						case "br" -> ssb.append('\n');
 						case "span" -> {
@@ -271,7 +274,7 @@ public class HtmlParser{
 			String url=matcher.group(3);
 			if(TextUtils.isEmpty(matcher.group(4)))
 				url="http://"+url;
-			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null), matcher.start(3), matcher.end(3), 0);
+			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null, null, null), matcher.start(3), matcher.end(3), 0);
 		}while(matcher.find()); // Find more URLs
 		return ssb;
 	}

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

@@ -5,6 +5,7 @@ import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 import android.view.View;
 
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 public class LinkSpan extends CharacterStyle {
@@ -14,17 +15,15 @@ public class LinkSpan extends CharacterStyle {
 	private String link;
 	private Type type;
 	private String accountID;
+	private Object linkObject;
 	private String text;
 
-	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID){
-		this(link, listener, type, accountID, null);
-	}
-
-	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, String text){
+	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, Object linkObject, String text){
 		this.listener=listener;
 		this.link=link;
 		this.type=type;
 		this.accountID=accountID;
+		this.linkObject=linkObject;
 		this.text=text;
 	}
 
@@ -42,7 +41,12 @@ public class LinkSpan extends CharacterStyle {
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link);
 			case MENTION -> UiUtils.openProfileByID(context, accountID, link);
-			case HASHTAG -> UiUtils.openHashtagTimeline(context, accountID, link, null);
+			case HASHTAG -> {
+				if(linkObject instanceof Hashtag ht)
+					UiUtils.openHashtagTimeline(context, accountID, ht);
+				else
+					UiUtils.openHashtagTimeline(context, accountID, text);
+			}
 			case CUSTOM -> listener.onLinkClick(this);
 		}
 	}

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

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

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

@@ -46,7 +46,7 @@ public class DiscoverInfoBannerHelper{
 			TextView text=banner.findViewById(R.id.banner_text);
 			text.setText(switch(type){
 				case TRENDING_POSTS -> list.getResources().getString(R.string.sk_trending_posts_info_banner);
-				case TRENDING_LINKS -> list.getResources().getString(R.string.trending_links_info_banner);
+				case TRENDING_LINKS -> list.getResources().getString(R.string.sk_trending_links_info_banner);
 				case FEDERATED_TIMELINE -> list.getResources().getString(R.string.sk_federated_timeline_info_banner);
 				case POST_NOTIFICATIONS -> list.getResources().getString(R.string.sk_notify_posts_info_banner);
 				case BUBBLE_TIMELINE -> list.getResources().getString(R.string.sk_bubble_timeline_info_banner);

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

@@ -74,24 +74,19 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
 
 	@Override
 	public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-		List<StatusDisplayItem> displayItems=listFragment.getDisplayItems();
+//		List<StatusDisplayItem> displayItems=listFragment.getDisplayItems();
 		RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
 		if(holder instanceof StatusDisplayItem.Holder<?> sdi){
 			boolean inset=sdi.getItem().inset;
-			int pos=holder.getAbsoluteAdapterPosition();
+//			int pos=holder.getAbsoluteAdapterPosition();
 			if(inset){
-				boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
-				boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
-				int pad;
+//				boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
+//				boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
 //				if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder)
-					pad=V.dp(16);
-//				else
-//					pad=V.dp(12);
-				boolean insetPadding=((StatusDisplayItem.Holder<?>) holder).getItem().insetPadding;
-				if(insetPadding)
-					outRect.left=pad;
-				if(insetPadding)
-					outRect.right=pad;
+				int pad=V.dp(16);
+//				else pad=V.dp(12);
+				outRect.left=pad;
+				outRect.right=pad;
 
 				// had to comment this out because animations with offsets aren't handled properly.
 				// can be worked around by manually applying top margins to items