Merge remote-tracking branch 'upstream/l10n_master'

reduce max height for photos
Translated using Weblate (Persian)
2023-06-12 20:43:22 +02:00 · 2023-06-12 20:25:12 +02:00 · 2023-06-12 17:43:48 +00:00 · 2023-06-12 17:43:48 +00:00 · 2023-06-12 17:43:48 +00:00 · 2023-06-12 19:43:13 +02:00
777 changed files with 2594 additions and 9027 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,9 +1,9 @@
 # These are supported funding model platforms

-github: LucasGGamerM
-custom: ["https://liberapay.com/LucasGGamerM/donate", liberapay.com]
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # mastodon
 open_collective: # Replace with a single Open Collective username e.g., user1
+ko_fi: xsk22
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username e.g., user1
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,6 +22,8 @@ Steps to reproduce the behavior:
 **Does this happen in the official app?**

 Does this issue also occur with the respective upstream release?
+(Please test using the respective `upstream-xxxxxx.apk` provided in [Releases](https://github.com/sk22/megalodon/releases) or at least using the current Mastodon version from the Play Store)
+
 > No / Yes

 > In case it does, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead.
@@ -33,7 +35,7 @@ If applicable, add screenshots (and screen recordings, if possible) to help expl

 **Version**

-Moshidon version: [e.g. v1.1.4+fork.#]
+Megalodon version: [e.g. v1.1.4+fork.#]

 **Crash log**

--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -1,70 +0,0 @@
-name: Nightly builds
-
-on:
-  push:
-    branches: [ "master" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout Appkit Repo
-      uses: actions/checkout@v3
-      with:
-        repository: grishka/appkit
-        
-    - name: set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'corretto'
-        cache: gradle
-        
-    - name: Comment out signing config in appkits gradle file
-      run: |
-        sed -i 's/sign publishing\.publications\.release/\/\/ sign publishing.publications.release/' appkit/maven-push.gradle
-
-    - name: Grant execute permission for gradlew for Appkit
-      run: chmod +x gradlew
-    
-    - name: Compile appkit
-      run: ./gradlew publishToMavenLocal
-      
-    - uses: actions/checkout@v3
-    - name: set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'corretto'
-        cache: gradle
-    
-    - name: Get current date
-      id: date
-      run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    
-    - name: Decode Keystore
-      id: decode_keystore
-      uses: timheuer/base64-to-file@v1
-      with:
-        fileName: 'nightly_keystore.jks'  
-        fileDir: './mastodon/keystore/'
-        encodedString: ${{ secrets.KEYSTORE }}
-    
-    - name: Build with Gradle
-      run: ./gradlew assembleNightly
-      env:
-          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-          CURRENT_DATE: ${{ steps.date.outputs.date }}
-      
-    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v3.1.2
-      with:
-       name: moshidon-nightly.apk
-       path: ./mastodon/build/outputs/apk/nightly/moshidon-nightly.apk
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,3 @@
 .cxx
 local.properties
 *.jks
-*.keystore
-/mastodon/keystore/nightly_keystore.keystore
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,9 +0,0 @@
-## F.A.Q
-
-Q: What are the main differences between Moshidon and Megalodon?
-
-A: There are many, but the most outstanding differences are: the ability to have other server's local timeline inside the app. It can be acessed in the "Add community" option in the top right corner of the Edit timelines screen. Other outstanding features that Moshidon has are some quality of life improvements, such as notification actions and allowing for unlisted replies by default.  Most other features are pretty minor, such as profile notes directly available in the person's profile. Other features are quite minor usability and visibility improvements. All of which can be found in the settings page. 
-
-Q: Will there ever be a versjon of Moshidon for iOS? 
-
-A: No. As android and iOS apps do not share code, it is incredibly hard to port.
--- a/README.md
+++ b/README.md
@@ -1,123 +1,122 @@
-![MoshidonLogo](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)

-# Moshidon, the material you mastodon client! 
+# Megalodon

-> A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
-
-
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=282C37&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)
-
-[![Download nightly release](https://img.shields.io/badge/dynamic/json?color=282C37&label=Download%20Nightly%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon-nightly/releases/latest/download/moshidon-nightly.apk)
-
-
-[![Translation status](https://translate.codeberg.org/widgets/moshidon/-/svg-badge.svg)](https://translate.codeberg.org/engage/moshidon/)
+[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
 &nbsp;
-[![Nightly build](https://github.com/LucasGGamerM/moshidon/actions/workflows/nightly-builds.yml/badge.svg)](https://github.com/LucasGGamerM/moshidon/actions/workflows/nightly-builds.yml)
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)

-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.moshinda"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
+<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
 &nbsp;
-<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
+<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>

-## Help out the project by donating at: https://github.com/sponsors/LucasGGamerM!
-### We also support LiberaPay at: https://liberapay.com/LucasGGamerM/donate!
+> A fork of the [Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app, focusing on [Glitch](https://glitch-soc.github.io/docs) compatibility, a pretty UI and adding new features that I feel make using the Fediverse a more pleasent experience.

-### You can also donate some Monero through this wallet address as well:
-4886mdarcyB6Yf8Qc6vDJBK1fz6ibHFLZUmHb4GZZz9yLGNhcG3XC64e5UZ8dVQYTLZb82W6P9WhteowW4STJEec97Gf22j
-
--- 

 ## Key features

-### **The ability to add other server's local timeline to your timelines**
-
-It can be accessed in the "Edit timelines" menu, where you can add a new "Community" to see other server's local posts!
-
-### **View remote profiles**
-
-You can now see all of a profile follows and followers, by directly loading them from the profile's home instance. In case of a failed lookup, the app will automatically fall back to the older method.
-
-### **Translate posts easily**
-
-Allows you to easily translate posts in another language with a translate button! Your instance must support translation, otherwise it will not work.
-
-### **Show posts filtered with a warning**
-
-Allows you to have filtered posts collapsed with a warning! As shown in the screenshots:
-
-Before             |  After
-:-------------------------:|:-------------------------:
-![Screenshot_20230205-100200edited](https://user-images.githubusercontent.com/71328265/216820539-20802dc5-e433-4511-b2d9-291d810e4ef2.png) | ![Screenshot_20230205-100203edited](https://user-images.githubusercontent.com/71328265/216820544-231b2966-f38f-4ec6-b555-d39c62433839.png)
-
-
-### **Color themes**
-
-Allows you to change theme within the app. Supports Material You, purple, pink, green, blue, red, orange, yellow and Nord!
-
 ### **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”).**
+<details>
+<p><summary>Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Community”, “Federated” and “Posts”).</summary></p>
+
+When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reblogged/replied to your post.

-When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
-  
 The Mastodon documentation has some more information about [Unlisted posting](https://docs.joinmastodon.org/user/posting/#unlisted) and [Public timelines](https://docs.joinmastodon.org/user/network/#timelines).
+</details>

 ### **Federated timeline**

-**This allows you to chronologically see all Public posts from people on all other Fediverse neighborhoods your home instance is connected to.**
+<details>
+<p><summary>This allows you to chronologically see all Public posts from people on all other Fediverse neighborhoods your home instance is connected to.</summary></p>

 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!
+</details>

-### **Image description viewer**
+### **Customizable timelines**

-**Allows you to quickly check whether an image or video has an alternative text attached to it.**
+<details>
+<p><summary>You can customize Megalodon’s home tab and not only add local and federated timelines, but also pin lists and hashtags.</summary></p>

-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!
+Even better: You can rename every timeline however you please and pick a distinct icon for each timeline. This way, you can pin the hashtag “#Caturday”, rename your timeline to “CUTENESS OVERLOAD” and set <img src="img/ic_fluent_animal_cat_24_regular.svg" alt="Cat icon from Microsoft Fluent UI icons"> as its icon. :3 You can find the timelines editor by opening your home tab, tapping the `⋮` button in the top right and going to “Edit timelines”.
+</details>

-### **Reminder to add alt text to attached media**
+### **Draft and schedule posts**

-By default, Moshidon will show a warning to add alt text if your post has any attachments without any alt text. This is for better accessibility, and it can easily be bypassed and disabled in settings.
+<details>
+<p><summary>
+Allows to prepare a post and schedule it to send it automatically at a specific time.</summary></p>

-### **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.
+You can create drafts, edit them, send them manually later or set a scheduled date. Drafts are technically saved as scheduled posts, so you can view and edit them from other apps that support scheduled posts. Scheduled posts are handled by your home instance, so they'll work even if you uninstall Megalodon.
+</details>

 ## Installation

-**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Moshidon will automatically notify you about new updates inside the app.**
+### IzzyOnDroid

-To install this app on your Android device, download the [latest release from GitHub](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
+[apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)

-Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Moshidon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
+
+Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
+
+[`https://apt.izzysoft.de/fdroid/repo`](https://apt.izzysoft.de/fdroid/repo)
+
+### Google Play Store
+
+[play.google.com/store/apps/details?id=org.joinmastodon.android.sk](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)
+
+<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
+
+### F-Droid
+
+**[F-Droid.org?](https://f-droid.org)** Not yet, sorry!
+
+If you want, you can help me figure out if something's missing in the [Issue #47: F-Droid.org](https://github.com/sk22/megalodon/issues/47)
+
+### Direct
+
+Press the download button to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.
+
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
+
+You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
+
+Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+
+---

-Moshidon is also available in [IzzyOnDroid repo](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.moshinda), compatible with all F-Droid clients. The APK provided here is the same as the one included in the Releases.

 ## Release variants

-### Stable variant
+All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page. When downloading a pre-release, expect to see unfinished features and bugs. If you don’t want that, just download the [latest full release](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk).

-All stable version downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
+**`megalodon.apk`**

-**`moshidon.apk`**
+Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.

-Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
+**`upstream-1234abc.apk`**

-### Nightly variant
+This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.

-All nightly builds can be downloaded at [Nightly Releases](https://github.com/LucasGGamerM/moshidon-nightly/releases) page.
+<!-- **`megalodon-fdroid.apk`**

-**`moshidon-nightly.apk`**
+Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
+
+---
+
+## Contribution
+
+### Translation
+
+The translation for the base of the app is sourced from the upstream **Mastodon for Android** project, which you can contribute to on its Crowdin project: [https://crowdin.com/project/mastodon-for-android](https://crowdin.com/project/mastodon-for-android)
+
+There's also a bunch of custom strings exclusive to this project that need to be translated. You can help translate **Megalodon** on Weblate: [https://translate.codeberg.org/projects/megalodon](https://translate.codeberg.org/projects/megalodon)
+
+[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/horizontal-auto.svg)](https://translate.codeberg.org/engage/megalodon)

-Unstable variant with an integrated updater. It's for development and testing purposes. If you find any bugs with it, please file a bug report at our [issues](https://github.com/LucasGGamerM/moshidon/issues) page.

 ---

@@ -126,25 +125,16 @@ Unstable variant with an integrated updater. It's for development and testing pu

 ### Features

-* [Adding the ability to view other server's local timelines](https://github.com/LucasGGamerM/moshidon/tree/feature/local-timelines)
-* [Adding the ability to load followers and following from remote instance](https://github.com/LucasGGamerM/moshidon/tree/feature/remote-followers)
-* [Adding the ability to have filtered posts show with a warning](https://github.com/LucasGGamerM/moshidon/tree/feature/filters_again)
 * [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
  ([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* Adding a useful private profile note box
-* Auto hiding the compose button on scroll
-* Adding the ability to remind yourself to add alt text to images
-* An indicator for if an image has alt text or not
-* Adding the ability to have drafts
-* Also adding the ability to view announcements from your instance
-* Adding the ability to post for local timeline only (Only on instances that support it!)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
 * [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
 * [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
 * [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
 * [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
 * [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/check-for-update-button)
 * [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Add settings to hide replies and reblogs from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
 * [Follow and unfollow hashtags](https://github.com/sk22/megalodon/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
 * [Notification bell for posts](https://github.com/sk22/megalodon/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
 * [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
@@ -154,13 +144,27 @@ Unstable variant with an integrated updater. It's for development and testing pu
 * [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/posts-notifications-tab)
 * [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
 * [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
-* [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
+* [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
+* [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
+* [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
+* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
+* [Implement deleting notifications](https://github.com/sk22/megalodon/commit/b0f9ce081f69f29ad59658fc00ca41372cd2677d) (disabled by default)
+* [Long-click boost button to "quote" a post](https://github.com/sk22/megalodon/commit/b25a237c20c6a924ed4d9b357999867c3a32b32b)
+* [Draft and schedule posts](https://github.com/sk22/megalodon/pull/217)
+* [Display original post when replying](https://github.com/sk22/megalodon/commit/375f8ceb2747705fedf43686681cc0e0b812f899)
+* [Display server announcements](https://github.com/sk22/megalodon/commit/84179bc207d6b69cc2a770a3c28fa0a39b0b54e8)
+* [Create](https://github.com/sk22/megalodon/commit/294595513a45037359b31377aafc25ae5b58d8e7), [edit](https://github.com/sk22/megalodon/commit/d47797bf7ac8cff3f9ba1cfee219a1bb2af21da6) and [delete](https://github.com/sk22/megalodon/commit/54c29fd787fc2cd0dfd2787ad796b8190f795973) lists
+* [Soft-blocking (by blocking and immediately unblocking)](https://github.com/sk22/megalodon/commit/e75d350b7a2709259e9fc5138e0e1f361bdb0972)
+* [Pinnable custom timelines](https://github.com/sk22/megalodon/pull/338/commits)
+* Support for local-only posts
+* Support for copying the URL to posts/accounts/… in Pixel launcher’s Recent apps view
+* Compatibility for Akkoma Bubble timeline
+* Listings of followers/following/favorites/boosts can be loaded from the origin instance (there’s an option to disable this in in the settings)
+* Allow opening posts/accounts in-app by sharing a URL/handle to Megalodon (Originally implemented in [Moshidon](https://github.com/LucasGGamerM/moshidon), [PR](https://github.com/sk22/megalodon/pull/531))


 ### Behavior

-* Allow for confirmation before reblogging
-* Adding a bottom option for the publish button, allowing for easier use on larger screens!
 * [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
 * [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
 * [Display full image when adding image description](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
@@ -168,6 +172,22 @@ Unstable variant with an integrated updater. It's for development and testing pu
 * [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
 * [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
 * [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
+* [No ellipsis for long poll answers](https://github.com/mastodon/mastodon-android/commit/c9aae828e2518adccdc092e41f8d1f0489636271)
+* [Show poll vote button for multiple and single answer polls](https://github.com/mastodon/mastodon-android/commit/e14dfda2fdf32f0fa3043504ac5831683a87559a)
+* [Show own vote after voting](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28) ([Closes issue](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28))
+* [Make inline emoji search case-insensitive and don't only search from start of emoji names](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:better-inline-emoji-search) ([Pull request](https://github.com/mastodon/mastodon-android/pull/445))
+* [Include subject line when sharing e.g. a website to Megalodon](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:external-share-include-subject)
+* [Improve semantics for voting on polls (radio buttons and checkboxes)](https://github.com/sk22/megalodon/commit/6fd58c96827cb1d2da329cebdc170a1425dd18d7)
+* [Copy post URL when long-pressing share button](https://github.com/sk22/megalodon/commit/ba36347f03278763ecec617b1ce57ba89db7be72)
+* [Add option to disable swiping between tabs](https://github.com/sk22/megalodon/commit/1f20b21fc84bf006c1ec14bd2229cbfad5215ec8)
+* [Resolve Fediverse links in the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/open-urls-in-app)
+* [Preserve whitespaces in HTML](https://github.com/sk22/megalodon/commit/7d876bddc7a07d98f0fecbf62b13bdb9fcce3412)
+* [Long-click to copy links](https://github.com/sk22/megalodon/commit/b32e32274923a94742a9926ef38785f746d41405)
+* Improved filtering using Mastodon 4.0 API: [#202](https://github.com/sk22/megalodon/pull/202), [#212](https://github.com/sk22/megalodon/pull/212), [#255](https://github.com/sk22/megalodon/pull/255) by [@thiagojedi](https://github.com/thiagojedi)
+* [Support admin notifications](https://github.com/sk22/megalodon/commit/c12a6eaee6b609bc53eb0a45d9199f37d5241801) and [notifications for edited reblogged posts](https://github.com/sk22/megalodon/commit/900e8fb2e9353002c16d15e06b78d2731e121601)
+* [Android file opener added back in addition to image picker](https://github.com/sk22/megalodon/commit/3a6ace53d5ab01e28077c9c930cb6ed487b78031)
+* [Replies are inserted below the replied-to post in thread view](https://github.com/sk22/megalodon/commit/87c37df370ec24aeea0d2dbaeb29468aa4fb5808)
+* Option to auto-reveal equal content warnings in threads


 ### Visual
@@ -175,6 +195,17 @@ Unstable variant with an integrated updater. It's for development and testing pu
 * [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
 * [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
 * [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
+* [Custom color themes](https://github.com/sk22/megalodon/pull/124) by [@LucasGGamerM](https://github.com/LucasGGamerM)
+* [Custom "megalodon" text logo](https://github.com/sk22/megalodon/commit/563afd487ca5c608cfbb00fa3909d3c27384acc0) by [@LucasGGamerM](https://github.com/LucasGGamerM)
+* [Custom login screen](https://github.com/sk22/megalodon/commit/9bbf8c4618dbe13accaeb3b5482bf3fe88cac4c0)
+* [More distinct filled boost icon](https://github.com/sk22/megalodon/commits/more-distinct-filled-boost-icon)
+* Material You color theme by [@LucasGGamerM](https://github.com/LucasGGamerM)
+* [Animations for interaction buttons](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/animate-buttons)
+* [Dedicated icons for different notification types](https://github.com/sk22/megalodon/pull/178) by [@florian-obernberger](https://github.com/florian-obernberger)
+* Scale text according to system settings
+* Header in timeline for followed hashtags
+* [Indicator for missing alt texts](https://github.com/sk22/megalodon/commit/c0c276f03e793b78c478c17dfdef24a66ef7cedb)
+* Visually grouped (by removing divider lines and reducing padding) threaded replies in thread view


 ## Building
@@ -185,18 +216,12 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth
 ./gradlew assembleRelease
 ```

+Note that Megalodon might be depending on an in-development version of [AppKit](https://github.com/grishka/appkit) – a library by Mastodon for Android’s developer. In case the used AppKit version isn’t published to Maven Central yet, you might have to clone, build and publish it to your local Maven repository. For more information, see [this GitHub issue](https://github.com/mastodon/mastodon-android/issues/375#issuecomment-1507678585).
+
 ## License

 This project is released under the [GPL-3 License](./LICENSE).

 ## Links

-[F.A.Q](FAQ.md)
-
-[Official matrix chatroom:](https://matrix.to/#/#moshidon:floss.social) https://matrix.to/#/#moshidon:floss.social
-
-[Moshidon roadmap](https://github.com/users/LucasGGamerM/projects/1)
-
-<a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>
-
---
+<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>
--- a/_config.yml
+++ b/_config.yml
@@ -1,2 +1,2 @@
-title: Moshidon
+title: Megalodon
 layout: default
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Moshidon</title>
+    <title>Megalodon</title>
    <link rel="icon" href="mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png">
    <link rel="me" href="https://floss.social/@megalodon">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.1.0/github-markdown.min.css">
@@ -14,4 +14,4 @@
      {{ content }}  
    </div>
  </body>
-</html>
+</html>
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,6 @@ buildscript {
 	repositories {
 		google()
 		mavenCentral()
-		mavenLocal()
 	}
 	dependencies {
 		classpath 'com.android.tools.build:gradle:8.0.0'
--- a/img/ic_fluent_animal_cat_24_regular.svg
+++ b/img/ic_fluent_animal_cat_24_regular.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<style>
+path { fill: black; }
+@media (prefers-color-scheme: dark) {
+    path { fill: white; }
+}
+</style>
+<path d="M15.4925 3.50673C14.652 3.58251 13.9933 4.28929 13.9933 5.15V10C13.9933 10.4142 13.6577 10.75 13.2437 10.75C11.8002 10.75 10.7863 11.3378 10.0365 12.238C9.26389 13.1656 8.7607 14.444 8.44554 15.7954C8.13254 17.1376 8.01871 18.4912 7.98453 19.5172C7.97182 19.8987 7.9702 20.2324 7.97313 20.5H14.9928V19.75C14.9928 18.5074 13.986 17.5 12.744 17.5H11.4947C11.0807 17.5 10.7451 17.1642 10.7451 16.75C10.7451 16.3358 11.0807 16 11.4947 16H12.744C14.8139 16 16.4919 17.6789 16.4919 19.75V20.5H17.2415C17.6555 20.5 17.9911 20.1642 17.9911 19.75V9.75C17.9911 9.33579 18.3267 9 18.7407 9H19.2472C20.2264 9 20.8249 7.92404 20.309 7.09132L19.6893 6.09132C19.4615 5.72367 19.0599 5.5 18.6275 5.5H16.2421C15.8281 5.5 15.4925 5.16421 15.4925 4.75V3.50673ZM6.47388 20.5C6.47098 20.2156 6.47293 19.8655 6.4862 19.4672C6.52229 18.3838 6.64271 16.9249 6.98559 15.4546C7.32631 13.9935 7.90065 12.4594 8.88484 11.2777C9.75681 10.2307 10.9399 9.47669 12.4942 9.29318V5.15C12.4942 3.4103 13.9037 2 15.6424 2C16.3876 2 16.9916 2.60442 16.9916 3.35V4H18.6275C19.5787 4 20.4622 4.49207 20.9634 5.30092L21.5831 6.30092C22.6749 8.06291 21.4985 10.32 19.4903 10.4898V19.75C19.4903 20.9926 18.4835 22 17.2415 22H7.24708L7.24537 22H5.79625C3.69964 22 2 20.2994 2 18.2016C2 17.2395 2.36489 16.3133 3.02098 15.6099L4.15612 14.393C4.92005 13.5741 5.17521 12.4027 4.82117 11.3399C4.67114 10.8896 4.41837 10.4804 4.08288 10.1447L2.96914 9.03042C2.67641 8.73753 2.67639 8.26266 2.96912 7.96976C3.26184 7.67686 3.73645 7.67685 4.02919 7.96974L5.14293 9.08405C5.643 9.58438 6.01977 10.1943 6.2434 10.8656C6.77114 12.4497 6.3908 14.1958 5.25209 15.4165L4.11695 16.6334C3.71996 17.059 3.49916 17.6195 3.49916 18.2016C3.49916 19.471 4.52761 20.5 5.79625 20.5H6.47388Z" fill="#212121"/>
+</svg>
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -11,69 +11,30 @@ java {
 android {
 	compileSdk 33
 	defaultConfig {
-		manifestPlaceholders = [oAuthScheme:"moshidon-android-auth"]
-		archivesBaseName = "moshidon"
-		applicationId "org.joinmastodon.android.moshinda"
+		archivesBaseName = "megalodon"
+		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 33
-		versionCode 100
-		versionName "1.3.0+fork.100.moshinda"
+		versionCode 92
+		versionName "1.2.3+fork.92"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        resourceConfigurations += ['ar-rSA', 'ar-rDZ', 'be-rBY', 'bn-rBD', 'bs-rBA', 'ca-rES', 'cs-rCZ', 'da-rDK', 'de-rDE', 'el-rGR', 'es-rES', 'eu-rES', 'fa-rIR', 'fi-rFI', 'fil-rPH', 'fr-rFR', 'ga-rIE', 'gd-rGB', 'gl-rES', 'hi-rIN', 'hr-rHR', 'hu-rHU', 'hy-rAM', 'ig-rNG', 'in-rID', 'is-rIS', 'it-rIT', 'iw-rIL', 'ja-rJP', 'kab', 'ko-rKR', 'my-rMM', 'nl-rNL', 'no-rNO', 'oc-rFR', 'pl-rPL', 'pt-rBR', 'pt-rPT', 'ro-rRO', 'ru-rRU', 'si-rLK', 'sl-rSI', 'sv-rSE', 'th-rTH', 'tr-rTR', 'uk-rUA', 'ur-rIN', 'vi-rVN', 'zh-rCN', 'zh-rTW']
    }

-	signingConfigs {
-		nightly{
-			storeFile = file("keystore/nightly_keystore.jks")
-			storePassword System.getenv("SIGNING_STORE_PASSWORD")
-			if (storePassword == null) {
-				Properties properties = new Properties()
-				properties.load(project.rootProject.file('local.properties').newDataInputStream())
-				storePassword = properties.getProperty('SIGNING_STORE_PASSWORD')
-			}
-			keyAlias System.getenv("SIGNING_KEY_ALIAS")
-			if (keyAlias == null) {
-				Properties properties = new Properties()
-				properties.load(project.rootProject.file('local.properties').newDataInputStream())
-				keyAlias = properties.getProperty('SIGNING_KEY_ALIAS')
-			}
-			keyPassword System.getenv("SIGNING_KEY_PASSWORD")
-			if (keyPassword == null) {
-				Properties properties = new Properties()
-				properties.load(project.rootProject.file('local.properties').newDataInputStream())
-				keyPassword = properties.getProperty('SIGNING_KEY_PASSWORD')
-			}
-		}
-	}
-
 	buildTypes {
 		release {
-			minifyEnabled true
-			shrinkResources true
+//			minifyEnabled true
+//			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{
 			debuggable true
 			versionNameSuffix '-debug'
 			applicationIdSuffix '.debug'
-			manifestPlaceholders = [oAuthScheme:"moshidon-android-debug-auth"]
 		}
 		githubRelease{
 			initWith release
 		}
-		nightly{
-			if(System.getenv("CURRENT_DATE") != null){
-				versionNameSuffix '-nightly+@' + System.getenv("CURRENT_DATE")
-			} else {
-				Properties properties = new Properties()
-				properties.load(project.rootProject.file('local.properties').newDataInputStream())
-				versionNameSuffix '-nightly+@' + properties.getProperty('CURRENT_DATE')
-			}
-			applicationIdSuffix '.nightly'
-
-			signingConfig signingConfigs.nightly
-			manifestPlaceholders = [oAuthScheme:"moshidon-android-nightly-auth"]
-		}
 		playRelease{
 			initWith release
 			minifyEnabled true
@@ -91,7 +52,7 @@ android {
 			setRoot "src/github"
 		}
 		debug {
-			setRoot "src/debug"
+			setRoot "src/github"
 		}
 	}
 	namespace 'org.joinmastodon.android'
--- a/mastodon/proguard-rules.pro
+++ b/mastodon/proguard-rules.pro
@@ -42,13 +42,6 @@

 -keepattributes LineNumberTable

-keepattributes *
-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
-
-#-keep class javax.** { *; }
-keep class org.joinmastodon.android.** { *; }
-
 # Parceler library
 -keep interface org.parceler.Parcel
 -keep @org.parceler.Parcel class * { *; }
--- a/mastodon/src/debug/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
+++ b/mastodon/src/debug/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
@@ -1,369 +0,0 @@
-package org.joinmastodon.android.updater;
-
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInstaller;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-
-import java.io.File;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import androidx.annotation.Keep;
-import okhttp3.Call;
-import okhttp3.Request;
-import okhttp3.Response;
-
-@Keep
-public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
-	private static final long CHECK_PERIOD=6*3600*1000L;
-	private static final String TAG="GithubSelfUpdater";
-
-	private UpdateState state=UpdateState.NO_UPDATE;
-	private UpdateInfo info;
-	private long downloadID;
-	private BroadcastReceiver downloadCompletionReceiver=new BroadcastReceiver(){
-		@Override
-		public void onReceive(Context context, Intent intent){
-			if(downloadID!=0 && intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, 0)==downloadID){
-				MastodonApp.context.unregisterReceiver(this);
-				setState(UpdateState.DOWNLOADED);
-			}
-		}
-	};
-
-	public GithubSelfUpdaterImpl(){
-		SharedPreferences prefs=getPrefs();
-		int checkedByBuild=prefs.getInt("checkedByBuild", 0);
-		if(prefs.contains("version") && checkedByBuild==BuildConfig.VERSION_CODE){
-			info=new UpdateInfo();
-			info.version=prefs.getString("version", null);
-			info.size=prefs.getLong("apkSize", 0);
-			info.changelog=prefs.getString("changelog", null);
-			downloadID=prefs.getLong("downloadID", 0);
-			if(downloadID==0 || !getUpdateApkFile().exists()){
-				state=UpdateState.UPDATE_AVAILABLE;
-			}else{
-				DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
-				state=dm.getUriForDownloadedFile(downloadID)==null ? UpdateState.DOWNLOADING : UpdateState.DOWNLOADED;
-				if(state==UpdateState.DOWNLOADING){
-					MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-				}
-			}
-		}else if(checkedByBuild!=BuildConfig.VERSION_CODE && checkedByBuild>0){
-			// We are in a new version, running for the first time after update. Gotta clean things up.
-			long id=getPrefs().getLong("downloadID", 0);
-			if(id!=0){
-				MastodonApp.context.getSystemService(DownloadManager.class).remove(id);
-			}
-			getUpdateApkFile().delete();
-			getPrefs().edit()
-					.remove("apkSize")
-					.remove("version")
-					.remove("apkURL")
-					.remove("checkedByBuild")
-					.remove("downloadID")
-					.remove("changelog")
-					.apply();
-		}
-	}
-
-	private SharedPreferences getPrefs(){
-		return MastodonApp.context.getSharedPreferences("githubUpdater", Context.MODE_PRIVATE);
-	}
-
-	@Override
-	public void maybeCheckForUpdates(){
-		if(state!=UpdateState.NO_UPDATE && state!=UpdateState.UPDATE_AVAILABLE)
-			return;
-		long timeSinceLastCheck=System.currentTimeMillis()-getPrefs().getLong("lastCheck", CHECK_PERIOD);
-		if(timeSinceLastCheck>=CHECK_PERIOD){
-			setState(UpdateState.CHECKING);
-			MastodonAPIController.runInBackground(this::actuallyCheckForUpdates);
-		}
-	}
-
-	@Override
-	public void checkForUpdates() {
-		setState(UpdateState.CHECKING);
-		MastodonAPIController.runInBackground(this::actuallyCheckForUpdates);
-	}
-
-	private void actuallyCheckForUpdates(){
-		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases")
-				.build();
-		Call call=MastodonAPIController.getHttpClient().newCall(req);
-		try(Response resp=call.execute()){
-			JsonArray arr=JsonParser.parseReader(resp.body().charStream()).getAsJsonArray();
-			for (JsonElement jsonElement : arr) {
-				JsonObject obj = jsonElement.getAsJsonObject();
-				if (obj.get("prerelease").getAsBoolean() && !GlobalUserPreferences.enablePreReleases) continue;
-
-				String tag=obj.get("tag_name").getAsString();
-				String changelog=obj.get("body").getAsString();
-				Pattern pattern=Pattern.compile("v?(\\d+)\\.(\\d+)\\.(\\d+)\\+fork\\.(\\d+)");
-				Matcher matcher=pattern.matcher(tag);
-				if(!matcher.find()){
-					Log.w(TAG, "actuallyCheckForUpdates: release tag has wrong format: "+tag);
-					return;
-				}
-				int newMajor=Integer.parseInt(matcher.group(1)),
-						newMinor=Integer.parseInt(matcher.group(2)),
-						newRevision=Integer.parseInt(matcher.group(3)),
-						newForkNumber=Integer.parseInt(matcher.group(4));
-				matcher=pattern.matcher(BuildConfig.VERSION_NAME);
-				String[] currentParts=BuildConfig.VERSION_NAME.split("[.+]");
-				if(!matcher.find()){
-					Log.w(TAG, "actuallyCheckForUpdates: current version has wrong format: "+BuildConfig.VERSION_NAME);
-					return;
-				}
-				int curMajor=Integer.parseInt(matcher.group(1)),
-						curMinor=Integer.parseInt(matcher.group(2)),
-						curRevision=Integer.parseInt(matcher.group(3)),
-						curForkNumber=Integer.parseInt(matcher.group(4));
-				long newVersion=((long)newMajor << 32) | ((long)newMinor << 16) | newRevision;
-				long curVersion=((long)curMajor << 32) | ((long)curMinor << 16) | curRevision;
-				if(newVersion>curVersion || newForkNumber>curForkNumber){
-					String version=newMajor+"."+newMinor+"."+newRevision+"+fork."+newForkNumber;
-					Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
-					for(JsonElement el:obj.getAsJsonArray("assets")){
-						JsonObject asset=el.getAsJsonObject();
-						if("moshidon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
-							long size=asset.get("size").getAsLong();
-							String url=asset.get("browser_download_url").getAsString();
-
-							UpdateInfo info=new UpdateInfo();
-							info.size=size;
-							info.version=version;
-							info.changelog=changelog;
-							this.info=info;
-
-							getPrefs().edit()
-									.putLong("apkSize", size)
-									.putString("version", version)
-									.putString("apkURL", url)
-									.putString("changelog", changelog)
-									.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
-									.remove("downloadID")
-									.apply();
-
-							break;
-						}
-					}
-				}
-				getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
-				break;
-			}
-		}catch(Exception x){
-			Log.w(TAG, "actuallyCheckForUpdates", x);
-		}finally{
-			setState(info==null ? UpdateState.NO_UPDATE : UpdateState.UPDATE_AVAILABLE);
-		}
-	}
-
-	private void setState(UpdateState state){
-		this.state=state;
-		E.post(new SelfUpdateStateChangedEvent(state));
-	}
-
-	@Override
-	public UpdateState getState(){
-		return state;
-	}
-
-	@Override
-	public UpdateInfo getUpdateInfo(){
-		return info;
-	}
-
-	public File getUpdateApkFile(){
-		return new File(MastodonApp.context.getExternalCacheDir(), "update.apk");
-	}
-
-	@Override
-	public void downloadUpdate(){
-		if(state==UpdateState.DOWNLOADING)
-			throw new IllegalStateException();
-		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
-		MastodonApp.context.registerReceiver(downloadCompletionReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-		downloadID=dm.enqueue(
-				new DownloadManager.Request(Uri.parse(getPrefs().getString("apkURL", null)))
-						.setDestinationUri(Uri.fromFile(getUpdateApkFile()))
-		);
-		getPrefs().edit().putLong("downloadID", downloadID).apply();
-		setState(UpdateState.DOWNLOADING);
-	}
-
-	@Override
-	public void installUpdate(Activity activity){
-		if(state!=UpdateState.DOWNLOADED)
-			throw new IllegalStateException();
-		Uri uri;
-		Intent intent=new Intent(Intent.ACTION_INSTALL_PACKAGE);
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-			uri=new Uri.Builder().scheme("content").authority(activity.getPackageName()+".self_update_provider").path("update.apk").build();
-			intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-		}else{
-			uri=Uri.fromFile(getUpdateApkFile());
-		}
-		intent.setDataAndType(uri, "application/vnd.android.package-archive");
-		activity.startActivity(intent);
-
-		// TODO figure out how to restart the app when updating via this new API
-		/*
-		PackageInstaller installer=activity.getPackageManager().getPackageInstaller();
-		try{
-			final int sid=installer.createSession(new PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL));
-			installer.registerSessionCallback(new PackageInstaller.SessionCallback(){
-				@Override
-				public void onCreated(int i){
-
-				}
-
-				@Override
-				public void onBadgingChanged(int i){
-
-				}
-
-				@Override
-				public void onActiveChanged(int i, boolean b){
-
-				}
-
-				@Override
-				public void onProgressChanged(int id, float progress){
-
-				}
-
-				@Override
-				public void onFinished(int id, boolean success){
-					activity.getPackageManager().setComponentEnabledSetting(new ComponentName(activity, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
-				}
-			});
-			activity.getPackageManager().setComponentEnabledSetting(new ComponentName(activity, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
-			PackageInstaller.Session session=installer.openSession(sid);
-			try(OutputStream out=session.openWrite("mastodon.apk", 0, info.size); InputStream in=new FileInputStream(getUpdateApkFile())){
-				byte[] buffer=new byte[16384];
-				int read;
-				while((read=in.read(buffer))>0){
-					out.write(buffer, 0, read);
-				}
-			}
-//			PendingIntent intent=PendingIntent.getBroadcast(activity, 1, new Intent(activity, InstallerStatusReceiver.class), PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
-			PendingIntent intent=PendingIntent.getActivity(activity, 1, new Intent(activity, MainActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-			session.commit(intent.getIntentSender());
-		}catch(IOException x){
-			Log.w(TAG, "installUpdate", x);
-			Toast.makeText(activity, x.getMessage(), Toast.LENGTH_SHORT).show();
-		}
-		 */
-	}
-
-	@Override
-	public float getDownloadProgress(){
-		if(state!=UpdateState.DOWNLOADING)
-			throw new IllegalStateException();
-		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
-		try(Cursor cursor=dm.query(new DownloadManager.Query().setFilterById(downloadID))){
-			if(cursor.moveToFirst()){
-				long loaded=cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
-				long total=cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
-//				Log.d(TAG, "getDownloadProgress: "+loaded+" of "+total);
-				return total>0 ? (float)loaded/total : 0f;
-			}
-		}
-		return 0;
-	}
-
-	@Override
-	public void cancelDownload(){
-		if(state!=UpdateState.DOWNLOADING)
-			throw new IllegalStateException();
-		DownloadManager dm=MastodonApp.context.getSystemService(DownloadManager.class);
-		dm.remove(downloadID);
-		downloadID=0;
-		getPrefs().edit().remove("downloadID").apply();
-		setState(UpdateState.UPDATE_AVAILABLE);
-	}
-
-	@Override
-	public void handleIntentFromInstaller(Intent intent, Activity activity){
-		int status=intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0);
-		if(status==PackageInstaller.STATUS_PENDING_USER_ACTION){
-			Intent confirmIntent=intent.getParcelableExtra(Intent.EXTRA_INTENT);
-			activity.startActivity(confirmIntent);
-		}else if(status!=PackageInstaller.STATUS_SUCCESS){
-			String msg=intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
-			Toast.makeText(activity, activity.getString(R.string.error)+":\n"+msg, Toast.LENGTH_LONG).show();
-		}
-	}
-
-	/*public static class InstallerStatusReceiver extends BroadcastReceiver{
-
-		@Override
-		public void onReceive(Context context, Intent intent){
-			int status=intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0);
-			if(status==PackageInstaller.STATUS_PENDING_USER_ACTION){
-				Intent confirmIntent=intent.getParcelableExtra(Intent.EXTRA_INTENT);
-				context.startActivity(confirmIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-			}else if(status!=PackageInstaller.STATUS_SUCCESS){
-				String msg=intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
-				Toast.makeText(context, context.getString(R.string.error)+":\n"+msg, Toast.LENGTH_LONG).show();
-			}
-		}
-	}
-
-	public static class AfterUpdateRestartReceiver extends BroadcastReceiver{
-
-		@Override
-		public void onReceive(Context context, Intent intent){
-			if(Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction())){
-				context.getPackageManager().setComponentEnabledSetting(new ComponentName(context, AfterUpdateRestartReceiver.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
-				Toast.makeText(context, R.string.update_installed, Toast.LENGTH_SHORT).show();
-				Intent restartIntent=new Intent(context, MainActivity.class)
-						.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-						.setPackage(context.getPackageName());
-				if(Build.VERSION.SDK_INT<Build.VERSION_CODES.P){
-					context.startActivity(restartIntent);
-				}else{
-					// Bypass activity starting restrictions by starting it from a notification
-					NotificationManager nm=context.getSystemService(NotificationManager.class);
-					NotificationChannel chan=new NotificationChannel("selfUpdateRestart", context.getString(R.string.update_installed), NotificationManager.IMPORTANCE_HIGH);
-					nm.createNotificationChannel(chan);
-					Notification n=new Notification.Builder(context, "selfUpdateRestart")
-							.setContentTitle(context.getString(R.string.update_installed))
-							.setContentIntent(PendingIntent.getActivity(context, 1, restartIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))
-							.setFullScreenIntent(PendingIntent.getActivity(context, 1, restartIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE), true)
-							.setSmallIcon(R.drawable.ic_ntf_logo)
-							.build();
-					nm.notify(1, n);
-				}
-			}
-		}
-	}*/
-}
--- a/mastodon/src/debug/java/org/joinmastodon/android/updater/SelfUpdateContentProvider.java
+++ b/mastodon/src/debug/java/org/joinmastodon/android/updater/SelfUpdateContentProvider.java
@@ -1,62 +0,0 @@
-package org.joinmastodon.android.updater;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-
-import java.io.FileNotFoundException;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public class SelfUpdateContentProvider extends ContentProvider{
-	@Override
-	public boolean onCreate(){
-		return true;
-	}
-
-	@Nullable
-	@Override
-	public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder){
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String getType(@NonNull Uri uri){
-		if(isCorrectUri(uri))
-			return "application/vnd.android.package-archive";
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public Uri insert(@NonNull Uri uri, @Nullable ContentValues values){
-		return null;
-	}
-
-	@Override
-	public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs){
-		return 0;
-	}
-
-	@Override
-	public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs){
-		return 0;
-	}
-
-	@Nullable
-	@Override
-	public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException{
-		if(isCorrectUri(uri)){
-			return ParcelFileDescriptor.open(((GithubSelfUpdaterImpl)GithubSelfUpdater.getInstance()).getUpdateApkFile(), ParcelFileDescriptor.MODE_READ_ONLY);
-		}
-		throw new FileNotFoundException();
-	}
-
-	private boolean isCorrectUri(Uri uri){
-		return "/update.apk".equals(uri.getPath());
-	}
-}
--- a/mastodon/src/debug/res/drawable/ic_fluent_dismiss_20_filled.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_dismiss_20_filled.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M3.897 4.054L3.97 3.97c0.266-0.267 0.683-0.29 0.976-0.073L5.03 3.97 10 8.939l4.97-4.97c0.266-0.266 0.683-0.29 0.976-0.072L16.03 3.97c0.267 0.266 0.29 0.683 0.073 0.976L16.03 5.03 11.061 10l4.97 4.97c0.266 0.266 0.29 0.683 0.072 0.976L16.03 16.03c-0.266 0.267-0.683 0.29-0.976 0.073L14.97 16.03 10 11.061l-4.97 4.97c-0.266 0.266-0.683 0.29-0.976 0.072L3.97 16.03c-0.267-0.266-0.29-0.683-0.073-0.976L3.97 14.97 8.939 10l-4.97-4.97C3.704 4.764 3.68 4.347 3.898 4.054L3.97 3.97 3.897 4.054z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_mail_inbox_dismiss_24_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_mail_inbox_dismiss_24_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M22 6.5c0 3.038-2.462 5.5-5.5 5.5S11 9.538 11 6.5 13.462 1 16.5 1 22 3.462 22 6.5zm-7.146-2.354c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708L15.793 6.5l-1.647 1.646c-0.195 0.196-0.195 0.512 0 0.707 0.196 0.196 0.512 0.196 0.708 0L16.5 7.208l1.646 1.647c0.196 0.195 0.512 0.195 0.708 0 0.195-0.196 0.195-0.512 0-0.707L17.207 6.5l1.647-1.646c0.195-0.196 0.195-0.512 0-0.708-0.196-0.195-0.512-0.195-0.708 0L16.5 5.793l-1.646-1.647zM19.5 14v-1.732c0.551-0.287 1.056-0.651 1.5-1.078v7.56c0 1.733-1.357 3.15-3.066 3.245L17.75 22H6.25c-1.733 0-3.15-1.357-3.245-3.066L3 18.75V7.25C3 5.517 4.356 4.1 6.066 4.005L6.25 4h4.248c-0.198 0.474-0.34 0.977-0.422 1.5H6.25c-0.918 0-1.671 0.707-1.744 1.606L4.5 7.25V14H9c0.38 0 0.694 0.282 0.743 0.648L9.75 14.75C9.75 15.993 10.757 17 12 17c1.19 0 2.166-0.925 2.245-2.096l0.005-0.154c0-0.38 0.282-0.694 0.648-0.743L15 14h4.5zm-15 1.5v3.25c0 0.918 0.707 1.671 1.606 1.744L6.25 20.5h11.5c0.918 0 1.671-0.707 1.744-1.607L19.5 18.75V15.5h-3.825c-0.335 1.648-1.75 2.904-3.475 2.995L12 18.5c-1.747 0-3.215-1.195-3.632-2.812L8.325 15.5H4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_mail_inbox_dismiss_28_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_mail_inbox_dismiss_28_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M26 7.5c0 3.59-2.91 6.5-6.5 6.5S13 11.09 13 7.5 15.91 1 19.5 1 26 3.91 26 7.5zm-9.146-3.354c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708L18.793 7.5l-2.647 2.646c-0.195 0.196-0.195 0.512 0 0.708 0.196 0.195 0.512 0.195 0.708 0L19.5 8.207l2.646 2.647c0.196 0.195 0.512 0.195 0.708 0 0.195-0.196 0.195-0.512 0-0.708L20.207 7.5l2.647-2.646c0.195-0.196 0.195-0.512 0-0.708-0.196-0.195-0.512-0.195-0.708 0L19.5 6.793l-2.646-2.647zM25 22.75V12.6c-0.443 0.476-0.947 0.896-1.5 1.245V16h-6l-0.102 0.007c-0.366 0.05-0.648 0.363-0.648 0.743 0 1.519-1.231 2.75-2.75 2.75s-2.75-1.231-2.75-2.75l-0.007-0.102C11.193 16.282 10.88 16 10.5 16h-6V7.25c0-0.966 0.784-1.75 1.75-1.75h6.02c0.145-0.525 0.345-1.028 0.595-1.5H6.25C4.455 4 3 5.455 3 7.25v15.5C3 24.545 4.455 26 6.25 26h15.5c1.795 0 3.25-1.455 3.25-3.25zm-20.5 0V17.5h5.316l0.041 0.204C10.291 19.592 11.982 21 14 21l0.215-0.005c1.994-0.1 3.627-1.574 3.969-3.495H23.5v5.25c0 0.966-0.784 1.75-1.75 1.75H6.25c-0.966 0-1.75-0.784-1.75-1.75z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_mention_20_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_mention_20_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M10 2c4.418 0 8 3.582 8 8 0 2.706-1.142 4.5-3 4.5-1.226 0-2.14-0.781-2.62-2.09C11.784 13.393 10.781 14 9.5 14 7.36 14 6 12.307 6 10c0-2.337 1.313-4 3.5-4 1.052 0 1.901 0.385 2.5 1.044V6.5C12 6.224 12.224 6 12.5 6c0.245 0 0.45 0.177 0.492 0.41L13 6.5V10c0 2.223 0.813 3.5 2 3.5s2-1.277 2-3.5c0-3.866-3.134-7-7-7s-7 3.134-7 7 3.134 7 7 7c0.823 0 1.626-0.142 2.383-0.416 0.26-0.094 0.547 0.04 0.64 0.3 0.095 0.26-0.04 0.546-0.3 0.64C11.859 17.838 10.94 18 10 18c-4.418 0-8-3.582-8-8s3.582-8 8-8zM9.5 7C7.924 7 7 8.17 7 10c0 1.797 0.966 3 2.5 3s2.5-1.203 2.5-3c0-1.83-0.924-3-2.5-3z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_open_24_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_open_24_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M6.25 4.5C5.283 4.5 4.5 5.284 4.5 6.25v11.5c0 0.966 0.783 1.75 1.75 1.75h11.5c0.966 0 1.75-0.784 1.75-1.75v-4c0-0.414 0.335-0.75 0.75-0.75 0.414 0 0.75 0.336 0.75 0.75v4c0 1.795-1.456 3.25-3.25 3.25H6.25C4.455 21 3 19.545 3 17.75V6.25C3 4.455 4.455 3 6.25 3h4C10.664 3 11 3.336 11 3.75S10.664 4.5 10.25 4.5h-4zM13 3.75C13 3.336 13.335 3 13.75 3h6.5C20.664 3 21 3.336 21 3.75v6.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75V5.56l-5.22 5.22c-0.293 0.293-0.768 0.293-1.06 0-0.293-0.293-0.293-0.768 0-1.06l5.22-5.22h-4.69C13.335 4.5 13 4.164 13 3.75z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_sign_out_24_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_sign_out_24_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M8.502 11.5c0.554 0 1.002 0.448 1.002 1.002 0 0.553-0.448 1.002-1.002 1.002-0.553 0-1.002-0.449-1.002-1.002 0-0.554 0.449-1.003 1.002-1.003zM12 4.353v6.651h7.442L17.72 9.28c-0.267-0.266-0.29-0.683-0.073-0.977L17.72 8.22c0.266-0.266 0.683-0.29 0.976-0.072L18.78 8.22l2.997 2.998c0.266 0.266 0.29 0.682 0.073 0.976l-0.073 0.084-2.996 3.003c-0.293 0.294-0.767 0.294-1.06 0.002-0.267-0.266-0.292-0.683-0.075-0.977l0.073-0.084 1.713-1.717h-7.431L12 19.25c0 0.466-0.421 0.82-0.88 0.738l-8.5-1.501C2.26 18.424 2 18.112 2 17.748V5.75c0-0.368 0.266-0.681 0.628-0.74l8.5-1.396C11.585 3.539 12 3.89 12 4.354zm-1.5 0.883l-7 1.15v10.732l7 1.236V5.237zM13 18.5h0.765l0.102-0.007c0.366-0.05 0.649-0.364 0.648-0.744l-0.007-4.25H13v5zm0.002-8.502L13 8.726V5h0.745c0.38 0 0.693 0.281 0.743 0.647l0.007 0.101L14.502 10h-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_speaker_0_24_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_speaker_0_24_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M14.704 3.44C14.895 3.667 15 3.953 15 4.248V19.75c0 0.69-0.56 1.25-1.25 1.25-0.296 0-0.582-0.105-0.808-0.296l-4.967-4.206H4.25c-1.243 0-2.25-1.008-2.25-2.25v-4.5c0-1.243 1.007-2.25 2.25-2.25h3.725l4.968-4.204c0.526-0.446 1.315-0.38 1.761 0.147zM13.5 4.787l-4.975 4.21H4.25c-0.414 0-0.75 0.337-0.75 0.75v4.5c0 0.415 0.336 0.75 0.75 0.75h4.275L13.5 19.21V4.787z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_speaker_0_28_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_speaker_0_28_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M16.5 4.814c0-1.094-1.307-1.66-2.105-0.912l-4.937 4.63C9.134 8.836 8.706 9.005 8.261 9.005H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912V4.814zm-6.016 4.812L15 5.39v17.216l-4.516-4.232c-0.602-0.564-1.397-0.878-2.222-0.878H5.25c-0.966 0-1.75-0.784-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.826 0 1.62-0.314 2.223-0.88z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_speaker_off_24_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_speaker_off_24_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06L6.438 7.5H4.25C3.007 7.499 2 8.506 2 9.749v4.497c0 1.243 1.007 2.25 2.25 2.25h3.68c0.183 0 0.36 0.068 0.498 0.19l4.491 3.994C13.725 21.396 15 20.824 15 19.746V16.06l5.72 5.72c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM13.5 14.56v4.629l-4.075-3.624c-0.412-0.366-0.944-0.569-1.495-0.569H4.25c-0.414 0-0.75-0.335-0.75-0.75V9.75C3.5 9.335 3.836 9 4.25 9h3.688l5.562 5.56zm0-9.753v5.511l1.5 1.5V4.25c0-1.079-1.274-1.65-2.08-0.934l-3.4 3.022 1.063 1.063L13.5 4.807zm3.641 9.152l1.138 1.138C18.741 14.163 19 13.111 19 12c0-1.203-0.304-2.338-0.84-3.328-0.198-0.364-0.653-0.5-1.017-0.303-0.364 0.197-0.5 0.653-0.303 1.017 0.42 0.777 0.66 1.666 0.66 2.614 0 0.691-0.127 1.351-0.359 1.96zm2.247 2.247l1.093 1.094C21.445 15.763 22 13.946 22 12c0-2.226-0.728-4.284-1.96-5.946-0.246-0.333-0.716-0.403-1.048-0.157-0.333 0.247-0.403 0.716-0.157 1.05C19.881 8.358 20.5 10.106 20.5 12c0 1.531-0.404 2.966-1.112 4.206z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_fluent_speaker_off_28_regular.xml
+++ b/mastodon/src/debug/res/drawable/ic_fluent_speaker_off_28_regular.xml
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M3.28 2.22c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l5.724 5.725H5.25C3.455 9.005 2 10.46 2 12.255v3.492c0 1.795 1.455 3.25 3.25 3.25h3.012c0.444 0 0.872 0.17 1.196 0.473l4.937 4.626c0.799 0.748 2.105 0.182 2.105-0.912v-5.623l8.22 8.22c0.292 0.292 0.767 0.292 1.06 0 0.293-0.293 0.293-0.768 0-1.061L3.28 2.22zM15 16.06v6.547l-4.516-4.231c-0.602-0.565-1.397-0.879-2.222-0.879H5.25c-0.966 0-1.75-0.783-1.75-1.75v-3.492c0-0.966 0.784-1.75 1.75-1.75h3.011c0.35 0 0.693-0.056 1.02-0.164L15 16.061zm-4.378-8.62l1.061 1.061L15 5.392v6.427l1.5 1.5V4.814c0-1.094-1.307-1.66-2.105-0.912L10.622 7.44zm9.55 9.55l1.137 1.137C21.912 16.88 22.25 15.478 22.25 14c0-2.136-0.706-4.11-1.897-5.697-0.249-0.332-0.719-0.399-1.05-0.15-0.332 0.249-0.399 0.719-0.15 1.05C20.156 10.54 20.75 12.199 20.75 14c0 1.058-0.205 2.067-0.578 2.99zm2.803 2.803l1.095 1.096c1.224-2.008 1.93-4.366 1.93-6.89 0-3.35-1.245-6.414-3.298-8.747-0.274-0.31-0.747-0.341-1.058-0.068-0.311 0.274-0.342 0.748-0.068 1.059C23.396 8.313 24.5 11.027 24.5 14c0 2.107-0.554 4.084-1.525 5.793z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_launcher_foreground_debug.xml
+++ b/mastodon/src/debug/res/drawable/ic_launcher_foreground_debug.xml
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M54,90L54,90c-19.9,0 -36,-16.1 -36,-36v0c0,-19.9 16.1,-36 36,-36h0c19.9,0 36,16.1 36,36v0C90,73.9 73.9,90 54,90z"
-      android:strokeAlpha="0"
-      android:fillAlpha="0"/>
-  <path
-      android:pathData="M52.5,41.6c-2.4,0 -4.3,0.9 -5.5,2.8l-1.2,2l-1.2,-2c-1.2,-1.9 -3.1,-2.8 -5.5,-2.8c-2.1,0 -3.8,0.8 -5.1,2.2c-1.2,1.4 -1.9,3.4 -1.9,5.9v12h4.7V50c0,-2.4 1.1,-3.7 3.1,-3.7c2.3,0 3.4,1.4 3.4,4.4v6.4h4.7v-6.4c0,-2.9 1.1,-4.4 3.4,-4.4c2.1,0 3.1,1.2 3.1,3.7v11.7h4.7v-12c0,-2.4 -0.6,-4.4 -1.9,-5.9C56.2,42.3 54.6,41.6 52.5,41.6z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M65.9,58.1h0.8c0,0 0,0 -0.1,0c-0.6,-0.3 -1.1,-0.8 -1.4,-1.4c-0.3,-0.6 -0.5,-1.4 -0.5,-2.1c0,-0.8 0.2,-1.5 0.5,-2.1c0.4,-0.6 0.8,-1.1 1.4,-1.4c0.6,-0.3 1.2,-0.5 1.9,-0.5c0.7,0 1.3,0.2 1.9,0.5s1.1,0.8 1.4,1.4s0.5,1.3 0.5,2.1c0,0.2 0,0.4 0,0.6l0.7,0.7c0.4,0 0.8,0 1.1,0l1.5,-1.5l0.2,-0.2c-0.1,-1.2 -0.4,-2.3 -0.9,-3.4c-0.6,-1.1 -1.4,-2 -2.6,-2.6c-1.1,-0.6 -2.4,-1 -3.7,-1c-1.4,0 -2.7,0.3 -3.8,1c-1.1,0.6 -2,1.5 -2.6,2.6c-0.6,1.1 -0.9,2.4 -0.9,3.7s0.3,2.7 0.9,3.7c0.6,1.1 1.5,2 2.6,2.6c0.4,0.2 0.8,0.4 1.1,0.5v-1.8V58.1z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M76,58.3l1.2,-1.2L76.2,56l-1.7,1.7c-0.4,-0.1 -0.7,-0.2 -1.1,-0.2s-0.8,0.1 -1.1,0.2L70.7,56l-1,1.1l1.2,1.2c-0.5,0.4 -1.1,0.9 -1.4,1.5h-2.1v1.5H69c0,0.2 -0.1,0.5 -0.1,0.8v0.8h-1.5v1.5h1.5v0.8c0,0.2 0,0.5 0.1,0.8h-1.6v1.5h2.1c0.8,1.4 2.3,2.3 4,2.3s3.1,-0.9 4,-2.3h2.1v-1.5H78c0,-0.2 0.1,-0.5 0.1,-0.8v-0.8h1.5v-1.5h-1.5v-0.8c0,-0.2 0,-0.5 -0.1,-0.8h1.6v-1.5h-2.1C77.1,59.2 76.6,58.8 76,58.3zM75,65.9H72v-1.5H75V65.9zM75,62.9H72v-1.5H75V62.9z"
-      android:fillColor="#33D17A"/>
-</vector>
--- a/mastodon/src/debug/res/drawable/ic_launcher_foreground_monochrome_debug.xml
+++ b/mastodon/src/debug/res/drawable/ic_launcher_foreground_monochrome_debug.xml
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M54,90L54,90c-19.9,0 -36,-16.1 -36,-36v0c0,-19.9 16.1,-36 36,-36h0c19.9,0 36,16.1 36,36v0C90,73.9 73.9,90 54,90z"
-      android:strokeAlpha="0"
-      android:fillAlpha="0"/>
-  <path
-      android:pathData="M52.5,41.6c-2.4,0 -4.3,0.9 -5.5,2.8l-1.2,2l-1.2,-2c-1.2,-1.9 -3.1,-2.8 -5.5,-2.8c-2.1,0 -3.8,0.8 -5.1,2.2c-1.2,1.4 -1.9,3.4 -1.9,5.9v12h4.7V50c0,-2.4 1.1,-3.7 3.1,-3.7c2.3,0 3.4,1.4 3.4,4.4v6.4h4.7v-6.4c0,-2.9 1.1,-4.4 3.4,-4.4c2.1,0 3.1,1.2 3.1,3.7v11.7h4.7v-12c0,-2.4 -0.6,-4.4 -1.9,-5.9C56.2,42.3 54.6,41.6 52.5,41.6z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M65.9,58.1h0.8c0,0 0,0 -0.1,0c-0.6,-0.3 -1.1,-0.8 -1.4,-1.4c-0.3,-0.6 -0.5,-1.4 -0.5,-2.1c0,-0.8 0.2,-1.5 0.5,-2.1c0.4,-0.6 0.8,-1.1 1.4,-1.4c0.6,-0.3 1.2,-0.5 1.9,-0.5c0.7,0 1.3,0.2 1.9,0.5s1.1,0.8 1.4,1.4s0.5,1.3 0.5,2.1c0,0.2 0,0.4 0,0.6l0.7,0.7c0.4,0 0.8,0 1.1,0l1.5,-1.5l0.2,-0.2c-0.1,-1.2 -0.4,-2.3 -0.9,-3.4c-0.6,-1.1 -1.4,-2 -2.6,-2.6c-1.1,-0.6 -2.4,-1 -3.7,-1c-1.4,0 -2.7,0.3 -3.8,1c-1.1,0.6 -2,1.5 -2.6,2.6c-0.6,1.1 -0.9,2.4 -0.9,3.7s0.3,2.7 0.9,3.7c0.6,1.1 1.5,2 2.6,2.6c0.4,0.2 0.8,0.4 1.1,0.5v-1.8V58.1z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M76,58.3l1.2,-1.2L76.2,56l-1.7,1.7c-0.4,-0.1 -0.7,-0.2 -1.1,-0.2s-0.8,0.1 -1.1,0.2L70.7,56l-1,1.1l1.2,1.2c-0.5,0.4 -1.1,0.9 -1.4,1.5h-2.1v1.5H69c0,0.2 -0.1,0.5 -0.1,0.8v0.8h-1.5v1.5h1.5v0.8c0,0.2 0,0.5 0.1,0.8h-1.6v1.5h2.1c0.8,1.4 2.3,2.3 4,2.3s3.1,-0.9 4,-2.3h2.1v-1.5H78c0,-0.2 0.1,-0.5 0.1,-0.8v-0.8h1.5v-1.5h-1.5v-0.8c0,-0.2 0,-0.5 -0.1,-0.8h1.6v-1.5h-2.1C77.1,59.2 76.6,58.8 76,58.3zM75,65.9H72v-1.5H75V65.9zM75,62.9H72v-1.5H75V62.9z"
-      android:fillColor="#33D17A"/>
-</vector>
--- a/mastodon/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/mastodon/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground_debug"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome_debug"/>
-</adaptive-icon>
--- a/mastodon/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/mastodon/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground_debug"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome_debug"/>
-</adaptive-icon>
--- a/mastodon/src/debug/res/mipmap-hdpi/ic_launcher.png
+++ b/mastodon/src/debug/res/mipmap-hdpi/ic_launcher.png
--- a/mastodon/src/debug/res/mipmap-hdpi/ic_launcher_round.png
+++ b/mastodon/src/debug/res/mipmap-hdpi/ic_launcher_round.png
--- a/mastodon/src/debug/res/mipmap-mdpi/ic_launcher.png
+++ b/mastodon/src/debug/res/mipmap-mdpi/ic_launcher.png
--- a/mastodon/src/debug/res/mipmap-mdpi/ic_launcher_round.png
+++ b/mastodon/src/debug/res/mipmap-mdpi/ic_launcher_round.png
--- a/mastodon/src/debug/res/mipmap-xhdpi/ic_launcher.png
+++ b/mastodon/src/debug/res/mipmap-xhdpi/ic_launcher.png
--- a/mastodon/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/mastodon/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
--- a/mastodon/src/debug/res/mipmap-xxhdpi/ic_launcher.png
+++ b/mastodon/src/debug/res/mipmap-xxhdpi/ic_launcher.png
--- a/mastodon/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/mastodon/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/mastodon/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/mastodon/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
--- a/mastodon/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/mastodon/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/mastodon/src/debug/res/values/ic_launcher_background.xml
+++ b/mastodon/src/debug/res/values/ic_launcher_background.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#000000</color>
-</resources>
--- a/mastodon/src/github/AndroidManifest.xml
+++ b/mastodon/src/github/AndroidManifest.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="org.joinmastodon.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>

-
-	<application
-		tools:replace="android:label"
-		android:label="@string/mo_app_name_debug">
+	<application>
 		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$InstallerStatusReceiver" android:exported="false"/>-->
 		<!--		<receiver android:name=".updater.GithubSelfUpdaterImpl$AfterUpdateRestartReceiver" android:exported="true" android:enabled="false">-->
 		<!--			<intent-filter>-->
--- a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
+++ b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
@@ -115,7 +115,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{

 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases")
+				.url("https://api.github.com/repos/sk22/megalodon/releases")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
@@ -153,7 +153,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
 					for(JsonElement el:obj.getAsJsonArray("assets")){
 						JsonObject asset=el.getAsJsonObject();
-						if("moshidon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+						if("megalodon.apk".equals(asset.get("name").getAsString()) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
 							long size=asset.get("size").getAsLong();
 							String url=asset.get("browser_download_url").getAsString();

--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.joinmastodon.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
@@ -26,13 +24,12 @@
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/mo_app_name"
+		android:label="@string/sk_app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:theme="@style/Theme.Mastodon.AutoLightDark"
-		android:windowSoftInputMode="adjustPan"
 		android:largeHeap="true">

 		<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">
@@ -62,7 +59,7 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:scheme="${oAuthScheme}" android:host="callback"/>
+				<data android:scheme="megalodon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
 		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"
--- a/mastodon/src/main/ic_launcher-playstore.png
+++ b/mastodon/src/main/ic_launcher-playstore.png
--- a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java
@@ -1,83 +0,0 @@
-package org.joinmastodon.android;
-
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.graphics.drawable.Icon;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.browser.customtabs.CustomTabsIntent;
-
-import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.PushSubscriptionManager;
-import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
-import org.joinmastodon.android.api.requests.accounts.GetPreferences;
-import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
-import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
-import org.joinmastodon.android.api.session.AccountActivationInfo;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.EmojiUpdatedEvent;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Application;
-import org.joinmastodon.android.model.Emoji;
-import org.joinmastodon.android.model.EmojiCategory;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Preferences;
-import org.joinmastodon.android.model.Token;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-
-public class DomainManager {
-	private static final String TAG="DomainManager";
-
-	private static final DomainManager instance=new DomainManager();
-
-	private String currentDomain = "";
-
-
-	public static DomainManager getInstance(){
-		return instance;
-	}
-
-	private DomainManager(){
-
-	}
-
-	public String getCurrentDomain() {
-		return currentDomain;
-	}
-
-	public void setCurrentDomain(String domain) {
-		this.currentDomain = domain;
-	}
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
@@ -35,7 +35,7 @@ public class ExternalShareActivity extends FragmentStackActivity{

 			Optional<String> text = Optional.ofNullable(getIntent().getStringExtra(Intent.EXTRA_TEXT));
 			Optional<Pair<String, Optional<String>>> fediHandle = text.flatMap(UiUtils::parseFediverseHandle);
-			boolean isFediUrl = text.map(UiUtils::looksLikeMastodonUrl).orElse(false);
+			boolean isFediUrl = text.map(UiUtils::looksLikeFediverseUrl).orElse(false);
 			boolean isOpenable = isFediUrl || fediHandle.isPresent();

 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
@@ -69,7 +69,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 								.ifPresent(req ->
 										req.wrapProgress(this, R.string.loading, true, d -> {
 											UiUtils.transformDialogForLookup(this, accountId, isFediUrl ? text.get() : null, d);
-											d.setOnDismissListener((ev) -> finish());
+											d.setOnDismissListener((x) -> finish());
 										}));
 					} else {
 						openComposeFragment(accountId);
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -4,7 +4,6 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;

 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;

 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
@@ -31,40 +30,31 @@ public class GlobalUserPreferences{
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
-	public static boolean showDividers;
 	public static boolean voteButtonForSingleChoice;
 	public static boolean enableDeleteNotifications;
 	public static boolean translateButtonOpenedOnly;
 	public static boolean uniformNotificationIcon;
-	public static boolean relocatePublishButton;
 	public static boolean reduceMotion;
 	public static boolean keepOnlyLatestNotification;
 	public static boolean disableAltTextReminder;
 	public static boolean showAltIndicator;
 	public static boolean showNoAltIndicator;
 	public static boolean enablePreReleases;
-	public static boolean prefixRepliesWithRe;
+	public static PrefixRepliesMode prefixReplies;
 	public static boolean bottomEncoding;
 	public static boolean collapseLongPosts;
 	public static boolean spectatorMode;
 	public static boolean autoHideFab;
-	public static boolean defaultToUnlistedReplies;
-	public static boolean doubleTapToSwipe;
+	public static boolean replyLineAboveHeader;
 	public static boolean compactReblogReplyLine;
 	public static boolean confirmBeforeReblog;
-	public static boolean replyLineAboveHeader;
-	public static boolean swapBookmarkWithBoostAction;
-	public static boolean loadRemoteAccountFollowers;
-	public static boolean mentionRebloggerAutomatically;
 	public static boolean allowRemoteLoading;
+	public static boolean forwardReportDefault;
 	public static AutoRevealMode autoRevealEqualSpoilers;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;

-	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
-	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
-	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 	public static Map<String, List<TimelineDefinition>> pinnedTimelines;
 	public static Set<String> accountsWithLocalOnlySupport;
@@ -72,15 +62,16 @@ public class GlobalUserPreferences{
 	public static Set<String> accountsWithContentTypesEnabled;
 	public static Map<String, ContentType> accountsDefaultContentTypes;

-	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
-	public static Map<String, Integer> recentEmojis;
+	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
+	private final static Type pinnedTimelinesType = new TypeToken<Map<String, List<TimelineDefinition>>>() {}.getType();
+	private final static Type accountsDefaultContentTypesType = new TypeToken<Map<String, ContentType>>() {}.getType();

 	/**
 	 * Pleroma
 	 */
 	public static String replyVisibility;

-	public static SharedPreferences getPrefs(){
+	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}

@@ -109,13 +100,10 @@ public class GlobalUserPreferences{
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
 		showNewPostsButton=prefs.getBoolean("showNewPostsButton", true);
-		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		showDividers =prefs.getBoolean("showDividers", false);
-		relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
 		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
@@ -126,25 +114,17 @@ public class GlobalUserPreferences{
 		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
 		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
 		enablePreReleases=prefs.getBoolean("enablePreReleases", false);
-		prefixRepliesWithRe=prefs.getBoolean("prefixRepliesWithRe", false);
+		prefixReplies=PrefixRepliesMode.valueOf(prefs.getString("prefixReplies", PrefixRepliesMode.NEVER.name()));
 		bottomEncoding=prefs.getBoolean("bottomEncoding", false);
 		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
 		spectatorMode=prefs.getBoolean("spectatorMode", false);
 		autoHideFab=prefs.getBoolean("autoHideFab", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
-		defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false);
-		doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true);
 		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
 		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
 		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
-		swapBookmarkWithBoostAction=prefs.getBoolean("swapBookmarkWithBoostAction", false);
-		loadRemoteAccountFollowers=prefs.getBoolean("loadRemoteAccountFollowers", true);
-		mentionRebloggerAutomatically=prefs.getBoolean("mentionRebloggerAutomatically", false);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
-		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
-		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
-		publishButtonText=prefs.getString("publishButtonText", "");
+		recentLanguages=fromJson(prefs.getString("recentLanguages", null), recentLanguagesType, new HashMap<>());
 		pinnedTimelines=fromJson(prefs.getString("pinnedTimelines", null), pinnedTimelinesType, new HashMap<>());
 		accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
 		accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
@@ -153,16 +133,22 @@ public class GlobalUserPreferences{
 		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
 		allowRemoteLoading=prefs.getBoolean("allowRemoteLoading", true);
 		autoRevealEqualSpoilers=AutoRevealMode.valueOf(prefs.getString("autoRevealEqualSpoilers", AutoRevealMode.THREADS.name()));
+		forwardReportDefault=prefs.getBoolean("forwardReportDefault", true);
+
+		if (prefs.contains("prefixRepliesWithRe")) {
+			prefixReplies = prefs.getBoolean("prefixRepliesWithRe", false)
+					? PrefixRepliesMode.TO_OTHERS : PrefixRepliesMode.NEVER;
+			prefs.edit()
+					.putString("prefixReplies", prefixReplies.name())
+					.remove("prefixRepliesWithRe")
+					.apply();
+		}

 		try {
-			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
-			}else{
-				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PURPLE.name()));
-			}
+			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PURPLE;
+			color=ColorPreference.PINK;
 		}
 	}

@@ -179,36 +165,28 @@ public class GlobalUserPreferences{
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("showDividers", showDividers)
-				.putBoolean("relocatePublishButton", relocatePublishButton)
-				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
+				.putBoolean("translateButtonOpenedOnly", translateButtonOpenedOnly)
+				.putBoolean("uniformNotificationIcon", uniformNotificationIcon)
 				.putBoolean("reduceMotion", reduceMotion)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
 				.putBoolean("disableAltTextReminder", disableAltTextReminder)
 				.putBoolean("showAltIndicator", showAltIndicator)
 				.putBoolean("showNoAltIndicator", showNoAltIndicator)
 				.putBoolean("enablePreReleases", enablePreReleases)
-				.putBoolean("prefixRepliesWithRe", prefixRepliesWithRe)
+				.putString("prefixReplies", prefixReplies.name())
 				.putBoolean("collapseLongPosts", collapseLongPosts)
 				.putBoolean("spectatorMode", spectatorMode)
 				.putBoolean("autoHideFab", autoHideFab)
 				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putString("publishButtonText", publishButtonText)
 				.putBoolean("bottomEncoding", bottomEncoding)
-				.putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
-				.putBoolean("doubleTapToSwipe", doubleTapToSwipe)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
 				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
 				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
-				.putBoolean("swapBookmarkWithBoostAction", swapBookmarkWithBoostAction)
-				.putBoolean("loadRemoteAccountFollowers", loadRemoteAccountFollowers)
-				.putBoolean("mentionRebloggerAutomatically", mentionRebloggerAutomatically)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
 				.putString("pinnedTimelines", gson.toJson(pinnedTimelines))
-				.putString("recentEmojis", gson.toJson(recentEmojis))
 				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
 				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
 				.putString("replyVisibility", replyVisibility)
@@ -216,6 +194,7 @@ public class GlobalUserPreferences{
 				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
 				.putBoolean("allowRemoteLoading", allowRemoteLoading)
 				.putString("autoRevealEqualSpoilers", autoRevealEqualSpoilers.name())
+				.putBoolean("forwardReportDefault", forwardReportDefault)
 				.apply();
 	}

@@ -227,8 +206,7 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		YELLOW,
-		NORD
+		YELLOW
 	}

 	public enum ThemePreference{
@@ -242,4 +220,10 @@ public class GlobalUserPreferences{
 		THREADS,
 		DISCUSSIONS
 	}
+
+	public enum PrefixRepliesMode {
+		NEVER,
+		ALWAYS,
+		TO_OTHERS
+	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -1,28 +1,19 @@
 package org.joinmastodon.android;

-import static org.joinmastodon.android.fragments.ComposeFragment.CAMERA_PERMISSION_CODE;
-import static org.joinmastodon.android.fragments.ComposeFragment.CAMERA_PIC_REQUEST_CODE;
-
 import android.Manifest;
-import android.app.Activity;
 import android.app.Fragment;
 import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.Toast;

 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.PictureTakenEvent;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
@@ -197,27 +188,6 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		}
 	}

-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data){
-		if(requestCode==CAMERA_PIC_REQUEST_CODE && resultCode== Activity.RESULT_OK){
-			Bitmap image = (Bitmap) data.getExtras().get("data");
-			String path = MediaStore.Images.Media.insertImage(this.getContentResolver(), image, null, null);
-			E.post(new PictureTakenEvent(Uri.parse(path)));
-		}
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-		if (requestCode == CAMERA_PERMISSION_CODE && (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
-			Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-			startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE);
-		} else {
-			Toast.makeText(this, R.string.permission_required, Toast.LENGTH_SHORT);
-		}
-	}
-
 	public Fragment getCurrentFragment() {
 		for (int i = fragmentContainers.size() - 1; i >= 0; i--) {
 			FrameLayout fl = fragmentContainers.get(i);
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -1,6 +1,6 @@
 package org.joinmastodon.android;

-import static org.joinmastodon.android.GlobalUserPreferences.getPrefs;
+import static org.joinmastodon.android.GlobalUserPreferences.PrefixRepliesMode.*;

 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -12,14 +12,12 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.opengl.Visibility;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;

 import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
@@ -35,7 +33,6 @@ import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;

@@ -126,26 +123,17 @@ public class PushNotificationReceiver extends BroadcastReceiver{

 			if(intent.hasExtra("notification")){
 				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				String statusID = null;
-				String targetAccountID = null;
-
-				if(notification.status != null){
-					statusID = notification.status.id;
-				}
-				if(notification.account != null){
-					targetAccountID = notification.account.id;
-				}
-				if (statusID != null || targetAccountID != null) {
+				String statusID=notification.status.id;
+				if (statusID != null) {
 					AccountSessionManager accountSessionManager = AccountSessionManager.getInstance();
 					Preferences preferences = accountSessionManager.getAccount(accountID).preferences;

 					switch (NotificationAction.values()[intent.getIntExtra("notificationAction", 0)]) {
 						case FAVORITE -> new SetStatusFavorited(statusID, true).exec(accountID);
 						case BOOKMARK -> new SetStatusBookmarked(statusID, true).exec(accountID);
-						case BOOST -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
-						case UNBOOST -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
+						case REBLOG -> new SetStatusReblogged(notification.status.id, true, preferences.postingDefaultVisibility).exec(accountID);
+						case UNDO_REBLOG -> new SetStatusReblogged(notification.status.id, false, preferences.postingDefaultVisibility).exec(accountID);
 						case REPLY -> handleReplyAction(context, accountID, intent, notification, notificationId, preferences);
-						case FOLLOW_BACK -> new SetAccountFollowed(notification.account.id, true, true, false).exec(accountID);
 						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
 					}
 				}
@@ -157,7 +145,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{

 	private void notify(Context context, PushNotification pn, String accountID, org.joinmastodon.android.model.Notification notification){
 		NotificationManager nm=context.getSystemService(NotificationManager.class);
-		notificationId=getPrefs().getInt("latestNotificationId", 0);
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		String accountName="@"+self.username+"@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 		Notification.Builder builder;
@@ -205,7 +192,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(context.getColor(R.color.shortcut_icon_background));
+				.setColor(UiUtils.getThemeColor(context, android.R.attr.colorAccent));

 		if (!GlobalUserPreferences.uniformNotificationIcon) {
 			builder.setSmallIcon(switch (pn.notificationType) {
@@ -229,7 +216,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		}

 		int id = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++;
-		getPrefs().edit().putInt("latestNotificationId", notificationId).apply();

 		if (notification != null){
 			switch (pn.notificationType){
@@ -238,23 +224,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						builder.addAction(buildReplyAction(context, id, accountID, notification));
 					}
 					builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_favorite), NotificationAction.FAVORITE));
-					if(GlobalUserPreferences.swapBookmarkWithBoostAction){
-						if(notification.status.visibility != StatusPrivacy.DIRECT) {
-							builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_reblog), NotificationAction.BOOST));
-						}else{
-							// This is just so there is a bookmark action if you cannot reblog the toot
-							builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.add_bookmark), NotificationAction.BOOKMARK));
-						}
-					} else {
-						builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.add_bookmark), NotificationAction.BOOKMARK));
+					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.add_bookmark), NotificationAction.BOOKMARK));
+					if(notification.status.visibility != StatusPrivacy.DIRECT) {
+						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_reblog), NotificationAction.REBLOG));
 					}
 				}
 				case UPDATE -> {
 					if(notification.status.reblogged)
-						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNBOOST));
-				}
-				case FOLLOW -> {
-					builder.addAction(buildNotificationAction(context, id, accountID, notification, context.getString(R.string.follow_back), NotificationAction.FOLLOW_BACK));
+						builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.sk_undo_reblog), NotificationAction.UNDO_REBLOG));
 				}
 			}
 		}
@@ -320,7 +297,11 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		req.language = preferences.postingDefaultLanguage;
 		req.visibility = preferences.postingDefaultVisibility;
 		req.inReplyToId = notification.status.id;
-		if(!notification.status.spoilerText.isEmpty() && GlobalUserPreferences.prefixRepliesWithRe && !notification.status.spoilerText.startsWith("re: ")){
+
+		if (!notification.status.spoilerText.isEmpty() &&
+				(GlobalUserPreferences.prefixReplies == ALWAYS
+						|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(notification.status.account.id)))
+				&& !notification.status.spoilerText.startsWith("re: ")) {
 			req.spoilerText = "re: " + notification.status.spoilerText;
 		}

--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -89,13 +89,13 @@ public class MastodonAPIController{
 		final boolean isBad = host == null || badDomains.stream().anyMatch(h -> h.equalsIgnoreCase(host) || host.toLowerCase().endsWith("." + h));
 		thread.postRunnable(()->{
 			try{
-//				if (isBad) throw new IllegalArgumentException();
+				if (isBad) throw new IllegalArgumentException();
 				if(req.canceled)
 					return;
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MoshidonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MegalodonAndroid/"+BuildConfig.VERSION_NAME);

 				String token=null;
 				if(session!=null)
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
@@ -4,15 +4,8 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Relationship;

 public class SetAccountMuted extends MastodonAPIRequest<Relationship>{
-	public SetAccountMuted(String id, boolean muted, long duration){
+	public SetAccountMuted(String id, boolean muted){
 		super(HttpMethod.POST, "/accounts/"+id+"/"+(muted ? "mute" : "unmute"), Relationship.class);
-		setRequestBody(muted ? new Request(duration): new Object());
-	}
-
-	private static class Request{
-		public long duration;
-		public Request(long duration){
-			this.duration=duration;
-		}
+		setRequestBody(new Object());
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -1,19 +0,0 @@
-package org.joinmastodon.android.api.requests.accounts;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Relationship;
-
-public class SetPrivateNote extends MastodonAPIRequest<Relationship>{
-    public SetPrivateNote(String id, String comment){
-        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", Relationship.class);
-        Request req = new Request(comment);
-        setRequestBody(req);
-    }
-
-    private static class Request{
-        public String comment;
-        public Request(String comment){
-            this.comment=comment;
-        }
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetDomainBlocks.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetDomainBlocks.java
@@ -1,16 +0,0 @@
-package org.joinmastodon.android.api.requests.instance;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.DomainBlock;
-import org.joinmastodon.android.model.ExtendedDescription;
-
-import java.util.List;
-
-public class GetDomainBlocks extends MastodonAPIRequest<List<DomainBlock>>{
-	public GetDomainBlocks(){
-		super(HttpMethod.GET, "/instance/domain_blocks", new TypeToken<>(){});
-	}
-
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetExtendedDescription.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetExtendedDescription.java
@@ -1,12 +0,0 @@
-package org.joinmastodon.android.api.requests.instance;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ExtendedDescription;
-import org.joinmastodon.android.model.Instance;
-
-public class GetExtendedDescription extends MastodonAPIRequest<ExtendedDescription>{
-	public GetExtendedDescription(){
-		super(HttpMethod.GET, "/instance/extended_description", ExtendedDescription.class);
-	}
-
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetWeeklyActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetWeeklyActivity.java
@@ -1,15 +0,0 @@
-package org.joinmastodon.android.api.requests.instance;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.WeeklyActivity;
-
-import java.util.List;
-
-public class GetWeeklyActivity extends MastodonAPIRequest<List<WeeklyActivity>>{
-	public GetWeeklyActivity(){
-		super(HttpMethod.GET, "/instance/activity", new TypeToken<>(){});
-	}
-
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddList.java
@@ -1,17 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
-
-public class AddList extends MastodonAPIRequest<Object> {
-    public AddList(String listName){
-        super(HttpMethod.POST, "/lists", Object.class);
-        Request req = new Request();
-        req.title = listName;
-        setRequestBody(req);
-    }
-
-    public static class Request{
-        public String title;
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/EditListName.java
@@ -1,17 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
-
-public class EditListName extends MastodonAPIRequest<Object> {
-    public EditListName(String newListName, String listId){
-        super(HttpMethod.PUT, "/lists/"+listId, Object.class);
-        Request req = new Request();
-        req.title = newListName;
-        setRequestBody(req);
-    }
-
-    public static class Request{
-        public String title;
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveList.java
@@ -1,10 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import java.util.List;
-
-public class RemoveList extends MastodonAPIRequest<Object> {
-    public RemoveList(String listId){
-        super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
@@ -10,8 +10,8 @@ import java.util.EnumSet;
 import java.util.List;

 public class DismissNotification extends MastodonAPIRequest<Object>{
-    public DismissNotification(String id){
-        super(HttpMethod.POST, "/notifications/" + (id != null ? id + "/dismiss" : "clear"), Object.class);
-        setRequestBody(new Object());
-    }
+	public DismissNotification(String id){
+		super(HttpMethod.POST, "/notifications/" + (id != null ? id + "/dismiss" : "clear"), Object.class);
+		setRequestBody(new Object());
+	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java
@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}

 	private static class Request{
-		public String clientName="Moshidon";
+		public String clientName="Megalodon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://github.com/LucasGGamerM/moshidon";
+		public String website="https://sk22.github.io/megalodon";
 	}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
@@ -66,7 +66,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class AccountSessionManager{
 	private static final String TAG="AccountSessionManager";
 	public static final String SCOPE="read write follow push";
-	public static final String REDIRECT_URI = getRedirectURI();
+	public static final String REDIRECT_URI="megalodon-android-auth://callback";

 	private static final AccountSessionManager instance=new AccountSessionManager();

@@ -85,17 +85,6 @@ public class AccountSessionManager{
 		return instance;
 	}

-	public static String getRedirectURI() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("moshidon-android-");
-		if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("nightly")) {
-			builder.append(BuildConfig.BUILD_TYPE);
-			builder.append('-');
-		}
-		builder.append("auth://callback");
-		return builder.toString();
-	}
-
 	private AccountSessionManager(){
 		prefs=MastodonApp.context.getSharedPreferences("account_manager", Context.MODE_PRIVATE);
 		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
@@ -241,7 +230,7 @@ public class AccountSessionManager{
 								.path("/oauth/authorize")
 								.appendQueryParameter("response_type", "code")
 								.appendQueryParameter("client_id", result.clientId)
-								.appendQueryParameter("redirect_uri", REDIRECT_URI)
+								.appendQueryParameter("redirect_uri", "megalodon-android-auth://callback")
 								.appendQueryParameter("scope", SCOPE)
 								.build();

--- a/mastodon/src/main/java/org/joinmastodon/android/events/PictureTakenEvent.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/events/PictureTakenEvent.java
@@ -1,13 +0,0 @@
-package org.joinmastodon.android.events;
-
-import android.net.Uri;
-
-import org.joinmastodon.android.model.Poll;
-
-public class PictureTakenEvent {
-    public Uri uri;
-
-    public PictureTakenEvent(Uri uri){
-        this.uri = uri;
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
@@ -77,7 +77,6 @@ public class AccountTimelineFragment extends StatusListFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab = ((ProfileFragment) getParentFragment()).getFab();
 	}

 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -94,12 +94,15 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 					@Override
 					public void onSuccess(List<Announcement> result){
 						if (getActivity() == null) return;
-						List<Announcement> unread = result.stream().filter(a -> !a.read).collect(toList());
-						List<Announcement> read = result.stream().filter(a -> a.read).collect(toList());
-						onDataLoaded(unread, true);
-						onDataLoaded(read, false);
-						if (unread.isEmpty()) setResult(true, null);
-						else unreadIDs = unread.stream().map(a -> a.id).collect(toList());
+
+						// get unread items first
+						List<Announcement> data = result.stream().filter(a -> !a.read).collect(toList());
+						if (data.isEmpty()) setResult(true, null);
+						else unreadIDs = data.stream().map(a -> a.id).collect(toList());
+
+						// append read items at the end
+						data.addAll(result.stream().filter(a -> a.read).collect(toList()));
+						onDataLoaded(data, false);
 					}
 				})
 				.exec(accountID);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -21,10 +21,6 @@ import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.Toolbar;

-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -68,7 +64,6 @@ 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.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -465,7 +460,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		List<StatusDisplayItem> pollItems=displayItems.subList(firstOptionIndex, footerIndex+1);
 		int prevSize=pollItems.size();
 		pollItems.clear();
-		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems, status);
+		StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
 		if(prevSize!=pollItems.size()){
 			adapter.notifyItemRangeRemoved(firstOptionIndex, prevSize);
 			adapter.notifyItemRangeInserted(firstOptionIndex, pollItems.size());
@@ -812,7 +807,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		private int currentMediaHiddenLayoutsWidth=0;

 		{
-			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), GlobalUserPreferences.showDividers ? R.attr.colorPollVoted : R.attr.colorWindowBackground));
+			dividerPaint.setColor(UiUtils.getThemeColor(getActivity(), R.attr.colorPollVoted));
 			dividerPaint.setStyle(Paint.Style.STROKE);
 			dividerPaint.setStrokeWidth(V.dp(1));
 		}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;

+import static org.joinmastodon.android.GlobalUserPreferences.PrefixRepliesMode.*;
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
@@ -7,7 +8,6 @@ import static org.joinmastodon.android.ui.utils.UiUtils.isPhotoPickerAvailable;
 import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages;
 import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages;

-import android.Manifest;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -16,7 +16,6 @@ import android.app.TimePickerDialog;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -69,10 +68,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;

-import androidx.annotation.NonNull;
-
 import com.github.bottomSoftwareFoundation.bottom.Bottom;
-import com.squareup.otto.Subscribe;
 import com.twitter.twittertext.TwitterTextEmojiRegex;

 import org.joinmastodon.android.E;
@@ -89,14 +85,11 @@ import org.joinmastodon.android.api.requests.statuses.GetAttachmentByID;
 import org.joinmastodon.android.api.requests.statuses.UploadAttachment;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.PictureTakenEvent;
 import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
 import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
-import org.joinmastodon.android.fragments.settings.SettingsBaseFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.ContentType;
@@ -118,7 +111,6 @@ import org.joinmastodon.android.ui.text.ComposeAutocompleteSpan;
 import org.joinmastodon.android.ui.text.ComposeHashtagOrMentionSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ComposeEditText;
@@ -167,8 +159,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private static final String GLITCH_LOCAL_ONLY_SUFFIX = "👁";
 	private static final Pattern GLITCH_LOCAL_ONLY_PATTERN = Pattern.compile("[\\s\\S]*" + GLITCH_LOCAL_ONLY_SUFFIX + "[\uFE00-\uFE0F]*");
 	private static final String TAG="ComposeFragment";
-	public static final int CAMERA_PERMISSION_CODE = 626938;
-	public static final int CAMERA_PIC_REQUEST_CODE = 6242069;

 	public static final Pattern MENTION_PATTERN=Pattern.compile("(^|[^\\/\\w])@(([a-z0-9_]+)@[a-z0-9\\.\\-]+[a-z0-9]+)", Pattern.CASE_INSENSITIVE);

@@ -249,15 +239,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private ContentType contentType;
 	private MastodonLanguage.LanguageResolver languageResolver;

-	private int navigationBarColorBefore;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		E.register(this);
 		setRetainInstance(true);
-		navigationBarColorBefore = getActivity().getWindow().getNavigationBarColor();
-		getActivity().getWindow().setNavigationBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLightest));

 		accountID=getArguments().getString("account");
 		contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
@@ -295,7 +280,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	@Override
 	public void onDestroy(){
 		super.onDestroy();
-		E.unregister(this);
 		for(DraftMediaAttachment att:attachments){
 			if(att.isUploadingOrProcessing())
 				att.cancelUpload();
@@ -304,7 +288,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
-		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}

 	@Override
@@ -322,25 +305,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		emojiKeyboard.setListener(this::onCustomEmojiClick);

 		View view=inflater.inflate(R.layout.fragment_compose, container, false);
-
-		if(GlobalUserPreferences.relocatePublishButton){
-			publishButton=view.findViewById(R.id.publish);
-//			publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
-			publishButton.setEllipsize(TextUtils.TruncateAt.END);
-			publishButton.setOnClickListener(this::onPublishClick);
-			publishButton.setSingleLine(true);
-			publishButton.setVisibility(View.VISIBLE);
-
-			draftsBtn=view.findViewById(R.id.drafts_btn);
-			draftsBtn.setVisibility(View.VISIBLE);
-		} else {
-			charCounter=view.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
-		}
-
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
+		charCounter=view.findViewById(R.id.char_counter);
+		charCounter.setText(String.valueOf(charLimit));
 		scrollView=view.findViewById(R.id.scroll_view);

 		selfName=view.findViewById(R.id.self_name);
@@ -375,28 +343,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		view.findViewById(GlobalUserPreferences.replyLineAboveHeader ? R.id.reply_text_below : R.id.reply_text)
 				.setVisibility(View.GONE);

-		PopupMenu attachPopup = new PopupMenu(getContext(), mediaBtn);
-		attachPopup.inflate(R.menu.attach);
-		if(isPhotoPickerAvailable())
-			attachPopup.getMenu().findItem(R.id.media).setVisible(true);
-
-		attachPopup.setOnMenuItemClickListener(i -> {
-			if (i.getItemId() == R.id.camera){
-				if (getContext().checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-					Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-					startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE);
-				} else {
-					getActivity().requestPermissions(new String[] { Manifest.permission.CAMERA }, CAMERA_PERMISSION_CODE);
-				}
-
-			} else {
+		if (isPhotoPickerAvailable()) {
+			PopupMenu attachPopup = new PopupMenu(getContext(), mediaBtn);
+			attachPopup.inflate(R.menu.attach);
+			attachPopup.setOnMenuItemClickListener(i -> {
 				openFilePicker(i.getItemId() == R.id.media);
-			}
-			return true;
-		});
-		UiUtils.enablePopupMenuIcons(getContext(), attachPopup);
-		mediaBtn.setOnClickListener(v->attachPopup.show());
-		mediaBtn.setOnTouchListener(attachPopup.getDragToOpenListener());
+				return true;
+			});
+			UiUtils.enablePopupMenuIcons(getContext(), attachPopup);
+			mediaBtn.setOnClickListener(v->attachPopup.show());
+			mediaBtn.setOnTouchListener(attachPopup.getDragToOpenListener());
+		} else {
+			mediaBtn.setOnClickListener(v -> openFilePicker(false));
+		}
 		if (isInstancePixelfed()) pollBtn.setVisibility(View.GONE);
 		pollBtn.setOnClickListener(v->togglePoll());
 		emojiBtn.setOnClickListener(v->emojiKeyboard.toggleKeyboardPopup(mainEditText));
@@ -588,19 +547,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if (scheduledStatus != null) outState.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
 	}

-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-		if (requestCode == CAMERA_PERMISSION_CODE && (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
-			Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-			startActivityForResult(cameraIntent, CAMERA_PIC_REQUEST_CODE);
-		} else {
-			Toast.makeText(getContext(), R.string.permission_required, Toast.LENGTH_SHORT);
-		}
-	}
-
 	@Override
 	public void onResume(){
 		super.onResume();
@@ -780,17 +726,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			replyText.setOnClickListener(v->{
 				scrollView.smoothScrollTo(0, 0);
 			});
-			replyText.setOnClickListener(v->{
-				scrollView.smoothScrollTo(0, 0);
-			});
-

 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
 			if(!status.account.id.equals(ownID))
 				mentions.add('@'+status.account.acct);
-			if(status.rebloggedBy != null && GlobalUserPreferences.mentionRebloggerAutomatically)
-				mentions.add('@'+status.rebloggedBy.acct);
 			for(Mention mention:status.mentions){
 				if(mention.id.equals(ownID))
 					continue;
@@ -807,9 +747,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				if(!TextUtils.isEmpty(status.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
-					if(GlobalUserPreferences.prefixRepliesWithRe && !status.spoilerText.startsWith("re: ")){
+					if ((GlobalUserPreferences.prefixReplies == ALWAYS
+							|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(status.account.id)))
+							&& !status.spoilerText.startsWith("re: ")) {
 						spoilerEdit.setText("re: " + status.spoilerText);
-					}else{
+					} else {
 						spoilerEdit.setText(status.spoilerText);
 					}
 					spoilerBtn.setSelected(true);
@@ -881,20 +823,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		item.setActionView(wrap);
 		item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

-		if(!GlobalUserPreferences.relocatePublishButton){
-			publishButton = wrap.findViewById(R.id.publish_btn);
-			publishButton.setOnClickListener(this::onPublishClick);
-			publishButton.setVisibility(View.VISIBLE);
-
-			draftsBtn = wrap.findViewById(R.id.drafts_btn);
-			draftsBtn.setVisibility(View.VISIBLE);
-		}else{
-			charCounter = wrap.findViewById(R.id.char_counter);
-			charCounter.setVisibility(View.VISIBLE);
-			charCounter.setText(String.valueOf(charLimit));
-		}
-
-//		draftsBtn = wrap.findViewById(R.id.drafts_btn);
+		draftsBtn = wrap.findViewById(R.id.drafts_btn);
 		draftOptionsPopup = new PopupMenu(getContext(), draftsBtn);
 		draftOptionsPopup.inflate(R.menu.compose_more);
 		draftMenuItem = draftOptionsPopup.getMenu().findItem(R.id.draft);
@@ -911,11 +840,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		});
 		UiUtils.enablePopupMenuIcons(getContext(), draftOptionsPopup);

-
+		publishButton = wrap.findViewById(R.id.publish_btn);
 		languageButton = wrap.findViewById(R.id.language_btn);
 		sendProgress = wrap.findViewById(R.id.send_progress);
 		sendError = wrap.findViewById(R.id.send_error);

+		publishButton.setOnClickListener(this::onPublishClick);
 		draftsBtn.setOnClickListener(v-> draftOptionsPopup.show());
 		draftsBtn.setOnTouchListener(draftOptionsPopup.getDragToOpenListener());
 		updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null);
@@ -1068,9 +998,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr

 	private void resetPublishButtonText() {
 		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
-		if(GlobalUserPreferences.relocatePublishButton){
-			return;
-		}
 		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
 			publishButton.setText(GlobalUserPreferences.publishButtonText);
 		} else {
@@ -1459,17 +1386,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				}
 			}
 		}
-
-		if(requestCode==CAMERA_PIC_REQUEST_CODE && resultCode==Activity.RESULT_OK){
-			Bitmap image = (Bitmap) data.getExtras().get("data");
-			String path = MediaStore.Images.Media.insertImage(getContext().getContentResolver(), image, null, null);
-			addMediaAttachment(Uri.parse(path), null);
-		}
-	}
-
-	@Subscribe
-	public void onPictureTaken(PictureTakenEvent ev){
-		addMediaAttachment(ev.uri, null);
 	}

 	private boolean addMediaAttachment(Uri uri, String description){
@@ -1968,15 +1884,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				scheduleDraftText.setText(R.string.sk_compose_draft);
 				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_regular, 0, 0, 0);
 				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_draft));
-				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_drafts_24_regular : R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
-
-				if(GlobalUserPreferences.relocatePublishButton){
-					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-						? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_drafts_24_selector, 0, 0, 0);
-				}else{
-					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-							? R.string.save : R.string.sk_draft);
-				}
+				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_drafts_20_filled, 0, 0, 0);
+				publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
+						? R.string.save : R.string.sk_draft);
 			} else {
 				scheduleMenuItem.setVisible(false);
 				unscheduleMenuItem.setVisible(true);
@@ -1986,21 +1896,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				scheduleDraftText.setText(R.string.sk_compose_scheduled);
 				scheduleDraftText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 				scheduleDraftDismiss.setContentDescription(getString(R.string.sk_compose_no_schedule));
-				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_filled : R.drawable.ic_fluent_clock_20_filled, 0, 0, 0);
-				if(GlobalUserPreferences.relocatePublishButton)
-				{
-					publishButton.setCompoundDrawablesWithIntrinsicBounds(scheduledStatus != null && scheduledStatus.scheduledAt.isAfter(DRAFTS_AFTER_INSTANT)
-							? R.drawable.ic_fluent_save_24_selector : R.drawable.ic_fluent_clock_24_selector, 0, 0, 0);
-				}else{
-					publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.equals(scheduledAt)
-							? R.string.save : R.string.sk_schedule);
-				}
+				draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_clock_20_filled, 0, 0, 0);
+				publishButton.setText(scheduledStatus != null && scheduledStatus.scheduledAt.equals(scheduledAt)
+						? R.string.save : R.string.sk_schedule);
 			}
 		} else {
-			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(GlobalUserPreferences.relocatePublishButton ? R.drawable.ic_fluent_clock_24_regular : R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
-			if(GlobalUserPreferences.relocatePublishButton){
-				publishButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_send_24_selector, 0, 0, 0);
-			}
+			draftsBtn.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_clock_20_regular, 0, 0, 0);
 			resetPublishButtonText();
 		}
 	}
@@ -2095,9 +1996,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}

 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
-		if(replyTo != null) {
-			statusVisibility = (replyTo.visibility == StatusPrivacy.PUBLIC && GlobalUserPreferences.defaultToUnlistedReplies ? StatusPrivacy.UNLISTED : replyTo.visibility);
-		}
+		if(replyTo != null) statusVisibility = replyTo.visibility;

 		AccountSessionManager asm = AccountSessionManager.getInstance();
 		Preferences prefs = asm.getAccount(accountID).preferences;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/CustomLocalTimelineFragment.java
@@ -1,86 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.app.Activity;
-import android.net.Uri;
-
-import org.joinmastodon.android.DomainManager;
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import me.grishka.appkit.api.SimpleCallback;
-
-public class CustomLocalTimelineFragment extends StatusListFragment implements ProvidesAssistContent.ProvidesWebUri {
-    //    private String name;
-    private String domain;
-
-    private String maxID;
-    @Override
-    protected boolean wantsComposeButton() {
-        return false;
-    }
-
-    @Override
-    public void onAttach(Activity activity){
-        super.onAttach(activity);
-        domain=getArguments().getString("domain");
-        updateTitle(domain);
-
-        setHasOptionsMenu(true);
-    }
-
-    private void updateTitle(String domain) {
-        this.domain = domain;
-        setTitle(this.domain);
-    }
-
-    @Override
-    public String getDomain() {
-        return domain;
-    }
-
-    @Override
-    protected void doLoadData(int offset, int count){
-        currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, count)
-                .setCallback(new SimpleCallback<>(this){
-                    @Override
-                    public void onSuccess(List<Status> result){
-                        if(!result.isEmpty())
-                            maxID=result.get(result.size()-1).id;
-                        if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
-                        result.stream().forEach(status -> {
-                            status.account.acct += "@"+domain;
-                            status.mentions.forEach(mention -> mention.id = null);
-                            status.isRemote = true;
-                        });
-
-                        onDataLoaded(result, !result.isEmpty());
-                    }
-                })
-                .execNoAuth(domain);
-    }
-
-    @Override
-    protected void onShown(){
-        super.onShown();
-        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
-            loadData();
-    }
-
-    @Override
-    protected Filter.FilterContext getFilterContext() {
-        return null;
-    }
-
-    @Override
-    public Uri getWebUri(Uri.Builder base) {
-        return Uri.parse(domain);
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java
@@ -1,15 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-
-public interface DomainDisplay {
-
-	default String getDomain(){
-		AccountSession session = AccountSessionManager.getInstance().getLastActiveAccount();
-		if (session != null)
-			return session.domain;
-		else
-			return "";
-	}
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -7,7 +7,6 @@ import static org.joinmastodon.android.ui.utils.UiUtils.makeBackItem;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
-import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -16,7 +15,6 @@ import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -34,7 +32,6 @@ import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.model.CustomLocalTimeline;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Instance;
@@ -54,7 +51,6 @@ import java.util.Map;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;

 public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition> implements ScrollableToTop {
@@ -66,7 +62,6 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
    private final Map<MenuItem, TimelineDefinition> timelineByMenuItem = new HashMap<>();
    private final List<ListTimeline> listTimelines = new ArrayList<>();
    private final List<Hashtag> hashtags = new ArrayList<>();
-    private final List<CustomLocalTimeline> localTimelines = new ArrayList<>();

    public EditTimelinesFragment() {
        super(10);
@@ -135,10 +130,6 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
            optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
            return true;
        }
-        if (item.getItemId() == R.id.menu_add_local_timelines) {
-            addNewLocalTimeline();
-            return true;
-        }
        TimelineDefinition tl = timelineByMenuItem.get(item);
        if (tl != null) {
            data.add(tl.copy());
@@ -149,26 +140,6 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
        return true;
    }

-    private void addNewLocalTimeline() {
-        FrameLayout inputWrap = new FrameLayout(getContext());
-        EditText input = new EditText(getContext());
-        input.setHint(R.string.sk_example_domain);
-        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-        input.setLayoutParams(params);
-        inputWrap.addView(input);
-        new M3AlertDialogBuilder(getContext()).setTitle(R.string.mo_add_custom_server_local_timeline).setView(inputWrap)
-                .setPositiveButton(R.string.save, (d, which) -> {
-                    TimelineDefinition tl = TimelineDefinition.ofCustomLocalTimeline(input.getText().toString().trim());
-                    data.add(tl);
-                    saveTimelines();
-                })
-                .setNegativeButton(R.string.cancel, (d, which) -> {
-                })
-                .show();
-    }
-
    private void addTimelineToOptions(TimelineDefinition tl, Menu menu) {
        if (data.contains(tl)) return;
        MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, tl.getTitle(getContext()));
@@ -192,9 +163,6 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
        SubMenu hashtagsMenu = menu.addSubMenu(R.string.sk_hashtag);
        hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);

-        MenuItem addLocalTimelines = menu.add(0, R.id.menu_add_local_timelines, NONE, R.string.local_timeline);
-        addLocalTimelines.setIcon(R.drawable.ic_fluent_add_24_regular);
-
        makeBackItem(timelinesMenu);
        makeBackItem(listsMenu);
        makeBackItem(hashtagsMenu);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
@@ -255,6 +255,10 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 			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)));
+			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
+			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
 			if(relationship == null || !relationship.followedBy){
 				actionWrap.setVisibility(View.GONE);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
@@ -72,7 +72,6 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
        return new HashtagsAdapter();
    }

-
    @Override
    public void scrollToTop() {
        smoothScrollRecyclerViewToTop(list);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -11,7 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;

-import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.tags.GetHashtag;
@@ -44,19 +43,12 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 		return true;
 	}

-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/tags/" + hashtag;
-	}
-
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
 		updateTitle(getArguments().getString("hashtag"));
 		following=getArguments().getBoolean("following", false);
 		setHasOptionsMenu(true);
-		DomainManager.getInstance().setCurrentDomain(getDomain());
 	}

 	private void updateTitle(String hashtagName) {
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -3,7 +3,6 @@ package org.joinmastodon.android.fragments;
 import android.app.Fragment;
 import android.app.NotificationManager;
 import android.app.assist.AssistContent;
-import android.content.Intent;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,10 +22,6 @@ import androidx.annotation.Nullable;

 import com.squareup.otto.Subscribe;

-import org.joinmastodon.android.DomainManager;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
@@ -34,9 +29,7 @@ import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.AllNotificationsSeenEvent;
 import org.joinmastodon.android.events.NotificationReceivedEvent;
-import org.joinmastodon.android.fragments.discover.DiscoverAccountsFragment;
 import org.joinmastodon.android.fragments.discover.DiscoverFragment;
-import org.joinmastodon.android.fragments.onboarding.OnboardingFollowSuggestionsFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
@@ -52,7 +45,6 @@ import java.util.List;
 import java.util.Optional;

 import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
@@ -84,7 +76,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		super.onCreate(savedInstanceState);
 		E.register(this);
 		accountID=getArguments().getString("account");
-		setTitle(R.string.mo_app_name);
+		setTitle(R.string.sk_app_name);
 		isPleroma = AccountSessionManager.getInstance().getAccount(accountID).getInstance()
 				.map(Instance::isAkkoma)
 				.orElse(false);
@@ -285,17 +277,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			new AccountSwitcherSheet(getActivity(), this).show();
 			return true;
 		}
-		if(tab==R.id.tab_search){
-			onTabSelected(R.id.tab_search);
-			tabBar.selectTab(R.id.tab_search);
-			searchFragment.selectSearch();
-			return true;
-		}
-		if(tab==R.id.tab_home){
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			Nav.go(getActivity(), OnboardingFollowSuggestionsFragment.class, args);
-		}
 		return false;
 	}

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -37,7 +37,6 @@ import androidx.viewpager2.widget.ViewPager2;

 import com.squareup.otto.Subscribe;

-import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -48,7 +47,6 @@ import org.joinmastodon.android.events.HashtagUpdatedEvent;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.settings.SettingsMainFragment;
 import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
@@ -117,10 +115,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		fragments = new Fragment[count];
 		tabViews = new FrameLayout[count];
 		timelines = new TimelineDefinition[count];
-		if(GlobalUserPreferences.disableMarquee){
-			setTitleMarqueeEnabled(false);
-			setSubtitleMarqueeEnabled(false);
-		}
 	}

 	@Override
@@ -490,7 +484,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 			getToolbar().post(() -> overflowPopup.show());
 			return true;
 		} else if (id == R.id.settings || id == R.id.settings_action) {
-			Nav.go(getActivity(), SettingsMainFragment.class, args);
+			Nav.go(getActivity(), SettingsFragment.class, args);
 		} else if (id == R.id.announcements || id == R.id.announcements_action) {
 			Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
 		} else if (id == R.id.edit_timelines) {
@@ -510,12 +504,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab

 	@Override
 	public void scrollToTop(){
-		if (((IsOnTop) fragments[pager.getCurrentItem()]).isOnTop() &&
-				GlobalUserPreferences.doubleTapToSwipe && !newPostsBtnShown) {
-			int nextPage = (pager.getCurrentItem() + 1) % count;
-			navigateTo(nextPage);
-			return;
-		}
 		((ScrollableToTop) fragments[pager.getCurrentItem()]).scrollToTop();
 	}

@@ -589,8 +577,8 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab

 	private void onNewPostsBtnClick(View view) {
 		if(newPostsBtnShown){
-			scrollToTop();
 			hideNewPostsButton();
+			scrollToTop();
 		}
 	}

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -41,11 +41,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 		return true;
 	}

-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/home";
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -53,12 +48,13 @@ public class HomeTimelineFragment extends StatusListFragment {
 		loadData();
 	}

+	private boolean typeFilterPredicate(Status s) {
+		return (GlobalUserPreferences.showReplies || s.inReplyToId == null) &&
+				(GlobalUserPreferences.showBoosts || s.reblog == null);
+	}
+
 	private List<Status> filterPosts(List<Status> items) {
-		// This is the function I must use to solve the filters thing for real
-		return items.stream().filter(i ->
-				(GlobalUserPreferences.showReplies || i.inReplyToId == null) &&
-				(GlobalUserPreferences.showBoosts || i.reblog == null)
-		).collect(Collectors.toList());
+		return items.stream().filter(this::typeFilterPredicate).collect(Collectors.toList());
 	}

 	@Override
@@ -107,24 +103,24 @@ public class HomeTimelineFragment extends StatusListFragment {
 	@Override
 	protected void onHidden(){
 		super.onHidden();
-//		if(!data.isEmpty()){
-//			String topPostID=displayItems.get(list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset()).parentID;
-//			if(!topPostID.equals(lastSavedMarkerID)){
-//				lastSavedMarkerID=topPostID;
-//				new SaveMarkers(topPostID, null)
-//						.setCallback(new Callback<>(){
-//							@Override
-//							public void onSuccess(SaveMarkers.Response result){
-//							}
-//
-//							@Override
-//							public void onError(ErrorResponse error){
-//								lastSavedMarkerID=null;
-//							}
-//						})
-//						.exec(accountID);
-//			}
-//		}
+		if(!data.isEmpty()){
+			String topPostID=displayItems.get(Math.max(0, list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset())).parentID;
+			if(!topPostID.equals(lastSavedMarkerID)){
+				lastSavedMarkerID=topPostID;
+				new SaveMarkers(topPostID, null)
+						.setCallback(new Callback<>(){
+							@Override
+							public void onSuccess(SaveMarkers.Response result){
+							}
+
+							@Override
+							public void onError(ErrorResponse error){
+								lastSavedMarkerID=null;
+							}
+						})
+						.exec(accountID);
+			}
+		}
 	}

 	public void onStatusCreated(StatusCreatedEvent ev){
@@ -238,7 +234,7 @@ public class HomeTimelineFragment extends StatusListFragment {
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
-								if(filterPredicate.test(s)){
+								if(typeFilterPredicate(s) && filterPredicate.test(s)){
 									targetList.addAll(buildDisplayItems(s));
 									insertedPosts.add(s);
 								}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceBlockListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceBlockListFragment.java
@@ -1,185 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.Html;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.instance.GetDomainBlocks;
-import org.joinmastodon.android.fragments.onboarding.GoogleMadeMeAddThisFragment;
-import org.joinmastodon.android.model.DomainBlock;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Severity;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.ElevationOnScrollListener;
-import org.parceler.Parcels;
-
-import java.util.List;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.LoaderFragment;
-import me.grishka.appkit.fragments.ToolbarFragment;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
-import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.FragmentRootLinearLayout;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class InstanceBlockListFragment extends LoaderFragment {
-	private UsableRecyclerView list;
-	private MergeRecyclerAdapter adapter;
-	private View buttonBar;
-	private Instance instance;
-	private ElevationOnScrollListener onScrollListener;
-
-	private List<DomainBlock> domainBlocks;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		setRetainInstance(true);
-		loadData();
-	}
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
-		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
-		setTitle(R.string.mo_instance_info_moderated_servers);
-	}
-
-	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
-		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
-
-		list=view.findViewById(R.id.list);
-		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-
-		adapter=new MergeRecyclerAdapter();
-		adapter.addAdapter(new ItemsAdapter());
-		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 0, 0, DividerItemDecoration.NOT_FIRST));
-
-		buttonBar=view.findViewById(R.id.button_bar);
-
-		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
-
-		return view;
-	}
-
-	@Override
-	protected void doLoadData() {
-		currentRequest= new GetDomainBlocks().setCallback(new SimpleCallback<>(this) {
-			@Override
-			public void onSuccess(List<DomainBlock> result) {
-				domainBlocks=result;
-				dataLoaded();
-			}
-		}).execNoAuth(instance.uri);
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		getToolbar().setBackgroundResource(R.drawable.bg_onboarding_panel);
-		getToolbar().setElevation(0);
-		if(onScrollListener!=null){
-			onScrollListener.setViews(buttonBar, getToolbar());
-		}
-	}
-
-	@Override
-	public void onApplyWindowInsets(WindowInsets insets){
-		if(Build.VERSION.SDK_INT>=27){
-			int inset=insets.getSystemWindowInsetBottom();
-			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
-			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(),  insets.getSystemWindowInsetBottom()));
-		}else{
-			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
-		}
-	}
-
-
-	@Override
-	public void onRefresh(){
-		doLoadData();
-	}
-	private class ItemsAdapter extends RecyclerView.Adapter<ItemViewHolder>{
-
-		@NonNull
-		@Override
-		public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new ItemViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull ItemViewHolder holder, int position){
-			holder.bind(domainBlocks.get(position));
-		}
-
-		@Override
-		public int getItemCount(){
-			return domainBlocks.size();
-		}
-	}
-
-	private class ItemViewHolder extends BindableViewHolder<DomainBlock>{
-		private final TextView instanceUri, reason;
-		private final ImageView severity;
-
-		public ItemViewHolder(){
-			super(getActivity(), R.layout.item_server_block, list);
-			instanceUri=findViewById(R.id.instance);
-			reason=findViewById(R.id.reason);
-			severity=findViewById(R.id.severity);
-		}
-
-		@SuppressLint("DefaultLocale")
-		@Override
-		public void onBind(DomainBlock item){
-			instanceUri.setText(item.domain);
-			reason.setText(item.comment);
-			switch (item.severity) {
-				case SILENCE -> {
-					severity.setImageDrawable(getContext().getDrawable(R.drawable.ic_fluent_speaker_mute_28_regular));
-					severity.setContentDescription(getContext().getString(R.string.mo_severity_silence));
-				}
-				case SUSPEND -> {
-					severity.setImageDrawable(getContext().getDrawable(R.drawable.ic_fluent_shield_prohibited_28_regular));
-					severity.setContentDescription(getContext().getString(R.string.mo_severity_suspend));
-				}
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				severity.setTooltipText(severity.getContentDescription());
-			}
-		}
-	}
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/InstanceInfoFragment.java
@@ -1,477 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Outline;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-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.view.ViewOutlineProvider;
-import android.view.WindowInsets;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import org.joinmastodon.android.DomainManager;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.instance.GetExtendedDescription;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.AccountField;
-import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.ExtendedDescription;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
-import org.joinmastodon.android.ui.drawables.CoverOverlayGradientDrawable;
-import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.CoverImageView;
-import org.joinmastodon.android.ui.views.LinkedTextView;
-import org.parceler.Parcels;
-
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.fragments.LoaderFragment;
-import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
-import me.grishka.appkit.imageloader.RecyclerViewDelegate;
-import me.grishka.appkit.imageloader.ViewImageLoader;
-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 InstanceInfoFragment extends LoaderFragment {
-
-	private Instance instance;
-	private String extendedDescription;
-	private CoverImageView cover;
-	private TextView uri, description, readMore;
-	private SwipeRefreshLayout refreshLayout;
-	private final CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
-	private LinearLayout textWrap;
-
-	private ScrollView scrollView, textScrollView;
-	private float titleTransY;
-
-	private String accountID;
-	private Account account;
-	private String targetDomain;
-	private final ArrayList<AccountField> fields=new ArrayList<>();
-
-	private boolean refreshing;
-	private boolean isExpanded = false;
-
-	public UsableRecyclerView list;
-	private List<AccountField> metadataListData=Collections.emptyList();
-	private MetadataAdapter adapter;
-	private ListImageLoaderWrapper imgLoader;
-
-	private int statusBarHeight;
-
-	private float textMaxHeight, textCollapsedHeight;
-	private LinearLayout.LayoutParams collapseParams, wrapParams;
-
-	public InstanceInfoFragment(){
-		super(R.layout.loader_fragment_overlay_toolbar);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
-			setRetainInstance(true);
-
-		accountID=getArguments().getString("account");
-		account= AccountSessionManager.getInstance().getAccount(accountID).self;
-		targetDomain=getArguments().getString("instanceDomain");
-		loadData();
-		loadExtendedDescription();
-		DomainManager.getInstance().setCurrentDomain(targetDomain + "/about");
-	}
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		setHasOptionsMenu(true);
-	}
-
-	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
-		View content=inflater.inflate(R.layout.fragment_instance_info, container, false);
-
-		refreshLayout=content.findViewById(R.id.refresh_layout);
-		scrollView=content.findViewById(R.id.scroll_view);
-		cover=content.findViewById(R.id.cover);
-		uri =content.findViewById(R.id.uri);
-		description=content.findViewById(R.id.description);
-		list=content.findViewById(R.id.metadata);
-		textScrollView=content.findViewById(R.id.text_scroll_view);
-		textWrap=content.findViewById(R.id.text_wrap);
-		readMore=content.findViewById(R.id.read_more);
-		textMaxHeight=getActivity().getResources().getDimension(R.dimen.description_max_height);
-		textCollapsedHeight=getActivity().getResources().getDimension(R.dimen.description_collapsed_height);
-		collapseParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) textCollapsedHeight);
-		wrapParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-
-		cover.setForeground(coverGradient);
-		cover.setOnClickListener(this::onCoverClick);
-		readMore.setOnClickListener(this::onReadMoreClick);
-		refreshLayout.setOnRefreshListener(this);
-
-		if(loaded){
-			bindViews();
-			dataLoaded();
-		}
-
-		list.setItemAnimator(new BetterItemAnimator());
-		list.setDrawSelectorOnTop(true);
-		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		imgLoader=new ListImageLoaderWrapper(getActivity(), list, new RecyclerViewDelegate(list), null);
-		list.setAdapter(adapter=new MetadataAdapter());
-		list.setClipToPadding(false);
-
-		return content;
-	}
-
-	@Override
-	protected void doLoadData(){
-		currentRequest=new GetInstance()
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(Instance result){
-						if (getActivity() == null) return;
-						instance = result;
-						bindViews();
-						dataLoaded();
-						invalidateOptionsMenu();
-						if(refreshing) {
-							refreshing = false;
-							refreshLayout.setRefreshing(false);
-						}
-					}
-				})
-				.execNoAuth(targetDomain);
-	}
-
-	private void loadExtendedDescription() {
-		new GetExtendedDescription()
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(ExtendedDescription result){
-						if (getActivity() == null || result == null || TextUtils.isEmpty(result.content)) return;
-						extendedDescription = result.content;
-						updateDescription();
-						collapseDescription();
-					}
-				})
-				.execNoAuth(targetDomain);
-	}
-
-	private void updateDescription() {
-		if (instance == null || description == null)
-			return;
-
-		description.setText(HtmlParser.parse(TextUtils.isEmpty(extendedDescription) ?
-				TextUtils.isEmpty(instance.description) ? instance.shortDescription : instance.description
-				: extendedDescription,
-				account.emojis, Collections.emptyList(), Collections.emptyList(), accountID));
-
-		description.measure(
-					View.MeasureSpec.makeMeasureSpec(textWrap.getWidth(), View.MeasureSpec.EXACTLY),
-					View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
-	}
-
-	@Override
-	public void onRefresh(){
-		if(refreshing)
-			return;
-		refreshing=true;
-		doLoadData();
-		loadExtendedDescription();
-	}
-
-	@Override
-	public void dataLoaded(){
-		if(getActivity()==null)
-			return;
-		setFields(fields);
-		super.dataLoaded();
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		updateToolbar();
-		scrollView.setOnScrollChangeListener(this::onScrollChanged);
-		titleTransY=getToolbar().getLayoutParams().height;
-		if(toolbarTitleView!=null){
-			toolbarTitleView.setTranslationY(titleTransY);
-			toolbarSubtitleView.setTranslationY(titleTransY);
-		}
-	}
-
-	@Override
-	public void onConfigurationChanged(Configuration newConfig){
-		super.onConfigurationChanged(newConfig);
-		updateToolbar();
-	}
-
-	@Override
-	public void onApplyWindowInsets(WindowInsets insets){
-		statusBarHeight = insets.getSystemWindowInsetTop();
-		if(contentView!=null){
-			((ViewGroup.MarginLayoutParams) getToolbar().getLayoutParams()).topMargin= statusBarHeight;
-		}
-		super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
-	}
-
-
-
-	private void bindViews(){
-		ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(instance.thumbnail, 1000, 1000));
-		uri.setText(instance.title);
-		setTitle(instance.title);
-		setSubtitle(instance.uri);
-
-		updateDescription();
-		collapseDescription();
-
-		fields.clear();
-
-
-		if (instance.contactAccount != null) {
-			AccountField admin = new AccountField();
-			admin.parsedName=admin.name=getContext().getString(R.string.mo_instance_admin);
-			admin.parsedValue=buildLinkText(instance.contactAccount.url, instance.contactAccount.getDisplayUsername() + "@" + instance.uri);
-			fields.add(admin);
-		}
-
-		if (instance.email != null) {
-			AccountField contact = new AccountField();
-			contact.parsedName=getContext().getString(R.string.mo_instance_contact);
-			contact.parsedValue=buildLinkText("mailto:" + instance.email, instance.email);
-			fields.add(contact);
-		}
-
-		if (instance.stats != null) {
-			AccountField activeUsers = new AccountField();
-			activeUsers.parsedName=getContext().getString(R.string.mo_instance_users);
-			activeUsers.parsedValue= NumberFormat.getInstance().format(instance.stats.userCount);
-			fields.add(activeUsers);
-
-			AccountField statusCount = new AccountField();
-			statusCount.parsedName=getContext().getString(R.string.mo_instance_status);
-			statusCount.parsedValue= NumberFormat.getInstance().format(instance.stats.statusCount);
-			fields.add(statusCount);
-		}
-
-		AccountField registration = new AccountField();
-		registration.parsedName=getContext().getString(R.string.mo_instance_registration);
-		registration.parsedValue=getContext().getString(instance.registrations ? instance.approvalRequired ? R.string.mo_instance_registration_approval : R.string.mo_instance_registration_open : R.string.instance_signup_closed);
-		fields.add(registration);
-
-		setFields(fields);
-	}
-
-	private SpannableStringBuilder buildLinkText(String link, String text) {
-		String value = "<span class=\"h-card\"><a href=" + link + " class=\"u-url mention\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">" + text + "</a></span>";
-		return HtmlParser.parse(value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
-	}
-
-	private void collapseDescription() {
-		textScrollView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-
-		description.measure(
-				View.MeasureSpec.makeMeasureSpec(textWrap.getWidth(), View.MeasureSpec.EXACTLY),
-				View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
-
-		readMore.setText(isExpanded ? R.string.sk_collapse : R.string.sk_expand);
-		description.post(() -> {
-			boolean tooBig = description.getMeasuredHeight() > textMaxHeight;
-			readMore.setVisibility(tooBig ? View.VISIBLE : View.GONE);
-			textScrollView.setLayoutParams(tooBig && !isExpanded ? collapseParams : wrapParams);
-		});
-	}
-
-	private void updateToolbar(){
-		getToolbar().setBackgroundColor(0);
-		if(toolbarTitleView!=null){
-			toolbarTitleView.setTranslationY(titleTransY);
-			toolbarSubtitleView.setTranslationY(titleTransY);
-		}
-		getToolbar().setOnClickListener(v->scrollToTop());
-		getToolbar().setNavigationContentDescription(R.string.back);
-	}
-
-	public void scrollToTop(){
-		scrollView.smoothScrollTo(0, 0);
-	}
-
-	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
-		int topBarsH=getToolbar().getHeight()+statusBarHeight;
-		if(scrollY>cover.getHeight()-topBarsH){
-			cover.setTranslationY(scrollY-(cover.getHeight()-topBarsH));
-			cover.setTranslationZ(V.dp(10));
-			cover.setTransform(cover.getHeight()/2f-topBarsH/2f, 1f);
-		}else{
-			cover.setTranslationY(0f);
-			cover.setTranslationZ(0f);
-			cover.setTransform(scrollY/2f, 1f);
-		}
-		coverGradient.setTopOffset(scrollY);
-		cover.invalidate();
-		titleTransY=getToolbar().getHeight();
-		if(scrollY>textWrap.getTop()-topBarsH){
-			titleTransY=Math.max(0f, titleTransY-(scrollY-(textWrap.getTop()-topBarsH)));
-		}
-		if(toolbarTitleView!=null){
-			toolbarTitleView.setTranslationY(titleTransY);
-			toolbarSubtitleView.setTranslationY(titleTransY);
-		}
-	}
-
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		if (instance != null) {
-			inflater.inflate(R.menu.instance_info, menu);
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu);
-			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, instance.uri));
-
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item){
-		int id=item.getItemId();
-		if(id==R.id.share){
-			Intent intent = new Intent(Intent.ACTION_SEND);
-			intent.setType("text/plain");
-			intent.putExtra(Intent.EXTRA_TEXT, instance.uri);
-			startActivity(Intent.createChooser(intent, item.getTitle()));
-		} else if (id==R.id.open_timeline) {
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putString("domain", instance.uri);
-			Nav.go(getActivity(), CustomLocalTimelineFragment.class, args);
-		}else if (id==R.id.rules) {
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
-			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		} else if (id==R.id.moderated_servers) {
-			Bundle args=new Bundle();
-			args.putParcelable("instance", Parcels.wrap(instance));
-			Nav.go(getActivity(), InstanceBlockListFragment.class, args);
-		}
-		return true;
-	}
-
-
-	@Override
-	public boolean wantsLightStatusBar(){
-		return false;
-	}
-	@Override
-	protected int getToolbarResource(){
-		return R.layout.profile_toolbar;
-	}
-	private void onReadMoreClick(View view) {
-		isExpanded = !isExpanded;
-		bindViews();
-	}
-
-
-	private void onCoverClick(View v){
-			Drawable drawable=cover.getDrawable();
-			if(drawable==null || drawable instanceof ColorDrawable)
-				return;
-		new PhotoViewer(getActivity(), Attachment.createFakeAttachments(instance.thumbnail, drawable), 0,
-				new SingleImagePhotoViewerListener(cover, cover, null, this, () -> {
-				}, () -> drawable, null, null));
-	}
-
-	public void setFields(ArrayList<AccountField> fields){
-		metadataListData=fields;
-		if (adapter != null) adapter.notifyDataSetChanged();
-	}
-
-	private class MetadataAdapter extends UsableRecyclerView.Adapter<BaseViewHolder> {
-		public MetadataAdapter(){
-			super(imgLoader);
-		}
-
-		@NonNull
-		@Override
-		public BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new AboutViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(BaseViewHolder holder, int position){
-			holder.bind(metadataListData.get(position));
-			super.onBindViewHolder(holder, position);
-		}
-
-		@Override
-		public int getItemCount(){
-				return metadataListData.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return 0;
-		}
-
-	}
-
-	private abstract class BaseViewHolder extends BindableViewHolder<AccountField> {
-		public BaseViewHolder(int layout){
-			super(getActivity(), layout, list);
-		}
-	}
-
-	private class AboutViewHolder extends BaseViewHolder {
-		private final TextView title;
-		private final LinkedTextView value;
-
-		public AboutViewHolder(){
-			super(R.layout.item_profile_about);
-			title=findViewById(R.id.title);
-			value=findViewById(R.id.value);
-		}
-
-		@Override
-		public void onBind(AccountField item){
-			title.setText(item.parsedName);
-			value.setText(item.parsedValue);
-			value.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
-			value.setLinkTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorAccent));
-			value.setCompoundDrawables(null, null, null, null);
-		}
-	}
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
@@ -46,7 +46,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;

-	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment;

 	private String accountID;
 	@Override
@@ -105,13 +105,12 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		pager=view.findViewById(R.id.pager);
 		UiUtils.reduceSwipeSensitivity(pager);

-		tabViews=new FrameLayout[3];
+		tabViews=new FrameLayout[2];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.notifications_all;
 				case 1 -> R.id.notifications_mentions;
-				case 2 -> R.id.notifications_posts;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -163,15 +162,9 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment=new NotificationsListFragment();
 			mentionsFragment.setArguments(args);

-			args=new Bundle(args);
-			args.putBoolean("onlyPosts", true);
-			postsFragment=new NotificationsListFragment();
-			postsFragment.setArguments(args);
-
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
-					.add(R.id.notifications_posts, postsFragment)
 					.commit();
 		}

@@ -181,7 +174,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
-					case 2 -> R.string.posts;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -212,11 +204,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc

 	@Override
 	public void scrollToTop(){
-		if (getFragmentForPage(pager.getCurrentItem()).isOnTop() && GlobalUserPreferences.doubleTapToSwipe) {
-			int nextPage = (pager.getCurrentItem() + 1) % tabViews.length;
-			pager.setCurrentItem(nextPage, true);
-			return;
-		}
 		getFragmentForPage(pager.getCurrentItem()).scrollToTop();
 	}

@@ -237,7 +224,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
-			case 2 -> postsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -263,7 +249,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc

 		@Override
 		public int getItemCount(){
-			return 3;
+			return 2;
 		}

 		@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
@@ -14,8 +14,7 @@ import org.joinmastodon.android.model.TimelineDefinition;
 import java.util.ArrayList;
 import java.util.List;

-public abstract class PinnableStatusListFragment extends StatusListFragment implements DomainDisplay {
-    protected boolean pinnedUpdated;
+public abstract class PinnableStatusListFragment extends StatusListFragment {
    protected List<TimelineDefinition> pinnedTimelines;

    @Override
@@ -54,7 +53,7 @@ public abstract class PinnableStatusListFragment extends StatusListFragment impl
    }

    protected void togglePin(MenuItem pin) {
-        pinnedUpdated = true;
+        onPinnedUpdated(true);
        getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
        TimelineDefinition def = makeTimelineDefinition();
        boolean pinned = isPinned();
@@ -66,17 +65,5 @@ public abstract class PinnableStatusListFragment extends StatusListFragment impl
        updatePinButton(pin);
    }

-    protected Bundle getResultArgs() {
-        return new Bundle();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        Bundle resultArgs = getResultArgs();
-        if (pinnedUpdated) {
-            resultArgs.putBoolean("pinnedUpdated", true);
-            setResult(true, resultArgs);
-        }
-    }
+    public void onPinnedUpdated(boolean pinned) {}
 }
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java
@@ -0,0 +1,52 @@
+package org.joinmastodon.android.fragments;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.Status;
+import org.parceler.Parcels;
+
+import java.util.List;
+
+import me.grishka.appkit.api.SimpleCallback;
+
+public class PinnedPostsListFragment extends StatusListFragment{
+	private Account account;
+
+	public PinnedPostsListFragment() {
+		setListLayoutId(R.layout.recycler_fragment_no_refresh);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState){
+		super.onCreate(savedInstanceState);
+		account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
+		setTitle(R.string.posts);
+		loadData();
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		new GetAccountStatuses(account.id, null, null, 100, GetAccountStatuses.Filter.PINNED)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Status> result){
+						onDataLoaded(result, false);
+					}
+				}).exec(accountID);
+	}
+
+	@Override
+	protected Filter.FilterContext getFilterContext() {
+		return Filter.FilterContext.ACCOUNT;
+	}
+
+	@Override
+	public Uri getWebUri(Uri.Builder base) {
+		return Uri.parse(account.url);
+	}
+}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments;

-import android.app.Activity;
 import android.app.Fragment;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -13,23 +12,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;

 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.model.AccountField;
-import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
@@ -39,8 +26,11 @@ import org.joinmastodon.android.ui.views.LinkedTextView;
 import java.util.Collections;
 import java.util.List;

-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
@@ -56,11 +46,6 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 	private static final int MAX_FIELDS=4;

 	public UsableRecyclerView list;
-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String accountID;
-	private String profileAccountID;
-	private String note;
 	private List<AccountField> fields=Collections.emptyList();
 	private AboutAdapter adapter;
 	private Paint dividerPaint=new Paint();
@@ -79,49 +64,11 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 			adapter.notifyDataSetChanged();
 	}

-	public void setNote(String note, String accountID, String profileAccountID){
-		this.note=note;
-		this.accountID=accountID;
-		this.profileAccountID=profileAccountID;
-//		noteWrap.setVisibility(View.VISIBLE);
-//		noteEdit.setVisibility(View.VISIBLE);
-//		noteEdit.setText(note);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
-		View view = inflater.inflate(R.layout.fragment_profile_about, null);
-
-		noteEdit = view.findViewById(R.id.note_edit);
-		noteWrap = view.findViewById(R.id.note_edit_wrap);
-		ImageButton noteEditConfirm = view.findViewById(R.id.note_edit_confirm);
-
-
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
-
-		list = view.findViewById(R.id.list);
+		list=new UsableRecyclerView(getActivity());
+		list.setId(R.id.list);
 		list.setItemAnimator(new BetterItemAnimator());
 		list.setDrawSelectorOnTop(true);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -148,20 +95,8 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 				}
 			}
 		});
-		return view;
+		return list;
 	}
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse result) {
-				Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show();
-			}
-		}).exec(accountID);
-	}
-

 	public void enterEditMode(List<AccountField> editableFields){
 		isInEditMode=true;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -20,7 +20,6 @@ import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -33,7 +32,6 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
-import android.view.animation.TranslateAnimation;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -45,14 +43,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;

-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.viewpager2.widget.ViewPager2;
-
-import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
@@ -60,7 +51,6 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -134,7 +124,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
-	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
+	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, mediaFragment;
+	private PinnedPostsListFragment pinnedPostsFragment;
 //	private ProfileAboutFragment aboutFragment;
 	private TabLayout tabbar;
 	private SwipeRefreshLayout refreshLayout;
@@ -148,9 +139,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private TextView followsYouView;
 	private ViewGroup rolesView;

-	public FrameLayout noteWrap;
-	public EditText noteEdit;
-	private String note;
 	private Account account, remoteAccount;
 	private String accountID;
 	private String domain;
@@ -202,9 +190,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!isOwnProfile)
 				loadRelationship();
 			else if (isInstanceAkkoma() && getInstance().isPresent())
-				if(getInstance().get().pleroma != null && getInstance().get().pleroma.metadata != null && getInstance().get().pleroma.metadata.fieldsLimits != null){
-					maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
-				}
+				maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
 		}else{
 			profileAccountID=getArguments().getString("profileAccountID");
 			if(!getArguments().getBoolean("noAutoLoad", false))
@@ -259,10 +245,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		list=content.findViewById(R.id.metadata);
 		rolesView=content.findViewById(R.id.roles);

-		noteEdit = content.findViewById(R.id.note_edit);
-		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
-
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
 			public void getOutline(View view, Outline outline){
@@ -271,47 +253,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);

-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				fab.setVisibility(View.INVISIBLE);
-				TranslateAnimation animate = new TranslateAnimation(
-						0,
-						0,
-						0,
-						fab.getHeight() * 2);
-				animate.setDuration(300);
-				fab.startAnimation(animate);
-
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-			} else {
-				fab.setVisibility(View.VISIBLE);
-				TranslateAnimation animate = new TranslateAnimation(
-						0,
-						0,
-						fab.getHeight() * 2,
-						0);
-				animate.setDuration(300);
-				fab.startAnimation(animate);
-
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
-
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -392,16 +333,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followersBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);

-
-		//this currently takes up the whole username
-		//in the future it might need to be change to only the instance uri
-		username.setOnClickListener(v -> {
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putString("instanceDomain", Uri.parse(account.url).getHost());
-			Nav.go(getActivity(), InstanceInfoFragment.class, args);
-		});
-
 		username.setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
@@ -448,25 +379,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		V.setVisibilityAnimated(fab, View.VISIBLE);
 	}

-	public void setNote(String note){
-		this.note=note;
-		noteWrap.setVisibility(View.VISIBLE);
-		noteEdit.setVisibility(View.VISIBLE);
-		noteEdit.setText(note);
-	}
-
-	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
 	@Override
 	protected void doLoadData(){
 		if (remoteAccount != null) {
@@ -497,11 +409,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList

 	@Override
 	public void onRefresh(){
-		if(isInEditMode){
-			refreshing=false;
-			refreshLayout.setRefreshing(false);
-			return;
-		}
 		if(refreshing)
 			return;
 		refreshing=true;
@@ -515,8 +422,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(postsFragment==null){
 			postsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.DEFAULT, true);
 			postsWithRepliesFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.INCLUDE_REPLIES, false);
-			pinnedPostsFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.PINNED, false);
 			mediaFragment=AccountTimelineFragment.newInstance(accountID, account, GetAccountStatuses.Filter.MEDIA, false);
+
+			Bundle args=new Bundle();
+			args.putString("account", accountID);
+			args.putParcelable("profileAccount", Parcels.wrap(account));
+			args.putBoolean("__is_tab", true);
+			pinnedPostsFragment=new PinnedPostsListFragment();
+			pinnedPostsFragment.setArguments(args);
 //			aboutFragment=new ProfileAboutFragment();
 			setFields(fields);
 		}
@@ -608,9 +521,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		ViewImageLoader.load(avatar, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.avatar : account.avatarStatic, V.dp(100), V.dp(100)));
 		ViewImageLoader.load(cover, null, new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? account.header : account.headerStatic, 1000, 1000));
 		SpannableStringBuilder ssb=new SpannableStringBuilder(account.displayName);
-		HtmlParser.parseCustomEmoji(ssb, account.emojis);
-		name.setText(ssb);
-		setTitle(ssb);
+			HtmlParser.parseCustomEmoji(ssb, account.emojis);
+			name.setText(ssb);
+			setTitle(ssb);

 		if (account.roles != null && !account.roles.isEmpty()) {
 			rolesView.setVisibility(View.VISIBLE);
@@ -641,27 +554,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
-		}else if(account.bot){
-			ssb=new SpannableStringBuilder("@");
-			ssb.append(account.acct);
-			if(isSelf){
-				ssb.append('@');
-				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
-			}
-			ssb.append(" ");
-			Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, getActivity().getTheme()).mutate();
-			botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
-			botIcon.setTint(username.getCurrentTextColor());
-			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
-			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+acct);
 		}
-		CharSequence parsedBio = null;
-		if(account.note != null){
-			parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
-		}
+		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
 		}else{
@@ -675,6 +572,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingLabel.setText(getResources().getQuantityString(R.plurals.following, (int)Math.min(999, account.followingCount)));
 		postsLabel.setText(getResources().getQuantityString(R.plurals.posts, (int)Math.min(999, account.statusesCount)));

+		if (account.followersCount < 0) followersBtn.setVisibility(View.GONE);
+		if (account.followingCount < 0) followingBtn.setVisibility(View.GONE);
+
 		UiUtils.loadCustomEmojiInTextView(name);
 		UiUtils.loadCustomEmojiInTextView(bio);

@@ -752,11 +652,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-		if(isOwnProfile){
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.scheduled, R.id.bookmarks, R.id.favorites);
-		}else{
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
-		}
+		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
 		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
 		openWithAccounts.setVisible(hasMultipleAccounts);
@@ -901,10 +797,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		if (!isOwnProfile) {
-			setNote(relationship.note);
-//			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
-		}
 		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}

@@ -1176,9 +1068,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList

 	@Override
 	public boolean onBackPressed(){
-		if(noteEdit.hasFocus()) {
-			savePrivateNote();
-		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;
@@ -1444,7 +1333,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList

 	private class EditableAboutViewHolder extends BaseViewHolder {
 		private EditText title;
-		private boolean titleHasFocus, valueHasFocus;
 		private EditText value;

 		public EditableAboutViewHolder(){
@@ -1456,19 +1344,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				return true;
 			});
 			title.addTextChangedListener(new SimpleTextWatcher(e->item.name=e.toString()));
-			title.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-				@Override
-				public void onFocusChange(View v, boolean hasFocus) {
-					titleHasFocus = hasFocus;
-				}
-			});
 			value.addTextChangedListener(new SimpleTextWatcher(e->item.value=e.toString()));
-			value.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-				@Override
-				public void onFocusChange(View v, boolean hasFocus) {
-					valueHasFocus = hasFocus;
-				}
-			});
 			findViewById(R.id.remove_row_btn).setOnClickListener(this::onRemoveRowClick);
 		}

@@ -1479,10 +1355,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}

 		private void onRemoveRowClick(View v){
-			if(titleHasFocus || valueHasFocus){
-				return;
-			}
-
 			int pos=getAbsoluteAdapterPosition();
 			metadataListData.remove(pos);
 			adapter.notifyItemRemoved(pos);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
@@ -14,7 +14,6 @@ import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
 import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
 import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScrollableToTop.java
@@ -7,8 +7,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.ui.utils.UiUtils;

 public interface ScrollableToTop{
-//	boolean isScrolledToTop();
-
 	void scrollToTop();

 	/**
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -39,6 +39,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.GlobalUserPreferences.AutoRevealMode;
 import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
+import org.joinmastodon.android.GlobalUserPreferences.PrefixRepliesMode;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -129,16 +130,16 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
 			b.setOnTouchListener(popupMenu.getDragToOpenListener());
 			b.setOnClickListener(v->popupMenu.show());
-//			b.setText(switch(GlobalUserPreferences.color){
-//				case MATERIAL3 -> R.string.sk_color_palette_material3;
-//				case PINK -> R.string.sk_color_palette_pink;
-//				case PURPLE -> R.string.sk_color_palette_purple;
-//				case GREEN -> R.string.sk_color_palette_green;
-//				case BLUE -> R.string.sk_color_palette_blue;
-//				case BROWN -> R.string.sk_color_palette_brown;
-//				case RED -> R.string.sk_color_palette_red;
-//				case YELLOW -> R.string.sk_color_palette_yellow;
-//			});
+			b.setText(switch(GlobalUserPreferences.color){
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case RED -> R.string.sk_color_palette_red;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+			});
 		}));
 		items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{
 			updatePublishText(b);
@@ -221,14 +222,27 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.prefixRepliesWithRe, i->{
-			GlobalUserPreferences.prefixRepliesWithRe=i.checked;
+		items.add(new ButtonItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, b->{
+			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.settings_prefix_reply_mode);
+			popupMenu.setOnMenuItemClickListener(i -> onPrefixRepliesClick(i, b));
+			b.setOnTouchListener(popupMenu.getDragToOpenListener());
+			b.setOnClickListener(v->popupMenu.show());
+			b.setText(switch(GlobalUserPreferences.prefixReplies){
+				case TO_OTHERS -> R.string.sk_settings_prefix_replies_to_others;
+				case ALWAYS -> R.string.sk_settings_prefix_replies_always;
+				default -> R.string.sk_settings_prefix_replies_never;
+			});
 			GlobalUserPreferences.save();
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_confirm_before_reblog, R.drawable.ic_fluent_checkmark_circle_24_regular, GlobalUserPreferences.confirmBeforeReblog, i->{
 			GlobalUserPreferences.confirmBeforeReblog=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_forward_report_default, R.drawable.ic_fluent_arrow_forward_24_regular, GlobalUserPreferences.forwardReportDefault, i->{
+			GlobalUserPreferences.forwardReportDefault=i.checked;
+			GlobalUserPreferences.save();
+		}));
 		items.add(new SwitchItem(R.string.sk_settings_allow_remote_loading, R.drawable.ic_fluent_communication_24_regular, GlobalUserPreferences.allowRemoteLoading, i->{
 			GlobalUserPreferences.allowRemoteLoading=i.checked;
 			GlobalUserPreferences.save();
@@ -270,7 +284,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 		}));
-		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_show_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
+		items.add(showNewPostsItem = new SwitchItem(R.string.sk_settings_see_new_posts_button, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.showNewPostsButton, i->{
 			GlobalUserPreferences.showNewPostsButton=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -311,11 +325,11 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			needAppRestart=true;
 		}));
 		compactReblogReplyLineItem.enabled=GlobalUserPreferences.replyLineAboveHeader;
-//		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
-////			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
-//			GlobalUserPreferences.save();
-//			needAppRestart=true;
-//		}));
+		items.add(new SwitchItem(R.string.sk_settings_translate_only_opened, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
+			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
+			GlobalUserPreferences.save();
+			needAppRestart=true;
+		}));
 		boolean translationAvailable = instance
 				.map(i -> i.v2 != null && i.v2.configuration.translation != null && i.v2.configuration.translation.enabled)
 				.orElse(false);
@@ -541,6 +555,22 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		return true;
 	}

+	private boolean onPrefixRepliesClick(MenuItem item, Button btn) {
+		int id = item.getItemId();
+		PrefixRepliesMode mode = PrefixRepliesMode.NEVER;
+		if (id == R.id.prefix_replies_always) mode = PrefixRepliesMode.ALWAYS;
+		else if (id == R.id.prefix_replies_to_others) mode = PrefixRepliesMode.TO_OTHERS;
+		GlobalUserPreferences.prefixReplies = mode;
+
+		btn.setText(switch(GlobalUserPreferences.prefixReplies){
+			case TO_OTHERS -> R.string.sk_settings_prefix_replies_to_others;
+			case ALWAYS -> R.string.sk_settings_prefix_replies_always;
+			default -> R.string.sk_settings_prefix_replies_never;
+		});
+
+		return true;
+	}
+
 	private boolean onAutoRevealSpoilerClick(MenuItem item, Button btn) {
 		int id = item.getItemId();

@@ -557,12 +587,12 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide

 	private void onAutoRevealSpoilerChanged(Button b) {
 		if (GlobalUserPreferences.alwaysExpandContentWarnings) {
-			b.setText(R.string.sk_settings_auto_reveal_always);
+			b.setText(R.string.sk_settings_auto_reveal_anyone);
 		} else {
 			b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){
-				case THREADS -> R.string.sk_settings_auto_reveal_threads;
-				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_discussions;
-				default -> R.string.sk_settings_auto_reveal_never;
+				case THREADS -> R.string.sk_settings_auto_reveal_author;
+				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_anyone;
+				default -> R.string.sk_settings_auto_reveal_nobody;
 			});
 			if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) {
 				alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings;
@@ -767,7 +797,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
 		checkForUpdateItem.loading = ev.state == GithubSelfUpdater.UpdateState.CHECKING;
 		if (list.findViewHolderForAdapterPosition(items.indexOf(checkForUpdateItem)) instanceof TextViewHolder tvh) tvh.rebind();
-
+		
 		UpdateItem updateItem = null;
 		if(items.get(0) instanceof UpdateItem item0) {
 			updateItem = item0;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
@@ -8,7 +8,6 @@ import com.squareup.otto.Subscribe;

 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -20,7 +19,6 @@ import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;

 import java.util.ArrayList;
@@ -31,7 +29,7 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;

-public abstract class StatusListFragment extends BaseStatusListFragment<Status> implements DomainDisplay{
+public abstract class StatusListFragment extends BaseStatusListFragment<Status> {
 	protected EventListener eventListener=new EventListener();

 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
@@ -67,18 +65,6 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 		Status status=getContentStatusByID(id);
 		if(status==null)
 			return;
-		if(status.isRemote){
-			UiUtils.lookupStatus(getContext(), status, accountID, null, status1 -> {
-				status1.filterRevealed = true;
-				Bundle args=new Bundle();
-				args.putString("account", accountID);
-				args.putParcelable("status", Parcels.wrap(status1));
-				if(status1.inReplyToAccountId!=null && knownAccounts.containsKey(status1.inReplyToAccountId))
-					args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status1.inReplyToAccountId)));
-				Nav.go(getActivity(), ThreadFragment.class, args);
-			});
-			return;
-		}
 		status.filterRevealed = true;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
@@ -178,13 +164,29 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>
 	protected void removeStatus(Status status){
 		data.remove(status);
 		preloadedData.remove(status);
-		int index=-1;
+		int index=-1, ancestorFirstIndex = -1, ancestorLastIndex = -1;
 		for(int i=0;i<displayItems.size();i++){
-			if(status.id.equals(displayItems.get(i).parentID)){
+			StatusDisplayItem item = displayItems.get(i);
+			if(status.id.equals(item.parentID)){
 				index=i;
 				break;
 			}
+			if (item.parentID.equals(status.inReplyToId)) {
+				if (ancestorFirstIndex == -1) ancestorFirstIndex = i;
+				ancestorLastIndex = i;
+			}
 		}
+
+		// did we find an ancestor that is also the status' neighbor?
+		if (ancestorFirstIndex >= 0 && ancestorLastIndex == index - 1) {
+			for (int i = ancestorFirstIndex; i <= ancestorLastIndex; i++) {
+				StatusDisplayItem item = displayItems.get(i);
+				// update ancestor to have no descendant anymore
+				if (item.parentID.equals(status.inReplyToId)) item.hasDescendantNeighbor = false;
+			}
+			adapter.notifyItemRangeChanged(ancestorFirstIndex, ancestorLastIndex - ancestorFirstIndex + 1);
+		}
+
 		if(index==-1)
 			return;
 		int lastIndex;
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
@@ -52,7 +52,8 @@ import me.grishka.appkit.utils.V;
 public class ThreadFragment extends StatusListFragment implements ProvidesAssistContent {
 	protected Status mainStatus, updatedStatus;
 	private final HashMap<String, NeighborAncestryInfo> ancestryMap = new HashMap<>();
-	protected boolean contextInitiallyRendered;
+	private StatusContext result;
+	protected boolean contextInitiallyRendered, transitionFinished;

 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -105,13 +106,20 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 					footer.hideCounts=true;
 			}
 		}
+    
 		for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
 		if(s.id.equals(mainStatus.id)) {
-			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, getAccountID(), s.getContentStatus()));
+			items.add(new ExtendedFooterStatusDisplayItem(s.id, this, accountID, s.getContentStatus()));
 		}
 		return items;
 	}

+	@Override
+	public void onTransitionFinished() {
+		transitionFinished = true;
+		maybeApplyContext();
+	}
+
 	@Override
 	protected void doLoadData(int offset, int count){
 		if (refreshing) loadMainStatus();
@@ -119,72 +127,8 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(StatusContext result){
-						if (getContext() == null) return;
-						Map<String, Status> oldData = null;
-						if(refreshing){
-							oldData = new HashMap<>(data.size());
-							for (Status s : data) oldData.put(s.id, s);
-							data.clear();
-							ancestryMap.clear();
-							displayItems.clear();
-							data.add(mainStatus);
-							onAppendItems(Collections.singletonList(mainStatus));
-						}
-
-						// TODO: figure out how this code works
-						if(isInstanceAkkoma()) sortStatusContext(mainStatus, result);
-
-						result.descendants=filterStatuses(result.descendants);
-						result.ancestors=filterStatuses(result.ancestors);
-
-						for (NeighborAncestryInfo i : mapNeighborhoodAncestry(mainStatus, result)) {
-							ancestryMap.put(i.status.id, i);
-						}
-
-						if(footerProgress!=null)
-							footerProgress.setVisibility(View.GONE);
-						data.addAll(result.descendants);
-						int prevCount=displayItems.size();
-						onAppendItems(result.descendants);
-						int count=displayItems.size();
-						if(!refreshing)
-							adapter.notifyItemRangeInserted(prevCount, count-prevCount);
-						int prependedCount = prependItems(result.ancestors, !refreshing);
-						if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
-							displayItems.remove(prependedCount);
-							adapter.notifyItemRemoved(prependedCount);
-							count--;
-						}
-
-						for (Status s : data) {
-							Status oldStatus = oldData == null ? null : oldData.get(s.id);
-							// restore previous spoiler/filter revealed states when refreshing
-							if (oldStatus != null) {
-								s.spoilerRevealed = oldStatus.spoilerRevealed;
-								s.filterRevealed = oldStatus.filterRevealed;
-							} else if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
-									s.spoilerText != null &&
-									s.spoilerText.equals(mainStatus.spoilerText) &&
-									mainStatus.spoilerRevealed) {
-								if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
-									s.spoilerRevealed = true;
-								}
-							}
-						}
-
-						dataLoaded();
-						if(refreshing){
-							refreshDone();
-							adapter.notifyDataSetChanged();
-						}
-						list.scrollToPosition(displayItems.size()-count);
-
-						// no animation is going to happen, so proceeding to apply right now
-						if (data.size() == 1) {
-							contextInitiallyRendered = true;
-							// for the case that the main status has already finished loading
-							maybeApplyMainStatus();
-						}
+						ThreadFragment.this.result = result;
+						maybeApplyContext();
 					}
 				})
 				.exec(accountID);
@@ -207,6 +151,77 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 				}).exec(accountID);
 	}

+	protected void maybeApplyContext() {
+		if (!transitionFinished || result == null || getContext() == null) return;
+		Map<String, Status> oldData = null;
+		if(refreshing){
+			oldData = new HashMap<>(data.size());
+			for (Status s : data) oldData.put(s.id, s);
+			data.clear();
+			ancestryMap.clear();
+			displayItems.clear();
+			data.add(mainStatus);
+			onAppendItems(Collections.singletonList(mainStatus));
+		}
+
+		// TODO: figure out how this code works
+		if (isInstanceAkkoma()) sortStatusContext(mainStatus, result);
+
+		result.descendants=filterStatuses(result.descendants);
+		result.ancestors=filterStatuses(result.ancestors);
+
+		for (NeighborAncestryInfo i : mapNeighborhoodAncestry(mainStatus, result)) {
+			ancestryMap.put(i.status.id, i);
+		}
+
+		if(footerProgress!=null)
+			footerProgress.setVisibility(View.GONE);
+		data.addAll(result.descendants);
+		int prevCount=displayItems.size();
+		onAppendItems(result.descendants);
+		int count=displayItems.size();
+		if(!refreshing)
+			adapter.notifyItemRangeInserted(prevCount, count-prevCount);
+		int prependedCount = prependItems(result.ancestors, !refreshing);
+		if (prependedCount > 0 && displayItems.get(prependedCount) instanceof ReblogOrReplyLineStatusDisplayItem) {
+			displayItems.remove(prependedCount);
+			adapter.notifyItemRemoved(prependedCount);
+			count--;
+		}
+
+		for (Status s : data) {
+			Status oldStatus = oldData == null ? null : oldData.get(s.id);
+			// restore previous spoiler/filter revealed states when refreshing
+			if (oldStatus != null) {
+				s.spoilerRevealed = oldStatus.spoilerRevealed;
+				s.filterRevealed = oldStatus.filterRevealed;
+			} else if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
+					s.spoilerText != null &&
+					s.spoilerText.equals(mainStatus.spoilerText) &&
+					mainStatus.spoilerRevealed) {
+				if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
+					s.spoilerRevealed = true;
+				}
+			}
+		}
+
+		dataLoaded();
+		if(refreshing){
+			refreshDone();
+			adapter.notifyDataSetChanged();
+		}
+		list.scrollToPosition(displayItems.size()-count);
+
+		// no animation is going to happen, so proceeding to apply right now
+		if (data.size() == 1) {
+			contextInitiallyRendered = true;
+			// for the case that the main status has already finished loading
+			maybeApplyMainStatus();
+		}
+
+		result = null;
+	}
+
 	protected Object maybeApplyMainStatus() {
 		if (updatedStatus == null || !contextInitiallyRendered) return null;

@@ -337,10 +352,60 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
 	}

 	protected void onStatusCreated(StatusCreatedEvent ev){
-		if(ev.status.inReplyToId!=null && getStatusByID(ev.status.inReplyToId)!=null){
-			data.add(ev.status);
-			onAppendItems(Collections.singletonList(ev.status));
+		if (ev.status.inReplyToId == null) return;
+		Status repliedToStatus = getStatusByID(ev.status.inReplyToId);
+		if (repliedToStatus == null) return;
+		NeighborAncestryInfo ancestry = ancestryMap.get(repliedToStatus.id);
+
+		int nextDisplayItemsIndex = -1, indexOfPreviousDisplayItem = -1;
+
+		for (int i = 0; i < displayItems.size(); i++) {
+			StatusDisplayItem item = displayItems.get(i);
+			if (repliedToStatus.id.equals(item.parentID)) {
+				// saving the replied-to status' display items index to eventually reach the last one
+				indexOfPreviousDisplayItem = i;
+				item.hasDescendantNeighbor = true;
+			} else if (indexOfPreviousDisplayItem >= 0 && nextDisplayItemsIndex == -1) {
+				// previous display item was the replied-to status' display items
+				nextDisplayItemsIndex = i;
+				// nothing left to do if there's no other reply to that status
+				if (ancestry.descendantNeighbor == null) break;
+			}
+			if (ancestry.descendantNeighbor != null && item.parentID.equals(ancestry.descendantNeighbor.id)) {
+				// existing reply shall no longer have the replied-to status as its neighbor
+				item.hasAncestoringNeighbor = false;
+			}
 		}
+
+		// fall back to inserting the item at the end
+		nextDisplayItemsIndex = nextDisplayItemsIndex >= 0 ? nextDisplayItemsIndex : displayItems.size();
+		int nextDataIndex = data.indexOf(repliedToStatus) + 1;
+
+		// if replied-to status already has another reply...
+		if (ancestry.descendantNeighbor != null) {
+			// update the reply's ancestry to remove its ancestoring neighbor (as we did above)
+			ancestryMap.get(ancestry.descendantNeighbor.id).ancestoringNeighbor = null;
+			// make sure the existing reply has a reply line
+			if (nextDataIndex < data.size() &&
+					!(displayItems.get(nextDisplayItemsIndex) instanceof ReblogOrReplyLineStatusDisplayItem)) {
+				Status nextStatus = data.get(nextDataIndex);
+				if (!nextStatus.account.id.equals(repliedToStatus.account.id)) {
+					// create reply line manually since we're not building that status' items
+					displayItems.add(nextDisplayItemsIndex, StatusDisplayItem.buildReplyLine(
+							this, nextStatus, accountID, nextStatus, repliedToStatus.account, false
+					));
+				}
+			}
+		}
+
+		// update replied-to status' ancestry
+		ancestry.descendantNeighbor = ev.status;
+
+		// add ancestry for newly created status before building its display items
+		ancestryMap.put(ev.status.id, new NeighborAncestryInfo(ev.status, null, repliedToStatus));
+		displayItems.addAll(nextDisplayItemsIndex, buildDisplayItems(ev.status));
+		data.add(nextDataIndex, ev.status);
+		adapter.notifyDataSetChanged();
 	}

 	@Override
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -79,8 +79,6 @@ public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccou

 	@Override
 	protected void onDataLoaded(List<AccountItem> d, boolean more){
-		if (getActivity() == null)
-			return;
 		if(refreshing){
 			relationships.clear();
 		}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
@@ -43,7 +43,6 @@ 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;
@@ -224,11 +223,11 @@ public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsF
 			actionProgress=findViewById(R.id.action_progress);
 			actionWrap=findViewById(R.id.action_btn_wrap);

-			itemView.setOutlineProvider(OutlineProviders.roundedRect(12));
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(6));
 			itemView.setClipToOutline(true);
 			avatar.setOutlineProvider(OutlineProviders.roundedRect(12));
 			avatar.setClipToOutline(true);
-			cover.setOutlineProvider(OutlineProviders.roundedRect(12));
+			cover.setOutlineProvider(OutlineProviders.roundedRect(3));
 			cover.setClipToOutline(true);
 			actionButton.setOnClickListener(this::onActionButtonClick);
 		}
@@ -244,6 +243,10 @@ public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsF
 			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)));
+			followersCount.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followersLabel.setVisibility(item.account.followersCount < 0 ? View.GONE : View.VISIBLE);
+			followingCount.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
+			followingLabel.setVisibility(item.account.followingCount < 0 ? View.GONE : View.VISIBLE);
 			relationship=relationships.get(item.account.id);
 			if(relationship==null){
 				actionWrap.setVisibility(View.GONE);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -2,7 +2,6 @@ package org.joinmastodon.android.fragments.discover;

 import android.app.Fragment;
 import android.app.assist.AssistContent;
-import android.app.FragmentTransaction;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
@@ -19,8 +18,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;

-import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.DomainManager;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.HomeFragment;
@@ -333,28 +330,27 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				: getFragmentForPage(pager.getCurrentItem()), assistContent);
 	}

-	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
+	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
-		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-			FrameLayout view = tabViews[viewType];
-			((ViewGroup) view.getParent()).removeView(view);
+		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			FrameLayout view=tabViews[viewType];
+			((ViewGroup)view.getParent()).removeView(view);
 			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}

 		@Override
-		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position) {
-		}
+		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){}

 		@Override
-		public int getItemCount() {
+		public int getItemCount(){
 			return tabViews.length;
 		}

 		@Override
-		public int getItemViewType(int position) {
+		public int getItemViewType(int position){
 			return position;
 		}
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
@@ -19,11 +19,6 @@ import me.grishka.appkit.api.SimpleCallback;
 public class DiscoverPostsFragment extends StatusListFragment {
 	private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS);

-	@Override
-	public String getDomain() {
-		return super.getDomain() + "/explore/posts";
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetTrendingStatuses(offset, count)
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
@@ -39,7 +39,6 @@ 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;

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
@@ -141,8 +141,8 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
 		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
 		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
-		((TextView) headerView.findViewById(R.id.username)).setText(R.string.mo_app_username);
-		((TextView) headerView.findViewById(R.id.name)).setText(R.string.mo_app_name);
+		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
+		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
 		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
@@ -106,13 +106,13 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 				.execNoAuth("");
 	}

-//	@Override
-//	protected void onUpdateToolbar(){
-//		super.onUpdateToolbar();
-//		Toolbar toolbar=getToolbar();
-//		toolbar.setElevation(0);
-//		toolbar.setBackground(null);
-//	}
+	@Override
+	protected void onUpdateToolbar(){
+		super.onUpdateToolbar();
+		Toolbar toolbar=getToolbar();
+		toolbar.setElevation(0);
+		toolbar.setBackground(null);
+	}

 	@Override
 	protected RecyclerView.Adapter getAdapter(){
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@@ -79,7 +79,7 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 56, 0, DividerItemDecoration.NOT_FIRST));

 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
@@ -93,8 +93,8 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));
 	}

@@ -127,7 +127,7 @@ public class InstanceRulesFragment extends ToolbarFragment implements ProvidesAs
 		if(Build.VERSION.SDK_INT>=27){
 			int inset=insets.getSystemWindowInsetBottom();
 			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
-			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(),  insets.getSystemWindowInsetBottom()));
+			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
 		}else{
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
@@ -77,13 +77,12 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		buttonBar=view.findViewById(R.id.button_bar);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		getToolbar().setBackgroundResource(UiUtils.getThemeColorRes(getToolbarContext(), R.attr.colorBackgroundLight));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
-//		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		list.addOnScrollListener(onScrollListener=new ElevationOnScrollListener((FragmentRootLinearLayout) view, buttonBar, getToolbar()));

 		view.findViewById(R.id.btn_next).setOnClickListener(UiUtils.rateLimitedClickListener(this::onFollowAllClick));
-//		view.findViewById(R.id.btn_skip).setOnClickListener(UiUtils.rateLimitedClickListener(v->proceed()));
+		view.findViewById(R.id.btn_skip).setOnClickListener(UiUtils.rateLimitedClickListener(v->proceed()));
 	}

 	@Override
@@ -215,9 +214,9 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
 	}

 	private void proceed(){
-//		Bundle args=new Bundle();
-//		args.putString("account", accountID);
-//		Nav.go(getActivity(), OnboardingProfileSetupFragment.class, args);
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), OnboardingProfileSetupFragment.class, args);
 	}

 	private class SuggestionsAdapter extends UsableRecyclerView.Adapter<SuggestionViewHolder> implements ImageLoaderRecyclerAdapter{
@@ -267,7 +266,7 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
 		private Relationship relationship;

 		public SuggestionViewHolder(){
-			super(getActivity(), R.layout.item_user_row, list);
+			super(getActivity(), R.layout.item_user_row_m3, list);
 			name=findViewById(R.id.name);
 			username=findViewById(R.id.username);
 			bio=findViewById(R.id.bio);
@@ -297,7 +296,7 @@ public class OnboardingFollowSuggestionsFragment extends RecyclerFragment<Parsed
 				actionWrap.setVisibility(View.GONE);
 			}else{
 				actionWrap.setVisibility(View.VISIBLE);
-				UiUtils.setRelationshipToActionButton(relationship, actionButton);
+				UiUtils.setRelationshipToActionButtonM3(relationship, actionButton);
 			}
 		}

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 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.reports.SendReport;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
@@ -39,7 +40,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 	private TextView forwardReportText;
 	private Switch forwardReportSwitch;
 	private EditText commentEdit;
-	private boolean forwardReport;
+	private boolean forwardReport = GlobalUserPreferences.forwardReportDefault;

 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -89,7 +90,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{
 		} else {
 			forwardReportItem.setOnClickListener(this::onForwardReportClick);
 			forwardReportText.setText(getActivity().getString(R.string.sk_forward_report_to, domain));
-			forwardReportSwitch.setChecked(forwardReport = true);
+			forwardReportSwitch.setChecked(forwardReport);
 		}
 		return view;
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AboutFragment.java
@@ -1,137 +0,0 @@
-package org.joinmastodon.android.fragments.settings;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.LruCache;
-import android.view.View;
-import android.widget.Toast;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIController;
-import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
-import org.joinmastodon.android.api.session.AccountActivationInfo;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.imageloader.ImageCache;
-
-public class AboutFragment extends SettingsBaseFragment{
-
-    private TextItem clearImageCacheItem;
-    private ImageCache imageCache;
-
-    private TextItem checkForUpdateItem;
-
-    @Override
-    public void addItems(ArrayList<Item> items) {
-
-        imageCache = ImageCache.getInstance(getActivity());
-
-        items.add(new TextItem(R.string.mo_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
-
-        if (GithubSelfUpdater.needSelfUpdating()) {
-            checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
-            items.add(checkForUpdateItem);
-            items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
-                GlobalUserPreferences.enablePreReleases=i.checked;
-                GlobalUserPreferences.save();
-            }));
-        }
-
-        LruCache<?, ?> cache = imageCache == null ? null : imageCache.getLruCache();
-        clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), cache != null ? cache.size() : 0, true), this::clearImageCache, 0);
-        items.add(clearImageCacheItem);
-        items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
-            GlobalUserPreferences.recentLanguages.remove(accountID);
-            GlobalUserPreferences.save();
-        })));
-
-        items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> {
-            GlobalUserPreferences.recentEmojis.clear();
-            GlobalUserPreferences.save();
-        }));
-
-        if(BuildConfig.DEBUG){
-            items.add(new RedHeaderItem("Debug options"));
-
-            items.add(new TextItem("Test E-Mail confirmation flow", ()->{
-                AccountSession sess=AccountSessionManager.getInstance().getAccount(accountID);
-                sess.activated=false;
-                sess.activationInfo=new AccountActivationInfo("test@email", System.currentTimeMillis());
-                Bundle args=new Bundle();
-                args.putString("account", accountID);
-                args.putBoolean("debug", true);
-                Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
-            }));
-
-            items.add(new TextItem("Copy preferences", ()->{
-                StringBuilder prefBuilder = new StringBuilder();
-                GlobalUserPreferences.load();
-                GlobalUserPreferences.getPrefs().getAll().forEach((key, value) -> prefBuilder.append(key).append(": ").append(value).append('\n'));
-                UiUtils.copyText(view, prefBuilder.toString());
-            }));
-
-            items.add(new TextItem("Reset preferences", ()->{
-                GlobalUserPreferences.load();
-                GlobalUserPreferences.getPrefs().edit().clear().commit();
-                UiUtils.restartApp();
-            }, R.drawable.ic_fluent_warning_24_regular));
-
-            items.add(new TextItem("Open App Info", () ->
-                            getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                    .setData(Uri.fromParts("package", getContext().getPackageName(), null))),
-                            R.drawable.ic_fluent_open_24_regular
-                    )
-            );
-
-            items.add(new TextItem("Open developer settings",
-                    ()-> getContext().startActivity(new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)),
-                    R.drawable.ic_fluent_open_24_regular)
-            );
-        }
-
-        String version = getContext().getString(R.string.mo_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
-        items.add(new FooterItem(version, () -> UiUtils.copyText(view, version)));
-    }
-
-    @Subscribe
-    public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-        checkForUpdateItem.loading = ev.state == GithubSelfUpdater.UpdateState.CHECKING;
-        if (list.findViewHolderForAdapterPosition(items.indexOf(checkForUpdateItem)) instanceof TextViewHolder tvh) tvh.rebind();
-    }
-
-    private void clearImageCache(){
-        MastodonAPIController.runInBackground(()->{
-            Activity activity=getActivity();
-            imageCache.clear();
-            Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
-        });
-        if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
-            clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
-            tvh.rebind();
-        }
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AccountFragment.java
@@ -1,181 +0,0 @@
-package org.joinmastodon.android.fragments.settings;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Button;
-import android.widget.PopupMenu;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.MainActivity;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.model.ContentType;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-
-public class AccountFragment extends SettingsBaseFragment{
-
-
-    private SwitchItem glitchModeItem;
-    private ButtonItem defaultContentTypeButtonItem;
-    private Menu contentTypeMenu;
-    @Override
-    public void addItems(ArrayList<Item> items) {
-        items.add(new HeaderItem(R.string.settings_account));
-        items.add(new TextItem(R.string.sk_settings_profile, ()-> UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/profile"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.sk_settings_posting, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/preferences/other"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.sk_settings_filters, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/filters"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
-
-        items.add(new HeaderItem(getInstanceName()));
-        items.add(new TextItem(R.string.sk_settings_rules, ()->{
-            Bundle args=new Bundle();
-            args.putParcelable("instance", Parcels.wrap(getInstance()));
-            Nav.go(getActivity(), InstanceRulesFragment.class, args);
-        }, R.drawable.ic_fluent_task_list_ltr_24_regular));
-        items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
-        items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
-        items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
-        if (!TextUtils.isEmpty(getInstance().version)) items.add(new SmallTextItem(getString(R.string.sk_settings_server_version, getInstance().version)));
-
-        items.add(new HeaderItem(R.string.sk_instance_features));
-        items.add(new SwitchItem(R.string.sk_settings_content_types, R.string.sk_settings_content_types_explanation, 0, GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID), (i)->{
-            if (i.checked) {
-                GlobalUserPreferences.accountsWithContentTypesEnabled.add(accountID);
-                if (GlobalUserPreferences.accountsDefaultContentTypes.get(accountID) == null) {
-                    GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, ContentType.PLAIN);
-                }
-            } else {
-                GlobalUserPreferences.accountsWithContentTypesEnabled.remove(accountID);
-                GlobalUserPreferences.accountsDefaultContentTypes.remove(accountID);
-            }
-            if (list.findViewHolderForAdapterPosition(items.indexOf(defaultContentTypeButtonItem))
-                    instanceof ButtonViewHolder bvh) bvh.rebind();
-            GlobalUserPreferences.save();
-        }));
-        items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, R.string.sk_settings_default_content_type_explanation, 0, b->{
-            PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-            popupMenu.inflate(R.menu.compose_content_type);
-            popupMenu.setOnMenuItemClickListener(item -> this.onContentTypeChanged(item, b));
-            b.setOnTouchListener(popupMenu.getDragToOpenListener());
-            b.setOnClickListener(v->popupMenu.show());
-            ContentType contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID);
-            b.setText(getContentTypeString(contentType));
-            contentTypeMenu = popupMenu.getMenu();
-            contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true);
-            ContentType.adaptMenuToInstance(contentTypeMenu, getInstance());
-            contentTypeMenu.findItem(R.id.content_type_null).setVisible(
-                    !GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID));
-        }));
-        items.add(new SwitchItem(R.string.sk_settings_support_local_only, R.string.sk_settings_local_only_explanation, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
-            glitchModeItem.enabled = i.checked;
-            if (i.checked) {
-                GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
-                if (getInstance().pleroma == null) GlobalUserPreferences.accountsInGlitchMode.add(accountID);
-            } else {
-                GlobalUserPreferences.accountsWithLocalOnlySupport.remove(accountID);
-                GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
-            }
-            glitchModeItem.checked = GlobalUserPreferences.accountsInGlitchMode.contains(accountID);
-            if (list.findViewHolderForAdapterPosition(items.indexOf(glitchModeItem)) instanceof SwitchViewHolder svh) svh.rebind();
-            GlobalUserPreferences.save();
-        }));
-        items.add(glitchModeItem = new SwitchItem(R.string.sk_settings_glitch_instance, R.string.sk_settings_glitch_mode_explanation, 0, GlobalUserPreferences.accountsInGlitchMode.contains(accountID), i->{
-            if (i.checked) {
-                GlobalUserPreferences.accountsInGlitchMode.add(accountID);
-            } else {
-                GlobalUserPreferences.accountsInGlitchMode.remove(accountID);
-            }
-            GlobalUserPreferences.save();
-        }));
-        glitchModeItem.enabled = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID);
-
-
-        boolean translationAvailable = getInstance().v2 != null && getInstance().v2.configuration.translation != null && getInstance().v2.configuration.translation.enabled;
-        items.add(new SmallTextItem(getString(translationAvailable ?
-                R.string.sk_settings_translation_availability_note_available :
-                R.string.sk_settings_translation_availability_note_unavailable, getInstance().title)));
-
-    }
-
-    private void confirmLogOut(){
-        new M3AlertDialogBuilder(getActivity())
-                .setTitle(R.string.log_out)
-                .setMessage(R.string.confirm_log_out)
-                .setPositiveButton(R.string.log_out, (dialog, which) -> logOut())
-                .setNegativeButton(R.string.cancel, null)
-                .show();
-    }
-
-    private void logOut(){
-        AccountSession session= AccountSessionManager.getInstance().getAccount(accountID);
-        new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken)
-                .setCallback(new Callback<>(){
-                    @Override
-                    public void onSuccess(Object result){
-                        onLoggedOut();
-                    }
-
-                    @Override
-                    public void onError(ErrorResponse error){
-                        onLoggedOut();
-                    }
-                })
-                .wrapProgress(getActivity(), R.string.loading, false)
-                .exec(accountID);
-    }
-
-    private void onLoggedOut(){
-        if (getActivity() == null) return;
-        AccountSessionManager.getInstance().removeAccount(accountID);
-        getActivity().finish();
-        Intent intent=new Intent(getActivity(), MainActivity.class);
-        startActivity(intent);
-    }
-
-    private @StringRes int getContentTypeString(@Nullable ContentType contentType) {
-        if (contentType == null) return R.string.sk_content_type_unspecified;
-        return switch (contentType) {
-            case PLAIN -> R.string.sk_content_type_plain;
-            case HTML -> R.string.sk_content_type_html;
-            case MARKDOWN -> R.string.sk_content_type_markdown;
-            case BBCODE -> R.string.sk_content_type_bbcode;
-            case MISSKEY_MARKDOWN -> R.string.sk_content_type_mfm;
-        };
-    }
-
-    private boolean onContentTypeChanged(MenuItem item, Button btn){
-        int id = item.getItemId();
-        ContentType contentType = switch (id) {
-            case R.id.content_type_plain -> ContentType.PLAIN;
-            case R.id.content_type_html -> ContentType.HTML;
-            case R.id.content_type_markdown -> ContentType.MARKDOWN;
-            case R.id.content_type_bbcode -> ContentType.BBCODE;
-            case R.id.content_type_misskey_markdown -> ContentType.MISSKEY_MARKDOWN;
-            default -> null;
-        };
-        GlobalUserPreferences.accountsDefaultContentTypes.put(accountID, contentType);
-        GlobalUserPreferences.save();
-        btn.setText(getContentTypeString(contentType));
-        item.setChecked(true);
-        return true;
-    }
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/AppearanceFragment.java
@@ -1,73 +0,0 @@
-package org.joinmastodon.android.fragments.settings;
-
-import android.os.Build;
-import android.view.Gravity;
-import android.view.MenuItem;
-import android.widget.PopupMenu;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-
-import java.util.ArrayList;
-
-public class AppearanceFragment extends SettingsBaseFragment {
-
-    @Override
-    public void addItems(ArrayList<Item> items) {
-        themeItem = new ThemeItem();
-        items.add(themeItem);
-        items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b -> {
-            PopupMenu popupMenu = new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-            popupMenu.inflate(R.menu.color_palettes);
-            popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-            popupMenu.setOnMenuItemClickListener(this::onColorPreferenceClick);
-            b.setOnTouchListener(popupMenu.getDragToOpenListener());
-            b.setOnClickListener(v -> popupMenu.show());
-            b.setText(switch (GlobalUserPreferences.color) {
-                case MATERIAL3 -> R.string.sk_color_palette_material3;
-                case PINK -> R.string.sk_color_palette_pink;
-                case PURPLE -> R.string.sk_color_palette_purple;
-                case GREEN -> R.string.sk_color_palette_green;
-                case BLUE -> R.string.sk_color_palette_blue;
-                case BROWN -> R.string.sk_color_palette_brown;
-                case RED -> R.string.sk_color_palette_red;
-                case YELLOW -> R.string.sk_color_palette_yellow;
-                case NORD -> R.string.mo_color_palette_nord;
-            });
-        }));
-        items.add(new SwitchItem(R.string.theme_true_black, R.string.mo_setting_true_black_summary, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
-        items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i -> {
-            GlobalUserPreferences.disableMarquee = i.checked;
-            GlobalUserPreferences.save();
-            needAppRestart = true;
-        }));
-        items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.string.mo_setting_reduced_motion_summary, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i -> {
-            GlobalUserPreferences.reduceMotion = i.checked;
-            GlobalUserPreferences.save();
-            needAppRestart = true;
-        }));
-    }
-
-    private boolean onColorPreferenceClick(MenuItem item) {
-            GlobalUserPreferences.ColorPreference pref = null;
-            int id = item.getItemId();
-
-            if (id == R.id.m3_color) pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
-            else if (id == R.id.pink_color) pref = GlobalUserPreferences.ColorPreference.PINK;
-            else if (id == R.id.purple_color) pref = GlobalUserPreferences.ColorPreference.PURPLE;
-            else if (id == R.id.green_color) pref = GlobalUserPreferences.ColorPreference.GREEN;
-            else if (id == R.id.blue_color) pref = GlobalUserPreferences.ColorPreference.BLUE;
-            else if (id == R.id.brown_color) pref = GlobalUserPreferences.ColorPreference.BROWN;
-            else if (id == R.id.red_color) pref = GlobalUserPreferences.ColorPreference.RED;
-            else if (id == R.id.yellow_color) pref = GlobalUserPreferences.ColorPreference.YELLOW;
-            else if (id == R.id.nord_color) pref = GlobalUserPreferences.ColorPreference.NORD;
-
-            if (pref == null) return false;
-
-            GlobalUserPreferences.color=pref;
-            GlobalUserPreferences.save();
-            restartActivityToApplyNewTheme();
-            return true;
-    }
-}
-
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java
@@ -1,160 +0,0 @@
-package org.joinmastodon.android.fragments.settings;
-
-import android.view.Gravity;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.PopupMenu;
-import android.widget.Toast;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.SettingsFragment;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-
-import java.util.ArrayList;
-
-import me.grishka.appkit.utils.V;
-
-public class BehaviourFragment extends SettingsBaseFragment{
-
-    SwitchItem alwaysRevealSpoilersItem;
-    ButtonItem autoRevealSpoilersItem;
-    @Override
-    public void addItems(ArrayList<Item> items) {
-        items.add(new HeaderItem(R.string.settings_behavior));
-        items.add(new SwitchItem(R.string.settings_gif, R.string.mo_setting_play_gif_summary, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
-            GlobalUserPreferences.playGifs=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(new SwitchItem(R.string.settings_custom_tabs, R.drawable.ic_fluent_link_24_regular, GlobalUserPreferences.useCustomTabs, i->{
-            GlobalUserPreferences.useCustomTabs=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(new SettingsBaseFragment.SwitchItem(R.string.sk_settings_allow_remote_loading, R.string.sk_settings_allow_remote_loading_explanation,  R.drawable.ic_fluent_communication_24_regular, GlobalUserPreferences.allowRemoteLoading, i->{
-            GlobalUserPreferences.allowRemoteLoading=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(alwaysRevealSpoilersItem = new SettingsBaseFragment.SwitchItem(R.string.sk_settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
-            GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
-            GlobalUserPreferences.save();
-            if (list.findViewHolderForAdapterPosition(items.indexOf(autoRevealSpoilersItem)) instanceof SettingsBaseFragment.ButtonViewHolder bvh) bvh.rebind();
-        }));
-        items.add(autoRevealSpoilersItem = new SettingsBaseFragment.ButtonItem(R.string.sk_settings_auto_reveal_equal_spoilers, R.drawable.ic_fluent_eye_24_regular, b->{
-            PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-            popupMenu.inflate(R.menu.settings_auto_reveal_spoiler);
-            popupMenu.setOnMenuItemClickListener(i -> onAutoRevealSpoilerClick(i, b));
-            b.setOnTouchListener(popupMenu.getDragToOpenListener());
-            b.setOnClickListener(v->popupMenu.show());
-            onAutoRevealSpoilerChanged(b);
-        }));
-
-        items.add(new SwitchItem(R.string.sk_tabs_disable_swipe, R.string.mo_setting_disable_swipe_summary, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{
-            GlobalUserPreferences.disableSwipe=i.checked;
-            GlobalUserPreferences.save();
-            needAppRestart=true;
-        }));
-        items.add(new SwitchItem(R.string.mo_double_tap_to_swipe_between_tabs, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, GlobalUserPreferences.doubleTapToSwipe, i->{
-            GlobalUserPreferences.doubleTapToSwipe=i.checked;
-            GlobalUserPreferences.save();
-            needAppRestart=true;
-        }));
-        items.add(new SwitchItem(R.string.sk_settings_confirm_before_reblog, R.drawable.ic_fluent_checkmark_circle_24_regular, GlobalUserPreferences.confirmBeforeReblog, i->{
-            GlobalUserPreferences.confirmBeforeReblog=i.checked;
-            GlobalUserPreferences.save();
-        }));
-
-        items.add(new HeaderItem(R.string.mo_composer_behavior));
-        items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b-> {
-            updatePublishText(b);
-            b.setOnClickListener(l -> {
-                if(!GlobalUserPreferences.relocatePublishButton) {
-                    FrameLayout inputWrap = new FrameLayout(getContext());
-                    EditText input = new EditText(getContext());
-                    input.setHint(R.string.publish);
-                    input.setText(GlobalUserPreferences.publishButtonText.trim());
-                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                    params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-                    input.setLayoutParams(params);
-                    inputWrap.addView(input);
-                    new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-                            .setPositiveButton(R.string.save, (d, which) -> {
-                                GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-                                GlobalUserPreferences.save();
-                                updatePublishText(b);
-                            })
-                            .setNeutralButton(R.string.clear, (d, which) -> {
-                                GlobalUserPreferences.publishButtonText = "";
-                                GlobalUserPreferences.save();
-                                updatePublishText(b);
-                            })
-                            .setNegativeButton(R.string.cancel, (d, which) -> {
-                            })
-                            .show();
-
-                } else {
-                    Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization,
-                            Toast.LENGTH_LONG).show();
-                }
-            });
-        }));
-        items.add(new SwitchItem(R.string.mo_relocate_publish_button, R.string.mo_setting_relocate_publish_summary, R.drawable.ic_fluent_arrow_autofit_down_24_regular, GlobalUserPreferences.relocatePublishButton, i->{
-            GlobalUserPreferences.relocatePublishButton=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(new SwitchItem(R.string.mo_change_default_reply_visibility_to_unlisted, R.string.mo_setting_default_reply_privacy_summary, R.drawable.ic_fluent_lock_open_24_regular, GlobalUserPreferences.defaultToUnlistedReplies, i->{
-            GlobalUserPreferences.defaultToUnlistedReplies=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(new SwitchItem(R.string.mo_mention_reblogger_automatically, R.drawable.ic_fluent_comment_mention_24_regular, GlobalUserPreferences.mentionRebloggerAutomatically, i -> {
-            GlobalUserPreferences.mentionRebloggerAutomatically=i.checked;
-            GlobalUserPreferences.save();
-        }));
-        items.add(new SwitchItem(R.string.mo_disable_reminder_to_add_alt_text, R.drawable.ic_fluent_image_alt_text_24_regular, GlobalUserPreferences.disableAltTextReminder, i->{
-            GlobalUserPreferences.disableAltTextReminder=i.checked;
-            GlobalUserPreferences.save();
-            needAppRestart=true;
-        }));
-        items.add(new SwitchItem(R.string.sk_settings_prefix_reply_cw_with_re, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.prefixRepliesWithRe, i->{
-            GlobalUserPreferences.prefixRepliesWithRe=i.checked;
-            GlobalUserPreferences.save();
-        }));
-    }
-
-    private boolean onAutoRevealSpoilerClick(MenuItem item, Button btn) {
-        int id = item.getItemId();
-
-        GlobalUserPreferences.AutoRevealMode mode = GlobalUserPreferences.AutoRevealMode.NEVER;
-        if (id == R.id.auto_reveal_threads) mode = GlobalUserPreferences.AutoRevealMode.THREADS;
-        else if (id == R.id.auto_reveal_discussions) mode = GlobalUserPreferences.AutoRevealMode.DISCUSSIONS;
-
-        GlobalUserPreferences.alwaysExpandContentWarnings = false;
-        GlobalUserPreferences.autoRevealEqualSpoilers = mode;
-        GlobalUserPreferences.save();
-        onAutoRevealSpoilerChanged(btn);
-        return true;
-    }
-
-    private void onAutoRevealSpoilerChanged(Button b) {
-        if (GlobalUserPreferences.alwaysExpandContentWarnings) {
-            b.setText(R.string.sk_settings_auto_reveal_always);
-        } else {
-            b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){
-                case THREADS -> R.string.sk_settings_auto_reveal_threads;
-                case DISCUSSIONS -> R.string.sk_settings_auto_reveal_discussions;
-                default -> R.string.sk_settings_auto_reveal_never;
-            });
-            if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) {
-                alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings;
-                if (list.findViewHolderForAdapterPosition(items.indexOf(alwaysRevealSpoilersItem)) instanceof SettingsBaseFragment.SwitchViewHolder svh) svh.rebind();
-            }
-        }
-    }
-
-    private void updatePublishText(Button btn) {
-        if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
-        else btn.setText(GlobalUserPreferences.publishButtonText);
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sk	3d79e87ec8	Merge remote-tracking branch 'upstream/l10n_master'	2023-06-12 20:43:22 +02:00
sk	09ed3c647a	reduce max height for photos	2023-06-12 20:25:12 +02:00
EndermanCo	172515ba0a	Translated using Weblate (Persian) Currently translated at 23.2% (71 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fa/	2023-06-12 17:43:48 +00:00
Andrewblasco	a2f0fc8c87	Translated using Weblate (Spanish) Currently translated at 100.0% (18 of 18 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/	2023-06-12 17:43:48 +00:00
Andrewblasco	888cee4556	Translated using Weblate (Spanish) Currently translated at 100.0% (305 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/	2023-06-12 17:43:48 +00:00
sk	c005e9bf18	apply upstream alt overlay changes	2023-06-12 19:43:13 +02:00
Eugen Rochko	64362968fc	New translations strings.xml (Persian)	2023-06-12 19:10:22 +02:00
sk	320027ca9b	merge upstream photo layout changes	2023-06-12 18:42:07 +02:00
sk	ad2678da7c	Merge remote-tracking branch 'upstream/l10n_master'	2023-06-12 18:22:38 +02:00
sk22	c56c7448d0	Translated using Weblate (German) Currently translated at 100.0% (18 of 18 strings) Translation: Megalodon/metadata Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/	2023-06-12 16:22:10 +00:00
sk	731e67725c	fix errors in strings	2023-06-12 18:22:02 +02:00
sk	8178f81c85	update changelog	2023-06-12 18:08:40 +02:00
sk	6fbf00a132	add newline	2023-06-12 18:07:28 +02:00
sk	968cde9e4c	clean up empty regional locales	2023-06-12 18:03:22 +02:00
sk	f2ab2acef7	Merge remote-tracking branch 'weblate/main'	2023-06-12 17:47:22 +02:00
sk	81d1ecc5f8	update readme, changelog	2023-06-12 17:47:10 +02:00
EndermanCo	513e6439ff	Translated using Weblate (Persian) Currently translated at 22.2% (68 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fa/	2023-06-12 15:35:16 +00:00
Oliebol	1f0108b14e	Translated using Weblate (Dutch) Currently translated at 84.5% (258 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/	2023-06-12 15:35:15 +00:00
Choukajohn	1433d0717e	Translated using Weblate (French) Currently translated at 100.0% (305 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/	2023-06-12 15:35:15 +00:00
sk	be91775f4b	fix pinned posts showing post multiple times	2023-06-12 17:29:00 +02:00
sk	7b2f8d2be3	update readme	2023-06-12 16:40:52 +02:00
sk	54c386ccec	update readme	2023-06-12 16:32:28 +02:00
sk	9d9e98959f	change glitch url	2023-06-12 16:18:45 +02:00
sk	a3cd7224bd	update readme	2023-06-12 16:17:08 +02:00
sk	6cf214f127	fix header disappearing in some cases closes sk22#570	2023-06-12 15:39:38 +02:00
Eugen Rochko	b6976fb519	New translations strings.xml (Persian)	2023-06-12 15:36:23 +02:00
sk	871ada23ab	don't display context until fragment transition finished	2023-06-12 14:33:09 +02:00
Eugen Rochko	040237de2b	New translations strings.xml (Persian)	2023-06-12 14:30:32 +02:00
sk	29b2a25840	no error when opening url that looks like fedi url	2023-06-12 13:33:30 +02:00
sk	bd2f05be67	hide followers/following count if count is -1	2023-06-12 12:13:44 +02:00
sk22	ed075b276f	Translated using Weblate (German) Currently translated at 100.0% (305 of 305 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/	2023-06-11 23:48:58 +00:00
sk	dd25f3380a	add setting to configure default value for "forward report" closes sk22#565	2023-06-12 01:38:44 +02:00
sk22	1a2d1efa29	Added translation using Weblate (Persian)	2023-06-11 23:10:35 +00:00
sk	f3e1fa4b2b	fix announcements loading infinitely closes sk22#569	2023-06-12 01:01:45 +02:00
Eugen Rochko	fc307ff43f	New translations strings.xml (Persian)	2023-06-11 21:52:27 +02:00
Eugen Rochko	04304b3397	New translations strings.xml (Persian)	2023-06-11 20:49:08 +02:00
sk	23f4b63195	Merge remote-tracking branch 'upstream/l10n_master'	2023-06-11 20:04:33 +02:00
sk22	edeae13dda	Translated using Weblate (German) Currently translated at 100.0% (304 of 304 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/	2023-06-11 18:04:03 +00:00
Oliebol	44558534e9	Translated using Weblate (Dutch) Currently translated at 85.0% (256 of 301 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/	2023-06-11 17:49:51 +00:00
Linerly	2b760bb215	Translated using Weblate (Indonesian) Currently translated at 100.0% (301 of 301 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/	2023-06-11 17:49:51 +00:00
sk	44154a987d	setting for "re:" reply CW prefix always or only to others re: sk22#567	2023-06-11 19:46:18 +02:00
Eugen Rochko	7260db6668	New translations full_description.txt (Persian)	2023-06-11 19:41:48 +02:00
Eugen Rochko	1dadc51ddf	New translations strings.xml (Persian)	2023-06-11 19:41:48 +02:00
Eugen Rochko	fe85351869	New translations strings.xml (Persian)	2023-06-11 18:34:16 +02:00
Eugen Rochko	74a83c6ac4	New translations strings.xml (Persian)	2023-06-11 17:37:10 +02:00
sk	acb1369e88	fix "show replies/boosts" filter not applied closes sk22#566	2023-06-11 17:23:54 +02:00
sk	8e0d74f9c2	use appkit V.sp	2023-06-11 17:12:56 +02:00
Eugen Rochko	df77ba61ad	New translations strings.xml (Persian)	2023-06-11 15:12:30 +02:00
Eugen Rochko	ed40f74d59	New translations strings.xml (Persian)	2023-06-11 13:57:15 +02:00
Eugen Rochko	42e26bef68	New translations strings.xml (Persian)	2023-06-11 12:54:18 +02:00
Eugen Rochko	af60adb55f	New translations strings.xml (Indonesian)	2023-06-11 05:16:01 +02:00
sk	b94741feae	boop version	2023-06-10 22:10:24 +02:00
sk	e43d6c35d8	update languages	2023-06-10 22:10:13 +02:00
sk	4a6f9e80b1	Merge remote-tracking branch 'weblate/main'	2023-06-10 22:03:41 +02:00
gallegonovato	ec02680507	Translated using Weblate (Spanish) Currently translated at 99.6% (300 of 301 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/	2023-06-10 20:03:34 +00:00
sk22	5fc569a45a	Translated using Weblate (German) Currently translated at 100.0% (301 of 301 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/	2023-06-10 20:03:34 +00:00
sk	4bc9c5691d	Merge remote-tracking branch 'upstream/l10n_master'	2023-06-10 22:03:19 +02:00
sk	19b68855ac	move permission definition to status privacy	2023-06-10 21:54:47 +02:00
sk	70fdfb612e	fix issue on re-bind	2023-06-10 21:54:18 +02:00
sk	0a32c217d8	Merge branch 'main' into pr/FineFindus/557	2023-06-10 21:47:26 +02:00
Eugen Rochko	5dfa9237ad	New translations short_description.txt (Persian)	2023-06-10 21:44:47 +02:00
sk	573ff75498	update ancestor when deleting post	2023-06-10 21:32:41 +02:00
sk	87c37df370	insert replied directly below status closes sk22#558	2023-06-10 20:57:01 +02:00
sk22	7fb0944e66	Translated using Weblate (German) Currently translated at 100.0% (301 of 301 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/	2023-06-10 16:59:16 +00:00
sk	35c8a3d121	change strings	2023-06-10 18:59:05 +02:00
sk	9e58413d1a	Merge remote-tracking branch 'weblate/main'	2023-06-10 18:54:32 +02:00
sk	90e60aef84	change auto-reveal cw wording closes sk22#562	2023-06-10 18:53:38 +02:00
sk	8547ce05ed	change auto-reveal cw wording closes sk22#562	2023-06-10 18:52:01 +02:00
gicorada	0825faee5c	Translated using Weblate (Italian) Currently translated at 100.0% (297 of 297 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/it/	2023-06-10 16:42:23 +00:00
Linerly	d43a697df7	Translated using Weblate (Indonesian) Currently translated at 100.0% (297 of 297 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/	2023-06-10 16:42:23 +00:00
Choukajohn	3b742c4391	Translated using Weblate (French) Currently translated at 100.0% (297 of 297 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/	2023-06-10 16:42:23 +00:00
ihor_ck	a43a396043	Translated using Weblate (Ukrainian) Currently translated at 100.0% (297 of 297 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/	2023-06-10 16:42:23 +00:00
Choukajohn	bcb4fac553	Translated using Weblate (French) Currently translated at 100.0% (297 of 297 strings) Translation: Megalodon/values Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/	2023-06-10 16:42:23 +00:00
Eugen Rochko	c890195567	New translations strings.xml (Swedish)	2023-06-08 22:57:52 +02:00
Eugen Rochko	b50a327b17	New translations strings.xml (Swedish)	2023-06-08 17:47:06 +02:00
FineFindus	dbe7eb25ff	Merge branch 'main' into feat/hide-non-boostable-boosts	2023-06-08 10:35:12 +02:00
FineFindus	45ecec09f5	feat: hide boost count on non-boostable statuses	2023-06-08 10:33:27 +02:00
FineFindus	9b4556d293	refactor: move boostable check to status	2023-06-08 10:33:27 +02:00