bump version

Add note on contributions and trademarks to README

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+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
+issuehunt: # Replace with a single IssueHunt username e.g., user1
+otechie: # Replace with a single Otechie username e.g., user1
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -1,13 +1,14 @@
-![Pink version of the Mastodon for Android launcher icon](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)
 
-# Mastodos
+# Megalodon
 
 > 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, bookmarks and an image description viewer.
 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/mastodos/releases/latest/download/mastodos.apk)
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
 
 ---
 
+
 ## Key features
 
 ### **Unlisted posting**
@@ -46,53 +47,81 @@ To bookmark a post, press the button between the Favorite and Share buttons on t
 
 ## Installation
 
-**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Mastodos will automatically notify you about new updates inside the app.**
+**Press the download button above 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.**
 
-To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/mastodos/releases/latest/download/mastodos.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/sk22/mastodos/releases) page.
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/megalodon/releases/latest/download/megalodon.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/sk22/megalodon/releases) page.
 
-Mastodos makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Mastodos 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!
+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!
+
+### Other sources
+
+* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk
 
 ---
 
+
+## Release variants
+
+All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
+
+**`megalodon.apk`**
+
+Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
+
+**`upstream-1234abc.apk`**
+
+This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
+
+<!-- **`megalodon-fdroid.apk`**
+
+Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
+
+---
+
+
 ## Detailed changes
 
 ### Features
 
-* [Add “Unlisted” as a post visibility option](https://github.com/sk22/mastodos/commits/feature/enable-unlisted)
+* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
   ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* [Add “Federation” tab and change Discover tab order](https://github.com/sk22/mastodos/commits/feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
-* [Add image description button and viewer](https://github.com/sk22/mastodos/commits/feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
-* [Implement pinning posts and displaying pinned posts](https://github.com/sk22/mastodos/commits/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
-* [Implement deleting and re-drafting](https://github.com/sk22/mastodos/commits/feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
-* [Implement a bookmark button and list](https://github.com/sk22/mastodos/commits/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/sk22/mastodos/commits/feature/check-for-update-button)
-* [Add “Mark media as sensitive” option](https://github.com/sk22/mastodos/commits/feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reposts from the timeline](https://github.com/sk22/mastodos/commits/feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
-* [Follow and unfollow hashtags](https://github.com/sk22/mastodos/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
-* [Notification bell for posts](https://github.com/sk22/mastodos/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
-* [Viewing lists and adding/removing users from lists](https://github.com/sk22/mastodos/commits/list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
-* [List favorited posts](https://github.com/sk22/mastodos/commits/feature/favs-list)
-* [Accept/reject follow requests](https://github.com/sk22/mastodos/commits/feature/follow-requests)
-* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
+* [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
+* [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+* [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
+* [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))
+* [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)
+* [List favorited posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/favs-list)
+* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/follow-requests)
+* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
+* [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)
+* [Long-click to copy username from profile](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/copy-username)
+
 
 ### Behavior
 
-* [Make back button return to the home tab before exiting the app](https://github.com/sk22/mastodos/commits/feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
-* [Always preserve content warnings when replying](https://github.com/sk22/mastodos/commits/feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
-* [Display full image when adding image description](https://github.com/sk22/mastodos/commits/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
-* [Set spoiler height independently to content height](https://github.com/sk22/mastodos/commits/spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
-* [Custom extended footer redesign](https://github.com/sk22/mastodos/commits/compact-extended-footer)
-* [Option to hide interaction numbers](https://github.com/sk22/mastodos/commits/settings/hide-interaction-numbers)
-* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
+* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
+* [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
+* [Display full image when adding image description](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Set spoiler height independently to content height](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
+* [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)
 
-### Branding
 
-* App name “Mastodos”
-* Pink primary color
-* Custom icon: Modulate upstream icon using ImageMagick
-  ```bash
-  mogrify -modulate 90,100,140 mastodon/src/main/res/mipmap-*/ic_launcher*.png
-  ```
+### Visual
+
+* [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)
+
 
 ## Building
 
@@ -105,3 +134,7 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth
 ## License
 
 This project is released under the [GPL-3 License](./LICENSE).
+
+## Links
+
+<a rel="me" href="https://floss.social/@megalodon">@megalodon​@floss.social</a>

_config.yml

@@ -1,2 +1,2 @@
-title: Mastodos
-theme: minima
+title: Megalodon
+layout: default

_layouts/default.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Megalodon</title>
+    <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">
+  </head>
+  <body class="markdown-body">
+    <div style="margin: 0 auto; max-width: 45rem; padding: 2rem 1rem">
+      {{ content }}  
+    </div>
+  </body>
+</html>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath "com.android.tools.build:gradle:7.1.3"
+		classpath 'com.android.tools.build:gradle:7.3.1'
 		classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files

fastlane/metadata/android/be-BY/full_description.txt

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

fastlane/metadata/android/be-BY/short_description.txt

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

fastlane/metadata/android/be-BY/title.txt

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

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

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

fastlane/metadata/android/en-US/full_description.txt

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

fastlane/metadata/android/ga-IE/full_description.txt

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

fastlane/metadata/android/ga-IE/short_description.txt

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

fastlane/metadata/android/ga-IE/title.txt

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

fastlane/metadata/android/gd-GB/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is the largest decentralized social network on the internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+’S e an lìonra sòisealta sgaoilte as motha air an eadar-lìon a th’ ann am Mastodon. Seach aon làrach-lìn a-mhàin, ’s e lìonra de mhilleanan de dhaoine ann an coimhearsnachdan neo-eisimeileach a th’ ann agus ’s urrainn dhan a h-uile duine bruidhinn ri chèile fhathast gun duilgheadas. Ge b’ e dè na rudan a tha ùidh agad annta, coinnichidh tu ri daoine a sgrìobhas mun dèidhinn air Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Find new accounts to follow and trending hashtags to expand your network.
+Faigh ballrachd ann an coimhearsnachd ’s cruthaich pròifil dhut. Lorg is lean daoine inntinneach agus leugh na postaichean aca air loidhne-ama cheart gun sanasachd. Cuir thu fhèin an cèill le Emojis gnàthaichte, dealbhan, GIFs, videothan is fuaimean ann am postaichean le 500 caractar. Freagair ri snàithleanan is brosnaich postaichean le neach sam bith airson deagh rudan a cho-roinneadh. Lorg cunntasan ùra ri leantainn is tagaichean hais a’ treandadh airson an lìonra agad a leudachadh.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Chaidh Mastodon a thogail leis an aire air prìobhaideachd is sàbhailteachd. Tha e an urra riut fhèin an co-roinn thu post leis an luchd-leantainn agad, leis na daoine air an doir thu iomradh a-mhàin no leis an t-saoghal mhòr. Leigidh rabhaidhean susbainte leat postaichean sa bheil susbaint fhrionasach fhalach is cha leig daoine leas coimhead air ach nuair a bhios iad deònach. Tha riaghailtean is maoir fa leth aig gach coimhearsnachd airson a buill a chumail sàbhailte agus cuidichidh innealan bacaidh is gearain le dìon o dhroch-dhìol.
 
-More features:
+Gleusan eile:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Modh dorcha: Leugh postaichean le modh soilleir, dorcha no dubh dorcha
+• Cunntasan-bheachd: Faighnich dhen luchd-leantainn dè am beachd is faigh cunntas nam bhòt
+• Rùraich: Ruig tagaichean hais is cunntasan a’ treandadh le aon ghnogag
+• Brathan: Faigh brathan mu luchd-leantainn, freagairtean is brosnachaidhean ùra
+• Co-roinn: Postaich gu Mastodon gu dìreach o shiota co-roinnidh ann an aplacaid sam bith
+• Stampachd: ’S e ailbhean ealanta a tha san t-suaichnean againn is nochdaidh e o àm gu àm
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+’S e bhuidheann neo-phrothaideach clàraichte a th’ ann am Mastodon a gheibh taic dhìreach o na tabhartasan agad. Chan eil sanasachd, airgeadachadh no calpa iomairte sam bith ann agus tha fainear dhuinn ’ga chumail mar sin.

fastlane/metadata/android/gd-GB/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Lìonra sòisealta sgaoilte

fastlane/metadata/android/id-ID/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon adalah jejaring sosial terdesentralisasi terbesar di internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon adalah jejaring sosial terdesentralisasi terbesar di internet. Daripada sebuah satu situs web, ini adalah jaringan dari jutaan pengguna dalam komunitas tersendiri yang dapat berinteraksi antar sesama, tanpa masalah. Tanpa memedulikan apa yang Anda minat, Anda dapat bertemu orang-orang yang mengirimkan apa yang mereka minat di Mastodon!
 
-Join a community and create your profile. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Reply to threads and reblog posts from anyone to share great stuff. Temukan akun-akun baru untuk diikuti dan hashtag yang sedang tren untuk memperluas jejaring Anda.
+Bergabung sebuah komunitas dan buat profil Anda. Temukan dan ikuti orang-orang menarik dan lihat kiriman mereka dalam linimasa kronologis tanpa iklan. Ekspresikan diri Anda dengan emoji kustom, gambar, GIF, video, dan audio dalam kiriman dengan batasan 500 karakter. Balas ke utasan dan bagikan kiriman dari siapa pun ke pengikut Anda untuk membagikan hal-hal yang keren. Temukan akun baru untuk diikuti dan tagar yang sedang tren untuk memperluas jejaring Anda.
 
-Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah postingan Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon dibuat dengan fokus pada privasi dan keamanan. Tentukan apakah kiriman Anda dibagikan kepada pengikut, hanya orang yang disebut, atau seluruh dunia. Peringatan konten memungkinkan Anda untuk menyembunyikan kiriman yang berisi material sensitif atau memicu sampai Anda siap untuk terlibat dengan mereka. Setiap komunitas memiliki pedoman dan moderator sendiri-sendiri untuk menjaga anggotanya aman, dan alat pemblokiran dan pelaporan yang kokoh membantu mencegah pelecehan.
 
 Fitur lainnya:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
-• Notifications: Get notified about new follows, replies, and reblogs
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Mode Gelap: Baca kiriman dalam mode terang, gelap, atau gelap asli
+• Pemungutan suara: Tanya pengikut tentang opini mereka dan hitung pilihannya
+• Jelajahi: Tagar dan akun tren dengan satu ketuk
+• Pemberitahuan: Dapatkan pemberitahuan tentang pengikut, balasan, dan pembagian baru
+• Pembagian: Kirim langsung ke Mastodon dari lembar pembagian apa pun dalam aplikasi apa pun
+• Kelucuan: Maskot kami adalah seekor gajah yang lucu, dan Anda akan melihat dia muncul dari waktu ke waktu
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon adalah nirlaba yang terdaftar dan pengembangan didukung secara langsung dari donasi Anda. Tanpa periklanan, tanpa monetisasi, dan tanpa kapitalisme ventura, dan kami berencana untuk tetap seperti itu.

fastlane/metadata/android/is-IS/full_description.txt

@@ -0,0 +1,30 @@
+Mastodon er stærsta ómiðstýrða samfélagsnetið á internetinu. Í staðinn fyrir að vera á inu vefsvæði, er þetta net með milljónum notenda í 
+sjálfstæðum samfélögum, sem geta óhindrað átt í samskiptum við hvern annan. Sama hvað þú ert að pæla, alltaf geturðu hitt áhugasamt fólk í gegnum 
+færslur á Mastodon!
+
+Taktu þátt í samfélagi og útbúðu notandasnið fyrir þig. Finndu og fylgstu með áhugaverðu fólki og lestu færslurnar þeirra á 
+auglýsingalausri, raðaðri tímalínu. Tjáðu þig með sérsniðnum emoji-táknum, myndum, GIF-hreyfimyndum, myndskeiðum 
+og hljóðskrám í 500-stafa færslum. Svaraðu spjallþráðum og endurbirtu færslur frá hverjum sem er til að deila 
+frábæru efni. Finndu nýja notendur til að fylgjast með og skoðaðu vinsæl myllumerki til að 
+útvíkka netið þitt.
+
+Mastodon er byggt með áherslu á gagnaleynd og öryggi. Ákveddu hvort færslunum þínum sé deilt með þeim sem fylgjast með þér, aðeins 
+fólkinu sem þú minnist á, eða allri veröldinni. Viðvaranir vegna efnis gera þér kleift að fela færslur sem innihalda 
+viðkvæmt eða eldfimt efni þangað til þú ert í stuði til að eiga við slíkt. Hvert samfélag er með sínar eigin reglur og umsjónarmenn til að passa upp á 
+öryggi meðlimanna, auk áreiðanlegra verkfæra til að útiloka aðila og 
+meðhöndla kærur, sem hjálpar til við að koma í veg fyrir misnotkun.
+
+Fleiri eiginleikar:
+
+• Dökkur hamur: Lestu færslur í ljósum, dökkum eða sönnum kolsvörtum ham
+• Kannanir: Spyrðu fylgjendur um skoðanir þeirra og teldu atkvæðin
+• Uppgötva: Vinsæl myllumerki og notendaaðgangar eru við hendina
+• Tilkynningar: Fáðu tilkynningar um nýja fylgjendur, svör og endurbirtingar
+• Deiling: Birtu beint á Mastodon frá hvaða deilingarblaði sem er í hvaða 
+forriti sem er
+• Krúttlegheit: Gæludýrið okkar er vinalegur loðfíll sem þú gætir rekist á 
+öðru hverju
+
+Mastodon er skráð óhagnaðardrifin sjálfseignarstofnun og er þróun þess 
+drifin áfram með styrkjum frá þér. Það eru engar auglýsingar, engin gjaldtaka og engir áhættufjárfestar - við 
+höfum hugsað okkur að halda því þannig.

fastlane/metadata/android/is-IS/short_description.txt

@@ -0,0 +1 @@
+Dreifstýrt samfélagsnet

fastlane/metadata/android/is-IS/title.txt

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

fastlane/metadata/android/nl-NL/full_description.txt

@@ -1,16 +1,16 @@
-Mastodon is het grootste gedecentraliseerde sociale netwerk op het internet. Instead of a single website, it’s a network of millions of users in independent communities that can all interact with one another, seamlessly. No matter what you’re into, you can meet passionate people posting about it on Mastodon!
+Mastodon is het grootste gedecentraliseerde sociale netwerk op het internet. In plaats van één enkele website is het een netwerk van miljoenen gebruikers in onafhankelijke gemeenschappen die allemaal naadloos met elkaar kunnen communiceren. Waar je ook mee bezig bent, je kunt gepassioneerde mensen ontmoeten die erover berichten op Mastodon!
 
-Word lid van een community en maak je profiel aan. Find and and follow fascinating folks and read their posts in an ad-free, chronological timeline. Express yourself with custom emoji, images, GIFs, videos, and audio in 500-character posts. Antwoord op berichten en boost iedereens berichten om geweldige dingen te delen. Find new accounts to follow and trending hashtags to expand your network.
+Word lid van een gemeenschap en maak je profiel aan. Vind en volg fascinerende mensen en lees hun berichten in een advertentievrije, chronologische tijdlijn. Druk jezelf uit met aangepaste emoji, afbeeldingen, GIF’s, video’s en audio in berichten van 500 karakters. Antwoord op berichten en boost iedereens berichten om geweldige dingen te delen. Vind nieuwe accounts om te volgen en hashtags om je netwerk uit te breiden.
 
-Mastodon is built with a focus on privacy and safety. Decide whether your posts are shared with your followers, just the people you mention, or the whole world. Content warnings let you hide posts containing sensitive or triggering material until you're ready to engage with them. Each community has its own guidelines and moderators to keep its members safe, and robust blocking and reporting tools help prevent abuse.
+Mastodon is gebouwd met een focus op privacy en veiligheid. Bepaal zelf of je berichten met je volgers, alleen de mensen die je noemt, of de hele wereld worden gedeeld. Inhoudswaarschuwingen laten je berichten verbergen die gevoelig of aanmatigend materiaal bevatten, totdat je er klaar voor bent om ermee ze te bekijken. Elke gemeenschap heeft haar eigen richtlijnen en moderators om haar leden veilig te houden, en robuuste blokkerings- en rapportagetools helpen misbruik te voorkomen.
 
 Meer mogelijkheden:
 
-• Dark Mode: Read posts in light, dark, or true black mode
-• Polls: Ask followers for their opinion and tally the votes
-• Explore: Trending hashtags and accounts are a tap away
+• Donkere Modus: Berichten lezen in licht, donker of echt zwart
+• Polls: Vraag volgers om hun mening en tel de stemmen
+• Ontdekken: Trending hashtags en accounts zijn een tik weg
 • Meldingen: Krijg een melding over nieuwe volgers, reacties en boosts
-• Sharing: Post directly to Mastodon from any share sheet in any app
-• Cuteness: Our mascot is an adorable elephant, and you'll see them pop up from time to time
+• Delen: Deel vanuit elke app direct op Mastodon
+• Schattigheid: Onze mascotte is een schattige olifant, en je zult ze van tijd tot tijd zien verschijnen
 
-Mastodon is a registered nonprofit and development is supported directly by your donations. There’s no advertising, no monetization, and no venture capital, and we plan to keep it that way.
+Mastodon is een geregistreerde non-profit en de ontwikkeling wordt direct ondersteund door jouw donaties. Er is geen reclame, geen geldelijk gewin en geen durfkapitaal en we zijn van plan het zo te houden.

fastlane/metadata/android/ro-RO/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon este cea mai mare rețea socială descentralizată de pe internet. În loc de un singur site, este o rețea de milioane de utilizatori din comunități independente care pot interacționa cu ceilalți, fără nici o întrerupere. Indiferent în ce te afli, poți întâlni oameni pasionați care postează despre asta pe Mastodon!
+
+Alătură-te unei comunități și creează-ți profilul. Găsește și urmărește oameni fascinanți și citește postările lor într-un calendar cronologic fără reclame. Exprimă-te cu emoji-uri personalizate, imagini, GIF-uri, videoclipuri și audio în postări de 500 de caractere. Răspunde la subiectele de discuție și impulsionează postările de la oricine pentru a împărtăși lucruri minunate. Găsește conturi noi de urmărit și haștag-uri populare pentru a-ți extinde rețeaua.
+
+Mastodon a fost construit cu accent pe confidențialitate și siguranță. Decide dacă postările tale sunt partajate cu urmăritorii tăi, doar cu cei pe care îi menționezi sau cu întreaga lume. Avertismentele de conținut vă permit să ascundeți postările care conțin materiale sensibile sau declanșatoare până când sunteți gata să le implicați. Fiecare comunitate are propriile sale orientări și proprii moderatori pentru a-și menține membrii în siguranță, iar instrumentele solide de blocare și raportare contribuie la prevenirea abuzurilor.
+
+Mai multe caracteristici:
+
+• Mod întunecat: Citește postările în modul luminos, întunecat sau negru total
+• Sondaje: Cereți celor care vă urmăresc opinia lor și numărați voturile
+• Explorează: Hașhtag-urile populare și conturile sunt la o apăsare distanță
+• Notificări: Primiți notificări despre noi urmăritori, răspunsuri și impulsionări
+• Distribuire: Postează direct pe Mastodon din orice foaie de partajare în orice aplicație
+• Drăgălășenie: Mascota noastră este un elefant adorabil, și îi veți vedea apărând din când în când
+
+Mastodon este o organizație non-profit înregistrată, iar dezvoltarea este sprijinită direct de donațiile tale. Nu există publicitate, monetizare și capital de risc, și intenționăm să păstrăm lucrurile astfel.

fastlane/metadata/android/ro-RO/short_description.txt

@@ -0,0 +1 @@
+Rețea socială descentralizată

fastlane/metadata/android/ro-RO/title.txt

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

fastlane/metadata/android/sl-SI/full_description.txt

@@ -0,0 +1,16 @@
+Mastodon je največje decentralizirano družbeno omrežje na internetu. Namesto enega samega spletišča ga tvorijo milijoni uporabnikov v neodvisnih skupnostih, ki lahko med seboj komunicirajo brez težav. Ne glede na to, kaj vas zanima, lahko srečate predane ljudi, ki o tem objavljajo na Mastodonu!
+
+Pridružite se skupnosti in ustvarite svoj profil. Poiščite in sledite zanimivim osebam ter berite njihove objave na časovnici brez oglasov v kronološkem zaporedju. Izrazite se s čustvenčki po meri, slikami, GIF-i, videoposnetki in zvočnimi posnetki v objavah z največ 500 znaki. Odgovarjajte na niti in poobjavite objave drugih, da delite dobro z drugimi. Poiščite nove račune za sledenje ter ključnike v trendu, da razširite svoje omrežje.
+
+Mastodon je izdelan s poudarkom na zasebnosti in varnosti. Odločite se, ali se vaše objave delijo z vašimi sledilci, zgolj z omenjenimi ali s celim svetom. Opozorila o vsebini omogočajo skrivanje objav, ki vsebujejo občutljive ali netilne zadeve, vse dokler niste pripravljeni, da se z njimi spopadete. Vsak skupnost ima svoja lastna pravila in moderatorje, ki varujejo svoje člane, ter robustna orodja za blokiranje in poročanje, ki pomagajo preprečiti žalitve in kršitve človeškega dostojanstva ter pravic.
+
+Dodatne funkcionalnosti:
+
+• Temni način: objave berite v svetlem, temnem ali povsem črnem načinu;
+• Ankete: vprašajte sledilce o njihovem mnenju in preštejte njihove glasove;
+• Razišči: ključniki in računi v trendu so le en tap stran;
+• Obvestila: bodite obveščeni o novih sledenjih, odgovorih in poobjavah;
+• Skupna raba: objavljajte neposredno v Mastodon s poljubne preglednice v skupni rabi;
+• Srčkano: naša maskota je ljubek slon in videli boste, kako se sem ter tja pojavi.
+
+Mastodon je registrirana neprofitna organizacija, razvoj pa podpirajo neposredno vaše donacije. Je brez oglaševanja, monetizacije in brez rizičnega kapitala; nameravamo ga takšnega tudi obdržati.

fastlane/metadata/android/sl-SI/short_description.txt

@@ -0,0 +1 @@
+Decentralizirano družbeno omrežje

fastlane/metadata/android/sl-SI/title.txt

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

fastlane/metadata/android/uk-UA/full_description.txt

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

fastlane/metadata/android/uk-UA/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Децентралізована соціальна мережа

get-upstream-commit.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git rev-parse --short --verify upstream/master

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jan 13 11:33:43 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 40
-		versionName "1.1.4+fork.40"
+		versionCode 49
+		versionName "1.1.4+fork.49"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",
@@ -20,12 +20,14 @@ android {
 
 	buildTypes {
 		release {
-			minifyEnabled true
-			shrinkResources true
+//			minifyEnabled true
+//			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{
 			debuggable true
+			versionNameSuffix '-debug'
+			applicationIdSuffix '.debug'
 		}
 		appcenterPrivateBeta{
 			initWith release

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

@@ -111,7 +111,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/mastodos/releases/latest")
+				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
@@ -139,12 +139,12 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				curForkNumber=Integer.parseInt(matcher.group(4));
 			long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
 			long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
-			if(newVersion>curVersion || newForkNumber>curForkNumber || BuildConfig.DEBUG){
+			if(newVersion>curVersion || newForkNumber>curForkNumber){
 				String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
 				Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
 				for(JsonElement el:obj.getAsJsonArray("assets")){
 					JsonObject asset=el.getAsJsonObject();
-					if("application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+					if("megalodon.apk".equals(asset.get("name")) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
 						long size=asset.get("size").getAsLong();
 						String url=asset.get("browser_download_url").getAsString();
 

mastodon/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+	<uses-permission android:name="android.permission.VIBRATE"/>
 
 	<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
 

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

@@ -12,9 +12,10 @@ public class GlobalUserPreferences{
 	public static boolean loadNewPosts;
 	public static boolean showInteractionCounts;
 	public static boolean alwaysExpandContentWarnings;
+	public static boolean disableMarquee;
 	public static ThemePreference theme;
 
-	private static SharedPreferences getPrefs(){
+    private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
@@ -28,6 +29,7 @@ public class GlobalUserPreferences{
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
+		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 	}
 
@@ -41,6 +43,7 @@ public class GlobalUserPreferences{
 				.putBoolean("trueBlackTheme", trueBlackTheme)
 				.putBoolean("showInteractionCounts", showInteractionCounts)
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
+				.putBoolean("disableMarquee", disableMarquee)
 				.putInt("theme", theme.ordinal())
 				.apply();
 	}

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

@@ -35,7 +35,7 @@ import me.grishka.appkit.utils.WorkerThread;
 
 public class CacheController{
 	private static final String TAG="CacheController";
-	private static final int DB_VERSION=2;
+	private static final int DB_VERSION=3;
 	private static final WorkerThread databaseThread=new WorkerThread("databaseThread");
 	private static final Handler uiHandler=new Handler(Looper.getMainLooper());
 
@@ -73,7 +73,7 @@ public class CacheController{
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
 								for(Filter filter:filters){
-									if(filter.matches(status.getContentStatus().content))
+									if(filter.matches(status))
 										continue outer;
 								}
 								result.add(status);
@@ -126,14 +126,15 @@ public class CacheController{
 		});
 	}
 
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
 				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
-					try(Cursor cursor=db.query(onlyMentions ? "notifications_mentions" : "notifications_all", new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
+					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
+					try(Cursor cursor=db.query(table, new String[]{"json"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`id` DESC", count+"")){
 						if(cursor.getCount()==count){
 							ArrayList<Notification> result=new ArrayList<>();
 							cursor.moveToFirst();
@@ -145,7 +146,7 @@ public class CacheController{
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
 									for(Filter filter:filters){
-										if(filter.matches(ntf.status.getContentStatus().content))
+										if(filter.matches(ntf.status))
 											continue outer;
 									}
 								}
@@ -159,21 +160,21 @@ public class CacheController{
 						Log.w(TAG, "getNotifications: corrupted notification object in database", x);
 					}
 				}
-				new GetNotifications(maxID, count, onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
 								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
 										for(Filter filter:filters){
-											if(filter.matches(ntf.status.getContentStatus().content)){
+											if(filter.matches(ntf.status)){
 												return false;
 											}
 										}
 									}
 									return true;
 								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
-								putNotifications(result, onlyMentions, maxID==null);
+								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
 
 							@Override
@@ -191,9 +192,9 @@ public class CacheController{
 		}, 0);
 	}
 
-	private void putNotifications(List<Notification> notifications, boolean onlyMentions, boolean clear){
+	private void putNotifications(List<Notification> notifications, boolean onlyMentions, boolean onlyPosts, boolean clear){
 		runOnDbThread((db)->{
-			String table=onlyMentions ? "notifications_mentions" : "notifications_all";
+			String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
 			if(clear)
 				db.delete(table, null, null);
 			ContentValues values=new ContentValues(3);
@@ -317,6 +318,7 @@ public class CacheController{
 							`type` INTEGER NOT NULL
 						)""");
 			createRecentSearchesTable(db);
+			createPostsNotificationsTable(db);
 		}
 
 		@Override
@@ -324,6 +326,9 @@ public class CacheController{
 			if(oldVersion==1){
 				createRecentSearchesTable(db);
 			}
+			if(oldVersion==2){
+				createPostsNotificationsTable(db);
+			}
 		}
 
 		private void createRecentSearchesTable(SQLiteDatabase db){
@@ -334,6 +339,16 @@ public class CacheController{
 							`time` INTEGER NOT NULL
 						)""");
 		}
+
+		private void createPostsNotificationsTable(SQLiteDatabase db){
+			db.execSQL("""
+						CREATE TABLE `notifications_posts` (
+							`id` VARCHAR(25) NOT NULL PRIMARY KEY,
+							`json` TEXT NOT NULL,
+							`flags` INTEGER NOT NULL DEFAULT 0,
+							`type` INTEGER NOT NULL
+						)""");
+		}
 	}
 
 	@FunctionalInterface

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.follow_requests;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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

@@ -0,0 +1,50 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.FollowSuggestion;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetFollowRequests extends MastodonAPIRequest<List<Account>>{
+	private String maxId;
+
+	public GetFollowRequests(String maxID, String minID, int limit){
+		super(HttpMethod.GET, "/follow_requests", new TypeToken<>(){});
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+	}
+
+	@Override
+	public void validateAndPostprocessResponse(List<Account> respObj, Response httpResponse) throws IOException {
+		super.validateAndPostprocessResponse(respObj, httpResponse);
+		// <https://mastodon.social/api/v1/follow_requests?max_id=268962>; rel="next",
+		// <https://mastodon.social/api/v1/follow_requests?min_id=268981>; rel="prev"
+		String link=httpResponse.header("link");
+		// parsing link header by hand; using a library would be cleaner
+		// (also, the functionality should be part of the max id logics and implemented in MastodonAPIRequest)
+		if(link==null) return;
+		String maxIdEq="max_id=";
+		for(String s : link.split(",")) {
+			if(s.contains("rel=\"next\"")) {
+				int start=s.indexOf(maxIdEq)+maxIdEq.length();
+				int end=s.indexOf('>');
+				if(start<0 || start>end) return;
+				this.maxId=s.substring(start, end);
+			}
+		}
+	}
+
+	public String getMaxId() {
+		return maxId;
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.joinmastodon.android.api.requests.follow_requests;
+package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

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="Mastodos";
+		public String clientName="Megalodon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://sk22.github.io/mastodos";
+		public String website="https://sk22.github.io/megalodon";
 	}
 }

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

@@ -0,0 +1,18 @@
+package org.joinmastodon.android.events;
+
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Relationship;
+
+public class FollowRequestHandledEvent {
+	public String accountID;
+	public boolean accepted;
+	public Account account;
+	public Relationship	relationship;
+
+	public FollowRequestHandledEvent(String accountID, boolean accepted, Account account, Relationship rel){
+		this.accountID=accountID;
+		this.accepted=accepted;
+		this.account=account;
+		this.relationship=rel;
+	}
+}

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

@@ -19,6 +19,7 @@ import android.view.WindowInsets;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
@@ -81,6 +82,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
+		if(GlobalUserPreferences.disableMarquee){
+			setTitleMarqueeEnabled(false);
+			setSubtitleMarqueeEnabled(false);
+		}
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 	}

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

@@ -13,6 +13,7 @@ import android.graphics.Outline;
 import android.graphics.PixelFormat;
 import android.graphics.RenderEffect;
 import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.icu.text.BreakIterator;
 import android.media.MediaMetadataRetriever;
@@ -502,6 +503,24 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
+			int visibilityNameRes = switch (statusVisibility) {
+				case PUBLIC -> R.string.visibility_public;
+				case UNLISTED -> R.string.visibility_unlisted;
+				case PRIVATE -> R.string.visibility_followers_only;
+				case DIRECT -> R.string.visibility_private;
+			};
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
+			Drawable visibilityIcon = getActivity().getDrawable(switch(statusVisibility){
+				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
+				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
+				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
+				case DIRECT -> R.drawable.ic_at_symbol;
+			});
+			visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20));
+			Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled);
+			replyArrow.setBounds(0, 0, V.dp(20), V.dp(20));
+			replyText.setCompoundDrawables(replyArrow, null, visibilityIcon, null);
+
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 			if(!replyTo.account.id.equals(ownID))

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

@@ -0,0 +1,344 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
+import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Relationship;
+import org.joinmastodon.android.ui.OutlineProviders;
+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.ProgressBarButton;
+import org.parceler.Parcels;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
+import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
+import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
+	private String accountID;
+	private Map<String, Relationship> relationships=Collections.emptyMap();
+	private GetAccountRelationships relationshipsRequest;
+	private String lastMaxId=null;
+
+	public FollowRequestsListFragment(){
+		super(20);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		accountID=getArguments().getString("account");
+		loadData();
+	}
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+		setTitle(R.string.follow_requests);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		if(relationshipsRequest!=null){
+			relationshipsRequest.cancel();
+			relationshipsRequest=null;
+		}
+		currentRequest=new GetFollowRequests(offset>0 ? lastMaxId : null, null, count)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Account> result){
+						onDataLoaded(result.stream().map(AccountWrapper::new).collect(Collectors.toList()), false);
+						loadRelationships();
+					}
+				})
+				.exec(accountID);
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		return new AccountsAdapter();
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				outRect.bottom=outRect.left=outRect.right=V.dp(16);
+				if(parent.getChildAdapterPosition(view)==0)
+					outRect.top=V.dp(16);
+			}
+		});
+		((UsableRecyclerView)list).setDrawSelectorOnTop(true);
+	}
+
+	private void loadRelationships(){
+		relationships=Collections.emptyMap();
+		relationshipsRequest=new GetAccountRelationships(data.stream().map(fs->fs.account.id).collect(Collectors.toList()));
+		relationshipsRequest.setCallback(new Callback<>(){
+			@Override
+			public void onSuccess(List<Relationship> result){
+				relationshipsRequest=null;
+				relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity()));
+				if(list==null)
+					return;
+				for(int i=0;i<list.getChildCount();i++){
+					RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+					if(holder instanceof AccountViewHolder avh)
+						avh.rebind();
+				}
+			}
+
+			@Override
+			public void onError(ErrorResponse error){
+				relationshipsRequest=null;
+			}
+		}).exec(accountID);
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(relationshipsRequest!=null){
+			relationshipsRequest.cancel();
+			relationshipsRequest=null;
+		}
+	}
+
+	@Override
+	public void scrollToTop(){
+		smoothScrollRecyclerViewToTop(list);
+	}
+
+	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
+
+		public AccountsAdapter(){
+			super(imgLoader);
+		}
+
+		@Override
+		public void onBindViewHolder(AccountViewHolder holder, int position){
+			holder.bind(data.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@NonNull
+		@Override
+		public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new AccountViewHolder();
+		}
+
+		@Override
+		public int getItemCount(){
+			return data.size();
+		}
+
+		@Override
+		public int getImageCountForItem(int position){
+			return 2+data.get(position).emojiHelper.getImageCount();
+		}
+
+		@Override
+		public ImageLoaderRequest getImageRequest(int position, int image){
+			AccountWrapper item=data.get(position);
+			if(image==0)
+				return item.avaRequest;
+			else if(image==1)
+				return item.coverRequest;
+			else
+				return item.emojiHelper.getImageRequest(image-2);
+		}
+	}
+
+	// literally the same as AccountCardStatusDisplayItem and DiscoverAccountsFragment. code should be generalized
+	private class AccountViewHolder extends BindableViewHolder<AccountWrapper> implements ImageLoaderViewHolder, UsableRecyclerView.Clickable{
+		private final ImageView cover, avatar;
+		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
+		private final ProgressBarButton actionButton, acceptButton, rejectButton;
+		private final ProgressBar actionProgress, acceptProgress, rejectProgress;
+		private final View actionWrap, acceptWrap, rejectWrap;
+
+		private Relationship relationship;
+
+		public AccountViewHolder(){
+			super(getActivity(), R.layout.item_discover_account, list);
+			cover=findViewById(R.id.cover);
+			avatar=findViewById(R.id.avatar);
+			name=findViewById(R.id.name);
+			username=findViewById(R.id.username);
+			bio=findViewById(R.id.bio);
+			followersCount=findViewById(R.id.followers_count);
+			followersLabel=findViewById(R.id.followers_label);
+			followingCount=findViewById(R.id.following_count);
+			followingLabel=findViewById(R.id.following_label);
+			postsCount=findViewById(R.id.posts_count);
+			postsLabel=findViewById(R.id.posts_label);
+			actionButton=findViewById(R.id.action_btn);
+			actionProgress=findViewById(R.id.action_progress);
+			actionWrap=findViewById(R.id.action_btn_wrap);
+			acceptButton=findViewById(R.id.accept_btn);
+			acceptProgress=findViewById(R.id.accept_progress);
+			acceptWrap=findViewById(R.id.accept_btn_wrap);
+			rejectButton=findViewById(R.id.reject_btn);
+			rejectProgress=findViewById(R.id.reject_progress);
+			rejectWrap=findViewById(R.id.reject_btn_wrap);
+
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(6));
+			itemView.setClipToOutline(true);
+			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
+			avatar.setClipToOutline(true);
+			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
+			cover.setClipToOutline(true);
+			actionButton.setOnClickListener(this::onActionButtonClick);
+			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
+			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
+		}
+
+		@Override
+		public void onBind(AccountWrapper item){
+			name.setText(item.parsedName);
+			username.setText('@'+item.account.acct);
+			bio.setText(item.parsedBio);
+			followersCount.setText(UiUtils.abbreviateNumber(item.account.followersCount));
+			followingCount.setText(UiUtils.abbreviateNumber(item.account.followingCount));
+			postsCount.setText(UiUtils.abbreviateNumber(item.account.statusesCount));
+			followersLabel.setText(getResources().getQuantityString(R.plurals.followers, (int)Math.min(999, item.account.followersCount)));
+			followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
+			postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
+			relationship=relationships.get(item.account.id);
+			if(relationship == null || !relationship.followedBy){
+				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.VISIBLE);
+				rejectWrap.setVisibility(View.VISIBLE);
+			
+				// i hate that i wasn't able to do this in xml
+				acceptButton.setCompoundDrawableTintList(acceptButton.getTextColors());
+				acceptProgress.setIndeterminateTintList(acceptButton.getTextColors());
+				rejectButton.setCompoundDrawableTintList(rejectButton.getTextColors());
+				rejectProgress.setIndeterminateTintList(rejectButton.getTextColors());
+			}else if(relationship==null){
+				actionWrap.setVisibility(View.GONE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
+			}else{
+				actionWrap.setVisibility(View.VISIBLE);
+				acceptWrap.setVisibility(View.GONE);
+				rejectWrap.setVisibility(View.GONE);
+				UiUtils.setRelationshipToActionButton(relationship, actionButton);
+			}
+		}
+
+		@Override
+		public void setImage(int index, Drawable image){
+			if(index==0){
+				avatar.setImageDrawable(image);
+			}else if(index==1){
+				cover.setImageDrawable(image);
+			}else{
+				item.emojiHelper.setImageDrawable(index-2, image);
+				name.invalidate();
+				bio.invalidate();
+			}
+			if(image instanceof Animatable a && !a.isRunning())
+				a.start();
+		}
+
+		@Override
+		public void clearImage(int index){
+			setImage(index, null);
+		}
+
+		@Override
+		public void onClick(){
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(item.account));
+			Nav.go(getActivity(), ProfileFragment.class, args);
+		}
+
+		private void onFollowRequestButtonClick(View v) {
+			itemView.setHasTransientState(true);
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, accountID, null, v == acceptButton, relationship, rel -> {
+				itemView.setHasTransientState(false);
+				relationships.put(item.account.id, rel);
+				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();
+				if (!rel.requested && !rel.followedBy && adapter != null) {
+					data.remove(item);
+					adapter.notifyItemRemoved(getBindingAdapterPosition());
+				} else {
+					rebind();
+				}
+			});
+		}
+
+		private void onActionButtonClick(View v){
+			itemView.setHasTransientState(true);
+			UiUtils.performAccountAction(getActivity(), item.account, accountID, relationship, actionButton, this::setActionProgressVisible, rel->{
+				itemView.setHasTransientState(false);
+				relationships.put(item.account.id, rel);
+				rebind();
+			});
+		}
+
+		private void setActionProgressVisible(boolean visible){
+			actionButton.setTextVisible(!visible);
+			actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+			actionButton.setClickable(!visible);
+		}
+	}
+
+	protected class AccountWrapper{
+		public Account account;
+		public ImageLoaderRequest avaRequest, coverRequest;
+		public CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+		public CharSequence parsedName, parsedBio;
+
+		public AccountWrapper(Account account){
+			this.account=account;
+			if(!TextUtils.isEmpty(account.avatar))
+				avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
+			if(!TextUtils.isEmpty(account.header))
+				coverRequest=new UrlImageLoaderRequest(account.header, 1000, 1000);
+			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+			if(account.emojis.isEmpty()){
+				parsedName=account.displayName;
+			}else{
+				parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
+				emojiHelper.setText(new SpannableStringBuilder(parsedName).append(parsedBio));
+			}
+		}
+	}
+}

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

@@ -66,8 +66,8 @@ public class HashtagTimelineFragment extends StatusListFragment{
 			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
 				@Override
 				public void onSuccess(Hashtag i) {
+					if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
 					updateFollowingState(i.following);
-					Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
 				}
 
 				@Override

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

@@ -5,7 +5,6 @@ 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;
@@ -18,7 +17,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
-import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toolbar;
 
 import com.squareup.otto.Subscribe;
@@ -42,6 +41,7 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -56,7 +56,7 @@ import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment{
 	private ImageButton fab;
-	private ImageView toolbarLogo;
+	private TextView toolbarLogo;
 	private Button toolbarShowNewPostsBtn;
 	private boolean newPostsBtnShown;
 	private AnimatorSet currentNewPostsAnim;
@@ -268,7 +268,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 								if(idsBelowGap.contains(s.id))
 									break;
 								for(Filter filter:filters){
-									if(filter.matches(s.getContentStatus().content)){
+									if(filter.matches(s)){
 										continue outer;
 									}
 								}
@@ -315,10 +315,9 @@ public class HomeTimelineFragment extends StatusListFragment{
 	}
 
 	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);

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

@@ -41,6 +41,7 @@ public class ListTimelineFragment extends StatusListFragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
+        // TODO: implement edit, delete
         // inflater.inflate(R.menu.list, menu);
     }
 
@@ -73,7 +74,6 @@ public class ListTimelineFragment extends StatusListFragment {
     private void onFabClick(View v){
         Bundle args=new Bundle();
         args.putString("account", accountID);
-        args.putString("prefilledText", listID+' ');
         Nav.go(getActivity(), ComposeFragment.class, args);
     }
 

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

@@ -2,16 +2,22 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.res.Configuration;
 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.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
+import org.joinmastodon.android.events.FollowRequestHandledEvent;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -20,8 +26,15 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
+
+import com.squareup.otto.Subscribe;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
-import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.utils.V;
 
 public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop{
@@ -31,7 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 
-	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
 
 	private String accountID;
 
@@ -42,14 +55,36 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
+		E.register(this);
+	}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		E.unregister(this);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
+		setHasOptionsMenu(true);
 		setTitle(R.string.notifications);
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.notifications, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() != R.id.follow_requests) return false;
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+		return true;
+	}
+
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		LinearLayout view=(LinearLayout) inflater.inflate(R.layout.fragment_notifications, container, false);
@@ -57,12 +92,13 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[2];
+		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.notifications_all;
 				case 1 -> R.id.notifications_mentions;
+				case 2 -> R.id.notifications_posts;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -101,9 +137,15 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment=new NotificationsListFragment();
 			mentionsFragment.setArguments(args);
 
+			args=new Bundle(args);
+			args.putBoolean("onlyPosts", true);
+			postsFragment=new NotificationsListFragment();
+			postsFragment.setArguments(args);
+
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
+					.add(R.id.notifications_posts, postsFragment)
 					.commit();
 		}
 
@@ -113,6 +155,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
+					case 2 -> R.string.posts;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -123,12 +166,30 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return view;
 	}
 
+	public void refreshFollowRequestsBadge() {
+		new GetFollowRequests(null, null, 1).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(List<Account> accounts) {
+				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
+			}
+
+			@Override
+			public void onError(ErrorResponse errorResponse) {}
+		}).exec(accountID);
+	}
+
+	@Subscribe
+	public void onFollowRequestHandled(FollowRequestHandledEvent ev) {
+		refreshFollowRequestsBadge();
+	}
+
 	@Override
 	public void scrollToTop(){
 		getFragmentForPage(pager.getCurrentItem()).scrollToTop();
 	}
 
 	public void loadData(){
+		refreshFollowRequestsBadge();
 		if(allNotificationsFragment!=null && !allNotificationsFragment.loaded && !allNotificationsFragment.dataLoading)
 			allNotificationsFragment.loadData();
 	}
@@ -143,6 +204,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
+			case 2 -> postsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -163,7 +225,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		@Override
 		public int getItemCount(){
-			return 2;
+			return 3;
 		}
 
 		@Override

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

@@ -35,6 +35,7 @@ import me.grishka.appkit.utils.V;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
+	private boolean onlyPosts;
 	private String maxID;
 
 	@Override
@@ -53,6 +54,15 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
 		onlyMentions=getArguments().getBoolean("onlyMentions", false);
+		onlyPosts=getArguments().getBoolean("onlyPosts", false);
+	}
+
+	@Override
+	public void onRefresh() {
+		super.onRefresh();
+		if (getParentFragment() instanceof NotificationsFragment notificationsFragment) {
+			notificationsFragment.refreshFollowRequestsBadge();
+		}
 	}
 
 	@Override
@@ -98,7 +108,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
 				.getAccount(accountID).getCacheController()
-				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, refreshing, new SimpleCallback<>(this){
+				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(PaginatedResponse<List<Notification>> result){
 						if(getActivity()==null)

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;
@@ -31,9 +38,11 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 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 org.joinmastodon.android.GlobalUserPreferences;
@@ -435,15 +444,25 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
 			}
 			ssb.append(" ");
-			Drawable lock=username.getResources().getDrawable(R.drawable.ic_fluent_lock_closed_20_filled, getActivity().getTheme()).mutate();
+			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
 			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
 			lock.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0);
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
+		username.setOnLongClickListener(l->{
+			ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
+			Vibrator v = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
+			ClipData clip = ClipData.newPlainText("Username", '@'+account.acct+'@'+AccountSessionManager.getInstance().getAccount(accountID).domain);
+			clipboard.setPrimaryClip(clip);
+			Toast.makeText(getActivity(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) v.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
+			else v.vibrate(50);
+			return true;
+		});
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
@@ -648,7 +667,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
+		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){

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

@@ -94,6 +94,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
+		items.add(new SwitchItem(R.string.disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+			GlobalUserPreferences.disableMarquee=i.checked;
+			GlobalUserPreferences.save();
+		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{

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

@@ -139,7 +139,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 					action=getString(R.string.edit_multiple_changed);
 				}
 			}
-			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0));
+			items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" · "+date, Collections.emptyList(), 0, null));
 		}
 		return items;
 	}

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

@@ -97,7 +97,7 @@ public class ThreadFragment extends StatusListFragment{
 			return statuses;
 		return statuses.stream().filter(status->{
 			for(Filter filter:filters){
-				if(filter.matches(status.getContentStatus().content))
+				if(filter.matches(status))
 					return false;
 			}
 			return true;

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

@@ -53,6 +53,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -295,6 +296,14 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void proceedWithAuthOrSignup(Instance instance){
 		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
 		if(isSignup){
+			if(!instance.registrations){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.error)
+						.setMessage(R.string.instance_signup_closed)
+						.setPositiveButton(R.string.ok, null)
+						.show();
+				return;
+			}
 			Bundle args=new Bundle();
 			args.putParcelable("instance", Parcels.wrap(instance));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
@@ -478,7 +487,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 							instanceProgressDialog=null;
 							proceedWithAuthOrSignup(result);
 						}
-						if(domain.equals(currentSearchQuery) || currentSearchQuery.equals(redirects.get(domain)) || currentSearchQuery.equals(redirectsInverse.get(domain))){
+						if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
 							boolean found=false;
 							for(CatalogInstance ci:filteredData){
 								if(ci.domain.equals(domain)){

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

@@ -102,7 +102,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		ReportReason reason=ReportReason.valueOf(getArguments().getString("reason"));
 		ArrayList<String> statusIDs=getArguments().getStringArrayList("statusIDs");
 		ArrayList<String> ruleIDs=getArguments().getStringArrayList("ruleIDs");
-		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), false)
+		new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), true)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){

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

@@ -50,6 +50,10 @@ public class Filter extends BaseModel{
 		return pattern.matcher(text).find();
 	}
 
+	public boolean matches(Status status){
+		return matches(status.getContentStatus().getStrippedText());
+	}
+
 	@Override
 	public String toString(){
 		return "Filter{"+

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

@@ -4,6 +4,7 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.ui.text.HtmlParser;
 import org.parceler.Parcel;
 
 import java.time.Instant;
@@ -57,6 +58,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 
 	public transient boolean spoilerRevealed;
 	public transient boolean hasGapAfter;
+	private transient String strippedText;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
@@ -134,4 +136,10 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public Status getContentStatus(){
 		return reblog!=null ? reblog : this;
 	}
+
+	public String getStrippedText(){
+		if(strippedText==null)
+			strippedText=HtmlParser.strip(content);
+		return strippedText;
+	}
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.SpannableStringBuilder;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -17,6 +18,8 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import java.util.List;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 
@@ -25,14 +28,16 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 	@DrawableRes
 	private int icon;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
+	private View.OnClickListener handleClick;
 
-	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon){
+	public ReblogOrReplyLineStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, CharSequence text, List<Emoji> emojis, @DrawableRes int icon, @Nullable View.OnClickListener handleClick){
 		super(parentID, parentFragment);
 		SpannableStringBuilder ssb=new SpannableStringBuilder(text);
 		HtmlParser.parseCustomEmoji(ssb, emojis);
 		this.text=ssb;
 		emojiHelper.setText(ssb);
 		this.icon=icon;
+		this.handleClick=handleClick;
 	}
 
 	@Override
@@ -61,6 +66,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(ReblogOrReplyLineStatusDisplayItem item){
 			text.setText(item.text);
 			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, 0, 0);
+			if(item.handleClick!=null) text.setOnClickListener(item.handleClick);
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
 		}

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

@@ -2,12 +2,14 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -16,6 +18,7 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.text.HtmlParser;
+import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +26,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
@@ -73,11 +77,19 @@ public abstract class StatusDisplayItem{
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
 		if(status.reblog!=null){
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled));
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.user_boosted, status.account.displayName), status.account.emojis, R.drawable.ic_fluent_arrow_repeat_all_20_filled, i->{
+				args.putParcelable("profileAccount", Parcels.wrap(status.account));
+				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
+			}));
 		}else if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId)){
 			Account account=Objects.requireNonNull(knownAccounts.get(status.inReplyToAccountId));
-			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled));
+			items.add(new ReblogOrReplyLineStatusDisplayItem(parentID, fragment, fragment.getString(R.string.in_reply_to, account.displayName), account.emojis, R.drawable.ic_fluent_arrow_reply_20_filled, i->{
+				args.putParcelable("profileAccount", Parcels.wrap(account));
+				Nav.go(fragment.getActivity(), ProfileFragment.class, args);
+			}));
 		}
 		HeaderStatusDisplayItem header;
 		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null));

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

@@ -5,8 +5,10 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
@@ -20,6 +22,7 @@ import org.joinmastodon.android.ui.views.LinkedTextView;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
+import me.grishka.appkit.utils.V;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
@@ -61,8 +64,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
+		private final LinearLayout spoilerHeader;
 		private final TextView spoilerTitle, spoilerTitleInline;
-		private final View spoilerOverlay, spoilerHeader;
+		private final View spoilerOverlay, borderTop, borderBottom;
+		private final Drawable backgroundColor, borderColor;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
@@ -71,14 +76,29 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			spoilerTitleInline=findViewById(R.id.spoiler_title_inline);
 			spoilerHeader=findViewById(R.id.spoiler_header);
 			spoilerOverlay=findViewById(R.id.spoiler_overlay);
+			borderTop=findViewById(R.id.border_top);
+			borderBottom=findViewById(R.id.border_bottom);
 			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);
 		}
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
 			text.setText(item.text);
 			text.setTextIsSelectable(item.textSelectable);
+			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
+			spoilerTitleInline.setBackground(item.inset ? null : backgroundColor);
+			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
+			borderTop.setBackground(item.inset ? null : borderColor);
+			borderBottom.setBackground(item.inset ? null : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
 				spoilerTitleInline.setText(item.parsedSpoilerText);

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

@@ -39,13 +39,14 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
-import org.joinmastodon.android.api.requests.follow_requests.AuthorizeFollowRequest;
-import org.joinmastodon.android.api.requests.follow_requests.RejectFollowRequest;
+import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
+import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.events.FollowRequestHandledEvent;
 import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
@@ -536,11 +537,12 @@ public class UiUtils{
 	}
 
 
-	public static void handleFollowRequest(Activity activity, Account account, String accountID, String notificationID, boolean accepted, Relationship relationship, Consumer<Relationship> resultCallback) {
+	public static void handleFollowRequest(Activity activity, Account account, String accountID, @Nullable String notificationID, boolean accepted, Relationship relationship, Consumer<Relationship> resultCallback) {
 		if (accepted) {
 			new AuthorizeFollowRequest(account.id).setCallback(new Callback<>() {
 				@Override
 				public void onSuccess(Relationship rel) {
+					E.post(new FollowRequestHandledEvent(accountID, true, account, rel));
 					resultCallback.accept(rel);
 				}
 
@@ -554,7 +556,8 @@ public class UiUtils{
 			new RejectFollowRequest(account.id).setCallback(new Callback<>() {
 				@Override
 				public void onSuccess(Relationship rel) {
-					E.post(new NotificationDeletedEvent(notificationID));
+					E.post(new FollowRequestHandledEvent(accountID, false, account, rel));
+					if (notificationID != null) E.post(new NotificationDeletedEvent(notificationID));
 					resultCallback.accept(rel);
 				}
 

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

@@ -21,9 +21,8 @@ public class StatusFilterPredicate implements Predicate<Status>{
 
 	@Override
 	public boolean test(Status status){
-		CharSequence content=status.getContentStatus().content;
 		for(Filter filter:filters){
-			if(filter.matches(content))
+			if(filter.matches(status))
 				return false;
 		}
 		return true;

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

@@ -1,10 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16.7096,17.7682C19.4819,17.4391 21.8955,15.7408 22.199,14.1888C22.6769,11.7442 22.6376,8.2231 22.6376,8.2231C22.6376,3.4504 19.4929,2.0516 19.4929,2.0516C17.9073,1.3274 15.1846,1.023 12.356,1H12.2865C9.4579,1.023 6.7369,1.3274 5.1513,2.0516C5.1513,2.0516 2.0066,3.4504 2.0066,8.2231C2.0066,8.5125 2.0051,8.8169 2.0035,9.1339C1.9991,10.0135 1.9943,10.9896 2.0199,12.0083C2.1341,16.6755 2.8805,21.2752 7.2202,22.4175C9.2213,22.944 10.9392,23.0542 12.323,22.9785C14.832,22.8403 16.2406,22.0883 16.2406,22.0883L16.1577,20.2779C16.1577,20.2779 14.3648,20.8402 12.3511,20.7717C10.356,20.7037 8.2496,20.5577 7.9269,18.1221C7.8972,17.9082 7.8823,17.6794 7.8823,17.4391C7.8823,17.4391 9.8408,17.9152 12.323,18.0283C13.8407,18.0974 15.2639,17.9399 16.7096,17.7682ZM18.8747,14.3719V8.5932C18.8747,7.4121 18.5723,6.4736 17.9648,5.7792C17.3382,5.0849 16.518,4.729 15.4997,4.729C14.3212,4.729 13.4291,5.1792 12.8392,6.0799L12.2657,7.0359L11.692,6.0799C11.1023,5.1792 10.21,4.729 9.0316,4.729C8.0134,4.729 7.193,5.0849 6.5664,5.7792C5.9589,6.4736 5.6565,7.4121 5.6565,8.5932V14.3719H7.959V8.763C7.959,7.5805 8.4594,6.9806 9.4602,6.9806C10.5665,6.9806 11.1211,7.6925 11.1211,9.1001V12.1701H13.4101V9.1001C13.4101,7.6925 13.9647,6.9806 15.071,6.9806C16.0718,6.9806 16.5722,7.5805 16.5722,8.763V14.3719H18.8747Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd"/>
+<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_popup.xml

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

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_selected="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_filled"/>
 	<item android:state_enabled="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_regular"/>
 	<item android:drawable="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
 </selector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M14.712 2.289L14.625 2.21c-0.392-0.31-0.964-0.285-1.327 0.078L13.22 2.376c-0.31 0.392-0.285 0.964 0.078 1.326l1.299 1.297H8.999L8.76 5.003C5.004 5.13 2 8.211 2 11.993c0 1.445 0.438 2.788 1.189 3.899C3.37 16.143 3.666 16.307 4 16.307c0.552 0 1-0.448 1-1 0-0.216-0.069-0.416-0.185-0.578L4.68 14.51C4.248 13.77 4 12.91 4 11.993c0-2.759 2.238-4.995 5-4.995h5.595l-1.297 1.297-0.078 0.087c-0.31 0.392-0.285 0.964 0.078 1.326 0.39 0.39 1.024 0.39 1.414 0l3.006-3.003 0.077-0.087c0.311-0.392 0.285-0.964-0.078-1.326l-3.005-3.003zm6.075 5.771C20.602 7.827 20.319 7.678 20 7.678c-0.552 0-1 0.448-1 1 0 0.208 0.064 0.4 0.172 0.56 0.523 0.79 0.828 1.737 0.828 2.755 0 2.76-2.238 4.996-5 4.996H9.416l1.294-1.292 0.083-0.095c0.281-0.361 0.28-0.871-0.006-1.23l-0.077-0.088-0.095-0.084c-0.362-0.28-0.873-0.278-1.232 0.006l-0.088 0.078-3.005 3.003-0.083 0.095c-0.281 0.361-0.28 0.872 0.006 1.231L6.289 18.7l3.005 3.003 0.095 0.084c0.392 0.304 0.96 0.277 1.32-0.084 0.362-0.362 0.388-0.933 0.077-1.326L10.71 20.29l-1.304-1.303h5.596l0.24-0.003C18.996 18.857 22 15.776 22 11.994c0-1.46-0.448-2.816-1.213-3.937V8.06z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M8.75 3.75C8.75 2.231 7.519 1 6 1S3.25 2.231 3.25 3.75 4.481 6.5 6 6.5s2.75-1.231 2.75-2.75zm-4.5 0C4.25 2.784 5.034 2 6 2s1.75 0.784 1.75 1.75S6.966 5.5 6 5.5 4.25 4.716 4.25 3.75zM2.5 7.5h4.183c-0.164 0.31-0.286 0.646-0.358 1H2.5C2.224 8.5 2 8.724 2 9v0.5c0 1.26 1.099 2.614 3.096 2.93-0.322 0.22-0.59 0.513-0.781 0.854C2.205 12.713 1 11.087 1 9.5V9c0-0.828 0.672-1.5 1.5-1.5zm5.379 0c0.504-0.61 1.267-1 2.121-1 0.854 0 1.617 0.39 2.121 1 0.24 0.29 0.42 0.629 0.525 1 0.068 0.238 0.104 0.49 0.104 0.75 0 1.07-0.611 1.997-1.503 2.452-0.355 0.18-0.754 0.287-1.177 0.297L10 12H9.93c-0.423-0.011-0.822-0.117-1.177-0.298C7.861 11.247 7.25 10.32 7.25 9.25c0-0.26 0.036-0.512 0.104-0.75 0.104-0.371 0.285-0.71 0.525-1zm0.54 1C8.31 8.727 8.25 8.982 8.25 9.25c0 0.714 0.428 1.328 1.04 1.6C9.509 10.947 9.749 11 10 11c0.252 0 0.492-0.053 0.71-0.15 0.612-0.272 1.04-0.886 1.04-1.6 0-0.268-0.06-0.523-0.168-0.75-0.246-0.516-0.737-0.894-1.322-0.98C10.175 7.506 10.088 7.5 10 7.5c-0.088 0-0.175 0.006-0.26 0.02C9.155 7.605 8.664 7.983 8.418 8.5zm7.266 4.784c-0.19-0.341-0.459-0.634-0.781-0.853C16.9 12.114 18 10.759 18 9.5V9c0-0.276-0.224-0.5-0.5-0.5h-3.825c-0.072-0.354-0.194-0.69-0.357-1H17.5C18.328 7.5 19 8.172 19 9v0.5c0 1.587-1.206 3.212-3.315 3.784zm-1.198 0.087C14.223 13.14 13.878 13 13.5 13h-7c-0.432 0-0.821 0.183-1.095 0.475C5.154 13.743 5 14.104 5 14.5V15c0 1.971 1.86 4 5 4 3.14 0 5-2.029 5-4v-0.5c0-0.45-0.198-0.854-0.513-1.13zM6 14.5C6 14.224 6.224 14 6.5 14h7c0.276 0 0.5 0.224 0.5 0.5V15c0 1.438-1.432 3-4 3s-4-1.562-4-3v-0.5zM14 1c1.519 0 2.75 1.231 2.75 2.75S15.519 6.5 14 6.5s-2.75-1.231-2.75-2.75S12.481 1 14 1zm0 1c-0.966 0-1.75 0.784-1.75 1.75S13.034 5.5 14 5.5s1.75-0.784 1.75-1.75S14.966 2 14 2z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M9.75 2c0.301 0 0.573 0.18 0.69 0.457l6.972 16.431C16.951 18.345 16.267 18 15.5 18c-0.031 0-0.063 0-0.094 0.002L13.92 14.5H5.58l-2.14 5.043c-0.161 0.381-0.601 0.56-0.983 0.397-0.381-0.161-0.559-0.602-0.397-0.983l7-16.5C9.177 2.18 9.45 2 9.75 2zm3.534 11L9.75 4.67 6.216 13h7.068zM12 20.5c0 0.828-0.672 1.5-1.5 1.5S9 21.328 9 20.5 9.672 19 10.5 19s1.5 0.672 1.5 1.5zm3.5 1.5c0.828 0 1.5-0.672 1.5-1.5S16.328 19 15.5 19 14 19.672 14 20.5s0.672 1.5 1.5 1.5zm5 0c0.828 0 1.5-0.672 1.5-1.5S21.328 19 20.5 19 19 19.672 19 20.5s0.672 1.5 1.5 1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

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

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

@@ -0,0 +1,6 @@
+<?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="M10 2c1.657 0 3 1.343 3 3v1h1c1.105 0 2 0.895 2 2v7c0 1.105-0.895 2-2 2H6c-1.105 0-2-0.895-2-2V8c0-1.105 0.895-2 2-2h1V5c0-1.657 1.343-3 3-3zm0 8.5c-0.552 0-1 0.448-1 1s0.448 1 1 1 1-0.448 1-1-0.448-1-1-1zM10 4C9.448 4 9 4.448 9 5v1h2V5c0-0.552-0.448-1-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+	</group>
+</vector>

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

@@ -1,10 +1,10 @@
-<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="M16.7096,17.7682C19.4819,17.4391 21.8955,15.7408 22.199,14.1888C22.6769,11.7442 22.6376,8.2231 22.6376,8.2231C22.6376,3.4504 19.4929,2.0516 19.4929,2.0516C17.9073,1.3274 15.1846,1.023 12.356,1H12.2865C9.4579,1.023 6.7369,1.3274 5.1513,2.0516C5.1513,2.0516 2.0066,3.4504 2.0066,8.2231C2.0066,8.5125 2.0051,8.8169 2.0035,9.1339C1.9991,10.0135 1.9943,10.9896 2.0199,12.0083C2.1341,16.6755 2.8805,21.2752 7.2202,22.4175C9.2213,22.944 10.9392,23.0542 12.323,22.9785C14.832,22.8403 16.2406,22.0883 16.2406,22.0883L16.1577,20.2779C16.1577,20.2779 14.3648,20.8402 12.3511,20.7717C10.356,20.7037 8.2496,20.5577 7.9269,18.1221C7.8972,17.9082 7.8823,17.6794 7.8823,17.4391C7.8823,17.4391 9.8408,17.9152 12.323,18.0283C13.8407,18.0974 15.2639,17.9399 16.7096,17.7682ZM18.8747,14.3719V8.5932C18.8747,7.4121 18.5723,6.4736 17.9648,5.7792C17.3382,5.0849 16.518,4.729 15.4997,4.729C14.3212,4.729 13.4291,5.1792 12.8392,6.0799L12.2657,7.0359L11.692,6.0799C11.1023,5.1792 10.21,4.729 9.0316,4.729C8.0134,4.729 7.193,5.0849 6.5664,5.7792C5.9589,6.4736 5.6565,7.4121 5.6565,8.5932V14.3719H7.959V8.763C7.959,7.5805 8.4594,6.9806 9.4602,6.9806C10.5665,6.9806 11.1211,7.6925 11.1211,9.1001V12.1701H13.4101V9.1001C13.4101,7.6925 13.9647,6.9806 15.071,6.9806C16.0718,6.9806 16.5722,7.5805 16.5722,8.763V14.3719H18.8747Z"
-      android:fillColor="#fff"
-      android:fillType="evenOdd"/>
+<vector android:height="24dp" android:viewportHeight="320"
+    android:viewportWidth="320" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:rotation="90" android:translateX="304" android:translateY="16" android:scaleX=".9" android:scaleY=".9">
+        <clip-path android:pathData="M0,0 0,320 320,320 320,0">
+            <path android:fillColor="#fff" android:pathData="M331.17,455.15c-0.9,-16.19 -2.47,-32.4 -4,-48.56 -0.18,-1.83 -0.35,-3.66 -0.53,-5.49 0,-0.4 -0.07,-0.79 -0.11,-1.19 -0.23,-2.39 -0.45,-4.79 -0.67,-7.18q-1.17,-12.75 -2.2,-25.6c-1,-12.83 -2,-25.72 -3,-38.63q-0.5,-6.45 -1,-12.91c-1.36,-17.23 -2.81,-34.48 -4.56,-51.69 -2.47,-24.15 -5.54,-48.22 -9.8,-72a13.13,13.13 0,0 0,-2 1c-18.27,11.86 -31.15,63.65 -38.89,82.19a2.7,2.7 0,0 1,-5.18 -0.79c-0.53,-5.37 -0.76,-10.78 -0.77,-16.2v-1.05a303.5,303.5 0,0 1,7.59 -65.79c4.46,-19.78 9.28,-44 23.15,-59.59 0.23,-0.26 1.83,-1.9 1.83,-1.9 -3,-14.17 -14.66,-42.19 -14.67,-42.2a136.07,136.07 0,0 0,-12.61 -25.07C242.82,29.09 204.46,0 166.47,0a70.43,70.43 0,0 0,-16.56 1.94c-39.17,9.42 -70.55,53.52 -88.75,87C40.69,126.5 29.93,168.34 20.1,209.72 5.32,271.87 -2.82,335.37 -8.77,398.91 -13.67,451.32 -30.7,510 22.87,541.51c24.5,14.41 53.18,23.56 81.15,28.16a213.92,213.92 0,0 0,34.86 2.51c10.31,0 20.64,-0.47 30.93,-0.95l108.72,-5c1.57,-0.07 3.2,-0.12 4.83,-0.12 8.69,0 17.78,1.42 22.39,8.4 0.55,-5.81 -4.53,-15.25 -10.6,-25.33l12.44,-2.81c0.31,-10 1.32,-17.53 5.46,-11.76 2,2.84 4.78,6 8.24,5.55 4.06,-0.49 5.79,-5.35 6.52,-9.37C332.36,505.83 332.59,480.52 331.17,455.15ZM168.3,538.52c-9.72,0.45 -19.77,0.91 -29.42,0.91a180.1,180.1 0,0 1,-29.54 -2.07C83.06,533 58.9,524.71 39.48,513.28c-12.37,-7.27 -18.39,-16 -20.79,-30 -2.74,-16 -0.24,-36.07 2.41,-57.29 1,-7.83 2,-15.93 2.74,-24C30.92,326.23 39.59,269.28 52,217.29c9.57,-40.22 19.67,-79.12 38,-112.74 21.38,-39.27 46.67,-65.73 67.64,-70.77a37.8,37.8 0,0 1,8.91 -1c14.5,0 31.71,7.73 47.22,21.2C228.67,67 240.3,83.72 245,99c-11.69,29.46 -22.95,68.57 -27.31,96.85C206,271.74 198.13,413.31 201.13,537Z"/>
+            <path android:fillColor="#fff" android:pathData="M177.15,182.12a30.01,18.34 97.5,1 0,7.83 -59.51a30.01,18.34 97.5,1 0,-7.83 59.51z"/>
+            <path android:fillColor="#fff" android:pathData="M0,320 320,320 288,288 32,288"/>
+        </clip-path>
+    </group>
 </vector>

mastodon/src/main/res/layout/display_item_header.xml

@@ -9,26 +9,29 @@
 
 	<ImageView
 		android:id="@+id/more"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
+		android:layout_width="36dp"
+		android:layout_height="36dp"
 		android:layout_alignParentTop="true"
 		android:layout_alignParentEnd="true"
+		android:layout_marginTop="-6dp"
+		android:layout_marginRight="-8dp"
 		android:background="?android:selectableItemBackgroundBorderless"
-		android:scaleType="center"
-		android:tint="?android:textColorSecondary"
 		android:contentDescription="@string/more_options"
-		android:src="@drawable/ic_post_more" />
+		android:scaleType="center"
+		android:src="@drawable/ic_post_more"
+		android:tint="?android:textColorSecondary" />
 
 	<ImageView
 		android:id="@+id/visibility"
-		android:layout_width="24dp"
-		android:layout_height="20dp"
-		android:layout_alignParentEnd="true"
-		android:layout_below="@id/more"
+		android:layout_width="36dp"
+		android:layout_height="36dp"
+		android:layout_marginTop="-6dp"
+		android:layout_marginRight="6dp"
+		android:layout_toLeftOf="@id/more"
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:scaleType="center"
-		android:tint="?android:textColorSecondary"
-		android:src="@drawable/ic_visibility" />
+		android:src="@drawable/ic_visibility"
+		android:tint="?android:textColorSecondary" />
 
 	<ImageView
 		android:id="@+id/avatar"
@@ -42,9 +45,9 @@
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
 		android:layout_height="24dp"
-		android:layout_toEndOf="@id/avatar"
-		android:layout_toStartOf="@id/more"
-		android:layout_marginEnd="8dp">
+		android:layout_marginEnd="8dp"
+		android:layout_toStartOf="@id/visibility"
+		android:layout_toEndOf="@id/avatar">
 
 		<TextView
 			android:id="@+id/name"
@@ -52,8 +55,8 @@
 			android:layout_height="24dp"
 			android:ellipsize="end"
 			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
 			android:textAlignment="viewStart"
+			android:textAppearance="@style/m3_title_medium"
 			tools:text="Eugen" />
 
 		<TextView
@@ -62,10 +65,10 @@
 			android:layout_height="24dp"
 			android:layout_marginStart="8dp"
 			android:ellipsize="end"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_title_medium"
 			android:fontFamily="sans-serif"
+			android:singleLine="true"
 			android:textAlignment="viewStart"
+			android:textAppearance="@style/m3_title_medium"
 			tools:text="boosted your cat picture" />
 
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
@@ -74,8 +77,9 @@
 		android:layout_width="match_parent"
 		android:layout_height="20dp"
 		android:layout_below="@id/name_wrap"
-		android:layout_toEndOf="@id/avatar"
+		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/visibility"
+		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
 		android:orientation="horizontal">
 
@@ -94,6 +98,7 @@
 			android:layout_height="20dp"
 			android:layout_marginLeft="4dp"
 			android:layout_marginRight="4dp"
+			android:importantForAccessibility="no"
 			android:text="·"
 			android:textAppearance="@style/m3_title_small" />
 
@@ -101,8 +106,8 @@
 			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
 			android:layout_height="20dp"
-			android:textAppearance="@style/m3_title_small"
 			android:singleLine="true"
+			android:textAppearance="@style/m3_title_small"
 			tools:text="3h" />
 
 	</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>

mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml

@@ -2,15 +2,16 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="-6dp"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
-	android:paddingTop="16dp">
+	android:layout_marginBottom="-12dp">
 
 	<TextView
 		android:id="@+id/text"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:paddingHorizontal="16dp"
+		android:paddingTop="16dp"
+		android:paddingBottom="6dp"
+		android:background="?android:selectableItemBackground"
 		android:textAppearance="@style/m3_title_small"
 		android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
 		android:drawableTint="?android:textColorSecondary"

mastodon/src/main/res/layout/display_item_text.xml

@@ -14,9 +14,12 @@
 		<LinearLayout
 			android:id="@+id/spoiler_header"
 			android:orientation="vertical"
+			android:layout_marginTop="6dp"
+			android:layout_marginBottom="8dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content">
 			<View
+				android:id="@+id/border_top"
 				android:layout_width="match_parent"
 				android:layout_height="0.5dp"
 				android:background="?attr/colorPollVoted"/>
@@ -24,18 +27,17 @@
 			<TextView
 				android:id="@+id/spoiler_title_inline"
 				android:paddingHorizontal="16dp"
-				android:paddingVertical="12dp"
+				android:paddingVertical="14dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginBottom="0dp"
 				android:textAppearance="@style/m3_title_medium"
 				android:background="?colorBackgroundLight"
 				tools:text="CW title"/>
 
 			<View
+				android:id="@+id/border_bottom"
 				android:layout_width="match_parent"
 				android:layout_height="0.5dp"
-				android:layout_marginBottom="12dp"
 				android:background="?attr/colorPollVoted"/>
 		</LinearLayout>
 

mastodon/src/main/res/layout/fragment_compose.xml

@@ -40,6 +40,7 @@
 				android:layout_marginTop="16dp"
 				android:textAppearance="@style/m3_title_small"
 				android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
+				tools:drawableEnd="@drawable/ic_fluent_earth_20_regular"
 				android:drawableTint="?android:textColorSecondary"
 				android:drawablePadding="6dp"
 				android:singleLine="true"

mastodon/src/main/res/layout/fragment_profile.xml

@@ -28,10 +28,10 @@
 					<org.joinmastodon.android.ui.views.CoverImageView
 						android:id="@+id/cover"
 						android:layout_width="match_parent"
-						android:layout_height="229dp"
-						android:background="#808080"
+						android:layout_height="200dp"
+						android:background="?profileHeaderBackground"
 						android:contentDescription="@string/profile_header"
-						android:scaleType="centerCrop"/>
+						android:scaleType="centerCrop" />
 
 					<TextView
 						android:id="@+id/follows_you"
@@ -54,8 +54,8 @@
 
 					<FrameLayout
 						android:id="@+id/avatar_border"
-						android:layout_width="102dp"
-						android:layout_height="102dp"
+						android:layout_width="112dp"
+						android:layout_height="112dp"
 						android:layout_below="@id/cover"
 						android:layout_alignParentStart="true"
 						android:layout_marginTop="-40dp"
@@ -65,8 +65,8 @@
 
 						<ImageView
 							android:id="@+id/avatar"
-							android:layout_width="98dp"
-							android:layout_height="98dp"
+							android:layout_width="108dp"
+							android:layout_height="108dp"
 							android:layout_gravity="center"
 							android:scaleType="centerCrop"
 							android:contentDescription="@string/profile_picture"
@@ -234,22 +234,27 @@
 						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
 						android:layout_marginStart="16dp"
-						android:layout_marginTop="12dp"
+						android:layout_marginTop="17dp"
+						android:layout_marginBottom="0.4dp"
 						android:layout_toStartOf="@id/profile_action_btn_wrap"
-						android:textAppearance="@style/m3_headline_small"
 						android:textAlignment="viewStart"
+						android:textAppearance="@style/m3_headline_small"
 						tools:text="Eugen" />
 
+
 					<TextView
 						android:id="@+id/username"
-						android:layout_width="match_parent"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
+						android:layout_marginTop="2dp"
 						android:layout_below="@id/name"
-						android:layout_marginStart="16dp"
-						android:layout_toStartOf="@id/profile_action_btn_wrap"
+						android:paddingHorizontal="16dp"
+						android:paddingTop="2dp"
+						android:paddingBottom="4dp"
+						android:background="?android:selectableItemBackground"
 						android:textAppearance="@style/m3_title_medium"
 						android:textColor="?android:textColorSecondary"
-						tools:text="\@Gargron"/>
+						tools:text="\@Gargron" />
 
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
@@ -257,7 +262,7 @@
 						android:layout_height="wrap_content"
 						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
-						android:layout_marginTop="8dp"
+						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"

mastodon/src/main/res/menu/notifications.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/follow_requests"
+		android:icon="@drawable/ic_follow_requests_24_badged"
+		android:showAsAction="always"
+		android:title="@string/follow_requests" />
+</menu>

mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,9 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome>
-        <layer-list>
-            <item android:drawable="@drawable/ic_launcher_monochrome" android:gravity="center"/>
-        </layer-list>
-    </monochrome>
 </adaptive-icon>

mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,9 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome>
-        <layer-list>
-            <item android:drawable="@drawable/ic_launcher_monochrome" android:gravity="center"/>
-        </layer-list>
-    </monochrome>
 </adaptive-icon>