bump version

closes #39

README.md

@@ -4,34 +4,86 @@
 
 > 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/mastodon-android-fork/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/mastodos/releases/latest/download/mastodos.apk)
 
-## Changes
+---
+
+## Key features
+
+### **Unlisted posting**
+
+**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
+
+When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
+  
+The Mastodon documentation has some more information about [Unlisted posting](https://docs.joinmastodon.org/user/posting/#unlisted) and [Public timelines](https://docs.joinmastodon.org/user/network/#timelines).
+
+### **Federated timeline**
+
+**This allows you to chronologically see all Public posts from people on all other Fediverse instances your home instance is connected to.**
+
+Despite being one of the main features of federated social media, the Federated timeline wasn’t included in the official Mastodon app – supposedly, because this conflicts with Google’s safety requirements for apps on the Play Store.
+  
+That’s one of the reasons why choosing a small, **well-moderated instance is important**. Instance admins and moderators should always make sure to ban abusive users and stop federating with instances who platform them. On well-moderated instances, the Federated timeline can be a welcoming place to meet new people!
+
+### **Image description viewer**
+
+**Allows you to quickly check whether an image or video has an alternative text attached to it.**
+
+This is important to **ensure the content you’re sharing is as accessible as possible** to people who can’t see the images and rely on software to read back the provided content descriptions. Thankfully, it’s quite common for people on the Fediverse to provide such alt texts, and hopefully things stay this way!
+
+### **Pinning posts**
+
+**This lets you can highlight important posts on your profile. A dedicated “Pinned” tab in people’s profiles shows all the posts they pinned.**
+
+On the Fediverse, it’s quite common for people to pin posts they want others to read before following them. You can pin/unpin posts yourself by clicking the `⋯` button in the top right corner of your posts.
+
+### **Bookmarks**
+
+**They allow for quickly saving posts and viewing them through the Bookmarks button on the top right of your profile.**
+
+To bookmark a post, press the button between the Favorite and Share buttons on the bottom of the post. Bookmarks are saved privately, so the post authors won’t know you saved their post – the list of bookmarked posts is only visible to you.
+
+## Installation
+
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Mastodos 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.
+
+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!
+
+---
+
+## Detailed changes
 
 ### Features
 
-* [Add “Unlisted” as a post visibility option](https://github.com/sk22/mastodon-android-fork/tree/feature/enable-unlisted)
+* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos: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/mastodon-android-fork/tree/feature/add-federated-timeline) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/8))
-* [Add image description button and viewer](https://github.com/sk22/mastodon-android-fork/tree/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/mastodon-android-fork/tree/feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
-* [Implement a bookmark button and list](https://github.com/sk22/mastodon-android-fork/tree/feature/bookmarks) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/22))
-* [Add “Mark media as sensitive” option](https://github.com/sk22/mastodon-android-fork/tree/feature/mark-media-as-sensitive)
-* [Add “Check for update” button in addition to integrated update checker](https://github.com/sk22/mastodon-android-fork/commits/feature/check-for-update-button)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos: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:mastodos: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:mastodos: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:mastodos: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:mastodos: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:mastodos:feature/check-for-update-button)
+* [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/mark-media-as-sensitive)
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos: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/mastodon/mastodon-android/compare/master...sk22:mastodos: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:mastodos:feature/favs-list)
+* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/follow-requests)
+* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
 
 ### Behavior
 
-* [Make back button return to the home tab before exiting the app](https://github.com/sk22/mastodon-android-fork/tree/feature/back-returns-home) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/118))
-* [Always preserve content warnings when replying](https://github.com/sk22/mastodon-android-fork/tree/feature/always-preserve-cw) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/113))
-* [Display full image when adding image description](https://github.com/sk22/mastodon-android-fork/tree/feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
-* [Implement deleting and re-drafting](https://github.com/sk22/mastodon-android-fork/tree/feature/delete-redraft) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/21))
-* [Set spoiler height independently to content height](https://github.com/sk22/mastodon-android-fork/commits/spoiler-height-independent) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/166))
-
-### Installation
-
-To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/mastodon-android-fork/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/mastodon-android-fork/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!
+* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos: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:mastodos: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:mastodos: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:mastodos:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
+* [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:compact-extended-footer)
+* [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:settings/hide-interaction-numbers)
+* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
 
 ### Branding
 

_config.yml

@@ -0,0 +1,2 @@
+title: Mastodos
+theme: minima

fastlane/metadata/android/bn-BD/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/bn-BD/short_description.txt

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

fastlane/metadata/android/bn-BD/title.txt

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

fastlane/metadata/android/gd-GB/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/gd-GB/short_description.txt

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

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

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

fastlane/metadata/android/he-IL/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!
+מסטודון היא הרשת החברתית המבוזרת הגדולה ביותר באינטרנט. במקום אתר אחד, מסטודון היא רשת של מיליוני משתמשים בקהילות עצמאיות שיכולות לפעול ביחד באופן חלק. לא משנה מה הקטע שלכם, אתם יכולים לפגוש אנשים שמתעניינים בו וכותבים עליו במסטודון!
 
-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.
+הצטרפו לקהילה וצרו את המשתמש שלכם. גלו ועקבו אחר אנשים מרתקים וקראו את הרשומות שלהם על גבי ציר זמן כרונולוגי וללא פרסומות. הביעו את עצמכם באמצעות אמוג׳ים מעוצבים, תמונות, גיפים, סרטונים, ושמע ברשומות של עד 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.
+מסטודון בנויה עם פוקוס על פרטיות ובטיחות. קבעו האם הרשומות יתפרסמו עבור העוקבים שלכם, רק האנשים שאתם מציינים, או כל העולם. אזהרות תוכן מאפשרות לכם להסתיר רשומות המכילות תוכן רגיש או שעלול להוות טריגר עד שתהיו מוכנים להתמודד איתן. לכל קהילה כללים ומנהלים משלה שמטרתם לשמור על כך שכל חבריה יהיו בטוחים, וכלי חסימה ודיווח ענפים כדי לעזור למנוע שימוש לרעה.
 
-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/he-IL/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+רשת חברתית מבוזרת

fastlane/metadata/android/hi-IN/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/hi-IN/short_description.txt

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

fastlane/metadata/android/hi-IN/title.txt

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

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

@@ -0,0 +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!
+
+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.
+
+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.
+
+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
+
+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/id-ID/short_description.txt

@@ -0,0 +1 @@
+Jaringan sosial terdesentralisasi

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

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

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

@@ -0,0 +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!
+
+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.
+
+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.
+
+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
+• 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
+
+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/nl-NL/short_description.txt

@@ -0,0 +1 @@
+Gedecentraliseerd sociaal netwerk

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

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

fastlane/metadata/android/pl-PL/full_description.txt

@@ -1,8 +1,8 @@
 Mastodon to największa zdecentralizowana sieć społecznościowa w Internecie. Zamiast jednej strony internetowej, jest to sieć milionów użytkowników w niezależnych społecznościach, które mogą ze sobą wchodzić w interakcje. Niezależnie od swoich zainteresowań, momżesz poznać interesujących ludzi piszących o nich na Mastodonie!
 
-Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do śledzenia i zyskujące popularność hashtagi, by poszerzać swoją sieć.
+Dołącz do społeczności i utwórz swój profil. Poznaj i obserwuj fascynujących ludzi i czytaj ich wpisy w chronologicznym osi czasu. Wyrażaj siebie za pomocą niestandardowych emoji, obrazów, GIFów, filmów i audio w 500-znakowych wpisach. Odpowiadaj na wątki i podawaj dalej posty od każdego, aby dzielić się wspaniałymi rzeczami. Odnajduj nowe konta do obserwowania i zyskujące popularność hashtagi, by poszerzać swoją sieć.
 
-Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom śledzącym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
+Mastodon został zaprojektowany z myślą o prywatności i bezpieczeństwie. Decyduj, czy Twoje wpisy są udostępniane osobom obserwującym Cię, tylko wzmiankowanym, czy całemu światu. Ostrzeżenia dotyczące zawartości pozwalają ukrywać posty zawierające wrażliwe lub wyzywające materiały, dopóki nie będziesz gotów się z nimi pogodzić. Każda społeczność ma własne wytyczne i moderatorów, aby zapewniać swoim członkom bezpieczeństwo, a także solidne narzędzia blokowania i raportowania pomagające zapobiegać nadużyciom.
 
 Więcej funkcji:
 
@@ -13,4 +13,4 @@ Więcej funkcji:
 • Udostępnianie: Publikuj bezpośrednio na Mastodonie z menu udostępniania w dowolnej aplikacji
 • Słodycz: Nasza maskotka to uroczy słoń i zobaczysz go pojawiającego się od czasu do czasu
 
-Mastodon to zarejestrowana organizacja non-profit i rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.
+Mastodon to zarejestrowana organizacja non-profit, a rozwój jest wspierany bezpośrednio przez darowizny. Nie ma reklam, monetyzacji, ani kapitału inwestycyjnego i planujemy, by tak pozostało.

fastlane/metadata/android/pt-BR/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 é a maior rede social descentralizada na internet. Ao invés de ser um ‘website’, é uma rede de milhões de usuários em comunidades independentes que podem comunicar-se uma à outra, de forma transparente. Independente do que você gostar, você pode encontrar pessoas dedicadas a isso no 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.
+Junte-se a uma comunidade e crie o seu perfil. Encontre e siga pessoas fascinantes e leia seus posts em uma linha cronológica sem publicidade. Se expresse com emojis personalizados, imagens, GIFs, vídeos e áudio em publicações de 500 caracteres. Responda a tópicos e reblogue publicações de qualquer um para compartilhar coisas ótimas. Encontre contas novas para seguir e hashtags em alta para expandir sua rede.
 
-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.
+O Mastodon foi construído com foco em privacidade e segurança. Decida se seus posts serão compartilhados com seus seguidores, apenas com as pessoas que você menciona, ou com o mundo inteiro. Avisos de conteúdo permitem que você oculte mensagens que contenham conteúdo sensível até você estar pronto para interagir com elas. Cada comunidade tem suas próprias diretrizes e moderadores para manter seus membros seguros, e ferramentas robustas de bloqueio e denúncias ajudam a prevenir abusos.
 
-More features:
+Mais detalhes:
 
-• 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
+• Modo escuro: Leia as postagens no modo claro, escuro ou preto de verdade
+• Enquetes: Peça as opiniões de seus seguidores e registre os resultados
+• Explorar: Hashtags e contas em destaque estão a um toque de distância
+• Notificações: Seja notificado sobre novos seguidores, respostas e reblogs
+• Compartilhar: Poste diretamente ao Mastodon pela página de compartilhamento de qualquer aplicativo
+• Fofura: Nossa mascote é um elefante fofinho, e você vai vê-lo por aí ocasionalmente
 
-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 é uma instituição sem fins lucrativos e o desenvolvimento é suportado diretamente pelas suas doações. Não há publicidade, não há monetização, nem capital de risco, e planejamos manter-se assim.

fastlane/metadata/android/pt-BR/short_description.txt

@@ -1 +1 @@
-Decentralized social network
+Rede social descentralizada

fastlane/metadata/android/si-LK/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/si-LK/short_description.txt

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

fastlane/metadata/android/si-LK/title.txt

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

fastlane/metadata/android/sv-SE/full_description.txt

@@ -1,6 +1,6 @@
 Mastodon är det största decentraliserade sociala nätverket på internet. I stället för en enda webbplats är det ett nätverk av miljontals användare på oberoende servrar som alla kan interagera med varandra, sömlöst. Oavsett vad du är intresserad av kan du träffa passionerade personer som diskuterar ämnet på Mastodon!
 
-Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och ompostningar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
+Gå med på en server och skapa din profil. Hitta och följ fascinerande människor och läsa deras inlägg i en annonsfri, kronologisk tidslinje. Uttryck dig med anpassade emoji, bilder, GIF:ar, videor och ljud i 500-teckensinlägg. Svara på trådar och boostar från vem som helst för att dela bra saker. Hitta nya konton att följa och trendande hashtaggar för att utöka ditt nätverk.
 
 Mastodon är byggt med fokus på integritet och trygghet. Bestäm om dina inlägg delas med dina följare, bara personer du omnämner, eller hela världen. Innehållsvarningar låter dig dölja inlägg som innehåller känsligt eller triggande material tills du är redo att interagera med dem. Varje server har sina egna riktlinjer och moderatorer för att hålla sina medlemmar trygga, och robusta blockerings- och rapporteringsverktyg för att förhindra missbruk.
 
@@ -9,7 +9,7 @@ Fler funktioner:
 • Mörkt läge: Läs inlägg i ljust, mörkt eller helsvart läge
 • Omröstningar: Fråga följare om deras åsikt och sammanställ deras röster
 • Utforska: Trendande hashtaggar och konton är ett tryck bort
-• Notiser: Bli meddelad om nya följare, svar och ompostningar
+• Notiser: Bli meddelad om nya följare, svar och boostar
 • Delning: Posta direkt till Mastodon från delningsbladet i alla appar
 • Gullighet: Vår maskot är en bedårande elefant, och du kommer att se dem dyka upp då och då
 

fastlane/metadata/android/th-TH/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
+Mastodon เป็นเครือข่ายสังคมแบบกระจายศูนย์ที่ใหญ่ที่สุดบนอินเทอร์เน็ต ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon! ซึ่งไม่ได้เป็นเว็บไซต์เดียว แต่เป็นเครือข่ายของผู้ใช้หลายล้านคนในชุมชนอิสระที่ทุกคนสามารถโต้ตอบซึ่งกันและกันได้แบบไร้รอยต่อ ไม่ว่าคุณจะชอบอะไร คุณก็พบคนที่ชื่นชอบเหมือนกันโพสต์เกี่ยวกับสิ่งที่คุณชอบได้บน Mastodon!
 
 เข้าร่วมชุมชนและสร้างโปรไฟล์ ค้นหาและติดตามผู้คนที่น่าสนใจและอ่านโพสต์ของเขาในไทม์ไลน์ที่ไร้โฆษณาและเรียงตามลำดับเวลาล้วน ๆ แสดงความรู้สึกของตัวคุณเองด้วยอีโมจิที่กำหนดเอง รูปภาพ GIF วิดีโอ และเสียงในโพสต์ 500 ตัวอักษร ตอบกลับและดันโพสต์จากคนอื่น ๆ เพื่อแชร์สิ่งดี ๆ และค้นหาบัญชีใหม่ ๆ ที่จะติดตามและแฮชแท็กที่เป็นที่นิยมเพื่อขยายเครือข่ายของคุณ
 
@@ -13,4 +13,4 @@ Mastodon สร้างขึ้นโดยเน้นความเป็
 • การแชร์: โพสต์ลง Mastodon ได้โดยตรงจากแอปอื่น ๆ ที่อยู่ในเครื่อง
 • ความน่ารัก: มาสคอตของเราเป็นช้างน่ารัก และคุณจะเห็นมันโผล่ออกมาเป็นระยะ ๆ
 
-Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป
+Mastodon เป็นองค์กรไม่แสวงหาผลกำไรที่จดทะเบียนแล้ว และการพัฒนาได้รับการสนับสนุนจากเงินบริจาคของคุณโดยตรง ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป ดังนั้นจึงไม่มีโฆษณา ไม่มีการทำกำไร และไม่มีการร่วมลงทุน และเรามีแผนจะทำให้เป็นอย่างนี้ต่อไป

fastlane/metadata/android/vi-VN/full_description.txt

@@ -1,6 +1,6 @@
-Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người dùng trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
+Mastodon là mạng xã hội liên hợp lớn nhất trên internet. Thay vì một trang web duy nhất, nó là một mạng lưới hàng triệu người trong các máy chủ độc lập, tất cả đều có thể tương tác với nhau một cách liền mạch. Bất kể bạn thích gì, bạn đều có thể gặp gỡ những người đăng tút về nó trên Mastodon!
 
-Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người dùng mới để theo dõi và các hashtag nổi bật để mở rộng mạng lưới của bạn.
+Tham gia một máy chủ và tạo trang hồ sơ của bạn. Tìm, theo dõi những người thú vị và đọc tút của họ theo trình tự thời gian, không có quảng cáo. Thể hiện bản thân bằng emoji, hình ảnh, GIF, video và âm thanh trong tút tối đa 500 ký tự. Trả lời tút và đăng lại tút từ bất kỳ ai để chia sẻ những điều tuyệt vời. Tìm những người mới để theo dõi và các hashtag nổi bật để mở rộng mạng lưới của bạn.
 
 Mastodon được xây dựng tập trung vào sự riêng tư và an toàn. Quyết định xem tút của bạn được chia sẻ với những người theo dõi, chỉ những người bạn nhắc đến hay cả thế giới. Nội dung ẩn cho phép bạn ẩn các tút chứa nội dung nhạy cảm hoặc chơi chữ cho đến khi bạn sẵn sàng tương tác với chúng. Mỗi máy chủ có các nguyên tắc riêng và kiểm duyệt viên riêng để giữ an toàn cho các thành viên, song song với các công cụ chặn và báo cáo mạnh mẽ giúp ngăn chặn hành vi bậy.
 

fastlane/metadata/android/zh-CN/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon 是互联网上最大的去中心化社交网络。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。
+Mastodon 是互联网上最大的去中心化社交网络。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。 它不是一个网站，而是由独立社区节点及其数以百万计的用户组成的网络，所有这些用户都能够无缝地相互交流。 无论你进入哪一个节点，你都可以与所有在 Mastodon 的人之间进行交流。
 
 加入一个社区节点并创建你的账户。 寻找并关注感兴趣的同好，无广告地浏览他们的时间线。 用自定义表情、图像、GIF、视频和音频在 500 个字符的帖子里写下你的想法。 回复及转发其他人的帖子来共同分享美好的事物。 寻找新的账户以及热门的话题来拓展你的网络。
 
@@ -13,4 +13,4 @@ Mastodon 以隐私和安全为首要目标。 自由选择你的帖子是分享
 • 分享：从其他应用中的分享菜单中直接发布到 Mastodon
 • 吉祥物：你会不时地看到我们可爱的长毛象
 
-Mastodon 是一个注册的非营利开发项目，直接由您的捐赠支持。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。
+Mastodon 是一个注册的非营利开发项目，直接由您的捐赠支持。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。 没有广告，没有商业化，也没有风险资本，我们计划保持这种方式。

fastlane/metadata/android/zh-TW/full_description.txt

@@ -1,4 +1,4 @@
-Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。
+Mastodon 是網際網路上最大的去中心化社交網路。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 無論您對什麼事情感興趣，您都能在 Mastodon 上遇到充滿熱情的人們討論該話題。 它是一個由能無縫互動的獨立社群中，數百萬使用者組成的網路，而非單一網站。 Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分享、只與您提及的人們分享，又或是與全世界分享。 內容警告可讓您隱藏包含敏感或可能觸發強烈情緒反應的嘟文，直到您準備好與它們進行互動。 每個社群都有它們自己的指導方針與管理原來確保其成員安全，強大的封鎖與回報工具有助於防止濫用。
 
 加入社群並建立您的個人檔案。 尋找並跟隨迷人的朋友們，並在無廣告、按時間順序排列的時間軸上閱讀他們的嘟文。 在 500 個字元的嘟文中使用自訂表情符號、GIF、視訊與音訊來表達您自己。 回覆任何人的話題與轉發貼文以分享精彩內容。 尋找要跟隨的新帳號與熱門主題標籤來拓展您的網路。
 
@@ -13,4 +13,4 @@ Mastodon 以隱私與安全為要。 決定您的嘟文要與您的跟隨者分
 • 分享：從任何應用程式中的分享表中直接發表嘟文到 Mastodon 中
 • 可愛：我們的吉祥物是一隻可愛的大象，您會不時看到牠出現
 
-Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。
+Mastodon 是一家註冊的非營利組織，您的捐款會直接支援開發工作。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。 沒有廣告、沒有貨幣化、沒有風險投資，我們計畫維持這種狀態。

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 30
-		versionName "1.1.4+fork.30"
+		versionCode 41
+		versionName "1.1.4+fork.41"
 		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",
@@ -75,7 +75,7 @@ dependencies {
 	implementation 'me.grishka.litex:dynamicanimation:1.1.0-alpha03'
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.6'
+	implementation 'me.grishka.appkit:appkit:1.2.7'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

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/mastodon-android-fork/releases/latest")
+				.url("https://api.github.com/repos/sk22/mastodos/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){

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

@@ -7,6 +7,11 @@ public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
 	public static boolean trueBlackTheme;
+	public static boolean showReplies;
+	public static boolean showBoosts;
+	public static boolean loadNewPosts;
+	public static boolean showInteractionCounts;
+	public static boolean alwaysExpandContentWarnings;
 	public static ThemePreference theme;
 
 	private static SharedPreferences getPrefs(){
@@ -18,6 +23,11 @@ public class GlobalUserPreferences{
 		playGifs=prefs.getBoolean("playGifs", true);
 		useCustomTabs=prefs.getBoolean("useCustomTabs", true);
 		trueBlackTheme=prefs.getBoolean("trueBlackTheme", false);
+		showReplies=prefs.getBoolean("showReplies", true);
+		showBoosts=prefs.getBoolean("showBoosts", true);
+		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
+		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
+		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 	}
 
@@ -25,7 +35,12 @@ public class GlobalUserPreferences{
 		getPrefs().edit()
 				.putBoolean("playGifs", playGifs)
 				.putBoolean("useCustomTabs", useCustomTabs)
+				.putBoolean("showReplies", showReplies)
+				.putBoolean("showBoosts", showBoosts)
+				.putBoolean("loadNewPosts", loadNewPosts)
 				.putBoolean("trueBlackTheme", trueBlackTheme)
+				.putBoolean("showInteractionCounts", showInteractionCounts)
+				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putInt("theme", theme.ordinal())
 				.apply();
 	}

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

@@ -191,15 +191,18 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	void onError(ErrorResponse err){
-		invokeErrorCallback(err);
+		if(!canceled)
+			invokeErrorCallback(err);
 	}
 
 	void onError(String msg, int httpStatus, Throwable exception){
-		invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus, exception));
+		if(!canceled)
+			invokeErrorCallback(new MastodonErrorResponse(msg, httpStatus, exception));
 	}
 
 	void onSuccess(T resp){
-		invokeSuccessCallback(resp);
+		if(!canceled)
+			invokeSuccessCallback(resp);
 	}
 
 	@Override

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

@@ -12,6 +12,7 @@ import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.OpenableColumns;
+import android.text.TextUtils;
 
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.ui.utils.UiUtils;
@@ -48,6 +49,8 @@ public class ResizedImageRequestBody extends CountingRequestBody{
 			}
 			contentType=MastodonApp.context.getContentResolver().getType(uri);
 		}
+		if(TextUtils.isEmpty(contentType))
+			contentType="image/jpeg";
 		if(needResize(opts.outWidth, opts.outHeight) || needCrop(opts.outWidth, opts.outHeight)){
 			Bitmap bitmap;
 			if(Build.VERSION.SDK_INT>=28){

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

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

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

@@ -0,0 +1,49 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Status;
+
+import java.io.IOException;
+import java.util.List;
+
+import okhttp3.Response;
+
+public class GetFavourites extends MastodonAPIRequest<List<Status>>{
+    private String maxId;
+
+    public GetFavourites(String maxID, String minID, int limit){
+        super(HttpMethod.GET, "/favourites", 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<Status> respObj, Response httpResponse) throws IOException {
+        super.validateAndPostprocessResponse(respObj, httpResponse);
+        // <https://mastodon.social/api/v1/bookmarks?max_id=268962>; rel="next",
+        // <https://mastodon.social/api/v1/bookmarks?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/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

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

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

@@ -4,10 +4,10 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;
 
 public class SetAccountFollowed extends MastodonAPIRequest<Relationship>{
-	public SetAccountFollowed(String id, boolean followed, boolean showReblogs){
+	public SetAccountFollowed(String id, boolean followed, boolean showReblogs, boolean notify){
 		super(HttpMethod.POST, "/accounts/"+id+"/"+(followed ? "follow" : "unfollow"), Relationship.class);
 		if(followed)
-			setRequestBody(new Request(showReblogs, null));
+			setRequestBody(new Request(showReblogs, notify));
 		else
 			setRequestBody(new Object());
 	}

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

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

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

@@ -0,0 +1,17 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ListTimeline;
+
+import java.util.List;
+
+public class GetLists extends MastodonAPIRequest<List<ListTimeline>>{
+    public GetLists() {
+        super(HttpMethod.GET, "/lists", new TypeToken<>(){});
+    }
+    public GetLists(String accountID) {
+        super(HttpMethod.GET, "/accounts/"+accountID+"/lists", new TypeToken<>(){});
+    }
+}

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java

@@ -14,6 +14,6 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 		public String clientName="Mastodos";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://github.com/sk22/mastodon-android-fork";
+		public String website="https://sk22.github.io/mastodos";
 	}
 }

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class GetHashtag extends MastodonAPIRequest<Hashtag> {
+    public GetHashtag(String name){
+        super(HttpMethod.GET, "/tags/"+name, Hashtag.class);
+    }
+}
+

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

@@ -0,0 +1,11 @@
+package org.joinmastodon.android.api.requests.tags;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Hashtag;
+
+public class SetHashtagFollowed extends MastodonAPIRequest<Hashtag>{
+    public SetHashtagFollowed(String name, boolean followed){
+        super(HttpMethod.POST, "/tags/"+name+"/"+(followed ? "follow" : "unfollow"), Hashtag.class);
+        setRequestBody(new Object());
+    }
+}

mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetListTimeline.java

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

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/events/NotificationDeletedEvent.java

@@ -0,0 +1,9 @@
+package org.joinmastodon.android.events;
+
+public class NotificationDeletedEvent{
+	public final String id;
+
+	public NotificationDeletedEvent(String id){
+		this.id=id;
+  }
+}

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

@@ -101,6 +101,8 @@ import org.parceler.Parcels;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -196,19 +198,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private boolean attachmentsErrorShowing;
 
 	private Status editingStatus;
+	private boolean redraftStatus;
 	private boolean pollChanged;
 	private boolean creatingView;
 	private boolean ignoreSelectionChanges=false;
 	private Runnable updateUploadEtaRunnable;
 
-	public static DraftMediaAttachment redraftAttachment(Attachment att) {
-		DraftMediaAttachment draft=new DraftMediaAttachment();
-		draft.serverAttachment=att;
-		draft.description=att.description;
-		draft.uri=Uri.parse(att.url);
-		return draft;
-	}
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -222,6 +217,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		instance=AccountSessionManager.getInstance().getInstanceInfo(instanceDomain);
 		if(getArguments().containsKey("editStatus")){
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
+			redraftStatus=getArguments().getBoolean("redraftStatus");
 		}
 		if(instance==null){
 			Nav.finish(this);
@@ -328,18 +324,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollDurationView.setOnClickListener(v->showPollDurationMenu());
 
 		pollOptions.clear();
-		ArrayList<String> restoredPollOptions=(savedInstanceState!=null ? savedInstanceState : getArguments())
-				.getStringArrayList("pollOptions");
-		if(restoredPollOptions!=null){
-			if(savedInstanceState==null){
-				// restoring from arguments
-				pollDuration=getArguments().getInt("pollDuration");
-				pollDurationStr=DateUtils.formatElapsedTime(pollDuration); // getResources().getQuantityString(R.plurals.x_hours, pollDuration/3600);
-			}
+		if(savedInstanceState!=null && savedInstanceState.containsKey("pollOptions")){
 			pollBtn.setSelected(true);
 			mediaBtn.setEnabled(false);
 			pollWrap.setVisibility(View.VISIBLE);
-			for(String oldText:restoredPollOptions){
+			for(String oldText:savedInstanceState.getStringArrayList("pollOptions")){
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(oldText);
 			}
@@ -353,6 +342,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(eopt.title);
 			}
+			pollDuration=(int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond();
+			pollDurationStr=UiUtils.formatTimeLeft(getActivity(), editingStatus.poll.expiresAt);
 			updatePollOptionHints();
 			pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr));
 		}else{
@@ -374,13 +365,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
-		sensitive = editingStatus != null ? editingStatus.sensitive
-				: (savedInstanceState != null && savedInstanceState.getBoolean("sensitive", false));
-		sensitiveIcon.setSelected(sensitive);
-
-		ArrayList<Parcelable> serializedAttachments=(savedInstanceState!=null ? savedInstanceState : getArguments())
-				.getParcelableArrayList("attachments");
-		if(serializedAttachments!=null){
+		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
+			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
 			for(Parcelable a:serializedAttachments){
 				DraftMediaAttachment att=Parcels.unwrap(a);
 				attachmentsView.addView(createMediaAttachmentView(att));
@@ -422,17 +408,17 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putStringArrayList("pollOptions", opts);
 			outState.putInt("pollDuration", pollDuration);
 			outState.putString("pollDurationStr", pollDurationStr);
-			outState.putBoolean("hasSpoiler", hasSpoiler);
-			if(!attachments.isEmpty()){
-				ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
-				for(DraftMediaAttachment att:attachments){
-					serializedAttachments.add(Parcels.wrap(att));
-				}
-				outState.putParcelableArrayList("attachments", serializedAttachments);
-			}
-			outState.putSerializable("visibility", statusVisibility);
 		}
 		outState.putBoolean("sensitive", sensitive);
+		outState.putBoolean("hasSpoiler", hasSpoiler);
+		if(!attachments.isEmpty()){
+			ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
+			for(DraftMediaAttachment att:attachments){
+				serializedAttachments.add(Parcels.wrap(att));
+			}
+			outState.putParcelableArrayList("attachments", serializedAttachments);
+		}
+		outState.putSerializable("visibility", statusVisibility);
 	}
 
 	@Override
@@ -540,7 +526,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					spoilerBtn.setSelected(true);
 				}
 			}
-		}else{
+		}else if (editingStatus==null || editingStatus.inReplyToId==null){
+			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
 			replyText.setVisibility(View.GONE);
 		}
 		if(savedInstanceState==null){
@@ -557,6 +544,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						da.serverAttachment=att;
 						da.description=att.description;
 						da.uri=Uri.parse(att.previewUrl);
+						da.state=AttachmentUploadState.DONE;
 						attachmentsView.addView(createMediaAttachmentView(da));
 						attachments.add(da);
 					}
@@ -584,14 +572,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		if(editingStatus!=null){
 			updateCharCounter();
-			visibilityBtn.setEnabled(false);
+			visibilityBtn.setEnabled(redraftStatus);
 		}
 	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		publishButton=new Button(getActivity());
-		publishButton.setText(editingStatus==null ? R.string.publish : R.string.save);
+		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
 		publishButton.setOnClickListener(this::onPublishClick);
 		LinearLayout wrap=new LinearLayout(getActivity());
 		wrap.setOrientation(LinearLayout.HORIZONTAL);
@@ -696,8 +684,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 		}
-		if(replyTo!=null){
-			req.inReplyToId=replyTo.id;
+		if(replyTo!=null || (editingStatus != null && editingStatus.inReplyToId!=null)){
+			req.inReplyToId=editingStatus!=null ? editingStatus.inReplyToId : replyTo.id;
 		}
 		if(!pollOptions.isEmpty()){
 			req.poll=new CreateStatus.Request.Poll();
@@ -740,6 +728,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					E.post(new StatusUpdatedEvent(result));
 				}
 				Nav.finish(ComposeFragment.this);
+				if (getArguments().getBoolean("navigateToStatus", false)) {
+					Bundle args=new Bundle();
+					args.putString("account", accountID);
+					args.putParcelable("status", Parcels.wrap(result));
+					if(replyTo!=null) args.putParcelable("inReplyToAccount", Parcels.wrap(replyTo));
+					Nav.go(getActivity(), ThreadFragment.class, args);
+				}
 			}
 
 			@Override
@@ -753,7 +748,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
-		if(editingStatus!=null){
+		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)
 					.exec(accountID);

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

@@ -0,0 +1,46 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetFavourites;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class FavoritesListFragment extends StatusListFragment{
+
+    private String accountID;
+    private String lastMaxId=null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        accountID=getArguments().getString("account");
+        AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
+        setTitle(R.string.favorited_posts);
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count) {
+        GetFavourites b=new GetFavourites(offset>0 ? lastMaxId : null, null, count);
+        currentRequest=b.setCallback(new SimpleCallback<>(this){
+            @Override
+            public void onSuccess(List<Status> result){
+                onDataLoaded(result, b.getMaxId()!=null);
+                lastMaxId=b.getMaxId();
+            }
+        })
+                .exec(accountID);
+    }
+}

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

@@ -2,23 +2,34 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.Toast;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.tags.GetHashtag;
+import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
+import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
 
 import java.util.List;
 
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 public class HashtagTimelineFragment extends StatusListFragment{
 	private String hashtag;
+	private boolean following;
 	private ImageButton fab;
+	private MenuItem followButton;
 
 	public HashtagTimelineFragment(){
 		setListLayoutId(R.layout.recycler_fragment_with_fab);
@@ -27,10 +38,61 @@ public class HashtagTimelineFragment extends StatusListFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		hashtag=getArguments().getString("hashtag");
+		updateTitle(getArguments().getString("hashtag"));
+		following=getArguments().getBoolean("following", false);
+
+		setHasOptionsMenu(true);
+	}
+
+	private void updateTitle(String hashtagName) {
+		hashtag = hashtagName;
 		setTitle('#'+hashtag);
 	}
 
+	private void updateFollowingState(boolean newFollowing) {
+		this.following = newFollowing;
+		followButton.setTitle(getString(newFollowing ? R.string.unfollow_user : R.string.follow_user, "#" + hashtag));
+		followButton.setIcon(newFollowing ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.hashtag_timeline, menu);
+		followButton = menu.findItem(R.id.follow_hashtag);
+		updateFollowingState(following);
+
+		followButton.setOnMenuItemClickListener(i -> {
+			updateFollowingState(!following);
+			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
+				@Override
+				public void onSuccess(Hashtag i) {
+					updateFollowingState(i.following);
+					Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					error.showToast(getActivity());
+					updateFollowingState(!following);
+				}
+			}).exec(accountID);
+			return true;
+		});
+
+		new GetHashtag(hashtag).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Hashtag hashtag) {
+				updateTitle(hashtag.name);
+				updateFollowingState(hashtag.following);
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getActivity());
+			}
+		}).exec(accountID);
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count)

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

@@ -24,6 +24,7 @@ import android.widget.Toolbar;
 import com.squareup.otto.Subscribe;
 
 import org.joinmastodon.android.E;
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
@@ -73,6 +74,13 @@ public class HomeTimelineFragment extends StatusListFragment{
 		loadData();
 	}
 
+	private List<Status> filterPosts(List<Status> items) {
+		return items.stream().filter(i ->
+				(GlobalUserPreferences.showReplies || i.inReplyToId == null) &&
+				(GlobalUserPreferences.showBoosts || i.reblog == null)
+		).collect(Collectors.toList());
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		AccountSessionManager.getInstance()
@@ -82,7 +90,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if(getActivity()==null)
 							return;
-						onDataLoaded(result.items, !result.items.isEmpty());
+						List<Status> filteredItems = filterPosts(result.items);
+						onDataLoaded(filteredItems, !result.items.isEmpty());
 						maxID=result.maxID;
 						if(result.isFromCache())
 							loadNewPosts();
@@ -153,6 +162,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 	}
 
 	private void loadNewPosts(){
+		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
 		// The idea here is that we request the timeline such that if there are fewer than `limit` posts,
 		// we'll get the currently topmost post as last in the response. This way we know there's no gap
@@ -164,6 +174,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 					public void onSuccess(List<Status> result){
 						currentRequest=null;
 						dataLoading=false;
+						result = filterPosts(result);
 						if(result.isEmpty() || getActivity()==null)
 							return;
 						Status last=result.get(result.size()-1);

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

@@ -0,0 +1,84 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.media.MediaRouter;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.model.Status;
+
+import java.util.List;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
+
+
+public class ListTimelineFragment extends StatusListFragment {
+    private String listID;
+    private String listTitle;
+    private ImageButton fab;
+
+    public ListTimelineFragment() {
+        setListLayoutId(R.layout.recycler_fragment_with_fab);
+    }
+
+    @Override
+    public void onAttach(Activity activity){
+        super.onAttach(activity);
+        listID=getArguments().getString("listID");
+        listTitle=getArguments().getString("listTitle");
+        setTitle(listTitle);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        // inflater.inflate(R.menu.list, menu);
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count) {
+        currentRequest=new GetListTimeline(listID, offset==0 ? null : getMaxID(), null, count, null)
+                .setCallback(new SimpleCallback<>(this) {
+                    @Override
+                    public void onSuccess(List<Status> result) {
+                        onDataLoaded(result, !result.isEmpty());
+                    }
+                })
+                .exec(accountID);
+    }
+
+    @Override
+    protected void onShown() {
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        fab=view.findViewById(R.id.fab);
+        fab.setOnClickListener(this::onFabClick);
+    }
+
+    private void onFabClick(View v){
+        Bundle args=new Bundle();
+        args.putString("account", accountID);
+        args.putString("prefilledText", listID+' ');
+        Nav.go(getActivity(), ComposeFragment.class, args);
+    }
+
+    @Override
+    protected void onSetFabBottomInset(int inset) {
+        ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
+    }
+}

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

@@ -0,0 +1,188 @@
+package org.joinmastodon.android.fragments;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.GetLists;
+import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.ui.utils.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.utils.V;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
+    private String accountId;
+    private String profileAccountId;
+    private String profileDisplayUsername;
+    private HashMap<String, Boolean> userInListBefore = new HashMap<>();
+    private HashMap<String, Boolean> userInList = new HashMap<>();
+    private int inProgress = 0;
+
+    public ListTimelinesFragment() {
+        super(10);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle args=getArguments();
+        accountId=args.getString("account");
+
+        if(args.containsKey("profileAccount")){
+            profileAccountId=args.getString("profileAccount");
+            profileDisplayUsername=args.getString("profileDisplayUsername");
+            setTitle(getString(R.string.lists_with_user, profileDisplayUsername));
+//            setHasOptionsMenu(true);
+        }
+    }
+
+    @Override
+    protected void onShown(){
+        super.onShown();
+        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+            loadData();
+    }
+
+//    @Override
+//    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+//        Button saveButton=new Button(getActivity());
+//        saveButton.setText(R.string.save);
+//        saveButton.setOnClickListener(this::onSaveClick);
+//        LinearLayout wrap=new LinearLayout(getActivity());
+//        wrap.setOrientation(LinearLayout.HORIZONTAL);
+//        wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+//        wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
+//        wrap.setClipToPadding(false);
+//        MenuItem item=menu.add(R.string.save);
+//        item.setActionView(wrap);
+//        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+//    }
+
+    private void saveListMembership(String listId, boolean isMember) {
+        userInList.put(listId, isMember);
+        List<String> accountIdList = Collections.singletonList(profileAccountId);
+        MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
+        req.setCallback(new SimpleCallback<>(this) {
+            @Override
+            public void onSuccess(Object o) {}
+        }).exec(accountId);
+    }
+
+    @Override
+    protected void doLoadData(int offset, int count){
+        userInListBefore.clear();
+        userInList.clear();
+        currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
+                .setCallback(new SimpleCallback<>(this) {
+                    @Override
+                    public void onSuccess(List<ListTimeline> lists) {
+                        for (ListTimeline l : lists) userInListBefore.put(l.id, true);
+                        userInList.putAll(userInListBefore);
+                        if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
+                        if (profileAccountId == null) return;
+
+                        currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListTimelinesFragment.this) {
+                            @Override
+                            public void onSuccess(List<ListTimeline> allLists) {
+                                List<ListTimeline> newLists = new ArrayList<>();
+                                for (ListTimeline l : allLists) {
+                                    if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
+                                    if (!userInListBefore.containsKey(l.id)) {
+                                        userInListBefore.put(l.id, false);
+                                    }
+                                }
+                                userInList.putAll(userInListBefore);
+                                onDataLoaded(newLists, false);
+                            }
+                        }).exec(accountId);
+                    }
+                })
+                .exec(accountId);
+    }
+
+    @Override
+    protected RecyclerView.Adapter getAdapter() {
+        return new ListsAdapter();
+    }
+
+    @Override
+    public void scrollToTop() {
+        smoothScrollRecyclerViewToTop(list);
+    }
+
+    private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
+        @NonNull
+        @Override
+        public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+            return new ListViewHolder();
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
+            holder.bind(data.get(position));
+        }
+
+        @Override
+        public int getItemCount() {
+            return data.size();
+        }
+    }
+
+    private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
+        private final TextView title;
+        private final CheckBox listToggle;
+
+        public ListViewHolder(){
+            super(getActivity(), R.layout.item_list_timeline, list);
+            title=findViewById(R.id.title);
+            listToggle=findViewById(R.id.list_toggle);
+        }
+
+        @Override
+        public void onBind(ListTimeline item) {
+            title.setText(item.title);
+            if (profileAccountId != null) {
+                Boolean checked = userInList.get(item.id);
+                listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
+                listToggle.setOnClickListener(this::onClickToggle);
+            } else {
+                listToggle.setVisibility(View.GONE);
+            }
+        }
+
+        private void onClickToggle(View view) {
+            saveListMembership(item.id, listToggle.isChecked());
+        }
+
+        @Override
+        public void onClick() {
+            UiUtils.openListTimeline(getActivity(), accountId, item);
+        }
+    }
+}

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{
@@ -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);
@@ -123,12 +158,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();
 	}

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

@@ -9,6 +9,7 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
@@ -54,6 +55,14 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		onlyMentions=getArguments().getBoolean("onlyMentions", false);
 	}
 
+	@Override
+	public void onRefresh() {
+		super.onRefresh();
+		if (getParentFragment() instanceof NotificationsFragment notificationsFragment) {
+			notificationsFragment.refreshFollowRequestsBadge();
+		}
+	}
+
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
 		String extraText=switch(n.type){
@@ -78,7 +87,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				items.add(0, titleItem);
 			return items;
 		}else if(titleItem!=null){
-			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account);
+			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account, n);
 			return Arrays.asList(titleItem, card);
 		}else{
 			return Collections.emptyList();
@@ -180,4 +189,28 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
+	@Subscribe
+	public void onNotificationDeleted(NotificationDeletedEvent ev) {
+		Notification notification = getNotificationByID(ev.id);
+		if(notification==null)
+			return;
+		data.remove(notification);
+		int index=-1;
+		for(int i=0;i<displayItems.size();i++){
+			if(ev.id.equals(displayItems.get(i).parentID)){
+				index=i;
+				break;
+			}
+		}
+		if(index==-1)
+			return;
+		int lastIndex;
+		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
+			if(!displayItems.get(lastIndex).parentID.equals(ev.id))
+				break;
+		}
+		displayItems.subList(index, lastIndex).clear();
+		adapter.notifyItemRangeRemoved(index, lastIndex-index);
+	}
+
 }

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

@@ -98,7 +98,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private CoverImageView cover;
 	private View avatarBorder;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel, postsCount, postsLabel;
-	private ProgressBarButton actionButton;
+	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
 	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
@@ -109,7 +109,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private float titleTransY;
 	private View postsBtn, followersBtn, followingBtn;
 	private EditText nameEdit, bioEdit;
-	private ProgressBar actionProgress;
+	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
@@ -181,6 +181,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		postsLabel=content.findViewById(R.id.posts_label);
 		postsBtn=content.findViewById(R.id.posts_btn);
 		actionButton=content.findViewById(R.id.profile_action_btn);
+		notifyButton=content.findViewById(R.id.notify_btn);
 		pager=content.findViewById(R.id.pager);
 		scrollView=content.findViewById(R.id.scroller);
 		tabbar=content.findViewById(R.id.tabbar);
@@ -188,6 +189,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		nameEdit=content.findViewById(R.id.name_edit);
 		bioEdit=content.findViewById(R.id.bio_edit);
 		actionProgress=content.findViewById(R.id.action_progress);
+		notifyProgress=content.findViewById(R.id.notify_progress);
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 
@@ -258,6 +260,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 
 		actionButton.setOnClickListener(this::onActionButtonClick);
+		notifyButton.setOnClickListener(this::onNotifyButtonClick);
 		avatar.setOnClickListener(this::onAvatarClick);
 		cover.setOnClickListener(this::onCoverClick);
 		refreshLayout.setOnRefreshListener(this);
@@ -458,6 +461,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		UiUtils.loadCustomEmojiInTextView(name);
 		UiUtils.loadCustomEmojiInTextView(bio);
 
+		notifyButton.setVisibility(View.GONE);
 		if(AccountSessionManager.getInstance().isSelf(accountID, account)){
 			actionButton.setText(R.string.edit_profile);
 		}else{
@@ -527,20 +531,24 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(R.menu.profile, menu);
 		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
 		if(isOwnProfile){
 			for(int i=0;i<menu.size();i++){
 				MenuItem item=menu.getItem(i);
-				item.setVisible(item.getItemId()==R.id.share || item.getItemId()==R.id.bookmarks);
+				item.setVisible(item.getItemId()==R.id.share || item.getItemId()==R.id.bookmarks || item.getItemId()==R.id.manage_user_lists);
 			}
+			menu.findItem(R.id.favorites_list).setVisible(true);
 			return;
 		}
 		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-		if(relationship.following)
+		if(relationship.following) {
 			menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
-		else
+		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			menu.findItem(R.id.manage_user_lists).setVisible(false);
+		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
 		else
@@ -560,6 +568,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			args.putString("account", accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(account));
 			Nav.go(getActivity(), BookmarksListFragment.class, args);
+		}else if(id==R.id.favorites_list) {
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			Nav.go(getActivity(), FavoritesListFragment.class, args);
 		}else if(id==R.id.mute){
 			confirmToggleMuted();
 		}else if(id==R.id.block){
@@ -577,7 +590,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				updateRelationship();
 			});
 		}else if(id==R.id.hide_boosts){
-			new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
+			new SetAccountFollowed(account.id, true, !relationship.showingReblogs, relationship.notifying)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Relationship result){
@@ -591,6 +604,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					})
 					.wrapProgress(getActivity(), R.string.loading, false)
 					.exec(accountID);
+		}else if(id==R.id.manage_user_lists){
+			final Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}
 		return true;
 	}
@@ -622,9 +641,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void updateRelationship(){
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
+		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);
 		UiUtils.setRelationshipToActionButton(relationship, actionButton);
+		UiUtils.setRelationshipToActionButton(relationship, notifyButton, true);
 		actionProgress.setIndeterminateTintList(actionButton.getTextColors());
+		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));
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
@@ -691,6 +715,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		actionButton.setClickable(!visible);
 	}
 
+	private void setNotifyProgressVisible(boolean visible){
+		notifyButton.setTextVisible(!visible);
+		notifyProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
+		notifyButton.setClickable(!visible);
+	}
+
 	private void loadAccountInfoAndEnterEditMode(){
 		if(editModeLoading)
 			return;
@@ -859,6 +889,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return Collections.singletonList(att);
 	}
 
+	private void onNotifyButtonClick(View v) {
+		UiUtils.performToggleAccountNotifications(getActivity(), account, accountID, relationship, actionButton, this::setNotifyProgressVisible, this::updateRelationship);
+	}
+
 	private void onAvatarClick(View v){
 		if(isInEditMode){
 			startImagePicker(AVATAR_RESULT);

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

@@ -104,6 +104,28 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.useCustomTabs=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
+			GlobalUserPreferences.showInteractionCounts=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
+			GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
+			GlobalUserPreferences.save();
+		}));
+
+		items.add(new HeaderItem(R.string.home_timeline));
+		items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
+			GlobalUserPreferences.showReplies=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
+			GlobalUserPreferences.showBoosts=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
+			GlobalUserPreferences.loadNewPosts=i.checked;
+			GlobalUserPreferences.save();
+		}));
 
 		items.add(new HeaderItem(R.string.settings_notifications));
 		items.add(notificationPolicyItem=new NotificationPolicyItem());
@@ -115,7 +137,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 		items.add(new HeaderItem(R.string.settings_boring));
 		items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
-		items.add(new TextItem(R.string.settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/mastodon/mastodon-android")));
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
 
@@ -124,6 +145,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			checkForUpdateItem = new TextItem(R.string.check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
+		items.add(new TextItem(R.string.settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/mastodon/mastodon-android")));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 

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

@@ -286,6 +286,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			if(relationship.following){
 				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
@@ -353,7 +354,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 					bindRelationship();
 				});
 			}else if(id==R.id.hide_boosts){
-				new SetAccountFollowed(account.id, true, !relationship.showingReblogs)
+				new SetAccountFollowed(account.id, true, !relationship.showingReblogs, relationship.notifying)
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(Relationship result){

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

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -52,6 +53,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
 	private FederatedTimelineFragment federatedTimelineFragment;
+	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -73,7 +75,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[6];
+		tabViews=new FrameLayout[7];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
@@ -83,6 +85,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				case 3 -> R.id.discover_posts;
 				case 4 -> R.id.discover_news;
 				case 5 -> R.id.discover_users;
+				case 6 -> R.id.discover_lists;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -131,6 +134,9 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			federatedTimelineFragment=new FederatedTimelineFragment();
 			federatedTimelineFragment.setArguments(args);
 
+			listTimelinesFragment=new ListTimelinesFragment();
+			listTimelinesFragment.setArguments(args);
+
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
@@ -138,6 +144,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
 					.add(R.id.discover_users, accountsFragment)
+					.add(R.id.discover_lists, listTimelinesFragment)
 					.commit();
 		}
 
@@ -151,6 +158,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					case 3 -> R.string.posts;
 					case 4 -> R.string.news;
 					case 5 -> R.string.for_you;
+					case 6 -> R.string.list_timelines;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -279,6 +287,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 3 -> postsFragment;
 			case 4 -> newsFragment;
 			case 5 -> accountsFragment;
+			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}

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

@@ -35,6 +35,8 @@ import java.util.stream.Collectors;
 
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.V;
@@ -91,6 +93,8 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 	@Override
 	public void onItemClick(String id){
 		SearchResult res=getResultByID(id);
+		if(res==null)
+			return;
 		switch(res.type){
 			case ACCOUNT -> {
 				Bundle args=new Bundle();
@@ -98,7 +102,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 				args.putParcelable("profileAccount", Parcels.wrap(res.account));
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			}
-			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name);
+			case HASHTAG -> UiUtils.openHashtagTimeline(getActivity(), accountID, res.hashtag.name, res.hashtag.following);
 			case STATUS -> {
 				Status status=res.status.getContentStatus();
 				Bundle args=new Bundle();
@@ -126,7 +130,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		}else{
 			progressVisibilityListener.onProgressVisibilityChanged(true);
 			currentRequest=new GetSearchResults(currentQuery, null, true)
-					.setCallback(new SimpleCallback<>(this){
+					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(SearchResults result){
 							ArrayList<SearchResult> results=new ArrayList<>();
@@ -146,6 +150,17 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 							unfilteredResults=results;
 							onDataLoaded(filterSearchResults(results), false);
 						}
+
+						@Override
+						public void onError(ErrorResponse error){
+							currentRequest=null;
+							Activity a=getActivity();
+							if(a==null)
+								return;
+							error.showToast(a);
+							if(progressVisibilityListener!=null)
+								progressVisibilityListener.onProgressVisibilityChanged(false);
+						}
 					})
 					.exec(accountID);
 		}
@@ -157,12 +172,11 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 			super.updateList();
 			return;
 		}
-		imgLoader.deactivate();
 		UiUtils.updateList(prevDisplayItems, displayItems, list, adapter, (i1, i2)->i1.parentID.equals(i2.parentID) && i1.index==i2.index && i1.getType()==i2.getType());
 		boolean recent=isInRecentMode();
 		if(recent!=headerAdapter.isVisible())
 			headerAdapter.setVisible(recent);
-		imgLoader.activate();
+		imgLoader.forceUpdateImages();
 		prevDisplayItems=null;
 	}
 

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

@@ -107,7 +107,7 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
 
 		@Override
 		public void onClick(){
-			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name);
+			UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
 		}
 	}
 }

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments.onboarding;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
@@ -9,6 +10,7 @@ import android.os.LocaleList;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,6 +23,7 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
@@ -36,7 +39,13 @@ import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
+import java.io.IOException;
 import java.net.IDN;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +55,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
@@ -58,6 +69,9 @@ import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
+import okhttp3.Call;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
 	private InstancesAdapter adapter;
@@ -75,9 +89,11 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private List<CatalogCategory> categories=new ArrayList<>();
 	private String loadingInstanceDomain;
 	private GetInstance loadingInstanceRequest;
+	private Call loadingInstanceRedirectRequest;
 	private HashMap<String, Instance> instancesCache=new HashMap<>();
 	private ProgressDialog instanceProgressDialog;
 	private View buttonBar;
+	private HashMap<String, String> redirects=new HashMap<>(), redirectsInverse=new HashMap<>();
 
 	private boolean isSignup;
 
@@ -271,7 +287,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		}else{
 			showProgressDialog();
 			if(!domain.equals(loadingInstanceDomain)){
-				loadInstanceInfo(domain);
+				loadInstanceInfo(domain, false);
 			}
 		}
 	}
@@ -353,7 +369,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		Instance instance=instancesCache.get(normalizeInstanceDomain(currentSearchQuery));
 		if(instance==null){
 			showProgressDialog();
-			loadInstanceInfo(currentSearchQuery);
+			loadInstanceInfo(currentSearchQuery, false);
 		}else{
 			proceedWithAuthOrSignup(instance);
 		}
@@ -363,7 +379,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
 		updateFilteredList();
-		loadInstanceInfo(currentSearchQuery);
+		loadInstanceInfo(currentSearchQuery, false);
 	}
 
 	private void updateFilteredList(){
@@ -403,13 +419,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 	private void showProgressDialog(){
 		instanceProgressDialog=new ProgressDialog(getActivity());
 		instanceProgressDialog.setMessage(getString(R.string.loading_instance));
-		instanceProgressDialog.setOnCancelListener(dialog->{
-			if(loadingInstanceRequest!=null){
-				loadingInstanceRequest.cancel();
-				loadingInstanceRequest=null;
-				loadingInstanceDomain=null;
-			}
-		});
+		instanceProgressDialog.setOnCancelListener(dialog->cancelLoadingInstanceInfo());
 		instanceProgressDialog.show();
 	}
 
@@ -429,10 +439,12 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		}catch(IllegalArgumentException x){
 			return null;
 		}
+		if(redirects.containsKey(domain))
+			return redirects.get(domain);
 		return domain;
 	}
 
-	private void loadInstanceInfo(String _domain){
+	private void loadInstanceInfo(String _domain, boolean isFromRedirect){
 		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
@@ -446,10 +458,11 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			return;
 		}
 		if(loadingInstanceDomain!=null){
-			if(loadingInstanceDomain.equals(domain))
+			if(loadingInstanceDomain.equals(domain)){
 				return;
-			else
-				loadingInstanceRequest.cancel();
+			}else{
+				cancelLoadingInstanceInfo();
+			}
 		}
 		loadingInstanceDomain=domain;
 		loadingInstanceRequest=new GetInstance();
@@ -465,7 +478,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 							instanceProgressDialog=null;
 							proceedWithAuthOrSignup(result);
 						}
-						if(domain.equals(currentSearchQuery)){
+						if(domain.equals(currentSearchQuery) || currentSearchQuery.equals(redirects.get(domain)) || currentSearchQuery.equals(redirectsInverse.get(domain))){
 							boolean found=false;
 							for(CatalogInstance ci:filteredData){
 								if(ci.domain.equals(domain)){
@@ -484,20 +497,105 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 					@Override
 					public void onError(ErrorResponse error){
 						loadingInstanceRequest=null;
-						loadingInstanceDomain=null;
-						if(instanceProgressDialog!=null){
-							instanceProgressDialog.dismiss();
-							instanceProgressDialog=null;
-							new M3AlertDialogBuilder(getActivity())
-									.setTitle(R.string.error)
-									.setMessage(getString(R.string.not_a_mastodon_instance, domain)+"\n\n"+((MastodonErrorResponse)error).error)
-									.setPositiveButton(R.string.ok, null)
-									.show();
+						if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
+							fetchDomainFromHostMetaAndMaybeRetry(domain, error);
+							return;
 						}
+						loadingInstanceDomain=null;
+						showInstanceInfoLoadError(domain, error);
 					}
 				}).execNoAuth(domain);
 	}
 
+	private void cancelLoadingInstanceInfo(){
+		if(loadingInstanceRequest!=null){
+			loadingInstanceRequest.cancel();
+			loadingInstanceRequest=null;
+		}
+		if(loadingInstanceRedirectRequest!=null){
+			loadingInstanceRedirectRequest.cancel();
+			loadingInstanceRedirectRequest=null;
+		}
+		loadingInstanceDomain=null;
+		if(instanceProgressDialog!=null){
+			instanceProgressDialog.dismiss();
+			instanceProgressDialog=null;
+		}
+	}
+
+	private void showInstanceInfoLoadError(String domain, Object error){
+		if(instanceProgressDialog!=null){
+			instanceProgressDialog.dismiss();
+			instanceProgressDialog=null;
+			String additionalInfo;
+			if(error instanceof MastodonErrorResponse me){
+				additionalInfo="\n\n"+me.error;
+			}else if(error instanceof Throwable t){
+				additionalInfo="\n\n"+t.getLocalizedMessage();
+			}else{
+				additionalInfo="";
+			}
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.error)
+					.setMessage(getString(R.string.not_a_mastodon_instance, domain)+additionalInfo)
+					.setPositiveButton(R.string.ok, null)
+					.show();
+		}
+	}
+
+	private void fetchDomainFromHostMetaAndMaybeRetry(String domain, Object origError){
+		String url="https://"+domain+"/.well-known/host-meta";
+		Request req=new Request.Builder()
+				.url(url)
+				.build();
+		loadingInstanceRedirectRequest=MastodonAPIController.getHttpClient().newCall(req);
+		loadingInstanceRedirectRequest.enqueue(new okhttp3.Callback(){
+			@Override
+			public void onFailure(@NonNull Call call, @NonNull IOException e){
+				loadingInstanceRedirectRequest=null;
+				loadingInstanceDomain=null;
+				Activity a=getActivity();
+				if(a==null)
+					return;
+				a.runOnUiThread(()->showInstanceInfoLoadError(domain, e));
+			}
+
+			@Override
+			public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{
+				loadingInstanceRedirectRequest=null;
+				loadingInstanceDomain=null;
+				Activity a=getActivity();
+				if(a==null)
+					return;
+				try(response){
+					if(!response.isSuccessful()){
+						a.runOnUiThread(()->showInstanceInfoLoadError(domain, response.code()+" "+response.message()));
+						return;
+					}
+					InputSource source=new InputSource(response.body().charStream());
+					Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(source);
+					NodeList list=doc.getElementsByTagName("Link");
+					for(int i=0;i<list.getLength();i++){
+						if(list.item(i) instanceof Element el){
+							String template=el.getAttribute("template");
+							if("lrdd".equals(el.getAttribute("rel")) && !TextUtils.isEmpty(template) && template.contains("{uri}")){
+								Uri uri=Uri.parse(template.replace("{uri}", "qwe"));
+								String redirectDomain=normalizeInstanceDomain(uri.getHost());
+								redirects.put(domain, redirectDomain);
+								redirectsInverse.put(redirectDomain, domain);
+								a.runOnUiThread(()->loadInstanceInfo(redirectDomain, true));
+								return;
+							}
+						}
+					}
+					a.runOnUiThread(()->showInstanceInfoLoadError(domain, origError));
+				}catch(Exception x){
+					a.runOnUiThread(()->showInstanceInfoLoadError(domain, x));
+				}
+			}
+		});
+	}
+
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=27){
@@ -580,7 +678,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 			if(chosenInstance==null)
 				nextButton.setEnabled(true);
 			chosenInstance=item;
-			loadInstanceInfo(chosenInstance.domain);
+			loadInstanceInfo(chosenInstance.domain, false);
 		}
 	}
 }

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

@@ -200,7 +200,6 @@ public class SignupFragment extends AppKitFragment{
 					@Override
 					public void onSuccess(Token result){
 						progressDialog.dismiss();
-						progressDialog=null;
 						Account fakeAccount=new Account();
 						fakeAccount.acct=fakeAccount.username=username;
 						fakeAccount.id="tmp"+System.currentTimeMillis();
@@ -238,7 +237,6 @@ public class SignupFragment extends AppKitFragment{
 							error.showToast(getActivity());
 						}
 						progressDialog.dismiss();
-						progressDialog=null;
 					}
 				})
 				.exec(instance.uri, apiToken);
@@ -255,9 +253,11 @@ public class SignupFragment extends AppKitFragment{
 	}
 
 	private void showProgressDialog(){
-		progressDialog=new ProgressDialog(getActivity());
-		progressDialog.setMessage(getString(R.string.loading));
-		progressDialog.setCancelable(false);
+		if(progressDialog==null){
+			progressDialog=new ProgressDialog(getActivity());
+			progressDialog.setMessage(getString(R.string.loading));
+			progressDialog.setCancelable(false);
+		}
 		progressDialog.show();
 	}
 
@@ -280,7 +280,6 @@ public class SignupFragment extends AppKitFragment{
 						if(submitAfterGettingToken){
 							submitAfterGettingToken=false;
 							progressDialog.dismiss();
-							progressDialog=null;
 							error.showToast(getActivity());
 						}
 					}
@@ -307,7 +306,6 @@ public class SignupFragment extends AppKitFragment{
 						if(submitAfterGettingToken){
 							submitAfterGettingToken=false;
 							progressDialog.dismiss();
-							progressDialog=null;
 							error.showToast(getActivity());
 						}
 					}

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

@@ -125,7 +125,7 @@ public class ReportDoneFragment extends MastodonToolbarFragment{
 	}
 
 	private void onUnfollowClick(){
-		new SetAccountFollowed(reportAccount.id, false, false)
+		new SetAccountFollowed(reportAccount.id, false, false, false)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Relationship result){

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

@@ -11,6 +11,7 @@ public class Hashtag extends BaseModel{
 	public String name;
 	@RequiredField
 	public String url;
+	public boolean following;
 	public List<History> history;
 
 	@Override
@@ -18,6 +19,7 @@ public class Hashtag extends BaseModel{
 		return "Hashtag{"+
 				"name='"+name+'\''+
 				", url='"+url+'\''+
+				", following="+following+
 				", history="+history+
 				'}';
 	}

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

@@ -0,0 +1,34 @@
+package org.joinmastodon.android.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.joinmastodon.android.api.RequiredField;
+import org.parceler.Parcel;
+
+@Parcel
+public class ListTimeline extends BaseModel {
+    @RequiredField
+    public String id;
+    @RequiredField
+    public String title;
+    @RequiredField
+    public RepliesPolicy repliesPolicy;
+
+    @Override
+    public String toString() {
+        return "List{" +
+                "id='" + id + '\'' +
+                ", title='" + title + '\'' +
+                ", repliesPolicy=" + repliesPolicy +
+                '}';
+    }
+
+    public enum RepliesPolicy{
+        @SerializedName("followed")
+        FOLLOWED,
+        @SerializedName("list")
+        LIST,
+        @SerializedName("none")
+        NONE
+    }
+}

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

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -78,7 +79,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		if(reblog!=null)
 			reblog.postprocess();
 
-		spoilerRevealed=!sensitive;
+		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 	}
 
 	@Override

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

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -31,13 +32,15 @@ import me.grishka.appkit.utils.V;
 
 public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	private final Account account;
+	private final Notification notification;
 	public ImageLoaderRequest avaRequest, coverRequest;
 	public CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
 	public CharSequence parsedName, parsedBio;
 
-	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account){
+	public AccountCardStatusDisplayItem(String parentID, BaseStatusListFragment parentFragment, Account account, Notification notification){
 		super(parentID, parentFragment);
 		this.account=account;
+		this.notification=notification;
 		if(!TextUtils.isEmpty(account.avatar))
 			avaRequest=new UrlImageLoaderRequest(account.avatar, V.dp(50), V.dp(50));
 		if(!TextUtils.isEmpty(account.header))
@@ -73,9 +76,9 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<AccountCardStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final ImageView cover, avatar;
 		private final TextView name, username, bio, followersCount, followingCount, postsCount, followersLabel, followingLabel, postsLabel;
-		private final ProgressBarButton actionButton;
-		private final ProgressBar actionProgress;
-		private final View actionWrap;
+		private final ProgressBarButton actionButton, acceptButton, rejectButton;
+		private final ProgressBar actionProgress, acceptProgress, rejectProgress;
+		private final View actionWrap, acceptWrap, rejectWrap;
 
 		private Relationship relationship;
 
@@ -96,6 +99,12 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			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);
 
 			View card=findViewById(R.id.card);
 			card.setOutlineProvider(OutlineProviders.roundedRect(6));
@@ -105,6 +114,8 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
 			cover.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
+			acceptButton.setOnClickListener(this::onFollowRequestButtonClick);
+			rejectButton.setOnClickListener(this::onFollowRequestButtonClick);
 		}
 
 		@Override
@@ -119,14 +130,36 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 			followingLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.following, (int)Math.min(999, item.account.followingCount)));
 			postsLabel.setText(item.parentFragment.getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, item.account.statusesCount)));
 			relationship=item.parentFragment.getRelationship(item.account.id);
-			if(relationship==null){
+			if(item.notification.type == Notification.Type.FOLLOW_REQUEST && (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);
 			}
 		}
 
+		private void onFollowRequestButtonClick(View v) {
+			itemView.setHasTransientState(true);
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), item.notification.id , v == acceptButton, relationship, rel -> {
+				itemView.setHasTransientState(false);
+				item.parentFragment.putRelationship(item.account.id, rel);
+				rebind();
+			});
+		}
 
 		private void onActionButtonClick(View v){
 			itemView.setHasTransientState(true);

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

@@ -9,6 +9,8 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.TypefaceSpan;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
@@ -45,18 +47,20 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{
-		private final TextView time, favoritesCount, reblogsCount, lastEditTime;
-		private final View favorites, reblogs, editHistory;
+		private final TextView time;
+		private final Button favorites, reblogs, editHistory, applicationName;
+		private final ImageView visibility;
+		private final Context context;
 
 		public Holder(Context context, ViewGroup parent){
 			super(context, R.layout.display_item_extended_footer, parent);
+			this.context = context;
 			reblogs=findViewById(R.id.reblogs);
 			favorites=findViewById(R.id.favorites);
 			editHistory=findViewById(R.id.edit_history);
+			applicationName=findViewById(R.id.application_name);
+			visibility=findViewById(R.id.visibility);
 			time=findViewById(R.id.timestamp);
-			favoritesCount=findViewById(R.id.favorites_count);
-			reblogsCount=findViewById(R.id.reblogs_count);
-			lastEditTime=findViewById(R.id.last_edited);
 
 			reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
 			favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
@@ -67,20 +71,35 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(ExtendedFooterStatusDisplayItem item){
 			Status s=item.status;
-			favoritesCount.setText(String.format("%,d", s.favouritesCount));
-			reblogsCount.setText(String.format("%,d", s.reblogsCount));
+			favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount));
+			reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int)(s.reblogsCount%1000), s.reblogsCount));
 			if(s.editedAt!=null){
 				editHistory.setVisibility(View.VISIBLE);
-				lastEditTime.setText(item.parentFragment.getString(R.string.last_edit_at_x, UiUtils.formatRelativeTimestampAsMinutesAgo(itemView.getContext(), s.editedAt)));
+				editHistory.setText(UiUtils.formatRelativeTimestampAsMinutesAgo(itemView.getContext(), s.editedAt));
 			}else{
 				editHistory.setVisibility(View.GONE);
 			}
 			String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
-			if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){
-				time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, item.status.application.name));
-			}else{
+			
+			if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
+				time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, ""));
+				applicationName.setText(item.status.application.name);
+				if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) {
+					applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website));
+				} else {
+					applicationName.setEnabled(false);
+				}
+			} else {
 				time.setText(timeStr);
+				applicationName.setVisibility(View.GONE);
 			}
+
+			visibility.setImageResource(switch (s.visibility) {
+				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
+				case UNLISTED -> R.drawable.ic_fluent_people_20_regular;
+				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
+				case DIRECT -> R.drawable.ic_at_symbol;
+			});
 		}
 
 		@Override

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

@@ -11,6 +11,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
@@ -98,7 +99,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void bindButton(TextView btn, long count){
-			if(count>0 && !item.hideCounts){
+			if(GlobalUserPreferences.showInteractionCounts && count>0 && !item.hideCounts){
 				btn.setText(DecimalFormat.getIntegerInstance().format(count));
 				btn.setCompoundDrawablePadding(V.dp(8));
 			}else{

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

@@ -26,6 +26,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
@@ -137,10 +138,18 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			optionsMenu.setOnMenuItemClickListener(menuItem->{
 				Account account=item.user;
 				int id=menuItem.getItemId();
-				if(id==R.id.edit){
+				if(id==R.id.edit || id==R.id.delete_and_redraft) {
 					final Bundle args=new Bundle();
 					args.putString("account", item.parentFragment.getAccountID());
 					args.putParcelable("editStatus", Parcels.wrap(item.status));
+					if (id==R.id.delete_and_redraft) {
+						args.putBoolean("redraftStatus", true);
+						if (item.parentFragment instanceof ThreadFragment thread && !thread.isItemEnabled(item.status.id)) {
+							// ("enabled" = clickable; opened status is not clickable)
+							// request navigation to the re-drafted status if status is currently opened
+							args.putBoolean("navigateToStatus", true);
+						}
+					}
 					if(TextUtils.isEmpty(item.status.content) && TextUtils.isEmpty(item.status.spoilerText)){
 						Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 					}else{
@@ -150,7 +159,13 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 									public void onSuccess(GetStatusSourceText.Response result){
 										args.putString("sourceText", result.text);
 										args.putString("sourceSpoiler", result.spoilerText);
-										Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+										if (id==R.id.delete_and_redraft) {
+											UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{
+												Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+											}, true);
+										} else {
+											Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
+										}
 									}
 
 									@Override
@@ -163,8 +178,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					}
 				}else if(id==R.id.delete){
 					UiUtils.confirmDeletePost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
-				}else if(id==R.id.delete_and_redraft) {
-					UiUtils.confirmDeleteAndRedraftPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, s->{});
 				}else if(id==R.id.pin || id==R.id.unpin){
 					UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s->{});
 				}else if(id==R.id.mute){

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

@@ -85,6 +85,7 @@ public abstract class ImageStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void clearImage(int index){
 			crossfadeDrawable.setCrossfadeAlpha(1f);
+			crossfadeDrawable.setImageDrawable(null);
 			didClear=true;
 		}
 

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

@@ -158,7 +158,7 @@ public abstract class StatusDisplayItem{
 		}
 
 		public Holder(Context context, int layout, ViewGroup parent){
-			super(context, layout, parent);
+ 			super(context, layout, parent);
 		}
 
 		public String getItemID(){

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

@@ -3,14 +3,18 @@ package org.joinmastodon.android.ui.displayitems;
 import android.app.Activity;
 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;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.views.LinkedTextView;
@@ -18,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;
@@ -59,35 +64,58 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
-		private final TextView spoilerTitle;
-		private final View spoilerOverlay;
+		private final LinearLayout spoilerHeader;
+		private final TextView spoilerTitle, spoilerTitleInline;
+		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);
 			text=findViewById(R.id.text);
 			spoilerTitle=findViewById(R.id.spoiler_title);
+			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);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
+					spoilerHeader.setVisibility(View.VISIBLE);
 					text.setVisibility(View.VISIBLE);
 					itemView.setClickable(false);
 				}else{
 					spoilerOverlay.setVisibility(View.VISIBLE);
+					spoilerHeader.setVisibility(View.GONE);
 					text.setVisibility(View.GONE);
 					itemView.setClickable(true);
 				}
 			}else{
 				spoilerOverlay.setVisibility(View.GONE);
+				spoilerHeader.setVisibility(View.GONE);
 				text.setVisibility(View.VISIBLE);
 				itemView.setClickable(false);
 			}

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

@@ -34,7 +34,7 @@ public class LinkSpan extends CharacterStyle {
 		switch(getType()){
 			case URL -> UiUtils.openURL(context, accountID, link);
 			case MENTION -> UiUtils.openProfileByID(context, accountID, link);
-			case HASHTAG -> UiUtils.openHashtagTimeline(context, accountID, link);
+			case HASHTAG -> UiUtils.openHashtagTimeline(context, accountID, link, null);
 		}
 	}
 

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

@@ -19,7 +19,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.Parcelable;
 import android.provider.OpenableColumns;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -40,26 +39,30 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountBlocked;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
+import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
+import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
 import org.joinmastodon.android.api.requests.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;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
+import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
-import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.text.SpacerSpan;
 import org.parceler.Parcels;
 
@@ -70,8 +73,6 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -80,14 +81,11 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import androidx.annotation.AttrRes;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.gson.Gson;
-import com.google.gson.annotations.SerializedName;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -309,13 +307,22 @@ public class UiUtils{
 		Nav.go((Activity)context, ProfileFragment.class, args);
 	}
 
-	public static void openHashtagTimeline(Context context, String accountID, String hashtag){
+	public static void openHashtagTimeline(Context context, String accountID, String hashtag, @Nullable Boolean following){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putString("hashtag", hashtag);
+		if (following != null) args.putBoolean("following", following);
 		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
 	}
 
+	public static void openListTimeline(Context context, String accountID, ListTimeline list){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		args.putString("listID", list.id);
+		args.putString("listTitle", list.title);
+		Nav.go((Activity)context, ListTimelineFragment.class, args);
+	}
+
 	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, Runnable onConfirmed){
 		showConfirmationAlert(context, context.getString(title), context.getString(message), context.getString(confirmButton), onConfirmed);
 	}
@@ -391,9 +398,12 @@ public class UiUtils{
 							.exec(accountID);
 				});
 	}
-
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback){
-		showConfirmationAlert(activity, R.string.confirm_delete_title, R.string.confirm_delete, R.string.delete, ()->{
+		confirmDeletePost(activity, accountID, status, resultCallback, false);
+	}
+
+	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft){
+		showConfirmationAlert(activity, forRedraft ? R.string.confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.delete_and_redraft : R.string.delete, ()->{
 			new DeleteStatus(status.id)
 					.setCallback(new Callback<>(){
 						@Override
@@ -440,62 +450,12 @@ public class UiUtils{
 		);
 	}
 
-	public static void confirmDeleteAndRedraftPost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback){
-		showConfirmationAlert(activity, R.string.confirm_delete_and_redraft_title, R.string.confirm_delete_and_redraft, R.string.delete_and_redraft, ()->{
-			new DeleteStatus(status.id)
-					.setCallback(new Callback<>(){
-						@Override
-						public void onSuccess(Status result){
-							resultCallback.accept(result);
-							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().deleteStatus(status.id);
-							E.post(new StatusDeletedEvent(status.id, accountID));
-							UiUtils.redraftStatus(status, accountID, activity);
-						}
-
-						@Override
-						public void onError(ErrorResponse error){
-							error.showToast(activity);
-						}
-					})
-					.wrapProgress(activity, R.string.deleting, false)
-					.exec(accountID);
-		});
-	}
-
-	public static void redraftStatus(Status status, String accountID, Activity activity) {
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putBoolean("hasDraft", true);
-		args.putString("prefilledText", HtmlParser.parse(status.content, status.emojis, status.mentions, status.tags, accountID).toString());
-		args.putString("spoilerText", status.spoilerText);
-		args.putSerializable("visibility", status.visibility);
-		if(status.poll!=null){
-			args.putInt("pollDuration", (int)status.poll.expiresAt.minus(status.createdAt.getEpochSecond(), ChronoUnit.SECONDS).getEpochSecond());
-			ArrayList<String> opts=status.poll.options.stream().map(o -> o.title).collect(Collectors.toCollection(ArrayList::new));
-			args.putStringArrayList("pollOptions", opts);
-		}
-		if(!status.mediaAttachments.isEmpty()){
-			ArrayList<Parcelable> serializedAttachments=status.mediaAttachments.stream()
-					.map(att -> Parcels.wrap(ComposeFragment.redraftAttachment(att)))
-					.collect(Collectors.toCollection(ArrayList::new));
-			args.putParcelableArrayList("attachments", serializedAttachments);
-		}
-		Callback<Status> cb=new Callback<>(){
-			@Override public void onError(ErrorResponse error) {
-				onSuccess(null);
-				error.showToast(activity);
-			}
-			@Override public void onSuccess(Status status) {
-				if (status!=null) args.putParcelable("replyTo", Parcels.wrap(status));
-				Nav.go(activity, ComposeFragment.class, args);
-			}
-		};
-
-		if(status.inReplyToId!=null) new GetStatusByID(status.inReplyToId).setCallback(cb).exec(accountID);
-		else cb.onSuccess(null);
-	}
-
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
+		setRelationshipToActionButton(relationship, button, false);
+	}
+
+	public static void setRelationshipToActionButton(Relationship relationship, Button button, boolean keepText){
+		CharSequence textBefore = keepText ? button.getText() : null;
 		boolean secondaryStyle;
 		if(relationship.blocking){
 			button.setText(R.string.button_blocked);
@@ -514,6 +474,8 @@ public class UiUtils{
 			secondaryStyle=true;
 		}
 
+		if (keepText) button.setText(textBefore);
+
 		button.setEnabled(!relationship.blockedBy);
 		int attr=secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle;
 		TypedArray ta=button.getContext().obtainStyledAttributes(new int[]{attr});
@@ -530,6 +492,25 @@ public class UiUtils{
 		ta.recycle();
 	}
 
+	public static void performToggleAccountNotifications(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback) {
+		progressCallback.accept(true);
+		new SetAccountFollowed(account.id, true, relationship.showingReblogs, !relationship.notifying)
+				.setCallback(new Callback<>() {
+					@Override
+					public void onSuccess(Relationship result) {
+						resultCallback.accept(result);
+						progressCallback.accept(false);
+						Toast.makeText(activity, activity.getString(result.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username), Toast.LENGTH_SHORT).show();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						progressCallback.accept(false);
+						error.showToast(activity);
+					}
+				}).exec(accountID);
+	}
+
 	public static void performAccountAction(Activity activity, Account account, String accountID, Relationship relationship, Button button, Consumer<Boolean> progressCallback, Consumer<Relationship> resultCallback){
 		if(relationship.blocking){
 			confirmToggleBlockUser(activity, accountID, account, true, resultCallback);
@@ -537,7 +518,7 @@ public class UiUtils{
 			confirmToggleMuteUser(activity, accountID, account, true, resultCallback);
 		}else{
 			progressCallback.accept(true);
-			new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true)
+			new SetAccountFollowed(account.id, !relationship.following && !relationship.requested, true, false)
 					.setCallback(new Callback<>(){
 						@Override
 						public void onSuccess(Relationship result){
@@ -555,6 +536,40 @@ public class UiUtils{
 		}
 	}
 
+
+	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);
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					resultCallback.accept(relationship);
+					error.showToast(activity);
+				}
+			}).exec(accountID);
+		} else {
+			new RejectFollowRequest(account.id).setCallback(new Callback<>() {
+				@Override
+				public void onSuccess(Relationship rel) {
+					E.post(new FollowRequestHandledEvent(accountID, false, account, rel));
+					if (notificationID != null) E.post(new NotificationDeletedEvent(notificationID));
+					resultCallback.accept(rel);
+				}
+
+				@Override
+				public void onError(ErrorResponse error) {
+					resultCallback.accept(relationship);
+					error.showToast(activity);
+				}
+			}).exec(accountID);
+		}
+	}
+
 	public static <T> void updateList(List<T> oldList, List<T> newList, RecyclerView list, RecyclerView.Adapter<?> adapter, BiPredicate<T, T> areItemsSame){
 		// Save topmost item position and offset because for some reason RecyclerView would scroll the list to weird places when you insert items at the top
 		int topItem, topItemOffset;
@@ -643,10 +658,10 @@ public class UiUtils{
 		return GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK;
 	}
 
-	public static void openURL(Context context, String accountID, String url){
+	public static void openURL(Context context, @Nullable String accountID, String url){
 		Uri uri=Uri.parse(url);
-		String accountDomain=AccountSessionManager.getInstance().getAccount(accountID).domain;
-		if("https".equals(uri.getScheme()) && accountDomain.equalsIgnoreCase(uri.getAuthority())){
+		String accountDomain=accountID != null ? AccountSessionManager.getInstance().getAccount(accountID).domain : null;
+		if(accountDomain!=null && "https".equals(uri.getScheme()) && accountDomain.equalsIgnoreCase(uri.getAuthority())){
 			List<String> path=uri.getPathSegments();
 			// Match URLs like https://mastodon.social/@Gargron/108132679274083591
 			if(path.size()==2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$")){

mastodon/src/main/res/drawable/ic_fluent_alert_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="M9.042 19.003h5.916c-0.238 1.418-1.472 2.498-2.958 2.498-1.486 0-2.72-1.08-2.958-2.498zm2.958-17c4.142 0 7.5 3.359 7.5 7.5v4l1.418 3.16c0.055 0.122 0.084 0.254 0.084 0.389 0 0.524-0.426 0.95-0.95 0.95h-16.1c-0.134 0-0.266-0.029-0.388-0.083-0.479-0.215-0.693-0.777-0.479-1.256l1.415-3.16V9.49l0.005-0.25C4.644 5.211 7.955 2.004 12 2.004z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_alert_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="M12 1.996c4.05 0 7.357 3.195 7.496 7.25l0.004 0.25v4.097l1.38 3.156c0.07 0.158 0.105 0.329 0.105 0.5 0 0.691-0.56 1.25-1.25 1.25L15 18.502c0 1.657-1.343 3-3 3-1.598 0-2.904-1.249-2.995-2.823L9 18.499H4.275c-0.171 0-0.34-0.034-0.498-0.103-0.633-0.275-0.924-1.01-0.649-1.644L4.5 13.594V9.496c0-4.155 3.352-7.5 7.5-7.5zM13.5 18.5l-3 0.002c0 0.829 0.672 1.5 1.5 1.5 0.78 0 1.42-0.595 1.493-1.355L13.5 18.5zM12 3.496c-3.32 0-6 2.674-6 6v4.41L4.656 17h14.697L18 13.907V9.509l-0.003-0.225C17.885 6.05 15.242 3.496 12 3.496z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_fluent_alert_24_filled" android:state_activated="true"/>
+    <item android:drawable="@drawable/ic_fluent_alert_24_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_fluent_alert_24_filled" android:state_selected="true"/>
+    <item android:drawable="@drawable/ic_fluent_alert_24_regular"/>
+</selector>

mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_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="M16.5 6.671c0.116 0 0.223 0.04 0.308 0.106l0.067 0.064 0.017 0.02C17.585 7.719 18 8.81 18 10c0 2.689-2.122 4.882-4.783 4.995L13 15H7c-0.102 0-0.203-0.003-0.303-0.009l1.657 1.655c0.173 0.174 0.192 0.443 0.057 0.638l-0.057 0.07C8.18 17.527 7.91 17.546 7.716 17.41l-0.07-0.057-2.5-2.5C4.973 14.68 4.954 14.41 5.09 14.216l0.057-0.07 2.5-2.5c0.196-0.195 0.512-0.195 0.708 0 0.173 0.174 0.192 0.443 0.057 0.638l-0.057 0.07-1.637 1.636 0.14 0.008L7 14h6c2.21 0 4-1.79 4-4 0-0.954-0.334-1.829-0.89-2.516C16.04 7.399 16 7.29 16 7.17c0-0.276 0.224-0.5 0.5-0.5zm-4.854-4.024c0.174-0.174 0.443-0.193 0.638-0.058l0.07 0.058 2.5 2.5 0.057 0.069c0.119 0.17 0.119 0.398 0 0.568l-0.057 0.07-2.5 2.5-0.07 0.057c-0.17 0.119-0.398 0.119-0.568 0l-0.07-0.057-0.057-0.07c-0.119-0.17-0.119-0.398 0-0.568l0.057-0.07 1.637-1.636-0.14-0.007L13 6H7c-2.21 0-4 1.79-4 4 0 0.956 0.336 1.834 0.895 2.522C3.96 12.606 4 12.714 4 12.832c0 0.275-0.224 0.5-0.5 0.5-0.167 0-0.315-0.083-0.406-0.208C2.41 12.268 2 11.182 2 10c0-2.689 2.122-4.882 4.783-4.995L7 5h6c0.102 0 0.203 0.003 0.303 0.009l-1.657-1.656-0.057-0.069c-0.135-0.195-0.116-0.464 0.057-0.637z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_arrow_up_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="M4.209 10.733c-0.286 0.3-0.274 0.774 0.026 1.06 0.3 0.286 0.774 0.274 1.06-0.026l5.954-6.251V20.25c0 0.414 0.336 0.75 0.75 0.75 0.415 0 0.75-0.336 0.75-0.75V5.516l5.955 6.251c0.286 0.3 0.76 0.312 1.06 0.026 0.3-0.286 0.312-0.76 0.027-1.06l-7.067-7.42c-0.161-0.168-0.367-0.268-0.58-0.3C12.097 3.006 12.049 3 11.999 3c-0.05 0-0.098 0.005-0.145 0.014-0.213 0.031-0.418 0.131-0.578 0.3l-7.067 7.419z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_delete_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="M10 5h4c0-1.105-0.895-2-2-2s-2 0.895-2 2zM8.5 5c0-1.933 1.567-3.5 3.5-3.5s3.5 1.567 3.5 3.5h5.75C21.664 5 22 5.336 22 5.75S21.664 6.5 21.25 6.5h-1.32l-1.17 12.111C18.573 20.533 16.957 22 15.026 22H8.974c-1.931 0-3.547-1.467-3.733-3.389L4.07 6.5H2.75C2.336 6.5 2 6.164 2 5.75S2.336 5 2.75 5H8.5zm2 4.75C10.5 9.336 10.164 9 9.75 9S9 9.336 9 9.75v7.5C9 17.664 9.336 18 9.75 18s0.75-0.336 0.75-0.75v-7.5zM14.25 9C14.664 9 15 9.336 15 9.75v7.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75v-7.5C13.5 9.336 13.836 9 14.25 9zm-7.516 9.467C6.846 19.62 7.815 20.5 8.974 20.5h6.052c1.159 0 2.128-0.88 2.24-2.033L18.424 6.5H5.576l1.158 11.967z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_earth_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="M2 10c0-4.418 3.582-8 8-8 4.419 0 8 3.582 8 8 0 4.419-3.581 8-8 8-4.418 0-8-3.581-8-8zm8-7C9.915 3 9.83 3.002 9.745 3.005c0.118 0.222 0.253 0.504 0.373 0.823 0.28 0.746 0.527 1.817 0.085 2.758C9.799 7.446 9.106 7.67 8.57 7.808L8.474 7.833c-0.506 0.13-0.755 0.194-0.93 0.46-0.17 0.257-0.129 0.574 0.037 1.113L7.619 9.53c0.067 0.211 0.144 0.457 0.184 0.688 0.05 0.286 0.06 0.636-0.113 0.97C7.51 11.53 7.276 11.762 7 11.912c-0.26 0.142-0.533 0.197-0.747 0.235l-0.088 0.015c-0.407 0.072-0.645 0.113-0.867 0.351-0.177 0.19-0.279 0.508-0.336 0.941-0.024 0.178-0.038 0.355-0.053 0.534l-0.007 0.095c-0.017 0.199-0.037 0.419-0.079 0.605l-0.005 0.02C6.1 16.116 7.947 17 10 17c1.35 0 2.612-0.383 3.682-1.045-0.086-0.086-0.181-0.189-0.275-0.307-0.271-0.34-0.609-0.909-0.492-1.57 0.056-0.313 0.226-0.581 0.397-0.794 0.175-0.216 0.386-0.417 0.576-0.592l0.128-0.117c0.146-0.133 0.273-0.25 0.382-0.363 0.147-0.154 0.191-0.237 0.2-0.263 0.068-0.226-0.013-0.404-0.126-0.492-0.094-0.073-0.295-0.142-0.61 0.058-0.12 0.075-0.228 0.141-0.323 0.191-0.086 0.045-0.205 0.102-0.336 0.122-0.157 0.025-0.375 0.002-0.544-0.177-0.129-0.136-0.164-0.302-0.178-0.375-0.016-0.09-0.024-0.19-0.03-0.276l-0.005-0.066c-0.006-0.074-0.011-0.15-0.02-0.238-0.02-0.221-0.057-0.496-0.143-0.825-0.127-0.491-0.44-0.888-0.764-1.3L11.377 8.39c-0.16-0.206-0.363-0.478-0.436-0.77-0.042-0.163-0.049-0.353 0.024-0.547 0.072-0.19 0.203-0.336 0.352-0.448 0.428-0.32 1.128-1.013 1.743-1.652 0.303-0.314 0.576-0.607 0.775-0.822l0.005-0.006C12.738 3.422 11.418 3 10 3zm4.638 1.757L14.569 4.83c-0.201 0.218-0.48 0.516-0.788 0.836-0.602 0.626-1.352 1.373-1.855 1.753 0.03 0.066 0.1 0.176 0.242 0.359l0.124 0.157c0.316 0.398 0.774 0.973 0.959 1.684 0.103 0.395 0.147 0.725 0.171 0.984l0.001 0.01c0.588-0.33 1.21-0.296 1.66 0.053 0.459 0.354 0.653 0.971 0.472 1.572-0.081 0.268-0.273 0.495-0.434 0.664-0.135 0.141-0.296 0.289-0.446 0.425-0.037 0.035-0.074 0.068-0.11 0.1-0.188 0.174-0.35 0.332-0.474 0.485-0.127 0.157-0.178 0.268-0.191 0.342-0.04 0.227 0.072 0.497 0.29 0.772 0.101 0.128 0.209 0.234 0.291 0.31l0.025 0.021C16.03 14.074 17 12.151 17 10.001c0-2.088-0.913-3.962-2.362-5.244zm-5.84-1.402c-0.053-0.096-0.1-0.173-0.133-0.228C5.437 3.75 3 6.591 3 10c0 1.283 0.345 2.486 0.947 3.52l0.023-0.198c0.063-0.467 0.193-1.059 0.597-1.491 0.462-0.495 1.026-0.588 1.404-0.65l0.108-0.019c0.203-0.036 0.336-0.07 0.443-0.128 0.093-0.05 0.19-0.133 0.28-0.309 0.03-0.054 0.048-0.147 0.016-0.336-0.028-0.16-0.08-0.327-0.146-0.536L6.625 9.7C6.472 9.203 6.25 8.438 6.709 7.742c0.4-0.607 1.04-0.762 1.477-0.869L8.32 6.84c0.467-0.12 0.772-0.242 0.978-0.68 0.261-0.556 0.143-1.292-0.116-1.98-0.124-0.33-0.27-0.618-0.384-0.825z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_history_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="M3.5 1.997l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402L4 2.497v2.211c1.164-1.323 2.748-2.242 4.542-2.574 4.345-0.805 8.519 2.064 9.324 6.408 0.805 4.344-2.064 8.519-6.408 9.324-4.344 0.805-8.519-2.064-9.324-6.408-0.087-0.468-0.158-1.32-0.13-1.98C2.016 9.204 2.25 8.989 2.524 9c0.277 0.012 0.49 0.245 0.48 0.52-0.025 0.58 0.04 1.358 0.113 1.756 0.705 3.8 4.357 6.311 8.159 5.607 3.8-0.705 6.311-4.357 5.607-8.159-0.705-3.8-4.357-6.311-8.159-5.607C6.885 3.458 5.3 4.502 4.258 5.995l2.74 0.002 0.09 0.008c0.233 0.042 0.41 0.246 0.41 0.492 0 0.245-0.177 0.45-0.41 0.492l-0.09 0.008H3.5L3.41 6.989C3.206 6.952 3.045 6.79 3.008 6.587L3 6.497v-4l0.008-0.09C3.045 2.203 3.206 2.042 3.41 2.005L3.5 1.997zm6 4l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402L10 6.497V10h2l0.09 0.008c0.233 0.042 0.41 0.246 0.41 0.492 0 0.245-0.177 0.45-0.41 0.491L12 11H9.5l-0.09-0.008c-0.204-0.037-0.365-0.198-0.402-0.402L9 10.5V6.498l0.008-0.09C9.045 6.203 9.206 6.042 9.41 6.005L9.5 5.997z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M8.75 4c1.519 0 2.75 1.231 2.75 2.75v10.5c0 1.519-1.231 2.75-2.75 2.75h-4C3.231 20 2 18.769 2 17.25V6.75C2 5.231 3.231 4 4.75 4h4zm0 1.5h-4C4.06 5.5 3.5 6.06 3.5 6.75v10.5c0 0.69 0.56 1.25 1.25 1.25h4c0.69 0 1.25-0.56 1.25-1.25V6.75C10 6.06 9.44 5.5 8.75 5.5zM19.25 4C20.769 4 22 5.231 22 6.75v10.5c0 1.519-1.231 2.75-2.75 2.75h-4c-1.519 0-2.75-1.231-2.75-2.75V6.75C12.5 5.231 13.731 4 15.25 4h4zm0 1.5h-4C14.56 5.5 14 6.06 14 6.75v10.5c0 0.69 0.56 1.25 1.25 1.25h4c0.69 0 1.25-0.56 1.25-1.25V6.75c0-0.69-0.56-1.25-1.25-1.25zM6 9v6c0 0.414 0.336 0.75 0.75 0.75S7.5 15.414 7.5 15V9c0-0.414-0.336-0.75-0.75-0.75S6 8.586 6 9zm11.5 0.75v1.5h-1.25c-0.414 0-0.75 0.336-0.75 0.75v3c0 0.414 0.336 0.75 0.75 0.75h2c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75H17v-1.5h1.25c0.414 0 0.75-0.336 0.75-0.75V9c0-0.414-0.336-0.75-0.75-0.75h-2c-0.414 0-0.75 0.336-0.75 0.75s0.336 0.75 0.75 0.75h1.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_people_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="M4.5 6.75c0-1.243 1.007-2.25 2.25-2.25S9 5.507 9 6.75 7.993 9 6.75 9 4.5 7.993 4.5 6.75zM6.75 3.5C4.955 3.5 3.5 4.955 3.5 6.75S4.955 10 6.75 10 10 8.545 10 6.75 8.545 3.5 6.75 3.5zm5.687 11.645c0.538 0.22 1.215 0.355 2.063 0.355 1.881 0 2.921-0.668 3.469-1.434 0.264-0.37 0.396-0.74 0.462-1.017 0.033-0.14 0.05-0.257 0.06-0.343l0.007-0.105 0.001-0.033V12.5c0-0.828-0.671-1.5-1.5-1.5h-4.628c0.24 0.29 0.42 0.629 0.525 1H17c0.276 0 0.5 0.224 0.5 0.5v0.054l-0.005 0.05c-0.005 0.049-0.015 0.122-0.037 0.213-0.043 0.182-0.13 0.425-0.303 0.667-0.327 0.459-1.037 1.016-2.656 1.016-0.731 0-1.277-0.114-1.686-0.281-0.082 0.28-0.201 0.596-0.376 0.926zM1.5 13c0-1.105 0.895-2 2-2H10c1.105 0 2 0.895 2 2v0.084c0 0.01 0 0.023-0.002 0.04-0.001 0.033-0.004 0.08-0.01 0.135-0.01 0.113-0.032 0.268-0.075 0.453-0.085 0.368-0.254 0.86-0.595 1.354C10.617 16.08 9.263 17 6.75 17c-2.513 0-3.867-0.92-4.568-1.934-0.34-0.494-0.51-0.986-0.595-1.354-0.042-0.185-0.064-0.34-0.075-0.453-0.006-0.056-0.009-0.102-0.01-0.135L1.5 13.084V13zm1 0.06v0.018l0.007 0.083c0.007 0.076 0.023 0.189 0.054 0.326 0.064 0.277 0.191 0.644 0.444 1.01C3.492 15.201 4.513 16 6.75 16s3.258-0.799 3.745-1.503c0.253-0.366 0.38-0.733 0.444-1.01 0.031-0.137 0.047-0.25 0.054-0.326C10.997 13.123 11 13.095 11 13.078V13c0-0.552-0.448-1-1-1H3.5c-0.552 0-1 0.448-1 1v0.06zM13 7.5C13 6.672 13.672 6 14.5 6S16 6.672 16 7.5 15.328 9 14.5 9 13 8.328 13 7.5zM14.5 5C13.12 5 12 6.12 12 7.5s1.12 2.5 2.5 2.5S17 8.88 17 7.5 15.88 5 14.5 5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_people_checkmark_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="M4.5 5.75c0-1.243 1.007-2.25 2.25-2.25S9 4.507 9 5.75 7.993 8 6.75 8 4.5 6.993 4.5 5.75zM6.75 2.5C4.955 2.5 3.5 3.955 3.5 5.75S4.955 9 6.75 9 10 7.545 10 5.75 8.545 2.5 6.75 2.5zM1.5 12c0-1.105 0.895-2 2-2H10c0.361 0 0.7 0.096 0.993 0.263-0.277 0.23-0.531 0.486-0.758 0.765C10.159 11.01 10.08 11 10 11H3.5c-0.552 0-1 0.448-1 1v0.078l0.007 0.083c0.007 0.076 0.023 0.189 0.054 0.326 0.064 0.277 0.191 0.644 0.444 1.01C3.492 14.201 4.513 15 6.75 15c0.954 0 1.687-0.145 2.252-0.367 0.008 0.35 0.049 0.69 0.12 1.02C8.476 15.87 7.695 16 6.75 16c-2.513 0-3.867-0.92-4.568-1.934-0.34-0.494-0.51-0.986-0.595-1.354-0.042-0.185-0.064-0.34-0.075-0.453-0.006-0.056-0.009-0.102-0.01-0.135L1.5 12.084V12zM13 6.5C13 5.672 13.672 5 14.5 5S16 5.672 16 6.5 15.328 8 14.5 8 13 7.328 13 6.5zM14.5 4C13.12 4 12 5.12 12 6.5S13.12 9 14.5 9 17 7.88 17 6.5 15.88 4 14.5 4zM19 14.5c0 2.485-2.015 4.5-4.5 4.5S10 16.985 10 14.5s2.015-4.5 4.5-4.5 4.5 2.015 4.5 4.5zm-2.146-1.854c-0.196-0.195-0.512-0.195-0.708 0L13.5 15.293l-0.646-0.647c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708l1 1c0.196 0.195 0.512 0.195 0.708 0l3-3c0.195-0.196 0.195-0.512 0-0.708z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_person_delete_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="M17.5 12c3.037 0 5.5 2.463 5.5 5.5 0 3.038-2.463 5.5-5.5 5.5-3.038 0-5.5-2.462-5.5-5.5 0-3.037 2.462-5.5 5.5-5.5zm-5.478 2C11.375 15.01 11 16.21 11 17.5c0 1.644 0.61 3.146 1.617 4.29-0.802 0.142-1.675 0.211-2.617 0.211-2.89 0-5.128-0.656-6.691-2-0.829-0.712-1.306-1.75-1.306-2.844V16.25c0-1.242 1.008-2.25 2.25-2.25h7.77zm3.07 0.966l-0.068 0.058-0.058 0.07c-0.118 0.17-0.118 0.398 0 0.568l0.058 0.07 1.77 1.769-1.768 1.767-0.058 0.069c-0.118 0.17-0.118 0.398 0 0.569l0.058 0.069 0.07 0.058c0.17 0.118 0.398 0.118 0.568 0l0.07-0.058 1.766-1.767 1.77 1.77 0.069 0.057c0.17 0.118 0.398 0.118 0.568 0l0.07-0.058 0.057-0.07c0.118-0.17 0.118-0.397 0-0.568l-0.058-0.069-1.769-1.77 1.772-1.768 0.058-0.07c0.118-0.17 0.118-0.398 0-0.568l-0.058-0.07-0.07-0.057c-0.17-0.119-0.397-0.119-0.568 0l-0.069 0.057-1.772 1.77-1.77-1.77-0.069-0.057c-0.146-0.102-0.334-0.116-0.492-0.044l-0.076 0.043zM10 2.005c2.761 0 5 2.239 5 5s-2.239 5-5 5-5-2.239-5-5 2.239-5 5-5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_star_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="M9.104 2.9c0.367-0.744 1.427-0.744 1.794 0l1.93 3.91 4.317 0.628c0.82 0.12 1.148 1.127 0.554 1.706l-3.124 3.044 0.738 4.3c0.14 0.816-0.717 1.44-1.451 1.054l-3.86-2.03-3.862 2.03c-0.733 0.385-1.59-0.238-1.45-1.055l0.737-4.299-3.124-3.044C1.71 8.565 2.037 7.557 2.857 7.438l4.317-0.627 1.93-3.912zm0.897 0.442l-1.93 3.911C7.925 7.548 7.643 7.753 7.318 7.8L3 8.428l3.124 3.044c0.235 0.23 0.343 0.561 0.287 0.885l-0.737 4.3 3.86-2.03c0.292-0.153 0.64-0.153 0.931 0l3.861 2.03-0.737-4.3c-0.056-0.324 0.052-0.655 0.287-0.885L17 8.428 12.684 7.8c-0.325-0.047-0.607-0.252-0.752-0.547l-1.93-3.911z" 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/layout-w600dp/button_bar_activation.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundLight"
+    android:outlineProvider="bounds"
+    android:orientation="horizontal"
+    android:clipToPadding="false"
+    android:elevation="3dp"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?secondaryLargeButtonStyle"
+        android:text="@string/resend" />
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?primaryLargeButtonStyle"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundLight"
+    android:clipToPadding="false"
+    android:elevation="3dp"
+    android:orientation="horizontal"
+    android:outlineProvider="bounds"
+    android:gravity="center_vertical"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        style="?secondaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="1"
+        android:text="@string/resend" />
+
+    <Button
+        android:id="@+id/btn_next"
+        style="?primaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="16dp"
+        android:layout_weight="1"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>

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

@@ -2,150 +2,113 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical"
+	android:padding="8dp"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?colorBackgroundLightest">
 
-	<RelativeLayout
-		android:id="@+id/reblogs"
+	<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+		android:id="@+id/button_bar"
 		android:layout_width="match_parent"
-		android:layout_height="64dp"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:paddingTop="12dp"
-		android:paddingBottom="12dp"
-		android:background="?android:selectableItemBackground">
+		android:layout_height="wrap_content">
 
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="24dp"
-			android:layout_height="24dp"
-			android:layout_alignParentStart="true"
-			android:layout_centerVertical="true"
-			android:src="@drawable/ic_fluent_arrow_repeat_all_24_regular"
-			android:tint="?android:textColorSecondary"
-			android:importantForAccessibility="no"/>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
 
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="match_parent"
+			<Button
+				android:id="@+id/reblogs"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:padding="8dp"
+				android:textSize="14sp"
+				android:minHeight="48dp"
+				android:textColor="?android:textColorSecondary"
+				android:background="@drawable/bg_text_button"
+				android:fontFamily="sans-serif"
+				android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"
+				android:drawablePadding="8dp"
+				android:drawableTint="?android:textColorSecondary"
+				tools:text="4 reblogs"/>
+
+			<Button
+				android:id="@+id/favorites"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:padding="8dp"
+				android:textSize="14sp"
+				android:minHeight="48dp"
+				android:textColor="?android:textColorSecondary"
+				android:background="@drawable/bg_text_button"
+				android:fontFamily="sans-serif"
+				android:drawableStart="@drawable/ic_fluent_star_20_regular"
+				android:drawablePadding="8dp"
+				android:drawableTint="?android:textColorSecondary"
+				tools:text="12 favorites"/>
+
+		</LinearLayout>
+
+		<Button
+			android:id="@+id/edit_history"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="32dp"
-			android:layout_toEndOf="@id/icon"
-			android:minHeight="22dp"
-			android:singleLine="true"
-			android:text="@string/post_info_reblogs"
-			android:textAppearance="@style/m3_body_large" />
-
-		<TextView
-			android:id="@+id/reblogs_count"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/title"
-			android:layout_alignStart="@id/title"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_body_medium"
+			android:gravity="center"
+			android:padding="8dp"
+			android:textSize="14sp"
+			android:minHeight="48dp"
 			android:textColor="?android:textColorSecondary"
-			tools:text="123 456"/>
+			android:background="@drawable/bg_text_button"
+			android:fontFamily="sans-serif"
+			android:drawableStart="@drawable/ic_fluent_history_20_regular"
+			android:drawablePadding="8dp"
+			android:drawableTint="?android:textColorSecondary"
+			tools:text="Dec 12, 2021, 12:42 PM"/>
 
-	</RelativeLayout>
+	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
-	<RelativeLayout
-		android:id="@+id/favorites"
-		android:layout_width="match_parent"
-		android:layout_height="64dp"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:paddingTop="12dp"
-		android:paddingBottom="12dp"
-		android:background="?android:selectableItemBackground">
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="24dp"
-			android:layout_height="24dp"
-			android:layout_alignParentStart="true"
-			android:layout_centerVertical="true"
-			android:src="@drawable/ic_fluent_star_24_regular"
-			android:tint="?android:textColorSecondary"
-			android:importantForAccessibility="no"/>
-
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="32dp"
-			android:layout_toEndOf="@id/icon"
-			android:minHeight="22dp"
-			android:singleLine="true"
-			android:text="@string/post_info_favorites"
-			android:textAppearance="@style/m3_body_large" />
-
-		<TextView
-			android:id="@+id/favorites_count"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/title"
-			android:layout_alignStart="@id/title"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_body_medium"
-			android:textColor="?android:textColorSecondary"
-			tools:text="123 456"/>
-
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:id="@+id/edit_history"
-		android:layout_width="match_parent"
-		android:layout_height="64dp"
-		android:paddingLeft="16dp"
-		android:paddingRight="16dp"
-		android:paddingTop="12dp"
-		android:paddingBottom="12dp"
-		android:background="?android:selectableItemBackground">
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="24dp"
-			android:layout_height="24dp"
-			android:layout_alignParentStart="true"
-			android:layout_centerVertical="true"
-			android:src="@drawable/ic_fluent_edit_24_regular"
-			android:tint="?android:textColorSecondary"
-			android:importantForAccessibility="no"/>
-
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="32dp"
-			android:layout_toEndOf="@id/icon"
-			android:minHeight="22dp"
-			android:singleLine="true"
-			android:text="@string/edit_history"
-			android:textAppearance="@style/m3_body_large" />
-
-		<TextView
-			android:id="@+id/last_edited"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/title"
-			android:layout_alignStart="@id/title"
-			android:singleLine="true"
-			android:textAppearance="@style/m3_body_medium"
-			android:textColor="?android:textColorSecondary"
-			tools:text="123 456"/>
-
-	</RelativeLayout>
-
-	<TextView
-		android:id="@+id/timestamp"
+	<LinearLayout
+		android:orientation="horizontal"
+		android:gravity="start|center"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:minHeight="20dp"
-		android:gravity="center_vertical"
-		android:textSize="14sp"
-		android:textColor="?android:textColorSecondary"
-		tools:text="Dec 12, 2021, 12:42 PM via Mastodon for Android"/>
+		android:layout_marginHorizontal="8dp"
+		android:minHeight="48dp">
+
+		<ImageView
+			android:id="@+id/visibility"
+			android:layout_height="20dp"
+			android:layout_width="20dp"
+			android:src="@drawable/ic_fluent_earth_20_regular"
+			android:tint="?android:textColorSecondary" />
+
+		<TextView
+			android:id="@+id/timestamp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="8dp"
+			android:minHeight="20dp"
+			android:gravity="center_vertical"
+			android:textSize="14sp"
+			android:textColor="?android:textColorSecondary"
+			tools:text="Dec 12, 2021, 12:42 PM via "/>
+
+		<Button
+			android:id="@+id/application_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:padding="0dp"
+			android:textSize="14sp"
+			android:minHeight="48dp"
+			android:textColor="?android:textColorSecondary"
+			android:background="@drawable/bg_text_button"
+			android:fontFamily="sans-serif"
+			android:singleLine="true"
+			android:ellipsize="end"
+			tools:text="Mastodon for Android"/>
+
+	</LinearLayout>
 
 </LinearLayout>

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

@@ -3,24 +3,62 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
 	android:paddingTop="10dp"
 	android:paddingBottom="12dp">
 
-	<org.joinmastodon.android.ui.views.LinkedTextView
-		android:id="@+id/text"
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:textSize="16sp"
-		android:textAppearance="@style/m3_body_large"/>
+		android:layout_height="wrap_content">
+
+		<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"/>
+
+			<TextView
+				android:id="@+id/spoiler_title_inline"
+				android:paddingHorizontal="16dp"
+				android:paddingVertical="14dp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				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:background="?attr/colorPollVoted"/>
+		</LinearLayout>
+
+		<org.joinmastodon.android.ui.views.LinkedTextView
+			android:id="@+id/text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingHorizontal="16dp"
+			android:textSize="16sp"
+			android:textAppearance="@style/m3_body_large"
+			tools:text="setting up my mstdn"/>
+	</LinearLayout>
+
 
 	<LinearLayout
+		android:visibility="gone"
 		android:id="@+id/spoiler_overlay"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:paddingVertical="8dp"
+		android:paddingHorizontal="16dp"
 		android:orientation="vertical">
 
 		<TextView

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

@@ -51,41 +51,6 @@
 
 	</ScrollView>
 
-	<LinearLayout
-		android:id="@+id/button_bar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?colorBackgroundLight"
-		android:outlineProvider="bounds"
-		android:orientation="horizontal"
-		android:clipToPadding="false"
-		android:elevation="3dp">
-
-		<Button
-			android:id="@+id/btn_back"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?secondaryLargeButtonStyle"
-			android:text="@string/resend"/>
-
-		<Space
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_weight="1"/>
-
-		<Button
-			android:id="@+id/btn_next"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?primaryLargeButtonStyle"
-			android:text="@string/open_email_app" />
-
-	</LinearLayout>
+	<include layout="@layout/button_bar_activation" />
 
 </me.grishka.appkit.views.FragmentRootLinearLayout>

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

@@ -166,31 +166,66 @@
 						</LinearLayout>
 					</LinearLayout>
 
-					<FrameLayout
+					<LinearLayout
 						android:id="@+id/profile_action_btn_wrap"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_alignParentEnd="true"
 						android:layout_below="@id/profile_counters"
-						android:padding="16dp"
-						android:clipToPadding="false">
-						<org.joinmastodon.android.ui.views.ProgressBarButton
-							android:id="@+id/profile_action_btn"
+						android:layout_alignParentEnd="true">
+
+						<FrameLayout
+							android:clipToPadding="false"
+							android:paddingVertical="16dp"
+							android:paddingLeft="16dp"
+							android:paddingRight="4dp"
 							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							tools:text="Edit Profile"/>
-						<ProgressBar
-							android:id="@+id/action_progress"
+							android:layout_height="wrap_content">
+							<org.joinmastodon.android.ui.views.ProgressBarButton
+								android:id="@+id/notify_btn"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:paddingHorizontal="8dp"
+								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
+
+							<ProgressBar
+								android:id="@+id/notify_progress"
+								style="?android:progressBarStyleSmall"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"
+								android:elevation="10dp"
+								android:indeterminate="true"
+								android:indeterminateTint="?colorButtonText"
+								android:outlineProvider="none"
+								android:visibility="gone" />
+						</FrameLayout>
+
+						<FrameLayout
+							android:clipToPadding="false"
+							android:paddingVertical="16dp"
+							android:paddingRight="16dp"
+							android:paddingLeft="4dp"
 							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center"
-							android:indeterminate="true"
-							style="?android:progressBarStyleSmall"
-							android:elevation="10dp"
-							android:outlineProvider="none"
-							android:indeterminateTint="?colorButtonText"
-							android:visibility="gone"/>
-					</FrameLayout>
+							android:layout_height="wrap_content">
+							<org.joinmastodon.android.ui.views.ProgressBarButton
+								android:id="@+id/profile_action_btn"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								tools:text="Edit Profile" />
+
+							<ProgressBar
+								android:id="@+id/action_progress"
+								style="?android:progressBarStyleSmall"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"
+								android:elevation="10dp"
+								android:indeterminate="true"
+								android:indeterminateTint="?colorButtonText"
+								android:outlineProvider="none"
+								android:visibility="gone" />
+						</FrameLayout>
+					</LinearLayout>
 
 					<TextView
 						android:id="@+id/name"

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

@@ -81,6 +81,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/bio"
+		android:paddingRight="8dp"
 		android:orientation="horizontal">
 
 		<LinearLayout
@@ -121,6 +122,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_title_large"
 				tools:text="123"/>
+
 			<TextView
 				android:id="@+id/followers_label"
 				android:layout_width="wrap_content"
@@ -143,6 +145,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_title_large"
 				tools:text="123"/>
+
 			<TextView
 				android:id="@+id/following_label"
 				android:layout_width="wrap_content"
@@ -156,20 +159,82 @@
 			android:layout_height="1px"
 			android:layout_weight="1"/>
 
+		<FrameLayout
+			android:id="@+id/reject_btn_wrap"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
+			android:paddingVertical="8dp"
+			android:visibility="gone">
+
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/reject_btn"
+				style="?secondaryButtonStyle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:contentDescription="@string/reject_follow_request"
+				android:drawableStart="@drawable/ic_fluent_dismiss_24_filled"
+				android:singleLine="true" />
+
+			<ProgressBar
+				android:id="@+id/reject_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone" />
+		</FrameLayout>
+
+		<FrameLayout
+			android:id="@+id/accept_btn_wrap"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:clipToPadding="false"
+			android:paddingHorizontal="4dp"
+			android:paddingVertical="8dp"
+			android:visibility="gone">
+
+			<org.joinmastodon.android.ui.views.ProgressBarButton
+				android:id="@+id/accept_btn"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:contentDescription="@string/accept_follow_request"
+				android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
+				android:singleLine="true" />
+
+			<ProgressBar
+				android:id="@+id/accept_progress"
+				style="?android:progressBarStyleSmall"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:elevation="10dp"
+				android:indeterminate="true"
+				android:outlineProvider="none"
+				android:visibility="gone" />
+		</FrameLayout>
+
 		<FrameLayout
 			android:id="@+id/action_btn_wrap"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
 			android:padding="8dp"
-			android:layout_marginEnd="8dp"
 			android:clipToPadding="false">
+
 			<org.joinmastodon.android.ui.views.ProgressBarButton
 				android:id="@+id/action_btn"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:singleLine="true"
 				tools:text="@string/follow_back"/>
+
 			<ProgressBar
 				android:id="@+id/action_progress"
 				android:layout_width="wrap_content"