Dunno what to do here, will leave for later

Adding a link to the official matrix chatrooom

.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,23 +1,32 @@
-![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)
 
-# Megalodon
+# Moshidon, the material you mastodon client! 
 
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
- 
-[![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%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
+> 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.
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
-&nbsp;
-<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk"><img height="50" alt="Get it on F-Droid" src="img/f-droid-badge.png"></a>
-
-> A fork of the [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 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%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!**
+
+**Screenshots**
+
+![Screenshot_20221209-135457_1](https://user-images.githubusercontent.com/71328265/206753830-cdb8bc65-7732-4a6a-8bcd-bbc4ca311d19.png)
+![Screenshot_20221209-135409_1](https://user-images.githubusercontent.com/71328265/206753831-7af92a48-d7a5-4780-9beb-90acef4e141b.png)
+
+### **Color themes**
+
+**Allows you to change theme within the app. Supports Purple, pink, green, blue, orange and yellow!**
+
 ### **Unlisted posting**
 
 **Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
@@ -46,63 +55,29 @@ This is important to **ensure the content you’re sharing is as accessible as p
 
 On the Fediverse, it’s quite common for people to pin posts they want others to read before following them. You can pin/unpin posts yourself by clicking the `⋯` button in the top right corner of your posts.
 
+### **Bookmarks**
+
+**They allow for quickly saving posts and viewing them through the Bookmarks button on the top right of your profile.**
+
+To bookmark a post, press the button between the Favorite and Share buttons on the bottom of the post. Bookmarks are saved privately, so the post authors won’t know you saved their post – the list of bookmarked posts is only visible to you.
+
 ## Installation
 
-### From app stores
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Moshidon will automatically notify you about new updates inside the app.**
 
-* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: [apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-  Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
-  
-  `https://apt.izzysoft.de/fdroid/repo`
+Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
 
-* **[Google Play Store](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)**: [play.google.com/store/apps/details?id=org.joinmastodon.android.sk](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)
-
-* **[F-Droid.org](https://f-droid.org)?** Not yet, sorry!
-
-  If you want, you can help me figure out if something's missing in the [Issue #47: F-Droid.org](https://github.com/sk22/megalodon/issues/47)
-
-### Directly from GitHub
-
-Press the download button to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.
-
-[![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%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
-
-You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
-
-Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
-
----
 
 
 ## Release variants
 
-All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
+All downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-**`megalodon.apk`**
-
-Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
-
-**`upstream-1234abc.apk`**
-
-This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
-
-<!-- **`megalodon-fdroid.apk`**
-
-Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
-
----
-
-## Contribution
-
-### Translation
-
-As with the source code, the translation is sourced from the official project, which you can contribute to on the official “**Mastodon for Android**” Crowdin project: https://crowdin.com/project/mastodon-for-android
-
-There's also a handful of custom strings exclusive to this projects that would need to be translated. You can help translate **Megalodon** on Weblate: https://translate.codeberg.org/projects/megalodon/
-
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/horizontal-auto.svg)](https://translate.codeberg.org/engage/megalodon/)
+**`moshidon.apk`**
 
+Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
 ---
 
@@ -131,10 +106,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
 * [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
 * [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
-* [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
-* [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
-* [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
-* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
 
 
 ### Behavior
@@ -146,12 +117,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
 * [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
 * [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
-* [No ellipsis for long poll answers](https://github.com/mastodon/mastodon-android/commit/c9aae828e2518adccdc092e41f8d1f0489636271)
-* [Show poll vote button for multiple and single answer polls](https://github.com/mastodon/mastodon-android/commit/e14dfda2fdf32f0fa3043504ac5831683a87559a)
-* [Show own vote after voting](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28) ([Closes issue](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28))
-* [Make inline emoji search case-insensitive and don't only search from start of emoji names](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:better-inline-emoji-search) ([Pull request](https://github.com/mastodon/mastodon-android/pull/445))
-* [Include subject line when sharing e.g. a website to Megalodon](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:external-share-include-subject)
-* [Improve semantics for voting on polls (radio buttons and checkboxes)](https://github.com/sk22/megalodon/commit/6fd58c96827cb1d2da329cebdc170a1425dd18d7)
 
 
 ### Visual
@@ -159,12 +124,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
 * [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
 * [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
-* [Custom color themes](https://github.com/sk22/megalodon/pull/124) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom "megalodon" text logo](https://github.com/sk22/megalodon/commit/563afd487ca5c608cfbb00fa3909d3c27384acc0) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom login screen](https://github.com/sk22/megalodon/commit/9bbf8c4618dbe13accaeb3b5482bf3fe88cac4c0)
-* [More distinct filled boost icon](https://github.com/sk22/megalodon/commits/more-distinct-filled-boost-icon)
-* [Material You color theme] by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Animations for interaction buttons](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/animate-buttons)
 
 
 ## Building
@@ -181,4 +140,6 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>
+[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>

mastodon/build.gradle

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

mastodon/src/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();
 		}
 	}
@@ -111,11 +113,12 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
+				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest")
 				.build();
 		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);
@@ -144,13 +147,14 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
 				for(JsonElement el:obj.getAsJsonArray("assets")){
 					JsonObject asset=el.getAsJsonObject();
-					if("megalodon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+					if("moshidon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
 						long size=asset.get("size").getAsLong();
 						String url=asset.get("browser_download_url").getAsString();
 
 						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,7 +15,7 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/sk_app_name"
+		android:label="@string/app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
@@ -33,7 +34,7 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:scheme="megalodon-android-auth" android:host="callback"/>
+				<data android:scheme="moshidon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
 		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize">

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\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

@@ -4,8 +4,7 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-
-import androidx.annotation.NonNull;
+import android.os.Build;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
@@ -26,13 +25,24 @@ 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 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);
 	}
@@ -50,19 +60,32 @@ 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);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
+		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
+		publishButtonText=prefs.getString("publishButtonText", "");
 
 		try {
-			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
+			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.PINK;
+			color=ColorPreference.PURPLE;
 		}
 	}
 
@@ -78,9 +101,18 @@ 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)
+				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
+				.putString("recentEmojis", gson.toJson(recentEmojis))
 				.apply();
 	}
 
@@ -92,8 +124,8 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		ORANGE,
-		YELLOW
+		YELLOW,
+		NORD
 	}
 
 	public enum ThemePreference{

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

@@ -17,6 +17,7 @@ import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;

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)
-				.setColor(context.getColor(R.color.primary_700));
+				.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);
@@ -370,7 +372,7 @@ public class PushSubscriptionManager{
 		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 			if(session.pushSubscription==null || forceReRegister)
 				session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
-			else
+			else if(session.needUpdatePushSettings)
 				session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
 		}
 	}

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

@@ -9,6 +9,7 @@ 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;
@@ -18,12 +19,18 @@ 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 StatusInteractionController(String accountID){
+		this(accountID, true);
 	}
 
 	public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
@@ -41,7 +48,7 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
 						cb.accept(result);
-						E.post(new StatusCountersUpdatedEvent(result));
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -50,16 +57,16 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
 						cb.accept(status);
-						E.post(new StatusCountersUpdatedEvent(status));
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		E.post(new StatusCountersUpdatedEvent(status));
+		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
-	public void setReblogged(Status status, boolean reblogged, Consumer<Status> cb){
+	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");
 
@@ -67,14 +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);
 						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
 						cb.accept(result);
-						E.post(new StatusCountersUpdatedEvent(result));
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -83,13 +91,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
 						cb.accept(status);
-						E.post(new StatusCountersUpdatedEvent(status));
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		E.post(new StatusCountersUpdatedEvent(status));
+		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
@@ -110,7 +118,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
 						cb.accept(result);
-						E.post(new StatusCountersUpdatedEvent(result));
+						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -119,12 +127,12 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
 						cb.accept(status);
-						E.post(new StatusCountersUpdatedEvent(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/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/oauth/CreateOAuthApp.java

@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}
 
 	private static class Request{
-		public String clientName="Megalodon";
+		public String clientName="Moshidon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://sk22.github.io/megalodon";
+		public String website="https://github.com/LucasGGamerM/moshidon";
 	}
 }

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/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/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/timelines/GetConversationsTimeline.java

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

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

@@ -8,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/AccountSession.java

@@ -32,7 +32,7 @@ public class AccountSession{
 	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;
 
@@ -52,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);
@@ -64,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;
@@ -63,7 +61,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class AccountSessionManager{
 	private static final String TAG="AccountSessionManager";
 	public static final String SCOPE="read write follow push";
-	public static final String REDIRECT_URI="megalodon-android-auth://callback";
+	public static final String REDIRECT_URI="moshidon-android-auth://callback";
 
 	private static final AccountSessionManager instance=new AccountSessionManager();
 
@@ -108,7 +106,7 @@ public class AccountSessionManager{
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
-		updateInstanceEmojis(instance, instance.uri);
+		updateMoreInstanceInfo(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
@@ -213,7 +211,7 @@ public class AccountSessionManager{
 								.path("/oauth/authorize")
 								.appendQueryParameter("response_type", "code")
 								.appendQueryParameter("client_id", result.clientId)
-								.appendQueryParameter("redirect_uri", "megalodon-android-auth://callback")
+								.appendQueryParameter("redirect_uri", "moshidon-android-auth://callback")
 								.appendQueryParameter("scope", SCOPE)
 								.build();
 
@@ -327,12 +325,7 @@ public class AccountSessionManager{
 					@Override
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
-						updateInstanceEmojis(instance, domain);
-						try {
-							if (Integer.parseInt(instance.version.split("\\.")[0]) >= 4) {
-								updateInstanceInfoV2(domain);
-							}
-						} catch (Exception ignored) {}
+						updateMoreInstanceInfo(instance, domain);
 					}
 
 					@Override
@@ -343,17 +336,19 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
-	public void updateInstanceInfoV2(String domain) {
+	public void updateMoreInstanceInfo(Instance instance, String domain) {
 		new GetInstance.V2().setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Instance.V2 v2) {
-				Instance instanceInfo = instances.get(domain);
-				if (instanceInfo != null) instanceInfo.v2 = v2;
+				if (instance != null) instance.v2 = v2;
+				updateInstanceEmojis(instance, domain);
 			}
 
 			@Override
-			public void onError(ErrorResponse errorResponse) {}
-		}).execNoAuth(domain);
+			public void onError(ErrorResponse errorResponse) {
+				updateInstanceEmojis(instance, domain);
+			}
+		}).execNoAuth(instance.uri);
 	}
 
 	private void updateInstanceEmojis(Instance instance, String domain){

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

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

@@ -1,12 +1,18 @@
 package org.joinmastodon.android.fragments;
 
+import static android.os.ext.SdkExtensions.getExtensionVersion;
+
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
+import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
+import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
 import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages;
 import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.DatePickerDialog;
+import android.app.TimePickerDialog;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
@@ -25,15 +31,17 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Layout;
+import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.format.DateFormat;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -55,6 +63,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -67,13 +76,15 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.ProgressListener;
-import org.joinmastodon.android.api.requests.accounts.GetPreferences;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.EditStatus;
 import org.joinmastodon.android.api.requests.statuses.GetAttachmentByID;
 import org.joinmastodon.android.api.requests.statuses.UploadAttachment;
 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.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
@@ -85,6 +96,7 @@ import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Mention;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Preferences;
+import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.ComposeAutocompleteViewController;
@@ -100,6 +112,7 @@ import org.joinmastodon.android.ui.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ComposeEditText;
 import org.joinmastodon.android.ui.views.ComposeMediaLayout;
+import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.ui.views.ReorderableLinearLayout;
 import org.joinmastodon.android.ui.views.SizeListenerLinearLayout;
 import org.joinmastodon.android.utils.MastodonLanguage;
@@ -109,6 +122,12 @@ import org.parceler.Parcels;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
@@ -131,6 +150,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private static final int MEDIA_RESULT=717;
 	private static final int IMAGE_DESCRIPTION_RESULT=363;
+	private static final int SCHEDULED_STATUS_OPENED_RESULT=161;
 	private static final int MAX_ATTACHMENTS=4;
 	private static final String TAG="ComposeFragment";
 
@@ -154,9 +174,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private String accountID;
 	private int charCount, charLimit, trimmedCharCount;
 
-	private Button publishButton, languageButton;
-	private PopupMenu languagePopup;
-	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn;
+	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
+	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
+	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
 	private TextView replyText;
@@ -165,8 +185,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private View addPollOptionBtn;
 	private View sensitiveItem;
 	private View pollAllowMultipleItem;
+	private View scheduleDraftView;
+	private ScrollView scrollView;
+	private boolean initiallyScrolled = false;
+	private TextView scheduleDraftText;
 	private CheckBox pollAllowMultipleCheckbox;
 	private TextView pollDurationView;
+	private MenuItem draftMenuItem, undraftMenuItem, scheduleMenuItem, unscheduleMenuItem;
 
 	private ArrayList<DraftPollOption> pollOptions=new ArrayList<>();
 
@@ -182,6 +207,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private EditText spoilerEdit;
 	private boolean hasSpoiler;
 	private boolean sensitive;
+	private Instant scheduledAt = null;
 	private ProgressBar sendProgress;
 	private ImageView sendError;
 	private View sendingOverlay;
@@ -194,6 +220,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private boolean attachmentsErrorShowing;
 
 	private Status editingStatus;
+	private ScheduledStatus scheduledStatus;
 	private boolean redraftStatus;
 	private boolean pollChanged;
 	private boolean creatingView;
@@ -203,10 +230,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private String language;
 	private MastodonLanguage.LanguageResolver languageResolver;
 
+	private int navigationBarColorBefore;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
+		navigationBarColorBefore = getActivity().getWindow().getNavigationBarColor();
+		getActivity().getWindow().setNavigationBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLightest));
 
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
@@ -215,9 +246,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		customEmojis=AccountSessionManager.getInstance().getCustomEmojis(instanceDomain);
 		instance=AccountSessionManager.getInstance().getInstanceInfo(instanceDomain);
 		languageResolver=new MastodonLanguage.LanguageResolver(instance);
+		redraftStatus=getArguments().getBoolean("redraftStatus", false);
 		if(getArguments().containsKey("editStatus")){
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
-			redraftStatus=getArguments().getBoolean("redraftStatus");
 		}
 		if(instance==null){
 			Nav.finish(this);
@@ -227,6 +258,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			AccountSessionManager.getInstance().updateInstanceInfo(instanceDomain);
 		}
 
+		Bundle bundle = savedInstanceState != null ? savedInstanceState : getArguments();
+		if (bundle.containsKey("scheduledStatus")) scheduledStatus=Parcels.unwrap(bundle.getParcelable("scheduledStatus"));
+		if (bundle.containsKey("scheduledAt")) scheduledAt=(Instant) bundle.getSerializable("scheduledAt");
+
 		if(instance.maxTootChars>0)
 			charLimit=instance.maxTootChars;
 		else if(instance.configuration!=null && instance.configuration.statuses!=null && instance.configuration.statuses.maxCharacters>0)
@@ -246,6 +281,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
+		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}
 
 	@Override
@@ -255,6 +291,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		wm=activity.getSystemService(WindowManager.class);
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
@@ -262,14 +299,30 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiKeyboard.setListener(this::onCustomEmojiClick);
 
 		View view=inflater.inflate(R.layout.fragment_compose, container, false);
+
+		if(GlobalUserPreferences.relocatePublishButton){
+			publishButton=view.findViewById(R.id.publish);
+//			publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+			publishButton.setEllipsize(TextUtils.TruncateAt.END);
+			publishButton.setOnClickListener(this::onPublishClick);
+			publishButton.setSingleLine(true);
+			publishButton.setVisibility(View.VISIBLE);
+
+			draftsBtn=view.findViewById(R.id.drafts_btn);
+			draftsBtn.setVisibility(View.VISIBLE);
+		} else {
+			charCounter=view.findViewById(R.id.char_counter);
+			charCounter.setVisibility(View.VISIBLE);
+			charCounter.setText(String.valueOf(charLimit));
+		}
+
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
-		charCounter=view.findViewById(R.id.char_counter);
-		charCounter.setText(String.valueOf(charLimit));
+		scrollView=view.findViewById(R.id.scroll_view);
 
-		selfName=view.findViewById(R.id.name);
-		selfUsername=view.findViewById(R.id.username);
-		selfAvatar=view.findViewById(R.id.avatar);
+		selfName=view.findViewById(R.id.self_name);
+		selfUsername=view.findViewById(R.id.self_username);
+		selfAvatar=view.findViewById(R.id.self_avatar);
 		HtmlParser.setTextWithCustomEmoji(selfName, self.displayName, self.emojis);
 		selfUsername.setText('@'+self.username+'@'+instanceDomain);
 		ViewImageLoader.load(selfAvatar, null, new UrlImageLoaderRequest(self.avatar));
@@ -287,6 +340,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiBtn=view.findViewById(R.id.btn_emoji);
 		spoilerBtn=view.findViewById(R.id.btn_spoiler);
 		visibilityBtn=view.findViewById(R.id.btn_visibility);
+		scheduleDraftView=view.findViewById(R.id.schedule_draft_view);
+		scheduleDraftText=view.findViewById(R.id.schedule_draft_text);
+		scheduleDraftDismiss=view.findViewById(R.id.schedule_draft_dismiss);
+		scheduleTimeBtn=view.findViewById(R.id.scheduled_time_btn);
 		sensitiveIcon=view.findViewById(R.id.sensitive_icon);
 		sensitiveItem=view.findViewById(R.id.sensitive_item);
 		replyText=view.findViewById(R.id.reply_text);
@@ -295,7 +352,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollBtn.setOnClickListener(v->togglePoll());
 		emojiBtn.setOnClickListener(v->emojiKeyboard.toggleKeyboardPopup(mainEditText));
 		spoilerBtn.setOnClickListener(v->toggleSpoiler());
-		visibilityBtn.setOnClickListener(this::onVisibilityClick);
+		buildVisibilityPopup(visibilityBtn);
+		visibilityBtn.setOnClickListener(v->visibilityPopup.show());
+		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
+
+		scheduleDraftDismiss.setOnClickListener(v->updateScheduledAt(null));
+		scheduleTimeBtn.setOnClickListener(v->pickScheduledDateTime());
+
 		sensitiveItem.setOnClickListener(v->toggleSensitive());
 		emojiKeyboard.setOnIconChangedListener(new PopupKeyboard.OnIconChangeListener(){
 			@Override
@@ -345,8 +408,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(eopt.title);
 			}
-			pollDuration=(int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond();
-			pollDurationStr=UiUtils.formatTimeLeft(getActivity(), editingStatus.poll.expiresAt);
+			pollDuration=scheduledStatus == null
+					? (int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond()
+					: Integer.parseInt(scheduledStatus.params.poll.expiresIn);
+			pollDurationStr=UiUtils.formatTimeLeft(getActivity(), scheduledStatus == null
+					? editingStatus.poll.expiresAt
+					: Instant.now().plus(pollDuration, ChronoUnit.SECONDS));
 			updatePollOptionHints();
 			pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr));
 		}else{
@@ -368,6 +435,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
+		sensitive = savedInstanceState==null && editingStatus != null ? editingStatus.sensitive
+				: savedInstanceState!=null && savedInstanceState.getBoolean("sensitive", false);
+		if (sensitive) {
+			sensitiveItem.setVisibility(View.VISIBLE);
+			sensitiveIcon.setSelected(true);
+		}
+
 		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
 			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
 			for(Parcelable a:serializedAttachments){
@@ -385,10 +459,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		if(editingStatus!=null && editingStatus.visibility!=null) {
 			statusVisibility=editingStatus.visibility;
+		} else {
+			loadDefaultStatusVisibility(savedInstanceState);
 		}
 
-		loadDefaultStatusVisibility(savedInstanceState);
 		updateVisibilityIcon();
+		visibilityPopup.getMenu().findItem(switch(statusVisibility){
+			case PUBLIC -> R.id.vis_public;
+			case UNLISTED -> R.id.vis_unlisted;
+			case PRIVATE -> R.id.vis_followers;
+			case DIRECT -> R.id.vis_private;
+		}).setChecked(true);
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(this::onAutocompleteOptionSelected);
@@ -425,6 +506,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putParcelableArrayList("attachments", serializedAttachments);
 		}
 		outState.putSerializable("visibility", statusVisibility);
+		if (scheduledAt != null) outState.putSerializable("scheduledAt", scheduledAt);
+		if (scheduledStatus != null) outState.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
 	}
 
 	@Override
@@ -444,6 +527,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		mainEditText.setSelectionListener(this);
 		mainEditText.addTextChangedListener(new TextWatcher(){
+			private int lastChangeStart, lastChangeCount;
+
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count, int after){
 
@@ -453,6 +538,16 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onTextChanged(CharSequence s, int start, int before, int count){
 				if(s.length()==0)
 					return;
+				lastChangeStart=start;
+				lastChangeCount=count;
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){
+				if(s.length()==0)
+					return;
+				int start=lastChangeStart;
+				int count=lastChangeCount;
 				// offset one char back to catch an already typed '@' or '#' or ':'
 				int realStart=start;
 				start=Math.max(0, start-1);
@@ -498,41 +593,94 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						editable.removeSpan(span);
 					}
 				}
-			}
 
-			@Override
-			public void afterTextChanged(Editable s){
 				updateCharCounter();
 			}
 		});
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
-			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			int visibilityNameRes = switch (replyTo.visibility) {
-				case PUBLIC -> R.string.visibility_public;
-				case UNLISTED -> R.string.sk_visibility_unlisted;
-				case PRIVATE -> R.string.visibility_followers_only;
-				case DIRECT -> R.string.visibility_private;
-			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
-			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
-				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
-				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
-				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
-				case DIRECT -> R.drawable.ic_at_symbol;
+			View replyWrap = view.findViewById(R.id.reply_wrap);
+			scrollView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+				int scrollHeight = scrollView.getHeight();
+				if (replyWrap.getMinimumHeight() != scrollHeight) {
+					replyWrap.setMinimumHeight(scrollHeight);
+					if (!initiallyScrolled) {
+						initiallyScrolled = true;
+						scrollView.post(() -> {
+							int bottom = scrollView.getChildAt(0).getBottom();
+							int delta = bottom - (scrollView.getScrollY() + scrollView.getHeight());
+							int space = GlobalUserPreferences.reduceMotion ? 0 : Math.min(V.dp(70), delta);
+							scrollView.scrollBy(0, delta - space);
+							if (!GlobalUserPreferences.reduceMotion) {
+								scrollView.postDelayed(() -> scrollView.smoothScrollBy(0, space), 130);
+							}
+						});
+					}
+				}
 			});
-			visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20));
-			Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled);
-			replyArrow.setBounds(0, 0, V.dp(20), V.dp(20));
-			replyText.setCompoundDrawables(replyArrow, null, visibilityIcon, null);
-
-			replyText.setOnClickListener(v->{
+			View originalPost = view.findViewById(R.id.original_post);
+			originalPost.setVisibility(View.VISIBLE);
+			originalPost.setOnClickListener(v->{
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
 				args.putParcelable("status", Parcels.wrap(replyTo));
 				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ThreadFragment.class, args);
 			});
+
+			ImageView avatar = view.findViewById(R.id.avatar);
+			ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(replyTo.account.avatar));
+			ViewOutlineProvider roundCornersOutline=new ViewOutlineProvider(){
+				@Override
+				public void getOutline(View view, Outline outline){
+					outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), V.dp(12));
+				}
+			};
+			avatar.setOutlineProvider(roundCornersOutline);
+			avatar.setClipToOutline(true);
+			avatar.setOnClickListener(v->{
+				Bundle args=new Bundle();
+				args.putString("account", accountID);
+				args.putParcelable("profileAccount", Parcels.wrap(replyTo.account));
+				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+				Nav.go(getActivity(), ProfileFragment.class, args);
+			});
+
+			((TextView) view.findViewById(R.id.name)).setText(replyTo.account.displayName);
+			((TextView) view.findViewById(R.id.username)).setText(replyTo.account.getDisplayUsername());
+			view.findViewById(R.id.visibility).setVisibility(View.GONE);
+			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
+				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
+				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
+				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
+				case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
+			});
+			ImageView moreBtn = view.findViewById(R.id.more);
+			moreBtn.setImageDrawable(visibilityIcon);
+			moreBtn.setBackground(null);
+			TextView timestamp = view.findViewById(R.id.timestamp);
+			if (replyTo.editedAt==null) timestamp.setText(UiUtils.formatRelativeTimestamp(getContext(), replyTo.createdAt));
+			else timestamp.setText(getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(getContext(), replyTo.editedAt)));
+			if (replyTo.spoilerText != null && !replyTo.spoilerText.isBlank()) {
+				view.findViewById(R.id.spoiler_header).setVisibility(View.VISIBLE);
+				((TextView) view.findViewById(R.id.spoiler_title_inline)).setText(replyTo.spoilerText);
+			}
+
+			SpannableStringBuilder content = HtmlParser.parse(replyTo.content, replyTo.emojis, replyTo.mentions, replyTo.tags, accountID);
+			LinkedTextView text = view.findViewById(R.id.text);
+			if (content.length() > 0) text.setText(content);
+			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
+
+			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
+			replyText.setOnClickListener(v->{
+				scrollView.smoothScrollTo(0, 0);
+			});
+			replyText.setOnClickListener(v->{
+				scrollView.smoothScrollTo(0, 0);
+			});
+
+
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 			if(!replyTo.account.id.equals(ownID))
@@ -576,7 +724,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						DraftMediaAttachment da=new DraftMediaAttachment();
 						da.serverAttachment=att;
 						da.description=att.description;
-						da.uri=Uri.parse(att.previewUrl);
+						da.uri=att.previewUrl!=null ? Uri.parse(att.previewUrl) : null;
 						da.state=AttachmentUploadState.DONE;
 						attachmentsView.addView(createMediaAttachmentView(da));
 						attachments.add(da);
@@ -592,6 +740,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					ignoreSelectionChanges=false;
 					initialText=prefilledText;
 				}
+				if (getArguments().containsKey("selectionStart") || getArguments().containsKey("selectionEnd")) {
+					int selectionStart=getArguments().getInt("selectionStart", 0);
+					int selectionEnd=getArguments().getInt("selectionEnd", selectionStart);
+					mainEditText.setSelection(selectionStart, selectionEnd);
+				}
 				ArrayList<Uri> mediaUris=getArguments().getParcelableArrayList("mediaAttachments");
 				if(mediaUris!=null && !mediaUris.isEmpty()){
 					for(Uri uri:mediaUris){
@@ -611,42 +764,71 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		publishButton=new Button(getActivity());
-		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
-		publishButton.setOnClickListener(this::onPublishClick);
-		LinearLayout wrap=new LinearLayout(getActivity());
-		wrap.setOrientation(LinearLayout.HORIZONTAL);
-
-		sendProgress=new ProgressBar(getActivity());
-		LinearLayout.LayoutParams progressLP=new LinearLayout.LayoutParams(V.dp(24), V.dp(24));
-		progressLP.setMarginEnd(V.dp(16));
-		progressLP.gravity=Gravity.CENTER_VERTICAL;
-		wrap.addView(sendProgress, progressLP);
-
-		sendError=new ImageView(getActivity());
-		sendError.setImageResource(R.drawable.ic_fluent_error_circle_24_regular);
-		sendError.setImageTintList(getResources().getColorStateList(R.color.error_600));
-		sendError.setScaleType(ImageView.ScaleType.CENTER);
-		wrap.addView(sendError, progressLP);
-
-		sendError.setVisibility(View.GONE);
-		sendProgress.setVisibility(View.GONE);
-
-		LinearLayout.LayoutParams langParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		langParams.setMarginEnd(V.dp(8));
-		wrap.addView(buildLanguageSelector(), langParams);
-
-		wrap.addView(publishButton, 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(editingStatus==null ? R.string.publish : R.string.save);
+		LinearLayout wrap=new LinearLayout(getActivity());
+		getActivity().getLayoutInflater().inflate(R.layout.compose_action, wrap);
 		item.setActionView(wrap);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-		updatePublishButtonState();
+
+		if(!GlobalUserPreferences.relocatePublishButton){
+			publishButton = wrap.findViewById(R.id.publish_btn);
+			publishButton.setOnClickListener(this::onPublishClick);
+			publishButton.setVisibility(View.VISIBLE);
+
+			draftsBtn = wrap.findViewById(R.id.drafts_btn);
+			draftsBtn.setVisibility(View.VISIBLE);
+		}else{
+			charCounter = wrap.findViewById(R.id.char_counter);
+			charCounter.setVisibility(View.VISIBLE);
+			charCounter.setText(String.valueOf(charLimit));
+		}
+
+//		draftsBtn = wrap.findViewById(R.id.drafts_btn);
+		draftOptionsPopup = new PopupMenu(getContext(), draftsBtn);
+		draftOptionsPopup.inflate(R.menu.compose_more);
+		draftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.draft);
+		undraftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.undraft);
+		scheduleMenuItem = draftOptionsPopup.getMenu().findItem(R.id.schedule);
+		unscheduleMenuItem = draftOptionsPopup.getMenu().findItem(R.id.unschedule);
+		draftOptionsPopup.setOnMenuItemClickListener(i->{
+			int id = i.getItemId();
+			if (id == R.id.draft) updateScheduledAt(getDraftInstant());
+			else if (id == R.id.schedule) pickScheduledDateTime();
+			else if (id == R.id.unschedule || id == R.id.undraft) updateScheduledAt(null);
+			else navigateToUnsentPosts();
+			return true;
+		});
+		UiUtils.enablePopupMenuIcons(getContext(), draftOptionsPopup);
+
+
+		languageButton = wrap.findViewById(R.id.language_btn);
+		sendProgress = wrap.findViewById(R.id.send_progress);
+		sendError = wrap.findViewById(R.id.send_error);
+
+		draftsBtn.setOnClickListener(v-> draftOptionsPopup.show());
+		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
+		updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null);
+		buildLanguageSelector(languageButton);
+	}
+
+	private void navigateToUnsentPosts() {
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putBoolean("hide_fab", true);
+		InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
+		imm.hideSoftInputFromWindow(draftsBtn.getWindowToken(), 0);
+		if (hasDraft()) {
+			Nav.go(getActivity(), ScheduledStatusListFragment.class, args);
+		} else {
+			// result for the previous ScheduledStatusList
+			setResult(true, null);
+			// finishing fragment in "onFragmentResult"
+			Nav.goForResult(getActivity(), ScheduledStatusListFragment.class, args, SCHEDULED_STATUS_OPENED_RESULT, this);
+		}
 	}
 
 	private void updateLanguage(String lang) {
-		updateLanguage(languageResolver.from(lang));
+		updateLanguage(lang == null ? languageResolver.getDefault() : languageResolver.from(lang));
 	}
 
 	private void updateLanguage(MastodonLanguage loc) {
@@ -656,21 +838,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
-	private Button buildLanguageSelector() {
-		TypedValue typedValue = new TypedValue();
-		getActivity().getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
-
-		languageButton=new Button(getActivity());
-		languageButton.setTextColor(typedValue.data);
-		languageButton.setBackground(getActivity().getDrawable(R.drawable.bg_text_button));
-		languageButton.setPadding(V.dp(8), 0, V.dp(8), 0);
-		languageButton.setCompoundDrawablesRelativeWithIntrinsicBounds(getActivity().getDrawable(R.drawable.ic_fluent_local_language_16_regular), null, null, null);
-		languageButton.setCompoundDrawableTintList(languageButton.getTextColors());
-		languageButton.setCompoundDrawablePadding(V.dp(6));
-
+	private void buildLanguageSelector(Button btn) {
 		languagePopup=new PopupMenu(getActivity(), languageButton);
-		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
-		languageButton.setOnClickListener(v->languagePopup.show());
+		btn.setOnTouchListener(languagePopup.getDragToOpenListener());
+		btn.setOnClickListener(v->languagePopup.show());
 
 		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
 		updateLanguage(prefs != null && prefs.postingDefaultLanguage != null && prefs.postingDefaultLanguage.length() > 0
@@ -694,8 +865,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			updateLanguage(allLanguages.get(i.getItemId()));
 			return true;
 		});
-
-		return languageButton;
 	}
 
 	@Override
@@ -732,6 +901,18 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		updatePublishButtonState();
 	}
 
+	private void resetPublishButtonText() {
+		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
+		if(GlobalUserPreferences.relocatePublishButton){
+			return;
+		}
+		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
+			publishButton.setText(GlobalUserPreferences.publishButtonText);
+		} else {
+			publishButton.setText(publishText);
+		}
+	}
+
 	private void updatePublishButtonState(){
 		uuid=null;
 		int nonEmptyPollOptionsCount=0;
@@ -747,6 +928,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				nonDoneAttachmentCount++;
 		}
 		publishButton.setEnabled((trimmedCharCount>0 || !attachments.isEmpty()) && charCount<=charLimit && nonDoneAttachmentCount==0 && (pollOptions.isEmpty() || nonEmptyPollOptionsCount>1));
+		sendError.setVisibility(View.GONE);
 	}
 
 	private void onCustomEmojiClick(Emoji emoji){
@@ -762,7 +944,55 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onPublishClick(View v){
-		publish();
+		if (!attachments.isEmpty()
+				&& statusVisibility != StatusPrivacy.DIRECT
+				&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.sk_no_image_desc_title)
+					.setMessage(R.string.sk_no_image_desc)
+					.setNegativeButton(R.string.cancel, null)
+					.setPositiveButton(R.string.publish, (dialog, i)-> publish())
+					.show();
+		} else {
+			publish();
+		}
+	}
+
+	private void publishErrorCallback(ErrorResponse error) {
+		wm.removeView(sendingOverlay);
+		sendingOverlay=null;
+		sendProgress.setVisibility(View.GONE);
+		sendError.setVisibility(View.VISIBLE);
+		publishButton.setEnabled(true);
+		if (error != null) error.showToast(getActivity());
+	}
+
+	private void createScheduledStatusFinish(ScheduledStatus result) {
+		wm.removeView(sendingOverlay);
+		sendingOverlay=null;
+		Toast.makeText(getContext(), scheduledAt.isAfter(DRAFTS_AFTER_INSTANT) ?
+				R.string.sk_draft_saved : R.string.sk_post_scheduled, Toast.LENGTH_SHORT).show();
+		Nav.finish(ComposeFragment.this);
+		E.post(new ScheduledStatusCreatedEvent(result, accountID));
+	}
+
+	private void maybeDeleteScheduledPost(Runnable callback) {
+		if (scheduledStatus != null) {
+			new DeleteStatus.Scheduled(scheduledStatus.id).setCallback(new Callback<>() {
+				@Override
+				public void onSuccess(Object o) {
+					E.post(new ScheduledStatusDeletedEvent(scheduledStatus.id, accountID));
+					callback.run();
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					publishErrorCallback(error);
+				}
+			}).exec(accountID);
+		} else {
+			callback.run();
+		}
 	}
 
 	private void publish(){
@@ -772,6 +1002,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.visibility=statusVisibility;
 		req.sensitive=sensitive;
 		req.language=language;
+		req.scheduledAt = scheduledAt;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 		}
@@ -808,46 +1039,71 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Callback<Status> resCallback=new Callback<>(){
 			@Override
 			public void onSuccess(Status result){
-				wm.removeView(sendingOverlay);
-				sendingOverlay=null;
-				if(editingStatus==null){
-					E.post(new StatusCreatedEvent(result, accountID));
-					if(replyTo!=null){
-						replyTo.repliesCount++;
-						E.post(new StatusCountersUpdatedEvent(replyTo));
+				maybeDeleteScheduledPost(() -> {
+					wm.removeView(sendingOverlay);
+					sendingOverlay=null;
+					if(editingStatus==null){
+						E.post(new StatusCreatedEvent(result, accountID));
+						if(replyTo!=null){
+							replyTo.repliesCount++;
+							E.post(new StatusCountersUpdatedEvent(replyTo));
+						}
+					}else{
+						E.post(new StatusUpdatedEvent(result));
 					}
-				}else{
-					E.post(new StatusUpdatedEvent(result));
-				}
-				Nav.finish(ComposeFragment.this);
-				if (getArguments().getBoolean("navigateToStatus", false)) {
-					Bundle args=new Bundle();
-					args.putString("account", accountID);
-					args.putParcelable("status", Parcels.wrap(result));
-					if(replyTo!=null) args.putParcelable("inReplyToAccount", Parcels.wrap(replyTo));
-					Nav.go(getActivity(), ThreadFragment.class, args);
-				}
+					Nav.finish(ComposeFragment.this);
+					if (getArguments().getBoolean("navigateToStatus", false)) {
+						Bundle args=new Bundle();
+						args.putString("account", accountID);
+						args.putParcelable("status", Parcels.wrap(result));
+						if(replyTo!=null) args.putParcelable("inReplyToAccount", Parcels.wrap(replyTo));
+						Nav.go(getActivity(), ThreadFragment.class, args);
+					}
+				});
 			}
 
 			@Override
 			public void onError(ErrorResponse error){
-				wm.removeView(sendingOverlay);
-				sendingOverlay=null;
-				sendProgress.setVisibility(View.GONE);
-				sendError.setVisibility(View.VISIBLE);
-				publishButton.setEnabled(true);
-				error.showToast(getActivity());
+				publishErrorCallback(error);
 			}
 		};
 
+
 		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
 					.exec(accountID);
-		}else{
+		}else if(req.scheduledAt == null){
 			new CreateStatus(req, uuid)
 					.setCallback(resCallback)
 					.exec(accountID);
+		}else if(req.scheduledAt.isAfter(Instant.now().plus(10, ChronoUnit.MINUTES))){
+			// checking for 10 instead of 5 minutes (as per mastodon) because i really don't want
+			// bugs to occur because the client's clock is wrong by a minute or two - the api
+			// returns a status instead of a scheduled status if scheduled time is less than 5
+			// minutes into the future and this is 1. unexpected for the user and 2. hard to handle
+			new CreateStatus.Scheduled(req, uuid)
+					.setCallback(new Callback<>() {
+						@Override
+						public void onSuccess(ScheduledStatus result) {
+							maybeDeleteScheduledPost(() -> {
+								createScheduledStatusFinish(result);
+							});
+						}
+
+						@Override
+						public void onError(ErrorResponse error) {
+							publishErrorCallback(error);
+						}
+					}).exec(accountID);
+		}else{
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.sk_scheduled_too_soon_title)
+					.setMessage(R.string.sk_scheduled_too_soon)
+					.setPositiveButton(R.string.ok, (a, b)->{})
+					.show();
+			publishErrorCallback(null);
+			publishButton.setEnabled(false);
 		}
 
 		if (replyTo == null) {
@@ -867,6 +1123,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			List<String> existingMediaIDs=editingStatus.mediaAttachments.stream().map(a->a.id).collect(Collectors.toList());
 			if(!existingMediaIDs.equals(attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList())))
 				return true;
+			if(!statusVisibility.equals(editingStatus.visibility)) return true;
+			if(scheduledStatus != null && !scheduledStatus.scheduledAt.equals(scheduledAt)) return true;
 			return pollChanged;
 		}
 		boolean pollFieldsHaveContent=false;
@@ -911,25 +1169,66 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					break;
 				}
 			}
+		} else if (reqCode == SCHEDULED_STATUS_OPENED_RESULT && success && getActivity() != null) {
+			Nav.finish(this);
 		}
 	}
 
 	private void confirmDiscardDraftAndFinish(){
 		new M3AlertDialogBuilder(getActivity())
-				.setTitle(editingStatus==null ? R.string.discard_draft : R.string.discard_changes)
-				.setPositiveButton(R.string.discard, (dialog, which)->Nav.finish(this))
-				.setNegativeButton(R.string.cancel, null)
+				.setTitle(editingStatus != null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
+				.setPositiveButton(R.string.save, (d, w) -> {
+					updateScheduledAt(scheduledAt == null ? getDraftInstant() : scheduledAt);
+					publish();
+				})
+				.setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
 				.show();
 	}
 
+	/**
+	 * Check to see if Android platform photopicker is available on the device\
+	 * @return whether the device supports photopicker intents.
+	 */
+	private boolean isPhotoPickerAvailable() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			return true;
+		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			return getExtensionVersion(Build.VERSION_CODES.R) >= 2;
+		} else
+			return false;
+	}
+
+	/**
+	 * Builds the correct intent for the device version to select media.
+	 *
+	 * <p>For Device version > T or R_SDK_v2, use the android platform photopicker via
+	 * {@link MediaStore#ACTION_PICK_IMAGES}
+	 *
+	 * <p>For earlier versions use the built in docs ui via {@link Intent#ACTION_GET_CONTENT}
+	 */
 	private void openFilePicker(){
-		Intent intent=new Intent(Intent.ACTION_GET_CONTENT);
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.setType("*/*");
-		if(instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.supportedMimeTypes!=null && !instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()){
-			intent.putExtra(Intent.EXTRA_MIME_TYPES, instance.configuration.mediaAttachments.supportedMimeTypes.toArray(new String[0]));
-		}else{
-			intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
+		Intent intent;
+		boolean usePhotoPicker = isPhotoPickerAvailable();
+		if (usePhotoPicker) {
+			intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+		} else {
+			intent = new Intent(Intent.ACTION_GET_CONTENT);
+			intent.addCategory(Intent.CATEGORY_OPENABLE);
+			intent.setType("*/*");
+		}
+		if (!usePhotoPicker && instance.configuration != null &&
+				instance.configuration.mediaAttachments != null &&
+				instance.configuration.mediaAttachments.supportedMimeTypes != null &&
+				!instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()) {
+			intent.putExtra(Intent.EXTRA_MIME_TYPES,
+					instance.configuration.mediaAttachments.supportedMimeTypes.toArray(
+							new String[0]));
+		} else {
+			if (!usePhotoPicker) {
+				// If photo picker is being used these are the default mimetypes.
+				intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
+			}
 		}
 		intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
 		startActivityForResult(intent, MEDIA_RESULT);
@@ -1012,7 +1311,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		View thumb=getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
 		ImageView img=thumb.findViewById(R.id.thumb);
 		if(draft.serverAttachment!=null){
-			ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
+			if(draft.serverAttachment.previewUrl!=null)
+				ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
 		}else{
 			if(draft.mimeType.startsWith("image/")){
 				ViewImageLoader.load(img, null, new UrlImageLoaderRequest(draft.uri, V.dp(250), V.dp(250)));
@@ -1072,7 +1372,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private void uploadMediaAttachment(DraftMediaAttachment attachment){
 		if(areThereAnyUploadingAttachments()){
-			 throw new IllegalStateException("there is already an attachment being uploaded");
+			throw new IllegalStateException("there is already an attachment being uploaded");
 		}
 		attachment.state=AttachmentUploadState.UPLOADING;
 		attachment.progressBar.setVisibility(View.VISIBLE);
@@ -1097,7 +1397,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					@Override
 					public void onProgress(long transferred, long total){
 						if(updateUploadEtaRunnable==null){
-							UiUtils.runOnUiThread(updateUploadEtaRunnable=ComposeFragment.this::updateUploadETAs, 100);
+							// getting a NoSuchMethodError: No static method -$$Nest$mupdateUploadETAs(ComposeFragment;)V in class ComposeFragment
+							// when using method reference out of nowhere after changing code elsewhere. no idea. programming is awful, actually
+							// noinspection Convert2MethodRef
+							UiUtils.runOnUiThread(updateUploadEtaRunnable=()->ComposeFragment.this.updateUploadETAs(), 50);
 						}
 						int progress=Math.round(transferred/(float)total*attachment.progressBar.getMax());
 						if(Build.VERSION.SDK_INT>=24)
@@ -1260,7 +1563,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				att.uploadStateText.setText(getString(R.string.file_upload_time_remaining, time));
 			}
 		}
-		UiUtils.runOnUiThread(updateUploadEtaRunnable, 100);
+		UiUtils.runOnUiThread(updateUploadEtaRunnable, 50);
 	}
 
 	private void onEditMediaDescriptionClick(View v){
@@ -1392,23 +1695,84 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if (attachments.isEmpty()) sensitive = false;
 	}
 
+	private void pickScheduledDateTime() {
+		LocalDateTime soon = LocalDateTime.now()
+				.plus(15, ChronoUnit.MINUTES) // so 14:59 doesn't get rounded up to…
+				.plus(1, ChronoUnit.HOURS) // …15:00, but rather 16:00
+				.withMinute(0);
+		new DatePickerDialog(getActivity(), (datePicker, year, arrayMonth, dayOfMonth) -> {
+			new TimePickerDialog(getActivity(), (timePicker, hour, minute) -> {
+				updateScheduledAt(LocalDateTime.of(year, arrayMonth + 1, dayOfMonth, hour, minute)
+						.toInstant(OffsetDateTime.now().getOffset()));
+			}, soon.getHour(), soon.getMinute(), DateFormat.is24HourFormat(getActivity())).show();
+		}, soon.getYear(), soon.getMonthValue() - 1, soon.getDayOfMonth()).show();
+	}
+
+	private void updateScheduledAt(Instant scheduledAt) {
+		this.scheduledAt = scheduledAt;
+		updatePublishButtonState();
+		scheduleDraftView.setVisibility(scheduledAt == null ? View.GONE : View.VISIBLE);
+		draftMenuItem.setVisible(true);
+		scheduleMenuItem.setVisible(true);
+		undraftMenuItem.setVisible(false);
+		unscheduleMenuItem.setVisible(false);
+		if (scheduledAt != null) {
+			DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault());
+			if (scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)) {
+				draftMenuItem.setVisible(false);
+				undraftMenuItem.setVisible(true);
+				scheduleTimeBtn.setVisibility(View.GONE);
+				scheduleDraftText.setText(R.string.sk_compose_draft);
+				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_regular, 0, 0, 0);
+				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_draft));
+				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_regular : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
+
+				if(GlobalUserPreferences.relocatePublishButton){
+					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+						? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_drafts_24_selector, 0, 0, 0);
+				}else{
+					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+							? R.string.save : R.string.sk_draft);
+				}
+			} else {
+				scheduleMenuItem.setVisible(false);
+				unscheduleMenuItem.setVisible(true);
+				String at = scheduledAt.atZone(ZoneId.systemDefault()).format(formatter);
+				scheduleTimeBtn.setVisibility(View.VISIBLE);
+				scheduleTimeBtn.setText(at);
+				scheduleDraftText.setText(R.string.sk_compose_scheduled);
+				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_schedule));
+				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_filled : R.drawable.ic_fluent_clock_20_filled, 0, 0, 0);
+				if(GlobalUserPreferences.relocatePublishButton)
+				{
+					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+							? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_clock_24_selector, 0, 0, 0);
+				}else{
+					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.equals(scheduledAt)
+							? R.string.save : R.string.sk_schedule);
+				}
+			}
+		} else {
+			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_regular : R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
+			if(GlobalUserPreferences.relocatePublishButton){
+				publishButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_send_24_selector, 0, 0, 0);
+			}
+			resetPublishButtonText();
+		}
+	}
+
 	private int getMediaAttachmentsCount(){
 		return attachments.size();
 	}
 
-	private void onVisibilityClick(View v){
-		PopupMenu menu=new PopupMenu(getActivity(), v);
-		menu.inflate(R.menu.compose_visibility);
-		Menu m=menu.getMenu();
-		UiUtils.enablePopupMenuIcons(getActivity(), menu);
+	private void buildVisibilityPopup(View v){
+		visibilityPopup=new PopupMenu(getActivity(), v);
+		visibilityPopup.inflate(R.menu.compose_visibility);
+		Menu m=visibilityPopup.getMenu();
+		UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
 		m.setGroupCheckable(0, true, true);
-		m.findItem(switch(statusVisibility){
-			case PUBLIC -> R.id.vis_public;
-			case UNLISTED -> R.id.vis_unlisted;
-			case PRIVATE -> R.id.vis_followers;
-			case DIRECT -> R.id.vis_private;
-		}).setChecked(true);
-		menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
+		visibilityPopup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
 			@Override
 			public boolean onMenuItemClick(MenuItem item){
 				int id=item.getItemId();
@@ -1426,7 +1790,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				return true;
 			}
 		});
-		menu.show();
 	}
 
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
@@ -1467,7 +1830,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			case PUBLIC -> R.drawable.ic_fluent_earth_24_regular;
 			case UNLISTED -> R.drawable.ic_fluent_people_community_24_regular;
 			case PRIVATE -> R.drawable.ic_fluent_people_checkmark_24_regular;
-			case DIRECT -> R.drawable.ic_at_symbol;
+			case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
 		});
 	}
 

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

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

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

@@ -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/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;
@@ -41,7 +42,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;
@@ -65,8 +70,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 +120,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 +153,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 +212,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 +224,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 +241,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 +272,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 +289,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 +308,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,42 @@
 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.R;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
 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);
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setHasOptionsMenu(true);
+		if (getParentFragment() instanceof HomeTabFragment home) parent = home;
 		loadData();
 	}
 
@@ -104,41 +68,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
@@ -157,12 +95,6 @@ public class HomeTimelineFragment extends StatusListFragment{
 		prependItems(Collections.singletonList(ev.status), true);
 	}
 
-	private void onFabClick(View v){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), ComposeFragment.class, args);
-	}
-
 	private void loadNewPosts(){
 		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
@@ -187,13 +119,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 +194,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,131 +239,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)));
-
-		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());
-		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);
-		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;
@@ -43,7 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 
-	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment, conversationsFragment;
 
 	private String accountID;
 
@@ -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
@@ -137,14 +151,14 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment.setArguments(args);
 
 			args=new Bundle(args);
-			args.putBoolean("onlyPosts", true);
-			postsFragment=new NotificationsListFragment();
-			postsFragment.setArguments(args);
+			args.putBoolean("onlyConversations", true);
+			conversationsFragment =new NotificationsListFragment();
+			conversationsFragment.setArguments(args);
 
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
-					.add(R.id.notifications_posts, postsFragment)
+					.add(R.id.notifications_posts, conversationsFragment)
 					.commit();
 		}
 
@@ -154,7 +168,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
-					case 2 -> R.string.posts;
+					case 2 -> R.string.sk_conversations;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -203,7 +217,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
-			case 2 -> postsFragment;
+			case 2 -> conversationsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}

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

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

@@ -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;
@@ -21,27 +17,36 @@ import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
+import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.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 +54,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 +86,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 +122,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 +136,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 +167,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 +194,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 +211,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 +223,31 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if (hasFocus) {
+				fab.setVisibility(View.GONE);
+				noteEditConfirm.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(1.0f)
+						.setDuration(700);
+			} else {
+				fab.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(0.0f)
+						.setDuration(700);
+				noteEditConfirm.setVisibility(View.INVISIBLE);
+			}
+		});
+
+		noteEditConfirm.setOnClickListener((v -> {
+			if (!noteEdit.getText().toString().trim().equals(note)) {
+				savePrivateNote();
+			}
+			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
+			noteEdit.clearFocus();
+		}));
+
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -233,7 +274,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 +314,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 +328,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.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
+			}
+		}).exec(accountID);
+	}
+
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -326,7 +386,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 							if(mediaFragment.loaded)
 								mediaFragment.onRefresh();
 						}
-						V.setVisibilityAnimated(fab, View.VISIBLE);
+//						if(noteEdit.hasFocus()){
+//							V.setVisibilityAnimated(fab, View.GONE);
+//						}else{
+//							V.setVisibilityAnimated(fab, View.VISIBLE);
+//						}
 					}
 				})
 				.exec(accountID);
@@ -445,6 +509,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 +523,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 +547,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 +628,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.manage_user_lists, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
+		}else{
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
+		}
+		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 +673,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 +713,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 +764,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 +989,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 +1000,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public boolean onBackPressed(){
+		if(noteEdit.hasFocus()) {
+			savePrivateNote();
+		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;
@@ -934,9 +1052,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,6 +9,7 @@ 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;
@@ -18,8 +19,11 @@ 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;
@@ -42,15 +46,18 @@ 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.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
+import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -58,6 +65,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;
@@ -76,7 +85,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){
@@ -84,8 +94,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();
@@ -102,9 +115,75 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			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.sk_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.sk_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();
@@ -121,6 +200,31 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			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.sk_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.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.sk_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->{
@@ -135,11 +239,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());
@@ -147,30 +246,65 @@ 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.sk_settings_contribute, ()->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.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
+//		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
+		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
+		items.add(clearImageCacheItem);
 		items.add(new TextItem(R.string.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.log_out, this::confirmLogOut));
+		items.add(new TextItem(R.string.sk_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.sk_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
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -255,6 +389,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		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;
 
@@ -264,6 +399,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		return true;
 	}
 
+
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -328,6 +464,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;
@@ -393,9 +535,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
@@ -433,6 +579,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			this.text=getString(text);
 		}
 
+		public HeaderItem(String text) {
+			this.text=text;
+		}
+
 		@Override
 		public int getViewType(){
 			return 0;
@@ -467,6 +617,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(){
@@ -490,19 +657,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
@@ -558,7 +750,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);
 			};
 		}
@@ -687,38 +880,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.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
-			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_fluent_color_24_regular);
-			button.setText(switch(GlobalUserPreferences.color){
-				case MATERIAL3 -> R.string.sk_color_theme_material3;
-				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 BROWN -> R.string.sk_color_theme_brown;
-				case RED -> R.string.sk_color_theme_red;
-				case YELLOW -> R.string.sk_color_theme_yellow;
-				default -> throw new IllegalStateException("Unexpected value: "+GlobalUserPreferences.color);
-			});
+		public void onBind(ButtonItem item){
+			text.setText(item.text);
+			icon.setImageResource(item.icon);
+			item.buttonConsumer.accept(button);
 		}
 	}
 
@@ -766,19 +946,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
@@ -787,6 +975,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(){
@@ -802,7 +1010,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;
@@ -813,6 +1021,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);
@@ -856,6 +1065,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/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,6 +172,12 @@ 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
@@ -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

@@ -225,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
@@ -283,29 +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.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername())).setVisible(relationship.following);
+			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);
@@ -346,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);

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;
 

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,7 +17,7 @@ import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class LocalTimelineFragment extends StatusListFragment{
+public class LocalTimelineFragment extends FabStatusListFragment {
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE);
 	private String maxID;
 

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

@@ -96,9 +96,9 @@ public class AccountActivationFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -139,6 +139,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
 		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
 		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
+		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
 		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
 		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
@@ -205,11 +206,6 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 		public InstanceViewHolder(){
 			super(getActivity(), R.layout.item_instance_custom, list);
-
-//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
-//			TypedValue value = new TypedValue();
-//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
-//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
 			userCount=findViewById(R.id.user_count);

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

@@ -115,9 +115,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -80,7 +80,6 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private LinearLayout filtersWrap;
 	private HorizontalScrollView filtersScroll;
 	private ImageButton backBtn, clearSearchBtn;
-	private View focusThing;
 
 	private FilterChipView categoryGeneral, categorySpecialInterests;
 	private List<FilterChipView> regionalFilters;
@@ -286,13 +285,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 		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);
-		}
+		langFilter.setText(R.string.server_filter_any_language);
 		langFilterMenu=new PopupMenu(getContext(), langFilter);
 		langFilter.setOnTouchListener(langFilterMenu.getDragToOpenListener());
 		langFilter.setOnClickListener(v->langFilterMenu.show());
@@ -308,12 +301,8 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		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);
+		speedFilter.setText(R.string.server_filter_instant_signup);
+		speedFilter.setSelected(true);
 		filtersWrap.addView(speedFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
 		speedFilterMenu.setOnMenuItemClickListener(item->{
@@ -339,13 +328,11 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		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->{
@@ -364,8 +351,6 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			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){
@@ -565,7 +550,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
 		}else{
 			filtersScroll.setVisibility(View.VISIBLE);
-			focusThing.requestFocus();
+			searchEdit.clearFocus();
 			searchEdit.setText("");
 			lp.addRule(RelativeLayout.END_OF, R.id.btn_back);
 			getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);

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

@@ -106,13 +106,13 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 				.execNoAuth("");
 	}
 
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		Toolbar toolbar=getToolbar();
-		toolbar.setElevation(0);
-		toolbar.setBackground(null);
-	}
+//	@Override
+//	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+//		Toolbar toolbar=getToolbar();
+//		toolbar.setElevation(0);
+//		toolbar.setBackground(null);
+//	}
 
 	@Override
 	protected RecyclerView.Adapter getAdapter(){

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

@@ -2,6 +2,7 @@ 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;
@@ -65,7 +66,7 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, 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());
@@ -77,13 +78,13 @@ public class InstanceRulesFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -147,15 +147,15 @@ public class SignupFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}
 
 	private void onButtonClick(){
-		if(!password.getText().equals(passwordConfirm.getText())){
+		if(!password.getText().toString().equals(passwordConfirm.getText().toString())){
 			passwordConfirm.setError(getString(R.string.signup_passwords_dont_match));
 			passwordConfirmWrap.setErrorState();
 			return;

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{"+

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

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

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

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

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

@@ -6,12 +6,14 @@ import com.google.gson.annotations.SerializedName;
 
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
+import org.parceler.Parcel;
 
 import java.time.Instant;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.regex.Pattern;
 
+@Parcel
 public class Filter extends BaseModel{
 	@RequiredField
 	public String id;
@@ -21,6 +23,7 @@ public class Filter extends BaseModel{
 	public Instant expiresAt;
 	public boolean irreversible;
 	public boolean wholeWord;
+	public FilterAction filterAction;
 
 	@SerializedName("context")
 	private List<FilterContext> _context;
@@ -76,4 +79,11 @@ public class Filter extends BaseModel{
 		@SerializedName("thread")
 		THREAD
 	}
+
+	public enum FilterAction{
+		@SerializedName("hide")
+		HIDE,
+		@SerializedName("warn")
+		WARN
+	}
 }

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

@@ -0,0 +1,8 @@
+package org.joinmastodon.android.model;
+
+import org.parceler.Parcel;
+
+@Parcel
+public class FilterResult extends BaseModel {
+    public Filter filter;
+}

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

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

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

@@ -57,6 +57,11 @@ public class Poll extends BaseModel{
 		public String title;
 		public Integer votesCount;
 
+		public Option() {}
+		public Option(String title) {
+			this.title = title;
+		}
+
 		@Override
 		public String toString(){
 			return "Option{"+

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

@@ -0,0 +1,81 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.model.Poll.Option;
+import org.parceler.Parcel;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Parcel
+public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
+    @RequiredField
+    public String id;
+    @RequiredField
+    public Instant scheduledAt;
+    @RequiredField
+    public Params params;
+    @RequiredField
+    public List<Attachment> mediaAttachments;
+
+    @Override
+    public String getID() {
+        return id;
+    }
+
+    @Parcel
+    public static class Params {
+        @RequiredField
+        public String text;
+        public String spoilerText;
+        @RequiredField
+        public StatusPrivacy visibility;
+        public long inReplyToId;
+        public ScheduledPoll poll;
+        public boolean sensitive;
+        public boolean withRateLimit;
+        public String language;
+        public String idempotency;
+        public String applicationId;
+        public List<String> mediaIds;
+    }
+
+    @Parcel
+    public static class ScheduledPoll {
+        @RequiredField
+        public String expiresIn;
+        @RequiredField
+        public List<String> options;
+        public boolean multiple;
+        public boolean hideTotals;
+
+        public Poll toPoll() {
+            Poll p = new Poll();
+            p.voted = true;
+            p.emojis = List.of();
+            p.ownVotes = List.of();
+            p.multiple = multiple;
+            p.options = options.stream().map(Option::new).collect(Collectors.toList());
+            return p;
+        }
+    }
+
+    public Status toStatus() {
+        Status s = new Status();
+        s.id = id;
+        s.mediaAttachments = mediaAttachments;
+        s.createdAt = scheduledAt;
+        s.inReplyToId = params.inReplyToId > 0 ? "" + params.inReplyToId : null;
+        s.content = s.text = params.text;
+        s.spoilerText = params.spoilerText;
+        s.visibility = params.visibility;
+        s.language = params.language;
+        s.sensitive = params.sensitive;
+        s.mentions = List.of();
+        s.tags = List.of();
+        s.emojis = List.of();
+        if (params.poll != null) s.poll = params.poll.toPoll();
+        return s;
+    }
+}

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

@@ -20,7 +20,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Instant createdAt;
 	@RequiredField
 	public Account account;
-//	@RequiredField
+	//	@RequiredField
 	public String content;
 	@RequiredField
 	public StatusPrivacy visibility;
@@ -40,6 +40,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public long favouritesCount;
 	public long repliesCount;
 	public Instant editedAt;
+	public List<FilterResult> filtered;
 
 	public String url;
 	public String inReplyToId;

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

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

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

@@ -24,6 +24,7 @@ import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;

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

@@ -1,8 +1,9 @@
 package org.joinmastodon.android.ui;
 
+import static org.joinmastodon.android.GlobalUserPreferences.recentEmojis;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -12,8 +13,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiUpdatedEvent;
@@ -21,13 +27,13 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
@@ -40,6 +46,9 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class CustomEmojiPopupKeyboard extends PopupKeyboard{
+	//determines how many emoji need to be clicked, before it disappears from the recent emojis
+	private static final int NEW_RECENT_VALUE=15;
+
 	private List<EmojiCategory> emojis;
 	private UsableRecyclerView list;
 	private ListImageLoaderWrapper imgLoader;
@@ -82,6 +91,17 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		list.setLayoutManager(lm);
 		imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);
 
+		// inject category with last used emojis
+		if (!recentEmojis.isEmpty()) {
+			List<Emoji> allAvailableEmojis =  emojis.stream().flatMap(category -> category.emojis.stream()).collect(Collectors.toList());
+			List<Emoji> recentEmojiList = new ArrayList<>();
+			for (String emojiCode : recentEmojis.keySet().stream().sorted(Comparator.comparingInt(GlobalUserPreferences.recentEmojis::get).reversed()).collect(Collectors.toList())) {
+				Optional<Emoji> element = allAvailableEmojis.stream().filter(e -> e.shortcode.equals(emojiCode)).findFirst();
+				element.ifPresent(recentEmojiList::add);
+			}
+			emojis.add(0, new EmojiCategory(activity.getString(R.string.sk_emoji_recent), recentEmojiList));
+		}
+
 		for(EmojiCategory category:emojis)
 			adapter.addAdapter(new SingleCategoryAdapter(category));
 		list.setAdapter(adapter);
@@ -100,6 +120,11 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		list.setBackgroundColor(UiUtils.getThemeColor(activity, android.R.attr.colorBackground));
 		list.setSelector(null);
 
+		//remove recently used afterwards, it would get duplicated otherwise
+		if (!recentEmojis.isEmpty()) {
+			emojis.remove(0);
+		}
+
 		return list;
 	}
 
@@ -107,6 +132,19 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		this.listener=listener;
 	}
 
+	private void increaseEmojiCount(Emoji emoji) {
+		Integer usageCount = recentEmojis.get(emoji.shortcode);
+		if (usageCount != null) {
+			recentEmojis.put(emoji.shortcode, usageCount + 1);
+		} else {
+			recentEmojis.put(emoji.shortcode, NEW_RECENT_VALUE);
+		}
+
+		recentEmojis.entrySet().removeIf(e -> e.getValue() <= 0);
+		recentEmojis.replaceAll((k, v) -> v - 1);
+		GlobalUserPreferences.save();
+	}
+
 	@SuppressLint("NotifyDataSetChanged")
 	@Subscribe
 	public void onEmojiUpdated(EmojiUpdatedEvent ev){
@@ -203,6 +241,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 
 		@Override
 		public void onClick(){
+			increaseEmojiCount(item);
 			listener.accept(item);
 		}
 	}

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

@@ -32,7 +32,7 @@ public class M3AlertDialogBuilder extends AlertDialog.Builder{
 			View title=alert.findViewById(titleID);
 			if(title!=null){
 				int pad=V.dp(24);
-				title.setPadding(pad, pad, pad, pad);
+				title.setPadding(pad, pad, pad, V.dp(18));
 			}
 		}
 		int titleDividerID=getContext().getResources().getIdentifier("titleDividerNoCustom", "id", "android");

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

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