Chaging string in title

Currently translated at 38.4% (5 of 13 strings)

Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/sv/

.github/FUNDING.yml

@@ -1,9 +1,8 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: LucasGGamerM
 patreon: # mastodon
 open_collective: # Replace with a single Open Collective username e.g., user1
-ko_fi: xsk22
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username e.g., user1

README.md

@@ -1,17 +1,19 @@
-![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![MoshidonLogo](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Moshidon
+# Moshidon, the material you mastodon client! 
 
 > A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)
 
 ---
 
 
 ## Key features
 
+### **Material you theme support on Android 12+ devices!**
+
 ### **Translate button**
 
 **Allows you to translate posts in instances with the translate feature!**
@@ -138,4 +140,6 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
+[Official matrix chatroom:](https://matrix.to/#/#moshidon:matrix.org) https://matrix.to/#/#moshidon:matrix.org
+
 <a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>

_config.yml

@@ -1,2 +1,2 @@
-title: Megalodon
+title: Moshidon
 layout: default

_layouts/default.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Megalodon</title>
+    <title>Moshidon</title>
     <link rel="icon" href="mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png">
     <link rel="me" href="https://floss.social/@mastodon">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.1.0/github-markdown.min.css">
@@ -14,4 +14,4 @@
       {{ content }}  
     </div>
   </body>
-</html>
+</html>

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -1,16 +0,0 @@
-Mastodon je největší decentralizovanou sociální sítí na internetu. Místo jediné webové stránky je to síť pro miliony uživatelů v nezávislých komunitách, ve kterých mohou všichni vzájemně a bezproblémově komunikovat. Bez ohledu na to, co vás baví, můžete se setkat s vášnivými lidmi, kteří o tom přispívají na Mastodon!
-
-Připojte se ke komunitě a vytvořte svůj profil. Najděte a sledujte fascinující lidi a přečtěte si jejich příspěvky v chronologické časové ose bez reklam. Vyjádřete se pomocí vlastních emoji, obrázků, GIFů, videí a zvuku v 500-znakových příspěvcích. Odpovězte na vlákna a boostujte příspěvky od kohokoliv, abyste mohli sdílet skvělé věci. Najděte nové účty pro sledování a populární hashtagy pro rozšíření vaší sítě.
-
-Mastodon je postaven se zaměřením na soukromí a bezpečnost. Rozhodněte, zda jsou vaše příspěvky sdíleny se vašimi sledujícími, jen s lidmi, které zmíníte, nebo s celým světem. Upozornění na obsah vám umožní skrýt příspěvky obsahující citlivý nebo spouštěcí materiál, dokud se s nimi nezačnete zabývat. Každá komunita má vlastní pokyny a moderátory, aby udržela své členy v bezpečí, a robustní blokování a nahlašovací nástroje pomáhácí předcházení zneužití.
-
-Více funkcí:
-
-• Tmavý režim: Čtěte příspěvky ve světlém, tmavém nebo pravém černém režimu
-• Ankety: Požádejte sledující o jejich názor a sečtěte jejich hlasy
-• Objevit: Populární hashtagy a účty jsou pryč na jedno klepnutí
-• Oznámení: Dostávejte oznámení o nových sledujících, odpovědích a boostech
-• Sdílení: Odesílání přímo do Mastodonu z libovolného seznamu sdílení v jakékoliv aplikaci
-• Roztomilost: Naším maskotem je roztomilý slon, kterého čas od času uvidíte
-
-Mastodon je registrovaný neziskový projekt a vývojový program je podporován přímo vašimi dary. Neexistuje žádná reklama, žádná monetizace a žádný rizikový kapitál a máme v plánu to udržet.

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,16 +0,0 @@
-Mastodon ist das größte dezentralisierte soziale Netzwerk im Internet. Statt einer einzigen Webseite ist es ein Netzwerk von Millionen von Benutzer*innen in unabhängigen Gemeinschaften, die alle miteinander interagieren können. Egal, was du magst, auf Mastodon kannst du begeisterte Menschen treffen, die darüber schreiben!
-
-Tritt einer Gemeinschaft bei und erstelle dein Profil. Finde und folge faszinierenden Leuten und lies ihre Beiträge in einer werbefreien, chronologischen Zeitachse. Drücke dich mit eigenen Emojis, Bildern, GIFs, Videos und Klängen in 500-Zeichen-Beiträgen aus. Antworte auf Themen und teile Beiträge von anderen, um tolle Dinge zu verbreiten. Finde neue Konten zum Folgen und angesagte Hashtags, um dein Netzwerk zu erweitern.
-
-Mastodon wurde mit einem Schwerpunkt auf Privatsphäre und Sicherheit gebaut. Entscheide, ob du deine Beiträge mit deinen Followern, nur mit den Menschen, die du erwähnst, oder mit der ganzen Welt teilen möchtest. Mit Inhaltswarnungen kannst du Beiträge mit sensiblem oder bedenklichen Inhalten ausblenden, bis du bereit bist, dich damit auseinanderzusetzen. Jede Gemeinschaft hat ihre eigenen Regeln und Moderator*innen, um die Sicherheit ihrer Mitglieder zu gewährleisten, sowie robuste Sperr- und Meldewerkzeuge, um Missbrauch vorzubeugen.
-
-Weitere Funktionen:
-
-• Dunkler Modus: Beiträge im hellen, dunklen oder schwarzen Modus lesen
-• Umfragen: frage deine Follower nach ihrer Meinung und zähle die Stimmen
-• Entdecken: trendende Hashtags und Profile sind nur einen Fingertipp entfernt
-• Benachrichtigungen: erhalte Benachrichtigungen über neue Follower, Antworten und geteilte Beiträge
-• Teilen: veröffentliche auf Mastodon aus jeder beliebigen anderen App
-• Niedlichkeit: unser Maskottchen ist ein entzückender Elefant und du wirst ihn von Zeit zu Zeit auftauchen sehen
-
-Mastodon ist eine eingetragene gemeinnützige Organisation und die Entwicklung wird direkt durch deine Spenden unterstützt. Es gibt keine Werbung, keine Monetarisierung und kein Risikokapital und so soll es auch bleiben.

fastlane/metadata/android/fil-PH/full_description.txt

@@ -1,16 +0,0 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
-
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
-
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
-
-More features:
-
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
-
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/fil-PH/short_description.txt

@@ -1 +0,0 @@
-Decentralized social network

fastlane/metadata/android/fil-PH/title.txt

@@ -1 +0,0 @@
-Mastodon

fastlane/metadata/android/hu-HU/full_description.txt

@@ -1,16 +0,0 @@
-A Mastodon a legnagyobb decentralizált közösségi hálózat az interneten. Egyetlen weboldal helyett, ez több millió felhasználóból álló, független közösségek hálózata, amelyek egymással kapcsolatba tudnak lépni, zökkenőmentesen. Nem számít, mi a hobbid, a Mastodonon találkozhatsz róla posztoló lelkes emberekkel!
-
-Csatlakozz egy közösséghez és készítsd el a profilodat. Keress és kövess lenyűgöző embereket, és olvasd egy reklámmentes, kronologikus idővonalon a bejegyzéseiket. Fejezd ki magad egyedi hangulatjelekkel, képekkel, GIFekkel, videókkal és hanggal, 500 karakter hosszúságú posztokban. Reply to threads and reblog posts from anyone to share great stuff. Fedezz fel új fiókokat amiket követhetsz és felkapott hashtageket, hogy bővíthesd a kapcsolataidat.
-
-A Mastodon az adatvédelemre és a biztonságra összpontosítva épült. Döntsd el, hogy a posztjaidat csak a követőiddel, csak azokkal akiket megemlítesz, vagy az egész világgal osztod meg. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
-
-More features:
-
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
-
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.

fastlane/metadata/android/hu-HU/short_description.txt

@@ -1 +0,0 @@
-Decentralizált szociális hálózat

fastlane/metadata/android/hu-HU/title.txt

@@ -1 +0,0 @@
-Mastodon

mastodon/build.gradle

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

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -61,6 +61,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 			info=new UpdateInfo();
 			info.version=prefs.getString("version", null);
 			info.size=prefs.getLong("apkSize", 0);
+			info.changelog=prefs.getString("changelog", null);
 			downloadID=prefs.getLong("downloadID", 0);
 			if(downloadID==0 || !getUpdateApkFile().exists()){
 				state=UpdateState.UPDATE_AVAILABLE;
@@ -84,6 +85,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					.remove("apkURL")
 					.remove("checkedByBuild")
 					.remove("downloadID")
+					.remove("changelog")
 					.apply();
 		}
 	}
@@ -116,6 +118,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
 			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
+			String changelog=obj.get("body").getAsString();
 			String tag=obj.get("tag_name").getAsString();
 			Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
 			Matcher matcher=pattern.matcher(tag);
@@ -151,6 +154,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 						UpdateInfo info=new UpdateInfo();
 						info.size=size;
 						info.version=version;
+						info.changelog=changelog;
 						this.info=info;
 
 						getPrefs().edit()
@@ -158,6 +162,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 								.putString("version", version)
 								.putString("apkURL", url)
 								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
+								.putString("changelog", changelog)
 								.remove("downloadID")
 								.apply();
 

mastodon/src/github/res/drawable/ic_fluent_dismiss_20_filled.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M3.897 4.054L3.97 3.97c0.266-0.267 0.683-0.29 0.976-0.073L5.03 3.97 10 8.939l4.97-4.97c0.266-0.266 0.683-0.29 0.976-0.072L16.03 3.97c0.267 0.266 0.29 0.683 0.073 0.976L16.03 5.03 11.061 10l4.97 4.97c0.266 0.266 0.29 0.683 0.072 0.976L16.03 16.03c-0.266 0.267-0.683 0.29-0.976 0.073L14.97 16.03 10 11.061l-4.97 4.97c-0.266 0.266-0.683 0.29-0.976 0.072L3.97 16.03c-0.267-0.266-0.29-0.683-0.073-0.976L3.97 14.97 8.939 10l-4.97-4.97C3.704 4.764 3.68 4.347 3.898 4.054L3.97 3.97 3.897 4.054z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_mail_inbox_dismiss_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M22 6.5c0 3.038-2.462 5.5-5.5 5.5S11 9.538 11 6.5 13.462 1 16.5 1 22 3.462 22 6.5zm-7.146-2.354c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708L15.793 6.5l-1.647 1.646c-0.195 0.196-0.195 0.512 0 0.707 0.196 0.196 0.512 0.196 0.708 0L16.5 7.208l1.646 1.647c0.196 0.195 0.512 0.195 0.708 0 0.195-0.196 0.195-0.512 0-0.707L17.207 6.5l1.647-1.646c0.195-0.196 0.195-0.512 0-0.708-0.196-0.195-0.512-0.195-0.708 0L16.5 5.793l-1.646-1.647zM19.5 14v-1.732c0.551-0.287 1.056-0.651 1.5-1.078v7.56c0 1.733-1.357 3.15-3.066 3.245L17.75 22H6.25c-1.733 0-3.15-1.357-3.245-3.066L3 18.75V7.25C3 5.517 4.356 4.1 6.066 4.005L6.25 4h4.248c-0.198 0.474-0.34 0.977-0.422 1.5H6.25c-0.918 0-1.671 0.707-1.744 1.606L4.5 7.25V14H9c0.38 0 0.694 0.282 0.743 0.648L9.75 14.75C9.75 15.993 10.757 17 12 17c1.19 0 2.166-0.925 2.245-2.096l0.005-0.154c0-0.38 0.282-0.694 0.648-0.743L15 14h4.5zm-15 1.5v3.25c0 0.918 0.707 1.671 1.606 1.744L6.25 20.5h11.5c0.918 0 1.671-0.707 1.744-1.607L19.5 18.75V15.5h-3.825c-0.335 1.648-1.75 2.904-3.475 2.995L12 18.5c-1.747 0-3.215-1.195-3.632-2.812L8.325 15.5H4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_mail_inbox_dismiss_28_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M26 7.5c0 3.59-2.91 6.5-6.5 6.5S13 11.09 13 7.5 15.91 1 19.5 1 26 3.91 26 7.5zm-9.146-3.354c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708L18.793 7.5l-2.647 2.646c-0.195 0.196-0.195 0.512 0 0.708 0.196 0.195 0.512 0.195 0.708 0L19.5 8.207l2.646 2.647c0.196 0.195 0.512 0.195 0.708 0 0.195-0.196 0.195-0.512 0-0.708L20.207 7.5l2.647-2.646c0.195-0.196 0.195-0.512 0-0.708-0.196-0.195-0.512-0.195-0.708 0L19.5 6.793l-2.646-2.647zM25 22.75V12.6c-0.443 0.476-0.947 0.896-1.5 1.245V16h-6l-0.102 0.007c-0.366 0.05-0.648 0.363-0.648 0.743 0 1.519-1.231 2.75-2.75 2.75s-2.75-1.231-2.75-2.75l-0.007-0.102C11.193 16.282 10.88 16 10.5 16h-6V7.25c0-0.966 0.784-1.75 1.75-1.75h6.02c0.145-0.525 0.345-1.028 0.595-1.5H6.25C4.455 4 3 5.455 3 7.25v15.5C3 24.545 4.455 26 6.25 26h15.5c1.795 0 3.25-1.455 3.25-3.25zm-20.5 0V17.5h5.316l0.041 0.204C10.291 19.592 11.982 21 14 21l0.215-0.005c1.994-0.1 3.627-1.574 3.969-3.495H23.5v5.25c0 0.966-0.784 1.75-1.75 1.75H6.25c-0.966 0-1.75-0.784-1.75-1.75z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_mention_20_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M10 2c4.418 0 8 3.582 8 8 0 2.706-1.142 4.5-3 4.5-1.226 0-2.14-0.781-2.62-2.09C11.784 13.393 10.781 14 9.5 14 7.36 14 6 12.307 6 10c0-2.337 1.313-4 3.5-4 1.052 0 1.901 0.385 2.5 1.044V6.5C12 6.224 12.224 6 12.5 6c0.245 0 0.45 0.177 0.492 0.41L13 6.5V10c0 2.223 0.813 3.5 2 3.5s2-1.277 2-3.5c0-3.866-3.134-7-7-7s-7 3.134-7 7 3.134 7 7 7c0.823 0 1.626-0.142 2.383-0.416 0.26-0.094 0.547 0.04 0.64 0.3 0.095 0.26-0.04 0.546-0.3 0.64C11.859 17.838 10.94 18 10 18c-4.418 0-8-3.582-8-8s3.582-8 8-8zM9.5 7C7.924 7 7 8.17 7 10c0 1.797 0.966 3 2.5 3s2.5-1.203 2.5-3c0-1.83-0.924-3-2.5-3z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_open_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.25 4.5C5.283 4.5 4.5 5.284 4.5 6.25v11.5c0 0.966 0.783 1.75 1.75 1.75h11.5c0.966 0 1.75-0.784 1.75-1.75v-4c0-0.414 0.335-0.75 0.75-0.75 0.414 0 0.75 0.336 0.75 0.75v4c0 1.795-1.456 3.25-3.25 3.25H6.25C4.455 21 3 19.545 3 17.75V6.25C3 4.455 4.455 3 6.25 3h4C10.664 3 11 3.336 11 3.75S10.664 4.5 10.25 4.5h-4zM13 3.75C13 3.336 13.335 3 13.75 3h6.5C20.664 3 21 3.336 21 3.75v6.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75V5.56l-5.22 5.22c-0.293 0.293-0.768 0.293-1.06 0-0.293-0.293-0.293-0.768 0-1.06l5.22-5.22h-4.69C13.335 4.5 13 4.164 13 3.75z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_sign_out_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8.502 11.5c0.554 0 1.002 0.448 1.002 1.002 0 0.553-0.448 1.002-1.002 1.002-0.553 0-1.002-0.449-1.002-1.002 0-0.554 0.449-1.003 1.002-1.003zM12 4.353v6.651h7.442L17.72 9.28c-0.267-0.266-0.29-0.683-0.073-0.977L17.72 8.22c0.266-0.266 0.683-0.29 0.976-0.072L18.78 8.22l2.997 2.998c0.266 0.266 0.29 0.682 0.073 0.976l-0.073 0.084-2.996 3.003c-0.293 0.294-0.767 0.294-1.06 0.002-0.267-0.266-0.292-0.683-0.075-0.977l0.073-0.084 1.713-1.717h-7.431L12 19.25c0 0.466-0.421 0.82-0.88 0.738l-8.5-1.501C2.26 18.424 2 18.112 2 17.748V5.75c0-0.368 0.266-0.681 0.628-0.74l8.5-1.396C11.585 3.539 12 3.89 12 4.354zm-1.5 0.883l-7 1.15v10.732l7 1.236V5.237zM13 18.5h0.765l0.102-0.007c0.366-0.05 0.649-0.364 0.648-0.744l-0.007-4.25H13v5zm0.002-8.502L13 8.726V5h0.745c0.38 0 0.693 0.281 0.743 0.647l0.007 0.101L14.502 10h-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_speaker_0_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.704 3.44C14.895 3.667 15 3.953 15 4.248V19.75c0 0.69-0.56 1.25-1.25 1.25-0.296 0-0.582-0.105-0.808-0.296l-4.967-4.206H4.25c-1.243 0-2.25-1.008-2.25-2.25v-4.5c0-1.243 1.007-2.25 2.25-2.25h3.725l4.968-4.204c0.526-0.446 1.315-0.38 1.761 0.147zM13.5 4.787l-4.975 4.21H4.25c-0.414 0-0.75 0.337-0.75 0.75v4.5c0 0.415 0.336 0.75 0.75 0.75h4.275L13.5 19.21V4.787z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_speaker_0_28_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M16.5 4.814c0-1.094-1.307-1.66-2.105-0.912l-4.937 4.63C9.134 8.836 8.706 9.005 8.261 9.005H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912V4.814zm-6.016 4.812L15 5.39v17.216l-4.516-4.232c-0.602-0.564-1.397-0.878-2.222-0.878H5.25c-0.966 0-1.75-0.784-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.826 0 1.62-0.314 2.223-0.88z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_speaker_off_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06L6.438 7.5H4.25C3.007 7.499 2 8.506 2 9.749v4.497c0 1.243 1.007 2.25 2.25 2.25h3.68c0.183 0 0.36 0.068 0.498 0.19l4.491 3.994C13.725 21.396 15 20.824 15 19.746V16.06l5.72 5.72c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM13.5 14.56v4.629l-4.075-3.624c-0.412-0.366-0.944-0.569-1.495-0.569H4.25c-0.414 0-0.75-0.335-0.75-0.75V9.75C3.5 9.335 3.836 9 4.25 9h3.688l5.562 5.56zm0-9.753v5.511l1.5 1.5V4.25c0-1.079-1.274-1.65-2.08-0.934l-3.4 3.022 1.063 1.063L13.5 4.807zm3.641 9.152l1.138 1.138C18.741 14.163 19 13.111 19 12c0-1.203-0.304-2.338-0.84-3.328-0.198-0.364-0.653-0.5-1.017-0.303-0.364 0.197-0.5 0.653-0.303 1.017 0.42 0.777 0.66 1.666 0.66 2.614 0 0.691-0.127 1.351-0.359 1.96zm2.247 2.247l1.093 1.094C21.445 15.763 22 13.946 22 12c0-2.226-0.728-4.284-1.96-5.946-0.246-0.333-0.716-0.403-1.048-0.157-0.333 0.247-0.403 0.716-0.157 1.05C19.881 8.358 20.5 10.106 20.5 12c0 1.531-0.404 2.966-1.112 4.206z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/github/res/drawable/ic_fluent_speaker_off_28_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l5.724 5.725H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912v-5.623l8.22 8.22c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM15 16.06v6.547l-4.516-4.231c-0.602-0.565-1.397-0.879-2.222-0.879H5.25c-0.966 0-1.75-0.783-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.35 0 0.693-0.056 1.02-0.164L15 16.061zm-4.378-8.62l1.061 1.061L15 5.392v6.427l1.5 1.5V4.814c0-1.094-1.307-1.66-2.105-0.912L10.622 7.44zm9.55 9.55l1.137 1.137C21.912 16.88 22.25 15.478 22.25 14c0-2.136-0.706-4.11-1.897-5.697-0.249-0.332-0.719-0.399-1.05-0.15-0.332 0.249-0.399 0.719-0.15 1.05C20.156 10.54 20.75 12.199 20.75 14c0 1.058-0.205 2.067-0.578 2.99zm2.803 2.803l1.095 1.096c1.224-2.008 1.93-4.366 1.93-6.89 0-3.35-1.245-6.414-3.298-8.747-0.274-0.31-0.747-0.341-1.058-0.068-0.311 0.274-0.342 0.748-0.068 1.059C23.396 8.313 24.5 11.027 24.5 14c0 2.107-0.554 4.084-1.525 5.793z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/AndroidManifest.xml

@@ -4,7 +4,8 @@
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
@@ -14,12 +15,12 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/app_name"
+		android:label="@string/mo_app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
-		android:theme="@style/Theme.Mastodon.AutoLightDark.Original"
+		android:theme="@style/Theme.Mastodon.AutoLightDark"
 		android:largeHeap="true">
 
 		<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">

mastodon/src/main/assets/blocks.tsv

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

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

@@ -52,7 +52,11 @@ public class ExternalShareActivity extends FragmentStackActivity{
 
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n");
+		String subject = "";
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
+			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+			if (!subject.isBlank()) builder.append(subject).append("\n\n");
+		}
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;
@@ -80,6 +84,8 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		args.putString("account", accountID);
 		if(!TextUtils.isEmpty(text))
 			args.putString("prefilledText", text);
+		if(!subject.isBlank())
+			args.putInt("selectionEnd", subject.length());
 		if(mediaUris!=null && !mediaUris.isEmpty())
 			args.putParcelableArrayList("mediaAttachments", toArrayList(mediaUris));
 		Fragment fragment=new ComposeFragment();

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

@@ -1,7 +1,18 @@
 package org.joinmastodon.android;
 
+import static org.joinmastodon.android.api.MastodonAPIController.gson;
+
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
+
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class GlobalUserPreferences{
 	public static boolean playGifs;
@@ -14,14 +25,34 @@ public class GlobalUserPreferences{
 	public static boolean showInteractionCounts;
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
+	public static boolean disableSwipe;
+	public static boolean disableDividers;
 	public static boolean voteButtonForSingleChoice;
+	public static boolean uniformNotificationIcon;
+	public static boolean enableDeleteNotifications;
+	public static boolean relocatePublishButton;
+	public static boolean reduceMotion;
+	public static boolean keepOnlyLatestNotification;
+	public static boolean enableFabAutoHide;
+	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
+	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
+	public static Map<String, List<String>> recentLanguages;
+
+	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
+	public static Map<String, Integer> recentEmojis;
+
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
+	private static <T> T fromJson(String json, Type type, T orElse) {
+		try { return gson.fromJson(json, type); }
+		catch (JsonSyntaxException ignored) { return orElse; }
+	}
+
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -30,13 +61,34 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
+		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", true);
 		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
+		disableSwipe=prefs.getBoolean("disableSwipe", false);
+		disableDividers=prefs.getBoolean("disableDividers", true);
+		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
+		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", true);
+		reduceMotion=prefs.getBoolean("reduceMotion", false);
+		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
+		enableFabAutoHide =prefs.getBoolean("enableFabAutoHide", true);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
-		color=ColorPreference.values()[prefs.getInt("color", 1)];
+		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
+		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
+		publishButtonText=prefs.getString("publishButtonText", "");
+
+		try {
+			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
+				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
+			}else{
+				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
+			}
+		} catch (IllegalArgumentException|ClassCastException ignored) {
+			// invalid color name or color was previously saved as integer
+			color=ColorPreference.PURPLE;
+		}
 	}
 
 	public static void save(){
@@ -51,19 +103,32 @@ public class GlobalUserPreferences{
 				.putBoolean("showInteractionCounts", showInteractionCounts)
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
+				.putBoolean("disableSwipe", disableSwipe)
+				.putBoolean("disableDividers", disableDividers)
+				.putBoolean("relocatePublishButton", relocatePublishButton)
+				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
+				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
+				.putBoolean("reduceMotion", reduceMotion)
+				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
+				.putBoolean("enableFabAutoHide", enableFabAutoHide)
+				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
-				.putInt("color", color.ordinal())
+				.putString("color", color.name())
+				.putString("recentLanguages", gson.toJson(recentLanguages))
+				.putString("recentEmojis", gson.toJson(recentEmojis))
 				.apply();
 	}
 
 	public enum ColorPreference{
+		MATERIAL3,
 		PINK,
 		PURPLE,
 		GREEN,
 		BLUE,
-		ORANGE,
+		BROWN,
+		RED,
 		YELLOW,
-		MATERIAL3
+		NORD
 	}
 
 	public enum ThemePreference{
@@ -72,3 +137,4 @@ public class GlobalUserPreferences{
 		DARK
 	}
 }
+

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

@@ -14,9 +14,10 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
-import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,18 +34,19 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new SplashFragment());
+				showFragmentClearingBackStack(new CustomWelcomeFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
 				Bundle args=new Bundle();
 				Intent intent=getIntent();
-				if(intent.getBooleanExtra("fromNotification", false)){
+				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(!intent.hasExtra("notification"))
-							args.putString("tab", "notifications");
+						if(!hasNotification) args.putString("tab", "notifications");
 					}catch(IllegalStateException x){
 						session=AccountSessionManager.getInstance().getLastActiveAccount();
 					}
@@ -54,13 +56,13 @@ public class MainActivity extends FragmentStackActivity{
 				args.putString("account", session.getID());
 				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 				fragment.setArguments(args);
-				showFragmentClearingBackStack(fragment);
-				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
+				if(fromNotification && hasNotification){
 					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 					showFragmentForNotification(notification, session.getID());
-				}else if(intent.getBooleanExtra("compose", false)){
+				} else if (intent.getBooleanExtra("compose", false)){
 					showCompose();
-				}else{
+				} else {
+					showFragmentClearingBackStack(fragment);
 					maybeRequestNotificationsPermission();
 				}
 			}
@@ -139,4 +141,30 @@ public class MainActivity extends FragmentStackActivity{
 			requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 100);
 		}
 	}
+
+	/**
+	 * when opening app through a notification: if (thread) fragment "can go back", clear back stack
+	 * and show home fragment. upstream's implementation doesn't require this as it opens home first
+	 * and then immediately switches to the notification's ThreadFragment. this causes a black
+	 * screen in megalodon, for some reason, so i'm working around this that way.
+ 	 */
+	@Override
+	public void onBackPressed() {
+		Fragment currentFragment = getFragmentManager().findFragmentById(
+				(fragmentContainers.get(fragmentContainers.size() - 1)).getId()
+		);
+		Bundle currentArgs = currentFragment.getArguments();
+		if (this.fragmentContainers.size() == 1
+				&& currentArgs.getBoolean("_can_go_back", false)
+				&& currentArgs.containsKey("account")) {
+			Bundle args = new Bundle();
+			args.putString("account", currentArgs.getString("account"));
+			args.putString("tab", "notifications");
+			Fragment fragment=new HomeFragment();
+			fragment.setArguments(args);
+			showFragmentClearingBackStack(fragment);
+		} else {
+			super.onBackPressed();
+		}
+	}
 }

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

@@ -64,7 +64,7 @@ public class OAuthActivity extends Activity{
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(Account account){
-										AccountSessionManager.getInstance().addAccount(instance, token, account, app, true);
+										AccountSessionManager.getInstance().addAccount(instance, token, account, app, null);
 										progress.dismiss();
 										finish();
 										// not calling restartMainActivity() here on purpose to have it recreated (notice different flags)

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

@@ -8,9 +8,7 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -39,6 +37,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 
 	public static final int NOTIFICATION_ID=178;
+	private static final int SUMMARY_ID = 791;
+	private static int notificationId = 0;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
@@ -99,6 +99,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		String accountName="@"+self.username+"@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 		Notification.Builder builder;
+		Notification.Builder summaryNotification;
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O){
 			boolean hasGroup=false;
 			List<NotificationChannelGroup> channelGroups=nm.getNotificationChannelGroups();
@@ -121,35 +122,59 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				nm.createNotificationChannels(channels);
 			}
 			builder=new Notification.Builder(context, accountID+"_"+pn.notificationType);
+//			summaryNotification=new Notification.Builder(context, accountID);
 		}else{
 			builder=new Notification.Builder(context)
 					.setPriority(Notification.PRIORITY_DEFAULT)
 					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
+			summaryNotification=new Notification.Builder(context)
+					.setPriority(Notification.PRIORITY_DEFAULT)
+					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 		}
 		Drawable avatar=ImageCache.getInstance(context).get(new UrlImageLoaderRequest(pn.icon, V.dp(50), V.dp(50)));
 		Intent contentIntent=new Intent(context, MainActivity.class);
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
+		contentIntent.putExtra("notificationID", notificationId);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
+
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
-				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentIntent(PendingIntent.getActivity(context, accountID.hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentTitle(pn.title)
+				.setStyle(new Notification.InboxStyle()
+						.addLine(pn.body))
+				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
+				.setGroup(accountID)
 				.setColor(context.getColor(R.color.shortcut_icon_background));
+		if(!GlobalUserPreferences.uniformNotificationIcon){
+			switch (pn.notificationType) {
+				case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
+				case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
+				case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
+				case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
+				case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
+				default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
+			}
+		}else{
+			builder.setSmallIcon(R.drawable.ic_ntf_logo);
+		}
+
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));
 		}
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, NOTIFICATION_ID, builder.build());
+
+		notificationId++;
+		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId, builder.build());
+
 	}
 }

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

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

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

@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.StringRes;
@@ -101,9 +102,14 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public MastodonAPIRequest<T> wrapProgress(Activity activity, @StringRes int message, boolean cancelable){
+		return wrapProgress(activity, message, cancelable, null);
+	}
+
+	public MastodonAPIRequest<T> wrapProgress(Activity activity, @StringRes int message, boolean cancelable, Consumer<ProgressDialog> transform){
 		progressDialog=new ProgressDialog(activity);
 		progressDialog.setMessage(activity.getString(message));
 		progressDialog.setCancelable(cancelable);
+		if (transform != null) transform.accept(progressDialog);
 		if(cancelable){
 			progressDialog.setOnCancelListener(dialog->cancel());
 		}

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

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

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

@@ -9,23 +9,31 @@ import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
 
 import java.util.HashMap;
+import java.util.function.Consumer;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 
 public class StatusInteractionController{
 	private final String accountID;
+	private final boolean updateCounters;
 	private final HashMap<String, SetStatusFavorited> runningFavoriteRequests=new HashMap<>();
 	private final HashMap<String, SetStatusReblogged> runningReblogRequests=new HashMap<>();
 	private final HashMap<String, SetStatusBookmarked> runningBookmarkRequests=new HashMap<>();
 
-	public StatusInteractionController(String accountID){
+	public StatusInteractionController(String accountID, boolean updateCounters) {
 		this.accountID=accountID;
+		this.updateCounters=updateCounters;
 	}
 
-	public void setFavorited(Status status, boolean favorited){
+	public StatusInteractionController(String accountID){
+		this(accountID, true);
+	}
+
+	public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -38,7 +46,9 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningFavoriteRequests.remove(status.id);
-						E.post(new StatusCountersUpdatedEvent(result));
+						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
+						cb.accept(result);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -46,24 +56,17 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
-						if(favorited)
-							status.favouritesCount--;
-						else
-							status.favouritesCount++;
-						E.post(new StatusCountersUpdatedEvent(status));
+						cb.accept(status);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		if(favorited)
-			status.favouritesCount++;
-		else
-			status.favouritesCount--;
-		E.post(new StatusCountersUpdatedEvent(status));
+		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
-	public void setReblogged(Status status, boolean reblogged){
+	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -71,12 +74,15 @@ public class StatusInteractionController{
 		if(current!=null){
 			current.cancel();
 		}
-		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged)
+		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged, visibility)
 				.setCallback(new Callback<>(){
 					@Override
-					public void onSuccess(Status result){
+					public void onSuccess(Status reblog){
+						Status result = reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
-						E.post(new StatusCountersUpdatedEvent(result));
+						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
+						cb.accept(result);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -84,24 +90,21 @@ public class StatusInteractionController{
 						runningReblogRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
-						if(reblogged)
-							status.reblogsCount--;
-						else
-							status.reblogsCount++;
-						E.post(new StatusCountersUpdatedEvent(status));
+						cb.accept(status);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		if(reblogged)
-			status.reblogsCount++;
-		else
-			status.reblogsCount--;
-		E.post(new StatusCountersUpdatedEvent(status));
+		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
+		setBookmarked(status, bookmarked, r->{});
+	}
+
+	public void setBookmarked(Status status, boolean bookmarked, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -114,7 +117,8 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
-						E.post(new StatusCountersUpdatedEvent(result));
+						cb.accept(result);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -122,12 +126,13 @@ public class StatusInteractionController{
 						runningBookmarkRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
-						E.post(new StatusCountersUpdatedEvent(status));
+						cb.accept(status);
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningBookmarkRequests.put(status.id, req);
 		status.bookmarked=bookmarked;
-		E.post(new StatusCountersUpdatedEvent(status));
+		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

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

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

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

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

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java

@@ -7,4 +7,15 @@ public class GetInstance extends MastodonAPIRequest<Instance>{
 	public GetInstance(){
 		super(HttpMethod.GET, "/instance", Instance.class);
 	}
+
+	public static class V2 extends MastodonAPIRequest<Instance.V2>{
+		public V2(){
+			super(HttpMethod.GET, "/instance", Instance.V2.class);
+		}
+
+		@Override
+		protected String getPathPrefix() {
+			return "/api/v2";
+		}
+	}
 }

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

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class AddList extends MastodonAPIRequest<Object> {
+    public AddList(String listName){
+        super(HttpMethod.POST, "/lists", Object.class);
+        Request req = new Request();
+        req.title = listName;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public String title;
+    }
+}

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

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

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

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

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

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class EditListName extends MastodonAPIRequest<Object> {
+    public EditListName(String newListName, String listId){
+        super(HttpMethod.PUT, "/lists/"+listId, Object.class);
+        Request req = new Request();
+        req.title = newListName;
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public String title;
+    }
+}

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class RemoveList extends MastodonAPIRequest<Object> {
+    public RemoveList(String listId){
+        super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
+    }
+}

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

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

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

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.notifications;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.ApiUtils;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Notification;
+
+import java.util.EnumSet;
+import java.util.List;
+
+public class DismissNotification extends MastodonAPIRequest<Object>{
+    public DismissNotification(String id){
+        super(HttpMethod.POST, "/notifications/" + (id != null ? id + "/dismiss" : "clear"), Object.class);
+        setRequestBody(new Object());
+    }
+}

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

@@ -9,7 +9,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 		Request r=new Request();
 		r.subscription.endpoint="https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;
 		r.data.alerts=alerts;
-		r.data.policy=policy;
+		r.policy=policy;
 		r.subscription.keys.p256dh=encryptionKey;
 		r.subscription.keys.auth=authKey;
 		setRequestBody(r);
@@ -18,6 +18,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 	private static class Request{
 		public Subscription subscription=new Subscription();
 		public Data data=new Data();
+		public PushSubscription.Policy policy;
 
 		private static class Keys{
 			public String p256dh;
@@ -31,7 +32,6 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 
 		private static class Data{
 			public PushSubscription.Alerts alerts;
-			public PushSubscription.Policy policy;
 		}
 	}
 }

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

@@ -3,23 +3,36 @@ package org.joinmastodon.android.api.requests.notifications;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.PushSubscription;
 
+import java.io.IOException;
+
+import okhttp3.Response;
+
 public class UpdatePushSettings extends MastodonAPIRequest<PushSubscription>{
+	private final PushSubscription.Policy policy;
+
 	public UpdatePushSettings(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
 		super(HttpMethod.PUT, "/push/subscription", PushSubscription.class);
 		setRequestBody(new Request(alerts, policy));
+		this.policy=policy;
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(PushSubscription respObj, Response httpResponse) throws IOException{
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		respObj.policy=policy;
 	}
 
 	private static class Request{
 		public Data data=new Data();
+		public PushSubscription.Policy policy;
 
 		public Request(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
 			this.data.alerts=alerts;
-			this.data.policy=policy;
+			this.policy=policy;
 		}
 
 		private static class Data{
 			public PushSubscription.Alerts alerts;
-			public PushSubscription.Policy policy;
 		}
 	}
 }

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
@@ -9,12 +10,29 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CreateStatus extends MastodonAPIRequest<Status>{
+	public static final Instant DRAFTS_AFTER_INSTANT = Instant.ofEpochMilli(253370764799999L) /* end of 9998 */;
+	private static final float draftFactor = 31536000000f /* one year */ / 253370764799999f /* end of 9998 */;
+
+	public static Instant getDraftInstant() {
+		// returns an instant between 9999-01-01 00:00:00 and 9999-12-31 23:59:59
+		// yes, this is a weird implementation for something that hardly matters
+		return DRAFTS_AFTER_INSTANT.plusMillis(1 + (long) (System.currentTimeMillis() * draftFactor));
+	}
+
 	public CreateStatus(CreateStatus.Request req, String uuid){
 		super(HttpMethod.POST, "/statuses", Status.class);
 		setRequestBody(req);
 		addHeader("Idempotency-Key", uuid);
 	}
 
+	public static class Scheduled extends MastodonAPIRequest<ScheduledStatus>{
+		public Scheduled(CreateStatus.Request req, String uuid){
+			super(HttpMethod.POST, "/statuses", ScheduledStatus.class);
+			setRequestBody(req);
+			addHeader("Idempotency-Key", uuid);
+		}
+	}
+
 	public static class Request{
 		public String status;
 		public List<String> mediaIds;

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

@@ -7,4 +7,10 @@ public class DeleteStatus extends MastodonAPIRequest<Status>{
 	public DeleteStatus(String id){
 		super(HttpMethod.DELETE, "/statuses/"+id, Status.class);
 	}
+
+	public static class Scheduled extends MastodonAPIRequest<Object> {
+		public Scheduled(String id) {
+			super(HttpMethod.DELETE, "/scheduled_statuses/"+id, Object.class);
+		}
+	}
 }

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

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

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

@@ -1,20 +0,0 @@
-package org.joinmastodon.android.api.requests.statuses;
-
-import org.joinmastodon.android.api.AllFieldsAreRequired;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.BaseModel;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusTranslation;
-
-import java.util.Locale;
-
-public class GetStatusTranslation extends MastodonAPIRequest<StatusTranslation>{
-    public GetStatusTranslation(String id){
-        super(HttpMethod.POST, "/statuses/"+id+"/translate", StatusTranslation.class);
-        Request r = new Request();
-        setRequestBody(r);
-    }
-
-    public static class Request{
-    }
-}

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

@@ -2,10 +2,17 @@ package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
 
 public class SetStatusReblogged extends MastodonAPIRequest<Status>{
-	public SetStatusReblogged(String id, boolean reblogged){
+	public SetStatusReblogged(String id, boolean reblogged, StatusPrivacy visibility){
 		super(HttpMethod.POST, "/statuses/"+id+"/"+(reblogged ? "reblog" : "unreblog"), Status.class);
-		setRequestBody(new Object());
+		Request req = new Request();
+		req.visibility = visibility;
+		setRequestBody(req);
+	}
+
+	public static class Request {
+		public StatusPrivacy visibility;
 	}
 }

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

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.session;
+
+public class AccountActivationInfo{
+	public String email;
+	public long lastEmailConfirmationResend;
+
+	public AccountActivationInfo(String email, long lastEmailConfirmationResend){
+		this.email=email;
+		this.lastEmailConfirmationResend=lastEmailConfirmationResend;
+	}
+}

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

@@ -7,6 +7,7 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.Token;
 
@@ -28,17 +29,20 @@ public class AccountSession{
 	public long filtersLastUpdated;
 	public List<Filter> wordFilters=new ArrayList<>();
 	public String pushAccountID;
+	public Preferences preferences;
+	public AccountActivationInfo activationInfo;
 	private transient MastodonAPIController apiController;
-	private transient StatusInteractionController statusInteractionController;
+	private transient StatusInteractionController statusInteractionController, remoteStatusInteractionController;
 	private transient CacheController cacheController;
 	private transient PushSubscriptionManager pushSubscriptionManager;
 
-	AccountSession(Token token, Account self, Application app, String domain, boolean activated){
+	AccountSession(Token token, Account self, Application app, String domain, boolean activated, AccountActivationInfo activationInfo){
 		this.token=token;
 		this.self=self;
 		this.domain=domain;
 		this.app=app;
 		this.activated=activated;
+		this.activationInfo=activationInfo;
 		infoLastUpdated=System.currentTimeMillis();
 	}
 
@@ -48,6 +52,10 @@ public class AccountSession{
 		return domain+"_"+self.id;
 	}
 
+	public String getFullUsername() {
+		return "@"+self.username+"@"+domain;
+	}
+
 	public MastodonAPIController getApiController(){
 		if(apiController==null)
 			apiController=new MastodonAPIController(this);
@@ -60,6 +68,12 @@ public class AccountSession{
 		return statusInteractionController;
 	}
 
+	public StatusInteractionController getRemoteStatusInteractionController(){
+		if(remoteStatusInteractionController==null)
+			remoteStatusInteractionController=new StatusInteractionController(getID(), false);
+		return remoteStatusInteractionController;
+	}
+
 	public CacheController getCacheController(){
 		if(cacheController==null)
 			cacheController=new CacheController(getID());

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

@@ -13,8 +13,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
-import com.google.gson.JsonParseException;
-
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.MainActivity;
@@ -22,6 +20,7 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
+import org.joinmastodon.android.api.requests.accounts.GetPreferences;
 import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
 import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
@@ -34,6 +33,7 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Token;
 
 import java.io.File;
@@ -100,13 +100,13 @@ public class AccountSessionManager{
 		maybeUpdateShortcuts();
 	}
 
-	public void addAccount(Instance instance, Token token, Account self, Application app, boolean active){
+	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
 		instances.put(instance.uri, instance);
-		AccountSession session=new AccountSession(token, self, app, instance.uri, active);
+		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
-		updateInstanceEmojis(instance, instance.uri);
+		updateMoreInstanceInfo(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
@@ -248,12 +248,13 @@ public class AccountSessionManager{
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-			if(now-session.infoLastUpdated>24L*3600_000L){
-				updateSessionLocalInfo(session);
-			}
-			if(now-session.filtersLastUpdated>3600_000L){
-				updateSessionWordFilters(session);
-			}
+//			if(now-session.infoLastUpdated>24L*3600_000L){
+			updateSessionPreferences(session);
+			updateSessionLocalInfo(session);
+//			}
+//			if(now-session.filtersLastUpdated>3600_000L){
+			updateSessionWordFilters(session);
+//			}
 		}
 		if(loadedInstances){
 			maybeUpdateCustomEmojis(domains);
@@ -263,10 +264,10 @@ public class AccountSessionManager{
 	private void maybeUpdateCustomEmojis(Set<String> domains){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-			Long lastUpdated=instancesLastUpdated.get(domain);
-			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
-				updateInstanceInfo(domain);
-			}
+//			Long lastUpdated=instancesLastUpdated.get(domain);
+//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
+			updateInstanceInfo(domain);
+//			}
 		}
 	}
 
@@ -288,6 +289,18 @@ public class AccountSessionManager{
 				.exec(session.getID());
 	}
 
+	private void updateSessionPreferences(AccountSession session){
+		new GetPreferences().setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Preferences preferences) {
+				session.preferences=preferences;
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {}
+		}).exec(session.getID());
+	}
+
 	private void updateSessionWordFilters(AccountSession session){
 		new GetWordFilters()
 				.setCallback(new Callback<>(){
@@ -312,7 +325,7 @@ public class AccountSessionManager{
 					@Override
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
-						updateInstanceEmojis(instance, domain);
+						updateMoreInstanceInfo(instance, domain);
 					}
 
 					@Override
@@ -323,6 +336,21 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
+	public void updateMoreInstanceInfo(Instance instance, String domain) {
+		new GetInstance.V2().setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Instance.V2 v2) {
+				if (instance != null) instance.v2 = v2;
+				updateInstanceEmojis(instance, domain);
+			}
+
+			@Override
+			public void onError(ErrorResponse errorResponse) {
+				updateInstanceEmojis(instance, domain);
+			}
+		}).execNoAuth(instance.uri);
+	}
+
 	private void updateInstanceEmojis(Instance instance, String domain){
 		new GetCustomEmojis()
 				.setCallback(new Callback<>(){
@@ -398,6 +426,10 @@ public class AccountSessionManager{
 		return instances.get(domain);
 	}
 
+	public Instance getInstanceInfoForAccount(String account) {
+		return AccountSessionManager.getInstance().getInstanceInfo(instance.getAccount(account).domain);
+	}
+
 	public void updateAccountInfo(String id, Account account){
 		AccountSession session=getAccount(id);
 		session.self=account;

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.ScheduledStatus;
+
+public class ScheduledStatusCreatedEvent {
+	public final ScheduledStatus scheduledStatus;
+	public final String accountID;
+
+	public ScheduledStatusCreatedEvent(ScheduledStatus scheduledStatus, String accountID){
+		this.scheduledStatus = scheduledStatus;
+		this.accountID=accountID;
+	}
+}

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

@@ -0,0 +1,13 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.ScheduledStatus;
+
+public class ScheduledStatusDeletedEvent{
+	public final String id;
+	public final String accountID;
+
+	public ScheduledStatusDeletedEvent(String id, String accountID){
+		this.id=id;
+		this.accountID=accountID;
+	}
+}

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

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

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

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

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

@@ -16,6 +16,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.animation.TranslateAnimation;
+import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
@@ -71,6 +73,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
 	protected PhotoViewer currentPhotoViewer;
+	protected ImageButton fab;
+	protected int scrollDiff = 0;
 	protected HashMap<String, Account> knownAccounts=new HashMap<>();
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
@@ -273,11 +277,46 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
+
+				if (fab!=null && GlobalUserPreferences.enableFabAutoHide) {
+					if(dy > 0){
+						scrollDiff = 0;
+					}
+					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
+						TranslateAnimation animate = new TranslateAnimation(
+								0,
+								0,
+								0,
+								fab.getHeight() * 2);
+						animate.setDuration(300);
+						animate.setFillAfter(true);
+						fab.startAnimation(animate);
+						fab.setVisibility(View.INVISIBLE);
+						scrollDiff = 0;
+					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
+						if (scrollDiff > 800) {
+							fab.setVisibility(View.VISIBLE);
+							TranslateAnimation animate = new TranslateAnimation(
+									0,
+									0,
+									fab.getHeight() * 2,
+									0);
+							animate.setDuration(300);
+							animate.setFillAfter(true);
+							fab.startAnimation(animate);
+							scrollDiff = 0;
+						} else {
+							scrollDiff += Math.abs(dy);
+						}
+					}
+				}
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());
@@ -462,21 +501,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		Status status=holder.getItem().status;
 		revealSpoiler(status, holder.getItemID());
 	}
-	public void onRevealTranslationClick(HeaderStatusDisplayItem.Holder holder){
-		Status status=holder.getItem().status;
-		revealTranslation(status, holder.getItemID());
-	}
-
-	protected void revealTranslation(Status status, String itemID){
-		status.wantsTranslation=!status.wantsTranslation;
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
-		if(text!=null)
-			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
-		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if(header!=null)
-			header.rebind();
-		updateImagesSpoilerState(status, itemID);
-	}
 
 	protected void revealSpoiler(Status status, String itemID){
 		status.spoilerRevealed=true;
@@ -690,7 +714,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		private int currentMediaHiddenLayoutsWidth=0;
 
 		{
-			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), R.attr.colorPollVoted));
+			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), GlobalUserPreferences.disableDividers ? R.attr.colorWindowBackground : R.attr.colorPollVoted));
 			dividerPaint.setStyle(Paint.Style.STROKE);
 			dividerPaint.setStrokeWidth(V.dp(1));
 		}
@@ -802,7 +826,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			currentMediaHiddenLayoutsWidth=width;
 			String title=getString(R.string.sensitive_content);
 			TextPaint titlePaint=new TextPaint(Paint.ANTI_ALIAS_FLAG);
-			titlePaint.setColor(getResources().getColor(R.color.gray_50));
+			titlePaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray50));
 			titlePaint.setTextSize(V.dp(22));
 			titlePaint.setTypeface(mediumTypeface);
 			mediaHiddenTitleLayout=StaticLayout.Builder.obtain(title, 0, title.length(), titlePaint, width)
@@ -813,7 +837,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					.setAlignment(Layout.Alignment.ALIGN_CENTER)
 					.build();
 			TextPaint textPaint=new TextPaint(Paint.ANTI_ALIAS_FLAG);
-			textPaint.setColor(getResources().getColor(R.color.gray_200));
+			textPaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray200));
 			textPaint.setTextSize(V.dp(16));
 			String text=getString(R.string.sensitive_content_explain);
 			mediaHiddenTextLayout=StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, width)

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

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

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

@@ -302,7 +302,7 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowReque
 				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();
 				if (!rel.requested && !rel.followedBy && adapter != null) {
 					data.remove(item);
-					adapter.notifyItemRemoved(getBindingAdapterPosition());
+					adapter.notifyItemRemoved(getLayoutPosition());
 				} else {
 					rebind();
 				}

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

@@ -0,0 +1,115 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop {
+    private String nextMaxID;
+    private String accountId;
+
+    public FollowedHashtagsFragment() {
+        super(20);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle args=getArguments();
+        accountId=args.getString("account");
+        setTitle(R.string.sk_hashtags_you_follow);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count){
+        currentRequest=new GetFollowedHashtags(offset==0 ? null : nextMaxID, null, count, null)
+                .setCallback(new SimpleCallback<>(this){
+                    @Override
+                    public void onSuccess(HeaderPaginationList<Hashtag> result){
+                        if(result.nextPageUri!=null)
+                            nextMaxID=result.nextPageUri.getQueryParameter("max_id");
+                        else
+                            nextMaxID=null;
+                        onDataLoaded(result, nextMaxID!=null);
+                    }
+                })
+                .exec(accountId);
+    }
+
+    @Override
+    protected RecyclerView.Adapter getAdapter() {
+        return new HashtagsAdapter();
+    }
+
+    @Override
+    public void scrollToTop() {
+        smoothScrollRecyclerViewToTop(list);
+    }
+
+    private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
+        @NonNull
+        @Override
+        public HashtagViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+            return new HashtagViewHolder();
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull HashtagViewHolder holder, int position) {
+            holder.bind(data.get(position));
+        }
+
+        @Override
+        public int getItemCount() {
+            return data.size();
+        }
+    }
+
+    private class HashtagViewHolder extends BindableViewHolder<Hashtag> implements UsableRecyclerView.Clickable{
+        private final TextView title;
+
+        public HashtagViewHolder(){
+            super(getActivity(), R.layout.item_text, list);
+            title=findViewById(R.id.title);
+        }
+
+        @Override
+        public void onBind(Hashtag item) {
+            title.setText(item.name);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_number_symbol_24_regular), null, null, null);
+        }
+
+        @Override
+        public void onClick() {
+            UiUtils.openHashtagTimeline(getActivity(), accountId, item.name, item.following);
+        }
+    }
+}

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

@@ -16,6 +16,7 @@ import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
 
@@ -117,6 +118,7 @@ public class HashtagTimelineFragment extends StatusListFragment{
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
+		fab.setOnLongClickListener(v -> UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' '));
 	}
 
 	private void onFabClick(View v){

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

@@ -5,6 +5,7 @@ import android.app.NotificationManager;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
+import android.service.notification.StatusBarNotification;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,7 +16,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import org.joinmastodon.android.PushNotificationReceiver;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -41,7 +41,11 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
 	private FragmentRootLinearLayout content;
-	private HomeTimelineFragment homeTimelineFragment;
+
+	private HomeTabFragment homeTabFragment;
+
+//	private HomeTimelineFragment homeTimelineFragment;
+
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
@@ -57,7 +61,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
-		setTitle(R.string.sk_app_name);
+		setTitle(R.string.mo_app_name);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
@@ -65,8 +69,13 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			homeTimelineFragment=new HomeTimelineFragment();
-			homeTimelineFragment.setArguments(args);
+
+			homeTabFragment=new HomeTabFragment();
+			homeTabFragment.setArguments(args);
+
+//			homeTimelineFragment=new HomeTimelineFragment();
+//			homeTimelineFragment.setArguments(args);
+
 			args=new Bundle(args);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
@@ -110,12 +119,19 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.fragment_wrap, homeTimelineFragment)
+					.add(R.id.fragment_wrap, homeTabFragment)
 					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
 					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
 					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 
+//			getChildFragmentManager().beginTransaction()
+//					.add(R.id.fragment_wrap, homeTimelineFragment)
+//					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
+//					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
+//					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
+//					.commit();
+
 			String defaultTab=getArguments().getString("tab");
 			if("notifications".equals(defaultTab)){
 				tabBar.selectTab(R.id.tab_notifications);
@@ -136,21 +152,36 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onViewStateRestored(Bundle savedInstanceState){
 		super.onViewStateRestored(savedInstanceState);
-		if(savedInstanceState==null || homeTimelineFragment!=null)
-			return;
-		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
+
+		if(savedInstanceState==null) return;
+
+//		if(savedInstanceState==null || homeTimelineFragment!=null)
+//			return;
+
+		homeTabFragment=(HomeTabFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTabFragment");
+
+//		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
 		searchFragment=(DiscoverFragment) getChildFragmentManager().getFragment(savedInstanceState, "searchFragment");
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
 		Fragment current=fragmentForTab(currentTab);
+
 		getChildFragmentManager().beginTransaction()
-				.hide(homeTimelineFragment)
+				.hide(homeTabFragment)
 				.hide(searchFragment)
 				.hide(notificationsFragment)
 				.hide(profileFragment)
 				.show(current)
 				.commit();
+
+		//		getChildFragmentManager().beginTransaction()
+//				.hide(homeTimelineFragment)
+//				.hide(searchFragment)
+//				.hide(notificationsFragment)
+//				.hide(profileFragment)
+//				.show(current)
+//				.commit();
 		maybeTriggerLoading(current);
 	}
 
@@ -180,7 +211,11 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
 		WindowInsets topOnlyInsets=insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), 0, 0);
-		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
+
+		homeTabFragment.onApplyWindowInsets(topOnlyInsets);
+
+//		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
+
 		searchFragment.onApplyWindowInsets(topOnlyInsets);
 		notificationsFragment.onApplyWindowInsets(topOnlyInsets);
 		profileFragment.onApplyWindowInsets(topOnlyInsets);
@@ -188,7 +223,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	private Fragment fragmentForTab(@IdRes int tab){
 		if(tab==R.id.tab_home){
-			return homeTimelineFragment;
+			return homeTabFragment;
+
+		//		if(tab==R.id.tab_home){
+//			return homeTimelineFragment;
 		}else if(tab==R.id.tab_search){
 			return searchFragment;
 		}else if(tab==R.id.tab_notifications){
@@ -202,6 +240,17 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
+			if(tab == R.id.tab_search){
+				if(newFragment instanceof ScrollableToTop scrollable)
+					scrollable.scrollToTop();
+				searchFragment.selectSearch();
+				return;
+			}
+			if(newFragment instanceof ScrollableToTop scrollable)
+				scrollable.scrollToTop();
+			return;
+		}
+		if(tab==currentTab && tab == R.id.tab_search){
 			if(newFragment instanceof ScrollableToTop scrollable)
 				scrollable.scrollToTop();
 			return;
@@ -222,7 +271,11 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			((NotificationsFragment) newFragment).loadData();
 			// TODO make an interface?
 			NotificationManager nm=getActivity().getSystemService(NotificationManager.class);
-			nm.cancel(accountID, PushNotificationReceiver.NOTIFICATION_ID);
+			for (StatusBarNotification notification : nm.getActiveNotifications()) {
+				if (accountID.equals(notification.getTag())) {
+					nm.cancel(accountID, notification.getId());
+				}
+			}
 		}
 	}
 
@@ -235,6 +288,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
+		if(tab==R.id.tab_search){
+			onTabSelected(R.id.tab_search);
+			tabBar.selectTab(R.id.tab_search);
+			searchFragment.selectSearch();
+			return true;
+		}
 		return false;
 	}
 
@@ -248,17 +307,24 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			tabBar.selectTab(R.id.tab_home);
 			onTabSelected(R.id.tab_home);
 			return true;
+		} else {
+			return homeTabFragment.onBackPressed();
 		}
-		return false;
 	}
 
 	@Override
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
-		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+
+		if (homeTabFragment.isAdded()) getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
+		if (searchFragment.isAdded()) getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+
+//		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
+//		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+//		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+//		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
 }

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

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

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

@@ -1,78 +1,46 @@
 package org.joinmastodon.android.fragments;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toolbar;
 
-import com.squareup.otto.Subscribe;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 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.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class HomeTimelineFragment extends StatusListFragment{
-	private ImageButton fab;
-	private ImageView toolbarLogo;
-	private Button toolbarShowNewPostsBtn;
-	private boolean newPostsBtnShown;
-	private AnimatorSet currentNewPostsAnim;
-
+public class HomeTimelineFragment extends FabStatusListFragment {
+	private HomeTabFragment parent;
 	private String maxID;
-
-	public HomeTimelineFragment(){
-		setListLayoutId(R.layout.recycler_fragment_with_fab);
-	}
+	private String lastSavedMarkerID;
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setHasOptionsMenu(true);
+		if (getParentFragment() instanceof HomeTabFragment home) parent = home;
 		loadData();
 	}
 
@@ -104,41 +72,15 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab=view.findViewById(R.id.fab);
-		fab.setOnClickListener(this::onFabClick);
-		updateToolbarLogo();
+
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				if(newPostsBtnShown && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
-					hideNewPostsButton();
+				if(parent != null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+					parent.hideNewPostsButton();
 				}
 			}
 		});
-
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.register(this);
-			updateUpdateState(GithubSelfUpdater.getInstance().getState());
-		}
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.home, menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), SettingsFragment.class, args);
-		return true;
-	}
-
-	@Override
-	public void onConfigurationChanged(Configuration newConfig){
-		super.onConfigurationChanged(newConfig);
-		updateToolbarLogo();
 	}
 
 	@Override
@@ -153,14 +95,31 @@ public class HomeTimelineFragment extends StatusListFragment{
 		}
 	}
 
-	public void onStatusCreated(StatusCreatedEvent ev){
-		prependItems(Collections.singletonList(ev.status), true);
+	@Override
+	protected void onHidden(){
+		super.onHidden();
+//		if(!data.isEmpty()){
+//			String topPostID=displayItems.get(list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset()).parentID;
+//			if(!topPostID.equals(lastSavedMarkerID)){
+//				lastSavedMarkerID=topPostID;
+//				new SaveMarkers(topPostID, null)
+//						.setCallback(new Callback<>(){
+//							@Override
+//							public void onSuccess(SaveMarkers.Response result){
+//							}
+//
+//							@Override
+//							public void onError(ErrorResponse error){
+//								lastSavedMarkerID=null;
+//							}
+//						})
+//						.exec(accountID);
+//			}
+//		}
 	}
 
-	private void onFabClick(View v){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), ComposeFragment.class, args);
+	public void onStatusCreated(StatusCreatedEvent ev){
+		prependItems(Collections.singletonList(ev.status), true);
 	}
 
 	private void loadNewPosts(){
@@ -187,13 +146,11 @@ public class HomeTimelineFragment extends StatusListFragment{
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
-						if(!filters.isEmpty()){
-							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
-						}
+						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							showNewPostsButton();
+							if (parent != null) parent.showNewPostsButton();
 							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
 					}
@@ -264,18 +221,14 @@ public class HomeTimelineFragment extends StatusListFragment{
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
-							outer:
+							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
-								for(Filter filter:filters){
-									if(filter.matches(s)){
-										continue outer;
-									}
+								if(filterPredicate.test(s)){
+									targetList.addAll(buildDisplayItems(s));
+									insertedPosts.add(s);
 								}
-								targetList.addAll(buildDisplayItems(s));
-								insertedPosts.add(s);
 							}
 							if(targetList.isEmpty()){
 								// oops. We didn't add new posts, but at least we know there are none.
@@ -313,132 +266,10 @@ public class HomeTimelineFragment extends StatusListFragment{
 			currentRequest=null;
 			dataLoading=false;
 		}
+		if (parent != null) parent.hideNewPostsButton();
 		super.onRefresh();
 	}
 
-	private void updateToolbarLogo(){
-		toolbarLogo=new ImageView(getActivity());
-		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-		toolbarLogo.setImageResource(R.drawable.logo);
-		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
-//		toolbarLogo =new TextView(getActivity());
-//		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
-//		toolbarLogo.setTextAppearance(R.style.app_title);
-
-		toolbarShowNewPostsBtn=new Button(getActivity());
-		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
-		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
-		toolbarShowNewPostsBtn.setStateListAnimator(null);
-		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
-		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
-		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
-		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
-		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
-			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
-		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
-
-		if(newPostsBtnShown){
-			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-			toolbarLogo.setVisibility(View.INVISIBLE);
-			toolbarLogo.setAlpha(0f);
-		}else{
-			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-			toolbarShowNewPostsBtn.setAlpha(0f);
-			toolbarShowNewPostsBtn.setScaleX(.8f);
-			toolbarShowNewPostsBtn.setScaleY(.8f);
-			toolbarLogo.setVisibility(View.VISIBLE);
-		}
-
-		FrameLayout logoWrap=new FrameLayout(getActivity());
-		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
-		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
-
-		Toolbar toolbar=getToolbar();
-		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
-	}
-
-	private void showNewPostsButton(){
-		if(newPostsBtnShown)
-			return;
-		newPostsBtnShown=true;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
-		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarLogo.setVisibility(View.INVISIBLE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	private void hideNewPostsButton(){
-		if(!newPostsBtnShown)
-			return;
-		newPostsBtnShown=false;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarLogo.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
-		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	private void onNewPostsBtnClick(View v){
-		if(newPostsBtnShown){
-			hideNewPostsButton();
-			scrollToTop();
-		}
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.unregister(this);
-		}
-	}
-
-	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
-		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
-			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
-	}
-
-	@Subscribe
-	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-		updateUpdateState(ev.state);
-	}
-
 	@Override
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;

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

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

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

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

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

@@ -14,6 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
 import org.joinmastodon.android.events.FollowRequestHandledEvent;
@@ -73,15 +74,26 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
+		menu.findItem(R.id.clear_notifications).setVisible(GlobalUserPreferences.enableDeleteNotifications);
+		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.follow_requests);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() != R.id.follow_requests) return false;
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
-		return true;
+		if (item.getItemId() == R.id.follow_requests) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+			return true;
+		} else if (item.getItemId() == R.id.clear_notifications) {
+			UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{
+				for (int i = 0; i < tabViews.length; i++) {
+					getFragmentForPage(i).reload();
+				}
+			});
+			return true;
+		}
+		return false;
 	}
 
 	@Override
@@ -90,6 +102,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
+		UiUtils.reduceSwipeSensitivity(pager);
 
 		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
@@ -109,6 +122,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
 
 		pager.setOffscreenPageLimit(4);
+		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new DiscoverPagerAdapter());
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override

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

@@ -2,6 +2,8 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 
 import com.squareup.otto.Subscribe;
@@ -10,7 +12,6 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Notification;
@@ -78,9 +79,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			case FAVORITE -> getString(R.string.user_favorited);
 			case POLL -> getString(R.string.poll_ended);
 		};
-		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, null, extraText) : null;
+		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, null, extraText, n, null) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n);
 			if(titleItem!=null){
 				for(StatusDisplayItem item:items){
 					if(item instanceof ImageStatusDisplayItem imgItem){
@@ -210,7 +211,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	private void removeNotification(Notification n){
+	public void removeNotification(Notification n){
 		data.remove(n);
 		preloadedData.remove(n);
 		int index=-1;

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

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

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

@@ -1,15 +1,11 @@
 package org.joinmastodon.android.fragments;
 
-import static android.content.Context.CLIPBOARD_SERVICE;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -31,17 +27,24 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.viewpager2.widget.ViewPager2;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
@@ -49,6 +52,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -80,10 +84,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -120,6 +120,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
 
+	public FrameLayout noteWrap;
+	public EditText noteEdit;
+	private String note;
 	private Account account;
 	private String accountID;
 	private Relationship relationship;
@@ -131,10 +134,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Uri editNewAvatar, editNewCover;
 	private String profileAccountID;
 	private boolean refreshing;
-	private View fab;
+	private ImageButton fab;
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
+	private boolean isScrollingUp = false;
 
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
@@ -161,6 +165,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
+	private String getPrefilledText() {
+		return account == null || AccountSessionManager.getInstance().isSelf(accountID, account)
+				? null : '@'+account.acct+' ';
+	}
+
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -183,6 +192,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingCount=content.findViewById(R.id.following_count);
 		followingLabel=content.findViewById(R.id.following_label);
 		followingBtn=content.findViewById(R.id.following_btn);
+
 		postsCount=content.findViewById(R.id.posts_count);
 		postsLabel=content.findViewById(R.id.posts_label);
 		postsBtn=content.findViewById(R.id.posts_btn);
@@ -199,6 +209,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 
+		noteEdit = content.findViewById(R.id.note_edit);
+		noteWrap = content.findViewById(R.id.note_edit_wrap);
+		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
+
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
 			public void getOutline(View view, Outline outline){
@@ -207,6 +221,49 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if (hasFocus) {
+				fab.setVisibility(View.INVISIBLE);
+				TranslateAnimation animate = new TranslateAnimation(
+						0,
+						0,
+						0,
+						fab.getHeight() * 2);
+				animate.setDuration(300);
+				animate.setFillAfter(true);
+				fab.startAnimation(animate);
+
+				noteEditConfirm.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(1.0f)
+						.setDuration(700);
+			} else {
+				fab.setVisibility(View.VISIBLE);
+				TranslateAnimation animate = new TranslateAnimation(
+						0,
+						0,
+						fab.getHeight() * 2,
+						0);
+				animate.setDuration(300);
+				animate.setFillAfter(true);
+				fab.startAnimation(animate);
+
+				noteEditConfirm.animate()
+						.alpha(0.0f)
+						.setDuration(700);
+				noteEditConfirm.setVisibility(View.INVISIBLE);
+			}
+		});
+
+		noteEditConfirm.setOnClickListener((v -> {
+			if (!noteEdit.getText().toString().trim().equals(note)) {
+				savePrivateNote();
+			}
+			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
+			noteEdit.clearFocus();
+		}));
+
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -233,7 +290,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
+		UiUtils.reduceSwipeSensitivity(pager);
 		pager.setOffscreenPageLimit(5);
+		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new ProfilePagerAdapter());
 		pager.getLayoutParams().height=getResources().getDisplayMetrics().heightPixels;
 
@@ -271,6 +330,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		cover.setOnClickListener(this::onCoverClick);
 		refreshLayout.setOnRefreshListener(this);
 		fab.setOnClickListener(this::onFabClick);
+		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID, getPrefilledText()));
 
 		if(loaded){
 			bindHeaderView();
@@ -284,20 +344,36 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
 		username.setOnLongClickListener(v->{
-			String username=account.acct;
-			if(!username.contains("@")){
-				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
-			}
-			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+username));
-			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU){ // Android 13+ SystemUI shows its own thing when you put things into the clipboard
-				Toast.makeText(getActivity(), R.string.text_copied, Toast.LENGTH_SHORT).show();
+			String usernameString=account.acct;
+			if(!usernameString.contains("@")){
+				usernameString+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 			}
+			UiUtils.copyText(username, '@'+usernameString);
 			return true;
 		});
 
 		return sizeWrapper;
 	}
 
+	public void setNote(String note){
+		this.note=note;
+		noteWrap.setVisibility(View.VISIBLE);
+		noteEdit.setVisibility(View.VISIBLE);
+		noteEdit.setText(note);
+	}
+
+	private void savePrivateNote(){
+		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Relationship result) {}
+
+			@Override
+			public void onError(ErrorResponse result) {
+				Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show();
+			}
+		}).exec(accountID);
+	}
+
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -445,6 +521,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
+
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
 			ssb.append(account.acct);
@@ -458,6 +535,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
+		}else if(account.bot){
+			ssb=new SpannableStringBuilder("@");
+			ssb.append(account.acct);
+			if(isSelf){
+				ssb.append('@');
+				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
+			}
+			ssb.append(" ");
+			Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, getActivity().getTheme()).mutate();
+			botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
+			botIcon.setTint(username.getCurrentTextColor());
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
+			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
@@ -469,6 +559,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setVisibility(View.VISIBLE);
 			bio.setText(parsedBio);
 		}
+
+
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -548,21 +640,32 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		if(isOwnProfile){
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.scheduled, R.id.bookmarks, R.id.favorites);
+		}else{
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
+		}
+		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
 		if(isOwnProfile)
 			return;
 
-		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
-		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
-		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
+		MenuItem mute = menu.findItem(R.id.mute);
+		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
+		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
+		UiUtils.insetPopupMenuIcon(getContext(), mute);
+
+		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
+		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
+		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 		if(relationship.following) {
-			menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
-			manageUserLists.setVisible(true);
+			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
+			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
+			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
+			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
-			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -582,6 +685,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			confirmToggleMuted();
 		}else if(id==R.id.block){
 			confirmToggleBlocked();
+		}else if(id==R.id.soft_block){
+			confirmSoftBlockUser();
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -620,9 +725,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("profileAccount", profileAccountID);
-			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			if (!isOwnProfile) {
+				args.putString("profileAccount", profileAccountID);
+				args.putString("profileDisplayUsername", account.getDisplayUsername());
+			}
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
+		}else if(id==R.id.followed_hashtags){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			Nav.go(getActivity(), FollowedHashtagsFragment.class, args);
+		}else if(id==R.id.scheduled){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			Nav.go(getActivity(), ScheduledStatusListFragment.class, args);
 		}
 		return true;
 	}
@@ -661,9 +776,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
+		if (!isOwnProfile) {
+			setNote(relationship.note);
+			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
+		}
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
+	public ImageButton getFab() {
+		return fab;
+	}
+
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
 		int topBarsH=getToolbar().getHeight()+statusBarHeight;
 		if(scrollY>avatarBorder.getTop()-topBarsH){
@@ -878,6 +1001,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
 	}
 
+	private void confirmSoftBlockUser(){
+		UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
+	}
+
 	private void updateRelationship(Relationship r){
 		relationship=r;
 		updateRelationship();
@@ -885,6 +1012,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public boolean onBackPressed(){
+		if(noteEdit.hasFocus()) {
+			savePrivateNote();
+		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;
@@ -934,9 +1064,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		if(!AccountSessionManager.getInstance().isSelf(accountID, account)){
-			args.putString("prefilledText", '@'+account.acct+' ');
-		}
+		if(getPrefilledText() != null) args.putString("prefilledText", getPrefilledText());
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 

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

@@ -0,0 +1,171 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
+import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
+import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.ScheduledStatus;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.Collections;
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class ScheduledStatusListFragment extends BaseStatusListFragment<ScheduledStatus> {
+	private String nextMaxID;
+	private ImageButton fab;
+	private static final int SCHEDULED_STATUS_LIST_OPENED = 161;
+
+	public ScheduledStatusListFragment() {
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		E.unregister(this);
+	}
+
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setTitle(R.string.sk_unsent_posts);
+		loadData();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putSerializable("scheduledAt", CreateStatus.getDraftInstant());
+		fab.setOnClickListener(v -> Nav.go(getActivity(), ComposeFragment.class, args));
+		fab.setOnLongClickListener(v -> UiUtils.pickAccountForCompose(getActivity(), accountID, args));
+		if (getArguments().getBoolean("hide_fab", false)) fab.setVisibility(View.GONE);
+	}
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+	}
+
+	@Override
+	protected void addAccountToKnown(ScheduledStatus s) {}
+
+	@Override
+	public void onItemClick(String id) {
+		final Bundle args=new Bundle();
+		args.putString("account", accountID);
+		ScheduledStatus scheduledStatus = getStatusByID(id);
+		Status status = scheduledStatus.toStatus();
+		args.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
+		args.putParcelable("editStatus", Parcels.wrap(status));
+		args.putString("sourceText", status.text);
+		args.putString("sourceSpoiler", status.spoilerText);
+		args.putBoolean("redraftStatus", true);
+		setResult(true, null);
+
+		// closing this scheduled status list if another status list is opened from compose fragment
+		Nav.goForResult(getActivity(), ComposeFragment.class, args, SCHEDULED_STATUS_LIST_OPENED, this);
+	}
+
+	@Override
+	public void onFragmentResult(int reqCode, boolean success, Bundle result) {
+		if (reqCode == SCHEDULED_STATUS_LIST_OPENED && success && getActivity() != null) {
+			Nav.finish(this);
+		}
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetScheduledStatuses(offset==0 ? null : nextMaxID, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(HeaderPaginationList<ScheduledStatus> result){
+						if(result.nextPageUri!=null)
+							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
+						else
+							nextMaxID=null;
+						onDataLoaded(result, nextMaxID!=null);
+					}
+				})
+				.exec(accountID);
+	}
+
+	// copied from StatusListFragment.java
+	@Subscribe
+	public void onScheduledStatusDeleted(ScheduledStatusDeletedEvent ev){
+		if(!ev.accountID.equals(accountID)) return;
+		ScheduledStatus status=getStatusByID(ev.id);
+		if(status==null) return;
+		removeStatus(status);
+	}
+
+	// copied from StatusListFragment.java
+	@Subscribe
+	public void onScheduledStatusCreated(ScheduledStatusCreatedEvent ev){
+		if(!ev.accountID.equals(accountID))	return;
+		prependItems(Collections.singletonList(ev.scheduledStatus), true);
+		scrollToTop();
+	}
+
+	// copied from StatusListFragment.java
+	protected void removeStatus(ScheduledStatus status){
+		data.remove(status);
+		preloadedData.remove(status);
+		int index=-1;
+		for(int i=0;i<displayItems.size();i++){
+			if(status.id.equals(displayItems.get(i).parentID)){
+				index=i;
+				break;
+			}
+		}
+		if(index==-1)
+			return;
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(status.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
+
+	// copied from StatusListFragment.java
+	protected ScheduledStatus getStatusByID(String id){
+		for(ScheduledStatus s:data){
+			if(s.id.equals(id)){
+				return s;
+			}
+		}
+		for(ScheduledStatus s:preloadedData){
+			if(s.id.equals(id)){
+				return s;
+			}
+		}
+		return null;
+	}
+}

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

@@ -9,16 +9,21 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
@@ -31,6 +36,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -40,12 +46,15 @@ import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
+import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
@@ -55,6 +64,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 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.imageloader.ImageCache;
@@ -73,7 +84,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private PushSubscription pushSubscription;
 
 	private ImageView themeTransitionWindowView;
-	private TextItem checkForUpdateItem;
+	private TextItem checkForUpdateItem, clearImageCacheItem;
+	private ImageCache imageCache;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -81,8 +93,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		setTitle(R.string.settings);
+		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		String instanceName = UiUtils.getInstanceName(accountID);
 
 		if(GithubSelfUpdater.needSelfUpdating()){
 			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
@@ -95,13 +110,79 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
-		items.add(new SwitchItem(R.string.disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new ColorPicker());
+		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
+			GlobalUserPreferences.uniformNotificationIcon=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
+			GlobalUserPreferences.reduceMotion=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
+			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.color_palettes);
+			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
+			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
+			b.setOnTouchListener(popupMenu.getDragToOpenListener());
+			b.setOnClickListener(v->popupMenu.show());
+			b.setText(switch(GlobalUserPreferences.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;
+				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;
+				case NORD -> R.string.mo_color_palette_nord;
+			});
+		}));
+		items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b-> {
+			updatePublishText(b);
+			if (GlobalUserPreferences.relocatePublishButton) {
+				b.setOnClickListener(l -> {
+					Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization,
+							Toast.LENGTH_LONG).show();
+				});
+			} else {
+				b.setOnClickListener(l -> {
+					FrameLayout inputWrap = new FrameLayout(getContext());
+					EditText input = new EditText(getContext());
+					input.setHint(R.string.publish);
+					input.setText(GlobalUserPreferences.publishButtonText.trim());
+					FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+					params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
+					input.setLayoutParams(params);
+					inputWrap.addView(input);
+					new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
+							.setPositiveButton(R.string.save, (d, which) -> {
+								GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
+								GlobalUserPreferences.save();
+								updatePublishText(b);
+							})
+							.setNeutralButton(R.string.clear, (d, which) -> {
+								GlobalUserPreferences.publishButtonText = "";
+								GlobalUserPreferences.save();
+								updatePublishText(b);
+							})
+							.setNegativeButton(R.string.cancel, (d, which) -> {
+							})
+							.show();
+				});}
+		}));
+
 
 		items.add(new HeaderItem(R.string.settings_behavior));
+		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
+			GlobalUserPreferences.showFederatedTimeline=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
 			GlobalUserPreferences.playGifs=i.checked;
 			GlobalUserPreferences.save();
@@ -114,10 +195,40 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.showInteractionCounts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
+		items.add(new SwitchItem(R.string.sk_settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
 			GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.sk_tabs_disable_swipe, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{
+			GlobalUserPreferences.disableSwipe=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+//		items.add(new SwitchItem(R.string.sk_settings_show_differentiated_notification_icons, R.drawable.ic_ntf_logo, GlobalUserPreferences.showUniformPushNoticationIcons, this::onNotificationStyleChanged));
+		items.add(new SwitchItem(R.string.mo_disable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.disableDividers, i->{
+			GlobalUserPreferences.disableDividers=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+		items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.enableFabAutoHide, i->{
+			GlobalUserPreferences.enableFabAutoHide =i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
+//		items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_delete_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{
+//			GlobalUserPreferences.enableDeleteNotifications=i.checked;
+//			GlobalUserPreferences.save();
+//			needAppRestart=true;
+//		}));
+		items.add(new SwitchItem(R.string.mo_relocate_publish_button, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{
+			GlobalUserPreferences.relocatePublishButton=i.checked;
+			GlobalUserPreferences.save();
+		}));
+//		items.add(new SwitchItem(R.string.sk_settings_hide_translate_in_timeline, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
+//			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
+//			GlobalUserPreferences.save();
+//			needAppRestart=true;
+//		}));
 
 		items.add(new HeaderItem(R.string.home_timeline));
 		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
@@ -132,11 +243,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.loadNewPosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
-			GlobalUserPreferences.showFederatedTimeline=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
 
 		items.add(new HeaderItem(R.string.settings_notifications));
 		items.add(notificationPolicyItem=new NotificationPolicyItem());
@@ -144,24 +250,63 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i->onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked)));
 		items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked)));
 		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked)));
-		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_at_symbol, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
+		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
 		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
+		items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
+			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
+			GlobalUserPreferences.save();
+		}));
 
-		items.add(new HeaderItem(R.string.settings_boring));
-		items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
-		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
-		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
+		items.add(new HeaderItem(R.string.settings_account));
+		items.add(new TextItem(R.string.sk_settings_profile, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/profile"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_posting, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/preferences/other"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_filters, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/filters"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
 
-		items.add(new RedHeaderItem(R.string.settings_spicy));
+		items.add(new HeaderItem(instanceName));
+		items.add(new TextItem(R.string.sk_settings_rules, ()->{
+			Bundle args=new Bundle();
+			args.putParcelable("instance", Parcels.wrap(instance));
+			Nav.go(getActivity(), InstanceRulesFragment.class, args);
+		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
+		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
+		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
+		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
+		items.add(new SmallTextItem(getString(translationAvailable ?
+				R.string.sk_settings_translation_availability_note_available :
+				R.string.sk_settings_translation_availability_note_unavailable, instance.title)));
+
+
+		items.add(new HeaderItem(R.string.sk_settings_about));
+//		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular));
+//		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular));
 		if (GithubSelfUpdater.needSelfUpdating()) {
 			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
-		items.add(new TextItem(R.string.settings_contribute_fork, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon")));
-		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
-		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
+		items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
+//		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
+		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
+		items.add(clearImageCacheItem);
+		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
+			GlobalUserPreferences.recentLanguages.remove(accountID);
+			GlobalUserPreferences.save();
+		})));
+		items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
+			GlobalUserPreferences.recentEmojis.clear();
+			GlobalUserPreferences.save();
+		}));
+//		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 
-		items.add(new FooterItem(getString(R.string.settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
+		items.add(new FooterItem(getString(R.string.mo_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
+	}
+
+	private void updatePublishText(Button btn) {
+		if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
+		else btn.setText(GlobalUserPreferences.publishButtonText);
 	}
 
 	@Override
@@ -236,13 +381,29 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		restartActivityToApplyNewTheme();
 	}
 
-	private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){
+	private boolean onColorPreferenceClick(MenuItem item){
+		ColorPreference pref = null;
+		int id = item.getItemId();
 
-		GlobalUserPreferences.color=color;
+		if (id == R.id.m3_color) pref = ColorPreference.MATERIAL3;
+		else if (id == R.id.pink_color) pref = ColorPreference.PINK;
+		else if (id == R.id.purple_color) pref = ColorPreference.PURPLE;
+		else if (id == R.id.green_color) pref = ColorPreference.GREEN;
+		else if (id == R.id.blue_color) pref = ColorPreference.BLUE;
+		else if (id == R.id.brown_color) pref = ColorPreference.BROWN;
+		else if (id == R.id.red_color) pref = ColorPreference.RED;
+		else if (id == R.id.yellow_color) pref = ColorPreference.YELLOW;
+		else if (id == R.id.nord_color) pref = ColorPreference.NORD;
+
+		if (pref == null) return false;
+
+		GlobalUserPreferences.color=pref;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
+		return true;
 	}
 
+
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -307,6 +468,12 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		needUpdateNotificationSettings=true;
 	}
 
+	private void onNotificationStyleChanged(SwitchItem item){
+		GlobalUserPreferences.uniformNotificationIcon=item.checked;
+		GlobalUserPreferences.save();
+	}
+
+
 	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
 		PushSubscription subscription=getPushSubscription();
 		PushSubscription.Policy prevPolicy=subscription.policy;
@@ -372,9 +539,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private void clearImageCache(){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
-			ImageCache.getInstance(getActivity()).clear();
+			imageCache.clear();
 			Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
 		});
+		if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
+			clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
+			tvh.rebind();
+		}
 	}
 
 	@Subscribe
@@ -412,6 +583,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			this.text=getString(text);
 		}
 
+		public HeaderItem(String text) {
+			this.text=text;
+		}
+
 		@Override
 		public int getViewType(){
 			return 0;
@@ -446,6 +621,23 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	public class ButtonItem extends Item{
+		private int text;
+		private int icon;
+		private Consumer<Button> buttonConsumer;
+
+		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
+			this.text = text;
+			this.icon = icon;
+			this.buttonConsumer = buttonConsumer;
+		}
+
+		@Override
+		public int getViewType(){
+			return 8;
+		}
+	}
+
 	public class ColorPicker extends Item{
 		@Override
 		public int getViewType(){
@@ -469,19 +661,44 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	private class TextItem extends Item{
+	private class SmallTextItem extends Item {
 		private String text;
-		private Runnable onClick;
-		private boolean loading;
 
-		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, onClick, false);
+		public SmallTextItem(String text) {
+			this.text = text;
 		}
 
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading){
+		@Override
+		public int getViewType() {
+			return 9;
+		}
+	}
+
+	private class TextItem extends Item{
+		private String text;
+		private String secondaryText;
+		private Runnable onClick;
+		private boolean loading;
+		private int icon;
+
+		public TextItem(@StringRes int text, Runnable onClick) {
+			this(text, null, onClick, false, 0);
+		}
+
+		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
+			this(text, null, onClick, false, icon);
+		}
+
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
+			this(text, secondaryText, onClick, false, icon);
+		}
+
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
+			this.icon=icon;
+			this.secondaryText = secondaryText;
 		}
 
 		@Override
@@ -537,7 +754,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
-				case 8 -> new ColorPickerViewHolder();
+				case 8 -> new ButtonViewHolder();
+				case 9 -> new SmallTextViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -666,75 +884,25 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
-	private class ColorPickerViewHolder extends BindableViewHolder<ColorPicker>{
+
+	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
-		private final PopupMenu popupMenu;
 		private final ImageView icon;
+		private final TextView text;
 
 		@SuppressLint("ClickableViewAccessibility")
-		public ColorPickerViewHolder(){
-			super(getActivity(), R.layout.item_settings_color_picker, list);
+		public ButtonViewHolder(){
+			super(getActivity(), R.layout.item_settings_button, list);
+			text=findViewById(R.id.text);
 			icon=findViewById(R.id.icon);
-			button=findViewById(R.id.color_picker_button);
-			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.color_picker);
-			popupMenu.setOnMenuItemClickListener(item->{
-				GlobalUserPreferences.ColorPreference pref;
-				int id=item.getItemId();
-				if(id==R.id.pink_color) {
-					pref = GlobalUserPreferences.ColorPreference.PINK;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.purple_color) {
-					pref = GlobalUserPreferences.ColorPreference.PURPLE;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.green_color) {
-					pref = GlobalUserPreferences.ColorPreference.GREEN;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.blue_color) {
-					pref = GlobalUserPreferences.ColorPreference.BLUE;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.orange_color) {
-					pref = GlobalUserPreferences.ColorPreference.ORANGE;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.yellow_color) {
-					pref = GlobalUserPreferences.ColorPreference.YELLOW;
-					onColorPreferenceClick(pref);
-				}
-				else if(id==R.id.m3_color) {
-					if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-						pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
-						onColorPreferenceClick(pref);
-					}else{
-						Toast.makeText(getActivity(), R.string.sk_not_supported,
-								Toast.LENGTH_LONG).show();
-					}
-				}
-				else
-					return false;
-				return true;
-			});
-//			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
-			button.setOnTouchListener(popupMenu.getDragToOpenListener());
-			button.setOnClickListener(v->popupMenu.show());
+			button=findViewById(R.id.button);
 		}
 
 		@Override
-		public void onBind(ColorPicker item){
-			icon.setImageResource(R.drawable.ic_color_theme_preference);
-			button.setText(switch(GlobalUserPreferences.color){
-				case PINK -> R.string.sk_color_theme_pink;
-				case PURPLE -> R.string.sk_color_theme_purple;
-				case GREEN -> R.string.sk_color_theme_green;
-				case BLUE -> R.string.sk_color_theme_blue;
-				case ORANGE -> R.string.sk_color_theme_brown;
-				case YELLOW -> R.string.sk_color_theme_yellow;
-				case MATERIAL3 -> R.string.sk_color_theme_material_you;
-			});
+		public void onBind(ButtonItem item){
+			text.setText(item.text);
+			icon.setImageResource(item.icon);
+			item.buttonConsumer.accept(button);
 		}
 	}
 
@@ -782,19 +950,27 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	}
 
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
-		private final TextView text;
+		private final TextView text, secondaryText;
 		private final ProgressBar progress;
+		private final ImageView icon;
 
 		public TextViewHolder(){
 			super(getActivity(), R.layout.item_settings_text, list);
 			text = itemView.findViewById(R.id.text);
+			secondaryText = itemView.findViewById(R.id.secondary_text);
 			progress = itemView.findViewById(R.id.progress);
+			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
+			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
+			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
+
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
+			icon.setImageResource(item.icon);
+			secondaryText.setText(item.secondaryText);
 		}
 
 		@Override
@@ -803,6 +979,26 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	private class SmallTextViewHolder extends BindableViewHolder<SmallTextItem> {
+		private final TextView text;
+;
+
+		public SmallTextViewHolder(){
+			super(getActivity(), R.layout.item_settings_text, list);
+			text = itemView.findViewById(R.id.text);
+		}
+
+		@Override
+		public void onBind(SmallTextItem item){
+			text.setText(item.text);
+			TypedValue val = new TypedValue();
+			getContext().getTheme().resolveAttribute(android.R.attr.textColorSecondary, val, true);
+			text.setTextColor(getResources().getColor(val.resourceId, getContext().getTheme()));
+			text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+		}
+	}
+
 	private class FooterViewHolder extends BindableViewHolder<FooterItem>{
 		private final TextView text;
 		public FooterViewHolder(){
@@ -818,7 +1014,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
 
-		private final TextView text;
+		private final TextView text, changelog;
 		private final Button button;
 		private final ImageButton cancelBtn;
 		private final ProgressBar progress;
@@ -829,6 +1025,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		public UpdateViewHolder(){
 			super(getActivity(), R.layout.item_settings_update, list);
 			text=findViewById(R.id.text);
+			changelog=findViewById(R.id.changelog);
 			button=findViewById(R.id.button);
 			cancelBtn=findViewById(R.id.cancel_btn);
 			progress=findViewById(R.id.progress);
@@ -853,10 +1050,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;
 			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
 			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
-				text.setText(getString(R.string.update_available, info.version));
+				text.setText(getString(R.string.mo_update_available, info.version));
 				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
 			}else{
-				text.setText(getString(R.string.update_ready, info.version));
+				text.setText(getString(R.string.mo_update_ready, info.version));
 				button.setText(R.string.install_update);
 			}
 			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){
@@ -872,6 +1069,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				progress.setVisibility(View.GONE);
 				progress.removeCallbacks(progressUpdater);
 			}
+			changelog.setText(info.changelog);
+//			changelog.setText(getString(R.string.sk_changelog, info.changelog));
 		}
 
 		private void updateProgress(){

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

@@ -1,20 +1,28 @@
 package org.joinmastodon.android.fragments;
 
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.style.ReplacementSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment;
-import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
@@ -23,12 +31,13 @@ public class SplashFragment extends AppKitFragment{
 
 	private SizeListenerFrameLayout contentView;
 	private View artContainer, blueFill, greenFill;
-	private InterpolatingMotionEffect motionEffect;
+	private ViewPager2 pager;
+	private ViewGroup pagerDots;
+	private View artClouds, artPlaneElephant, artRightHill, artLeftHill, artCenterHill;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
 	}
 
 	@Nullable
@@ -37,15 +46,44 @@ public class SplashFragment extends AppKitFragment{
 		contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false);
 		contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick);
 		contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick);
+		artClouds=contentView.findViewById(R.id.art_clouds);
+		artPlaneElephant=contentView.findViewById(R.id.art_plane_elephant);
+		artRightHill=contentView.findViewById(R.id.art_right_hill);
+		artLeftHill=contentView.findViewById(R.id.art_left_hill);
+		artCenterHill=contentView.findViewById(R.id.art_center_hill);
+		pager=contentView.findViewById(R.id.pager);
+		pagerDots=contentView.findViewById(R.id.pager_dots);
+		pager.setAdapter(new PagerAdapter());
+		pager.setOffscreenPageLimit(3);
+		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
+			@Override
+			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels){
+				for(int i=0;i<pagerDots.getChildCount();i++){
+					float alpha;
+					if(i==position){
+						alpha=0.3f+0.7f*(1f-positionOffset);
+					}else if(i==position+1){
+						alpha=0.3f+0.7f*positionOffset;
+					}else{
+						alpha=0.3f;
+					}
+					pagerDots.getChildAt(i).setAlpha(alpha);
+				}
+
+				float parallaxProgress=(position+positionOffset)/2f;
+				artClouds.setTranslationX(V.dp(-27)*(position>=1 ? 1f : positionOffset));
+				artPlaneElephant.setTranslationX(V.dp(101.55f)*parallaxProgress);
+				artLeftHill.setTranslationX(V.dp(-88)*parallaxProgress);
+				artLeftHill.setTranslationY(V.dp(24)*parallaxProgress);
+				artRightHill.setTranslationX(V.dp(-88)*parallaxProgress);
+				artRightHill.setTranslationY(V.dp(-24)*parallaxProgress);
+				artCenterHill.setTranslationX(V.dp(-40)*parallaxProgress);
+			}
+		});
 
 		artContainer=contentView.findViewById(R.id.art_container);
 		blueFill=contentView.findViewById(R.id.blue_fill);
 		greenFill=contentView.findViewById(R.id.green_fill);
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_clouds), V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_right_hill), V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_left_hill), V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_center_hill), V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_plane_elephant), V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
 
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
@@ -72,10 +110,10 @@ public class SplashFragment extends AppKitFragment{
 	}
 
 	private void updateArtSize(int w, int h){
-		float scale=w/(float)V.dp(412);
+		float scale=w/(float)V.dp(360);
 		artContainer.setScaleX(scale);
 		artContainer.setScaleY(scale);
-		blueFill.setScaleY(h/2f);
+		blueFill.setScaleY(artContainer.getBottom()-V.dp(90));
 		greenFill.setScaleY(h-artContainer.getBottom()+V.dp(90));
 	}
 
@@ -101,15 +139,91 @@ public class SplashFragment extends AppKitFragment{
 		return true;
 	}
 
-	@Override
-	protected void onShown(){
-		super.onShown();
-		motionEffect.activate();
+	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
+
+		@NonNull
+		@Override
+		public PagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new PagerViewHolder(viewType);
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull PagerViewHolder holder, int position){}
+
+		@Override
+		public int getItemCount(){
+			return 3;
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return position;
+		}
 	}
 
-	@Override
-	protected void onHidden(){
-		super.onHidden();
-		motionEffect.deactivate();
+	private class PagerViewHolder extends RecyclerView.ViewHolder{
+		public PagerViewHolder(int page){
+			super(new LinearLayout(getActivity()));
+			LinearLayout ll=(LinearLayout) itemView;
+			ll.setOrientation(LinearLayout.VERTICAL);
+			int pad=V.dp(16);
+			ll.setPadding(pad, pad, pad, pad);
+			ll.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+			TextView title=new TextView(getActivity());
+			title.setTextAppearance(R.style.m3_headline_medium);
+			title.setText(switch(page){
+				case 0 -> {
+					String src=getString(R.string.welcome_page1_title);
+					SpannableString ss=new SpannableString(src);
+					int start=src.indexOf("{logo}");
+					if(start!=-1){
+						LogoSpan span=new LogoSpan(getResources().getDrawable(R.drawable.splash_logo, getActivity().getTheme()));
+						ss.setSpan(span, start, start+6, 0);
+					}
+					yield ss;
+				}
+				case 1 -> getString(R.string.welcome_page2_title);
+				case 2 -> getString(R.string.welcome_page3_title);
+				default -> throw new IllegalStateException("Unexpected value: "+page);
+			});
+			title.setTextColor(0xFF17063B);
+			LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(page==0 ? 46 : 36));
+			lp.bottomMargin=V.dp(page==0 ? 4 : 14);
+			ll.addView(title, lp);
+
+			TextView text=new TextView(getActivity());
+			text.setTextAppearance(R.style.m3_body_medium);
+			text.setText(switch(page){
+				case 0 -> R.string.welcome_page1_text;
+				case 1 -> R.string.welcome_page2_text;
+				case 2 -> R.string.welcome_page3_text;
+				default -> throw new IllegalStateException("Unexpected value: "+page);
+			});
+			text.setTextColor(0xFF17063B);
+			ll.addView(text, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		}
+	}
+
+	private class LogoSpan extends ReplacementSpan{
+		private final Drawable drawable;
+
+		private LogoSpan(Drawable drawable){
+			this.drawable=drawable;
+		}
+
+		@Override
+		public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, @Nullable Paint.FontMetricsInt fm){
+			return drawable.getIntrinsicWidth();
+		}
+
+		@Override
+		public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint){
+			drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+			canvas.save();
+			canvas.translate(x, y-V.dp(20));
+			drawable.draw(canvas);
+			canvas.restore();
+		}
 	}
 }

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

@@ -54,7 +54,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));
@@ -139,7 +139,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 					action=getString(R.string.edit_multiple_changed);
 				}
 			}
-			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0, null));
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0, null, null));
 		}
 		return items;
 	}

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import android.content.res.Configuration;
 import android.os.Bundle;
 
 import com.squareup.otto.Subscribe;
@@ -29,7 +30,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected EventListener eventListener=new EventListener();
 
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true, null);
 	}
 
 	@Override
@@ -171,13 +172,19 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
 
+	@Override
+	public void onConfigurationChanged(Configuration newConfig){
+		super.onConfigurationChanged(newConfig);
+		if (getParentFragment() instanceof HomeTabFragment home) home.updateToolbarLogo();
+	}
+
 	public class EventListener{
 
 		@Subscribe
 		public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
 			for(Status s:data){
 				if(s.getContentStatus().id.equals(ev.id)){
-					s.update(ev);
+					s.getContentStatus().update(ev);
 					for(int i=0;i<list.getChildCount();i++){
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder instanceof FooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
@@ -189,8 +196,8 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 				}
 			}
 			for(Status s:preloadedData){
-				if(s.id.equals(ev.id)){
-					s.update(ev);
+				if(s.getContentStatus().id.equals(ev.id)){
+					s.getContentStatus().update(ev);
 				}
 			}
 		}

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

@@ -5,7 +5,6 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Filter;
@@ -17,6 +16,7 @@ import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -92,16 +92,10 @@ public class ThreadFragment extends StatusListFragment{
 	}
 
 	private List<Status> filterStatuses(List<Status> statuses){
-		List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.THREAD)).collect(Collectors.toList());
-		if(filters.isEmpty())
-			return statuses;
-		return statuses.stream().filter(status->{
-			for(Filter filter:filters){
-				if(filter.matches(status))
-					return false;
-			}
-			return true;
-		}).collect(Collectors.toList());
+		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
+		return statuses.stream()
+				.filter(statusFilterPredicate)
+				.collect(Collectors.toList());
 	}
 
 	@Override

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

@@ -23,6 +23,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
@@ -224,6 +225,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			contextMenu=new PopupMenu(getActivity(), menuAnchor);
 			contextMenu.inflate(R.menu.profile);
 			contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
+			UiUtils.enablePopupMenuIcons(getActivity(), contextMenu);
 		}
 
 		@Override
@@ -282,28 +284,32 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			Menu menu=contextMenu.getMenu();
 			Account account=item.account;
 
-			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
-			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
-			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
-			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
+
+			MenuItem mute = menu.findItem(R.id.mute);
+			mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
+			mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
+			UiUtils.insetPopupMenuIcon(getContext(), mute);
+
+			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
+			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
+			menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 			if(relationship.following){
-				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
+				hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 				hideBoosts.setVisible(true);
-				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
+				UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
+
+				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
 				manageUserLists.setVisible(true);
 			}
-			MenuItem blockDomain=menu.findItem(R.id.block_domain);
-			if(!account.isLocal()){
-				blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-				blockDomain.setVisible(true);
-			}else{
-				blockDomain.setVisible(false);
-			}
+			menu.findItem(R.id.block_domain).setVisible(false);
 
 			menuAnchor.setTranslationX(x);
 			menuAnchor.setTranslationY(y);
@@ -344,6 +350,8 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 			}else if(id==R.id.block){
 				UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
+			}else if(id==R.id.soft_block){
+				UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
 			}else if(id==R.id.report){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
@@ -372,6 +380,12 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 						})
 						.wrapProgress(getActivity(), R.string.loading, false)
 						.exec(accountID);
+			}else if(id==R.id.manage_user_lists){
+				final Bundle args=new Bundle();
+				args.putString("account", accountID);
+				args.putString("profileAccount", account.id);
+				args.putString("profileDisplayUsername", account.getDisplayUsername());
+				Nav.go(getActivity(), ListTimelinesFragment.class, args);
 			}
 			return true;
 		}

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

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

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

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

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

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

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

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

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

@@ -75,7 +75,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
 		};
 	}
 

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

@@ -1,8 +1,8 @@
 package org.joinmastodon.android.fragments.onboarding;
 
+import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -12,19 +12,21 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.ResendConfirmationEmail;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
+import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.SettingsFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
@@ -35,40 +37,50 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.utils.V;
 
-public class AccountActivationFragment extends AppKitFragment{
+public class AccountActivationFragment extends ToolbarFragment{
 	private String accountID;
 
-	private Button btn, backBtn;
-	private View buttonBar;
+	private Button openEmailBtn, resendBtn;
+	private View contentView;
 	private Handler uiHandler=new Handler(Looper.getMainLooper());
 	private Runnable pollRunnable=this::tryGetAccount;
 	private APIRequest currentRequest;
+	private Runnable resendTimer=this::updateResendTimer;
+	private long lastResendTime;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
+		setTitle(R.string.confirm_email_title);
+		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+		lastResendTime=session.activationInfo!=null ? session.activationInfo.lastEmailConfirmationResend : 0;
 	}
 
 	@Nullable
 	@Override
-	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+	public View onCreateContentView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_activation, container, false);
 
-		btn=view.findViewById(R.id.btn_next);
-		btn.setOnClickListener(v->onButtonClick());
-		btn.setOnLongClickListener(v->{
+		openEmailBtn=view.findViewById(R.id.btn_next);
+		openEmailBtn.setOnClickListener(this::onOpenEmailClick);
+		openEmailBtn.setOnLongClickListener(v->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			Nav.go(getActivity(), SettingsFragment.class, args);
 			return true;
 		});
-		buttonBar=view.findViewById(R.id.button_bar);
-		view.findViewById(R.id.btn_back).setOnClickListener(v->onBackButtonClick());
+		resendBtn=view.findViewById(R.id.btn_resend);
+		resendBtn.setOnClickListener(this::onResendClick);
+		TextView text=view.findViewById(R.id.subtitle);
+		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+		text.setText(getString(R.string.confirm_email_subtitle, session.activationInfo!=null ? session.activationInfo.email : "?"));
+		updateResendTimer();
 
+		contentView=view;
 		return view;
 	}
 
@@ -80,14 +92,32 @@ public class AccountActivationFragment extends AppKitFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+	}
+
+//	@Override
+	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+		getToolbar().setBackground(null);
+		getToolbar().setElevation(0);
+	}
+
+	@Override
+	protected boolean canGoBack(){
+		return true;
+	}
+
+	@Override
+	public void onToolbarNavigationClick(){
+		new AccountSwitcherSheet(getActivity()).show();
 	}
 
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=27){
 			int inset=insets.getSystemWindowInsetBottom();
-			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			contentView.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
 		}else{
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
@@ -111,7 +141,7 @@ public class AccountActivationFragment extends AppKitFragment{
 		}
 	}
 
-	private void onButtonClick(){
+	private void onOpenEmailClick(View v){
 		try{
 			startActivity(Intent.makeMainSelectorActivity(Intent.ACTION_MAIN, Intent.CATEGORY_APP_EMAIL).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 		}catch(ActivityNotFoundException x){
@@ -119,12 +149,21 @@ public class AccountActivationFragment extends AppKitFragment{
 		}
 	}
 
-	private void onBackButtonClick(){
+	private void onResendClick(View v){
 		new ResendConfirmationEmail(null)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){
 						Toast.makeText(getActivity(), R.string.resent_email, Toast.LENGTH_SHORT).show();
+						AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+						if(session.activationInfo==null){
+							session.activationInfo=new AccountActivationInfo("?", System.currentTimeMillis());
+						}else{
+							session.activationInfo.lastEmailConfirmationResend=System.currentTimeMillis();
+						}
+						lastResendTime=session.activationInfo.lastEmailConfirmationResend;
+						AccountSessionManager.getInstance().writeAccountsFile();
+						updateResendTimer();
 					}
 
 					@Override
@@ -152,7 +191,7 @@ public class AccountActivationFragment extends AppKitFragment{
 						AccountSessionManager mgr=AccountSessionManager.getInstance();
 						AccountSession session=mgr.getAccount(accountID);
 						mgr.removeAccount(accountID);
-						mgr.addAccount(mgr.getInstanceInfo(session.domain), session.token, result, session.app, true);
+						mgr.addAccount(mgr.getInstanceInfo(session.domain), session.token, result, session.app, null);
 						String newID=mgr.getLastActiveAccountID();
 						Bundle args=new Bundle();
 						args.putString("account", newID);
@@ -189,4 +228,25 @@ public class AccountActivationFragment extends AppKitFragment{
 				})
 				.exec(accountID);
 	}
+
+	@SuppressLint("DefaultLocale")
+	private void updateResendTimer(){
+		long sinceResend=System.currentTimeMillis()-lastResendTime;
+		if(sinceResend>59_000L){
+			resendBtn.setText(R.string.resend);
+			resendBtn.setEnabled(true);
+			return;
+		}
+		int seconds=(int)((60_000L-sinceResend)/1000L);
+		resendBtn.setText(String.format("%s (%d)", getString(R.string.resend), seconds));
+		if(resendBtn.isEnabled())
+			resendBtn.setEnabled(false);
+		resendBtn.postDelayed(resendTimer, 500);
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		resendBtn.removeCallbacks(resendTimer);
+	}
 }

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

@@ -0,0 +1,256 @@
+package org.joinmastodon.android.fragments.onboarding;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.Space;
+import android.widget.TextView;
+import android.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.catalog.CatalogInstance;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+import me.grishka.appkit.FragmentStackActivity;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class CustomWelcomeFragment extends InstanceCatalogFragment {
+	private View headerView;
+
+	public CustomWelcomeFragment() {
+		super(R.layout.fragment_welcome_custom, 1);
+	}
+
+	@Override
+	public void onAttach(Context context){
+		super.onAttach(context);
+		setRefreshEnabled(false);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		dataLoaded();
+	}
+
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+
+		if (!canGoBack()) {
+			ImageView toolbarLogo=new ImageView(getActivity());
+			toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+			toolbarLogo.setImageResource(R.drawable.logo);
+			toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+
+			FrameLayout logoWrap=new FrameLayout(getActivity());
+			FrameLayout.LayoutParams logoParams=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+			logoParams.setMargins(0, V.dp(2), 0, 0);
+			logoWrap.addView(toolbarLogo, logoParams);
+
+			getToolbar().addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+		} else {
+			setTitle(R.string.add_account);
+		}
+	}
+
+	@Override
+	protected void proceedWithAuthOrSignup(Instance instance) {
+		AccountSessionManager.getInstance().authenticate(getActivity(), instance);
+	}
+
+	@Override
+	protected void updateFilteredList(){
+		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
+		if(addFakeInstance){
+			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
+			fakeInstance.description=getString(R.string.loading_instance);
+			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
+				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
+					ivh.rebind();
+				}
+			}
+			if(filteredData.isEmpty()){
+				filteredData.add(fakeInstance);
+				adapter.notifyItemInserted(0);
+			}
+		}
+		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
+		filteredData.clear();
+		if(currentSearchQuery.length()>0){
+			boolean foundExactMatch=false;
+			for(CatalogInstance inst:data){
+				if(inst.normalizedDomain.contains(currentSearchQuery)){
+					filteredData.add(inst);
+					if(inst.normalizedDomain.equals(currentSearchQuery))
+						foundExactMatch=true;
+				}
+			}
+			if(!foundExactMatch && addFakeInstance) {
+				filteredData.add(0, fakeInstance);
+				adapter.notifyItemChanged(0);
+			}
+		}
+		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
+		for(int i=0;i<list.getChildCount();i++){
+			list.getChildAt(i).invalidateOutline();
+		}
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
+		list.setItemAnimator(new BetterItemAnimator());
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count) {}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_welcome_custom, list, false);
+		searchEdit=headerView.findViewById(R.id.search_edit);
+		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
+
+		headerView.findViewById(R.id.more).setVisibility(View.GONE);
+		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
+		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
+		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
+		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
+		((TextView) headerView.findViewById(R.id.username)).setText(R.string.mo_app_username);
+		((TextView) headerView.findViewById(R.id.name)).setText(R.string.mo_app_name);
+		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
+		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
+
+		searchEdit.addTextChangedListener(new TextWatcher(){
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after){}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count){
+				nextButton.setEnabled(false);
+				chosenInstance = null;
+				searchEdit.removeCallbacks(searchDebouncer);
+				searchEdit.postDelayed(searchDebouncer, 300);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){}
+		});
+
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
+		View spacer = new Space(getActivity());
+		spacer.setMinimumHeight(V.dp(8));
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(spacer));
+		return mergeAdapter;
+	}
+
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder> {
+		public InstancesAdapter(){
+			super(imgLoader);
+		}
+
+		@NonNull
+		@Override
+		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new InstanceViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(InstanceViewHolder holder, int position){
+			holder.bind(filteredData.get(position));
+			chosenInstance = filteredData.get(position);
+			if (chosenInstance != fakeInstance) nextButton.setEnabled(true);
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getItemCount(){
+			return filteredData.size();
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return -1;
+		}
+	}
+
+	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
+		private final TextView title, description, userCount, lang;
+		private final RadioButton radioButton;
+
+		public InstanceViewHolder(){
+			super(getActivity(), R.layout.item_instance_custom, list);
+			title=findViewById(R.id.title);
+			description=findViewById(R.id.description);
+			userCount=findViewById(R.id.user_count);
+			lang=findViewById(R.id.lang);
+			radioButton=findViewById(R.id.radiobtn);
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
+					UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
+					UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
+			}
+		}
+
+		@Override
+		public void onBind(CatalogInstance item){
+			title.setText(item.normalizedDomain);
+			description.setText(item.description);
+			if (item == fakeInstance) {
+				userCount.setVisibility(View.GONE);
+				lang.setVisibility(View.GONE);
+			} else {
+				userCount.setVisibility(View.VISIBLE);
+				lang.setVisibility(View.VISIBLE);
+				userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
+				lang.setText(item.language.toUpperCase());
+			}
+			radioButton.setChecked(chosenInstance==item);
+			radioButton.setVisibility(View.GONE);
+		}
+
+		@Override
+		public void onClick(){
+			if(chosenInstance!=null){
+					int idx=filteredData.indexOf(chosenInstance);
+					if(idx!=-1){
+						RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
+						if(holder instanceof InstanceViewHolder ivh){
+							ivh.radioButton.setChecked(false);
+						}
+					}
+			}
+			radioButton.setChecked(true);
+			if(chosenInstance==null)
+					nextButton.setEnabled(true);
+			chosenInstance=item;
+			loadInstanceInfo(chosenInstance.domain, false);
+			onNextClick(null);
+		}
+	}
+}

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

@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.Activity;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +16,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.Jsoup;
@@ -33,6 +35,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
@@ -46,7 +49,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-public class GoogleMadeMeAddThisFragment extends AppKitFragment{
+public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -60,6 +63,7 @@ public class GoogleMadeMeAddThisFragment extends AppKitFragment{
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
+		setTitle(R.string.privacy_policy_title);
 	}
 
 	@Override
@@ -82,37 +86,24 @@ public class GoogleMadeMeAddThisFragment extends AppKitFragment{
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
 
 		list=view.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		View headerView=inflater.inflate(R.layout.item_list_header, list, false);
-		TextView title=headerView.findViewById(R.id.title);
-		TextView subtitle=headerView.findViewById(R.id.subtitle);
-		headerView.findViewById(R.id.step_counter).setVisibility(View.GONE);
-		title.setText(R.string.privacy_policy_title);
-		subtitle.setText(R.string.privacy_policy_subtitle);
+		View headerView=inflater.inflate(R.layout.item_list_header_simple, list, false);
+		TextView text=headerView.findViewById(R.id.text);
+		text.setText(R.string.privacy_policy_subtitle);
 
 		adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(itemsAdapter=new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.setSelector(null);
-		list.addItemDecoration(new RecyclerView.ItemDecoration(){
-			@Override
-			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				if(parent.getChildViewHolder(view) instanceof ItemViewHolder){
-					outRect.left=outRect.right=V.dp(18.5f);
-					outRect.top=V.dp(16);
-				}
-			}
-		});
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
-		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 
 		return view;
 	}
@@ -120,7 +111,15 @@ public class GoogleMadeMeAddThisFragment extends AppKitFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+	}
+
+//	@Override
+	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+		getToolbar().setBackground(null);
+		getToolbar().setElevation(0);
 	}
 
 	protected void onButtonClick(){
@@ -192,24 +191,17 @@ public class GoogleMadeMeAddThisFragment extends AppKitFragment{
 	}
 
 	private class ItemViewHolder extends BindableViewHolder<Item> implements UsableRecyclerView.Clickable{
-		private final TextView domain, title;
-		private final ImageView favicon;
+		private final TextView title;
 
 		public ItemViewHolder(){
 			super(getActivity(), R.layout.item_privacy_policy_link, list);
-			domain=findViewById(R.id.domain);
 			title=findViewById(R.id.title);
-			favicon=findViewById(R.id.favicon);
-			itemView.setOutlineProvider(OutlineProviders.roundedRect(10));
-			itemView.setClipToOutline(true);
+			title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 		}
 
 		@Override
 		public void onBind(Item item){
-			domain.setText(item.domain);
 			title.setText(item.title);
-
-			ViewImageLoader.load(favicon, null, new UrlImageLoaderRequest(item.faviconUrl));
 		}
 
 		@Override

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

@@ -84,7 +84,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		isSignup=getArguments().getBoolean("signup");
+		isSignup=getArguments() != null && getArguments().getBoolean("signup");
 	}
 
 	protected abstract void proceedWithAuthOrSignup(Instance instance);
@@ -187,6 +187,8 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 	}
 
 	protected void loadInstanceInfo(String _domain, boolean isFromRedirect){
+		if(TextUtils.isEmpty(_domain))
+			return;
 		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
@@ -222,7 +224,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 				}
 				if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
 					boolean found=false;
-					for(CatalogInstance ci : filteredData){
+					for(CatalogInstance ci:filteredData){
 						if(ci.domain.equals(domain) && ci!=fakeInstance){
 							found=true;
 							break;

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

@@ -1,39 +1,52 @@
 package org.joinmastodon.android.fragments.onboarding;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
+import android.content.res.ColorStateList;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
-import android.os.LocaleList;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
 import android.widget.RadioButton;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
 import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
 import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.FilterChipView;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
+import java.util.Locale;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
@@ -42,18 +55,37 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.OnBackPressedListener;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
+import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
-	private View headerView;
+public class InstanceCatalogSignupFragment extends InstanceCatalogFragment implements OnBackPressedListener{
 	private MastodonAPIRequest<?> getCategoriesRequest;
-	private TabLayout categoriesList;
 	private String currentCategory="all";
 	private List<CatalogCategory> categories=new ArrayList<>();
+	private View topBar;
 
+	private List<String> languages=Collections.emptyList();
+	private PopupMenu langFilterMenu, speedFilterMenu;
+	private SignupSpeedFilter currentSignupSpeedFilter=SignupSpeedFilter.INSTANT;
+	private String currentLanguage=null;
+	private boolean searchQueryMode;
+	private LinearLayout filtersWrap;
+	private HorizontalScrollView filtersScroll;
+	private ImageButton backBtn, clearSearchBtn;
+	private View focusThing;
+
+	private FilterChipView categoryGeneral, categorySpecialInterests;
+	private List<FilterChipView> regionalFilters;
+	private CatalogInstance.Region chosenRegion;
+	private CategoryChoice categoryChoice;
 
 	public InstanceCatalogSignupFragment(){
 		super(R.layout.fragment_onboarding_common, 10);
@@ -63,6 +95,12 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 	public void onAttach(Context context){
 		super.onAttach(context);
 		setRefreshEnabled(false);
+		setRetainInstance(true);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
 		loadData();
 	}
 
@@ -75,6 +113,25 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 						if(getActivity()==null)
 							return;
 						onDataLoaded(sortInstances(result), false);
+
+						if(langFilterMenu!=null){
+							Menu menu=langFilterMenu.getMenu();
+							menu.clear();
+							menu.add(0, 0, 0, R.string.server_filter_any_language);
+							languages=result.stream().map(i->i.language).distinct().filter(s->s.length()>0).sorted().collect(Collectors.toList());
+							int i=1;
+							for(String lang:languages){
+								Locale locale=Locale.forLanguageTag(lang);
+								String name=locale.getDisplayLanguage(locale);
+								if(name.equals(lang))
+									name=lang.toUpperCase();
+								else
+									name=name.substring(0, 1).toUpperCase()+name.substring(1);
+								menu.add(0, i, 0, name);
+								i++;
+							}
+						}
+
 						updateFilteredList();
 					}
 
@@ -111,14 +168,14 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 	}
 
 	private void updateCategories(){
-		categoriesList.removeAllTabs();
-		for(CatalogCategory cat:categories){
-			int titleRes=getTitleForCategory(cat.category);
-			TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
-			ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
-			emoji.setImageResource(getEmojiForCategory(cat.category));
-			categoriesList.addTab(tab);
-		}
+//		categoriesList.removeAllTabs();
+//		for(CatalogCategory cat:categories){
+//			int titleRes=getTitleForCategory(cat.category);
+//			TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
+//			ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
+//			emoji.setImageResource(getEmojiForCategory(cat.category));
+//			categoriesList.addTab(tab);
+//		}
 	}
 
 	@Override
@@ -130,27 +187,77 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 
 	@Override
 	protected RecyclerView.Adapter getAdapter(){
-		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_onboarding_instance_catalog, list, false);
-		searchEdit=headerView.findViewById(R.id.search_edit);
-		categoriesList=headerView.findViewById(R.id.categories_list);
-		categoriesList.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
-			@Override
-			public void onTabSelected(TabLayout.Tab tab){
-				CatalogCategory category=categories.get(tab.getPosition());
-				currentCategory=category.category;
-				updateFilteredList();
-			}
+		View headerView=new View(getActivity());
+		headerView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
 
-			@Override
-			public void onTabUnselected(TabLayout.Tab tab){
-
-			}
-
-			@Override
-			public void onTabReselected(TabLayout.Tab tab){
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
+		return mergeAdapter;
+	}
 
+	@SuppressLint("ClickableViewAccessibility")
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		backBtn=view.findViewById(R.id.btn_back);
+		backBtn.setOnClickListener(v->{
+			if(searchQueryMode){
+				setSearchQueryMode(false);
+			}else{
+				Nav.finish(this);
 			}
 		});
+		clearSearchBtn=view.findViewById(R.id.clear);
+		clearSearchBtn.setOnClickListener(v->searchEdit.setText(""));
+		nextButton.setEnabled(true);
+		list.setItemAnimator(new BetterItemAnimator());
+		setStatusBarColor(0);
+		topBar=view.findViewById(R.id.top_bar);
+
+		LayerDrawable topBg=(LayerDrawable) topBar.getBackground().mutate();
+		topBar.setBackground(topBg);
+		Drawable topOverlay=topBg.findDrawableByLayerId(R.id.color_overlay);
+		topOverlay.setAlpha(0);
+
+		LayerDrawable btmBg=(LayerDrawable) buttonBar.getBackground().mutate();
+		buttonBar.setBackground(btmBg);
+		Drawable btmOverlay=btmBg.findDrawableByLayerId(R.id.color_overlay);
+		btmOverlay.setAlpha(0);
+
+		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
+			private boolean isAtTop=true;
+			private Animator currentPanelsAnim;
+			@Override
+			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
+				boolean newAtTop=recyclerView.getChildCount()==0 || (recyclerView.getChildAdapterPosition(recyclerView.getChildAt(0))==0 && recyclerView.getChildAt(0).getTop()==recyclerView.getPaddingTop());
+				if(newAtTop!=isAtTop){
+					isAtTop=newAtTop;
+					if(currentPanelsAnim!=null)
+						currentPanelsAnim.cancel();
+
+					AnimatorSet set=new AnimatorSet();
+					set.playTogether(
+							ObjectAnimator.ofInt(topOverlay, "alpha", isAtTop ? 0 : 20),
+							ObjectAnimator.ofInt(btmOverlay, "alpha", isAtTop ? 0 : 20),
+							ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Z, isAtTop ? 0 : V.dp(3)),
+							ObjectAnimator.ofFloat(buttonBar, View.TRANSLATION_Z, isAtTop ? 0 : V.dp(3))
+					);
+					set.setDuration(150);
+					set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+					set.addListener(new AnimatorListenerAdapter(){
+						@Override
+						public void onAnimationEnd(Animator animation){
+							currentPanelsAnim=null;
+						}
+					});
+					set.start();
+					currentPanelsAnim=set;
+				}
+			}
+		});
+
+		searchEdit=view.findViewById(R.id.search_edit);
 		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
 		searchEdit.addTextChangedListener(new TextWatcher(){
 			@Override
@@ -166,42 +273,159 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 
 			@Override
 			public void afterTextChanged(Editable s){
+				if((clearSearchBtn.getVisibility()==View.VISIBLE)!=(s.length()>0)){
+					clearSearchBtn.setVisibility(s.length()>0 ? View.VISIBLE : View.GONE);
+				}
+			}
+		});
+		searchEdit.setOnFocusChangeListener((v, hasFocus)->{
+			if(hasFocus && !searchQueryMode){
+				setSearchQueryMode(true);
 			}
 		});
 
-		mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
-		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
-		return mergeAdapter;
+		FilterChipView langFilter=new FilterChipView(getActivity());
+		langFilter.setDrawableEnd(R.drawable.ic_baseline_arrow_drop_down_18);
+		if(currentLanguage==null){
+			langFilter.setText(R.string.server_filter_any_language);
+		}else{
+			Locale locale=Locale.forLanguageTag(currentLanguage);
+			langFilter.setText(locale.getDisplayLanguage(locale));
+			langFilter.setSelected(true);
+		}
+		langFilterMenu=new PopupMenu(getContext(), langFilter);
+		langFilter.setOnTouchListener(langFilterMenu.getDragToOpenListener());
+		langFilter.setOnClickListener(v->langFilterMenu.show());
+		filtersWrap=view.findViewById(R.id.filters_container);
+		filtersScroll=view.findViewById(R.id.filters_scroll);
+		filtersWrap.addView(langFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+		FilterChipView speedFilter=new FilterChipView(getActivity());
+		speedFilter.setDrawableEnd(R.drawable.ic_baseline_arrow_drop_down_18);
+		speedFilterMenu=new PopupMenu(getContext(), speedFilter);
+		speedFilterMenu.getMenu().add(0, 0, 0, R.string.server_filter_any_signup_speed);
+		speedFilterMenu.getMenu().add(0, 1, 0, R.string.server_filter_instant_signup);
+		speedFilterMenu.getMenu().add(0, 2, 0, R.string.server_filter_manual_review);
+		speedFilter.setOnTouchListener(speedFilterMenu.getDragToOpenListener());
+		speedFilter.setOnClickListener(v->speedFilterMenu.show());
+		speedFilter.setText(switch(currentSignupSpeedFilter){
+			case ANY -> R.string.server_filter_any_signup_speed;
+			case INSTANT -> R.string.server_filter_instant_signup;
+			case REVIEWED -> R.string.server_filter_manual_review;
+		});
+		speedFilter.setSelected(currentSignupSpeedFilter!=SignupSpeedFilter.ANY);
+		filtersWrap.addView(speedFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+		speedFilterMenu.setOnMenuItemClickListener(item->{
+			speedFilter.setText(item.getTitle());
+			speedFilter.setSelected(item.getItemId()>0);
+			currentSignupSpeedFilter=SignupSpeedFilter.values()[item.getItemId()];
+			updateFilteredList();
+			return true;
+		});
+		langFilterMenu.setOnMenuItemClickListener(item->{
+			langFilter.setText(item.getTitle());
+			langFilter.setSelected(item.getItemId()>0);
+			currentLanguage=item.getItemId()==0 ? null : languages.get(item.getItemId()-1);
+			updateFilteredList();
+			return true;
+		});
+
+		View divider=new View(getActivity());
+		divider.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Outline));
+		filtersWrap.addView(divider, new LinearLayout.LayoutParams(V.dp(.5f), ViewGroup.LayoutParams.MATCH_PARENT));
+
+		categoryGeneral=new FilterChipView(getActivity());
+		categoryGeneral.setText(R.string.category_general);
+		categoryGeneral.setTag(CategoryChoice.GENERAL);
+		categoryGeneral.setOnClickListener(this::onCategoryFilterClick);
+		categoryGeneral.setSelected(categoryChoice==CategoryChoice.GENERAL);
+		filtersWrap.addView(categoryGeneral, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		categorySpecialInterests=new FilterChipView(getActivity());
+		categorySpecialInterests.setText(R.string.category_special_interests);
+		categorySpecialInterests.setTag(CategoryChoice.SPECIAL);
+		categorySpecialInterests.setOnClickListener(this::onCategoryFilterClick);
+		categorySpecialInterests.setSelected(categoryChoice==CategoryChoice.SPECIAL);
+		filtersWrap.addView(categorySpecialInterests, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+
+		regionalFilters=Arrays.stream(CatalogInstance.Region.values()).map(r->{
+			FilterChipView fv=new FilterChipView(getActivity());
+			fv.setTag(r);
+			fv.setText(switch(r){
+				case EUROPE -> R.string.server_filter_region_europe;
+				case NORTH_AMERICA -> R.string.server_filter_region_north_america;
+				case SOUTH_AMERICA -> R.string.server_filter_region_south_america;
+				case AFRICA -> R.string.server_filter_region_africa;
+				case ASIA -> R.string.server_filter_region_asia;
+				case OCEANIA -> R.string.server_filter_region_oceania;
+			});
+			fv.setSelected(r==chosenRegion);
+			fv.setOnClickListener(this::onRegionFilterClick);
+			filtersWrap.addView(fv, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+			return fv;
+		}).collect(Collectors.toList());
+		focusThing=view.findViewById(R.id.focus_thing);
+		focusThing.requestFocus();
+	}
+
+	private void onRegionFilterClick(View v){
+		CatalogInstance.Region r=(CatalogInstance.Region) v.getTag();
+		if(chosenRegion==r){
+			chosenRegion=null;
+			v.setSelected(false);
+		}else{
+			if(chosenRegion!=null)
+				filtersWrap.findViewWithTag(chosenRegion).setSelected(false);
+			chosenRegion=r;
+			v.setSelected(true);
+		}
+		updateFilteredList();
+	}
+
+	private void onCategoryFilterClick(View v){
+		CategoryChoice c=(CategoryChoice) v.getTag();
+		if(categoryChoice==c){
+			categoryChoice=null;
+			v.setSelected(false);
+		}else{
+			if(categoryChoice!=null)
+				filtersWrap.findViewWithTag(categoryChoice).setSelected(false);
+			categoryChoice=c;
+			v.setSelected(true);
+		}
+		updateFilteredList();
 	}
 
 	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
-		list.setItemAnimator(new BetterItemAnimator());
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+	protected void onNextClick(View v){
+		if(chosenInstance==null){
+			String lang=Locale.getDefault().getLanguage();
+			List<CatalogInstance> instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general"))) && (lang.equals(ci.language) || (ci.languages!=null && ci.languages.contains(lang)))).collect(Collectors.toList());
+			if(instances.isEmpty()){
+				instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
+			}
+			if(instances.isEmpty()){
+				return;
+			}
+			chosenInstance=instances.get(new Random().nextInt(instances.size()));
+		}
+		super.onNextClick(v);
 	}
 
 	@Override
 	protected void proceedWithAuthOrSignup(Instance instance){
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
-		if(isSignup){
-			if(!instance.registrations){
-				new M3AlertDialogBuilder(getActivity())
-						.setTitle(R.string.error)
-						.setMessage(R.string.instance_signup_closed)
-						.setPositiveButton(R.string.ok, null)
-						.show();
-				return;
-			}
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
-			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		}else{
+		if(!instance.registrations){
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.error)
+					.setMessage(R.string.instance_signup_closed)
+					.setPositiveButton(R.string.ok, null)
+					.show();
+			return;
 		}
+		Bundle args=new Bundle();
+		args.putParcelable("instance", Parcels.wrap(instance));
+		Nav.go(getActivity(), InstanceRulesFragment.class, args);
 	}
 
 //	private String getEmojiForCategory(String category){
@@ -265,11 +489,29 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 	protected void updateFilteredList(){
 		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
 		filteredData.clear();
-		for(CatalogInstance instance:data){
-			if(currentCategory.equals("all") || instance.categories.contains(currentCategory)){
-				if(TextUtils.isEmpty(currentSearchQuery) || instance.domain.contains(currentSearchQuery)){
-					if(instance.domain.equals(currentSearchQuery) || !isSignup || !instance.approvalRequired)
+		if(searchQueryMode){
+			if(!TextUtils.isEmpty(currentSearchQuery)){
+				for(CatalogInstance instance:data){
+					if(instance.domain.contains(currentSearchQuery)){
 						filteredData.add(instance);
+					}
+				}
+			}
+		}else{
+			for(CatalogInstance instance:data){
+				if(categoryChoice==null || categoryChoice.matches(instance.category)){
+					if(chosenRegion==null || instance.region==chosenRegion){
+						boolean signupSpeedMatches=switch(currentSignupSpeedFilter){
+							case ANY -> true;
+							case INSTANT -> !instance.approvalRequired;
+							case REVIEWED -> instance.approvalRequired;
+						};
+						if(signupSpeedMatches){
+							if(currentLanguage==null || instance.languages.contains(currentLanguage)){
+								filteredData.add(instance);
+							}
+						}
+					}
 				}
 			}
 		}
@@ -296,8 +538,46 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 		}).dispatchUpdatesTo(adapter);
 	}
 
+	@Override
+	public void onApplyWindowInsets(WindowInsets insets){
+		topBar.setPadding(0, insets.getSystemWindowInsetTop(), 0, 0);
+		super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
+	}
 
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceCatalogSignupFragment.InstanceViewHolder>{
+	@Override
+	public boolean onBackPressed(){
+		if(searchQueryMode){
+			setSearchQueryMode(false);
+			return true;
+		}
+		return false;
+	}
+
+	private void setSearchQueryMode(boolean enabled){
+		searchQueryMode=enabled;
+		RelativeLayout.LayoutParams lp=(RelativeLayout.LayoutParams) searchEdit.getLayoutParams();
+		if(searchQueryMode){
+			filtersScroll.setVisibility(View.GONE);
+			lp.removeRule(RelativeLayout.END_OF);
+			backBtn.setScaleX(0.83333333f);
+			backBtn.setScaleY(0.83333333f);
+			backBtn.setTranslationX(V.dp(8));
+			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
+		}else{
+			filtersScroll.setVisibility(View.VISIBLE);
+			focusThing.requestFocus();
+			searchEdit.setText("");
+			lp.addRule(RelativeLayout.END_OF, R.id.btn_back);
+			getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);
+			backBtn.setScaleX(1);
+			backBtn.setScaleY(1);
+			backBtn.setTranslationX(0);
+			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant)));
+		}
+		updateFilteredList();
+	}
+
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceCatalogSignupFragment.InstanceViewHolder> implements ImageLoaderRecyclerAdapter{
 		public InstancesAdapter(){
 			super(imgLoader);
 		}
@@ -323,32 +603,53 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 		public int getItemViewType(int position){
 			return -1;
 		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return filteredData.get(position).thumbnailRequest!=null ? 1 : 0;
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			return filteredData.get(position).thumbnailRequest;
+		}
 	}
 
-	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
-		private final TextView title, description, userCount, lang;
+	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.DisableableClickable, ImageLoaderViewHolder{
+		private final TextView title, description;
 		private final RadioButton radioButton;
+		private final ImageView thumbnail;
+		private boolean enabled;
 
 		public InstanceViewHolder(){
 			super(getActivity(), R.layout.item_instance_catalog, list);
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
-			userCount=findViewById(R.id.user_count);
-			lang=findViewById(R.id.lang);
 			radioButton=findViewById(R.id.radiobtn);
-			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
-				UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
-				UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
-			}
+			thumbnail=findViewById(R.id.image);
 		}
 
 		@Override
 		public void onBind(CatalogInstance item){
 			title.setText(item.normalizedDomain);
-			description.setText(item.description);
-			userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
-			lang.setText(item.language.toUpperCase());
 			radioButton.setChecked(chosenInstance==item);
+			if(item.thumbnailRequest==null)
+				thumbnail.setImageDrawable(null);
+			Instance realInstance=instancesCache.get(item.normalizedDomain);
+			float alpha;
+			if(realInstance!=null && !realInstance.registrations){
+				alpha=0.38f;
+				description.setText(R.string.not_accepting_new_members);
+				enabled=false;
+			}else{
+				alpha=1f;
+				description.setText(item.description);
+				enabled=true;
+			}
+			title.setAlpha(alpha);
+			description.setAlpha(alpha);
+			radioButton.setAlpha(alpha);
+			thumbnail.setAlpha(alpha);
 		}
 
 		@Override
@@ -358,10 +659,17 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 			if(chosenInstance!=null){
 				int idx=filteredData.indexOf(chosenInstance);
 				if(idx!=-1){
-					RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
-					if(holder instanceof InstanceCatalogSignupFragment.InstanceViewHolder ivh){
-						ivh.radioButton.setChecked(false);
+					boolean found=false;
+					for(int i=0;i<list.getChildCount();i++){
+						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+						if(holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx && holder instanceof InstanceViewHolder ivh){
+							ivh.radioButton.setChecked(false);
+							found=true;
+							break;
+						}
 					}
+					if(!found)
+						adapter.notifyItemChanged(idx);
 				}
 			}
 			radioButton.setChecked(true);
@@ -370,5 +678,36 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 			chosenInstance=item;
 			loadInstanceInfo(chosenInstance.domain, false);
 		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			thumbnail.setImageDrawable(image);
+		}
+
+		@Override
+		public void clearImage(int index){
+			setImage(index, null);
+		}
+
+		@Override
+		public boolean isEnabled(){
+			return enabled;
+		}
+	}
+
+	private enum SignupSpeedFilter{
+		ANY,
+		INSTANT,
+		REVIEWED
+	}
+
+	private enum CategoryChoice{
+		GENERAL,
+		SPECIAL;
+
+		public boolean matches(String category){
+			boolean isGeneral=(category==null || "general".equals(category));
+			return (this==GENERAL)==isGeneral;
+		}
 	}
 }

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

@@ -240,13 +240,17 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 			if(chosenInstance!=null){
 				int idx=filteredData.indexOf(chosenInstance);
 				if(idx!=-1){
+					boolean found=false;
 					for(int i=0;i<list.getChildCount();i++){
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx && holder instanceof InstanceViewHolder ivh){
 							ivh.radioButton.setChecked(false);
+							found=true;
 							break;
 						}
 					}
+					if(!found)
+						adapter.notifyItemChanged(idx);
 				}
 			}
 			radioButton.setChecked(true);

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

@@ -1,6 +1,8 @@
 package org.joinmastodon.android.fragments.onboarding;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -22,14 +24,14 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class InstanceRulesFragment extends AppKitFragment{
+public class InstanceRulesFragment extends ToolbarFragment{
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -47,31 +49,28 @@ public class InstanceRulesFragment extends AppKitFragment{
 		super.onAttach(activity);
 		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
+		setTitle(R.string.instance_rules_title);
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
 
 		list=view.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		View headerView=inflater.inflate(R.layout.item_list_header, list, false);
-		TextView title=headerView.findViewById(R.id.title);
-		TextView subtitle=headerView.findViewById(R.id.subtitle);
-		headerView.findViewById(R.id.step_counter).setVisibility(View.GONE);
-		title.setText(R.string.instance_rules_title);
-		subtitle.setText(getString(R.string.instance_rules_subtitle, instance.uri));
+		View headerView=inflater.inflate(R.layout.item_list_header_simple, list, false);
+		TextView text=headerView.findViewById(R.id.text);
+		text.setText(getString(R.string.instance_rules_subtitle, instance.uri));
 
 		adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
-		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 
 		return view;
 	}
@@ -79,7 +78,15 @@ public class InstanceRulesFragment extends AppKitFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+//		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+	}
+
+//	@Override
+	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+		getToolbar().setBackground(null);
+		getToolbar().setElevation(0);
 	}
 
 	protected void onButtonClick(){
@@ -119,23 +126,22 @@ public class InstanceRulesFragment extends AppKitFragment{
 	}
 
 	private class ItemViewHolder extends BindableViewHolder<Instance.Rule>{
-		private final TextView title, subtitle;
-		private final ImageView checkbox;
+		private final TextView text, number;
 
 		public ItemViewHolder(){
-			super(getActivity(), R.layout.item_report_choice, list);
-			title=findViewById(R.id.title);
-			subtitle=findViewById(R.id.subtitle);
-			checkbox=findViewById(R.id.checkbox);
-			subtitle.setVisibility(View.GONE);
+			super(getActivity(), R.layout.item_server_rule, list);
+			text=findViewById(R.id.text);
+			number=findViewById(R.id.number);
 		}
 
+		@SuppressLint("DefaultLocale")
 		@Override
 		public void onBind(Instance.Rule item){
 			if(item.parsedText==null){
 				item.parsedText=HtmlParser.parseLinks(item.text);
 			}
-			title.setText(item.parsedText);
+			text.setText(item.parsedText);
+			number.setText(String.format("%d", getAbsoluteAdapterPosition()));
 		}
 	}
 }

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

@@ -25,14 +25,15 @@ import org.joinmastodon.android.api.MastodonDetailedErrorResponse;
 import org.joinmastodon.android.api.requests.accounts.RegisterAccount;
 import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
 import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
+import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Token;
-import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
 import org.parceler.Parcels;
 
 import java.io.File;
@@ -49,30 +50,28 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.AppKitFragment;
+import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
-public class SignupFragment extends AppKitFragment{
+public class SignupFragment extends ToolbarFragment{
 	private static final int AVATAR_RESULT=198;
 	private static final String TAG="SignupFragment";
 
 	private Instance instance;
 
-	private EditText displayName, username, email, password, reason;
+	private EditText displayName, username, email, password, passwordConfirm, reason;
+	private FloatingHintEditTextLayout displayNameWrap, usernameWrap, emailWrap, passwordWrap, passwordConfirmWrap, reasonWrap;
 	private TextView reasonExplain;
 	private Button btn;
 	private View buttonBar;
 	private TextWatcher buttonStateUpdater=new SimpleTextWatcher(e->updateButtonState());
-	private ImageView avatar;
 	private APIRequest currentBackgroundRequest;
 	private Application apiApplication;
 	private Token apiToken;
 	private boolean submitAfterGettingToken;
 	private ProgressDialog progressDialog;
-	private Uri avatarUri;
-	private File avatarFile;
 	private HashSet<EditText> errorFields=new HashSet<>();
 
 	@Override
@@ -81,25 +80,30 @@ public class SignupFragment extends AppKitFragment{
 		setRetainInstance(true);
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
 		createAppAndGetToken();
+		setTitle(R.string.signup_title);
 	}
 
 	@Nullable
 	@Override
-	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+	public View onCreateContentView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_signup, container, false);
 
-		TextView title=view.findViewById(R.id.title);
 		TextView domain=view.findViewById(R.id.domain);
 		displayName=view.findViewById(R.id.display_name);
 		username=view.findViewById(R.id.username);
 		email=view.findViewById(R.id.email);
 		password=view.findViewById(R.id.password);
-		avatar=view.findViewById(R.id.avatar);
+		passwordConfirm=view.findViewById(R.id.password_confirm);
 		reason=view.findViewById(R.id.reason);
 		reasonExplain=view.findViewById(R.id.reason_explain);
-		View avaWrap=view.findViewById(R.id.ava_wrap);
 
-		title.setText(getString(R.string.signup_title, instance.uri));
+		displayNameWrap=view.findViewById(R.id.display_name_wrap);
+		usernameWrap=view.findViewById(R.id.username_wrap);
+		emailWrap=view.findViewById(R.id.email_wrap);
+		passwordWrap=view.findViewById(R.id.password_wrap);
+		passwordConfirmWrap=view.findViewById(R.id.password_confirm_wrap);
+		reasonWrap=view.findViewById(R.id.reason_wrap);
+
 		domain.setText('@'+instance.uri);
 
 		username.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
@@ -114,23 +118,20 @@ public class SignupFragment extends AppKitFragment{
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
-		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 		updateButtonState();
 
 		username.addTextChangedListener(buttonStateUpdater);
 		email.addTextChangedListener(buttonStateUpdater);
 		password.addTextChangedListener(buttonStateUpdater);
+		passwordConfirm.addTextChangedListener(buttonStateUpdater);
 		reason.addTextChangedListener(buttonStateUpdater);
 
 		username.addTextChangedListener(new ErrorClearingListener(username));
 		email.addTextChangedListener(new ErrorClearingListener(email));
 		password.addTextChangedListener(new ErrorClearingListener(password));
+		passwordConfirm.addTextChangedListener(new ErrorClearingListener(passwordConfirm));
 		reason.addTextChangedListener(new ErrorClearingListener(reason));
 
-		avaWrap.setOutlineProvider(OutlineProviders.roundedRect(22));
-		avaWrap.setClipToOutline(true);
-		avaWrap.setOnClickListener(v->onAvatarClick());
-
 		if(!instance.approvalRequired){
 			reason.setVisibility(View.GONE);
 			reasonExplain.setVisibility(View.GONE);
@@ -142,10 +143,23 @@ public class SignupFragment extends AppKitFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+	}
+
+//	@Override
+	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+		getToolbar().setBackground(null);
+		getToolbar().setElevation(0);
 	}
 
 	private void onButtonClick(){
+		if(!password.getText().toString().equals(passwordConfirm.getText().toString())){
+			passwordConfirm.setError(getString(R.string.signup_passwords_dont_match));
+			passwordConfirmWrap.setErrorState();
+			return;
+		}
 		showProgressDialog();
 		if(currentBackgroundRequest!=null){
 			submitAfterGettingToken=true;
@@ -160,32 +174,8 @@ public class SignupFragment extends AppKitFragment{
 		}
 	}
 
-	private void copyAvatar(Runnable onDone){
-		// Need to copy the avatar from the content provider to somewhere accessible in case the app gets killed between signup and account activation
-		Activity activity=getActivity();
-		MastodonAPIController.runInBackground(()->{
-			String origName=UiUtils.getFileName(avatarUri);
-			avatarFile=new File(activity.getCacheDir(), System.currentTimeMillis()+origName.substring(origName.lastIndexOf('.')));
-			try(InputStream in=activity.getContentResolver().openInputStream(avatarUri);
-				FileOutputStream out=new FileOutputStream(avatarFile)){
-				byte[] buf=new byte[10240];
-				int read;
-				while((read=in.read(buf))>0){
-					out.write(buf, 0, read);
-				}
-			}catch(IOException x){
-				Log.w(TAG, "copyAvatar: error copying", x);
-			}
-			activity.runOnUiThread(onDone);
-		});
-	}
-
 	private void submit(){
-		if(avatarUri!=null && (avatarFile==null || !avatarFile.exists())){
-			copyAvatar(this::actuallySubmit);
-		}else{
-			actuallySubmit();
-		}
+		actuallySubmit();
 	}
 
 	private void actuallySubmit(){
@@ -204,9 +194,7 @@ public class SignupFragment extends AppKitFragment{
 						fakeAccount.acct=fakeAccount.username=username;
 						fakeAccount.id="tmp"+System.currentTimeMillis();
 						fakeAccount.displayName=displayName.getText().toString();
-						if(avatarFile!=null)
-							fakeAccount.avatar=avatarFile.getAbsolutePath();
-						AccountSessionManager.getInstance().addAccount(instance, result, fakeAccount, apiApplication, false);
+						AccountSessionManager.getInstance().addAccount(instance, result, fakeAccount, apiApplication, new AccountActivationInfo(email, System.currentTimeMillis()));
 						Bundle args=new Bundle();
 						args.putString("account", AccountSessionManager.getInstance().getLastActiveAccountID());
 						Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
@@ -225,6 +213,7 @@ public class SignupFragment extends AppKitFragment{
 									continue;
 								}
 								field.setError(fieldErrors.get(fieldName).stream().map(err->err.description).collect(Collectors.joining("\n")));
+								getFieldWrapByName(fieldName).setErrorState();
 								errorFields.add(field);
 								if(first){
 									first=false;
@@ -252,6 +241,16 @@ public class SignupFragment extends AppKitFragment{
 		};
 	}
 
+	private FloatingHintEditTextLayout getFieldWrapByName(String name){
+		return switch(name){
+			case "email" -> emailWrap;
+			case "username" -> usernameWrap;
+			case "password" -> passwordWrap;
+			case "reason" -> reasonWrap;
+			default -> null;
+		};
+	}
+
 	private void showProgressDialog(){
 		if(progressDialog==null){
 			progressDialog=new ProgressDialog(getActivity());
@@ -262,7 +261,7 @@ public class SignupFragment extends AppKitFragment{
 	}
 
 	private void updateButtonState(){
-		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8 && (!instance.approvalRequired || reason.length()>0));
+		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8 && passwordConfirm.length()>=8 && (!instance.approvalRequired || reason.length()>0));
 	}
 
 	private void createAppAndGetToken(){
@@ -324,20 +323,6 @@ public class SignupFragment extends AppKitFragment{
 		}
 	}
 
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data){
-		if(requestCode==AVATAR_RESULT && resultCode==Activity.RESULT_OK){
-			avatarUri=data.getData();
-			if(avatarFile!=null && avatarFile.exists())
-				avatarFile.delete();
-			ViewImageLoader.load(avatar, getResources().getDrawable(R.drawable.default_avatar), new UrlImageLoaderRequest(avatarUri, V.dp(100), V.dp(100)));
-		}
-	}
-
-	private void onAvatarClick(){
-		startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT).setType("image/*").addCategory(Intent.CATEGORY_OPENABLE), AVATAR_RESULT);
-	}
-
 	private class ErrorClearingListener implements TextWatcher{
 		public final EditText editText;
 

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

@@ -237,7 +237,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
 		for(StatusDisplayItem item:items){
 			if(item instanceof ImageStatusDisplayItem isdi){
 				isdi.horizontalInset=V.dp(40+32);

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

@@ -164,6 +164,10 @@ public class Account extends BaseModel{
 		return '@'+acct;
 	}
 
+	public String getShortUsername() {
+		return '@'+acct.split("@")[0];
+	}
+
 	@Override
 	public String toString(){
 		return "Account{"+