Fixing the background of the disabled button on light themes and dark themes

# Conflicts:
#	mastodon/src/main/res/values/colors.xml

README.md

@@ -1,25 +1,37 @@
-![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="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-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 “Community”, “Federated” and “Posts”).**
+**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”).**
 
-When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reblogged/replied to your post.
+When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
   
 The Mastodon documentation has some more information about [Unlisted posting](https://docs.joinmastodon.org/user/posting/#unlisted) and [Public timelines](https://docs.joinmastodon.org/user/network/#timelines).
 
@@ -31,12 +43,6 @@ Despite being one of the main features of federated social media, the Federated
   
 That’s one of the reasons why choosing a small, **well-moderated instance is important**. Instance admins and moderators should always make sure to ban abusive users and stop federating with instances who platform them. On well-moderated instances, the Federated timeline can be a welcoming place to meet new people!
 
-### Draft and schedule posts
-
-**Allows for preparing a post and scheduling it to send it automatically at a specific time.**
-
-You can create drafts, edit them, send them manually later or set a scheduled date. Drafts are technically saved as scheduled posts, so you can view and edit them from other apps that support scheduled posts. Scheduled posts are handled by your home instance, so they'll work even if you uninstall Megalodon.
-
 ### **Image description viewer**
 
 **Allows you to quickly check whether an image or video has an alternative text attached to it.**
@@ -49,71 +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
 
-### IzzyOnDroid
+**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.**
 
-[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.
 
-<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
+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!
 
-Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
-
-[`https://apt.izzysoft.de/fdroid/repo`](https://apt.izzysoft.de/fdroid/repo)
-
-### Google Play Store
-
-[play.google.com/store/apps/details?id=org.joinmastodon.android.sk](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)
-
-<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>
-
-### F-Droid
-
-**[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)
-
-### Direct
-
-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,7 +95,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
 * [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/check-for-update-button)
 * [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reblogs from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
 * [Follow and unfollow hashtags](https://github.com/sk22/megalodon/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
 * [Notification bell for posts](https://github.com/sk22/megalodon/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
 * [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
@@ -141,14 +105,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/posts-notifications-tab)
 * [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)
-* [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)
-* [Implement deleting notifications](https://github.com/sk22/megalodon/commit/b0f9ce081f69f29ad59658fc00ca41372cd2677d) (disabled by default)
-* [Long-click boost button to "quote" a post](https://github.com/sk22/megalodon/commit/b25a237c20c6a924ed4d9b357999867c3a32b32b)
-* [Draft and schedule posts](https://github.com/sk22/megalodon/pull/217)
-* [Display original post when replying](https://github.com/sk22/megalodon/commit/375f8ceb2747705fedf43686681cc0e0b812f899)
+* [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
 
 
 ### Behavior
@@ -160,17 +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)
-* [Copy post URL when long-pressing share button](https://github.com/sk22/megalodon/commit/ba36347f03278763ecec617b1ce57ba89db7be72)
-* [Add option to disable swiping between tabs](https://github.com/sk22/megalodon/commit/1f20b21fc84bf006c1ec14bd2229cbfad5215ec8)
-* [Resolve Fediverse links in the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/open-urls-in-app)
-* [Preserve whitespaces in HTML](https://github.com/sk22/megalodon/commit/7d876bddc7a07d98f0fecbf62b13bdb9fcce3412)
-* [Long-click to copy links](https://github.com/sk22/megalodon/commit/b32e32274923a94742a9926ef38785f746d41405)
 
 
 ### Visual
@@ -178,13 +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)
-* [Dedicated icons for different notification types](https://github.com/sk22/megalodon/pull/178) by [@florian-obernberger](https://github.com/florian-obernberger)
 
 
 ## Building
@@ -201,4 +140,4 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>
+<a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>

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

fix-metadata-markdown-lists.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-find metadata -name '*.txt' -exec sed -Ei 's/^[–—─•·*]\s+/- /' {} \;

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 66
-		versionName "1.1.5+fork.66"
+		versionCode 72
+		versionName "1.1.4+fork.72.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

@@ -111,7 +111,7 @@ 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()){
@@ -144,7 +144,7 @@ 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();
 

mastodon/src/main/AndroidManifest.xml

@@ -15,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"
@@ -34,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

@@ -1,39 +0,0 @@
-#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
-#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
-#	This list contains domains of toxic mastodon instances
-#	Last-Modified:	1672044500
-
-#	gab - a neonazi social network
-gab.ai
-gab.com
-gab.protohype.net
-
-#	consequence-free speech
-social.unzensiert.to
-freeatlantis.com
-
-#	reactionary bigotry and hatespeech against magrinalized groups
-poa.st
-freespeechextremist.com
-rdrama.cc
-outpoa.st
-anime.website
-gameliberty.club
-social.byoblu.com
-yggdrasil.social
-smuglo.li
-dogeposting.social
-unsafe.space
-freezepeach.xyz
-
-#	+ CSAM
-rojogato.com
-
-#	antivaxxer shitposting & fearmongering
-shadowsocial.org
-
-#	Kiwifarms
-kiwifarms.net
-kiwifarms.cc
-kiwifarms.is
-kiwifarms.pleroma.net

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

@@ -12,6 +12,7 @@ import android.widget.Toast;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.ArrayList;
@@ -35,10 +36,13 @@ public class ExternalShareActivity extends FragmentStackActivity{
 				openComposeFragment(sessions.get(0).getID());
 			}else{
 				getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
-				UiUtils.pickAccount(this, null, R.string.choose_account, 0,
-						session -> openComposeFragment(session.getID()),
-						b -> b.setOnCancelListener(d -> finish())
-				);
+				new M3AlertDialogBuilder(this)
+						.setItems(sessions.stream().map(as->"@"+as.self.username+"@"+as.domain).toArray(String[]::new), (dialog, which)->{
+							openComposeFragment(sessions.get(which).getID());
+						})
+						.setTitle(R.string.choose_account)
+						.setOnCancelListener(dialog -> finish())
+						.show();
 			}
 		}
 	}
@@ -49,10 +53,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
 		String subject = "";
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
-			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-			if (!subject.isBlank()) builder.append(subject).append("\n\n");
-		}
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n\n");
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;

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

@@ -4,6 +4,7 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
@@ -26,11 +27,6 @@ public class GlobalUserPreferences{
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
 	public static boolean voteButtonForSingleChoice;
-	public static boolean enableDeleteNotifications;
-	public static boolean translateButtonOpenedOnly;
-	public static boolean uniformNotificationIcon;
-	public static boolean reduceMotion;
-	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
@@ -60,19 +56,18 @@ public class GlobalUserPreferences{
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
-		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
-		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
-		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
-		reduceMotion=prefs.getBoolean("reduceMotion", false);
-		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
 
 		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.PURPLE;
+			}
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PINK;
+			color=ColorPreference.PURPLE;
 		}
 	}
 
@@ -89,11 +84,6 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
-				.putBoolean("translateButtonOpenedOnly", translateButtonOpenedOnly)
-				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
-				.putBoolean("reduceMotion", reduceMotion)
-				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
@@ -108,7 +98,8 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		YELLOW
+		YELLOW,
+		NORD
 	}
 
 	public enum ThemePreference{

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

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

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

@@ -8,7 +8,9 @@ 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;
@@ -135,22 +137,20 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		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))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.primary_700));
-
-		if (!GlobalUserPreferences.uniformNotificationIcon) switch (pn.notificationType) {
+				.setColor(context.getColor(R.color.shortcut_icon_background));
+		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);
 		}
-
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));
 		}

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

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

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

@@ -162,8 +162,6 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								result.serverKey=result.serverKey.replace('/','_');
-								result.serverKey=result.serverKey.replace('+','-');
 								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
@@ -372,7 +370,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,7 +9,6 @@ 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;
@@ -19,18 +18,12 @@ 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, boolean updateCounters) {
-		this.accountID=accountID;
-		this.updateCounters=updateCounters;
-	}
-
 	public StatusInteractionController(String accountID){
-		this(accountID, true);
+		this.accountID=accountID;
 	}
 
 	public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
@@ -48,7 +41,7 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -57,16 +50,16 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
-	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){
+	public void setReblogged(Status status, boolean reblogged, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -74,7 +67,7 @@ public class StatusInteractionController{
 		if(current!=null){
 			current.cancel();
 		}
-		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged, visibility)
+		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Status reblog){
@@ -82,7 +75,7 @@ public class StatusInteractionController{
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -91,13 +84,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
@@ -118,7 +111,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -127,12 +120,12 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningBookmarkRequests.put(status.id, req);
 		status.bookmarked=bookmarked;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

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

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

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/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/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/notifications/DismissNotification.java

@@ -1,17 +0,0 @@
-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,7 +1,6 @@
 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;
 
@@ -10,29 +9,12 @@ 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,10 +7,4 @@ 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

@@ -1,16 +0,0 @@
-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,17 +2,10 @@ 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, StatusPrivacy visibility){
+	public SetStatusReblogged(String id, boolean reblogged){
 		super(HttpMethod.POST, "/statuses/"+id+"/"+(reblogged ? "reblog" : "unreblog"), Status.class);
-		Request req = new Request();
-		req.visibility = visibility;
-		setRequestBody(req);
-	}
-
-	public static class Request {
-		public StatusPrivacy visibility;
+		setRequestBody(new Object());
 	}
 }

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, remoteStatusInteractionController;
+	private transient StatusInteractionController statusInteractionController;
 	private transient CacheController cacheController;
 	private transient PushSubscriptionManager pushSubscriptionManager;
 
@@ -52,10 +52,6 @@ public class AccountSession{
 		return domain+"_"+self.id;
 	}
 
-	public String getFullUsername() {
-		return "@"+self.username+"@"+domain;
-	}
-
 	public MastodonAPIController getApiController(){
 		if(apiController==null)
 			apiController=new MastodonAPIController(this);
@@ -68,12 +64,6 @@ 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,6 +13,8 @@ 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;
@@ -61,7 +63,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();
 
@@ -102,11 +104,12 @@ public class AccountSessionManager{
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
 		instances.put(instance.uri, instance);
+		updateInstanceInfoV2(instance);
 		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
-		updateMoreInstanceInfo(instance, instance.uri);
+		updateInstanceEmojis(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
@@ -211,7 +214,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();
 
@@ -325,7 +328,10 @@ public class AccountSessionManager{
 					@Override
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
-						updateMoreInstanceInfo(instance, domain);
+						updateInstanceEmojis(instance, domain);
+						try {
+							updateInstanceInfoV2(instance);
+						} catch (Exception ignored) {}
 					}
 
 					@Override
@@ -336,18 +342,16 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
-	public void updateMoreInstanceInfo(Instance instance, String domain) {
+	public void updateInstanceInfoV2(Instance instance) {
 		new GetInstance.V2().setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Instance.V2 v2) {
 				if (instance != null) instance.v2 = v2;
-				updateInstanceEmojis(instance, domain);
+				writeAccountsFile();
 			}
 
 			@Override
-			public void onError(ErrorResponse errorResponse) {
-				updateInstanceEmojis(instance, domain);
-			}
+			public void onError(ErrorResponse errorResponse) {}
 		}).execNoAuth(instance.uri);
 	}
 

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

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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/AnnouncementsFragment.java

@@ -1,107 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-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 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();
-		return List.of(
-				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
-				new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus)
-		);
-	}
-
-	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 onDataLoaded(List<Announcement> d, boolean more) {
-		unreadIDs = d.stream().filter(a -> !a.read).map(a -> a.id).collect(Collectors.toList());
-		super.onDataLoaded(d, more);
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAnnouncements(true)
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(List<Announcement> result){
-						onDataLoaded(result, false);
-					}
-				})
-				.exec(accountID);
-	}
-}

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

@@ -1,16 +1,12 @@
 package org.joinmastodon.android.fragments;
 
 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;
@@ -33,12 +29,11 @@ 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;
@@ -60,7 +55,6 @@ 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;
 
@@ -73,15 +67,13 @@ 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;
@@ -93,7 +85,6 @@ 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;
@@ -109,7 +100,6 @@ 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;
@@ -119,12 +109,6 @@ 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;
@@ -147,7 +131,6 @@ 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";
 
@@ -171,9 +154,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private String accountID;
 	private int charCount, charLimit, trimmedCharCount;
 
-	private Button publishButton, languageButton, scheduleTimeBtn, draftsBtn;
-	private PopupMenu languagePopup, visibilityPopup, draftOptionsPopup;
-	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn, scheduleDraftDismiss;
+	private Button publishButton, languageButton;
+	private PopupMenu languagePopup, visibilityPopup;
+	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
 	private TextView replyText;
@@ -182,13 +165,8 @@ 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<>();
 
@@ -204,7 +182,6 @@ 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;
@@ -217,7 +194,6 @@ 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;
@@ -227,10 +203,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);
@@ -239,9 +219,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);
@@ -251,16 +231,14 @@ 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)
 			charLimit=instance.configuration.statuses.maxCharacters;
 		else
 			charLimit=500;
+
+		if (editingStatus == null) loadDefaultStatusVisibility(savedInstanceState);
 	}
 
 	@Override
@@ -274,6 +252,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
+		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}
 
 	@Override
@@ -295,11 +274,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
 		charCounter=view.findViewById(R.id.char_counter);
 		charCounter.setText(String.valueOf(charLimit));
-		scrollView=view.findViewById(R.id.scroll_view);
 
-		selfName=view.findViewById(R.id.self_name);
-		selfUsername=view.findViewById(R.id.self_username);
-		selfAvatar=view.findViewById(R.id.self_avatar);
+		selfName=view.findViewById(R.id.name);
+		selfUsername=view.findViewById(R.id.username);
+		selfAvatar=view.findViewById(R.id.avatar);
 		HtmlParser.setTextWithCustomEmoji(selfName, self.displayName, self.emojis);
 		selfUsername.setText('@'+self.username+'@'+instanceDomain);
 		ViewImageLoader.load(selfAvatar, null, new UrlImageLoaderRequest(self.avatar));
@@ -317,10 +295,6 @@ 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);
@@ -332,10 +306,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		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
@@ -385,12 +355,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(eopt.title);
 			}
-			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));
+			pollDuration=(int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond();
+			pollDurationStr=UiUtils.formatTimeLeft(getActivity(), editingStatus.poll.expiresAt);
 			updatePollOptionHints();
 			pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr));
 		}else{
@@ -429,10 +395,9 @@ 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;
@@ -476,8 +441,6 @@ 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
@@ -560,78 +523,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
-			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);
-							}
-						});
-					}
-				}
-			});
-			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));
 			int visibilityNameRes = switch (replyTo.visibility) {
 				case PUBLIC -> R.string.visibility_public;
@@ -640,10 +531,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				case DIRECT -> R.string.visibility_private;
 			};
 			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
-			replyText.setOnClickListener(v->{
-				scrollView.smoothScrollTo(0, 0);
+			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;
 			});
+			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->{
+				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);
+			});
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 			if(!replyTo.account.id.equals(ownID))
@@ -727,59 +632,42 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		MenuItem item=menu.add(editingStatus==null ? R.string.publish : R.string.save);
+		publishButton=new Button(getActivity());
+		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
+		publishButton.setOnClickListener(this::onPublishClick);
 		LinearLayout wrap=new LinearLayout(getActivity());
-		getActivity().getLayoutInflater().inflate(R.layout.compose_action, wrap);
+		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);
 		item.setActionView(wrap);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-
-		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);
-
-		publishButton = wrap.findViewById(R.id.publish_btn);
-		languageButton = wrap.findViewById(R.id.language_btn);
-		sendProgress = wrap.findViewById(R.id.send_progress);
-		sendError = wrap.findViewById(R.id.send_error);
-
-		publishButton.setOnClickListener(this::onPublishClick);
-		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);
-		}
+		updatePublishButtonState();
 	}
 
 	private void updateLanguage(String lang) {
-		updateLanguage(lang == null ? languageResolver.getDefault() : languageResolver.from(lang));
+		updateLanguage(languageResolver.from(lang));
 	}
 
 	private void updateLanguage(MastodonLanguage loc) {
@@ -789,10 +677,21 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
-	private void buildLanguageSelector(Button btn) {
+	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));
+
 		languagePopup=new PopupMenu(getActivity(), languageButton);
-		btn.setOnTouchListener(languagePopup.getDragToOpenListener());
-		btn.setOnClickListener(v->languagePopup.show());
+		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
+		languageButton.setOnClickListener(v->languagePopup.show());
 
 		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
 		updateLanguage(prefs != null && prefs.postingDefaultLanguage != null && prefs.postingDefaultLanguage.length() > 0
@@ -816,6 +715,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			updateLanguage(allLanguages.get(i.getItemId()));
 			return true;
 		});
+
+		return languageButton;
 	}
 
 	@Override
@@ -852,15 +753,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		updatePublishButtonState();
 	}
 
-	private void resetPublishButtonText() {
-		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
-		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
-			publishButton.setText(GlobalUserPreferences.publishButtonText);
-		} else {
-			publishButton.setText(publishText);
-		}
-	}
-
 	private void updatePublishButtonState(){
 		uuid=null;
 		int nonEmptyPollOptionsCount=0;
@@ -876,7 +768,6 @@ 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){
@@ -895,43 +786,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		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(){
 		String text=mainEditText.getText().toString();
 		CreateStatus.Request req=new CreateStatus.Request();
@@ -939,7 +793,6 @@ 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());
 		}
@@ -976,32 +829,35 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		Callback<Status> resCallback=new Callback<>(){
 			@Override
 			public void onSuccess(Status result){
-				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));
+				wm.removeView(sendingOverlay);
+				sendingOverlay=null;
+				if(editingStatus==null){
+					E.post(new StatusCreatedEvent(result, accountID));
+					if(replyTo!=null){
+						replyTo.repliesCount++;
+						E.post(new StatusCountersUpdatedEvent(replyTo));
 					}
-					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);
-					}
-				});
+				}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);
+				}
 			}
 
 			@Override
 			public void onError(ErrorResponse error){
-				publishErrorCallback(error);
+				wm.removeView(sendingOverlay);
+				sendingOverlay=null;
+				sendProgress.setVisibility(View.GONE);
+				sendError.setVisibility(View.VISIBLE);
+				publishButton.setEnabled(true);
+				error.showToast(getActivity());
 			}
 		};
 
@@ -1009,37 +865,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
 					.exec(accountID);
-		}else if(req.scheduledAt == null){
+		}else{
 			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) {
@@ -1059,8 +888,6 @@ 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;
@@ -1105,19 +932,14 @@ 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.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))
+				.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)
 				.show();
 	}
 
@@ -1296,10 +1118,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					@Override
 					public void onProgress(long transferred, long total){
 						if(updateUploadEtaRunnable==null){
-							// 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);
+							UiUtils.runOnUiThread(updateUploadEtaRunnable=ComposeFragment.this::updateUploadETAs, 100);
 						}
 						int progress=Math.round(transferred/(float)total*attachment.progressBar.getMax());
 						if(Build.VERSION.SDK_INT>=24)
@@ -1462,7 +1281,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				att.uploadStateText.setText(getString(R.string.file_upload_time_remaining, time));
 			}
 		}
-		UiUtils.runOnUiThread(updateUploadEtaRunnable, 50);
+		UiUtils.runOnUiThread(updateUploadEtaRunnable, 100);
 	}
 
 	private void onEditMediaDescriptionClick(View v){
@@ -1594,58 +1413,6 @@ 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(R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
-				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(R.drawable.ic_fluent_clock_20_filled, 0, 0, 0);
-				publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.equals(scheduledAt)
-						? R.string.save : R.string.sk_schedule);
-			}
-		} else {
-			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
-			resetPublishButtonText();
-		}
-	}
-
 	private int getMediaAttachmentsCount(){
 		return attachments.size();
 	}
@@ -1714,7 +1481,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_fluent_mention_24_regular;
+			case DIRECT -> R.drawable.ic_at_symbol;
 		});
 	}
 

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

@@ -16,7 +16,6 @@ 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;
 
@@ -118,7 +117,6 @@ 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/HomeTimelineFragment.java

@@ -19,22 +19,18 @@ 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 androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
 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.Announcement;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -47,9 +43,12 @@ 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;
@@ -58,14 +57,11 @@ import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment{
-	private static final int ANNOUNCEMENTS_RESULT = 654;
-
 	private ImageButton fab;
 	private ImageView toolbarLogo;
 	private Button toolbarShowNewPostsBtn;
 	private boolean newPostsBtnShown;
 	private AnimatorSet currentNewPostsAnim;
-	private MenuItem announcements;
 
 	private String maxID;
 
@@ -110,8 +106,6 @@ public class HomeTimelineFragment extends StatusListFragment{
 		super.onViewCreated(view, savedInstanceState);
 		fab=view.findViewById(R.id.fab);
 		fab.setOnClickListener(this::onFabClick);
-		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID));
-
 		updateToolbarLogo();
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
@@ -131,40 +125,16 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@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);
 	}
 
 	@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);
-		}
+		Nav.go(getActivity(), SettingsFragment.class, args);
 		return true;
 	}
 
-	@Override
-	public void onFragmentResult(int reqCode, boolean noMoreUnread, Bundle result){
-		if (reqCode == ANNOUNCEMENTS_RESULT && noMoreUnread) {
-			announcements.setIcon(R.drawable.ic_fluent_megaphone_24_regular);
-		}
-	}
-
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
 		super.onConfigurationChanged(newConfig);
@@ -217,8 +187,10 @@ public class HomeTimelineFragment extends StatusListFragment{
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
-						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
+						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+						if(!filters.isEmpty()){
+							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
+						}
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
 							showNewPostsButton();
@@ -292,14 +264,18 @@ public class HomeTimelineFragment extends StatusListFragment{
 							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);
+							List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+							outer:
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
-								if(filterPredicate.test(s)){
-									targetList.addAll(buildDisplayItems(s));
-									insertedPosts.add(s);
+								for(Filter filter:filters){
+									if(filter.matches(s)){
+										continue outer;
+									}
 								}
+								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.
@@ -345,6 +321,9 @@ public class HomeTimelineFragment extends StatusListFragment{
 		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
 		toolbarLogo.setImageResource(R.drawable.logo);
 		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+//		toolbarLogo =new TextView(getActivity());
+//		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+//		toolbarLogo.setTextAppearance(R.style.app_title);
 
 		toolbarShowNewPostsBtn=new Button(getActivity());
 		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
@@ -372,9 +351,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 		}
 
 		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(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
 		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
 
 		Toolbar toolbar=getToolbar();

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

@@ -1,6 +1,7 @@
 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;
@@ -11,7 +12,6 @@ import android.widget.ImageButton;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
 
@@ -69,7 +69,6 @@ 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/NotificationsFragment.java

@@ -74,26 +74,15 @@ 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) {
-			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;
+		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;
 	}
 
 	@Override

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

@@ -2,8 +2,6 @@ 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;
@@ -12,6 +10,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Notification;
@@ -79,9 +78,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, n, null) : null;
+		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, null, extraText) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null);
 			if(titleItem!=null){
 				for(StatusDisplayItem item:items){
 					if(item instanceof ImageStatusDisplayItem imgItem){
@@ -211,7 +210,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	public void removeNotification(Notification n){
+	private void removeNotification(Notification n){
 		data.remove(n);
 		preloadedData.remove(n);
 		int index=-1;

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

@@ -164,11 +164,6 @@ 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);
@@ -280,7 +275,6 @@ 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();
@@ -294,11 +288,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
 		username.setOnLongClickListener(v->{
-			String usernameString=account.acct;
-			if(!usernameString.contains("@")){
-				usernameString+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
+			String username=account.acct;
+			if(!username.contains("@")){
+				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 			}
-			UiUtils.copyText(username, '@'+usernameString);
+			UiUtils.copyText(getActivity(), '@'+username);
 			return true;
 		});
 
@@ -555,25 +549,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
-		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
+		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
 		if(isOwnProfile)
 			return;
 
-		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.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);
 		if(relationship.following) {
-			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
-			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
-			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
-			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			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);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
@@ -642,10 +628,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			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;
 	}
@@ -957,7 +939,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		if(getPrefilledText() != null) args.putString("prefilledText", getPrefilledText());
+		if(!AccountSessionManager.getInstance().isSelf(accountID, account)){
+			args.putString("prefilledText", '@'+account.acct+' ');
+		}
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 

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

@@ -1,171 +0,0 @@
-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);
-	}
-
-	@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,7 +9,6 @@ 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;
@@ -23,7 +22,6 @@ 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;
@@ -46,17 +44,15 @@ import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.parceler.Parcels;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -64,8 +60,6 @@ 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;
@@ -94,8 +88,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		setTitle(R.string.settings);
 		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();
@@ -108,6 +100,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
+		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+			GlobalUserPreferences.disableMarquee=i.checked;
+			GlobalUserPreferences.save();
+		}));
 		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);
@@ -124,54 +120,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				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);
-
-			b.setOnClickListener(l->{
-				FrameLayout inputWrap = new FrameLayout(getContext());
-				EditText input = new EditText(getContext());
-				input.setHint(R.string.publish);
-				input.setText(GlobalUserPreferences.publishButtonText.trim());
-				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-				params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-				input.setLayoutParams(params);
-				inputWrap.addView(input);
-				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-						.setPositiveButton(R.string.save, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNeutralButton(R.string.clear, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = "";
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNegativeButton(R.string.cancel, (d, which) -> {})
-						.show();
-			});
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
-			GlobalUserPreferences.uniformNotificationIcon=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
-			GlobalUserPreferences.disableMarquee=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
-		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
-		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
-			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();
@@ -193,20 +146,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{
-			GlobalUserPreferences.enableDeleteNotifications=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
-			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		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, instanceName)));
 
 		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->{
@@ -221,6 +160,11 @@ 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());
@@ -228,46 +172,30 @@ 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_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, 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.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
 
-		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 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(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.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));
-
-		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));
+		items.add(new RedHeaderItem(R.string.settings_spicy));
 		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/LucasGGamerM/moshidon")));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
+		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);
@@ -352,6 +280,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;
 
@@ -361,6 +290,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		return true;
 	}
 
+
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -530,10 +460,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			this.text=getString(text);
 		}
 
-		public HeaderItem(String text) {
-			this.text=text;
-		}
-
 		@Override
 		public int getViewType(){
 			return 0;
@@ -585,6 +511,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
+	public class ColorPicker extends Item{
+		@Override
+		public int getViewType(){
+			return 8;
+		}
+	}
+
 	private static class ThemeItem extends Item{
 
 		@Override
@@ -601,42 +534,19 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	private class SmallTextItem extends Item {
-		private String text;
-
-		public SmallTextItem(String text) {
-			this.text = text;
-		}
-
-		@Override
-		public int getViewType() {
-			return 9;
-		}
-	}
-
 	private class TextItem extends Item{
 		private String text;
 		private Runnable onClick;
 		private boolean loading;
-		private int icon;
 
 		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, onClick, false, 0);
+			this(text, onClick, false);
 		}
 
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading) {
-			this(text, onClick, loading, 0);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading, @DrawableRes int icon){
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
-			this.icon=icon;
 		}
 
 		@Override
@@ -693,7 +603,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
 				case 8 -> new ButtonViewHolder();
-				case 9 -> new SmallTextViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -822,6 +731,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
+
 	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
@@ -889,20 +799,17 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
 		private final TextView text;
 		private final ProgressBar progress;
-		private final ImageView icon;
 
 		public TextViewHolder(){
 			super(getActivity(), R.layout.item_settings_text, list);
 			text = itemView.findViewById(R.id.text);
 			progress = itemView.findViewById(R.id.progress);
-			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
-			if (item.icon != 0) icon.setImageDrawable(getActivity().getTheme().getDrawable(item.icon));
 		}
 
 		@Override
@@ -911,24 +818,6 @@ 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);
-			text.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
-			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(){

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, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
 		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, null));
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0, null));
 		}
 		return items;
 	}

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

@@ -29,7 +29,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, null);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true);
 	}
 
 	@Override

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

@@ -5,6 +5,7 @@ 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;
@@ -16,7 +17,6 @@ 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,10 +92,16 @@ public class ThreadFragment extends StatusListFragment{
 	}
 
 	private List<Status> filterStatuses(List<Status> statuses){
-		StatusFilterPredicate statusFilterPredicate=new StatusFilterPredicate(accountID,Filter.FilterContext.THREAD);
-		return statuses.stream()
-				.filter(statusFilterPredicate)
-				.collect(Collectors.toList());
+		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());
 	}
 
 	@Override

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

@@ -88,11 +88,11 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			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;
+				case 2 -> R.id.discover_lists;
+				case 3 -> R.id.discover_hashtags;
+				case 4 -> R.id.discover_posts;
+				case 5 -> R.id.discover_news;
+				case 6 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -166,11 +166,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				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 2 -> R.string.sk_list_timelines;
+					case 3 -> R.string.hashtags;
+					case 4 -> R.string.posts;
+					case 5 -> R.string.news;
+					case 6 -> R.string.for_you;
+
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);

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, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true);
 		};
 	}
 

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/CustomLoginFragment.java

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

mastodon/src/main/java/org/joinmastodon/android/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

@@ -65,7 +65,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.colorPollVoted, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
@@ -77,13 +77,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,9 +147,9 @@ 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);
 	}

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, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
 		for(StatusDisplayItem item:items){
 			if(item instanceof ImageStatusDisplayItem isdi){
 				isdi.horizontalInset=V.dp(40+32);

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

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import com.squareup.otto.Subscribe;
@@ -29,17 +28,15 @@ import java.util.ArrayList;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.utils.V;
 
 public class ReportCommentFragment extends MastodonToolbarFragment{
 	private String accountID;
 	private Account reportAccount;
 	private Button btn;
-	private View buttonBar, forwardReportItem;
-	private TextView forwardReportText;
-	private Switch forwardReportSwitch;
+	private View buttonBar;
 	private EditText commentEdit;
-	private boolean forwardReport;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -80,17 +77,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		view.findViewById(R.id.btn_back).setOnClickListener(this::onButtonClick);
 		buttonBar=view.findViewById(R.id.button_bar);
 		commentEdit=view.findViewById(R.id.text);
-		forwardReportSwitch = view.findViewById(R.id.forward_report_switch);
-		forwardReportItem = view.findViewById(R.id.forward_report);
-		forwardReportText = view.findViewById(R.id.forward_report_text);
-		String domain = reportAccount.getDomain();
-		if (domain == null) {
-			forwardReportItem.setVisibility(View.GONE);
-		} else {
-			forwardReportItem.setOnClickListener(this::onForwardReportClick);
-			forwardReportText.setText(getActivity().getString(R.string.sk_forward_report_to, domain));
-			forwardReportSwitch.setChecked(forwardReport = true);
-		}
+
 		return view;
 	}
 
@@ -115,7 +102,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		ReportReason reason=ReportReason.valueOf(getArguments().getString("reason"));
 		ArrayList<String> statusIDs=getArguments().getStringArrayList("statusIDs");
 		ArrayList<String> ruleIDs=getArguments().getStringArrayList("ruleIDs");
-		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), forwardReport)
+		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), true)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){
@@ -136,11 +123,6 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 				.exec(accountID);
 	}
 
-	private void onForwardReportClick(View v) {
-		forwardReport = !forwardReport;
-		forwardReportSwitch.setChecked(forwardReport);
-	}
-
 	@Subscribe
 	public void onFinishReportFragments(FinishReportFragmentsEvent ev){
 		if(ev.reportAccountID.equals(reportAccount.id))

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

@@ -164,10 +164,6 @@ 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

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

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

@@ -6,14 +6,12 @@ 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;
@@ -23,7 +21,6 @@ public class Filter extends BaseModel{
 	public Instant expiresAt;
 	public boolean irreversible;
 	public boolean wholeWord;
-	public FilterAction filterAction;
 
 	@SerializedName("context")
 	private List<FilterContext> _context;
@@ -79,11 +76,4 @@ 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

@@ -1,8 +0,0 @@
-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/Poll.java

@@ -57,11 +57,6 @@ 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

@@ -1,79 +0,0 @@
-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.content = s.text = params.text;
-        s.spoilerText = params.spoilerText;
-        s.visibility = params.visibility;
-        s.language = params.language;
-        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

@@ -40,7 +40,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public long favouritesCount;
 	public long repliesCount;
 	public Instant editedAt;
-	public List<FilterResult> filtered;
+	public boolean wantsTranslation;
 
 	public String url;
 	public String inReplyToId;
@@ -50,6 +50,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Card card;
 	public String language;
 	public String text;
+	public String translation;
 
 	public boolean favourited;
 	public boolean reblogged;

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

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

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

@@ -4,7 +4,6 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
 
 import me.grishka.appkit.utils.V;
 
@@ -32,16 +31,8 @@ public class M3AlertDialogBuilder extends AlertDialog.Builder{
 		if(titleID!=0){
 			View title=alert.findViewById(titleID);
 			if(title!=null){
-				int iconID=getContext().getResources().getIdentifier("icon", "id", "android");
-				int alertTitleID=getContext().getResources().getIdentifier("alertTitle", "id", "android");
-				if (alertTitleID != 0 && iconID != 0) {
-					ImageView icon = title.findViewById(iconID);
-					if (icon.getDrawable() != null) {
-						title.findViewById(alertTitleID).setPadding(V.dp(8), 0, 0, 0);
-					}
-				}
 				int pad=V.dp(24);
-				title.setPadding(pad, pad, pad, V.dp(12));
+				title.setPadding(pad, pad, pad, pad);
 			}
 		}
 		int titleDividerID=getContext().getResources().getIdentifier("titleDividerNoCustom", "id", "android");

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

@@ -98,7 +98,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 				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;
+				case DIRECT -> R.drawable.ic_at_symbol;
 			});
 		}
 

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

@@ -1,13 +1,9 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -22,18 +18,14 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
-import java.util.function.Consumer;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
@@ -60,14 +52,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private static final Animation opacityOut, opacityIn;
 
 		private View touchingView = null;
-		private boolean longClickPerformed = false;
-		private final Runnable longClickRunnable = () -> {
-			longClickPerformed = touchingView != null && touchingView.performLongClick();
-			if (longClickPerformed && touchingView != null) {
-				touchingView.startAnimation(opacityIn);
-				touchingView.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
-			}
-		};
+		private final Runnable longClickRunnable = () -> { if (touchingView != null) touchingView.performLongClick(); };
 
 		private final View.AccessibilityDelegate buttonAccessibilityDelegate=new View.AccessibilityDelegate(){
 			@Override
@@ -79,12 +64,12 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		};
 
 		static {
-			opacityOut = new AlphaAnimation(1, 0.55f);
-			opacityOut.setDuration(300);
+			opacityOut = new AlphaAnimation(1, 0.7f);
+			opacityOut.setDuration(200);
 			opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
 			opacityOut.setFillAfter(true);
-			opacityIn = new AlphaAnimation(0.55f, 1);
-			opacityIn.setDuration(400);
+			opacityIn = new AlphaAnimation(0.7f, 1);
+			opacityIn.setDuration(300);
 			opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
 		}
 
@@ -108,7 +93,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			View bookmark=findViewById(R.id.bookmark_btn);
 			reply.setOnTouchListener(this::onButtonTouch);
 			reply.setOnClickListener(this::onReplyClick);
-			reply.setOnLongClickListener(this::onReplyLongClick);
 			reply.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			boost.setOnTouchListener(this::onButtonTouch);
 			boost.setOnClickListener(this::onBoostClick);
@@ -116,11 +100,9 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			boost.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			favorite.setOnTouchListener(this::onButtonTouch);
 			favorite.setOnClickListener(this::onFavoriteClick);
-			favorite.setOnLongClickListener(this::onFavoriteLongClick);
 			favorite.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			bookmark.setOnTouchListener(this::onButtonTouch);
 			bookmark.setOnClickListener(this::onBookmarkClick);
-			bookmark.setOnLongClickListener(this::onBookmarkLongClick);
 			bookmark.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			share.setOnTouchListener(this::onButtonTouch);
 			share.setOnClickListener(this::onShareClick);
@@ -133,7 +115,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bindButton(reply, item.status.repliesCount);
 			bindButton(boost, item.status.reblogsCount);
 			bindButton(favorite, item.status.favouritesCount);
-			reply.setSelected(item.status.repliesCount > 0);
 			boost.setSelected(item.status.reblogged);
 			favorite.setSelected(item.status.favourited);
 			bookmark.setSelected(item.status.bookmarked);
@@ -155,15 +136,15 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			boolean disabled = !v.isEnabled() || (v instanceof FrameLayout parentFrame &&
 					parentFrame.getChildCount() > 0 && !parentFrame.getChildAt(0).isEnabled());
 			int action = event.getAction();
+			long eventDuration = event.getEventTime() - event.getDownTime();
 			if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
 				touchingView = null;
 				v.removeCallbacks(longClickRunnable);
-				if (!longClickPerformed) v.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
+				v.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
 				if (disabled) return true;
-				if (action == MotionEvent.ACTION_UP && !longClickPerformed) v.performClick();
-				else if (!longClickPerformed) v.startAnimation(opacityIn);
+				if (action == MotionEvent.ACTION_UP && eventDuration < ViewConfiguration.getLongPressTimeout()) v.performClick();
+				else v.startAnimation(opacityIn);
 			} else if (action == MotionEvent.ACTION_DOWN) {
-				longClickPerformed = false;
 				touchingView = v;
 				// 20dp to center in middle of icon, because: (icon width = 24dp) / 2 + (paddingStart = 8dp)
 				v.setPivotX(V.dp(20));
@@ -183,113 +164,23 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 		}
 
-		private boolean onReplyLongClick(View v) {
-			if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
-			UiUtils.pickAccount(v.getContext(), item.accountID, R.string.sk_reply_as, R.drawable.ic_fluent_arrow_reply_28_regular, session -> {
-				Bundle args=new Bundle();
-				String accountID = session.getID();
-				args.putString("account", accountID);
-				UiUtils.lookupStatus(v.getContext(), item.status, accountID, item.accountID, status -> {
-					args.putParcelable("replyTo", Parcels.wrap(status));
-					Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
-				});
-			}, null);
-			return true;
-		}
-
 		private void onBoostClick(View v){
 			boost.setSelected(!item.status.reblogged);
-			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, null, r->boostConsumer(v, r));
-		}
-
-		private void boostConsumer(View v, Status r) {
-			v.startAnimation(opacityIn);
-			bindButton(boost, r.reblogsCount);
+			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, r->{
+				v.startAnimation(opacityIn);
+				bindButton(boost, r.reblogsCount);
+			});
 		}
 
 		private boolean onBoostLongClick(View v){
-			Context ctx = itemView.getContext();
-			View menu = LayoutInflater.from(ctx).inflate(R.layout.item_boost_menu, null);
-			Dialog dialog = new M3AlertDialogBuilder(ctx).setView(menu).create();
-			AccountSession session = AccountSessionManager.getInstance().getAccount(item.accountID);
-
-			Consumer<StatusPrivacy> doReblog = (visibility) -> {
-				v.startAnimation(opacityOut);
-				session.getStatusInteractionController()
-						.setReblogged(item.status, !item.status.reblogged, visibility, r->boostConsumer(v, r));
-				dialog.dismiss();
-			};
-
-			View separator = menu.findViewById(R.id.separator);
-			TextView reblogHeader = menu.findViewById(R.id.reblog_header);
-			TextView undoReblog = menu.findViewById(R.id.delete_reblog);
-			TextView reblogAs = menu.findViewById(R.id.reblog_as);
-			TextView itemPublic = menu.findViewById(R.id.vis_public);
-			TextView itemUnlisted = menu.findViewById(R.id.vis_unlisted);
-			TextView itemFollowers = menu.findViewById(R.id.vis_followers);
-
-			undoReblog.setVisibility(item.status.reblogged ? View.VISIBLE : View.GONE);
-			separator.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE);
-			reblogHeader.setVisibility(item.status.reblogged ? View.GONE : View.VISIBLE);
-			reblogAs.setVisibility(AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1 ? View.VISIBLE : View.GONE);
-
-			itemPublic.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.PUBLIC) ? View.GONE : View.VISIBLE);
-			itemUnlisted.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) ? View.GONE : View.VISIBLE);
-			itemFollowers.setVisibility(item.status.reblogged || item.status.visibility.isLessVisibleThan(StatusPrivacy.PRIVATE) ? View.GONE : View.VISIBLE);
-
-			Drawable checkMark = ctx.getDrawable(R.drawable.ic_fluent_checkmark_circle_20_regular);
-			Drawable publicDrawable = ctx.getDrawable(R.drawable.ic_fluent_earth_24_regular);
-			Drawable unlistedDrawable = ctx.getDrawable(R.drawable.ic_fluent_people_community_24_regular);
-			Drawable followersDrawable = ctx.getDrawable(R.drawable.ic_fluent_people_checkmark_24_regular);
-
-			StatusPrivacy defaultVisibility = session.preferences != null ? session.preferences.postingDefaultVisibility : null;
-			// e.g. post visibility is unlisted, but default is public
-			// in this case, we want to display the check mark on the most visible visibility
-			if (defaultVisibility != null && item.status.visibility.isLessVisibleThan(defaultVisibility)) {
-				for (StatusPrivacy vis : StatusPrivacy.values()) {
-					if (vis.equals(item.status.visibility)) {
-						defaultVisibility = vis;
-						break;
-					}
-				}
-			}
-			itemPublic.setCompoundDrawablesWithIntrinsicBounds(publicDrawable, null, StatusPrivacy.PUBLIC.equals(defaultVisibility) ? checkMark : null, null);
-			itemUnlisted.setCompoundDrawablesWithIntrinsicBounds(unlistedDrawable, null, StatusPrivacy.UNLISTED.equals(defaultVisibility) ? checkMark : null, null);
-			itemFollowers.setCompoundDrawablesWithIntrinsicBounds(followersDrawable, null, StatusPrivacy.PRIVATE.equals(defaultVisibility) ? checkMark : null, null);
-
-			undoReblog.setOnClickListener(c->doReblog.accept(null));
-			itemPublic.setOnClickListener(c->doReblog.accept(StatusPrivacy.PUBLIC));
-			itemUnlisted.setOnClickListener(c->doReblog.accept(StatusPrivacy.UNLISTED));
-			itemFollowers.setOnClickListener(c->doReblog.accept(StatusPrivacy.PRIVATE));
-			reblogAs.setOnClickListener(c->{
-				dialog.dismiss();
-				UiUtils.pickInteractAs(v.getContext(),
-						item.accountID, item.status,
-						s -> s.reblogged,
-						(ic, status, consumer) -> ic.setReblogged(status, true, null, consumer),
-						R.string.sk_reblog_as,
-						R.string.sk_reblogged_as,
-						R.string.sk_already_reblogged,
-						// TODO: replace once available: https://raw.githubusercontent.com/microsoft/fluentui-system-icons/main/android/library/src/main/res/drawable/ic_fluent_arrow_repeat_all_28_regular.xml
-						R.drawable.ic_fluent_arrow_repeat_all_24_regular
-				);
-			});
-
-			menu.findViewById(R.id.quote).setOnClickListener(c->{
-				dialog.dismiss();
-				v.startAnimation(opacityIn);
-				Bundle args=new Bundle();
-				args.putString("account", item.accountID);
-				StringBuilder prefilledText = new StringBuilder().append("\n\n");
-				String ownID = AccountSessionManager.getInstance().getAccount(item.accountID).self.id;
-				if (!item.status.account.id.equals(ownID)) prefilledText.append('@').append(item.status.account.acct).append(' ');
-				prefilledText.append(item.status.url);
-				args.putString("prefilledText", prefilledText.toString());
-				args.putInt("selectionStart", 0);
-				Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
-			});
-
-			dialog.show();
+			v.setAlpha(1);
+			v.setScaleX(1);
+			v.setScaleY(1);
+			Bundle args=new Bundle();
+			args.putString("account", item.accountID);
+			args.putString("prefilledText", "\n\n" + item.status.url);
+			args.putInt("selectionStart", 0);
+			Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 			return true;
 		}
 
@@ -301,41 +192,13 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			});
 		}
 
-		private boolean onFavoriteLongClick(View v) {
-			if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
-			UiUtils.pickInteractAs(v.getContext(),
-					item.accountID, item.status,
-					s -> s.favourited,
-					(ic, status, consumer) -> ic.setFavorited(status, true, consumer),
-					R.string.sk_favorite_as,
-					R.string.sk_favorited_as,
-					R.string.sk_already_favorited,
-					R.drawable.ic_fluent_star_28_regular
-			);
-			return true;
-		}
-
 		private void onBookmarkClick(View v){
-			bookmark.setSelected(!item.status.bookmarked);
+			bookmark.setSelected(item.status.bookmarked);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked, r->{
 				v.startAnimation(opacityIn);
 			});
 		}
 
-		private boolean onBookmarkLongClick(View v) {
-			if (AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
-			UiUtils.pickInteractAs(v.getContext(),
-					item.accountID, item.status,
-					s -> s.bookmarked,
-					(ic, status, consumer) -> ic.setBookmarked(status, true, consumer),
-					R.string.sk_bookmark_as,
-					R.string.sk_bookmarked_as,
-					R.string.sk_already_bookmarked,
-					R.drawable.ic_fluent_bookmark_28_regular
-			);
-			return true;
-		}
-
 		private void onShareClick(View v){
 			v.startAnimation(opacityIn);
 			Intent intent=new Intent(Intent.ACTION_SEND);
@@ -345,7 +208,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private boolean onShareLongClick(View v){
-			UiUtils.copyText(v, item.status.url);
+			UiUtils.copyText(v.getContext(), item.status.url);
 			return true;
 		}
 

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

@@ -11,7 +11,6 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
@@ -23,37 +22,28 @@ import android.widget.Toast;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
-import org.joinmastodon.android.api.requests.announcements.DismissAnnouncement;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText;
-import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.fragments.NotificationsListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Relationship;
-import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
-import java.util.function.Consumer;
+import java.util.Objects;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
@@ -75,22 +65,15 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private boolean hasVisibilityToggle;
 	boolean needBottomPadding;
 	private String extraText;
-	private Notification notification;
-	private ScheduledStatus scheduledStatus;
-	private Announcement announcement;
-	private Consumer<String> consumeReadAnnouncement;
 
-	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText, Notification notification, ScheduledStatus scheduledStatus){
+	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText){
 		super(parentID, parentFragment);
-		user=scheduledStatus != null ? AccountSessionManager.getInstance().getAccount(accountID).self : user;
 		this.user=user;
 		this.createdAt=createdAt;
 		avaRequest=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? user.avatar : user.avatarStatic, V.dp(50), V.dp(50));
 		this.accountID=accountID;
 		parsedName=new SpannableStringBuilder(user.displayName);
 		this.status=status;
-		this.notification=notification;
-		this.scheduledStatus=scheduledStatus;
 		HtmlParser.parseCustomEmoji(parsedName, user.emojis);
 		emojiHelper.setText(parsedName);
 		if(status!=null){
@@ -107,13 +90,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		this.extraText=extraText;
 	}
 
-	public static HeaderStatusDisplayItem fromAnnouncement(Announcement a, Status fakeStatus, Account instanceUser, BaseStatusListFragment parentFragment, String accountID, Consumer<String> consumeReadID) {
-		HeaderStatusDisplayItem item = new HeaderStatusDisplayItem(a.id, instanceUser, a.startsAt, parentFragment, accountID, fakeStatus, null, null, null);
-		item.announcement = a;
-		item.consumeReadAnnouncement = consumeReadID;
-		return item;
-	}
-
 	@Override
 	public Type getType(){
 		return Type.HEADER;
@@ -133,8 +109,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView name, username, timestamp, extraText, separator;
-		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator;
+		private final TextView name, username, timestamp, extraText;
+		private final ImageView avatar, more, visibility;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -150,31 +126,22 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			super(activity, R.layout.display_item_header, parent);
 			name=findViewById(R.id.name);
 			username=findViewById(R.id.username);
-			separator=findViewById(R.id.separator);
 			timestamp=findViewById(R.id.timestamp);
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			visibility=findViewById(R.id.visibility);
-			deleteNotification=findViewById(R.id.delete_notification);
-			unreadIndicator=findViewById(R.id.unread_indicator);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
 			avatar.setClipToOutline(true);
 			more.setOnClickListener(this::onMoreClick);
 			visibility.setOnClickListener(v->item.parentFragment.onVisibilityIconClick(this));
-			deleteNotification.setOnClickListener(v->UiUtils.confirmDeleteNotification(activity, item.parentFragment.getAccountID(), item.notification, ()->{
-				if (item.parentFragment instanceof NotificationsListFragment fragment) {
-					fragment.removeNotification(item.notification);
-				}
-			}));
 
 			optionsMenu=new PopupMenu(activity, more);
 			optionsMenu.inflate(R.menu.post);
 			optionsMenu.setOnMenuItemClickListener(menuItem->{
 				Account account=item.user;
 				int id=menuItem.getItemId();
-
 				if(id==R.id.edit || id==R.id.delete_and_redraft) {
 					final Bundle args=new Bundle();
 					args.putString("account", item.parentFragment.getAccountID());
@@ -189,12 +156,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					}
 					if(TextUtils.isEmpty(item.status.content) && TextUtils.isEmpty(item.status.spoilerText)){
 						Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
-					}else if(item.scheduledStatus!=null){
-						args.putString("sourceText", item.status.text);
-						args.putString("sourceSpoiler", item.status.spoilerText);
-						args.putBoolean("redraftStatus", true);
-						args.putParcelable("scheduledStatus", Parcels.wrap(item.scheduledStatus));
-						Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 					}else{
 						new GetStatusSourceText(item.status.id)
 								.setCallback(new Callback<>(){
@@ -220,12 +181,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 								.exec(item.parentFragment.getAccountID());
 					}
 				}else if(id==R.id.delete){
-					if (item.scheduledStatus != null) {
-						UiUtils.confirmDeleteScheduledPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.scheduledStatus, ()->{});
-					} else {
-						UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
-					}
-				}else if(id==R.id.pin || id==R.id.unpin) {
+					UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
+				}else if(id==R.id.pin || id==R.id.unpin){
 					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
 				}else if(id==R.id.mute){
 					UiUtils.confirmToggleMuteUser(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), account, relationship!=null && relationship.muting, r->{});
@@ -237,10 +194,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					args.putParcelable("status", Parcels.wrap(item.status));
 					args.putParcelable("reportAccount", Parcels.wrap(item.status.account));
 					Nav.go(item.parentFragment.getActivity(), ReportReasonChoiceFragment.class, args);
-				}else if(id==R.id.open_in_browser) {
+				}else if(id==R.id.open_in_browser){
 					UiUtils.launchWebBrowser(activity, item.status.url);
-				}else if(id==R.id.copy_link){
-					UiUtils.copyText(parent, item.status.url);
 				}else if(id==R.id.follow){
 					if(relationship==null)
 						return true;
@@ -254,7 +209,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 							progress.dismiss();
 					}, rel->{
 						relationship=rel;
-						Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : R.string.unfollowed_user, account.getShortUsername()), Toast.LENGTH_SHORT).show();
+						Toast.makeText(activity, activity.getString(rel.following ? R.string.followed_user : R.string.unfollowed_user, account.getDisplayUsername()), Toast.LENGTH_SHORT).show();
 					});
 				}else if(id==R.id.block_domain){
 					UiUtils.confirmToggleBlockDomain(activity, item.parentFragment.getAccountID(), account.getDomain(), relationship!=null && relationship.domainBlocking, ()->{});
@@ -263,43 +218,17 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				}
 				return true;
 			});
-			UiUtils.enablePopupMenuIcons(activity, optionsMenu);
-		}
-
-		private void populateAccountsMenu(Menu menu) {
-			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
-			sessions.stream().filter(s -> !s.getID().equals(item.accountID)).forEach(s -> {
-				String username = "@"+s.self.username+"@"+s.domain;
-				menu.add(username).setOnMenuItemClickListener(c->{
-					UiUtils.openURL(item.parentFragment.getActivity(), s.getID(), item.status.url, false);
-					return true;
-				});
-			});
 		}
 
 		@Override
 		public void onBind(HeaderStatusDisplayItem item){
 			name.setText(item.parsedName);
 			username.setText('@'+item.user.acct);
-			separator.setVisibility(View.VISIBLE);
-
-			if (item.scheduledStatus!=null)
-				if (item.scheduledStatus.scheduledAt.isAfter(CreateStatus.DRAFTS_AFTER_INSTANT)) {
-					timestamp.setText(R.string.sk_draft);
-				} else {
-					DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault());
-					timestamp.setText(item.scheduledStatus.scheduledAt.atZone(ZoneId.systemDefault()).format(formatter));
-				}
-			else if ((item.status==null || item.status.editedAt==null) && item.createdAt != null)
+			if(item.status==null || item.status.editedAt==null)
 				timestamp.setText(UiUtils.formatRelativeTimestamp(itemView.getContext(), item.createdAt));
-			else if (item.status != null && item.status.editedAt != null)
+			else
 				timestamp.setText(item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)));
-			else {
-				separator.setVisibility(View.GONE);
-				timestamp.setText("");
-			}
 			visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE);
-			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if(item.hasVisibilityToggle){
 				visibility.setImageResource(item.status.spoilerRevealed ? R.drawable.ic_visibility_off : R.drawable.ic_visibility);
 				visibility.setContentDescription(item.parentFragment.getString(item.status.spoilerRevealed ? R.string.hide_content : R.string.reveal_content));
@@ -321,42 +250,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				currentRelationshipRequest.cancel();
 			}
 			relationship=null;
-
-			String desc;
-			if (item.announcement != null) {
-				if (unreadIndicator.getVisibility() == View.GONE) {
-					more.setAlpha(0f);
-					unreadIndicator.setAlpha(0f);
-					unreadIndicator.setVisibility(View.VISIBLE);
-				}
-				float alpha = item.announcement.read ? 0 : 1;
-				more.setImageResource(R.drawable.ic_fluent_checkmark_20_filled);
-				desc = item.parentFragment.getString(R.string.sk_mark_as_read);
-				more.animate().alpha(alpha);
-				unreadIndicator.animate().alpha(alpha);
-				more.setOnClickListener(v -> {
-					new DismissAnnouncement(item.announcement.id).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(Object o) {
-							item.consumeReadAnnouncement.accept(item.announcement.id);
-							item.announcement.read = true;
-							rebind();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							error.showToast(item.parentFragment.getActivity());
-						}
-					}).exec(item.accountID);
-				});
-			} else {
-				more.setImageResource(R.drawable.ic_fluent_more_vertical_20_filled);
-				desc = item.parentFragment.getString(R.string.more_options);
-				more.setOnClickListener(this::onMoreClick);
-			}
-
-			more.setContentDescription(desc);
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) more.setTooltipText(desc);
 		}
 
 		@Override
@@ -377,10 +270,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onAvaClick(View v){
-			if (item.announcement != null) {
-				UiUtils.openURL(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.user.url);
-				return;
-			}
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(item.user));
@@ -412,31 +301,15 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void updateOptionsMenu(){
-			if (item.announcement != null) return;
-			boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
-			Menu menu=optionsMenu.getMenu();
-
-			MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
-			SubMenu accountsMenu = openWithAccounts != null ? openWithAccounts.getSubMenu() : null;
-			if (hasMultipleAccounts && accountsMenu != null) {
-				openWithAccounts.setVisible(true);
-				accountsMenu.clear();
-				populateAccountsMenu(accountsMenu);
-			} else if (openWithAccounts != null) {
-				openWithAccounts.setVisible(false);
-			}
-
 			Account account=item.user;
+			Menu menu=optionsMenu.getMenu();
 			boolean isOwnPost=AccountSessionManager.getInstance().isSelf(item.parentFragment.getAccountID(), account);
-			boolean isPostScheduled=item.scheduledStatus!=null;
-			menu.findItem(R.id.open_with_account).setVisible(!isPostScheduled && hasMultipleAccounts);
 			menu.findItem(R.id.edit).setVisible(item.status!=null && isOwnPost);
 			menu.findItem(R.id.delete).setVisible(item.status!=null && isOwnPost);
-			menu.findItem(R.id.delete_and_redraft).setVisible(!isPostScheduled && item.status!=null && isOwnPost);
-			menu.findItem(R.id.pin).setVisible(!isPostScheduled && item.status!=null && isOwnPost && !item.status.pinned);
-			menu.findItem(R.id.unpin).setVisible(!isPostScheduled && item.status!=null && isOwnPost && item.status.pinned);
-			menu.findItem(R.id.open_in_browser).setVisible(!isPostScheduled && item.status!=null);
-			menu.findItem(R.id.copy_link).setVisible(!isPostScheduled && item.status!=null);
+			menu.findItem(R.id.delete_and_redraft).setVisible(item.status!=null && isOwnPost);
+			menu.findItem(R.id.pin).setVisible(item.status!=null && isOwnPost && !item.status.pinned);
+			menu.findItem(R.id.unpin).setVisible(item.status!=null && isOwnPost && item.status.pinned);
+			menu.findItem(R.id.open_in_browser).setVisible(item.status!=null);
 			MenuItem blockDomain=menu.findItem(R.id.block_domain);
 			MenuItem mute=menu.findItem(R.id.mute);
 			MenuItem block=menu.findItem(R.id.block);
@@ -452,7 +325,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				bookmark.setVisible(false);
 			}
 			*/
-			if(isPostScheduled || isOwnPost){
+			if(isOwnPost){
 				mute.setVisible(false);
 				block.setVisible(false);
 				report.setVisible(false);
@@ -463,22 +336,16 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				block.setVisible(true);
 				report.setVisible(true);
 				follow.setVisible(relationship==null || relationship.following || (!relationship.blocking && !relationship.blockedBy && !relationship.domainBlocking && !relationship.muting));
-				mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
-				mute.setIcon(relationship!=null && relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
-				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), mute);
-				block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
-				report.setTitle(item.parentFragment.getString(R.string.report_user, account.getShortUsername()));
-				// disabled in megalodon. domain blocks from a post clutters the context menu and looks out of place
-//				if(!account.isLocal()){
-//					blockDomain.setVisible(true);
-//					blockDomain.setTitle(item.parentFragment.getString(relationship!=null && relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-//				}else{
+				mute.setTitle(item.parentFragment.getString(relationship!=null && relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+				block.setTitle(item.parentFragment.getString(relationship!=null && relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
+				report.setTitle(item.parentFragment.getString(R.string.report_user, account.getDisplayUsername()));
+				if(!account.isLocal()){
+					blockDomain.setVisible(true);
+					blockDomain.setTitle(item.parentFragment.getString(relationship!=null && relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
+				}else{
 					blockDomain.setVisible(false);
-//				}
-				boolean following = relationship!=null && relationship.following;
-				follow.setTitle(item.parentFragment.getString(following ? R.string.unfollow_user : R.string.follow_user, account.getShortUsername()));
-				follow.setIcon(following ? R.drawable.ic_fluent_person_delete_24_regular : R.drawable.ic_fluent_person_add_24_regular);
-				UiUtils.insetPopupMenuIcon(item.parentFragment.getContext(), follow);
+				}
+				follow.setTitle(item.parentFragment.getString(relationship!=null && relationship.following ? R.string.unfollow_user : R.string.follow_user, account.getDisplayUsername()));
 			}
 		}
 	}

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

@@ -89,13 +89,10 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 				button.setBackground(progressBg);
 				itemView.setSelected(item.isMostVoted);
 				icon.setSelected(item.poll.ownVotes.contains(item.poll.options.indexOf(item.option)));
-				icon.setVisibility(item.poll.voted && item.poll.ownVotes.isEmpty() ? View.GONE : View.VISIBLE);
 				percent.setText(String.format(Locale.getDefault(), "%d%%", Math.round(item.votesFraction*100f)));
 			}else{
 				itemView.setSelected(item.poll.selectedOptions!=null && item.poll.selectedOptions.contains(item.option));
 				button.setBackgroundResource(R.drawable.bg_poll_option_clickable);
-				icon.setSelected(itemView.isSelected());
-				icon.setVisibility(View.VISIBLE);
 			}
 		}
 

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.ui.displayitems;
 import static org.joinmastodon.android.MastodonApp.context;
 
 import android.app.Activity;
-import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.SpannableStringBuilder;
@@ -15,7 +14,6 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Emoji;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -32,13 +30,10 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
 	@DrawableRes
 	private int icon;
-	private StatusPrivacy visibility;
-	@DrawableRes
-	private int iconEnd;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	private View.OnClickListener handleClick;
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, StatusPrivacy visibility, @Nullable View.OnClickListener handleClick){
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, @Nullable View.OnClickListener handleClick){
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
@@ -48,17 +43,6 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		this.handleClick=handleClick;
 		TypedValue outValue = new TypedValue();
 		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
-		updateVisibility(visibility);
-	}
-
-	public void updateVisibility(StatusPrivacy visibility) {
-		this.visibility = visibility;
-		this.iconEnd = visibility != null ? switch (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;
-			default -> 0;
-		} : 0;
 	}
 
 	@Override
@@ -86,18 +70,10 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(ReblogOrReplyLineStatusDisplayItem item){
 			text.setText(item.text);
-			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, item.iconEnd, 0);
+			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, 0, 0);
 			if(item.handleClick!=null) text.setOnClickListener(item.handleClick);
 			text.setEnabled(!item.inset);
 			text.setClickable(!item.inset);
-			Context ctx = itemView.getContext();
-			int visibilityText = item.visibility != null ? switch (item.visibility) {
-				case PUBLIC -> R.string.visibility_public;
-				case UNLISTED -> R.string.sk_visibility_unlisted;
-				case PRIVATE -> R.string.visibility_followers_only;
-				default -> 0;
-			} : 0;
-			if (visibilityText != 0) text.setContentDescription(item.text + " (" + ctx.getString(visibilityText) + ")");
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
 		}

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

@@ -8,16 +8,13 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Poll;
-import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -76,29 +73,26 @@ public abstract class StatusDisplayItem{
 		};
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
-
 		if(status.reblog!=null){
-			boolean isOwnPost = AccountSessionManager.getInstance().isSelf(fragment.getAccountID(), status.account);
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, isOwnPost ? status.visibility : null, i->{
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, i->{
 				args.putParcelable("profileAccount", Parcels.wrap(status.account));
 				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
 			}));
 		}else if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId)){
 			Account account=Objects.requireNonNull(knownAccounts.get(status.inReplyToAccountId));
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled, null, i->{
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled, i->{
 				args.putParcelable("profileAccount", Parcels.wrap(account));
 				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
 			}));
 		}
 		HeaderStatusDisplayItem header;
-		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, notification, scheduledStatus));
+		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null));
 		if(!TextUtils.isEmpty(statusForContent.content))
 			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent));
 		else

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

@@ -12,7 +12,6 @@ import android.widget.LinearLayout;
 import android.widget.Button;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -25,7 +24,6 @@ import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.model.TranslatedStatus;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 
 import me.grishka.appkit.api.Callback;
@@ -33,7 +31,6 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
@@ -83,7 +80,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 		private final LinearLayout spoilerHeader;
 		private final TextView spoilerTitle, spoilerTitleInline, translateInfo;
 		private final View spoilerOverlay, borderTop, borderBottom, textWrap, translateWrap, translateProgress;
-		private final int backgroundColor, borderColor;
+		private final Drawable backgroundColor, borderColor;
 		private final Button translateButton;
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -101,8 +98,14 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			translateInfo=findViewById(R.id.translate_info);
 			translateProgress=findViewById(R.id.translate_progress);
 			itemView.setOnClickListener(v->item.parentFragment.onRevealSpoilerClick(this));
-			backgroundColor=UiUtils.getThemeColor(activity, R.attr.colorBackgroundLight);
-			borderColor=UiUtils.getThemeColor(activity, R.attr.colorPollVoted);
+
+			TypedValue outValue=new TypedValue();
+			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLight, outValue, true);
+			backgroundColor=activity.getDrawable(outValue.resourceId);
+//			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLightest, outValue, true);
+//			backgroundColorInset=activity.getDrawable(outValue.resourceId);
+			activity.getTheme().resolveAttribute(R.attr.colorPollVoted, outValue, true);
+			borderColor=activity.getDrawable(outValue.resourceId);
 		}
 
 		@Override
@@ -113,10 +116,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setTextIsSelectable(item.textSelectable);
 			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
-			spoilerTitleInline.setBackgroundColor(item.inset ? 0 : backgroundColor);
+			spoilerTitleInline.setBackground(item.inset ? null : backgroundColor);
 			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
-			borderTop.setBackgroundColor(item.inset ? 0 : borderColor);
-			borderBottom.setBackgroundColor(item.inset ? 0 : borderColor);
+			borderTop.setBackground(item.inset ? null : borderColor);
+			borderBottom.setBackground(item.inset ? null : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
 				spoilerTitleInline.setText(item.parsedSpoilerText);
@@ -141,9 +144,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
 			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
 
-			translateWrap.setVisibility(
-					(!GlobalUserPreferences.translateButtonOpenedOnly || item.textSelectable) &&
-					translateEnabled &&
+			translateWrap.setVisibility(translateEnabled &&
 					!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&
 					item.status.language != null &&
 					(item.session.preferences == null || !item.status.language.equalsIgnoreCase(item.session.preferences.postingDefaultLanguage))
@@ -154,7 +155,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 				if (item.translation == null) {
 					translateProgress.setVisibility(View.VISIBLE);
 					translateButton.setClickable(false);
-					translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
+					translateButton.setAlpha(.50f);
 					new TranslateStatus(item.status.id).setCallback(new Callback<>() {
 						@Override
 						public void onSuccess(TranslatedStatus translatedStatus) {
@@ -162,7 +163,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 							item.translated = true;
 							translateProgress.setVisibility(View.GONE);
 							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
+							translateButton.setAlpha(1f);
 							rebind();
 						}
 
@@ -170,7 +171,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 						public void onError(ErrorResponse error) {
 							translateProgress.setVisibility(View.GONE);
 							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
+							translateButton.setAlpha(1f);
 							error.showToast(itemView.getContext());
 						}
 					}).exec(item.parentFragment.getAccountID());

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

@@ -10,8 +10,6 @@ import android.text.Layout;
 import android.text.Spanned;
 import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
-import android.view.View;
-import android.view.ViewConfiguration;
 import android.widget.TextView;
 
 import me.grishka.appkit.utils.V;
@@ -22,11 +20,7 @@ public class ClickableLinksDelegate {
 	private Path hlPath;
 	private LinkSpan selectedSpan;
 	private TextView view;
-
-	private final Runnable longClickRunnable = () -> {
-		if (selectedSpan != null) selectedSpan.onLongClick(view);
-	};
-
+	
 	public ClickableLinksDelegate(TextView view) {
 		this.view=view;
 		hlPaint=new Paint();
@@ -36,7 +30,6 @@ public class ClickableLinksDelegate {
 	}
 
 	public boolean onTouch(MotionEvent event) {
-		long eventDuration = event.getEventTime() - event.getDownTime();
 		if(event.getAction()==MotionEvent.ACTION_DOWN){
 			int line=-1;
 			Rect rect=new Rect();
@@ -70,7 +63,6 @@ public class ClickableLinksDelegate {
 							}
 							hlPath=new Path();
 							selectedSpan=span;
-							view.postDelayed(longClickRunnable, ViewConfiguration.getLongPressTimeout());
 							hlPaint.setColor((span.getColor() & 0x00FFFFFF) | 0x33000000);
 							//l.getSelectionPath(start, end, hlPath);
 							for(int j=lstart;j<=lend;j++){
@@ -98,11 +90,8 @@ public class ClickableLinksDelegate {
 			}
 		}
 		if(event.getAction()==MotionEvent.ACTION_UP && selectedSpan!=null){
-			if (eventDuration <= ViewConfiguration.getLongPressTimeout()) {
-				view.playSoundEffect(SoundEffectConstants.CLICK);
-				selectedSpan.onClick(view.getContext());
-			}
-			view.removeCallbacks(longClickRunnable);
+			view.playSoundEffect(SoundEffectConstants.CLICK);
+			selectedSpan.onClick(view.getContext());
 			hlPath=null;
 			selectedSpan=null;
 			view.invalidate();
@@ -111,7 +100,6 @@ public class ClickableLinksDelegate {
 		if(event.getAction()==MotionEvent.ACTION_CANCEL){
 			hlPath=null;
 			selectedSpan=null;
-			view.removeCallbacks(longClickRunnable);
 			view.invalidate();
 			return false;
 		}

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

@@ -111,14 +111,14 @@ public class HtmlParser{
 			@Override
 			public void head(@NonNull Node node, int depth){
 				if(node instanceof TextNode textNode){
-					ssb.append(textNode.getWholeText());
+					ssb.append(textNode.text());
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
 							String href=el.attr("href");
 							LinkSpan.Type linkType;
-							String text=el.text();
 							if(el.hasClass("hashtag")){
+								String text=el.text();
 								if(text.startsWith("#")){
 									linkType=LinkSpan.Type.HASHTAG;
 									href=text.substring(1);
@@ -136,7 +136,7 @@ public class HtmlParser{
 							}else{
 								linkType=LinkSpan.Type.URL;
 							}
-							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID, text), ssb.length(), el));
+							openSpans.add(new SpanInfo(new LinkSpan(href, null, linkType, accountID), ssb.length(), el));
 						}
 						case "br" -> ssb.append('\n');
 						case "span" -> {
@@ -260,7 +260,7 @@ public class HtmlParser{
 			String url=matcher.group(3);
 			if(TextUtils.isEmpty(matcher.group(4)))
 				url="http://"+url;
-			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null, url), matcher.start(3), matcher.end(3), 0);
+			ssb.setSpan(new LinkSpan(url, null, LinkSpan.Type.URL, null), matcher.start(3), matcher.end(3), 0);
 		}while(matcher.find()); // Find more URLs
 		return ssb;
 	}

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

@@ -3,7 +3,6 @@ package org.joinmastodon.android.ui.text;
 import android.content.Context;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
-import android.view.View;
 
 import org.joinmastodon.android.ui.utils.UiUtils;
 
@@ -14,14 +13,12 @@ public class LinkSpan extends CharacterStyle {
 	private String link;
 	private Type type;
 	private String accountID;
-	private String text;
 
-	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID, String text){
+	public LinkSpan(String link, OnLinkClickListener listener, Type type, String accountID){
 		this.listener=listener;
 		this.link=link;
 		this.type=type;
 		this.accountID=accountID;
-		this.text=text;
 	}
 
 	public int getColor(){
@@ -41,10 +38,6 @@ public class LinkSpan extends CharacterStyle {
 		}
 	}
 
-	public void onLongClick(View view) {
-		UiUtils.copyText(view, getType() == Type.URL ? link : text);
-	}
-
 	public String getLink(){
 		return link;
 	}

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

@@ -25,7 +25,8 @@ public class ColorPalette {
             ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
             ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
             ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
-            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
+            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow),
+            ColorPreference.NORD, new ColorPalette(R.style.ColorPalette_Nord)
     );
 
     private @StyleRes int base;

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

@@ -5,7 +5,6 @@ import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -19,6 +18,7 @@ import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
@@ -27,11 +27,12 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.view.HapticFeedbackConstants;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -45,44 +46,36 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
 import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
-import org.joinmastodon.android.api.requests.notifications.DismissNotification;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
-import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.FollowRequestHandledEvent;
 import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
-import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
-import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
+import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.parceler.Parcels;
 
 import java.io.File;
@@ -99,12 +92,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import androidx.annotation.AttrRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
@@ -348,29 +338,22 @@ public class UiUtils{
 	}
 
 	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, Runnable onConfirmed){
-		showConfirmationAlert(context, title, message, confirmButton, 0, onConfirmed);
+		showConfirmationAlert(context, context.getString(title), context.getString(message), context.getString(confirmButton), onConfirmed);
 	}
 
-	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, @DrawableRes int icon, Runnable onConfirmed){
-		showConfirmationAlert(context, context.getString(title), context.getString(message), context.getString(confirmButton), icon, onConfirmed);
-	}
-
-	public static void showConfirmationAlert(Context context, CharSequence title, CharSequence message, CharSequence confirmButton, int icon, Runnable onConfirmed){
+	public static void showConfirmationAlert(Context context, CharSequence title, CharSequence message, CharSequence confirmButton, Runnable onConfirmed){
 		new M3AlertDialogBuilder(context)
 				.setTitle(title)
 				.setMessage(message)
 				.setPositiveButton(confirmButton, (dlg, i)->onConfirmed.run())
 				.setNegativeButton(R.string.cancel, null)
-				.setIcon(icon)
 				.show();
 	}
 
 	public static void confirmToggleBlockUser(Activity activity, String accountID, Account account, boolean currentlyBlocked, Consumer<Relationship> resultCallback){
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_title : R.string.confirm_block_title),
 				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.displayName),
-				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block),
-				currentlyBlocked ? R.drawable.ic_fluent_person_28_regular : R.drawable.ic_fluent_person_prohibited_28_regular,
-				()->{
+				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block), ()->{
 					new SetAccountBlocked(account.id, !currentlyBlocked)
 							.setCallback(new Callback<>(){
 								@Override
@@ -394,9 +377,7 @@ public class UiUtils{
 	public static void confirmToggleBlockDomain(Activity activity, String accountID, String domain, boolean currentlyBlocked, Runnable resultCallback){
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_domain_title : R.string.confirm_block_domain_title),
 				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, domain),
-				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block),
-				R.drawable.ic_fluent_shield_28_regular,
-				()->{
+				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block), ()->{
 					new SetDomainBlocked(domain, !currentlyBlocked)
 							.setCallback(new Callback<>(){
 								@Override
@@ -417,9 +398,7 @@ public class UiUtils{
 	public static void confirmToggleMuteUser(Activity activity, String accountID, Account account, boolean currentlyMuted, Consumer<Relationship> resultCallback){
 		showConfirmationAlert(activity, activity.getString(currentlyMuted ? R.string.confirm_unmute_title : R.string.confirm_mute_title),
 				activity.getString(currentlyMuted ? R.string.confirm_unmute : R.string.confirm_mute, account.displayName),
-				activity.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute),
-				currentlyMuted ? R.drawable.ic_fluent_speaker_0_28_regular : R.drawable.ic_fluent_speaker_off_28_regular,
-				()->{
+				activity.getString(currentlyMuted ? R.string.do_unmute : R.string.do_mute), ()->{
 					new SetAccountMuted(account.id, !currentlyMuted)
 							.setCallback(new Callback<>(){
 								@Override
@@ -444,53 +423,24 @@ public class UiUtils{
 	}
 
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft){
-		showConfirmationAlert(activity,
-				forRedraft ? R.string.sk_confirm_delete_and_redraft_title : R.string.confirm_delete_title,
-				forRedraft ? R.string.sk_confirm_delete_and_redraft : R.string.confirm_delete,
-				forRedraft ? R.string.sk_delete_and_redraft : R.string.delete,
-				forRedraft ? R.drawable.ic_fluent_arrow_clockwise_28_regular : R.drawable.ic_fluent_delete_28_regular,
-				() -> new DeleteStatus(status.id)
-						.setCallback(new Callback<>(){
-							@Override
-							public void onSuccess(Status result){
-								resultCallback.accept(result);
-								AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
-								E.post(new StatusDeletedEvent(status.id, accountID));
-							}
+		showConfirmationAlert(activity, forRedraft ? R.string.sk_confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.sk_confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.sk_delete_and_redraft : R.string.delete, ()->{
+			new DeleteStatus(status.id)
+					.setCallback(new Callback<>(){
+						@Override
+						public void onSuccess(Status result){
+							resultCallback.accept(result);
+							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
+							E.post(new StatusDeletedEvent(status.id, accountID));
+						}
 
-							@Override
-							public void onError(ErrorResponse error){
-								error.showToast(activity);
-							}
-						})
-						.wrapProgress(activity, R.string.deleting, false)
-						.exec(accountID)
-		);
-	}
-
-	public static void confirmDeleteScheduledPost(Activity activity, String accountID, ScheduledStatus status, Runnable resultCallback){
-		boolean isDraft = status.scheduledAt.isAfter(CreateStatus.DRAFTS_AFTER_INSTANT);
-		showConfirmationAlert(activity,
-				isDraft ? R.string.sk_confirm_delete_draft_title : R.string.sk_confirm_delete_scheduled_post_title,
-				isDraft ? R.string.sk_confirm_delete_draft : R.string.sk_confirm_delete_scheduled_post,
-				R.string.delete,
-				R.drawable.ic_fluent_delete_28_regular,
-				() -> new DeleteStatus.Scheduled(status.id)
-						.setCallback(new Callback<>(){
-							@Override
-							public void onSuccess(Object nothing){
-								resultCallback.run();
-								E.post(new ScheduledStatusDeletedEvent(status.id, accountID));
-							}
-
-							@Override
-							public void onError(ErrorResponse error){
-								error.showToast(activity);
-							}
-						})
-						.wrapProgress(activity, R.string.deleting, false)
-						.exec(accountID)
-		);
+						@Override
+						public void onError(ErrorResponse error){
+							error.showToast(activity);
+						}
+					})
+					.wrapProgress(activity, R.string.deleting, false)
+					.exec(accountID);
+		});
 	}
 
 	public static void confirmPinPost(Activity activity, String accountID, Status status, boolean pinned, Consumer<Status> resultCallback){
@@ -498,7 +448,6 @@ public class UiUtils{
 				pinned ? R.string.sk_confirm_pin_post_title : R.string.sk_confirm_unpin_post_title,
 				pinned ? R.string.sk_confirm_pin_post : R.string.sk_confirm_unpin_post,
 				pinned ? R.string.sk_pin_post : R.string.sk_unpin_post,
-				pinned ? R.drawable.ic_fluent_pin_28_regular : R.drawable.ic_fluent_pin_off_28_regular,
 				()->{
 					new SetStatusPinned(status.id, pinned)
 							.setCallback(new Callback<>() {
@@ -521,26 +470,6 @@ public class UiUtils{
 		);
 	}
 
-	public static void confirmDeleteNotification(Activity activity, String accountID, Notification notification, Runnable callback) {
-		showConfirmationAlert(activity,
-				notification == null ? R.string.sk_clear_all_notifications : R.string.sk_delete_notification,
-				notification == null ? R.string.sk_clear_all_notifications_confirm : R.string.sk_delete_notification_confirm,
-				notification == null ? R.string.sk_clear_all_notifications_confirm_action : R.string.sk_delete_notification_confirm_action,
-				notification == null ? R.drawable.ic_fluent_mail_inbox_dismiss_28_regular : R.drawable.ic_fluent_delete_28_regular,
-				() -> new DismissNotification(notification != null ? notification.id : null).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Object o) {
-						callback.run();
-					}
-
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(activity);
-					}
-				}).exec(accountID)
-		);
-	}
-
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		setRelationshipToActionButton(relationship, button, false);
 	}
@@ -708,42 +637,6 @@ public class UiUtils{
 		return bitmap;
 	}
 
-	public static void insetPopupMenuIcon(Context context, MenuItem item) {
-		ColorStateList iconTint=ColorStateList.valueOf(UiUtils.getThemeColor(context, android.R.attr.textColorSecondary));
-		insetPopupMenuIcon(item, iconTint);
-	}
-	public static void insetPopupMenuIcon(MenuItem item, ColorStateList iconTint) {
-		Drawable icon=item.getIcon().mutate();
-		if(Build.VERSION.SDK_INT>=26) item.setIconTintList(iconTint);
-		else icon.setTintList(iconTint);
-		icon=new InsetDrawable(icon, V.dp(8), 0, V.dp(8), 0);
-		item.setIcon(icon);
-		SpannableStringBuilder ssb=new SpannableStringBuilder(item.getTitle());
-		item.setTitle(ssb);
-	}
-
-	public static void enableOptionsMenuIcons(Context context, Menu menu, @IdRes int... asAction) {
-		if(menu.getClass().getSimpleName().equals("MenuBuilder")){
-			try {
-				Method m = menu.getClass().getDeclaredMethod(
-						"setOptionalIconsVisible", Boolean.TYPE);
-				m.setAccessible(true);
-				m.invoke(menu, true);
-				enableMenuIcons(context, menu, asAction);
-			}
-			catch(Exception ignored){}
-		}
-	}
-
-	public static void enableMenuIcons(Context context, Menu m, @IdRes int... exclude) {
-		ColorStateList iconTint=ColorStateList.valueOf(UiUtils.getThemeColor(context, android.R.attr.textColorSecondary));
-		for(int i=0;i<m.size();i++){
-			MenuItem item=m.getItem(i);
-			if (item.getIcon() == null || Arrays.stream(exclude).anyMatch(id -> id == item.getItemId())) continue;
-			insetPopupMenuIcon(item, iconTint);
-		}
-	}
-
 	public static void enablePopupMenuIcons(Context context, PopupMenu menu){
 		Menu m=menu.getMenu();
 		if(Build.VERSION.SDK_INT>=29){
@@ -755,7 +648,23 @@ public class UiUtils{
 				setOptionalIconsVisible.invoke(m, true);
 			}catch(Exception ignore){}
 		}
-		enableMenuIcons(context, m);
+		ColorStateList iconTint=ColorStateList.valueOf(UiUtils.getThemeColor(context, android.R.attr.textColorSecondary));
+		for(int i=0;i<m.size();i++){
+			MenuItem item=m.getItem(i);
+			Drawable icon=item.getIcon().mutate();
+			if(Build.VERSION.SDK_INT>=26){
+				item.setIconTintList(iconTint);
+			}else{
+				icon.setTintList(iconTint);
+			}
+			icon=new InsetDrawable(icon, V.dp(8), 0, 0, 0);
+			item.setIcon(icon);
+			SpannableStringBuilder ssb=new SpannableStringBuilder(item.getTitle());
+			ssb.insert(0, " ");
+			ssb.setSpan(new SpacerSpan(V.dp(24), 1), 0, 1, 0);
+			ssb.append(" ", new SpacerSpan(V.dp(8), 1), 0);
+			item.setTitle(ssb);
+		}
 	}
 
 	public static void setUserPreferredTheme(Context context){
@@ -802,107 +711,29 @@ public class UiUtils{
 
 		String it = uri.getPath();
 		return it.matches("^/@[^/]+$") ||
-				it.matches("^/@[^/]+/\\d+$") ||
-				it.matches("^/users/\\w+$") ||
-				it.matches("^/notice/[a-zA-Z0-9]+$") ||
-				it.matches("^/objects/[-a-f0-9]+$") ||
-				it.matches("^/notes/[a-z0-9]+$") ||
-				it.matches("^/display/[-a-f0-9]+$") ||
-				it.matches("^/profile/\\w+$") ||
-				it.matches("^/p/\\w+/\\d+$") ||
-				it.matches("^/\\w+$") ||
-				it.matches("^/@[^/]+/statuses/[a-zA-Z0-9]+$") ||
-				it.matches("^/users/[^/]+/statuses/[a-zA-Z0-9]+$") ||
-				it.matches("^/o/[a-f0-9]+$");
+			it.matches("^/@[^/]+/\\d+$") ||
+			it.matches("^/users/\\w+$") ||
+			it.matches("^/notice/[a-zA-Z0-9]+$") ||
+			it.matches("^/objects/[-a-f0-9]+$") ||
+			it.matches("^/notes/[a-z0-9]+$") ||
+			it.matches("^/display/[-a-f0-9]+$") ||
+			it.matches("^/profile/\\w+$") ||
+			it.matches("^/p/\\w+/\\d+$") ||
+			it.matches("^/\\w+$") ||
+			it.matches("^/@[^/]+/statuses/[a-zA-Z0-9]+$") ||
+			it.matches("^/o/[a-f0-9]+$");
 	}
 
-	public static String getInstanceName(String accountID) {
-		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		return instance != null && !instance.title.isBlank() ? instance.title : session.domain;
-	}
-
-	public static void pickAccount(Context context, String exceptFor, @StringRes int titleRes, @DrawableRes int iconRes, Consumer<AccountSession> sessionConsumer, Consumer<AlertDialog.Builder> transformDialog) {
-		List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts()
-				.stream().filter(s->!s.getID().equals(exceptFor)).collect(Collectors.toList());
-
-		AlertDialog.Builder builder = new M3AlertDialogBuilder(context)
-				.setItems(
-						sessions.stream().map(AccountSession::getFullUsername).toArray(String[]::new),
-						(dialog, which) -> sessionConsumer.accept(sessions.get(which))
-				)
-				.setTitle(titleRes == 0 ? R.string.choose_account : titleRes)
-				.setIcon(iconRes);
-		if (transformDialog != null) transformDialog.accept(builder);
-		builder.show();
-	}
-
-	@FunctionalInterface
-	public interface InteractionPerformer {
-		void interact(StatusInteractionController ic, Status status, Consumer<Status> resultConsumer);
-	}
-
-	public static void pickInteractAs(Context context, String accountID, Status sourceStatus, Predicate<Status> checkInteracted, InteractionPerformer interactionPerformer, @StringRes int interactAsRes, @StringRes int interactedAsAccountRes, @StringRes int alreadyInteractedRes, @DrawableRes int iconRes) {
-		pickAccount(context, accountID, interactAsRes, iconRes, session -> {
-			lookupStatus(context, sourceStatus, session.getID(), accountID, status -> {
-				if (checkInteracted.test(status)) {
-					Toast.makeText(context, alreadyInteractedRes, Toast.LENGTH_SHORT).show();
-					return;
-				}
-
-				StatusInteractionController ic = AccountSessionManager.getInstance().getAccount(session.getID()).getRemoteStatusInteractionController();
-				interactionPerformer.interact(ic, status, s -> {
-					if (checkInteracted.test(s)) {
-						Toast.makeText(context, context.getString(interactedAsAccountRes, session.getFullUsername()), Toast.LENGTH_SHORT).show();
-					}
-				});
-			});
-		}, null);
-	}
-
-	public static void lookupStatus(Context context, Status queryStatus, String targetAccountID, @Nullable String sourceAccountID, Consumer<Status> statusConsumer) {
-		if (sourceAccountID != null && targetAccountID.startsWith(sourceAccountID.substring(0, sourceAccountID.indexOf('_')))) {
-			statusConsumer.accept(queryStatus);
-			return;
-		}
-
-		new GetSearchResults(queryStatus.url, GetSearchResults.Type.STATUSES, true).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(SearchResults results) {
-				if (!results.statuses.isEmpty()) statusConsumer.accept(results.statuses.get(0));
-				else Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(context);
-			}
-		})
-				.wrapProgress((Activity)context, R.string.loading, true,
-						d -> transformDialogForLookup(context, targetAccountID, null, d))
-				.exec(targetAccountID);
-	}
-
-	public static void openURL(Context context, String accountID, String url) {
-		openURL(context, accountID, url, true);
-	}
-
-	private static void transformDialogForLookup(Context context, String accountID, @Nullable String url, ProgressDialog dialog) {
-		if (accountID != null) {
-			dialog.setTitle(context.getString(R.string.sk_loading_resource_on_instance_title, getInstanceName(accountID)));
-		} else {
-			dialog.setTitle(R.string.sk_loading_fediverse_resource_title);
-		}
-		dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (d, which) -> d.cancel());
-		if (url != null) {
+	public static void openURL(Context context, String accountID, String url){
+		Consumer<ProgressDialog> transformDialogForLookup = dialog -> {
+			dialog.setTitle(R.string.loading_fediverse_resource_title);
+			dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (d, which) -> d.cancel());
 			dialog.setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.open_in_browser), (d, which) -> {
 				d.cancel();
 				launchWebBrowser(context, url);
 			});
-		}
-	}
+		};
 
-	public static void openURL(Context context, String accountID, String url, boolean launchBrowser){
 		Uri uri=Uri.parse(url);
 		List<String> path=uri.getPathSegments();
 		if(accountID!=null && "https".equals(uri.getScheme())){
@@ -920,11 +751,10 @@ public class UiUtils{
 							@Override
 							public void onError(ErrorResponse error){
 								error.showToast(context);
-								if (launchBrowser) launchWebBrowser(context, url);
+								launchWebBrowser(context, url);
 							}
 						})
-						.wrapProgress((Activity)context, R.string.loading, true,
-								d -> transformDialogForLookup(context, accountID, url, d))
+						.wrapProgress((Activity)context, R.string.loading, true, transformDialogForLookup)
 						.exec(accountID);
 				return;
 			} else if (looksLikeMastodonUrl(url)) {
@@ -941,19 +771,17 @@ public class UiUtils{
 									args.putParcelable("profileAccount", Parcels.wrap(results.accounts.get(0)));
 									Nav.go((Activity) context, ProfileFragment.class, args);
 								} else {
-									if (launchBrowser) launchWebBrowser(context, url);
-									else Toast.makeText(context, R.string.sk_resource_not_found, Toast.LENGTH_SHORT).show();
+									launchWebBrowser(context, url);
 								}
 							}
 
 							@Override
 							public void onError(ErrorResponse error) {
 								error.showToast(context);
-								if (launchBrowser) launchWebBrowser(context, url);
+								launchWebBrowser(context, url);
 							}
 						})
-						.wrapProgress((Activity)context, R.string.loading, true,
-								d -> transformDialogForLookup(context, accountID, url, d))
+						.wrapProgress((Activity)context, R.string.loading, true, transformDialogForLookup)
 						.exec(accountID);
 				return;
 			}
@@ -961,13 +789,14 @@ public class UiUtils{
 		launchWebBrowser(context, url);
 	}
 
-	public static void copyText(View v, String text) {
-		Context context = v.getContext();
+	public static void copyText(Context context, String text) {
 		context.getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, text));
 		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU || UiUtils.isMIUI()){ // Android 13+ SystemUI shows its own thing when you put things into the clipboard
 			Toast.makeText(context, R.string.text_copied, Toast.LENGTH_SHORT).show();
 		}
-		v.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+		Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+		else vibrator.vibrate(50);
 	}
 
 	private static String getSystemProperty(String key){
@@ -982,26 +811,4 @@ public class UiUtils{
 	public static boolean isMIUI(){
 		return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code"));
 	}
-
-	public static boolean pickAccountForCompose(Activity activity, String accountID, String prefilledText){
-		Bundle args = new Bundle();
-		if (prefilledText != null) args.putString("prefilledText", prefilledText);
-		return pickAccountForCompose(activity, accountID, args);
-	}
-
-	public static boolean pickAccountForCompose(Activity activity, String accountID){
-		return pickAccountForCompose(activity, accountID, (String) null);
-	}
-
-	public static boolean pickAccountForCompose(Activity activity, String accountID, Bundle args){
-		if (AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1) {
-			UiUtils.pickAccount(activity, accountID, 0, 0, session -> {
-				args.putString("account", session.getID());
-				Nav.go(activity, ComposeFragment.class, args);
-			}, null);
-			return true;
-		} else {
-			return false;
-		}
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java

@@ -7,6 +7,7 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.LocaleList;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.model.Instance;
 
 import java.util.ArrayList;

mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java

@@ -4,7 +4,6 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 
-import java.time.Instant;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -22,16 +21,6 @@ public class StatusFilterPredicate implements Predicate<Status>{
 
 	@Override
 	public boolean test(Status status){
-		if(status.filtered!=null){
-			if (status.filtered.isEmpty()){
-				return true;
-			}
-			boolean matches=status.filtered.stream()
-					.map(filterResult->filterResult.filter)
-					.filter(filter->filter.expiresAt==null||filter.expiresAt.isAfter(Instant.now()))
-					.anyMatch(filter->filter.filterAction==Filter.FilterAction.HIDE);
-			return !matches;
-		}
 		for(Filter filter:filters){
 			if(filter.matches(status))
 				return false;

mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?attr/colorButtonBackgroundPrimaryDarkOnLight" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
+	<item android:color="?colorPollVoted"/>
 </selector>

mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundPrimaryLightOnDark" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundPrimaryLightOnDarkDisabled"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
+	<item android:color="?colorPollVoted"/>
 </selector>

mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundSecondaryDarkOnLight" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundSecondaryDarkOnLightDisabled"/>
+	<item android:color="?colorBackgroundLightest" android:state_enabled="true"/>
+	<item android:color="?android:colorBackground"/>
 </selector>

mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundSecondaryLightOnDark" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundSecondaryLightOnDarkDisabled"/>
+	<item android:color="?colorPollVoted" android:state_enabled="true"/>
+	<item android:color="?colorSearchHint"/>
 </selector>

mastodon/src/main/res/color/button_text_primary_dark_on_light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextPrimaryDarkOnLight" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextPrimaryDarkOnLightDisabled"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

mastodon/src/main/res/color/button_text_primary_light_on_dark.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextPrimaryLightOnDark" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextPrimaryLightOnDarkDisabled"/>
+	<item android:color="@color/black" android:state_enabled="true"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextSecondaryDarkOnLight" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextSecondaryDarkOnLightDisabled"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

mastodon/src/main/res/color/translate_icon.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:colorAccent" android:state_selected="true"/>
+    <item android:color="?android:textColorSecondary" android:state_enabled="true"/>
+    <item android:color="?colorSecondary"/>
+</selector>

mastodon/src/main/res/drawable-anydpi-v24/ic_ntf_logo.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.9699526"
+      android:scaleY="0.9699526"
+      android:translateX="0.96"
+      android:translateY="6.925208">
+    <path
+        android:pathData="m3.639,-0c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L2.482,10.464L2.482,4.378c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L7.125,2.504 6.506,1.466C5.87,0.488 4.909,-0 3.639,-0Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m18.947,10.464q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM18.947,8.759q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>

mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml

@@ -1,5 +1,18 @@
-<vector android:height="108dp" android:viewportHeight="320"
-    android:viewportWidth="320" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M166.45,143.88c-4.6,-0.61 -9.13,5 -10.12,12.53s1.93,14.12 6.53,14.72 9.13,-5 10.12,-12.53S171.05,144.48 166.45,143.88ZM166.53,164.39a3.65,3.65 0,1 1,2 -4.78A3.66,3.66 0,0 1,166.53 164.39Z"/>
-    <path android:fillColor="#fff" android:pathData="M233.41,296.2c-0.41,-7.41 -1.13,-14.84 -1.84,-22.24l-0.24,-2.52c0,-0.18 0,-0.36 -0.05,-0.54 -0.11,-1.1 -0.21,-2.19 -0.31,-3.29q-0.54,-5.83 -1,-11.72 -0.71,-8.82 -1.37,-17.7 -0.24,-3 -0.46,-5.91c-0.63,-7.89 -1.29,-15.8 -2.09,-23.68 -1.13,-11.06 -2.54,-22.09 -4.49,-33a6.62,6.62 0,0 0,-0.9 0.48c-8.37,5.44 -14.27,29.16 -17.82,37.65a1.24,1.24 0,0 1,-2.37 -0.36c-0.09,-0.92 -0.16,-1.83 -0.21,-2.75l2.78,-1.79 -2.91,-2.2c0,-0.23 0,-0.45 0,-0.68v-0.48c0,-0.26 0,-0.51 0,-0.77l2.71,-1.72 -2.58,-3c0,-0.62 0.05,-1.25 0.09,-1.87l3.57,-1 -3.19,-3.83c0.05,-0.58 0.12,-1.16 0.18,-1.74l4.77,-1.39 -4,-4.46 0.24,-1.5 5.55,-1.61 -4.54,-4c0.08,-0.4 0.17,-0.8 0.26,-1.2l5,-1.44 -3.93,-3.22c0.08,-0.34 0.15,-0.69 0.23,-1l6.51,-1.89 -4.68,-5.41c0.07,-0.25 0.14,-0.5 0.22,-0.75l5.89,-0.82 -3.72,-5.48 0.3,-0.69 5.59,1.21 -3.33,-5.65c0.18,-0.3 0.37,-0.59 0.55,-0.88l5.95,0.95 -2.68,-5 0,0c-1.39,-6.49 -6.72,-19.33 -6.72,-19.33a62.21,62.21 0,0 0,-5.78 -11.48c-9.59,-15.31 -27.16,-28.64 -44.56,-28.64a32.59,32.59 0,0 0,-7.59 0.89c-17.93,4.31 -32.31,24.52 -40.65,39.83 -9.37,17.22 -14.3,36.39 -18.8,55.34 -6.77,28.47 -10.5,57.56 -13.22,86.66 -2.25,24 -10,50.88 14.49,65.32 11.22,6.6 24.36,10.79 37.17,12.9a98,98 0,0 0,16 1.15c4.72,0 9.45,-0.22 14.16,-0.44l49.8,-2.29c0.72,0 1.46,-0.06 2.21,-0.06 4,0 8.15,0.65 10.26,3.85 0.25,-2.66 -2.08,-7 -4.86,-11.6l5.7,-1.29c0.15,-4.58 0.6,-8 2.5,-5.38 0.93,1.29 2.19,2.73 3.78,2.54 1.86,-0.23 2.65,-2.45 3,-4.3C234,319.42 234.06,307.82 233.41,296.2ZM158.81,334.39c-4.45,0.2 -9.06,0.42 -13.47,0.42a83.24,83.24 0,0 1,-13.54 -0.95c-12,-2 -23.1,-5.8 -32,-11 -5.66,-3.33 -8.42,-7.32 -9.52,-13.75 -1.25,-7.35 -0.11,-16.53 1.1,-26.24 0.45,-3.59 0.91,-7.3 1.26,-11 3.25,-34.69 7.22,-60.78 12.88,-84.59 4.38,-18.42 9,-36.24 17.39,-51.64 9.79,-18 21.37,-30.11 31,-32.42a17.66,17.66 0,0 1,4.08 -0.47c6.64,0 14.53,3.54 21.63,9.71 6.86,6 12.19,13.64 14.36,20.64 -5.36,13.5 -10.52,31.41 -12.51,44.37 -5.36,34.75 -9,99.6 -7.6,156.26Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.5091188"
+      android:scaleY="2.5091188">
+    <path
+        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#000000"/>
+  </group>
 </vector>

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

@@ -3,7 +3,7 @@
 	android:color="?android:colorControlHighlight">
 	<item>
 		<shape>
-			<solid android:color="?attr/colorComposeButtonBackground"/>
+			<solid android:color="?colorSecondary"/>
 			<corners android:radius="16dp"/>
 		</shape>
 	</item>

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

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

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

@@ -0,0 +1,9 @@
+<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.0653,14.9329C14.0639,14.9132 14.0475,14.8978 14.0278,14.8978C14.0125,14.8978 13.9987,14.9072 13.993,14.9214C13.6711,15.7244 13.2265,16.3336 12.6594,16.7489C12.0948,17.1603 11.4132,17.366 10.6146,17.366C9.5096,17.366 8.6183,16.9587 7.9407,16.144C7.2632,15.3293 6.9244,14.2202 6.9244,12.8167C6.9244,10.9857 7.3922,9.4773 8.3279,8.2916C9.2716,7.1059 10.4574,6.513 11.8851,6.513C12.4658,6.513 12.9659,6.6421 13.3854,6.9002C13.8048,7.1583 14.0992,7.489 14.2686,7.8923H14.317L14.3417,7.6527C14.3964,7.122 14.8435,6.7187 15.3769,6.7187C15.9898,6.7187 16.4699,7.246 16.4136,7.8562C16.2791,9.3148 16.1731,10.4964 16.0956,11.4011C16.0069,12.5223 15.9625,13.216 15.9625,13.4822C15.9544,14.1839 16.0512,14.7082 16.2529,15.0551C16.4545,15.4019 16.761,15.5753 17.1724,15.5753C17.9226,15.5753 18.5477,15.1276 19.0478,14.2323C19.5479,13.337 19.7979,12.1754 19.7979,10.7477C19.7979,8.7151 19.1446,7.0494 17.8379,5.7508C16.5312,4.4521 14.7284,3.8028 12.4295,3.8028C10.0177,3.8028 8.0415,4.6094 6.5009,6.2226C4.9683,7.8358 4.2021,9.8484 4.2021,12.2601C4.2021,14.6316 4.9159,16.5191 6.3436,17.9226C7.7713,19.318 9.7193,20.0157 12.1875,20.0157C13.1393,20.0157 14.0307,19.923 14.8615,19.7374C15.3602,19.6309 15.8386,19.4953 16.2966,19.3307C16.7909,19.153 17.3563,19.3639 17.5632,19.8467C17.7578,20.3007 17.5634,20.8314 17.1019,21.0073C16.5257,21.2269 15.9039,21.4046 15.2365,21.5402C14.2525,21.75 13.1837,21.8548 12.0302,21.8548C9.0135,21.8548 6.5856,20.9837 4.7465,19.2414C2.9155,17.4991 2,15.1922 2,12.3206C2,9.3765 2.9679,6.9204 4.9038,4.9522C6.8397,2.9841 9.3442,2 12.4174,2C15.2002,2 17.491,2.7985 19.2898,4.3956C21.0966,5.9847 22,8.0738 22,10.663C22,12.6473 21.4878,14.2605 20.4634,15.5027C19.4471,16.7449 18.217,17.366 16.7731,17.366C15.9504,17.366 15.3051,17.1482 14.8373,16.7126C14.3765,16.2837 14.1192,15.6904 14.0653,14.9329ZM12.1512,8.2674C11.2398,8.2674 10.5098,8.707 9.9613,9.5862C9.4128,10.4573 9.1385,11.5342 9.1385,12.8167C9.1385,13.6798 9.32,14.3573 9.683,14.8494C10.054,15.3333 10.542,15.5753 11.147,15.5753C12.0423,15.5753 12.7481,15.1236 13.2644,14.2202C13.7806,13.3087 14.0387,12.0988 14.0387,10.5904C14.0387,9.8403 13.8734,9.2676 13.5426,8.8723C13.2119,8.4691 12.7481,8.2674 12.1512,8.2674Z"
+      android:fillColor="#667085"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="34dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="34dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M12 4.5c-4.142 0-7.5 3.358-7.5 7.5 0 4.142 3.358 7.5 7.5 7.5 4.142 0 7.5-3.358 7.5-7.5 0-0.376-0.028-0.746-0.081-1.108C19.352 10.438 19.684 10 20.143 10c0.37 0 0.696 0.256 0.752 0.623C20.965 11.072 21 11.532 21 12c0 4.97-4.03 9-9 9s-9-4.03-9-9 4.03-9 9-9c2.305 0 4.408 0.867 6 2.292V4.25c0-0.414 0.336-0.75 0.75-0.75s0.75 0.336 0.75 0.75v3C19.5 7.664 19.164 8 18.75 8h-3C15.336 8 15 7.664 15 7.25s0.336-0.75 0.75-0.75h1.35c-1.34-1.241-3.13-2-5.1-2z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M19.832 6.5c-1.61-1.254-3.634-2-5.832-2-5.247 0-9.5 4.253-9.5 9.5s4.253 9.5 9.5 9.5 9.5-4.253 9.5-9.5c0-0.452-0.03-0.659-0.1-1.139l-0.001-0.002c-0.06-0.41 0.223-0.791 0.633-0.851 0.41-0.06 0.791 0.223 0.851 0.633l0.002 0.012C24.957 13.143 25 13.438 25 14c0 6.075-4.925 11-11 11S3 20.075 3 14 7.925 3 14 3c2.66 0 5.099 0.944 7 2.514V3.75C21 3.336 21.336 3 21.75 3s0.75 0.336 0.75 0.75v3.5C22.5 7.664 22.164 8 21.75 8h-3.5c-0.414 0-0.75-0.336-0.75-0.75s0.336-0.75 0.75-0.75h1.582z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>