Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

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

.github/FUNDING.yml

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

README.md

@@ -1,37 +1,25 @@
-![MoshidonLogo](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Moshidon, the material you mastodon client! 
+# Megalodon
 
-> 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.
+[![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 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>
 
-[![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)
-
----
+> 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.
 
 
 ## Key features
 
-### **Material you theme support on Android 12+ devices!**
-
-### **Translate button**
-
-**Allows you to translate posts in instances with the translate feature!**
-
-**Screenshots**
-
-![Screenshot_20221209-135457_1](https://user-images.githubusercontent.com/71328265/206753830-cdb8bc65-7732-4a6a-8bcd-bbc4ca311d19.png)
-![Screenshot_20221209-135409_1](https://user-images.githubusercontent.com/71328265/206753831-7af92a48-d7a5-4780-9beb-90acef4e141b.png)
-
-### **Color themes**
-
-**Allows you to change theme within the app. Supports Purple, pink, green, blue, orange and yellow!**
-
 ### **Unlisted posting**
 
-**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
+**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”).**
 
-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.
+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.
   
 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).
 
@@ -43,6 +31,12 @@ 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.**
@@ -55,29 +49,71 @@ 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
 
-**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.**
+### IzzyOnDroid
 
-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.
+[apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)
 
-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!
+<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
+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/LucasGGamerM/moshidon/releases) page.
+All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
 
-**`moshidon.apk`**
+**`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/)
 
-Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
 ---
 
@@ -95,7 +131,7 @@ Variant with an integrated updater. If you download Moshidon from here (and not
 * [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 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))
+* [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))
 * [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)
@@ -105,7 +141,17 @@ Variant with an integrated updater. If you download Moshidon from here (and not
 * [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)
-* [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
+* [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
+* [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
+* [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
+* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
+* [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)
+* [Display server announcements](https://github.com/sk22/megalodon/commit/84179bc207d6b69cc2a770a3c28fa0a39b0b54e8)
+* [Create](https://github.com/sk22/megalodon/commit/294595513a45037359b31377aafc25ae5b58d8e7), [edit](https://github.com/sk22/megalodon/commit/d47797bf7ac8cff3f9ba1cfee219a1bb2af21da6) and [delete](https://github.com/sk22/megalodon/commit/54c29fd787fc2cd0dfd2787ad796b8190f795973) lists
+* [Soft-blocking (by blocking and immediately unblocking)](https://github.com/sk22/megalodon/commit/e75d350b7a2709259e9fc5138e0e1f361bdb0972)
 
 
 ### Behavior
@@ -117,6 +163,18 @@ Variant with an integrated updater. If you download Moshidon from here (and not
 * [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)
+* Improved filtering using Mastodon 4.0 API: [#202](https://github.com/sk22/megalodon/pull/202), [#212](https://github.com/sk22/megalodon/pull/212), [#255](https://github.com/sk22/megalodon/pull/255) by [@thiagojedi](https://github.com/thiagojedi)
 
 
 ### Visual
@@ -124,6 +182,14 @@ Variant with an integrated updater. If you download Moshidon from here (and not
 * [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)
+* Scale text according to system settings
 
 
 ## Building
@@ -140,4 +206,4 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-<a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>
+<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>

_config.yml

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

_layouts/default.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Moshidon</title>
+    <title>Megalodon</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

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

mastodon/build.gradle

@@ -5,12 +5,12 @@ plugins {
 android {
 	compileSdk 33
 	defaultConfig {
-		archivesBaseName = "moshidon"
-		applicationId "org.joinmastodon.android.moshinda"
+		archivesBaseName = "megalodon"
+		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 86
-		versionName "1.1.4+fork.86.moshinda"
+		versionCode 67
+		versionName "1.1.5+fork.67"
 		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

@@ -113,13 +113,13 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest")
+				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
 			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
-			String changelog=obj.get("body").getAsString();
 			String tag=obj.get("tag_name").getAsString();
+			String changelog=obj.get("body").getAsString();
 			Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
 			Matcher matcher=pattern.matcher(tag);
 			if(!matcher.find()){
@@ -147,7 +147,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
 				for(JsonElement el:obj.getAsJsonArray("assets")){
 					JsonObject asset=el.getAsJsonObject();
-					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())){
+					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())){
 						long size=asset.get("size").getAsLong();
 						String url=asset.get("browser_download_url").getAsString();
 
@@ -161,8 +161,8 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 								.putLong("apkSize", size)
 								.putString("version", version)
 								.putString("apkURL", url)
-								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
 								.putString("changelog", changelog)
+								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
 								.remove("downloadID")
 								.apply();
 

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

mastodon/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/app_name"
+		android:label="@string/sk_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="moshidon-android-auth" android:host="callback"/>
+				<data android:scheme="megalodon-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/java/org/joinmastodon/android/ExternalShareActivity.java

@@ -12,7 +12,6 @@ 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;
@@ -36,13 +35,10 @@ public class ExternalShareActivity extends FragmentStackActivity{
 				openComposeFragment(sessions.get(0).getID());
 			}else{
 				getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
-				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();
+				UiUtils.pickAccount(this, null, R.string.choose_account, 0,
+						session -> openComposeFragment(session.getID()),
+						b -> b.setOnCancelListener(d -> finish())
+				);
 			}
 		}
 	}

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

@@ -4,7 +4,6 @@ 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 +25,10 @@ public class GlobalUserPreferences{
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
-	public static boolean disableDividers;
 	public static boolean voteButtonForSingleChoice;
-	public static boolean uniformNotificationIcon;
 	public static boolean enableDeleteNotifications;
-	public static boolean relocatePublishButton;
+	public static boolean translateButtonOpenedOnly;
+	public static boolean uniformNotificationIcon;
 	public static boolean reduceMotion;
 	public static boolean keepOnlyLatestNotification;
 	public static String publishButtonText;
@@ -40,9 +38,6 @@ public class GlobalUserPreferences{
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 
-	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
-	public static Map<String, Integer> recentEmojis;
-
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
@@ -60,32 +55,26 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
-		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", true);
 		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		disableDividers=prefs.getBoolean("disableDividers", true);
-		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
-		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", true);
+		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
+		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
+		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
 		reduceMotion=prefs.getBoolean("reduceMotion", false);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
+		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
-		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
-		publishButtonText=prefs.getString("publishButtonText", "");
 
 		try {
-			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
-			}else{
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
-			}
+			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PURPLE;
+			color=ColorPreference.PINK;
 		}
 	}
 
@@ -102,17 +91,15 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("disableDividers", disableDividers)
-				.putBoolean("relocatePublishButton", relocatePublishButton)
-				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
+				.putBoolean("translateButtonOpenedOnly", translateButtonOpenedOnly)
+				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("reduceMotion", reduceMotion)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
-				.putString("recentEmojis", gson.toJson(recentEmojis))
 				.apply();
 	}
 
@@ -124,8 +111,7 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		YELLOW,
-		NORD
+		YELLOW
 	}
 
 	public enum ThemePreference{

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

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

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

@@ -130,30 +130,26 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationId);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
+				.setSmallIcon(R.drawable.ic_ntf_logo)
 				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.shortcut_icon_background));
-		if(!GlobalUserPreferences.uniformNotificationIcon){
-			switch (pn.notificationType) {
-				case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
-				case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
-				case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
-				case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
-				case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
-				default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
-			}
-		}else{
-			builder.setSmallIcon(R.drawable.ic_ntf_logo);
+				.setColor(context.getColor(R.color.primary_700));
+
+		if (!GlobalUserPreferences.uniformNotificationIcon) switch (pn.notificationType) {
+			case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
+			case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
+			case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
+			case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
+			case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
 		}
 
 		if(avatar!=null){

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

@@ -372,7 +372,7 @@ public class PushSubscriptionManager{
 		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 			if(session.pushSubscription==null || forceReRegister)
 				session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
-			else if(session.needUpdatePushSettings)
+			else
 				session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
 		}
 	}

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

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

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

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

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

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

@@ -10,8 +10,8 @@ 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());
-    }
+	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="Moshidon";
+		public String clientName="Megalodon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://github.com/LucasGGamerM/moshidon";
+		public String website="https://sk22.github.io/megalodon";
 	}
 }

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

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

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

@@ -61,7 +61,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class AccountSessionManager{
 	private static final String TAG="AccountSessionManager";
 	public static final String SCOPE="read write follow push";
-	public static final String REDIRECT_URI="moshidon-android-auth://callback";
+	public static final String REDIRECT_URI="megalodon-android-auth://callback";
 
 	private static final AccountSessionManager instance=new AccountSessionManager();
 
@@ -211,7 +211,7 @@ public class AccountSessionManager{
 								.path("/oauth/authorize")
 								.appendQueryParameter("response_type", "code")
 								.appendQueryParameter("client_id", result.clientId)
-								.appendQueryParameter("redirect_uri", "moshidon-android-auth://callback")
+								.appendQueryParameter("redirect_uri", "megalodon-android-auth://callback")
 								.appendQueryParameter("scope", SCOPE)
 								.build();
 

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

@@ -66,7 +66,7 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
 		instanceUser.emojis = List.of();
 		Status fakeStatus = a.toStatus();
-		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
+		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus);
 		textItem.textSelectable = true;
 		return List.of(
 				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),

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

@@ -675,7 +675,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		private int currentMediaHiddenLayoutsWidth=0;
 
 		{
-			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), GlobalUserPreferences.disableDividers ? R.attr.colorWindowBackground : R.attr.colorPollVoted));
+			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), R.attr.colorPollVoted));
 			dividerPaint.setStyle(Paint.Style.STROKE);
 			dividerPaint.setStrokeWidth(V.dp(1));
 		}

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

@@ -1,12 +1,11 @@
 package org.joinmastodon.android.fragments;
 
-import static android.os.ext.SdkExtensions.getExtensionVersion;
-
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
 import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages;
 import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages;
+import static android.os.ext.SdkExtensions.getExtensionVersion;
 
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
@@ -230,14 +229,10 @@ 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);
@@ -281,7 +276,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
-		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}
 
 	@Override
@@ -299,25 +293,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiKeyboard.setListener(this::onCustomEmojiClick);
 
 		View view=inflater.inflate(R.layout.fragment_compose, container, false);
-
-		if(GlobalUserPreferences.relocatePublishButton){
-			publishButton=view.findViewById(R.id.publish);
-//			publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
-			publishButton.setEllipsize(TextUtils.TruncateAt.END);
-			publishButton.setOnClickListener(this::onPublishClick);
-			publishButton.setSingleLine(true);
-			publishButton.setVisibility(View.VISIBLE);
-
-			draftsBtn=view.findViewById(R.id.drafts_btn);
-			draftsBtn.setVisibility(View.VISIBLE);
-		} else {
-			charCounter=view.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
-		}
-
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
+		charCounter=view.findViewById(R.id.char_counter);
+		charCounter.setText(String.valueOf(charLimit));
 		scrollView=view.findViewById(R.id.scroll_view);
 
 		selfName=view.findViewById(R.id.self_name);
@@ -672,7 +651,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
+			int visibilityNameRes = switch (replyTo.visibility) {
+				case PUBLIC -> R.string.visibility_public;
+				case UNLISTED -> R.string.sk_visibility_unlisted;
+				case PRIVATE -> R.string.visibility_followers_only;
+				case DIRECT -> R.string.visibility_private;
+			};
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
@@ -766,20 +751,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		item.setActionView(wrap);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
-		if(!GlobalUserPreferences.relocatePublishButton){
-			publishButton = wrap.findViewById(R.id.publish_btn);
-			publishButton.setOnClickListener(this::onPublishClick);
-			publishButton.setVisibility(View.VISIBLE);
-
-			draftsBtn = wrap.findViewById(R.id.drafts_btn);
-			draftsBtn.setVisibility(View.VISIBLE);
-		}else{
-			charCounter = wrap.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
-		}
-
-//		draftsBtn = wrap.findViewById(R.id.drafts_btn);
+		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);
@@ -796,11 +768,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 		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);
@@ -899,9 +872,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private void resetPublishButtonText() {
 		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
-		if(GlobalUserPreferences.relocatePublishButton){
-			return;
-		}
 		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
 			publishButton.setText(GlobalUserPreferences.publishButtonText);
 		} else {
@@ -940,18 +910,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onPublishClick(View v){
-		if (!attachments.isEmpty()
-				&& statusVisibility != StatusPrivacy.DIRECT
-				&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.sk_no_image_desc_title)
-					.setMessage(R.string.sk_no_image_desc)
-					.setNegativeButton(R.string.cancel, null)
-					.setPositiveButton(R.string.publish, (dialog, i)-> publish())
-					.show();
-		} else {
-			publish();
-		}
+		publish();
 	}
 
 	private void publishErrorCallback(ErrorResponse error) {
@@ -1064,7 +1023,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
-
 		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
@@ -1368,7 +1326,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	private void uploadMediaAttachment(DraftMediaAttachment attachment){
 		if(areThereAnyUploadingAttachments()){
-			throw new IllegalStateException("there is already an attachment being uploaded");
+			 throw new IllegalStateException("there is already an attachment being uploaded");
 		}
 		attachment.state=AttachmentUploadState.UPLOADING;
 		attachment.progressBar.setVisibility(View.VISIBLE);
@@ -1721,15 +1679,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				scheduleDraftText.setText(R.string.sk_compose_draft);
 				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_regular, 0, 0, 0);
 				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_draft));
-				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_regular : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
-
-				if(GlobalUserPreferences.relocatePublishButton){
-					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-						? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_drafts_24_selector, 0, 0, 0);
-				}else{
-					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-							? R.string.save : R.string.sk_draft);
-				}
+				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);
@@ -1739,21 +1691,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				scheduleDraftText.setText(R.string.sk_compose_scheduled);
 				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_schedule));
-				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_filled : R.drawable.ic_fluent_clock_20_filled, 0, 0, 0);
-				if(GlobalUserPreferences.relocatePublishButton)
-				{
-					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-							? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_clock_24_selector, 0, 0, 0);
-				}else{
-					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.equals(scheduledAt)
-							? R.string.save : R.string.sk_schedule);
-				}
+				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(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_regular : R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
-			if(GlobalUserPreferences.relocatePublishButton){
-				publishButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_send_24_selector, 0, 0, 0);
-			}
+			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
 			resetPublishButtonText();
 		}
 	}

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

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

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

@@ -21,6 +21,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
+import org.joinmastodon.android.fragments.discover.SearchFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -42,7 +43,7 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
 
 public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
 	private FragmentRootLinearLayout content;
-	private HomeTimelineFragment homeTimelineFragment;
+	private HomeTabFragment homeTabFragment;
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
@@ -66,8 +67,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			homeTimelineFragment=new HomeTimelineFragment();
-			homeTimelineFragment.setArguments(args);
+			homeTabFragment=new HomeTabFragment();
+			homeTabFragment.setArguments(args);
 			args=new Bundle(args);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
@@ -111,7 +112,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(R.id.fragment_wrap, homeTimelineFragment)
+					.add(R.id.fragment_wrap, homeTabFragment)
 					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
 					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
 					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
@@ -137,16 +138,15 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onViewStateRestored(Bundle savedInstanceState){
 		super.onViewStateRestored(savedInstanceState);
-		if(savedInstanceState==null || homeTimelineFragment!=null)
-			return;
-		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
+		if(savedInstanceState==null) return;
+		homeTabFragment=(HomeTabFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTabFragment");
 		searchFragment=(DiscoverFragment) getChildFragmentManager().getFragment(savedInstanceState, "searchFragment");
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
 		Fragment current=fragmentForTab(currentTab);
 		getChildFragmentManager().beginTransaction()
-				.hide(homeTimelineFragment)
+				.hide(homeTabFragment)
 				.hide(searchFragment)
 				.hide(notificationsFragment)
 				.hide(profileFragment)
@@ -181,7 +181,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
 		WindowInsets topOnlyInsets=insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), 0, 0);
-		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
+		homeTabFragment.onApplyWindowInsets(topOnlyInsets);
 		searchFragment.onApplyWindowInsets(topOnlyInsets);
 		notificationsFragment.onApplyWindowInsets(topOnlyInsets);
 		profileFragment.onApplyWindowInsets(topOnlyInsets);
@@ -189,7 +189,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	private Fragment fragmentForTab(@IdRes int tab){
 		if(tab==R.id.tab_home){
-			return homeTimelineFragment;
+			return homeTabFragment;
 		}else if(tab==R.id.tab_search){
 			return searchFragment;
 		}else if(tab==R.id.tab_notifications){
@@ -203,18 +203,9 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
-			if(tab == R.id.tab_search){
-				if(newFragment instanceof ScrollableToTop scrollable)
-					scrollable.scrollToTop();
-				searchFragment.selectSearch();
-				return;
-			}
-			if(newFragment instanceof ScrollableToTop scrollable)
-				scrollable.scrollToTop();
-			return;
-		}
-		if(tab==currentTab && tab == R.id.tab_search){
-			if(newFragment instanceof ScrollableToTop scrollable)
+			if (tab == R.id.tab_search)
+				searchFragment.onSelect();
+			else if(newFragment instanceof ScrollableToTop scrollable)
 				scrollable.scrollToTop();
 			return;
 		}
@@ -251,12 +242,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
-		if(tab==R.id.tab_search){
-			onTabSelected(R.id.tab_search);
-			tabBar.selectTab(R.id.tab_search);
-			searchFragment.selectSearch();
-			return true;
-		}
 		return false;
 	}
 
@@ -270,17 +255,18 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			tabBar.selectTab(R.id.tab_home);
 			onTabSelected(R.id.tab_home);
 			return true;
+		} else {
+			return homeTabFragment.onBackPressed();
 		}
-		return false;
 	}
 
 	@Override
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
-		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
+		if (homeTabFragment.isAdded()) getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
+		if (searchFragment.isAdded()) getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
 }

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

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

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

@@ -1,47 +1,21 @@
 package org.joinmastodon.android.fragments;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.content.res.ColorStateList;
-import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.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;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
@@ -50,38 +24,23 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class HomeTimelineFragment extends 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;
-
+public class HomeTimelineFragment extends FabStatusListFragment {
+	private HomeTabFragment parent;
 	private String maxID;
 
-	public HomeTimelineFragment(){
-		setListLayoutId(R.layout.recycler_fragment_with_fab);
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setHasOptionsMenu(true);
+		if (getParentFragment() instanceof HomeTabFragment home) parent = home;
 		loadData();
 	}
 
 	private List<Status> filterPosts(List<Status> items) {
-		// This is the function I must use to solve the filters thing for real
 		return items.stream().filter(i ->
 				(GlobalUserPreferences.showReplies || i.inReplyToId == null) &&
 				(GlobalUserPreferences.showBoosts || i.reblog == null)
@@ -109,67 +68,15 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab=view.findViewById(R.id.fab);
-		fab.setOnClickListener(this::onFabClick);
-		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID));
 
-		updateToolbarLogo();
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				if(newPostsBtnShown && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
-					hideNewPostsButton();
+				if(parent != null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+					parent.hideNewPostsButton();
 				}
 			}
 		});
-
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.register(this);
-			updateUpdateState(GithubSelfUpdater.getInstance().getState());
-		}
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.home, menu);
-		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);
-		}
-		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);
-		updateToolbarLogo();
 	}
 
 	@Override
@@ -188,12 +95,6 @@ public class HomeTimelineFragment extends StatusListFragment{
 		prependItems(Collections.singletonList(ev.status), true);
 	}
 
-	private void onFabClick(View v){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), ComposeFragment.class, args);
-	}
-
 	private void loadNewPosts(){
 		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
@@ -222,7 +123,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							showNewPostsButton();
+							if (parent != null) parent.showNewPostsButton();
 							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
 					}
@@ -338,132 +239,10 @@ public class HomeTimelineFragment extends StatusListFragment{
 			currentRequest=null;
 			dataLoading=false;
 		}
+		if (parent != null) parent.hideNewPostsButton();
 		super.onRefresh();
 	}
 
-	private void updateToolbarLogo(){
-		toolbarLogo=new ImageView(getActivity());
-		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-		toolbarLogo.setImageResource(R.drawable.logo);
-		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
-//		toolbarLogo =new TextView(getActivity());
-//		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
-//		toolbarLogo.setTextAppearance(R.style.app_title);
-
-		toolbarShowNewPostsBtn=new Button(getActivity());
-		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
-		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
-		toolbarShowNewPostsBtn.setStateListAnimator(null);
-		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
-		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
-		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
-		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
-		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
-			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
-		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
-
-		if(newPostsBtnShown){
-			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-			toolbarLogo.setVisibility(View.INVISIBLE);
-			toolbarLogo.setAlpha(0f);
-		}else{
-			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-			toolbarShowNewPostsBtn.setAlpha(0f);
-			toolbarShowNewPostsBtn.setScaleX(.8f);
-			toolbarShowNewPostsBtn.setScaleY(.8f);
-			toolbarLogo.setVisibility(View.VISIBLE);
-		}
-
-		FrameLayout logoWrap=new FrameLayout(getActivity());
-		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
-		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
-
-		Toolbar toolbar=getToolbar();
-		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
-	}
-
-	private void showNewPostsButton(){
-		if(newPostsBtnShown)
-			return;
-		newPostsBtnShown=true;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
-		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarLogo.setVisibility(View.INVISIBLE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	private void hideNewPostsButton(){
-		if(!newPostsBtnShown)
-			return;
-		newPostsBtnShown=false;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarLogo.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
-		);
-		set.setDuration(300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	private void onNewPostsBtnClick(View v){
-		if(newPostsBtnShown){
-			hideNewPostsButton();
-			scrollToTop();
-		}
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.unregister(this);
-		}
-	}
-
-	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
-		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
-			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
-	}
-
-	@Subscribe
-	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-		updateUpdateState(ev.state);
-	}
-
 	@Override
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.fragments;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public interface IsOnTop {
+    boolean isOnTop();
+
+    default boolean isRecyclerViewOnTop(RecyclerView list) {
+        return !list.canScrollVertically(-1);
+    }
+}

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

@@ -102,6 +102,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
+		UiUtils.reduceSwipeSensitivity(pager);
 
 		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){

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

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

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

@@ -1,11 +1,16 @@
 package org.joinmastodon.android.fragments;
 
+import static android.content.Context.CLIPBOARD_SERVICE;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -14,6 +19,8 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
@@ -27,23 +34,17 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.viewpager2.widget.ViewPager2;
-
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
@@ -51,7 +52,6 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -83,6 +83,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -119,9 +123,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
 
-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String note;
 	private Account account;
 	private String accountID;
 	private Relationship relationship;
@@ -190,7 +191,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingCount=content.findViewById(R.id.following_count);
 		followingLabel=content.findViewById(R.id.following_label);
 		followingBtn=content.findViewById(R.id.following_btn);
-
 		postsCount=content.findViewById(R.id.posts_count);
 		postsLabel=content.findViewById(R.id.posts_label);
 		postsBtn=content.findViewById(R.id.posts_btn);
@@ -207,10 +207,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 
-		noteEdit = content.findViewById(R.id.note_edit);
-		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
-
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
 			public void getOutline(View view, Outline outline){
@@ -219,31 +215,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);
 
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				fab.setVisibility(View.GONE);
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				fab.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
-
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -270,6 +241,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
+		UiUtils.reduceSwipeSensitivity(pager);
 		pager.setOffscreenPageLimit(5);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new ProfilePagerAdapter());
@@ -334,25 +306,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
-	public void setNote(String note){
-		this.note=note;
-		noteWrap.setVisibility(View.VISIBLE);
-		noteEdit.setVisibility(View.VISIBLE);
-		noteEdit.setText(note);
-	}
-
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse result) {
-				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
-			}
-		}).exec(accountID);
-	}
-
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -500,7 +453,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
-
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
 			ssb.append(account.acct);
@@ -514,19 +466,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
-		}else if(account.bot){
-			ssb=new SpannableStringBuilder("@");
-			ssb.append(account.acct);
-			if(isSelf){
-				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
-			}
-			ssb.append(" ");
-			Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, getActivity().getTheme()).mutate();
-			botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
-			botIcon.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
-			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
@@ -538,8 +477,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setVisibility(View.VISIBLE);
 			bio.setText(parsedBio);
 		}
-
-
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -619,11 +556,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-		if(isOwnProfile){
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.manage_user_lists, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
-		}else{
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
-		}
+		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
 		if(isOwnProfile)
 			return;
@@ -755,10 +688,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		if (!isOwnProfile) {
-			setNote(relationship.note);
-			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
-		}
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
@@ -987,9 +916,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public boolean onBackPressed(){
-		if(noteEdit.hasFocus()) {
-			savePrivateNote();
-		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;

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

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

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

@@ -19,8 +19,6 @@ import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -111,18 +109,6 @@ 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 SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
-			GlobalUserPreferences.uniformNotificationIcon=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
-		}));
 		items.add(new 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);
@@ -139,43 +125,44 @@ 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-> {
+		items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{
 			updatePublishText(b);
-			if (GlobalUserPreferences.relocatePublishButton) {
-				b.setOnClickListener(l -> {
-					Toast.makeText(getActivity(), R.string.sk_disable_relocate_publish_button_to_enable_customization,
-							Toast.LENGTH_LONG).show();
-				});
-			} else {
-				b.setOnClickListener(l -> {
-					FrameLayout inputWrap = new FrameLayout(getContext());
-					EditText input = new EditText(getContext());
-					input.setHint(R.string.publish);
-					input.setText(GlobalUserPreferences.publishButtonText.trim());
-					FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-					params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-					input.setLayoutParams(params);
-					inputWrap.addView(input);
-					new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-							.setPositiveButton(R.string.save, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNeutralButton(R.string.clear, (d, which) -> {
-								GlobalUserPreferences.publishButtonText = "";
-								GlobalUserPreferences.save();
-								updatePublishText(b);
-							})
-							.setNegativeButton(R.string.cancel, (d, which) -> {
-							})
-							.show();
-				});}
-		}));
 
+			b.setOnClickListener(l->{
+				TextInputFrameLayout input = new TextInputFrameLayout(
+						getContext(),
+						getString(R.string.publish),
+						GlobalUserPreferences.publishButtonText.trim()
+				);
+				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(input)
+						.setPositiveButton(R.string.save, (d, which) -> {
+							GlobalUserPreferences.publishButtonText = input.getEditText().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->{
@@ -204,26 +191,20 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-//		items.add(new SwitchItem(R.string.sk_settings_show_differentiated_notification_icons, R.drawable.ic_ntf_logo, GlobalUserPreferences.showUniformPushNoticationIcons, this::onNotificationStyleChanged));
-		items.add(new SwitchItem(R.string.sk_disable_dividers, R.drawable.ic_fluent_timeline_24_regular, GlobalUserPreferences.disableDividers, i->{
-			GlobalUserPreferences.disableDividers=i.checked;
+		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_enable_delete_notifications, R.drawable.ic_fluent_delete_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{
-//			GlobalUserPreferences.enableDeleteNotifications=i.checked;
-//			GlobalUserPreferences.save();
-//			needAppRestart=true;
-//		}));
-		items.add(new SwitchItem(R.string.sk_relocate_publish_button, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{
-			GlobalUserPreferences.relocatePublishButton=i.checked;
+		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;
 		}));
-//		items.add(new SwitchItem(R.string.sk_settings_hide_translate_in_timeline, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
-//			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
-//			GlobalUserPreferences.save();
-//			needAppRestart=true;
-//		}));
+		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->{
@@ -268,33 +249,20 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
-		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
-		items.add(new SmallTextItem(getString(translationAvailable ?
-				R.string.sk_settings_translation_availability_note_available :
-				R.string.sk_settings_translation_availability_note_unavailable, instance.title)));
-
 
 		items.add(new HeaderItem(R.string.sk_settings_about));
-//		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular));
-//		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular));
+		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular));
 		if (GithubSelfUpdater.needSelfUpdating()) {
 			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
-		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
-//		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
 		items.add(clearImageCacheItem);
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
-		items.add(new TextItem(R.string.sk_clear_recent_emoji, ()-> {
-			GlobalUserPreferences.recentEmojis.clear();
-			GlobalUserPreferences.save();
-		}));
-//		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 
 		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
 	}
@@ -388,7 +356,6 @@ 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;
 
@@ -398,7 +365,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		return true;
 	}
 
-
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -463,12 +429,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		needUpdateNotificationSettings=true;
 	}
 
-	private void onNotificationStyleChanged(SwitchItem item){
-		GlobalUserPreferences.uniformNotificationIcon=item.checked;
-		GlobalUserPreferences.save();
-	}
-
-
 	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
 		PushSubscription subscription=getPushSubscription();
 		PushSubscription.Policy prevPolicy=subscription.policy;
@@ -633,13 +593,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	public class ColorPicker extends Item{
-		@Override
-		public int getViewType(){
-			return 8;
-		}
-	}
-
 	private static class ThemeItem extends Item{
 
 		@Override
@@ -879,7 +832,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
-
 	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
@@ -986,9 +938,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		@Override
 		public void onBind(SmallTextItem item){
 			text.setText(item.text);
-			TypedValue val = new TypedValue();
-			getContext().getTheme().resolveAttribute(android.R.attr.textColorSecondary, val, true);
-			text.setTextColor(getResources().getColor(val.resourceId, getContext().getTheme()));
+			text.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);
 		}
@@ -1065,7 +1015,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				progress.removeCallbacks(progressUpdater);
 			}
 			changelog.setText(info.changelog);
-//			changelog.setText(getString(R.string.sk_changelog, info.changelog));
 		}
 
 		private void updateProgress(){

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

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

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Account;
@@ -48,7 +49,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop{
+public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccountsFragment.AccountWrapper> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -137,6 +138,11 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccou
 		smoothScrollRecyclerViewToTop(list);
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
+
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 
 		public AccountsAdapter(){

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments.discover;
 
 import android.app.Fragment;
-import android.app.FragmentTransaction;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -18,11 +17,10 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -38,7 +36,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
 import me.grishka.appkit.utils.V;
 
-public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener{
+public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, OnBackPressedListener, IsOnTop {
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
@@ -55,15 +53,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private DiscoverNewsFragment newsFragment;
 	private DiscoverAccountsFragment accountsFragment;
 	private SearchFragment searchFragment;
-	private LocalTimelineFragment localTimelineFragment;
-	private FederatedTimelineFragment federatedTimelineFragment;
-	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
 
-	private final boolean noFederated = !GlobalUserPreferences.showFederatedTimeline;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -81,19 +74,15 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[noFederated ? 6 : 7];
+		tabViews=new FrameLayout[4];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
-			int switchIndex = noFederated && i > 0 ? i + 1 : i;
-			tabView.setId(switch(switchIndex){
-				case 0 -> R.id.discover_local_timeline;
-				case 1 -> R.id.discover_federated_timeline;
-				case 2 -> R.id.discover_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.setId(switch(i){
+				case 0 -> R.id.discover_hashtags;
+				case 1 -> R.id.discover_posts;
+				case 2 -> R.id.discover_news;
+				case 3 -> R.id.discover_users;
+				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
 			view.addView(tabView); // needed so the fragment manager will have somewhere to restore the tab fragment
@@ -103,6 +92,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout.setTabTextSize(V.dp(16));
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
 
+		UiUtils.reduceSwipeSensitivity(pager);
 		pager.setOffscreenPageLimit(4);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new DiscoverPagerAdapter());
@@ -119,7 +109,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			}
 		});
 
-		if(localTimelineFragment==null){
+		if(hashtagsFragment==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			args.putBoolean("__is_tab", true);
@@ -136,42 +126,23 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			accountsFragment=new DiscoverAccountsFragment();
 			accountsFragment.setArguments(args);
 
-			localTimelineFragment=new LocalTimelineFragment();
-			localTimelineFragment.setArguments(args);
 
-			listTimelinesFragment=new ListTimelinesFragment();
-			listTimelinesFragment.setArguments(args);
-
-			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
+			getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
-					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
-					.add(R.id.discover_lists, listTimelinesFragment);
-
-			if (!noFederated) {
-				federatedTimelineFragment=new FederatedTimelineFragment();
-				federatedTimelineFragment.setArguments(args);
-				transaction.add(R.id.discover_federated_timeline, federatedTimelineFragment);
-			}
-
-			transaction.commit();
+					.commit();
 		}
 
 		tabLayoutMediator=new TabLayoutMediator(tabLayout, pager, new TabLayoutMediator.TabConfigurationStrategy(){
 			@Override
 			public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
-				if (noFederated && position > 0) position++;
 				tab.setText(switch(position){
-					case 0 -> R.string.local_timeline;
-					case 1 -> R.string.sk_federated_timeline;
-					case 2 -> R.string.sk_list_timelines;
-					case 3 -> R.string.hashtags;
-					case 4 -> R.string.posts;
-					case 5 -> R.string.news;
-					case 6 -> R.string.for_you;
-
+					case 0 -> R.string.hashtags;
+					case 1 -> R.string.posts;
+					case 2 -> R.string.news;
+					case 3 -> R.string.for_you;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -256,9 +227,26 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		}
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return searchActive ? searchFragment.isOnTop()
+				: ((IsOnTop)getFragmentForPage(pager.getCurrentItem())).isOnTop();
+	}
+
+	public void onSelect() {
+		if (isOnTop()) selectSearch();
+		else scrollToTop();
+	}
+
+	private void selectSearch() {
+		searchEdit.requestFocus();
+		onSearchEditFocusChanged(searchEdit, true);
+		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
+	}
+
 	public void loadData(){
-		if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
-			localTimelineFragment.loadData();
+		if(hashtagsFragment!=null && !hashtagsFragment.loaded && !hashtagsFragment.dataLoading)
+			hashtagsFragment.loadData();
 	}
 
 	private void onSearchEditFocusChanged(View v, boolean hasFocus){
@@ -293,15 +281,11 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	}
 
 	private Fragment getFragmentForPage(int page){
-		if (noFederated && page > 0) page++;
 		return switch(page){
-			case 0 -> localTimelineFragment;
-			case 1 -> federatedTimelineFragment;
-			case 2 -> hashtagsFragment;
-			case 3 -> postsFragment;
-			case 4 -> newsFragment;
-			case 5 -> accountsFragment;
-			case 6 -> listTimelinesFragment;
+			case 0 -> hashtagsFragment;
+			case 1 -> postsFragment;
+			case 2 -> newsFragment;
+			case 3 -> accountsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -358,10 +342,4 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			return position;
 		}
 	}
-
-	public void selectSearch(){
-		searchEdit.requestFocus();
-		onSearchEditFocusChanged(searchEdit, true);
-		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
-	}
 }

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

@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingLinks;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Card;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -34,7 +35,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements ScrollableToTop{
+public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private List<ImageLoaderRequest> imageRequests=Collections.emptyList();
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS);
@@ -81,6 +82,11 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<Card> implements
 		smoothScrollRecyclerViewToTop(list);
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
+
 	private class LinksAdapter extends UsableRecyclerView.Adapter<LinkViewHolder> implements ImageLoaderRecyclerAdapter{
 		public LinksAdapter(){
 			super(imgLoader);

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.View;
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
@@ -12,7 +13,7 @@ import java.util.List;
 
 import me.grishka.appkit.api.SimpleCallback;
 
-public class DiscoverPostsFragment extends StatusListFragment{
+public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop {
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS);
 
 	@Override
@@ -31,4 +32,9 @@ public class DiscoverPostsFragment extends StatusListFragment{
 		super.onViewCreated(view, savedInstanceState);
 		bannerHelper.maybeAddBanner(contentWrap);
 	}
+
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
 }

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

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

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

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

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

@@ -11,6 +11,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
@@ -37,11 +38,10 @@ import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 
-public class SearchFragment extends BaseStatusListFragment<SearchResult>{
+public class SearchFragment extends BaseStatusListFragment<SearchResult> implements IsOnTop {
 	private String currentQuery;
 	private List<StatusDisplayItem> prevDisplayItems;
 	private EnumSet<SearchResult.Type> currentFilter=EnumSet.allOf(SearchResult.Type.class);
@@ -62,6 +62,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		loadData();
+		setEmptyText(R.string.sk_recent_searches_placeholder);
 	}
 
 	@Override
@@ -173,7 +174,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			return;
 		}
 		UiUtils.updateList(prevDisplayItems, displayItems, list, adapter, (i1, i2)->i1.parentID.equals(i2.parentID) && i1.index==i2.index && i1.getType()==i2.getType());
-		boolean recent=isInRecentMode();
+		boolean recent=isInRecentMode() && !displayItems.isEmpty();
 		if(recent!=headerAdapter.isVisible())
 			headerAdapter.setVisible(recent);
 		imgLoader.forceUpdateImages();
@@ -299,6 +300,11 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
+
 	@FunctionalInterface
 	public interface ProgressVisibilityListener{
 		void onProgressVisibilityChanged(boolean visible);

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

@@ -7,6 +7,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags;
+import org.joinmastodon.android.fragments.IsOnTop;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.ui.DividerItemDecoration;
@@ -23,7 +24,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop{
+public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop, IsOnTop {
 	private String accountID;
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS);
 
@@ -66,6 +67,11 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 		smoothScrollRecyclerViewToTop(list);
 	}
 
+	@Override
+	public boolean isOnTop() {
+		return isRecyclerViewOnTop(list);
+	}
+
 	private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
 		@NonNull
 		@Override

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/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,6 +80,7 @@ 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;
@@ -285,7 +286,13 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 		FilterChipView langFilter=new FilterChipView(getActivity());
 		langFilter.setDrawableEnd(R.drawable.ic_baseline_arrow_drop_down_18);
-		langFilter.setText(R.string.server_filter_any_language);
+		if(currentLanguage==null){
+			langFilter.setText(R.string.server_filter_any_language);
+		}else{
+			Locale locale=Locale.forLanguageTag(currentLanguage);
+			langFilter.setText(locale.getDisplayLanguage(locale));
+			langFilter.setSelected(true);
+		}
 		langFilterMenu=new PopupMenu(getContext(), langFilter);
 		langFilter.setOnTouchListener(langFilterMenu.getDragToOpenListener());
 		langFilter.setOnClickListener(v->langFilterMenu.show());
@@ -301,8 +308,12 @@ 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(R.string.server_filter_instant_signup);
-		speedFilter.setSelected(true);
+		speedFilter.setText(switch(currentSignupSpeedFilter){
+			case ANY -> R.string.server_filter_any_signup_speed;
+			case INSTANT -> R.string.server_filter_instant_signup;
+			case REVIEWED -> R.string.server_filter_manual_review;
+		});
+		speedFilter.setSelected(currentSignupSpeedFilter!=SignupSpeedFilter.ANY);
 		filtersWrap.addView(speedFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
 		speedFilterMenu.setOnMenuItemClickListener(item->{
@@ -328,11 +339,13 @@ 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->{
@@ -351,6 +364,8 @@ 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){
@@ -550,7 +565,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
 		}else{
 			filtersScroll.setVisibility(View.VISIBLE);
-			searchEdit.clearFocus();
+			focusThing.requestFocus();
 			searchEdit.setText("");
 			lp.addRule(RelativeLayout.END_OF, R.id.btn_back);
 			getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);

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

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

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -82,9 +81,9 @@ public class InstanceRulesFragment 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/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/ReportCommentFragment.java

@@ -9,6 +9,7 @@ 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;
@@ -28,15 +29,17 @@ 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;
+	private View buttonBar, forwardReportItem;
+	private TextView forwardReportText;
+	private Switch forwardReportSwitch;
 	private EditText commentEdit;
+	private boolean forwardReport;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -77,7 +80,17 @@ 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;
 	}
 
@@ -102,7 +115,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(), true)
+		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), forwardReport)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){
@@ -123,6 +136,11 @@ 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/ScheduledStatus.java

@@ -66,7 +66,7 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         s.id = id;
         s.mediaAttachments = mediaAttachments;
         s.createdAt = scheduledAt;
-        s.inReplyToId = params.inReplyToId > 0 ? "" + params.inReplyToId : null;
+        s.inReplyToId = "" + params.inReplyToId;
         s.content = s.text = params.text;
         s.spoilerText = params.spoilerText;
         s.visibility = params.visibility;

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

@@ -20,7 +20,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Instant createdAt;
 	@RequiredField
 	public Account account;
-	//	@RequiredField
+//	@RequiredField
 	public String content;
 	@RequiredField
 	public StatusPrivacy visibility;

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

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

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

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

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

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

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

@@ -4,6 +4,7 @@ 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;
 
@@ -31,8 +32,16 @@ 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(18));
+				title.setPadding(pad, pad, pad, V.dp(12));
 			}
 		}
 		int titleDividerID=getContext().getResources().getIdentifier("titleDividerNoCustom", "id", "android");

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

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

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -99,13 +98,8 @@ 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_24_regular;
+				case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
 			});
-
-			visibility.setContentDescription(UiUtils.getVisibilityText(s));
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				visibility.setTooltipText(visibility.getContentDescription());
-			}
 		}
 
 		@Override

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

@@ -15,9 +15,6 @@ import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.RotateAnimation;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -61,8 +58,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private final TextView reply, boost, favorite, bookmark;
 		private final ImageView share;
 		private static final Animation opacityOut, opacityIn;
-		private static AnimationSet animSet;
-
 
 		private View touchingView = null;
 		private boolean longClickPerformed = false;
@@ -91,15 +86,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			opacityIn = new AlphaAnimation(0.55f, 1);
 			opacityIn.setDuration(400);
 			opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
-			Animation spin = new RotateAnimation(0, 360,
-					Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF,
-					0.5f);
-
-			animSet = new AnimationSet(true);
-			animSet.setInterpolator(CubicBezierInterpolator.DEFAULT);
-			animSet.addAnimation(spin);
-			animSet.addAnimation(opacityIn);
-			animSet.setDuration(400);
 		}
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -310,15 +296,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		private void onFavoriteClick(View v){
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
-				if (item.status.favourited) {
-					if(GlobalUserPreferences.reduceMotion){
-						v.startAnimation(opacityIn);
-					}else{
-						v.startAnimation(animSet);
-					}
-				} else {
-					v.startAnimation(opacityIn);
-				}
+				v.startAnimation(opacityIn);
 				bindButton(favorite, r.favouritesCount);
 			});
 		}
@@ -385,4 +363,4 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			return 0;
 		}
 	}
-}
+}

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

@@ -9,8 +9,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.ImageSpan;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -137,7 +135,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView name, username, timestamp, extraText, separator;
-		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, botIcon;
+		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -160,7 +158,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			visibility=findViewById(R.id.visibility);
 			deleteNotification=findViewById(R.id.delete_notification);
 			unreadIndicator=findViewById(R.id.unread_indicator);
-			botIcon=findViewById(R.id.bot_icon);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
@@ -285,24 +282,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(HeaderStatusDisplayItem item){
 			name.setText(item.parsedName);
 			username.setText('@'+item.user.acct);
-			botIcon.setVisibility(item.user.bot ? View.VISIBLE : View.GONE);
-			botIcon.setColorFilter(username.getCurrentTextColor());
 			separator.setVisibility(View.VISIBLE);
 
-//			if(item.user.bot){
-//				SpannableStringBuilder ssb = new SpannableStringBuilder();
-//				ssb.append('@'+item.user.acct);
-//				ssb.append(" ");
-//				Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, itemView.getContext().getTheme()).mutate();
-//				botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
-//				botIcon.setTint(username.getCurrentTextColor());
-//				ssb.append(itemView.getContext().getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
-//				username.setPaddingRelative(0,0,16,0);
-//				username.setText(ssb);
-//			}
-
-//			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
-
 			if (item.scheduledStatus!=null)
 				if (item.scheduledStatus.scheduledAt.isAfter(CreateStatus.DRAFTS_AFTER_INSTANT)) {
 					timestamp.setText(R.string.sk_draft);

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

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

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

@@ -12,6 +12,7 @@ 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;
@@ -24,6 +25,7 @@ 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;
@@ -40,16 +42,14 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
-	public boolean disableTranslate;
 	public boolean translated = false;
 	public TranslatedStatus translation = null;
 	private AccountSession session;
 
-	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
+	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status){
 		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
-		this.disableTranslate=disableTranslate;
 		emojiHelper.setText(text);
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
@@ -83,7 +83,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 Drawable backgroundColor, borderColor;
+		private final int backgroundColor, borderColor;
 		private final Button translateButton;
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -101,28 +101,22 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			translateInfo=findViewById(R.id.translate_info);
 			translateProgress=findViewById(R.id.translate_progress);
 			itemView.setOnClickListener(v->item.parentFragment.onRevealSpoilerClick(this));
-
-			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);
+			backgroundColor=UiUtils.getThemeColor(activity, R.attr.colorBackgroundLight);
+			borderColor=UiUtils.getThemeColor(activity, R.attr.colorPollVoted);
 		}
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
 			text.setText(item.translated
-					? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
-					: item.text);
+							? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
+							: item.text);
 			text.setTextIsSelectable(item.textSelectable);
 			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
-			spoilerTitleInline.setBackground(item.inset ? null : backgroundColor);
+			spoilerTitleInline.setBackgroundColor(item.inset ? 0 : backgroundColor);
 			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
-			borderTop.setBackground(item.inset ? null : borderColor);
-			borderBottom.setBackground(item.inset ? null : borderColor);
+			borderTop.setBackgroundColor(item.inset ? 0 : borderColor);
+			borderBottom.setBackgroundColor(item.inset ? 0 : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
 				spoilerTitleInline.setText(item.parsedSpoilerText);
@@ -145,10 +139,11 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			}
 
 			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
-			boolean translateEnabled = !item.disableTranslate && instanceInfo.v2 != null &&
-					instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
+			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
 
-			translateWrap.setVisibility(translateEnabled &&
+			translateWrap.setVisibility(
+					(!GlobalUserPreferences.translateButtonOpenedOnly || item.textSelectable) &&
+					translateEnabled &&
 					!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&
 					item.status.language != null &&
 					(item.session.preferences == null || !item.status.language.equalsIgnoreCase(item.session.preferences.postingDefaultLanguage))

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

@@ -27,7 +27,6 @@ public class ClickableLinksDelegate {
 		if (selectedSpan != null) selectedSpan.onLongClick(view);
 	};
 
-
 	public ClickableLinksDelegate(TextView view) {
 		this.view=view;
 		hlPaint=new Paint();

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

@@ -111,7 +111,7 @@ public class HtmlParser{
 			@Override
 			public void head(@NonNull Node node, int depth){
 				if(node instanceof TextNode textNode){
-					ssb.append(textNode.text());
+					ssb.append(textNode.getWholeText());
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {

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

@@ -1,10 +1,8 @@
 package org.joinmastodon.android.ui.text;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
-import android.util.Log;
 import android.view.View;
 
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -34,7 +32,7 @@ public class LinkSpan extends CharacterStyle {
 	public void updateDrawState(TextPaint tp) {
 		tp.setColor(color=tp.linkColor);
 	}
-
+	
 	public void onClick(Context context){
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link);
@@ -44,14 +42,7 @@ public class LinkSpan extends CharacterStyle {
 	}
 
 	public void onLongClick(View view) {
-		if (getType() == Type.URL) {
-            Intent shareIntent = new Intent(Intent.ACTION_SEND)
-                    .setType("text/plain")
-                    .putExtra(Intent.EXTRA_TEXT, link);
-			view.getContext().startActivity(Intent.createChooser(shareIntent, null));
-		} else {
-			UiUtils.copyText(view, text);
-		}
+		UiUtils.copyText(view, getType() == Type.URL ? link : text);
 	}
 
 	public String getLink(){

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

@@ -25,8 +25,7 @@ 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.NORD, new ColorPalette(R.style.ColorPalette_Nord)
+            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
     );
 
     private @StyleRes int base;

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

@@ -31,6 +31,7 @@ import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.HapticFeedbackConstants;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -87,6 +88,7 @@ import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.parceler.Parcels;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -111,6 +113,8 @@ import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -913,17 +917,17 @@ public class UiUtils{
 		}
 
 		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 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);
-					}
-				})
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(context);
+			}
+		})
 				.wrapProgress((Activity)context, R.string.loading, true,
 						d -> transformDialogForLookup(context, targetAccountID, null, d))
 				.exec(targetAccountID);
@@ -1051,12 +1055,18 @@ public class UiUtils{
 		}
 	}
 
-	public static String getVisibilityText(Status status) {
-		return MastodonApp.context.getString(switch (status.visibility) {
-			case PUBLIC -> R.string.visibility_public;
-			case UNLISTED -> R.string.sk_visibility_unlisted;
-			case PRIVATE -> R.string.visibility_followers_only;
-			case DIRECT -> R.string.visibility_private;
-		});
+	// https://github.com/tuskyapp/Tusky/pull/3148
+	public static void reduceSwipeSensitivity(ViewPager2 pager) {
+		try {
+			Field recyclerViewField = ViewPager2.class.getDeclaredField("mRecyclerView");
+			recyclerViewField.setAccessible(true);
+			RecyclerView recyclerView = (RecyclerView) recyclerViewField.get(pager);
+			Field touchSlopField = RecyclerView.class.getDeclaredField("mTouchSlop");
+			touchSlopField.setAccessible(true);
+			int touchSlop = touchSlopField.getInt(recyclerView);
+			touchSlopField.set(recyclerView, touchSlop * 3);
+		} catch (Exception ex) {
+			Log.e("reduceSwipeSensitivity", Log.getStackTraceString(ex));
+		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java

@@ -50,8 +50,8 @@ public abstract class GithubSelfUpdater{
 	}
 
 	public static class UpdateInfo{
-		public String changelog;
 		public String version;
+		public String changelog;
 		public long size;
 	}
 }

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

@@ -7,7 +7,6 @@ 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/res/color/bookmark_icon.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="?bookmark_selected" android:state_selected="true"/>
+	<item android:color="@color/bookmark_selected" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>

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="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorPollVoted"/>
+	<item android:color="?attr/colorButtonBackgroundPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
 </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="?colorSecondary" android:state_enabled="true"/>
-	<item android:color="?colorPollVoted"/>
+	<item android:color="?colorButtonBackgroundPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundPrimaryLightOnDarkDisabled"/>
 </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="?colorBackgroundLightest" android:state_enabled="true"/>
-	<item android:color="?android:colorBackground"/>
+	<item android:color="?colorButtonBackgroundSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundSecondaryDarkOnLightDisabled"/>
 </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="?colorPollVoted" android:state_enabled="true"/>
-	<item android:color="?colorSearchHint"/>
+	<item android:color="?colorButtonBackgroundSecondaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonBackgroundSecondaryLightOnDarkDisabled"/>
 </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="?colorSecondary" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextPrimaryDarkOnLightDisabled"/>
 </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="@color/black" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextPrimaryLightOnDarkDisabled"/>
 </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="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorTabInactive"/>
+	<item android:color="?colorButtonTextSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorButtonTextSecondaryDarkOnLightDisabled"/>
 </selector>

mastodon/src/main/res/color/favorite_icon.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="?favorite_selected" android:state_selected="true"/>
+	<item android:color="@color/favorite_selected" android:state_selected="true"/>
 	<item android:color="?android:textColorSecondary"/>
 </selector>

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

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

@@ -1,22 +0,0 @@
-<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,18 +1,5 @@
-<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 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>

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

@@ -2,9 +2,9 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
 	<item>
 		<shape>
-			<solid android:color="?android:colorAccent"/>
-			<corners android:radius="16dp"/>
-			<padding android:left="16dp" android:right="16dp"/>
+			<solid android:color="?colorPrimary800"/>
+			<corners android:radius="16sp"/>
+			<padding android:left="16sp" android:right="16sp"/>
 		</shape>
 	</item>
 </ripple>

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

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

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

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

mastodon/src/main/res/drawable/ic_fluent_arrow_autofit_down_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="M13.22 17.219c-0.267 0.266-0.29 0.683-0.073 0.976l0.073 0.084 2.367 2.37C15.713 20.859 15.963 21 16.251 21c0.252 0 0.475-0.109 0.611-0.276l0.053-0.075 2.367-2.37 0.073-0.084c0.193-0.26 0.196-0.619 0.007-0.882l-0.08-0.094-0.084-0.073c-0.261-0.193-0.62-0.196-0.883-0.007l-0.094 0.08L17 18.44V3.656l-0.007-0.089C16.943 3.247 16.63 3 16.25 3s-0.694 0.247-0.743 0.567L15.5 3.657V18.44l-1.22-1.221-0.084-0.073c-0.293-0.218-0.71-0.193-0.976 0.073zm-6.97 2.789C5.007 20.008 4 19 4 17.758v-11.5c0-1.243 1.007-2.25 2.25-2.25h6c0.414 0 0.75 0.336 0.75 0.75s-0.336 0.75-0.75 0.75h-6c-0.414 0-0.75 0.336-0.75 0.75v11.5c0 0.414 0.336 0.75 0.75 0.75h4c0.414 0 0.75 0.336 0.75 0.75s-0.336 0.75-0.75 0.75h-4z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

mastodon/src/main/res/drawable/ic_fluent_arrow_circle_up_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="M7.47 12.28l0.084 0.073c0.294 0.218 0.71 0.193 0.977-0.073l2.72-2.72v6.69l0.007 0.102C11.308 16.718 11.62 17 12 17l0.101-0.006c0.367-0.05 0.649-0.364 0.649-0.744V9.56l2.72 2.722 0.084 0.072c0.294 0.218 0.71 0.194 0.977-0.072 0.293-0.293 0.293-0.768 0-1.06l-4-4.002-0.084-0.073c-0.294-0.218-0.71-0.194-0.977 0.073l-4 4-0.073 0.085c-0.218 0.293-0.194 0.71 0.072 0.976zM22.001 12c0-5.523-4.477-10-10-10s-10 4.477-10 10 4.477 10 10 10 10-4.477 10-10zm-18.5 0c0-4.694 3.806-8.5 8.5-8.5s8.5 3.806 8.5 8.5-3.806 8.5-8.5 8.5-8.5-3.806-8.5-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.723 16.221c-0.293 0.293-0.293 0.768 0 1.06 0.293 0.294 0.768 0.293 1.061 0l4.997-5.003c0.292-0.293 0.292-0.768 0-1.06L15.783 6.22c-0.293-0.293-0.768-0.293-1.06 0-0.294 0.293-0.294 0.767-0.001 1.06l3.72 3.72H10.6c-1.595 0-2.81 0.242-3.889 0.764L6.466 11.89c-1.109 0.593-1.983 1.467-2.576 2.576C3.28 15.606 3 16.884 3 18.6c0 0.414 0.336 0.75 0.75 0.75S4.5 19.014 4.5 18.6c0-1.484 0.228-2.52 0.713-3.428 0.453-0.847 1.113-1.507 1.96-1.96 0.838-0.448 1.786-0.676 3.094-0.709L10.6 12.5h7.837l-3.715 3.721z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -3,21 +3,21 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:pathData="M9,9.123C7.423,9.123 6.125,10.421 6.125,11.994C6.125,12.523 6.269,13.014 6.514,13.434C6.514,13.435 6.513,13.436 6.514,13.438L6.619,13.607L6.623,13.613C6.666,13.679 6.706,13.747 6.744,13.816L7.787,12.775C9.015,11.549 10.977,11.548 12.205,12.775C12.789,13.359 13.077,14.104 13.105,14.863L15.002,14.863C16.579,14.863 17.875,13.567 17.875,11.992C17.875,11.463 17.731,10.972 17.486,10.553L17.486,10.549L17.381,10.379C17.337,10.311 17.295,10.241 17.256,10.17L16.215,11.211C14.986,12.439 13.025,12.44 11.797,11.213C11.218,10.634 10.931,9.885 10.902,9.123L9,9.123z"
-        android:strokeWidth="3"
-        android:fillColor="#212121"/>
-    <path
-        android:pathData="M20.787,8.06C20.603,7.828 20.319,7.678 20,7.678c-0.552,0 -1,0.447 -1,0.999 0,0.208 0.064,0.401 0.172,0.561C19.695,10.028 20,10.975 20,11.993c0,2.759 -2.238,4.996 -4.999,4.996l-5.586,-0.001 1.294,-1.291 0.084,-0.095c0.281,-0.362 0.279,-0.872 -0.006,-1.231L10.709,14.284 10.614,14.2C10.252,13.92 9.741,13.922 9.382,14.206L9.294,14.284 6.289,17.287 6.206,17.382c-0.281,0.362 -0.279,0.872 0.006,1.231l0.078,0.087 3.005,3.003 0.094,0.083c0.392,0.305 0.96,0.277 1.32,-0.083 0.363,-0.362 0.389,-0.934 0.078,-1.326l-0.078,-0.087 -1.304,-1.303 5.596,0.001 0.241,-0.004C18.996,18.857 22,15.776 22,11.993 22,10.534 21.552,9.178 20.787,8.057Z"
-        android:fillColor="#212121"/>
-    <path
-        android:pathData="M14.712,2.289 L14.625,2.211C14.233,1.901 13.661,1.926 13.298,2.289L13.22,2.376C12.91,2.768 12.936,3.34 13.298,3.702l1.299,1.297 -5.598,0 -0.241,0.004C5.004,5.13 2,8.211 2,11.993c0,1.445 0.438,2.787 1.189,3.898 0.182,0.251 0.477,0.415 0.811,0.415 0.552,0 1,-0.447 1,-0.999C5,15.091 4.931,14.891 4.815,14.729L4.68,14.511C4.248,13.772 4,12.911 4,11.993 4,9.234 6.238,6.998 8.999,6.998L14.595,6.998 13.298,8.295 13.22,8.382c-0.311,0.392 -0.285,0.964 0.078,1.326 0.391,0.39 1.024,0.39 1.414,0L17.718,6.705 17.795,6.618C18.106,6.226 18.08,5.654 17.718,5.292Z"
-        android:strokeWidth="3"
-        android:fillColor="#212121"/>
-    <path
-        android:pathData="M20.11,5.619L20.11,5.619A1.393,0.037 0,0 1,21.503 5.656L21.503,5.656A1.393,0.037 0,0 1,20.11 5.693L20.11,5.693A1.393,0.037 0,0 1,18.717 5.656L18.717,5.656A1.393,0.037 0,0 1,20.11 5.619z"
-        android:strokeWidth="52.513"
-        android:fillColor="#613583"
-        android:fillType="evenOdd"
-        android:fillAlpha="0.0156863"/>
+  <path
+      android:pathData="M9,9.123C7.423,9.123 6.125,10.421 6.125,11.994C6.125,12.523 6.269,13.014 6.514,13.434C6.514,13.435 6.513,13.436 6.514,13.438L6.619,13.607L6.623,13.613C6.666,13.679 6.706,13.747 6.744,13.816L7.787,12.775C9.015,11.549 10.977,11.548 12.205,12.775C12.789,13.359 13.077,14.104 13.105,14.863L15.002,14.863C16.579,14.863 17.875,13.567 17.875,11.992C17.875,11.463 17.731,10.972 17.486,10.553L17.486,10.549L17.381,10.379C17.337,10.311 17.295,10.241 17.256,10.17L16.215,11.211C14.986,12.439 13.025,12.44 11.797,11.213C11.218,10.634 10.931,9.885 10.902,9.123L9,9.123z"
+      android:strokeWidth="3"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M20.787,8.06C20.603,7.828 20.319,7.678 20,7.678c-0.552,0 -1,0.447 -1,0.999 0,0.208 0.064,0.401 0.172,0.561C19.695,10.028 20,10.975 20,11.993c0,2.759 -2.238,4.996 -4.999,4.996l-5.586,-0.001 1.294,-1.291 0.084,-0.095c0.281,-0.362 0.279,-0.872 -0.006,-1.231L10.709,14.284 10.614,14.2C10.252,13.92 9.741,13.922 9.382,14.206L9.294,14.284 6.289,17.287 6.206,17.382c-0.281,0.362 -0.279,0.872 0.006,1.231l0.078,0.087 3.005,3.003 0.094,0.083c0.392,0.305 0.96,0.277 1.32,-0.083 0.363,-0.362 0.389,-0.934 0.078,-1.326l-0.078,-0.087 -1.304,-1.303 5.596,0.001 0.241,-0.004C18.996,18.857 22,15.776 22,11.993 22,10.534 21.552,9.178 20.787,8.057Z"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M14.712,2.289 L14.625,2.211C14.233,1.901 13.661,1.926 13.298,2.289L13.22,2.376C12.91,2.768 12.936,3.34 13.298,3.702l1.299,1.297 -5.598,0 -0.241,0.004C5.004,5.13 2,8.211 2,11.993c0,1.445 0.438,2.787 1.189,3.898 0.182,0.251 0.477,0.415 0.811,0.415 0.552,0 1,-0.447 1,-0.999C5,15.091 4.931,14.891 4.815,14.729L4.68,14.511C4.248,13.772 4,12.911 4,11.993 4,9.234 6.238,6.998 8.999,6.998L14.595,6.998 13.298,8.295 13.22,8.382c-0.311,0.392 -0.285,0.964 0.078,1.326 0.391,0.39 1.024,0.39 1.414,0L17.718,6.705 17.795,6.618C18.106,6.226 18.08,5.654 17.718,5.292Z"
+      android:strokeWidth="3"
+      android:fillColor="#212121"/>
+  <path
+      android:pathData="M20.11,5.619L20.11,5.619A1.393,0.037 0,0 1,21.503 5.656L21.503,5.656A1.393,0.037 0,0 1,20.11 5.693L20.11,5.693A1.393,0.037 0,0 1,18.717 5.656L18.717,5.656A1.393,0.037 0,0 1,20.11 5.619z"
+      android:strokeWidth="52.513"
+      android:fillColor="#613583"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.0156863"/>
 </vector>

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

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

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

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

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-    <path
-        android:pathData="M12,5.5C11.448,5.5 11,5.948 11,6.5C11,7.052 11.448,7.5 12,7.5C12.552,7.5 13,7.052 13,6.5C13,5.948 12.552,5.5 12,5.5ZM7,6.5C7,5.948 7.448,5.5 8,5.5C8.552,5.5 9,5.948 9,6.5C9,7.052 8.552,7.5 8,7.5C7.448,7.5 7,7.052 7,6.5ZM10.5,2.5C10.5,2.224 10.276,2 10,2C9.724,2 9.5,2.224 9.5,2.5V3H6.5C5.672,3 5,3.672 5,4.5V8.5C5,9.328 5.672,10 6.5,10H13.5C14.328,10 15,9.328 15,8.5V4.5C15,3.672 14.328,3 13.5,3H10.5V2.5ZM6.5,4H13.5C13.776,4 14,4.224 14,4.5V8.5C14,8.776 13.776,9 13.5,9H6.5C6.224,9 6,8.776 6,8.5V4.5C6,4.224 6.224,4 6.5,4ZM10.25,17.998C12.866,17.965 14.445,17.403 15.372,16.557C16.247,15.759 16.461,14.781 16.495,14.002H16.5V13.312C16.5,12.313 15.69,11.503 14.691,11.503H11.5V11.5H8.5V11.503H5.309C4.31,11.503 3.5,12.313 3.5,13.312V14.002H3.505C3.539,14.781 3.753,15.759 4.628,16.557C5.555,17.403 7.134,17.965 9.75,17.998V18H10.25V17.998ZM5.309,12.503H14.691C15.138,12.503 15.5,12.865 15.5,13.312V13.75C15.5,14.44 15.369,15.206 14.698,15.819C14.01,16.446 12.66,17 10,17C7.339,17 5.99,16.446 5.302,15.819C4.631,15.206 4.5,14.44 4.5,13.75V13.312C4.5,12.865 4.862,12.503 5.309,12.503Z"
-        android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17.753,14a2.25,2.25 0,0 1,2.25 2.25v0.905a3.75,3.75 0,0 1,-1.307 2.846C17.13,21.345 14.89,22 12,22c-2.89,0 -5.128,-0.656 -6.691,-2a3.75,3.75 0,0 1,-1.306 -2.843v-0.908A2.25,2.25 0,0 1,6.253 14h11.5ZM11.898,2.008 L12,2a0.75,0.75 0,0 1,0.743 0.648l0.007,0.102L12.75,3.5h3.5a2.25,2.25 0,0 1,2.25 2.25v4.505a2.25,2.25 0,0 1,-2.25 2.25h-8.5a2.25,2.25 0,0 1,-2.25 -2.25L5.5,5.75A2.25,2.25 0,0 1,7.75 3.5h3.5v-0.749a0.75,0.75 0,0 1,0.648 -0.743L12,2l-0.102,0.007ZM9.75,6.5a1.25,1.25 0,1 0,0 2.5,1.25 1.25,0 0,0 0,-2.5ZM14.243,6.5a1.25,1.25 0,1 0,0 2.499,1.25 1.25,0 0,0 0,-2.499Z"
-      android:fillColor="?android:textColorPrimary"/>
-</vector>