Merge branch 'development_of_the_nord_theme'

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,35 +8,25 @@ assignees: ''
 ---
 
 **Describe the bug**
-
 A clear and concise description of what the bug is.
 
-**To reproduce**
-
+**To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**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.
-> If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
-
 **Screenshots and screen recordings**
-
 If applicable, add screenshots (and screen recordings, if possible) to help explain your problem.
 
 **Version**
-
 Megalodon version: [e.g. v1.1.4+fork.#]
 
-**Crash log**
+**Additional context**
+- 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)) No / Yes (`mastodon#…`)
 
+  > In this case, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead. If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
+
+**Crash log**
 If you know your way around Android development tools, please consider attaching a crash log, if possible.

.github/workflows/validate-gradle-wrapper.yml

@@ -1,11 +0,0 @@
-name: Validate Gradle Wrapper
-
-on: [pull_request, push]
-
-jobs:
-  validation:
-    name: Validation
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1

README.md

@@ -1,25 +1,37 @@
-![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![MoshidonLogo](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Megalodon
+# Moshidon, the material you mastodon client! 
 
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
- 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
+> A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
-&nbsp;
-<a href="#installation"><img height="50" alt="Get it on IzzyOnDroid" src="img/izzy-badge.png"></a>
 
-> A fork of the [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting and an image description viewer.
+[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=download%20apk&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2FLucasGGamerM%2Fmoshidon%2Freleases%2Flatest&style=for-the-badge)](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)
+
+---
 
 
 ## Key features
 
+### **Material you theme support on Android 12+ devices!**
+
+### **Translate button**
+
+**Allows you to translate posts in instances with the translate feature!**
+
+**Screenshots**
+
+![Screenshot_20221209-135457_1](https://user-images.githubusercontent.com/71328265/206753830-cdb8bc65-7732-4a6a-8bcd-bbc4ca311d19.png)
+![Screenshot_20221209-135409_1](https://user-images.githubusercontent.com/71328265/206753831-7af92a48-d7a5-4780-9beb-90acef4e141b.png)
+
+### **Color themes**
+
+**Allows you to change theme within the app. Supports Purple, pink, green, blue, orange and yellow!**
+
 ### **Unlisted posting**
 
-**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Community”, “Federated” and “Posts”).**
+**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
 
-When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reblogged/replied to your post.
+When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
   
 The Mastodon documentation has some more information about [Unlisted posting](https://docs.joinmastodon.org/user/posting/#unlisted) and [Public timelines](https://docs.joinmastodon.org/user/network/#timelines).
 
@@ -31,12 +43,6 @@ Despite being one of the main features of federated social media, the Federated
   
 That’s one of the reasons why choosing a small, **well-moderated instance is important**. Instance admins and moderators should always make sure to ban abusive users and stop federating with instances who platform them. On well-moderated instances, the Federated timeline can be a welcoming place to meet new people!
 
-### **Draft and schedule posts**
-
-**Allows for preparing a post and scheduling it to send it automatically at a specific time.**
-
-You can create drafts, edit them, send them manually later or set a scheduled date. Drafts are technically saved as scheduled posts, so you can view and edit them from other apps that support scheduled posts. Scheduled posts are handled by your home instance, so they'll work even if you uninstall Megalodon.
-
 ### **Image description viewer**
 
 **Allows you to quickly check whether an image or video has an alternative text attached to it.**
@@ -49,71 +55,29 @@ This is important to **ensure the content you’re sharing is as accessible as p
 
 On the Fediverse, it’s quite common for people to pin posts they want others to read before following them. You can pin/unpin posts yourself by clicking the `⋯` button in the top right corner of your posts.
 
+### **Bookmarks**
+
+**They allow for quickly saving posts and viewing them through the Bookmarks button on the top right of your profile.**
+
+To bookmark a post, press the button between the Favorite and Share buttons on the bottom of the post. Bookmarks are saved privately, so the post authors won’t know you saved their post – the list of bookmarked posts is only visible to you.
+
 ## Installation
 
-### IzzyOnDroid
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Moshidon will automatically notify you about new updates inside the app.**
 
-[apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk](https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk)
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-<a href="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>
+Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
 
-Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
-
-[`https://apt.izzysoft.de/fdroid/repo`](https://apt.izzysoft.de/fdroid/repo)
-
-### Google Play Store
-
-[play.google.com/store/apps/details?id=org.joinmastodon.android.sk](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)
-
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
-
-### F-Droid
-
-**[F-Droid.org?](https://f-droid.org)** Not yet, sorry!
-
-If you want, you can help me figure out if something's missing in the [Issue #47: F-Droid.org](https://github.com/sk22/megalodon/issues/47)
-
-### Direct
-
-Press the download button to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.
-
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
-
-You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
-
-Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
-
----
 
 
 ## Release variants
 
-All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
+All downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-**`megalodon.apk`**
-
-Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
-
-**`upstream-1234abc.apk`**
-
-This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
-
-<!-- **`megalodon-fdroid.apk`**
-
-Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
-
----
-
-## Contribution
-
-### Translation
-
-As with the source code, the translation is sourced from the official project, which you can contribute to on the official “**Mastodon for Android**” Crowdin project: https://crowdin.com/project/mastodon-for-android
-
-There's also a handful of custom strings exclusive to this projects that would need to be translated. You can help translate **Megalodon** on Weblate: https://translate.codeberg.org/projects/megalodon/
-
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/horizontal-auto.svg)](https://translate.codeberg.org/engage/megalodon/)
+**`moshidon.apk`**
 
+Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
 ---
 
@@ -131,7 +95,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
 * [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/check-for-update-button)
 * [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reblogs from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
 * [Follow and unfollow hashtags](https://github.com/sk22/megalodon/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
 * [Notification bell for posts](https://github.com/sk22/megalodon/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
 * [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
@@ -141,19 +105,7 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/posts-notifications-tab)
 * [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
 * [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
-* [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
-* [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
-* [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
-* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
-* [Implement deleting notifications](https://github.com/sk22/megalodon/commit/b0f9ce081f69f29ad59658fc00ca41372cd2677d) (disabled by default)
-* [Long-click boost button to "quote" a post](https://github.com/sk22/megalodon/commit/b25a237c20c6a924ed4d9b357999867c3a32b32b)
-* [Draft and schedule posts](https://github.com/sk22/megalodon/pull/217)
-* [Display original post when replying](https://github.com/sk22/megalodon/commit/375f8ceb2747705fedf43686681cc0e0b812f899)
-* [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
+* [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
 
 
 ### Behavior
@@ -165,20 +117,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
 * [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
 * [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
-* [No ellipsis for long poll answers](https://github.com/mastodon/mastodon-android/commit/c9aae828e2518adccdc092e41f8d1f0489636271)
-* [Show poll vote button for multiple and single answer polls](https://github.com/mastodon/mastodon-android/commit/e14dfda2fdf32f0fa3043504ac5831683a87559a)
-* [Show own vote after voting](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28) ([Closes issue](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28))
-* [Make inline emoji search case-insensitive and don't only search from start of emoji names](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:better-inline-emoji-search) ([Pull request](https://github.com/mastodon/mastodon-android/pull/445))
-* [Include subject line when sharing e.g. a website to Megalodon](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:external-share-include-subject)
-* [Improve semantics for voting on polls (radio buttons and checkboxes)](https://github.com/sk22/megalodon/commit/6fd58c96827cb1d2da329cebdc170a1425dd18d7)
-* [Copy post URL when long-pressing share button](https://github.com/sk22/megalodon/commit/ba36347f03278763ecec617b1ce57ba89db7be72)
-* [Add option to disable swiping between tabs](https://github.com/sk22/megalodon/commit/1f20b21fc84bf006c1ec14bd2229cbfad5215ec8)
-* [Resolve Fediverse links in the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/open-urls-in-app)
-* [Preserve whitespaces in HTML](https://github.com/sk22/megalodon/commit/7d876bddc7a07d98f0fecbf62b13bdb9fcce3412)
-* [Long-click to copy links](https://github.com/sk22/megalodon/commit/b32e32274923a94742a9926ef38785f746d41405)
-* 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)
 
 
 ### Visual
@@ -186,16 +124,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
 * [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
 * [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
-* [Custom color themes](https://github.com/sk22/megalodon/pull/124) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom "megalodon" text logo](https://github.com/sk22/megalodon/commit/563afd487ca5c608cfbb00fa3909d3c27384acc0) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom login screen](https://github.com/sk22/megalodon/commit/9bbf8c4618dbe13accaeb3b5482bf3fe88cac4c0)
-* [More distinct filled boost icon](https://github.com/sk22/megalodon/commits/more-distinct-filled-boost-icon)
-* Material You color theme by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Animations for interaction buttons](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/animate-buttons)
-* [Dedicated icons for different notification types](https://github.com/sk22/megalodon/pull/178) by [@florian-obernberger](https://github.com/florian-obernberger)
-* Scale text according to system settings
-* Header in timeline for followed hashtags
-* [Indicator for missing alt texts](https://github.com/sk22/megalodon/commit/c0c276f03e793b78c478c17dfdef24a66ef7cedb)
 
 
 ## Building
@@ -212,4 +140,4 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>
+<a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>

_layouts/default.html

@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Megalodon</title>
+    <title>Moshidon</title>
     <link rel="icon" href="mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png">
-    <link rel="me" href="https://floss.social/@megalodon">
+    <link rel="me" href="https://floss.social/@mastodon">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.1.0/github-markdown.min.css">
   </head>
   <body class="markdown-body">
@@ -14,4 +14,4 @@
       {{ content }}  
     </div>
   </body>
-</html>
+</html>

build.gradle

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

crowdin.yml

@@ -0,0 +1,5 @@
+files:
+  - source: /mastodon/src/main/res/values/strings.xml
+    translation: /mastodon/src/main/res/values-%android_code%/strings.xml
+  - source: /fastlane/metadata/android/en-US/*.txt
+    translation: /fastlane/metadata/android/%locale%/%original_file_name%

fix-metadata-markdown-lists.sh

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

gradle.properties

@@ -16,7 +16,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
-android.nonFinalResIds=false
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,98 +17,67 @@
 #
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -118,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -129,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -137,109 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

mastodon/build.gradle

@@ -2,24 +2,18 @@ plugins {
 	id 'com.android.application'
 }
 
-java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
-	}
-}
-
 android {
 	compileSdk 33
 	defaultConfig {
-		archivesBaseName = "megalodon"
-		applicationId "org.joinmastodon.android.sk"
+		archivesBaseName = "moshidon"
+		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 86
-		versionName "1.2.3+fork.86"
+		versionCode 74
+		versionName "1.1.4+fork.74.moshinda"
 		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']
-    }
+		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+	}
 
 	buildTypes {
 		release {
@@ -55,19 +49,14 @@ android {
 			setRoot "src/github"
 		}
 	}
-	namespace 'org.joinmastodon.android'
-	lint {
-		abortOnError false
+	lintOptions{
 		checkReleaseBuilds false
-	}
-
-	buildFeatures {
-		buildConfig true
+		abortOnError false
 	}
 }
 
 dependencies {
-	api 'androidx.annotation:annotation:1.6.0'
+	api 'androidx.annotation:annotation:1.3.0'
 	implementation 'com.squareup.okhttp3:okhttp:3.14.9'
 	implementation 'me.grishka.litex:recyclerview:1.2.1.1'
 	implementation 'me.grishka.litex:swiperefreshlayout:1.1.0.1'
@@ -76,12 +65,11 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.appkit:appkit:1.2.7'
-	implementation 'com.google.code.gson:gson:2.9.0'
+	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
 	implementation 'de.psdev:async-otto:1.0.3'
 	implementation 'org.parceler:parceler-api:1.1.12'
-	implementation 'com.github.bottom-software-foundation:bottom-java:2.1.0'
 	annotationProcessor 'org.parceler:parceler:1.1.12'
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 

mastodon/src/androidTest/java/org/joinmastodon/android/fragments/ThreadFragmentTest.java

@@ -1,90 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static org.junit.Assert.*;
-
-import android.util.Pair;
-
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusContext;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class ThreadFragmentTest {
-
-	private Status fakeStatus(String id, String inReplyTo) {
-		Status status = Status.ofFake(id, null, null);
-		status.inReplyToId = inReplyTo;
-		return status;
-	}
-
-	@Test
-	public void countAncestryLevels() {
-		StatusContext context = new StatusContext();
-		context.ancestors = List.of(
-				fakeStatus("oldest ancestor", null),
-				fakeStatus("younger ancestor", "oldest ancestor")
-		);
-		context.descendants = List.of(
-				fakeStatus("first reply", "main status"),
-				fakeStatus("reply to first reply", "first reply"),
-				fakeStatus("third level reply", "reply to first reply"),
-				fakeStatus("another reply", "main status")
-		);
-		List<Pair<String, Integer>> actual =
-				ThreadFragment.countAncestryLevels("main status", context);
-
-		List<Pair<String, Integer>> expected = List.of(
-				Pair.create("oldest ancestor", -2),
-				Pair.create("younger ancestor", -1),
-				Pair.create("main status", 0),
-				Pair.create("first reply", 1),
-				Pair.create("reply to first reply", 2),
-				Pair.create("third level reply", 3),
-				Pair.create("another reply", 1)
-		);
-		assertEquals(
-				"status ids are in the right order",
-				expected.stream().map(p -> p.first).collect(Collectors.toList()),
-				actual.stream().map(p -> p.first).collect(Collectors.toList())
-		);
-		assertEquals(
-				"counted levels match",
-				expected.stream().map(p -> p.second).collect(Collectors.toList()),
-				actual.stream().map(p -> p.second).collect(Collectors.toList())
-		);
-	}
-
-	@Test
-	public void sortStatusContext() {
-		StatusContext context = new StatusContext();
-		context.ancestors = List.of(
-				fakeStatus("younger ancestor", "oldest ancestor"),
-				fakeStatus("oldest ancestor", null)
-		);
-		context.descendants = List.of(
-				fakeStatus("reply to first reply", "first reply"),
-				fakeStatus("third level reply", "reply to first reply"),
-				fakeStatus("first reply", "main status"),
-				fakeStatus("another reply", "main status")
-		);
-
-		ThreadFragment.sortStatusContext(
-				fakeStatus("main status", "younger ancestor"),
-				context
-		);
-		List<Status> expectedAncestors = List.of(
-				fakeStatus("oldest ancestor", null),
-				fakeStatus("younger ancestor", "oldest ancestor")
-		);
-		List<Status> expectedDescendants = List.of(
-				fakeStatus("first reply", "main status"),
-				fakeStatus("reply to first reply", "first reply"),
-				fakeStatus("third level reply", "reply to first reply"),
-				fakeStatus("another reply", "main status")
-		);
-
-		// TODO: ??? i have no idea how this code works. it certainly doesn't return what i'd expect
-	}
-}

mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java

@@ -1,81 +0,0 @@
-package org.joinmastodon.android.utils;
-
-import static org.joinmastodon.android.model.Filter.FilterAction.*;
-import static org.joinmastodon.android.model.Filter.FilterContext.*;
-import static org.junit.Assert.*;
-
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Status;
-import org.junit.Test;
-
-import java.time.Instant;
-import java.util.EnumSet;
-import java.util.List;
-
-public class StatusFilterPredicateTest {
-
-    private static final Filter hideMeFilter = new Filter(), warnMeFilter = new Filter();
-    private static final List<Filter> allFilters = List.of(hideMeFilter, warnMeFilter);
-
-    private static final Status
-            hideInHomePublic = Status.ofFake(null, "hide me, please", Instant.now()),
-            warnInHomePublic = Status.ofFake(null, "display me with a warning", Instant.now());
-
-    static {
-        hideMeFilter.phrase = "hide me";
-        hideMeFilter.filterAction = HIDE;
-        hideMeFilter.context = EnumSet.of(PUBLIC, HOME);
-
-        warnMeFilter.phrase = "warning";
-        warnMeFilter.filterAction = WARN;
-        warnMeFilter.context = EnumSet.of(PUBLIC, HOME);
-    }
-
-    @Test
-    public void testHide() {
-        assertFalse("should not pass because matching filter applies to given context",
-                new StatusFilterPredicate(allFilters, HOME).test(hideInHomePublic));
-    }
-
-    @Test
-    public void testHideRegardlessOfContext() {
-        assertTrue("filters without context should always pass",
-                new StatusFilterPredicate(allFilters, null).test(hideInHomePublic));
-    }
-
-    @Test
-    public void testHideInDifferentContext() {
-        assertTrue("should pass because matching filter does not apply to given context",
-                new StatusFilterPredicate(allFilters, THREAD).test(hideInHomePublic));
-    }
-
-    @Test
-    public void testHideWithWarningText() {
-        assertTrue("should pass because matching filter is for warnings",
-                new StatusFilterPredicate(allFilters, HOME).test(warnInHomePublic));
-    }
-
-    @Test
-    public void testWarn() {
-        assertFalse("should not pass because filter applies to given context",
-                new StatusFilterPredicate(allFilters, HOME, WARN).test(warnInHomePublic));
-    }
-
-    @Test
-    public void testWarnRegardlessOfContext() {
-        assertTrue("filters without context should always pass",
-                new StatusFilterPredicate(allFilters, null, WARN).test(warnInHomePublic));
-    }
-
-    @Test
-    public void testWarnInDifferentContext() {
-        assertTrue("should pass because filter does not apply to given context",
-                new StatusFilterPredicate(allFilters, THREAD, WARN).test(warnInHomePublic));
-    }
-
-    @Test
-    public void testWarnWithHideText() {
-        assertTrue("should pass because matching filter is for hiding",
-                new StatusFilterPredicate(allFilters, HOME, WARN).test(hideInHomePublic));
-    }
-}

mastodon/src/github/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.joinmastodon.android">
 
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 

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

@@ -14,14 +14,12 @@ 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;
@@ -63,7 +61,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 			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;
@@ -87,7 +84,6 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 					.remove("apkURL")
 					.remove("checkedByBuild")
 					.remove("downloadID")
-					.remove("changelog")
 					.apply();
 		}
 	}
@@ -115,70 +111,61 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/megalodon/releases")
+				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest")
 				.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;
+			JsonObject obj=JsonParser.parseReader(resp.body().charStream()).getAsJsonObject();
+			String tag=obj.get("tag_name").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();
 
-				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("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();
+						UpdateInfo info=new UpdateInfo();
+						info.size=size;
+						info.version=version;
+						this.info=info;
 
-							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)
+								.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
+								.remove("downloadID")
+								.apply();
 
-							getPrefs().edit()
-									.putLong("apkSize", size)
-									.putString("version", version)
-									.putString("apkURL", url)
-									.putString("changelog", changelog)
-									.putInt("checkedByBuild", BuildConfig.VERSION_CODE)
-									.remove("downloadID")
-									.apply();
-
-							break;
-						}
+						break;
 					}
 				}
-				getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
-				break;
 			}
+			getPrefs().edit().putLong("lastCheck", System.currentTimeMillis()).apply();
 		}catch(Exception x){
 			Log.w(TAG, "actuallyCheckForUpdates", x);
 		}finally{

mastodon/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.joinmastodon.android">
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -11,20 +12,10 @@
 
 	<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
 
-	<queries>
-		<intent>
-			<action android:name="android.intent.action.PROCESS_TEXT" />
-			<data android:mimeType="text/plain" />
-		</intent>
-		<intent>
-			<action android:name="android.intent.action.TRANSLATE" />
-		</intent>
-	</queries>
-
 	<application
 		android:name=".MastodonApp"
 		android:allowBackup="true"
-		android:label="@string/sk_app_name"
+		android:label="@string/app_name"
 		android:supportsRtl="true"
 		android:localeConfig="@xml/locales_config"
 		android:icon="@mipmap/ic_launcher"
@@ -38,32 +29,15 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
-		<activity
-			android:name=".PanicResponderActivity"
-			android:exported="true"
-			android:launchMode="singleInstance"
-			android:noHistory="true"
-			android:theme="@android:style/Theme.NoDisplay">
-			<intent-filter>
-				<action android:name="info.guardianproject.panic.action.TRIGGER" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
-		</activity>
-		<activity
-			android:name=".ExitActivity"
-			android:exported="false"
-			android:theme="@android:style/Theme.NoDisplay" />
 		<activity android:name=".OAuthActivity" android:exported="true" android:configChanges="orientation|screenSize" android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:scheme="megalodon-android-auth" android:host="callback"/>
+				<data android:scheme="moshidon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
-		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"
-			android:theme="@style/TransparentDialog">
+		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize">
 			<intent-filter>
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>

mastodon/src/main/assets/blocks.txt

@@ -1,171 +0,0 @@
-13bells.com
-4aem.com
-aethy.com
-anime.website
-annihilation.social
-anon-kenkai.com
-asbestos.cafe
-bae.st
-bajax.us
-banepo.st
-baraag.net
-beefyboys.win
-beepboop.ga
-berserker.town
-bikeshed.party
-boks.moe
-brainsoap.net
-breastmilk.club
-brighteon.social
-cawfee.club
-clew.lol
-clubcyberia.co
-collapsitarian.io
-comfyboy.club
-contrapointsfan.club
-cum.camp
-cum.salon
-cybercriminal.eu
-darknight-coffee.org
-dembased.xyz
-desupost.soy
-detroitriotcity.com
-eatthebugs.social
-eientei.org
-elementality.org
-eveningzoo.club
-firedragonstudios.com
-firefaithfellowship.com
-fluf.club
-foxfam.club
-freak.university
-freeatlantis.com
-freecumextremist.com
-freedomstrike.org
-freesoftwareextremist.com
-freespeech.group
-freespeechextremist.com
-freetalklive.com
-froth.zone
-fulltermprivacy.com
-gameliberty.club
-gearlandia.haus
-genderheretics.xyz
-geofront.rocks
-gleasonator.com
-glee.li
-glindr.org
-goyim.app
-goyslop.cafe
-haeder.net
-handholding.io
-hidamari.apartments
-hitchhiker.social
-hunk.city
-iddqd.social
-intkos.link
-justicewarrior.social
-kawa-kun.com
-kitsunemimi.club
-kiwifarms.cc
-kompost.cz
-kurosawa.moe
-leafposter.club
-leftychan.net
-lewdieheaven.com
-liberdon.com
-ligma.pro
-lizards.live
-lolicon.rocks
-lolison.top
-lovingexpressions.net
-lucasvl.nl
-mahodou.moe
-makemysarcophagus.com
-maladaptive.art
-masochi.st
-mastinator.com
-merovingian.club
-midwaytrades.com
-mirr0r.city
-moa.st
-mouse.services
-mugicha.club
-narrativerry.xyz
-natehiggers.online
-neckbeard.xyz
-needs.vodka
-neenster.org
-nicecrew.digital
-nnia.space
-noagendasocial.com
-noagendasocial.nl
-noagendatube.com
-nobodyhasthe.biz
-nukem.biz
-obo.sh
-onionfarms.org
-outpoa.st
-pawlicker.com
-pawoo.net
-pedo.school
-piazza.today
-pibvt.net
-pieville.net
-pisskey.io
-plagu.ee
-pmth.us
-poa.st
-poast.org
-poast.tv
-poster.place
-prospeech.space
-quodverum.com
-rakket.app
-rapemeat.solutions
-rdrama.cc
-rebelbase.site
-retardedniggers.forsale
-rojogato.com
-ryona.agency
-schwartzwelt.xyz
-seal.cafe
-shigusegubu.club
-shitpost.cloud
-shitposter.club
-shota.house
-silliness.observer
-skinheads.eu
-skinheads.io
-skinheads.social
-skinheads.uk
-skippers-bin.com
-skyshanty.xyz
-slash.cl
-sleepy.cafe
-smuglo.li
-sneed.social
-sonichu.com
-spinster.xyz
-springbo.cc
-starnix.network
-stereophonic.space
-strelizia.net
-syspxl.xyz
-tastingtraffic.net
-teci.world
-theapex.social
-thepostearthdestination.com
-tkammer.de
-trumpislovetrumpis.life
-truthsocial.co.in
-urchan.org
-varishangout.net
-whinge.house
-whinge.town
-wideboys.org
-wolfgirl.bar
-xn--p1abe3d.xn--80asehdb
-yggdrasil.social
-youjo.love
-zztails.gay

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

@@ -1,24 +0,0 @@
-package org.joinmastodon.android;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-public class ExitActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        finishAndRemoveTask();
-    }
-
-    public static void exit(Context context) {
-        Intent intent = new Intent(context, ExitActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        context.startActivity(intent);
-    }
-
-}

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

@@ -3,6 +3,7 @@ package org.joinmastodon.android;
 import android.app.Fragment;
 import android.content.ClipData;
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -11,9 +12,8 @@ import android.widget.Toast;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.jsoup.internal.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,34 +28,21 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		UiUtils.setUserPreferredTheme(this);
 		super.onCreate(savedInstanceState);
 		if(savedInstanceState==null){
-
-			String text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-			boolean isMastodonURL = UiUtils.looksLikeMastodonUrl(text);
-
 			List<AccountSession> sessions=AccountSessionManager.getInstance().getLoggedInAccounts();
 			if(sessions.isEmpty()){
 				Toast.makeText(this, R.string.err_not_logged_in, Toast.LENGTH_SHORT).show();
 				finish();
-			}else if(sessions.size()==1 && !isMastodonURL){
+			}else if(sessions.size()==1){
 				openComposeFragment(sessions.get(0).getID());
 			}else{
-				new AccountSwitcherSheet(this, null, true, isMastodonURL, (accountId, open) -> {
-					if (open) {
-						UiUtils.lookupURL(this, accountId, text, false, (clazz, args) -> {
-							if (clazz == null) {
-								finish();
-								return;
-							}
-							args.putString("fromExternalShare", clazz.getSimpleName());
-							Intent intent = new Intent(this, MainActivity.class);
-							intent.putExtras(args);
-							finish();
-							startActivity(intent);
-						});
-					} else {
-						openComposeFragment(accountId);
-					}
-				}).show();
+				getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
+				new M3AlertDialogBuilder(this)
+						.setItems(sessions.stream().map(as->"@"+as.self.username+"@"+as.domain).toArray(String[]::new), (dialog, which)->{
+							openComposeFragment(sessions.get(which).getID());
+						})
+						.setTitle(R.string.choose_account)
+						.setOnCancelListener(dialog -> finish())
+						.show();
 			}
 		}
 	}
@@ -66,17 +53,8 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
 		String subject = "";
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
-			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
-			if (!StringUtil.isBlank(subject)) builder.append(subject).append("\n\n");
-		}
-		if (intent.hasExtra(Intent.EXTRA_TEXT)) {
-			String extra = intent.getStringExtra(Intent.EXTRA_TEXT);
-			if (!StringUtil.isBlank(extra)) {
-				if (extra.startsWith(subject)) extra = extra.substring(subject.length()).trim();
-				builder.append(extra).append("\n\n");
-			}
-		}
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n\n");
+		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;
 		if(Intent.ACTION_SEND.equals(intent.getAction())){
@@ -103,7 +81,8 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		args.putString("account", accountID);
 		if(!TextUtils.isEmpty(text))
 			args.putString("prefilledText", text);
-		args.putInt("selectionStart", StringUtil.isBlank(subject) ? 0 : subject.length());
+		if(!subject.isBlank())
+			args.putInt("selectionEnd", subject.length());
 		if(mediaUris!=null && !mediaUris.isEmpty())
 			args.putParcelableArrayList("mediaAttachments", toArrayList(mediaUris));
 		Fragment fragment=new ComposeFragment();

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

@@ -4,19 +4,15 @@ 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;
 
-import org.joinmastodon.android.model.ContentType;
-import org.joinmastodon.android.model.TimelineDefinition;
-
 import java.lang.reflect.Type;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class GlobalUserPreferences{
 	public static boolean playGifs;
@@ -25,68 +21,28 @@ public class GlobalUserPreferences{
 	public static boolean showReplies;
 	public static boolean showBoosts;
 	public static boolean loadNewPosts;
-	public static boolean showNewPostsButton;
+	public static boolean showFederatedTimeline;
 	public static boolean showInteractionCounts;
 	public static boolean alwaysExpandContentWarnings;
 	public static boolean disableMarquee;
 	public static boolean disableSwipe;
 	public static boolean voteButtonForSingleChoice;
-	public static boolean enableDeleteNotifications;
-	public static boolean translateButtonOpenedOnly;
-	public static boolean uniformNotificationIcon;
-	public static boolean reduceMotion;
-	public static boolean keepOnlyLatestNotification;
-	public static boolean disableAltTextReminder;
-	public static boolean showAltIndicator;
-	public static boolean showNoAltIndicator;
-	public static boolean enablePreReleases;
-	public static boolean prefixRepliesWithRe;
-	public static boolean bottomEncoding;
-	public static boolean collapseLongPosts;
-	public static boolean spectatorMode;
-	public static boolean autoHideFab;
-	public static boolean replyLineAboveHeader;
-	public static boolean compactReblogReplyLine;
-	public static boolean confirmBeforeReblog;
-	public static String publishButtonText;
+	public static boolean showDifferentiatedPushNoticationIcons;
 	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;
-	public static Set<String> accountsInGlitchMode;
-	public static Set<String> accountsWithContentTypesEnabled;
-	public static Map<String, ContentType> accountsDefaultContentTypes;
-
-	/**
-	 * Pleroma
-	 */
-	public static String replyVisibility;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
 	private static <T> T fromJson(String json, Type type, T orElse) {
-		if (json == null) return orElse;
 		try { return gson.fromJson(json, type); }
 		catch (JsonSyntaxException ignored) { return orElse; }
 	}
 
-	public static void removeAccount(String accountId) {
-		recentLanguages.remove(accountId);
-		pinnedTimelines.remove(accountId);
-		accountsInGlitchMode.remove(accountId);
-		accountsWithLocalOnlySupport.remove(accountId);
-		accountsWithContentTypesEnabled.remove(accountId);
-		accountsDefaultContentTypes.remove(accountId);
-		save();
-	}
-
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -95,44 +51,25 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
-		showNewPostsButton=prefs.getBoolean("showNewPostsButton", true);
+		showDifferentiatedPushNoticationIcons=prefs.getBoolean("showDifferentiatedPushNoticationIcons", false);
+		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
 		disableSwipe=prefs.getBoolean("disableSwipe", false);
 		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
-		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
-		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
-		uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
-		reduceMotion=prefs.getBoolean("reduceMotion", false);
-		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
-		disableAltTextReminder=prefs.getBoolean("disableAltTextReminder", false);
-		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
-		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
-		enablePreReleases=prefs.getBoolean("enablePreReleases", false);
-		prefixRepliesWithRe=prefs.getBoolean("prefixRepliesWithRe", false);
-		bottomEncoding=prefs.getBoolean("bottomEncoding", false);
-		collapseLongPosts=prefs.getBoolean("collapseLongPosts", true);
-		spectatorMode=prefs.getBoolean("spectatorMode", false);
-		autoHideFab=prefs.getBoolean("autoHideFab", true);
-		replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true);
-		compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
-		confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false);
-		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
-		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<>());
-		replyVisibility=prefs.getString("replyVisibility", null);
-		accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
-		accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
+		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
 
 		try {
-			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
+			if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
+				color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
+			}else{
+				color=ColorPreference.PURPLE;
+			}
 		} catch (IllegalArgumentException|ClassCastException ignored) {
 			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PINK;
+			color=ColorPreference.PURPLE;
 		}
 	}
 
@@ -143,39 +80,16 @@ public class GlobalUserPreferences{
 				.putBoolean("showReplies", showReplies)
 				.putBoolean("showBoosts", showBoosts)
 				.putBoolean("loadNewPosts", loadNewPosts)
-				.putBoolean("showNewPostsButton", showNewPostsButton)
+				.putBoolean("showFederatedTimeline", showFederatedTimeline)
 				.putBoolean("trueBlackTheme", trueBlackTheme)
 				.putBoolean("showInteractionCounts", showInteractionCounts)
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
 				.putBoolean("disableSwipe", disableSwipe)
-				.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)
-				.putBoolean("collapseLongPosts", collapseLongPosts)
-				.putBoolean("spectatorMode", spectatorMode)
-				.putBoolean("autoHideFab", autoHideFab)
-				.putBoolean("compactReblogReplyLine", compactReblogReplyLine)
-				.putString("publishButtonText", publishButtonText)
-				.putBoolean("bottomEncoding", bottomEncoding)
-				.putBoolean("replyLineAboveHeader", replyLineAboveHeader)
-				.putBoolean("confirmBeforeReblog", confirmBeforeReblog)
+				.putBoolean("showDifferentiatedPushNoticationIcons", showDifferentiatedPushNoticationIcons)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
-				.putString("pinnedTimelines", gson.toJson(pinnedTimelines))
-				.putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
-				.putStringSet("accountsInGlitchMode", accountsInGlitchMode)
-				.putString("replyVisibility", replyVisibility)
-				.putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
-				.putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
 				.apply();
 	}
 
@@ -187,7 +101,8 @@ public class GlobalUserPreferences{
 		BLUE,
 		BROWN,
 		RED,
-		YELLOW
+		YELLOW,
+		NORD
 	}
 
 	public enum ThemePreference{
@@ -196,3 +111,4 @@ public class GlobalUserPreferences{
 		DARK
 	}
 }
+

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

@@ -2,14 +2,11 @@ package org.joinmastodon.android;
 
 import android.Manifest;
 import android.app.Fragment;
-import android.app.assist.AssistContent;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
-import android.widget.FrameLayout;
 
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -19,17 +16,16 @@ import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
 
-public class MainActivity extends FragmentStackActivity implements ProvidesAssistContent {
+public class MainActivity extends FragmentStackActivity{
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState){
 		UiUtils.setUserPreferredTheme(this);
@@ -37,44 +33,34 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomWelcomeFragment());
+				showFragmentClearingBackStack(new CustomLoginFragment());
 			}else{
+				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
 				Bundle args=new Bundle();
 				Intent intent=getIntent();
-				if(intent.hasExtra("fromExternalShare")) {
-					AccountSessionManager.getInstance()
-							.setLastActiveAccountID(intent.getStringExtra("account"));
-					AccountSessionManager.getInstance().maybeUpdateLocalInfo(
-							AccountSessionManager.getInstance().getLastActiveAccount());
-					showFragmentForExternalShare(intent.getExtras());
-					return;
-				}
-
-				boolean fromNotification = intent.getBooleanExtra("fromNotification", false);
-				boolean hasNotification = intent.hasExtra("notification");
-				if(fromNotification){
+				if(intent.getBooleanExtra("fromNotification", false)){
 					String accountID=intent.getStringExtra("accountID");
 					try{
 						session=AccountSessionManager.getInstance().getAccount(accountID);
-						if(!hasNotification) args.putString("tab", "notifications");
+						if(!intent.hasExtra("notification"))
+							args.putString("tab", "notifications");
 					}catch(IllegalStateException x){
 						session=AccountSessionManager.getInstance().getLastActiveAccount();
 					}
 				}else{
 					session=AccountSessionManager.getInstance().getLastActiveAccount();
 				}
-				AccountSessionManager.getInstance().maybeUpdateLocalInfo(session);
 				args.putString("account", session.getID());
 				Fragment fragment=session.activated ? new HomeFragment() : new AccountActivationFragment();
 				fragment.setArguments(args);
-				if(fromNotification && hasNotification){
+				showFragmentClearingBackStack(fragment);
+				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
 					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 					showFragmentForNotification(notification, session.getID());
-				} else if (intent.getBooleanExtra("compose", false)){
+				}else if(intent.getBooleanExtra("compose", false)){
 					showCompose();
-				} else {
-					showFragmentClearingBackStack(fragment);
+				}else{
 					maybeRequestNotificationsPermission();
 				}
 			}
@@ -88,12 +74,11 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 	@Override
 	protected void onNewIntent(Intent intent){
 		super.onNewIntent(intent);
-		AccountSessionManager.getInstance().maybeUpdateLocalInfo();
-		if (intent.hasExtra("fromExternalShare")) showFragmentForExternalShare(intent.getExtras());
-		else if (intent.getBooleanExtra("fromNotification", false)) {
+		if(intent.getBooleanExtra("fromNotification", false)){
 			String accountID=intent.getStringExtra("accountID");
+			AccountSession accountSession;
 			try{
-				AccountSessionManager.getInstance().getAccount(accountID);
+				accountSession=AccountSessionManager.getInstance().getAccount(accountID);
 			}catch(IllegalStateException x){
 				return;
 			}
@@ -138,19 +123,6 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 		showFragment(fragment);
 	}
 
-	private void showFragmentForExternalShare(Bundle args) {
-		String clazz = args.getString("fromExternalShare");
-		Fragment fragment = switch (clazz) {
-			case "ThreadFragment" -> new ThreadFragment();
-			case "ProfileFragment" -> new ProfileFragment();
-			default -> null;
-		};
-		if (fragment == null) return;
-		args.putBoolean("_can_go_back", true);
-		fragment.setArguments(args);
-		showFragment(fragment);
-	}
-
 	private void showCompose(){
 		AccountSession session=AccountSessionManager.getInstance().getLastActiveAccount();
 		if(session==null || !session.activated)
@@ -167,53 +139,4 @@ public class MainActivity extends FragmentStackActivity implements ProvidesAssis
 			requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, 100);
 		}
 	}
-
-	/**
-	 * when opening app through a notification: if (thread) fragment "can go back", clear back stack
-	 * and show home fragment. upstream's implementation doesn't require this as it opens home first
-	 * and then immediately switches to the notification's ThreadFragment. this causes a black
-	 * screen in megalodon, for some reason, so i'm working around this that way.
- 	 */
-	@Override
-	public void onBackPressed() {
-		Fragment currentFragment = getFragmentManager().findFragmentById(
-				(fragmentContainers.get(fragmentContainers.size() - 1)).getId()
-		);
-		Bundle currentArgs = currentFragment.getArguments();
-		if (fragmentContainers.size() != 1
-				|| currentArgs == null
-				|| !currentArgs.getBoolean("_can_go_back", false)) {
-			super.onBackPressed();
-			return;
-		}
-		if (currentArgs.getBoolean("_finish_on_back", false)) {
-			finish();
-		} else if (currentArgs.containsKey("account")) {
-			Bundle args = new Bundle();
-			args.putString("account", currentArgs.getString("account"));
-			if (getIntent().getBooleanExtra("fromNotification", false)) {
-				args.putString("tab", "notifications");
-			}
-			Fragment fragment=new HomeFragment();
-			fragment.setArguments(args);
-			showFragmentClearingBackStack(fragment);
-		}
-	}
-
-	public Fragment getCurrentFragment() {
-		for (int i = fragmentContainers.size() - 1; i >= 0; i--) {
-			FrameLayout fl = fragmentContainers.get(i);
-			if (fl.getVisibility() == View.VISIBLE) {
-				return getFragmentManager().findFragmentById(fl.getId());
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		super.onProvideAssistContent(assistContent);
-		Fragment fragment = getCurrentFragment();
-		if (fragment != null) callFragmentToProvideAssistContent(fragment, assistContent);
-	}
 }

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

@@ -1,49 +0,0 @@
-package org.joinmastodon.android;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-
-
-public class PanicResponderActivity extends Activity {
-    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final Intent intent = getIntent();
-        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
-            AccountSessionManager.getInstance().getLoggedInAccounts().forEach(accountSession -> logOut(accountSession.getID()));
-            ExitActivity.exit(this);
-        }
-        finishAndRemoveTask();
-    }
-
-    private void logOut(String accountID){
-        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(accountID);
-                    }
-
-                    @Override
-                    public void onError(ErrorResponse error){
-                        onLoggedOut(accountID);
-                    }
-                })
-                .exec(accountID);
-    }
-
-    private void onLoggedOut(String accountID){
-        AccountSessionManager.getInstance().removeAccount(accountID);
-    }
-}

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

@@ -5,11 +5,12 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.RemoteInput;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -17,28 +18,15 @@ import android.util.Log;
 
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.requests.notifications.GetNotificationByID;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
-import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
-import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.NotificationReceivedEvent;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Mention;
-import org.joinmastodon.android.model.NotificationAction;
-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.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.Callback;
@@ -51,14 +39,9 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 
 	public static final int NOTIFICATION_ID=178;
-	private static final String ACTION_KEY_TEXT_REPLY = "ACTION_KEY_TEXT_REPLY";
-
-	private static final int SUMMARY_ID = 791;
-	private static int notificationId = 0;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
-		UiUtils.setUserPreferredTheme(context);
 		if(BuildConfig.DEBUG){
 			Log.e(TAG, "received: "+intent);
 			Bundle extras=intent.getExtras();
@@ -88,7 +71,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 						}
 						String accountID=account.getID();
 						PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s);
-						E.post(new NotificationReceivedEvent(accountID, pn.notificationId+""));
 						new GetNotificationByID(pn.notificationId+"")
 								.setCallback(new Callback<>(){
 									@Override
@@ -110,35 +92,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				Log.w(TAG, "onReceive: invalid push notification format");
 			}
 		}
-		if(intent.getBooleanExtra("fromNotificationAction", false)){
-			String accountID=intent.getStringExtra("accountID");
-			int notificationId=intent.getIntExtra("notificationId", -1);
-
-			if (notificationId >= 0){
-				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-				notificationManager.cancel(accountID, notificationId);
-			}
-
-			if(intent.hasExtra("notification")){
-				org.joinmastodon.android.model.Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
-				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 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);
-						default -> Log.w(TAG, "onReceive: Failed to get NotificationAction");
-					}
-				}
-			}else{
-				Log.e(TAG, "onReceive: Failed to load notification");
-			}
-		}
 	}
 
 	private void notify(Context context, PushNotification pn, String accountID, org.joinmastodon.android.model.Notification notification){
@@ -184,26 +137,23 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setSmallIcon(R.drawable.ic_ntf_logo)
-				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, accountID.hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setColor(UiUtils.getThemeColor(context, android.R.attr.colorAccent));
-
-		if (!GlobalUserPreferences.uniformNotificationIcon) {
-			builder.setSmallIcon(switch (pn.notificationType) {
-				case FAVORITE -> R.drawable.ic_fluent_star_24_filled;
-				case REBLOG -> R.drawable.ic_fluent_arrow_repeat_all_24_filled;
-				case FOLLOW -> R.drawable.ic_fluent_person_add_24_filled;
-				case MENTION -> R.drawable.ic_fluent_mention_24_filled;
-				case POLL -> R.drawable.ic_fluent_poll_24_filled;
-				case STATUS -> R.drawable.ic_fluent_chat_24_filled;
-				case UPDATE -> R.drawable.ic_fluent_history_24_filled;
-				case REPORT -> R.drawable.ic_fluent_warning_24_filled;
-				case SIGN_UP -> R.drawable.ic_fluent_person_available_24_filled;
-			});
+				.setColor(context.getColor(R.color.shortcut_icon_background));
+		if(GlobalUserPreferences.showDifferentiatedPushNoticationIcons){
+			switch (pn.notificationType) {
+				case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
+				case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);
+				case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
+				case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
+				case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
+				default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
+			}
+		}else{
+			builder.setSmallIcon(R.drawable.ic_ntf_logo);
 		}
 
 		if(avatar!=null){
@@ -212,123 +162,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-
-		int id = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++;
-
-		if (notification != null){
-			switch (pn.notificationType){
-				case MENTION, STATUS -> {
-					if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N){
-						builder.addAction(buildReplyAction(context, id, accountID, notification));
-					}
-					builder.addAction(buildNotificationAction(context, id, accountID, notification,  context.getString(R.string.button_favorite), NotificationAction.FAVORITE));
-					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.UNDO_REBLOG));
-				}
-			}
-		}
-
-		nm.notify(accountID, id, builder.build());
-	}
-
-	private Notification.Action buildNotificationAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification, String title, NotificationAction action){
-		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
-		notificationIntent.putExtra("notificationId", notificationId);
-		notificationIntent.putExtra("fromNotificationAction", true);
-		notificationIntent.putExtra("accountID", accountID);
-		notificationIntent.putExtra("notificationAction", action.ordinal());
-		notificationIntent.putExtra("notification", Parcels.wrap(notification));
-		PendingIntent actionPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT);
-
-		return new Notification.Action.Builder(null, title, actionPendingIntent).build();
-	}
-
-	private Notification.Action buildReplyAction(Context context, int notificationId, String accountID, org.joinmastodon.android.model.Notification notification){
-		String replyLabel = context.getResources().getString(R.string.button_reply);
-		RemoteInput remoteInput = new RemoteInput.Builder(ACTION_KEY_TEXT_REPLY)
-				.setLabel(replyLabel)
-				.build();
-
-		Intent notificationIntent=new Intent(context, PushNotificationReceiver.class);
-		notificationIntent.putExtra("notificationId", notificationId);
-		notificationIntent.putExtra("fromNotificationAction", true);
-		notificationIntent.putExtra("accountID", accountID);
-		notificationIntent.putExtra("notificationAction", NotificationAction.REPLY.ordinal());
-		notificationIntent.putExtra("notification", Parcels.wrap(notification));
-
-		int flags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT : PendingIntent.FLAG_UPDATE_CURRENT;
-		PendingIntent replyPendingIntent = PendingIntent.getBroadcast(context, new Random().nextInt(), notificationIntent,flags);
-		return new Notification.Action.Builder(null, replyLabel, replyPendingIntent).addRemoteInput(remoteInput).build();
-	}
-
-	private void handleReplyAction(Context context, String accountID, Intent intent, org.joinmastodon.android.model.Notification notification, int notificationId, Preferences preferences) {
-		Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
-		if (remoteInput == null) {
-			Log.e(TAG, "handleReplyAction: Could not get reply input");
-			return;
-		}
-		CharSequence input = remoteInput.getCharSequence(ACTION_KEY_TEXT_REPLY);
-
-		// copied from ComposeFragment - TODO: generalize?
-		ArrayList<String> mentions=new ArrayList<>();
-		Status status = notification.status;
-		String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
-		if(!status.account.id.equals(ownID))
-			mentions.add('@'+status.account.acct);
-		for(Mention mention:status.mentions){
-			if(mention.id.equals(ownID))
-				continue;
-			String m='@'+mention.acct;
-			if(!mentions.contains(m))
-				mentions.add(m);
-		}
-		String initialText=mentions.isEmpty() ? "" : TextUtils.join(" ", mentions)+" ";
-
-		CreateStatus.Request req=new CreateStatus.Request();
-		req.status = initialText + input.toString();
-		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: ")){
-			req.spoilerText = "re: " + notification.status.spoilerText;
-		}
-
-		new CreateStatus(req, UUID.randomUUID().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Status status) {
-				NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-				Notification.Builder builder = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ?
-						new Notification.Builder(context, accountID+"_"+notification.type) :
-						new Notification.Builder(context)
-								.setPriority(Notification.PRIORITY_DEFAULT)
-								.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
-
-				notification.status = status;
-				Intent contentIntent=new Intent(context, MainActivity.class);
-				contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				contentIntent.putExtra("fromNotification", true);
-				contentIntent.putExtra("accountID", accountID);
-				contentIntent.putExtra("notification", Parcels.wrap(notification));
-
-				Notification repliedNotification = builder.setSmallIcon(R.drawable.ic_ntf_logo)
-						.setContentTitle(context.getString(R.string.sk_notification_action_replied, notification.status.account.displayName))
-						.setContentText(status.getStrippedText())
-						.setCategory(Notification.CATEGORY_SOCIAL)
-						.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
-						.build();
-				notificationManager.notify(accountID, notificationId, repliedNotification);
-			}
-
-			@Override
-			public void onError(ErrorResponse errorResponse) {
-
-			}
-		}).exec(accountID);
+		nm.notify(accountID, NOTIFICATION_ID, builder.build());
 	}
 }

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

@@ -11,7 +11,7 @@ public class ApiUtils{
 		//no instance
 	}
 
-public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
+	public static <E extends Enum<E>> List<String> enumSetToStrings(EnumSet<E> e, Class<E> cls){
 		return e.stream().map(ev->{
 			try{
 				SerializedName annotation=cls.getField(ev.name()).getAnnotation(SerializedName.class);

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

@@ -13,12 +13,11 @@ import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
-import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
@@ -73,8 +72,10 @@ public class CacheController{
 								int flags=cursor.getInt(1);
 								status.hasGapAfter=((flags & POST_FLAG_GAP_AFTER)!=0);
 								newMaxID=status.id;
-								if (!new StatusFilterPredicate(filters, Filter.FilterContext.HOME).test(status))
-									continue outer;
+								for(Filter filter:filters){
+									if(filter.matches(status))
+										continue outer;
+								}
 								result.add(status);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
@@ -89,7 +90,7 @@ public class CacheController{
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Status> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters, Filter.FilterContext.HOME)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
 								putHomeTimeline(result, maxID==null);
 							}
 
@@ -125,12 +126,11 @@ public class CacheController{
 		});
 	}
 
-	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<CacheablePaginatedResponse<List<Notification>>> callback){
+	public void getNotifications(String maxID, int count, boolean onlyMentions, boolean onlyPosts, boolean forceReload, Callback<PaginatedResponse<List<Notification>>> callback){
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
-				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(accountID);
-				List<Filter> filters=accountSession.wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
+				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";
@@ -145,30 +145,35 @@ public class CacheController{
 								ntf.postprocess();
 								newMaxID=ntf.id;
 								if(ntf.status!=null){
-									if (!new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status))
-										continue outer;
+									for(Filter filter:filters){
+										if(filter.matches(ntf.status))
+											continue outer;
+									}
 								}
 								result.add(ntf);
 							}while(cursor.moveToNext());
 							String _newMaxID=newMaxID;
-							uiHandler.post(()->callback.onSuccess(new CacheablePaginatedResponse<>(result, _newMaxID, true)));
+							uiHandler.post(()->callback.onSuccess(new PaginatedResponse<>(result, _newMaxID)));
 							return;
 						}
 					}catch(IOException x){
 						Log.w(TAG, "getNotifications: corrupted notification object in database", x);
 					}
 				}
-				Instance instance=AccountSessionManager.getInstance().getInstanceInfo(accountSession.domain);
-				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class), instance.isAkkoma())
+				new GetNotifications(maxID, count, onlyPosts ? EnumSet.of(Notification.Type.STATUS) : onlyMentions ? EnumSet.of(Notification.Type.MENTION): EnumSet.allOf(Notification.Type.class))
 						.setCallback(new Callback<>(){
 							@Override
 							public void onSuccess(List<Notification> result){
-								callback.onSuccess(new CacheablePaginatedResponse<>(result.stream().filter(ntf->{
+								callback.onSuccess(new PaginatedResponse<>(result.stream().filter(ntf->{
 									if(ntf.status!=null){
-										return new StatusFilterPredicate(filters, Filter.FilterContext.NOTIFICATIONS).test(ntf.status);
+										for(Filter filter:filters){
+											if(filter.matches(ntf.status)){
+												return false;
+											}
+										}
 									}
 									return true;
-								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id, false));
+								}).collect(Collectors.toList()), result.isEmpty() ? null : result.get(result.size()-1).id));
 								putNotifications(result, onlyMentions, onlyPosts, maxID==null);
 							}
 

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

@@ -12,15 +12,11 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.model.Status;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -28,7 +24,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -42,41 +37,19 @@ import okhttp3.ResponseBody;
 
 public class MastodonAPIController{
 	private static final String TAG="MastodonAPIController";
-	public static final Gson gsonWithoutDeserializer = new GsonBuilder()
+	public static final Gson gson=new GsonBuilder()
 			.disableHtmlEscaping()
 			.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
 			.registerTypeAdapter(Instant.class, new IsoInstantTypeAdapter())
 			.registerTypeAdapter(LocalDate.class, new IsoLocalDateTypeAdapter())
 			.create();
-	public static final Gson gson = gsonWithoutDeserializer.newBuilder()
-			.registerTypeAdapter(Status.class, new Status.StatusDeserializer())
-			.create();
 	private static WorkerThread thread=new WorkerThread("MastodonAPIController");
-	private static OkHttpClient httpClient=new OkHttpClient.Builder()
-			.readTimeout(5, TimeUnit.MINUTES)
-			.build();
+	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 
 	private AccountSession session;
-	private static List<String> badDomains = new ArrayList<>();
 
 	static{
 		thread.start();
-		try {
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(
-					MastodonApp.context.getAssets().open("blocks.txt")
-			));
-			String line;
-			while ((line = reader.readLine()) != null) {
-				if (line.isBlank() || line.startsWith("#")) continue;
-				String[] parts = line.replaceAll("\"", "").split("[\s,;]");
-				if (parts.length == 0) continue;
-				String domain = parts[0].toLowerCase().trim();
-				if (domain.isBlank()) continue;
-				badDomains.add(domain);
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
 	}
 
 	public MastodonAPIController(@Nullable AccountSession session){
@@ -84,17 +57,14 @@ public class MastodonAPIController{
 	}
 
 	public <T> void submitRequest(final MastodonAPIRequest<T> req){
-		final String host = req.getURL().getHost();
-		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(req.canceled)
 					return;
 				Request.Builder builder=new Request.Builder()
 						.url(req.getURL().toString())
 						.method(req.getMethod(), req.getRequestBody())
-						.header("User-Agent", "MegalodonAndroid/"+BuildConfig.VERSION_NAME);
+						.header("User-Agent", "MastodonAndroid/"+BuildConfig.VERSION_NAME);
 
 				String token=null;
 				if(session!=null)

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

@@ -5,6 +5,8 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.joinmastodon.android.R;
+
 import me.grishka.appkit.api.ErrorResponse;
 
 public class MastodonErrorResponse extends ErrorResponse{
@@ -20,7 +22,7 @@ public class MastodonErrorResponse extends ErrorResponse{
 
 	@Override
 	public void bindErrorView(View view){
-		TextView text=view.findViewById(me.grishka.appkit.R.id.error_text);
+		TextView text=view.findViewById(R.id.error_text);
 		text.setText(error);
 	}
 

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

@@ -162,8 +162,6 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								result.serverKey=result.serverKey.replace('/','_');
-								result.serverKey=result.serverKey.replace('+','-');
 								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
@@ -372,7 +370,7 @@ public class PushSubscriptionManager{
 		for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 			if(session.pushSubscription==null || forceReRegister)
 				session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription);
-			else
+			else if(session.needUpdatePushSettings)
 				session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription);
 		}
 	}

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

@@ -9,7 +9,6 @@ import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 
 import java.util.HashMap;
 import java.util.function.Consumer;
@@ -19,18 +18,12 @@ import me.grishka.appkit.api.ErrorResponse;
 
 public class StatusInteractionController{
 	private final String accountID;
-	private final boolean updateCounters;
 	private final HashMap<String, SetStatusFavorited> runningFavoriteRequests=new HashMap<>();
 	private final HashMap<String, SetStatusReblogged> runningReblogRequests=new HashMap<>();
 	private final HashMap<String, SetStatusBookmarked> runningBookmarkRequests=new HashMap<>();
 
-	public StatusInteractionController(String accountID, boolean updateCounters) {
-		this.accountID=accountID;
-		this.updateCounters=updateCounters;
-	}
-
 	public StatusInteractionController(String accountID){
-		this(accountID, true);
+		this.accountID=accountID;
 	}
 
 	public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
@@ -48,7 +41,7 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -57,16 +50,16 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
-	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){
+	public void setReblogged(Status status, boolean reblogged, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -74,7 +67,7 @@ public class StatusInteractionController{
 		if(current!=null){
 			current.cancel();
 		}
-		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged, visibility)
+		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Status reblog){
@@ -82,7 +75,7 @@ public class StatusInteractionController{
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -91,13 +84,13 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
@@ -118,7 +111,7 @@ public class StatusInteractionController{
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
 						cb.accept(result);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
 					@Override
@@ -127,12 +120,12 @@ public class StatusInteractionController{
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
 						cb.accept(status);
-						if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningBookmarkRequests.put(status.id, req);
 		status.bookmarked=bookmarked;
-		if (updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+		E.post(new StatusCountersUpdatedEvent(status));
 	}
 }

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

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

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

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

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

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

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

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

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

@@ -1,19 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class CreateList extends MastodonAPIRequest<ListTimeline> {
-	public CreateList(String title, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.POST, "/lists", ListTimeline.class);
-		Request req = new Request();
-		req.title = title;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
-	}
-
-	public static class Request {
-		public String title;
-		public ListTimeline.RepliesPolicy repliesPolicy;
-	}
-}

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

@@ -1,10 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class DeleteList extends MastodonAPIRequest<Object> {
-	public DeleteList(String id) {
-		super(HttpMethod.DELETE, "/lists/" + id, Object.class);
-	}
-}

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

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

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

@@ -1,10 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class GetList extends MastodonAPIRequest<ListTimeline> {
-	public GetList(String id) {
-		super(HttpMethod.GET, "/lists/" + id, ListTimeline.class);
-	}
-}

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

@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import java.util.List;
+
+public class RemoveList extends MastodonAPIRequest<Object> {
+    public RemoveList(String listId){
+        super(HttpMethod.DELETE, "/lists/"+listId, Object.class);
+    }
+}

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

@@ -1,14 +0,0 @@
-package org.joinmastodon.android.api.requests.lists;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ListTimeline;
-
-public class UpdateList extends MastodonAPIRequest<ListTimeline> {
-	public UpdateList(String id, String title, ListTimeline.RepliesPolicy repliesPolicy) {
-		super(HttpMethod.PUT, "/lists/" + id, ListTimeline.class);
-		CreateList.Request req = new CreateList.Request();
-		req.title = title;
-		req.repliesPolicy = repliesPolicy;
-		setRequestBody(req);
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/markers/GetMarkers.java

@@ -1,17 +0,0 @@
-package org.joinmastodon.android.api.requests.markers;
-
-import org.joinmastodon.android.api.ApiUtils;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Marker;
-import org.joinmastodon.android.model.Markers;
-
-import java.util.EnumSet;
-
-public class GetMarkers extends MastodonAPIRequest<Markers> {
-	public GetMarkers(EnumSet<Marker.Type> timelines) {
-		super(HttpMethod.GET, "/markers", Markers.class);
-		for (String type : ApiUtils.enumSetToStrings(timelines, Marker.Type.class)){
-			addQueryParameter("timeline[]", type);
-		}
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java

@@ -1,17 +0,0 @@
-package org.joinmastodon.android.api.requests.notifications;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.ApiUtils;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Notification;
-
-import java.util.EnumSet;
-import java.util.List;
-
-public class DismissNotification extends MastodonAPIRequest<Object>{
-	public DismissNotification(String id){
-		super(HttpMethod.POST, "/notifications/" + (id != null ? id + "/dismiss" : "clear"), Object.class);
-		setRequestBody(new Object());
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/GetNotifications.java

@@ -1,5 +1,6 @@
 package org.joinmastodon.android.api.requests.notifications;
 
+import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.ApiUtils;
@@ -10,24 +11,18 @@ import java.util.EnumSet;
 import java.util.List;
 
 public class GetNotifications extends MastodonAPIRequest<List<Notification>>{
-	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes, boolean isPleromaInstance){
+	public GetNotifications(String maxID, int limit, EnumSet<Notification.Type> includeTypes){
 		super(HttpMethod.GET, "/notifications", new TypeToken<>(){});
 		if(maxID!=null)
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
 		if(includeTypes!=null){
-			if(!isPleromaInstance) {
-				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
-					addQueryParameter("types[]", type);
-				}
-				for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
-					addQueryParameter("exclude_types[]", type);
-				}
-			}else{
-				for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
-					addQueryParameter("include_types[]", type);
-				}
+			for(String type:ApiUtils.enumSetToStrings(includeTypes, Notification.Type.class)){
+				addQueryParameter("types[]", type);
+			}
+			for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), Notification.Type.class)){
+				addQueryParameter("exclude_types[]", type);
 			}
 		}
 		removeUnsupportedItems=true;

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/PleromaMarkNotificationsRead.java

@@ -1,30 +0,0 @@
-package org.joinmastodon.android.api.requests.notifications;
-
-import android.text.TextUtils;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Notification;
-
-import java.util.List;
-
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-
-public class PleromaMarkNotificationsRead extends MastodonAPIRequest<List<Notification>> {
-    private String maxID;
-    public PleromaMarkNotificationsRead(String maxID) {
-        super(HttpMethod.POST, "/pleroma/notifications/read", new TypeToken<>(){});
-        this.maxID = maxID;
-    }
-
-    @Override
-    public RequestBody getRequestBody() {
-        MultipartBody.Builder builder=new MultipartBody.Builder()
-                .setType(MultipartBody.FORM);
-        if(!TextUtils.isEmpty(maxID))
-            builder.addFormDataPart("max_id", maxID);
-        return builder.build();
-    }
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/RegisterForPushNotifications.java

@@ -9,7 +9,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 		Request r=new Request();
 		r.subscription.endpoint="https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;
 		r.data.alerts=alerts;
-		r.policy=policy;
+		r.data.policy=policy;
 		r.subscription.keys.p256dh=encryptionKey;
 		r.subscription.keys.auth=authKey;
 		setRequestBody(r);
@@ -18,7 +18,6 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 	private static class Request{
 		public Subscription subscription=new Subscription();
 		public Data data=new Data();
-		public PushSubscription.Policy policy;
 
 		private static class Keys{
 			public String p256dh;
@@ -32,6 +31,7 @@ public class RegisterForPushNotifications extends MastodonAPIRequest<PushSubscri
 
 		private static class Data{
 			public PushSubscription.Alerts alerts;
+			public PushSubscription.Policy policy;
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/UpdatePushSettings.java

@@ -3,36 +3,23 @@ package org.joinmastodon.android.api.requests.notifications;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.PushSubscription;
 
-import java.io.IOException;
-
-import okhttp3.Response;
-
 public class UpdatePushSettings extends MastodonAPIRequest<PushSubscription>{
-	private final PushSubscription.Policy policy;
-
 	public UpdatePushSettings(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
 		super(HttpMethod.PUT, "/push/subscription", PushSubscription.class);
 		setRequestBody(new Request(alerts, policy));
-		this.policy=policy;
-	}
-
-	@Override
-	public void validateAndPostprocessResponse(PushSubscription respObj, Response httpResponse) throws IOException{
-		super.validateAndPostprocessResponse(respObj, httpResponse);
-		respObj.policy=policy;
 	}
 
 	private static class Request{
 		public Data data=new Data();
-		public PushSubscription.Policy policy;
 
 		public Request(PushSubscription.Alerts alerts, PushSubscription.Policy policy){
 			this.data.alerts=alerts;
-			this.policy=policy;
+			this.data.policy=policy;
 		}
 
 		private static class Data{
 			public PushSubscription.Alerts alerts;
+			public PushSubscription.Policy policy;
 		}
 	}
 }

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

@@ -11,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest<Application>{
 	}
 
 	private static class Request{
-		public String clientName="Megalodon";
+		public String clientName="Moshidon";
 		public String redirectUris=AccountSessionManager.REDIRECT_URI;
 		public String scopes=AccountSessionManager.SCOPE;
-		public String website="https://sk22.github.io/megalodon";
+		public String website="https://github.com/LucasGGamerM/moshidon";
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/CreateStatus.java

@@ -1,8 +1,6 @@
 package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.ContentType;
-import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
@@ -11,44 +9,23 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CreateStatus extends MastodonAPIRequest<Status>{
-	public static final Instant DRAFTS_AFTER_INSTANT = Instant.ofEpochMilli(253370764799999L) /* end of 9998 */;
-	private static final float draftFactor = 31536000000f /* one year */ / 253370764799999f /* end of 9998 */;
-
-	public static Instant getDraftInstant() {
-		// returns an instant between 9999-01-01 00:00:00 and 9999-12-31 23:59:59
-		// yes, this is a weird implementation for something that hardly matters
-		return DRAFTS_AFTER_INSTANT.plusMillis(1 + (long) (System.currentTimeMillis() * draftFactor));
-	}
-
 	public CreateStatus(CreateStatus.Request req, String uuid){
 		super(HttpMethod.POST, "/statuses", Status.class);
 		setRequestBody(req);
 		addHeader("Idempotency-Key", uuid);
 	}
 
-	public static class Scheduled extends MastodonAPIRequest<ScheduledStatus>{
-		public Scheduled(CreateStatus.Request req, String uuid){
-			super(HttpMethod.POST, "/statuses", ScheduledStatus.class);
-			setRequestBody(req);
-			addHeader("Idempotency-Key", uuid);
-		}
-	}
-
 	public static class Request{
 		public String status;
 		public List<String> mediaIds;
 		public Poll poll;
 		public String inReplyToId;
 		public boolean sensitive;
-		public boolean localOnly;
 		public String spoilerText;
 		public StatusPrivacy visibility;
 		public Instant scheduledAt;
 		public String language;
 
-		public String quoteId;
-		public ContentType contentType;
-
 		public static class Poll{
 			public ArrayList<String> options=new ArrayList<>();
 			public int expiresIn;

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/DeleteStatus.java

@@ -7,10 +7,4 @@ public class DeleteStatus extends MastodonAPIRequest<Status>{
 	public DeleteStatus(String id){
 		super(HttpMethod.DELETE, "/statuses/"+id, Status.class);
 	}
-
-	public static class Scheduled extends MastodonAPIRequest<Object> {
-		public Scheduled(String id) {
-			super(HttpMethod.DELETE, "/scheduled_statuses/"+id, Object.class);
-		}
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetScheduledStatuses.java

@@ -1,16 +0,0 @@
-package org.joinmastodon.android.api.requests.statuses;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.api.requests.HeaderPaginationRequest;
-import org.joinmastodon.android.model.ScheduledStatus;
-
-public class GetScheduledStatuses extends HeaderPaginationRequest<ScheduledStatus>{
-	public GetScheduledStatuses(String maxID, int limit){
-		super(HttpMethod.GET, "/scheduled_statuses", new TypeToken<>(){});
-		if(maxID!=null)
-			addQueryParameter("max_id", maxID);
-		if(limit>0)
-			addQueryParameter("limit", limit+"");
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusSourceText.java

@@ -2,22 +2,17 @@ package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.model.BaseModel;
-import org.joinmastodon.android.model.ContentType;
 
 public class GetStatusSourceText extends MastodonAPIRequest<GetStatusSourceText.Response>{
 	public GetStatusSourceText(String id){
 		super(HttpMethod.GET, "/statuses/"+id+"/source", Response.class);
 	}
 
+	@AllFieldsAreRequired
 	public static class Response extends BaseModel{
-		@RequiredField
 		public String id;
-		@RequiredField
 		public String text;
-		@RequiredField
 		public String spoilerText;
-		public ContentType contentType;
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/SetStatusReblogged.java

@@ -2,17 +2,10 @@ package org.joinmastodon.android.api.requests.statuses;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.StatusPrivacy;
 
 public class SetStatusReblogged extends MastodonAPIRequest<Status>{
-	public SetStatusReblogged(String id, boolean reblogged, StatusPrivacy visibility){
+	public SetStatusReblogged(String id, boolean reblogged){
 		super(HttpMethod.POST, "/statuses/"+id+"/"+(reblogged ? "reblog" : "unreblog"), Status.class);
-		Request req = new Request();
-		req.visibility = visibility;
-		setRequestBody(req);
-	}
-
-	public static class Request {
-		public StatusPrivacy visibility;
+		setRequestBody(new Object());
 	}
 }

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

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

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

@@ -1,23 +0,0 @@
-package org.joinmastodon.android.api.requests.timelines;
-
-import android.text.TextUtils;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Status;
-
-import java.util.List;
-
-public class GetBubbleTimeline extends MastodonAPIRequest<List<Status>> {
-    public GetBubbleTimeline(String maxID, int limit) {
-        super(HttpMethod.GET, "/timelines/bubble", new TypeToken<>(){});
-        if(!TextUtils.isEmpty(maxID))
-            addQueryParameter("max_id", maxID);
-        if(limit>0)
-            addQueryParameter("limit", limit+"");
-        if(GlobalUserPreferences.replyVisibility != null)
-            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
-    }
-}

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -17,7 +16,5 @@ public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("min_id", minID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
-		if(GlobalUserPreferences.replyVisibility != null)
-			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -19,7 +18,5 @@ public class GetHomeTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
-		if(GlobalUserPreferences.replyVisibility != null)
-			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.api.requests.timelines;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -19,7 +18,5 @@ public class GetListTimeline extends MastodonAPIRequest<List<Status>> {
             addQueryParameter("limit", ""+limit);
         if(sinceID!=null)
             addQueryParameter("since_id", sinceID);
-        if(GlobalUserPreferences.replyVisibility != null)
-            addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
     }
 }

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

@@ -4,7 +4,6 @@ import android.text.TextUtils;
 
 import com.google.gson.reflect.TypeToken;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
 
@@ -21,7 +20,5 @@ public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
 			addQueryParameter("max_id", maxID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
-		if(GlobalUserPreferences.replyVisibility != null)
-			addQueryParameter("reply_visibility", GlobalUserPreferences.replyVisibility);
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java

@@ -8,11 +8,9 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetTrendingStatuses extends MastodonAPIRequest<List<Status>>{
-	public GetTrendingStatuses(int offset, int limit){
+	public GetTrendingStatuses(int limit){
 		super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){});
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
-		if(offset>0)
-			addQueryParameter("offset", ""+offset);
 	}
 }

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

@@ -1,7 +1,5 @@
 package org.joinmastodon.android.api.session;
 
-import android.net.Uri;
-
 import org.joinmastodon.android.api.CacheController;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
@@ -9,15 +7,12 @@ import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.Token;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class AccountSession{
 	public Token token;
@@ -36,9 +31,8 @@ public class AccountSession{
 	public String pushAccountID;
 	public Preferences preferences;
 	public AccountActivationInfo activationInfo;
-	public Markers markers;
 	private transient MastodonAPIController apiController;
-	private transient StatusInteractionController statusInteractionController, remoteStatusInteractionController;
+	private transient StatusInteractionController statusInteractionController;
 	private transient CacheController cacheController;
 	private transient PushSubscriptionManager pushSubscriptionManager;
 
@@ -58,10 +52,6 @@ public class AccountSession{
 		return domain+"_"+self.id;
 	}
 
-	public String getFullUsername() {
-		return "@"+self.username+"@"+domain;
-	}
-
 	public MastodonAPIController getApiController(){
 		if(apiController==null)
 			apiController=new MastodonAPIController(this);
@@ -74,12 +64,6 @@ public class AccountSession{
 		return statusInteractionController;
 	}
 
-	public StatusInteractionController getRemoteStatusInteractionController(){
-		if(remoteStatusInteractionController==null)
-			remoteStatusInteractionController=new StatusInteractionController(getID(), false);
-		return remoteStatusInteractionController;
-	}
-
 	public CacheController getCacheController(){
 		if(cacheController==null)
 			cacheController=new CacheController(getID());
@@ -91,15 +75,4 @@ public class AccountSession{
 			pushSubscriptionManager=new PushSubscriptionManager(getID());
 		return pushSubscriptionManager;
 	}
-
-	public Optional<Instance> getInstance() {
-		return Optional.ofNullable(AccountSessionManager.getInstance().getInstanceInfo(domain));
-	}
-
-	public Uri getInstanceUri() {
-		return new Uri.Builder()
-				.scheme("https")
-				.authority(getInstance().map(i -> i.normalizedUri).orElse(domain))
-				.build();
-	}
 }

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

@@ -13,9 +13,10 @@ import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
+import com.google.gson.JsonParseException;
+
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -26,7 +27,6 @@ import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
 import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
-import org.joinmastodon.android.api.requests.markers.GetMarkers;
 import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
 import org.joinmastodon.android.events.EmojiUpdatedEvent;
 import org.joinmastodon.android.model.Account;
@@ -35,8 +35,6 @@ 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.Marker;
-import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
 import org.joinmastodon.android.model.Token;
 
@@ -50,7 +48,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -66,7 +63,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class AccountSessionManager{
 	private static final String TAG="AccountSessionManager";
 	public static final String SCOPE="read write follow push";
-	public static final String REDIRECT_URI="megalodon-android-auth://callback";
+	public static final String REDIRECT_URI="moshidon-android-auth://callback";
 
 	private static final AccountSessionManager instance=new AccountSessionManager();
 
@@ -107,17 +104,12 @@ public class AccountSessionManager{
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
 		instances.put(instance.uri, instance);
+		updateInstanceInfoV2(instance);
 		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
-
-		// write initial instance info to file immediately to avoid sessions without instance info
-		InstanceInfoStorageWrapper wrapper = new InstanceInfoStorageWrapper();
-		wrapper.instance = instance;
-		MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, instance.uri));
-
-		updateMoreInstanceInfo(instance, instance.uri);
+		updateInstanceEmojis(instance, instance.uri);
 		if(PushSubscriptionManager.arePushNotificationsAvailable()){
 			session.getPushSubscriptionManager().registerAccountForPush(null);
 		}
@@ -125,16 +117,14 @@ public class AccountSessionManager{
 	}
 
 	public synchronized void writeAccountsFile(){
-		File tmpFile = new File(MastodonApp.context.getFilesDir(), "accounts.json~");
-		File file = new File(MastodonApp.context.getFilesDir(), "accounts.json");
+		File file=new File(MastodonApp.context.getFilesDir(), "accounts.json");
 		try{
-			try(FileOutputStream out=new FileOutputStream(tmpFile)){
+			try(FileOutputStream out=new FileOutputStream(file)){
 				SessionsStorageWrapper w=new SessionsStorageWrapper();
 				w.accounts=new ArrayList<>(sessions.values());
 				OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 				MastodonAPIController.gson.toJson(w, writer);
 				writer.flush();
-				if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 			}
 		}catch(IOException x){
 			Log.e(TAG, "Error writing accounts file", x);
@@ -187,7 +177,6 @@ public class AccountSessionManager{
 		AccountSession session=getAccount(id);
 		session.getCacheController().closeDatabase();
 		MastodonApp.context.deleteDatabase(id+".db");
-		GlobalUserPreferences.removeAccount(id);
 		sessions.remove(id);
 		if(lastActiveAccountID.equals(id)){
 			if(sessions.isEmpty())
@@ -225,7 +214,7 @@ public class AccountSessionManager{
 								.path("/oauth/authorize")
 								.appendQueryParameter("response_type", "code")
 								.appendQueryParameter("client_id", result.clientId)
-								.appendQueryParameter("redirect_uri", "megalodon-android-auth://callback")
+								.appendQueryParameter("redirect_uri", "moshidon-android-auth://callback")
 								.appendQueryParameter("scope", SCOPE)
 								.build();
 
@@ -258,44 +247,30 @@ public class AccountSessionManager{
 	}
 
 	public void maybeUpdateLocalInfo(){
-		maybeUpdateLocalInfo(null);
-	}
-
-	public void maybeUpdateLocalInfo(AccountSession activeSession){
 		long now=System.currentTimeMillis();
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-			if(now-session.infoLastUpdated>24L*3600_000L || session == activeSession){
-				updateSessionPreferences(session);
-				updateSessionLocalInfo(session);
-			}
-			if(now-session.filtersLastUpdated>3600_000L || session == activeSession){
-				updateSessionWordFilters(session);
-			}
-			updateSessionMarkers(session);
+//			if(now-session.infoLastUpdated>24L*3600_000L){
+			updateSessionPreferences(session);
+			updateSessionLocalInfo(session);
+//			}
+//			if(now-session.filtersLastUpdated>3600_000L){
+			updateSessionWordFilters(session);
+//			}
 		}
 		if(loadedInstances){
-			maybeUpdateCustomEmojis(domains, activeSession != null ? activeSession.domain : null);
+			maybeUpdateCustomEmojis(domains);
 		}
 	}
 
-	private void maybeUpdateCustomEmojis(Set<String> domains, String activeDomain){
+	private void maybeUpdateCustomEmojis(Set<String> domains){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-			Long lastUpdated=instancesLastUpdated.get(domain);
-			if(lastUpdated==null || now-lastUpdated>24L*3600_000L || domain.equals(activeDomain)){
-				updateInstanceInfo(domain);
-			}
-		}
-	}
-
-	private void preferencesFromSource(AccountSession session, Account account) {
-		if (account != null && account.source != null && session.preferences != null) {
-			if (account.source.privacy != null)
-				session.preferences.postingDefaultVisibility = account.source.privacy;
-			if (account.source.language != null)
-				session.preferences.postingDefaultLanguage = account.source.language;
+//			Long lastUpdated=instancesLastUpdated.get(domain);
+//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
+			updateInstanceInfo(domain);
+//			}
 		}
 	}
 
@@ -306,12 +281,13 @@ public class AccountSessionManager{
 					public void onSuccess(Account result){
 						session.self=result;
 						session.infoLastUpdated=System.currentTimeMillis();
-						preferencesFromSource(session, result);
 						writeAccountsFile();
 					}
 
 					@Override
-					public void onError(ErrorResponse error){}
+					public void onError(ErrorResponse error){
+
+					}
 				})
 				.exec(session.getID());
 	}
@@ -321,14 +297,10 @@ public class AccountSessionManager{
 			@Override
 			public void onSuccess(Preferences preferences) {
 				session.preferences=preferences;
-				preferencesFromSource(session, session.self);
 			}
 
 			@Override
-			public void onError(ErrorResponse error) {
-				session.preferences = new Preferences();
-				preferencesFromSource(session, session.self);
-			}
+			public void onError(ErrorResponse error) {}
 		}).exec(session.getID());
 	}
 
@@ -350,28 +322,16 @@ public class AccountSessionManager{
 				.exec(session.getID());
 	}
 
-	private void updateSessionMarkers(AccountSession session) {
-		new GetMarkers(EnumSet.allOf(Marker.Type.class)).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Markers markers) {
-				session.markers = markers;
-				writeAccountsFile();
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-
-			}
-		}).exec(session.getID());
-	}
-
 	public void updateInstanceInfo(String domain){
 		new GetInstance()
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
-						updateMoreInstanceInfo(instance, domain);
+						updateInstanceEmojis(instance, domain);
+						try {
+							updateInstanceInfoV2(instance);
+						} catch (Exception ignored) {}
 					}
 
 					@Override
@@ -382,18 +342,16 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
-	public void updateMoreInstanceInfo(Instance instance, String domain) {
+	public void updateInstanceInfoV2(Instance instance) {
 		new GetInstance.V2().setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Instance.V2 v2) {
 				if (instance != null) instance.v2 = v2;
-				updateInstanceEmojis(instance, domain);
+				writeAccountsFile();
 			}
 
 			@Override
-			public void onError(ErrorResponse errorResponse) {
-				updateInstanceEmojis(instance, domain);
-			}
+			public void onError(ErrorResponse errorResponse) {}
 		}).execNoAuth(instance.uri);
 	}
 
@@ -414,9 +372,7 @@ public class AccountSessionManager{
 
 					@Override
 					public void onError(ErrorResponse error){
-						InstanceInfoStorageWrapper wrapper=new InstanceInfoStorageWrapper();
-						wrapper.instance = instance;
-						MastodonAPIController.runInBackground(()->writeInstanceInfoFile(wrapper, domain));
+
 					}
 				})
 				.execNoAuth(domain);
@@ -427,13 +383,10 @@ public class AccountSessionManager{
 	}
 
 	private void writeInstanceInfoFile(InstanceInfoStorageWrapper emojis, String domain){
-		File file = getInstanceInfoFile(domain);
-		File tmpFile = new File(file.getPath() + "~");
-		try(FileOutputStream out=new FileOutputStream(tmpFile)){
+		try(FileOutputStream out=new FileOutputStream(getInstanceInfoFile(domain))){
 			OutputStreamWriter writer=new OutputStreamWriter(out, StandardCharsets.UTF_8);
 			MastodonAPIController.gson.toJson(emojis, writer);
 			writer.flush();
-			if (!tmpFile.renameTo(file)) Log.e(TAG, "Error renaming " + tmpFile.getPath() + " to " + file.getPath());
 		}catch(IOException x){
 			Log.w(TAG, "Error writing instance info file for "+domain, x);
 		}
@@ -453,7 +406,7 @@ public class AccountSessionManager{
 		}
 		if(!loadedInstances){
 			loadedInstances=true;
-			maybeUpdateCustomEmojis(domains, null);
+			maybeUpdateCustomEmojis(domains);
 		}
 	}
 
@@ -477,6 +430,10 @@ public class AccountSessionManager{
 		return instances.get(domain);
 	}
 
+	public Instance getInstanceInfoForAccount(String account) {
+		return AccountSessionManager.getInstance().getInstanceInfo(instance.getAccount(account).domain);
+	}
+
 	public void updateAccountInfo(String id, Account account){
 		AccountSession session=getAccount(id);
 		session.self=account;

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

@@ -1,4 +0,0 @@
-package org.joinmastodon.android.events;
-
-public class AllNotificationsSeenEvent {
-}

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

@@ -1,11 +0,0 @@
-package org.joinmastodon.android.events;
-
-public class HashtagUpdatedEvent {
-	public final String name;
-	public final boolean following;
-
-	public HashtagUpdatedEvent(String name, boolean following) {
-		this.name = name;
-		this.following = following;
-	}
-}

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

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

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

@@ -1,15 +0,0 @@
-package org.joinmastodon.android.events;
-
-import org.joinmastodon.android.model.ListTimeline;
-
-public class ListUpdatedCreatedEvent {
-	public final String id;
-	public final String title;
-	public final ListTimeline.RepliesPolicy repliesPolicy;
-
-	public ListUpdatedCreatedEvent(String id, String title, ListTimeline.RepliesPolicy repliesPolicy) {
-		this.id = id;
-		this.title = title;
-		this.repliesPolicy = repliesPolicy;
-	}
-}

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

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

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

@@ -1,13 +0,0 @@
-package org.joinmastodon.android.events;
-
-import org.joinmastodon.android.model.ScheduledStatus;
-
-public class ScheduledStatusCreatedEvent {
-	public final ScheduledStatus scheduledStatus;
-	public final String accountID;
-
-	public ScheduledStatusCreatedEvent(ScheduledStatus scheduledStatus, String accountID){
-		this.scheduledStatus = scheduledStatus;
-		this.accountID=accountID;
-	}
-}

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

@@ -1,13 +0,0 @@
-package org.joinmastodon.android.events;
-
-import org.joinmastodon.android.model.ScheduledStatus;
-
-public class ScheduledStatusDeletedEvent{
-	public final String id;
-	public final String accountID;
-
-	public ScheduledStatusDeletedEvent(String id, String accountID){
-		this.id=id;
-		this.accountID=accountID;
-	}
-}

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
@@ -12,15 +11,12 @@ import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 import org.parceler.Parcels;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.api.SimpleCallback;
 
@@ -60,13 +56,8 @@ public class AccountTimelineFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if(getActivity()==null) return;
-						AccountSessionManager asm = AccountSessionManager.getInstance();
-						result=result.stream().filter(status -> {
-							// don't hide own posts in own profile
-							if (asm.isSelf(accountID, user) && asm.isSelf(accountID, status.account)) return true;
-							else return new StatusFilterPredicate(accountID, getFilterContext()).test(status);
-						}).collect(Collectors.toList());
+						if(getActivity()==null)
+							return;
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -86,8 +77,7 @@ public class AccountTimelineFragment extends StatusListFragment{
 	}
 
 	protected void onStatusCreated(StatusCreatedEvent ev){
-		AccountSessionManager asm = AccountSessionManager.getInstance();
-		if(!asm.isSelf(accountID, ev.status.account) || !asm.isSelf(accountID, user))
+		if(!AccountSessionManager.getInstance().isSelf(accountID, ev.status.account))
 			return;
 		if(filter==GetAccountStatuses.Filter.PINNED) return;
 		if(filter==GetAccountStatuses.Filter.DEFAULT){
@@ -125,19 +115,4 @@ public class AccountTimelineFragment extends StatusListFragment{
 	protected void onRemoveAccountPostsEvent(RemoveAccountPostsEvent ev){
 		// no-op
 	}
-
-
-	@Override
-	protected Filter.FilterContext getFilterContext() {
-		return Filter.FilterContext.ACCOUNT;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		// could return different uris based on filter (e.g. media -> "/media"), but i want to
-		// return the remote url to the user, and i don't know whether i'd need to append
-		// '#media' (akkoma/pleroma) or '/media' (glitch/mastodon) since i don't know anything
-		// about the remote instance. so, just returning the base url to the user instead
-		return Uri.parse(user.url);
-	}
 }

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

@@ -1,112 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static java.util.stream.Collectors.toList;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageButton;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
-import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Announcement;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.ScheduledStatus;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.PaginatedList;
-import me.grishka.appkit.api.SimpleCallback;
-
-public class AnnouncementsFragment extends BaseStatusListFragment<Announcement> {
-	private Instance instance;
-	private AccountSession session;
-	private List<String> unreadIDs = null;
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		setTitle(R.string.sk_announcements);
-		session = AccountSessionManager.getInstance().getAccount(accountID);
-		instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
-		loadData();
-	}
-
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(Announcement a) {
-		if(TextUtils.isEmpty(a.content)) return List.of();
-		Account instanceUser = new Account();
-		instanceUser.id = instanceUser.acct = instanceUser.username = session.domain;
-		instanceUser.displayName = instance.title;
-		instanceUser.url = "https://"+session.domain+"/about";
-		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
-		instanceUser.emojis = List.of();
-		Status fakeStatus = a.toStatus();
-		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
-		textItem.textSelectable = true;
-		return List.of(
-				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
-				textItem
-		);
-	}
-
-	public void onMarkAsRead(String id) {
-		if (unreadIDs == null) return;
-		unreadIDs.remove(id);
-		if (unreadIDs.isEmpty()) setResult(true, null);
-	}
-
-	@Override
-	protected void addAccountToKnown(Announcement s) {}
-
-	@Override
-	public void onItemClick(String id) {}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetAnnouncements(true)
-				.setCallback(new SimpleCallback<>(this){
-					@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());
-					}
-				})
-				.exec(accountID);
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return isInstanceAkkoma() ? base.path("/announcements").build() : null;
-	}
-}

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -17,8 +16,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
-import android.view.animation.TranslateAnimation;
-import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.E;
@@ -26,7 +23,6 @@ import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.polls.SubmitPollVote;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.DisplayItemsParent;
@@ -34,22 +30,20 @@ import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.PhotoLayoutHelper;
+import org.joinmastodon.android.ui.TileGridLayoutManager;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.MediaGridStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.WarningFilteredStatusDisplayItem;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewer;
 import org.joinmastodon.android.ui.photoviewer.PhotoViewerHost;
-import org.joinmastodon.android.ui.utils.MediaAttachmentViewController;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.joinmastodon.android.utils.TypedObjectPool;
+import org.joinmastodon.android.ui.views.ImageAttachmentFrameLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -60,11 +54,11 @@ import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 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;
@@ -72,31 +66,22 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends RecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
+public abstract class BaseStatusListFragment<T extends DisplayItemsParent> extends BaseRecyclerFragment<T> implements PhotoViewerHost, ScrollableToTop{
 	protected ArrayList<StatusDisplayItem> displayItems=new ArrayList<>();
 	protected DisplayItemsAdapter adapter;
 	protected String accountID;
 	protected PhotoViewer currentPhotoViewer;
-	protected ImageButton fab;
-	protected int scrollDiff = 0;
 	protected HashMap<String, Account> knownAccounts=new HashMap<>();
 	protected HashMap<String, Relationship> relationships=new HashMap<>();
 	protected Rect tmpRect=new Rect();
-	protected TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> attachmentViewsPool=new TypedObjectPool<>(this::makeNewMediaAttachmentView);
 
 	public BaseStatusListFragment(){
 		super(20);
-		if (wantsComposeButton()) setListLayoutId(R.layout.recycler_fragment_with_fab);
-	}
-
-	protected boolean wantsComposeButton() {
-		return false;
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		UiUtils.loadMaxWidth(getContext());
 		if(GlobalUserPreferences.disableMarquee){
 			setTitleMarqueeEnabled(false);
 			setSubtitleMarqueeEnabled(false);
@@ -133,7 +118,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		displayItems.clear();
 	}
 
-	protected int prependItems(List<T> items, boolean notify){
+	protected void prependItems(List<T> items, boolean notify){
 		data.addAll(0, items);
 		int offset=0;
 		for(T s:items){
@@ -146,7 +131,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		}
 		if(notify)
 			adapter.notifyItemRangeInserted(0, offset);
-		return offset;
 	}
 
 	protected String getMaxID(){
@@ -192,21 +176,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	}
 
 	@Override
-	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex, MediaGridStatusDisplayItem.Holder gridHolder){
-		final Status status=_status.getContentStatus();
+	public void openPhotoViewer(String parentID, Status _status, int attachmentIndex){
+		final Status status=_status.reblog!=null ? _status.reblog : _status;
 		currentPhotoViewer=new PhotoViewer(getActivity(), status.mediaAttachments, attachmentIndex, new PhotoViewer.Listener(){
-			private MediaAttachmentViewController transitioningHolder;
+			private ImageStatusDisplayItem.Holder<?> transitioningHolder;
 
 			@Override
 			public void setPhotoViewVisibility(int index, boolean visible){
-				MediaAttachmentViewController holder=findPhotoViewHolder(index);
+				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					holder.photo.setAlpha(visible ? 1f : 0f);
 			}
 
 			@Override
 			public boolean startPhotoViewTransition(int index, @NonNull Rect outRect, @NonNull int[] outCornerRadius){
-				MediaAttachmentViewController holder=findPhotoViewHolder(index);
+				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
 				if(holder!=null){
 					transitioningHolder=holder;
 					View view=transitioningHolder.photo;
@@ -214,8 +198,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					view.getLocationOnScreen(pos);
 					outRect.set(pos[0], pos[1], pos[0]+view.getWidth(), pos[1]+view.getHeight());
 					list.setClipChildren(false);
-					gridHolder.setClipChildren(false);
-					transitioningHolder.view.setElevation(1f);
+					transitioningHolder.itemView.setElevation(1f);
 					return true;
 				}
 				return false;
@@ -242,16 +225,15 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				view.setTranslationY(0f);
 				view.setScaleX(1f);
 				view.setScaleY(1f);
-				transitioningHolder.view.setElevation(0f);
+				transitioningHolder.itemView.setElevation(0f);
 				if(list!=null)
 					list.setClipChildren(true);
-				gridHolder.setClipChildren(true);
 				transitioningHolder=null;
 			}
 
 			@Override
 			public Drawable getPhotoViewCurrentDrawable(int index){
-				MediaAttachmentViewController holder=findPhotoViewHolder(index);
+				ImageStatusDisplayItem.Holder<?> holder=findPhotoViewHolder(index);
 				if(holder!=null)
 					return holder.photo.getDrawable();
 				return null;
@@ -267,71 +249,35 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				requestPermissions(permissions, PhotoViewer.PERMISSION_REQUEST);
 			}
 
-			private MediaAttachmentViewController findPhotoViewHolder(int index){
-				return gridHolder.getViewController(index);
+			private ImageStatusDisplayItem.Holder<?> findPhotoViewHolder(int index){
+				if(list==null)
+					return null;
+				int offset=0;
+				for(StatusDisplayItem item:displayItems){
+					if(item.parentID.equals(parentID)){
+						if(item instanceof ImageStatusDisplayItem){
+							RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(getMainAdapterOffset()+offset+index);
+							if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
+								return imgHolder;
+							}
+							return null;
+						}
+					}
+					offset++;
+				}
+				return null;
 			}
 		});
 	}
 
-	@Override
-	public @Nullable View getFab() {
-		if (getParentFragment() instanceof HasFab l) return l.getFab();
-		else return fab;
-	}
-
-	@Override
-	public void showFab() {
-		View fab = getFab();
-		if (fab == null || fab.getVisibility() == View.VISIBLE) return;
-		fab.setVisibility(View.VISIBLE);
-		TranslateAnimation animate = new TranslateAnimation(
-				0,
-				0,
-				fab.getHeight() * 2,
-				0);
-		animate.setDuration(300);
-		fab.startAnimation(animate);
-	}
-
-	@Override
-	public void hideFab() {
-		View fab = getFab();
-		if (fab == null || fab.getVisibility() != View.VISIBLE) return;
-		TranslateAnimation animate = new TranslateAnimation(
-				0,
-				0,
-				0,
-				fab.getHeight() * 2);
-		animate.setDuration(300);
-		fab.startAnimation(animate);
-		fab.setVisibility(View.INVISIBLE);
-		scrollDiff = 0;
-	}
-
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		fab=view.findViewById(R.id.fab);
-
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
-
-				View fab = getFab();
-				if (fab!=null && GlobalUserPreferences.autoHideFab) {
-					if (dy > 0 && fab.getVisibility() == View.VISIBLE) {
-						hideFab();
-					} else if (dy < 0 && fab.getVisibility() != View.VISIBLE) {
-						if (list.getChildAt(0).getTop() == 0 || scrollDiff > 400) {
-							showFab();
-							scrollDiff = 0;
-						} else {
-							scrollDiff += Math.abs(dy);
-						}
-					}
-				}
 			}
 		});
 		list.addItemDecoration(new StatusListItemDecoration());
@@ -357,12 +303,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 								outRect.left=Math.min(outRect.left, tmpRect.left);
 								outRect.top=Math.min(outRect.top, tmpRect.top);
 								outRect.right=Math.max(outRect.right, tmpRect.right);
-								int bottom = tmpRect.bottom;
-								if (holder instanceof FooterStatusDisplayItem.Holder fh
-										&& fh.getItem().hasDescendantSibling) {
-									bottom += V.dp(8);
-								}
-								outRect.bottom=Math.max(outRect.bottom, bottom);
+								outRect.bottom=Math.max(outRect.bottom, tmpRect.bottom);
 							}
 						}
 					}
@@ -372,14 +313,31 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		list.setItemAnimator(new BetterItemAnimator());
 		((UsableRecyclerView) list).setIncludeMarginsInItemHitbox(true);
 		updateToolbar();
+	}
 
-		if (wantsComposeButton() && !getArguments().getBoolean("__disable_fab", false)) {
-			fab.setVisibility(View.VISIBLE);
-			fab.setOnClickListener(this::onFabClick);
-			fab.setOnLongClickListener(this::onFabLongClick);
-		} else if (fab != null) {
-			fab.setVisibility(View.GONE);
-		}
+	@Override
+	protected RecyclerView.LayoutManager onCreateLayoutManager(){
+		GridLayoutManager lm=new TileGridLayoutManager(getActivity(), 1000);
+		lm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup(){
+			@Override
+			public int getSpanSize(int position){
+				position-=getMainAdapterOffset();
+				if(position>=0 && position<displayItems.size()){
+					StatusDisplayItem item=displayItems.get(position);
+					if(item instanceof ImageStatusDisplayItem imgItem){
+						PhotoLayoutHelper.TiledLayoutResult layout=imgItem.tiledLayout;
+						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgItem.thisTile;
+						int spans=0;
+						for(int i=0;i<tile.colSpan;i++){
+							spans+=layout.columnSizes[tile.startCol+i];
+						}
+						return spans;
+					}
+				}
+				return 1000;
+			}
+		});
+		return lm;
 	}
 
 	@Override
@@ -500,7 +458,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		revealSpoiler(status, holder.getItemID());
 	}
 
-	public void onRevealSpoilerClick(MediaGridStatusDisplayItem.Holder holder){
+	public void onRevealSpoilerClick(ImageStatusDisplayItem.Holder<?> holder){
 		Status status=holder.getItem().status;
 		revealSpoiler(status, holder.getItemID());
 	}
@@ -520,7 +478,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		Status status=holder.getItem().status;
 		status.spoilerRevealed=!status.spoilerRevealed;
 		if(!TextUtils.isEmpty(status.spoilerText)){
-			TextStatusDisplayItem.Holder text = findHolderOfType(holder.getItemID(), TextStatusDisplayItem.Holder.class);
+			TextStatusDisplayItem.Holder text=findHolderOfType(holder.getItemID(), TextStatusDisplayItem.Holder.class);
 			if(text!=null){
 				adapter.notifyItemChanged(text.getAbsoluteAdapterPosition());
 			}
@@ -529,58 +487,23 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		updateImagesSpoilerState(status, holder.getItemID());
 	}
 
-	public void onEnableExpandable(TextStatusDisplayItem.Holder holder, boolean expandable) {
-		if (holder.getItem().status.textExpandable != expandable && list != null) {
-			holder.getItem().status.textExpandable = expandable;
-			HeaderStatusDisplayItem.Holder header = findHolderOfType(holder.getItemID(), HeaderStatusDisplayItem.Holder.class);
-			if (header != null) header.rebind();
-		}
-	}
-
-	public void onToggleExpanded(Status status, String itemID) {
-		status.textExpanded = !status.textExpanded;
-		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
-		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
-		if (text != null) text.rebind();
-		if (header != null) header.rebind();
-	}
-
 	protected void updateImagesSpoilerState(Status status, String itemID){
 		ArrayList<Integer> updatedPositions=new ArrayList<>();
-		MediaGridStatusDisplayItem.Holder mediaGrid=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
-		if(mediaGrid!=null){
-			mediaGrid.setRevealed(status.spoilerRevealed);
-			updatedPositions.add(mediaGrid.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		for(ImageStatusDisplayItem.Holder photo:(List<ImageStatusDisplayItem.Holder>)findAllHoldersOfType(itemID, ImageStatusDisplayItem.Holder.class)){
+			photo.setRevealed(status.spoilerRevealed);
+			updatedPositions.add(photo.getAbsoluteAdapterPosition()-getMainAdapterOffset());
 		}
 		int i=0;
 		for(StatusDisplayItem item:displayItems){
-			if(itemID.equals(item.parentID) && item instanceof MediaGridStatusDisplayItem && !updatedPositions.contains(i)){
+			if(itemID.equals(item.parentID) && item instanceof ImageStatusDisplayItem && !updatedPositions.contains(i)){
 				adapter.notifyItemChanged(i);
 			}
 			i++;
 		}
 	}
 
-	public void onImageUpdated(MediaGridStatusDisplayItem.Holder holder, int index) {
-		holder.rebind();
-		MediaGridStatusDisplayItem.Holder mediaGrid = findHolderOfType(holder.getItemID(), MediaGridStatusDisplayItem.Holder.class);
-		if(mediaGrid!=null){
-			adapter.notifyItemChanged(mediaGrid.getAbsoluteAdapterPosition());
-		}
-	}
-
 	public void onGapClick(GapStatusDisplayItem.Holder item){}
 
-	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
-		int startPos = warning.getAbsoluteAdapterPosition();
-		displayItems.remove(startPos);
-		displayItems.addAll(startPos, warning.filteredItems);
-		adapter.notifyItemRangeInserted(startPos, warning.filteredItems.size() - 1);
-		if (startPos == 0) scrollToTop();
-		warning.getItem().status.filterRevealed = true;
-	}
-
-	@Override
 	public String getAccountID(){
 		return accountID;
 	}
@@ -696,29 +619,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			currentPhotoViewer.onPause();
 	}
 
-	public void onFabClick(View v){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		Nav.go(getActivity(), ComposeFragment.class, args);
-	}
-
-	public boolean onFabLongClick(View v) {
-		return UiUtils.pickAccountForCompose(getActivity(), accountID);
-	}
-
-	private MediaAttachmentViewController makeNewMediaAttachmentView(MediaGridStatusDisplayItem.GridItemType type){
-		return new MediaAttachmentViewController(getActivity(), type);
-	}
-
-	public TypedObjectPool<MediaGridStatusDisplayItem.GridItemType, MediaAttachmentViewController> getAttachmentViewsPool(){
-		return attachmentViewsPool;
-	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		assistContent.setWebUri(getWebUri(getSession().getInstanceUri().buildUpon()));
-	}
-
 	protected class DisplayItemsAdapter extends UsableRecyclerView.Adapter<BindableViewHolder<StatusDisplayItem>> implements ImageLoaderRecyclerAdapter{
 
 		public DisplayItemsAdapter(){
@@ -756,6 +656,16 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		public ImageLoaderRequest getImageRequest(int position, int image){
 			return displayItems.get(position).getImageRequest(image);
 		}
+
+//		@Override
+//		public void onViewDetachedFromWindow(@NonNull BindableViewHolder<StatusDisplayItem> holder){
+//			if(holder instanceof ImageLoaderViewHolder){
+//				int count=holder.getItem().getImageCount();
+//				for(int i=0;i<count;i++){
+//					((ImageLoaderViewHolder) holder).clearImage(i);
+//				}
+//			}
+//		}
 	}
 
 	private class StatusListItemDecoration extends RecyclerView.ItemDecoration{
@@ -779,7 +689,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				RecyclerView.ViewHolder siblingHolder=parent.getChildViewHolder(bottomSibling);
 				if(holder instanceof StatusDisplayItem.Holder<?> ih && siblingHolder instanceof StatusDisplayItem.Holder<?> sh
 						&& (!ih.getItemID().equals(sh.getItemID()) || sh instanceof ExtendedFooterStatusDisplayItem.Holder) && ih.getItem().getType()!=StatusDisplayItem.Type.GAP){
-					if (ih.getItem().descendantLevel != 0 && ih.getItem().hasDescendantSibling) continue;
 					drawDivider(child, bottomSibling, holder, siblingHolder, parent, c, dividerPaint);
 				}
 			}
@@ -790,21 +699,25 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
+				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 						hiddenMediaPaint.setColor(0x80000000);
-						c.drawRect(child.getX(), child.getY(), child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
+						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
+						float hGap=tile.startCol>0 ? V.dp(1) : 0;
+						float vGap=tile.startRow>0 ? V.dp(1) : 0;
+						c.drawRect(child.getX()-hGap, child.getY()-vGap, child.getX()+child.getWidth(), child.getY()+child.getHeight(), hiddenMediaPaint);
 					}
 				}
 			}
 			for(int i=0;i<parent.getChildCount();i++){
 				View child=parent.getChildAt(i);
 				RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
-				if(holder instanceof MediaGridStatusDisplayItem.Holder imgHolder){
+				if(holder instanceof ImageStatusDisplayItem.Holder<?> imgHolder){
 					if(!imgHolder.getItem().status.spoilerRevealed){
-						if(TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
+						PhotoLayoutHelper.TiledLayoutResult.Tile tile=imgHolder.getItem().thisTile;
+						if(tile.startCol==0 && tile.startRow==0 && TextUtils.isEmpty(imgHolder.getItem().status.spoilerText)){
 							int listWidth=getListWidthForMediaLayout();
-							int width=Math.min(listWidth, UiUtils.MAX_WIDTH);
+							int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
 							if(currentMediaHiddenLayoutsWidth!=width)
 								rebuildMediaHiddenLayouts(width-V.dp(32));
 							c.save();
@@ -829,6 +742,47 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 		}
 
+		@Override
+		public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+			RecyclerView.ViewHolder holder=parent.getChildViewHolder(view);
+			if(holder instanceof ImageStatusDisplayItem.Holder){
+				int listWidth=getListWidthForMediaLayout();
+				int width=Math.min(listWidth, V.dp(ImageAttachmentFrameLayout.MAX_WIDTH));
+				PhotoLayoutHelper.TiledLayoutResult layout=((ImageStatusDisplayItem.Holder<?>) holder).getItem().tiledLayout;
+				PhotoLayoutHelper.TiledLayoutResult.Tile tile=((ImageStatusDisplayItem.Holder<?>) holder).getItem().thisTile;
+				if(tile.startCol+tile.colSpan<layout.columnSizes.length){
+					outRect.right=V.dp(1);
+				}
+				if(tile.startRow+tile.rowSpan<layout.rowSizes.length){
+					outRect.bottom=V.dp(1);
+				}
+
+				// For a view that spans rows, compensate its additional height so the row it's in stays the right height
+				if(tile.rowSpan>1){
+					outRect.bottom=-(Math.round(tile.height/1000f*width)-Math.round(layout.rowSizes[tile.startRow]/1000f*width));
+				}
+				// ...and for its siblings, offset those on rows below first to the right where they belong
+				if(tile.startCol>0 && layout.tiles[0].rowSpan>1 && tile.startRow>layout.tiles[0].startRow){
+					int xOffset=Math.round(layout.tiles[0].width/1000f*listWidth);
+					outRect.left=xOffset;
+					outRect.right=-xOffset;
+				}
+
+				// If the width of the media block is smaller than that of the RecyclerView, offset the views horizontally to center them
+				if(listWidth>width){
+					outRect.left+=(listWidth-V.dp(ImageAttachmentFrameLayout.MAX_WIDTH))/2;
+					if(tile.startCol>0){
+						int spanOffset=0;
+						for(int i=0;i<tile.startCol;i++){
+							spanOffset+=layout.columnSizes[i];
+						}
+						outRect.left-=Math.round(spanOffset/1000f*listWidth);
+						outRect.left+=Math.round(spanOffset/1000f*width);
+					}
+				}
+			}
+		}
+
 		private void rebuildMediaHiddenLayouts(int width){
 			currentMediaHiddenLayoutsWidth=width;
 			String title=getString(R.string.sensitive_content);

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

@@ -1,11 +1,9 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -27,7 +25,6 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
@@ -37,14 +34,4 @@ public class BookmarkedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
-
-	@Override
-	protected Filter.FilterContext getFilterContext() {
-		return Filter.FilterContext.ACCOUNT;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path("/bookmarks").build();
-	}
 }

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

@@ -1,354 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static android.view.Menu.NONE;
-
-import static org.joinmastodon.android.ui.utils.UiUtils.makeBackItem;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.SubMenu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-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.Hashtag;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.model.TimelineDefinition;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-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.views.UsableRecyclerView;
-
-public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition> implements ScrollableToTop {
-    private String accountID;
-    private TimelinesAdapter adapter;
-    private final ItemTouchHelper itemTouchHelper;
-    private Menu optionsMenu;
-    private boolean updated;
-    private final Map<MenuItem, TimelineDefinition> timelineByMenuItem = new HashMap<>();
-    private final List<ListTimeline> listTimelines = new ArrayList<>();
-    private final List<Hashtag> hashtags = new ArrayList<>();
-
-    public EditTimelinesFragment() {
-        super(10);
-        ItemTouchHelper.SimpleCallback itemTouchCallback = new ItemTouchHelperCallback() ;
-        itemTouchHelper = new ItemTouchHelper(itemTouchCallback);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-        setTitle(R.string.sk_timelines);
-        accountID = getArguments().getString("account");
-
-        new GetLists().setCallback(new Callback<>() {
-            @Override
-            public void onSuccess(List<ListTimeline> result) {
-                listTimelines.addAll(result);
-                updateOptionsMenu();
-            }
-
-            @Override
-            public void onError(ErrorResponse error) {
-                error.showToast(getContext());
-            }
-        }).exec(accountID);
-
-        new GetFollowedHashtags().setCallback(new Callback<>() {
-            @Override
-            public void onSuccess(HeaderPaginationList<Hashtag> result) {
-                hashtags.addAll(result);
-                updateOptionsMenu();
-            }
-
-            @Override
-            public void onError(ErrorResponse error) {
-                error.showToast(getContext());
-            }
-        }).exec(accountID);
-    }
-
-    @Override
-    protected void onShown(){
-        super.onShown();
-        if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading) loadData();
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        itemTouchHelper.attachToRecyclerView(list);
-        refreshLayout.setEnabled(false);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        this.optionsMenu = menu;
-        updateOptionsMenu();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_back) {
-            updateOptionsMenu();
-            optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
-            return true;
-        }
-        TimelineDefinition tl = timelineByMenuItem.get(item);
-        if (tl != null) {
-            data.add(tl.copy());
-            adapter.notifyItemInserted(data.size());
-            saveTimelines();
-            updateOptionsMenu();
-        };
-        return true;
-    }
-
-    private void addTimelineToOptions(TimelineDefinition tl, Menu menu) {
-        if (data.contains(tl)) return;
-        MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, tl.getTitle(getContext()));
-        item.setIcon(tl.getIcon().iconRes);
-        timelineByMenuItem.put(item, tl);
-    }
-
-    private void updateOptionsMenu() {
-        if (getActivity() == null) return;
-        optionsMenu.clear();
-        timelineByMenuItem.clear();
-
-        SubMenu menu = optionsMenu.addSubMenu(0, R.id.menu_add_timeline, NONE, R.string.sk_timelines_add);
-        menu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        menu.getItem().setIcon(R.drawable.ic_fluent_add_24_regular);
-
-        SubMenu timelinesMenu = menu.addSubMenu(R.string.sk_timeline);
-        timelinesMenu.getItem().setIcon(R.drawable.ic_fluent_timeline_24_regular);
-        SubMenu listsMenu = menu.addSubMenu(R.string.sk_list);
-        listsMenu.getItem().setIcon(R.drawable.ic_fluent_people_24_regular);
-        SubMenu hashtagsMenu = menu.addSubMenu(R.string.sk_hashtag);
-        hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
-
-        makeBackItem(timelinesMenu);
-        makeBackItem(listsMenu);
-        makeBackItem(hashtagsMenu);
-
-        TimelineDefinition.getAllTimelines(accountID).forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
-        listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
-        hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));
-
-        timelinesMenu.getItem().setVisible(timelinesMenu.size() > 0);
-        listsMenu.getItem().setVisible(listsMenu.size() > 0);
-        hashtagsMenu.getItem().setVisible(hashtagsMenu.size() > 0);
-
-        UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu, R.id.menu_add_timeline);
-    }
-
-    private void saveTimelines() {
-        updated = true;
-        GlobalUserPreferences.pinnedTimelines.put(accountID, data.size() > 0 ? data : List.of(TimelineDefinition.HOME_TIMELINE));
-        GlobalUserPreferences.save();
-    }
-
-    private void removeTimeline(int position) {
-        data.remove(position);
-        adapter.notifyItemRemoved(position);
-        saveTimelines();
-        updateOptionsMenu();
-    }
-
-    @Override
-    protected void doLoadData(int offset, int count){
-        onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)), false);
-        updateOptionsMenu();
-    }
-
-    @Override
-    protected RecyclerView.Adapter<TimelineViewHolder> getAdapter() {
-        return adapter = new TimelinesAdapter();
-    }
-
-    @Override
-    public void scrollToTop() {
-        smoothScrollRecyclerViewToTop(list);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (updated) UiUtils.restartApp();
-    }
-
-    private class TimelinesAdapter extends RecyclerView.Adapter<TimelineViewHolder>{
-        @NonNull
-        @Override
-        public TimelineViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-            return new TimelineViewHolder();
-        }
-
-        @Override
-        public void onBindViewHolder(@NonNull TimelineViewHolder holder, int position) {
-            holder.bind(data.get(position));
-        }
-
-        @Override
-        public int getItemCount() {
-            return data.size();
-        }
-    }
-
-    private class TimelineViewHolder extends BindableViewHolder<TimelineDefinition> implements UsableRecyclerView.Clickable{
-        private final TextView title;
-        private final ImageView dragger;
-
-        public TimelineViewHolder(){
-            super(getActivity(), R.layout.item_text, list);
-            title=findViewById(R.id.title);
-            dragger=findViewById(R.id.dragger_thingy);
-        }
-
-        @SuppressLint("ClickableViewAccessibility")
-        @Override
-        public void onBind(TimelineDefinition item) {
-            title.setText(item.getTitle(getContext()));
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(item.getIcon().iconRes), null, null, null);
-            dragger.setVisibility(View.VISIBLE);
-            dragger.setOnTouchListener((View v, MotionEvent event) -> {
-                if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                    itemTouchHelper.startDrag(this);
-                    return true;
-                }
-                return false;
-            });
-        }
-
-        @SuppressLint("ClickableViewAccessibility")
-        @Override
-        public void onClick() {
-            Context ctx = getContext();
-            LinearLayout view = (LinearLayout) getActivity().getLayoutInflater()
-                    .inflate(R.layout.edit_timeline, (ViewGroup) itemView, false);
-
-            TextInputFrameLayout inputLayout = view.findViewById(R.id.input);
-            EditText editText = inputLayout.getEditText();
-            editText.setText(item.getCustomTitle());
-            editText.setHint(item.getDefaultTitle(ctx));
-
-            ImageButton btn = view.findViewById(R.id.button);
-            PopupMenu popup = new PopupMenu(ctx, btn);
-            TimelineDefinition.Icon currentIcon = item.getIcon();
-            btn.setImageResource(currentIcon.iconRes);
-            btn.setContentDescription(ctx.getString(currentIcon.nameRes));
-            btn.setOnTouchListener(popup.getDragToOpenListener());
-            btn.setOnClickListener(l -> popup.show());
-
-            Menu menu = popup.getMenu();
-            TimelineDefinition.Icon defaultIcon = item.getDefaultIcon();
-            menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
-            if (!currentIcon.equals(defaultIcon)) {
-                menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
-            }
-            for (TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()) {
-                if (icon.hidden || icon.equals(item.getIcon())) continue;
-                menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
-            }
-            UiUtils.enablePopupMenuIcons(ctx, popup);
-
-            popup.setOnMenuItemClickListener(menuItem -> {
-                TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[menuItem.getItemId()];
-                btn.setImageResource(icon.iconRes);
-                btn.setContentDescription(ctx.getString(icon.nameRes));
-                item.setIcon(icon);
-                return true;
-            });
-
-            new M3AlertDialogBuilder(ctx)
-                    .setTitle(R.string.sk_edit_timeline)
-                    .setView(view)
-                    .setPositiveButton(R.string.save, (d, which) -> {
-                        item.setTitle(editText.getText().toString().trim());
-                        rebind();
-                        saveTimelines();
-                    })
-                    .setNeutralButton(R.string.sk_remove, (d, which) ->
-                            removeTimeline(getAbsoluteAdapterPosition()))
-                    .setNegativeButton(R.string.cancel, (d, which) -> {})
-                    .show();
-
-            btn.requestFocus();
-        }
-    }
-
-    private class ItemTouchHelperCallback extends ItemTouchHelper.SimpleCallback {
-        public ItemTouchHelperCallback() {
-            super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
-        }
-
-        @Override
-        public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
-            int fromPosition = viewHolder.getAbsoluteAdapterPosition();
-            int toPosition = target.getAbsoluteAdapterPosition();
-            if (Math.max(fromPosition, toPosition) >= data.size() || Math.min(fromPosition, toPosition) < 0) {
-                return false;
-            } else {
-                Collections.swap(data, fromPosition, toPosition);
-                adapter.notifyItemMoved(fromPosition, toPosition);
-                saveTimelines();
-                return true;
-            }
-        }
-
-        @Override
-        public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState) {
-            if (actionState == ItemTouchHelper.ACTION_STATE_DRAG && viewHolder != null) {
-                viewHolder.itemView.animate().alpha(0.65f);
-            }
-        }
-
-        @Override
-        public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-            super.clearView(recyclerView, viewHolder);
-            viewHolder.itemView.animate().alpha(1f);
-        }
-
-        @Override
-        public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-            int position = viewHolder.getAbsoluteAdapterPosition();
-            removeTimeline(position);
-        }
-    }
-}

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

@@ -1,11 +1,9 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;
 
@@ -27,7 +25,6 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Status> result){
-						if (getActivity() == null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
@@ -37,16 +34,4 @@ public class FavoritedStatusListFragment extends StatusListFragment{
 				})
 				.exec(accountID);
 	}
-
-	@Override
-	protected Filter.FilterContext getFilterContext() {
-		return Filter.FilterContext.ACCOUNT;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.encodedPath(isInstanceAkkoma()
-				? '/' + getSession().self.username + "#favorites"
-				: "/favourites").build();
-	}
 }

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -25,7 +24,6 @@ import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.Collections;
@@ -40,6 +38,7 @@ 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;
@@ -48,7 +47,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
+public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowRequestsListFragment.AccountWrapper> implements ScrollableToTop{
 	private String accountID;
 	private Map<String, Relationship> relationships=Collections.emptyMap();
 	private GetAccountRelationships relationshipsRequest;
@@ -81,7 +80,6 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(HeaderPaginationList<Account> result){
-						if (getActivity() == null) return;
 						if(result.nextPageUri!=null)
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
@@ -150,16 +148,6 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
 		smoothScrollRecyclerViewToTop(list);
 	}
 
-	@Override
-	public String getAccountID() {
-		return accountID;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path(isInstanceAkkoma() ? "/friend-requests" : "/follow_requests").build();
-	}
-
 	private class AccountsAdapter extends UsableRecyclerView.Adapter<AccountViewHolder> implements ImageLoaderRecyclerAdapter{
 
 		public AccountsAdapter(){

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

@@ -1,8 +1,6 @@
 package org.joinmastodon.android.fragments;
 
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -13,17 +11,16 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
 
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
+public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> implements ScrollableToTop {
     private String nextMaxID;
-    private String accountID;
+    private String accountId;
 
     public FollowedHashtagsFragment() {
         super(20);
@@ -33,7 +30,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
-        accountID=args.getString("account");
+        accountId=args.getString("account");
         setTitle(R.string.sk_hashtags_you_follow);
     }
 
@@ -44,19 +41,12 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
             loadData();
     }
 
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-    }
-
     @Override
     protected void doLoadData(int offset, int count){
         currentRequest=new GetFollowedHashtags(offset==0 ? null : nextMaxID, null, count, null)
                 .setCallback(new SimpleCallback<>(this){
                     @Override
                     public void onSuccess(HeaderPaginationList<Hashtag> result){
-                        if (getActivity() == null) return;
                         if(result.nextPageUri!=null)
                             nextMaxID=result.nextPageUri.getQueryParameter("max_id");
                         else
@@ -64,7 +54,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
                         onDataLoaded(result, nextMaxID!=null);
                     }
                 })
-                .exec(accountID);
+                .exec(accountId);
     }
 
     @Override
@@ -77,16 +67,6 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
         smoothScrollRecyclerViewToTop(list);
     }
 
-    @Override
-    public String getAccountID() {
-        return accountID;
-    }
-
-    @Override
-    public Uri getWebUri(Uri.Builder base) {
-        return isInstanceAkkoma() ? null : base.path("/followed_tags").build();
-    }
-
     private class HashtagsAdapter extends RecyclerView.Adapter<HashtagViewHolder>{
         @NonNull
         @Override
@@ -121,7 +101,7 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
 
         @Override
         public void onClick() {
-            UiUtils.openHashtagTimeline(getActivity(), accountID, item.name, item.following);
+            UiUtils.openHashtagTimeline(getActivity(), accountId, item.name, item.following);
         }
     }
 }

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

@@ -1,23 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.model.Instance;
-
-import java.util.Optional;
-
-public interface HasAccountID {
-    String getAccountID();
-
-    default AccountSession getSession() {
-        return AccountSessionManager.getInstance().getAccount(getAccountID());
-    }
-
-    default boolean isInstanceAkkoma() {
-        return getInstance().map(Instance::isAkkoma).orElse(false);
-    }
-
-    default Optional<Instance> getInstance() {
-        return getSession().getInstance();
-    }
-}

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

@@ -1,9 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.view.View;
-
-public interface HasFab {
-    View getFab();
-    void showFab();
-    void hideFab();
-}

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

@@ -1,31 +1,23 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.HapticFeedbackConstants;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.Toast;
 
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.tags.GetHashtag;
 import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
-import org.joinmastodon.android.events.HashtagUpdatedEvent;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.TimelineDefinition;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -33,14 +25,14 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
-public class HashtagTimelineFragment extends PinnableStatusListFragment {
+public class HashtagTimelineFragment extends StatusListFragment{
 	private String hashtag;
 	private boolean following;
+	private ImageButton fab;
 	private MenuItem followButton;
 
-	@Override
-	protected boolean wantsComposeButton() {
-		return true;
+	public HashtagTimelineFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
 	}
 
 	@Override
@@ -48,6 +40,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 		super.onAttach(activity);
 		updateTitle(getArguments().getString("hashtag"));
 		following=getArguments().getBoolean("following", false);
+
 		setHasOptionsMenu(true);
 	}
 
@@ -60,42 +53,19 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 		this.following = newFollowing;
 		followButton.setTitle(getString(newFollowing ? R.string.unfollow_user : R.string.follow_user, "#" + hashtag));
 		followButton.setIcon(newFollowing ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
-		E.post(new HashtagUpdatedEvent(hashtag, following));
 	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		inflater.inflate(R.menu.hashtag_timeline, menu);
-		super.onCreateOptionsMenu(menu, inflater);
 		followButton = menu.findItem(R.id.follow_hashtag);
 		updateFollowingState(following);
 
-		new GetHashtag(hashtag).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Hashtag hashtag) {
-				if (getActivity() == null) return;
-				updateTitle(hashtag.name);
-				updateFollowingState(hashtag.following);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (super.onOptionsItemSelected(item)) return true;
-		if (item.getItemId() == R.id.follow_hashtag) {
+		followButton.setOnMenuItemClickListener(i -> {
 			updateFollowingState(!following);
-			getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
 			new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
 				@Override
 				public void onSuccess(Hashtag i) {
-					if (getActivity() == null) return;
 					if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
 					updateFollowingState(i.following);
 				}
@@ -107,13 +77,20 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 				}
 			}).exec(accountID);
 			return true;
-		}
-		return false;
-	}
+		});
 
-	@Override
-	protected TimelineDefinition makeTimelineDefinition() {
-		return TimelineDefinition.ofHashtag(hashtag);
+		new GetHashtag(hashtag).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Hashtag hashtag) {
+				updateTitle(hashtag.name);
+				updateFollowingState(hashtag.following);
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getActivity());
+			}
+		}).exec(accountID);
 	}
 
 	@Override
@@ -122,8 +99,6 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						if (getActivity() == null) return;
-						result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
 						onDataLoaded(result, !result.isEmpty());
 					}
 				})
@@ -138,12 +113,13 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	}
 
 	@Override
-	public boolean onFabLongClick(View v) {
-		return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' ');
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		fab=view.findViewById(R.id.fab);
+		fab.setOnClickListener(this::onFabClick);
 	}
 
-	@Override
-	public void onFabClick(View v){
+	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putString("prefilledText", '#'+hashtag+' ');
@@ -154,14 +130,4 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	protected void onSetFabBottomInset(int inset){
 		((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
 	}
-
-	@Override
-	protected Filter.FilterContext getFilterContext() {
-		return Filter.FilterContext.PUBLIC;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path((isInstanceAkkoma() ? "/tag/" : "/tags") + hashtag).build();
-	}
 }

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

@@ -2,11 +2,9 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Fragment;
 import android.app.NotificationManager;
-import android.app.assist.AssistContent;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
-import android.service.notification.StatusBarNotification;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,36 +15,22 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
+import org.joinmastodon.android.PushNotificationReceiver;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.notifications.GetNotifications;
 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.DiscoverFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.TabBar;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
 
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
 import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
@@ -55,43 +39,35 @@ import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.FragmentRootLinearLayout;
 
-public class HomeFragment extends AppKitFragment implements OnBackPressedListener, ProvidesAssistContent, HasAccountID {
+public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
 	private FragmentRootLinearLayout content;
-	private HomeTabFragment homeTabFragment;
+	private HomeTimelineFragment homeTimelineFragment;
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
 	private TabBar tabBar;
 	private View tabBarWrap;
 	private ImageView tabBarAvatar;
-	private ImageView notificationTabIcon;
 	@IdRes
 	private int currentTab=R.id.tab_home;
 
 	private String accountID;
-	private boolean isPleroma;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		E.register(this);
 		accountID=getArguments().getString("account");
 		setTitle(R.string.sk_app_name);
-		isPleroma = AccountSessionManager.getInstance().getAccount(accountID).getInstance()
-				.map(Instance::isAkkoma)
-				.orElse(false);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 
-		// TODO: clean up
 		if(savedInstanceState==null){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
-			homeTabFragment=new HomeTabFragment();
-			homeTabFragment.setArguments(args);
+			homeTimelineFragment=new HomeTimelineFragment();
+			homeTimelineFragment.setArguments(args);
 			args=new Bundle(args);
-			args.putBoolean("disableDiscover", isPleroma);
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
 			searchFragment.setArguments(args);
@@ -113,7 +89,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		content.setOrientation(LinearLayout.VERTICAL);
 
 		FrameLayout fragmentContainer=new FrameLayout(getActivity());
-		fragmentContainer.setId(me.grishka.appkit.R.id.fragment_wrap);
+		fragmentContainer.setId(R.id.fragment_wrap);
 		content.addView(fragmentContainer, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
 
 		inflater.inflate(R.layout.tab_bar, content);
@@ -132,15 +108,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		Account self=AccountSessionManager.getInstance().getAccount(accountID).self;
 		ViewImageLoader.load(tabBarAvatar, null, new UrlImageLoaderRequest(self.avatar, V.dp(28), V.dp(28)));
 
-		notificationTabIcon=content.findViewById(R.id.tab_notifications);
-		updateNotificationBadge();
-
 		if(savedInstanceState==null){
 			getChildFragmentManager().beginTransaction()
-					.add(me.grishka.appkit.R.id.fragment_wrap, homeTabFragment)
-					.add(me.grishka.appkit.R.id.fragment_wrap, searchFragment).hide(searchFragment)
-					.add(me.grishka.appkit.R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
-					.add(me.grishka.appkit.R.id.fragment_wrap, profileFragment).hide(profileFragment)
+					.add(R.id.fragment_wrap, homeTimelineFragment)
+					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
+					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
+					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
 
 			String defaultTab=getArguments().getString("tab");
@@ -163,16 +136,16 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	@Override
 	public void onViewStateRestored(Bundle savedInstanceState){
 		super.onViewStateRestored(savedInstanceState);
-		if(savedInstanceState==null) return;
-		homeTabFragment=(HomeTabFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTabFragment");
+		if(savedInstanceState==null || homeTimelineFragment!=null)
+			return;
+		homeTimelineFragment=(HomeTimelineFragment) getChildFragmentManager().getFragment(savedInstanceState, "homeTimelineFragment");
 		searchFragment=(DiscoverFragment) getChildFragmentManager().getFragment(savedInstanceState, "searchFragment");
 		notificationsFragment=(NotificationsFragment) getChildFragmentManager().getFragment(savedInstanceState, "notificationsFragment");
 		profileFragment=(ProfileFragment) getChildFragmentManager().getFragment(savedInstanceState, "profileFragment");
 		currentTab=savedInstanceState.getInt("selectedTab");
-		tabBar.selectTab(currentTab);
 		Fragment current=fragmentForTab(currentTab);
 		getChildFragmentManager().beginTransaction()
-				.hide(homeTabFragment)
+				.hide(homeTimelineFragment)
 				.hide(searchFragment)
 				.hide(notificationsFragment)
 				.hide(profileFragment)
@@ -207,7 +180,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
 		}
 		WindowInsets topOnlyInsets=insets.replaceSystemWindowInsets(0, insets.getSystemWindowInsetTop(), 0, 0);
-		homeTabFragment.onApplyWindowInsets(topOnlyInsets);
+		homeTimelineFragment.onApplyWindowInsets(topOnlyInsets);
 		searchFragment.onApplyWindowInsets(topOnlyInsets);
 		notificationsFragment.onApplyWindowInsets(topOnlyInsets);
 		profileFragment.onApplyWindowInsets(topOnlyInsets);
@@ -215,7 +188,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 
 	private Fragment fragmentForTab(@IdRes int tab){
 		if(tab==R.id.tab_home){
-			return homeTabFragment;
+			return homeTimelineFragment;
 		}else if(tab==R.id.tab_search){
 			return searchFragment;
 		}else if(tab==R.id.tab_notifications){
@@ -226,28 +199,17 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 		throw new IllegalArgumentException();
 	}
 
-	public void setCurrentTab(@IdRes int tab){
-		if(tab==currentTab)
-			return;
-		tabBar.selectTab(tab);
-		onTabSelected(tab);
-	}
-
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
-			if (tab == R.id.tab_search)
-				searchFragment.onSelect();
-			else if(newFragment instanceof ScrollableToTop scrollable)
+			if(newFragment instanceof ScrollableToTop scrollable)
 				scrollable.scrollToTop();
 			return;
 		}
 		getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
 		maybeTriggerLoading(newFragment);
-		if (newFragment instanceof HasFab fabulous) fabulous.showFab();
 		currentTab=tab;
 		((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
-		if (tab == R.id.tab_search && isPleroma) searchFragment.selectSearch();
 	}
 
 	private void maybeTriggerLoading(Fragment newFragment){
@@ -260,11 +222,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			((NotificationsFragment) newFragment).loadData();
 			// TODO make an interface?
 			NotificationManager nm=getActivity().getSystemService(NotificationManager.class);
-			for (StatusBarNotification notification : nm.getActiveNotifications()) {
-				if (accountID.equals(notification.getTag())) {
-					nm.cancel(accountID, notification.getId());
-				}
-			}
+			nm.cancel(accountID, PushNotificationReceiver.NOTIFICATION_ID);
 		}
 	}
 
@@ -274,7 +232,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){
 				options.add(session.self.displayName+"\n("+session.self.username+"@"+session.domain+")");
 			}
-			new AccountSwitcherSheet(getActivity(), this).show();
+			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
 		return false;
@@ -290,71 +248,17 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			tabBar.selectTab(R.id.tab_home);
 			onTabSelected(R.id.tab_home);
 			return true;
-		} else {
-			return homeTabFragment.onBackPressed();
 		}
+		return false;
 	}
 
 	@Override
 	public void onSaveInstanceState(Bundle outState){
 		super.onSaveInstanceState(outState);
 		outState.putInt("selectedTab", currentTab);
-		if (homeTabFragment.isAdded()) getChildFragmentManager().putFragment(outState, "homeTabFragment", homeTabFragment);
-		if (searchFragment.isAdded()) getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
-		if (notificationsFragment.isAdded()) getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
-		if (profileFragment.isAdded()) getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
-	}
-
-	public void updateNotificationBadge() {
-		AccountSession session = AccountSessionManager.getInstance().getAccount(accountID);
-		Optional<Instance> instance = session.getInstance();
-		if (instance.isEmpty()) return; // avoiding incompatibility with akkoma
-
-		new GetNotifications(null, 1, EnumSet.allOf(Notification.Type.class), instance.get().isAkkoma())
-				.setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(List<Notification> notifications) {
-						if (notifications.size() > 0) {
-							try {
-								long newestId = Long.parseLong(notifications.get(0).id);
-								long lastSeenId = Long.parseLong(session.markers.notifications.lastReadId);
-								setNotificationBadge(newestId > lastSeenId);
-							} catch (Exception ignored) {
-								setNotificationBadge(false);
-							}
-						}
-					}
-
-					@Override
-					public void onError(ErrorResponse error) {
-						setNotificationBadge(false);
-					}
-				}).exec(accountID);
-	}
-
-	public void setNotificationBadge(boolean badge) {
-		notificationTabIcon.setImageResource(badge
-				? R.drawable.ic_fluent_alert_28_selector_badged
-				: R.drawable.ic_fluent_alert_28_selector);
-	}
-
-	@Subscribe
-	public void onNotificationReceived(NotificationReceivedEvent notificationReceivedEvent) {
-		if (notificationReceivedEvent.account.equals(accountID)) setNotificationBadge(true);
-	}
-
-	@Subscribe
-	public void onAllNotificationsSeen(AllNotificationsSeenEvent allNotificationsSeenEvent) {
-		setNotificationBadge(false);
-	}
-
-	@Override
-	public String getAccountID() {
-		return accountID;
-	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		callFragmentToProvideAssistContent(fragmentForTab(currentTab), assistContent);
+		getChildFragmentManager().putFragment(outState, "homeTimelineFragment", homeTimelineFragment);
+		getChildFragmentManager().putFragment(outState, "searchFragment", searchFragment);
+		getChildFragmentManager().putFragment(outState, "notificationsFragment", notificationsFragment);
+		getChildFragmentManager().putFragment(outState, "profileFragment", profileFragment);
 	}
 }

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

@@ -1,727 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import static org.joinmastodon.android.GlobalUserPreferences.reduceMotion;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.app.assist.AssistContent;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.ViewTreeObserver;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.PopupMenu;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
-import org.joinmastodon.android.api.requests.lists.GetLists;
-import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
-import org.joinmastodon.android.events.HashtagUpdatedEvent;
-import org.joinmastodon.android.events.ListDeletedEvent;
-import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.model.Announcement;
-import org.joinmastodon.android.model.Hashtag;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.model.TimelineDefinition;
-import org.joinmastodon.android.ui.SimpleViewHolder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
-import me.grishka.appkit.fragments.OnBackPressedListener;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-import me.grishka.appkit.utils.V;
-
-public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab, ProvidesAssistContent {
-	private static final int ANNOUNCEMENTS_RESULT = 654;
-
-	private String accountID;
-	private MenuItem announcements, announcementsAction, settings, settingsAction;
-//	private ImageView toolbarLogo;
-	private Button toolbarShowNewPostsBtn;
-	private boolean newPostsBtnShown;
-	private AnimatorSet currentNewPostsAnim;
-	private ViewPager2 pager;
-	private View switcher;
-	private FrameLayout toolbarFrame;
-	private ImageView timelineIcon;
-	private ImageView collapsedChevron;
-	private TextView timelineTitle;
-	private PopupMenu switcherPopup;
-	private final Map<Integer, ListTimeline> listItems = new HashMap<>();
-	private final Map<Integer, Hashtag> hashtagsItems = new HashMap<>();
-	private List<TimelineDefinition> timelineDefinitions;
-	private int count;
-	private Fragment[] fragments;
-	private FrameLayout[] tabViews;
-	private TimelineDefinition[] timelines;
-	private final Map<Integer, TimelineDefinition> timelinesByMenuItem = new HashMap<>();
-	private SubMenu hashtagsMenu, listsMenu;
-	private PopupMenu overflowPopup;
-	private View overflowActionView = null;
-	private boolean announcementsBadged, settingsBadged;
-	private ImageButton fab;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		E.register(this);
-		accountID = getArguments().getString("account");
-		timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID));
-		assert timelineDefinitions != null;
-		if (timelineDefinitions.size() == 0) timelineDefinitions = List.of(TimelineDefinition.HOME_TIMELINE);
-		count = timelineDefinitions.size();
-		fragments = new Fragment[count];
-		tabViews = new FrameLayout[count];
-		timelines = new TimelineDefinition[count];
-	}
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		setHasOptionsMenu(true);
-	}
-
-	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-		FrameLayout view = new FrameLayout(getContext());
-		inflater.inflate(R.layout.compose_fab, view);
-		fab = view.findViewById(R.id.fab);
-		fab.setOnClickListener(this::onFabClick);
-		fab.setOnLongClickListener(this::onFabLongClick);
-		pager = new ViewPager2(getContext());
-		toolbarFrame = (FrameLayout) LayoutInflater.from(getContext()).inflate(R.layout.home_toolbar, getToolbar(), false);
-
-		if (fragments[0] == null) {
-			Bundle args = new Bundle();
-			args.putString("account", accountID);
-			args.putBoolean("__is_tab", true);
-			args.putBoolean("__disable_fab", true);
-			args.putBoolean("onlyPosts", true);
-
-			for (int i = 0; i < timelineDefinitions.size(); i++) {
-				TimelineDefinition tl = timelineDefinitions.get(i);
-				fragments[i] = tl.getFragment();
-				timelines[i] = tl;
-			}
-
-			FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-			for (int i = 0; i < count; i++) {
-				fragments[i].setArguments(timelines[i].populateArguments(new Bundle(args)));
-				FrameLayout tabView = new FrameLayout(getActivity());
-				tabView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-				tabView.setVisibility(View.GONE);
-				tabView.setId(i + 1);
-				transaction.add(i + 1, fragments[i]);
-				view.addView(tabView);
-				tabViews[i] = tabView;
-			}
-			transaction.commit();
-		}
-
-		view.addView(pager, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
-		overflowActionView = UiUtils.makeOverflowActionView(getContext());
-		overflowPopup = new PopupMenu(getContext(), overflowActionView);
-		overflowPopup.setOnMenuItemClickListener(this::onOptionsItemSelected);
-		overflowActionView.setOnClickListener(l -> overflowPopup.show());
-		overflowActionView.setOnTouchListener(overflowPopup.getDragToOpenListener());
-
-		return view;
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-
-		timelineIcon = toolbarFrame.findViewById(R.id.timeline_icon);
-		timelineTitle = toolbarFrame.findViewById(R.id.timeline_title);
-		collapsedChevron = toolbarFrame.findViewById(R.id.collapsed_chevron);
-		switcher = toolbarFrame.findViewById(R.id.switcher_btn);
-		switcherPopup = new PopupMenu(getContext(), switcher);
-		switcherPopup.setOnMenuItemClickListener(this::onSwitcherItemSelected);
-		UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
-		switcher.setOnClickListener(v->switcherPopup.show());
-		switcher.setOnTouchListener(switcherPopup.getDragToOpenListener());
-		updateSwitcherMenu();
-
-		UiUtils.reduceSwipeSensitivity(pager);
-		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
-		pager.setAdapter(new HomePagerAdapter());
-		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-			@Override
-			public void onPageSelected(int position){
-				if (!reduceMotion) {
-					// setting this here because page transformer appears to fire too late so the
-					// animation can appear bumpy, especially when navigating to a further-away tab
-					switcher.setScaleY(0.85f);
-					switcher.setScaleX(0.85f);
-					switcher.setAlpha(0.65f);
-				}
-				updateSwitcherIcon(position);
-				if (!timelines[position].equals(TimelineDefinition.HOME_TIMELINE)) hideNewPostsButton();
-				if (fragments[position] instanceof BaseRecyclerFragment<?> page){
-					if(!page.loaded && !page.isDataLoading()) page.loadData();
-				}
-			}
-		});
-
-		if (!reduceMotion) {
-			pager.setPageTransformer((v, pos) -> {
-				if (reduceMotion || tabViews[pager.getCurrentItem()] != v) return;
-				float scaleFactor = Math.max(0.85f, 1 - Math.abs(pos) * 0.06f);
-				switcher.setScaleY(scaleFactor);
-				switcher.setScaleX(scaleFactor);
-				switcher.setAlpha(Math.max(0.65f, 1 - Math.abs(pos)));
-			});
-		}
-
-		updateToolbarLogo();
-
-		ViewTreeObserver vto = getToolbar().getViewTreeObserver();
-		if (vto.isAlive()) {
-			vto.addOnGlobalLayoutListener(() -> {
-				Toolbar t = getToolbar();
-				if (t == null) return;
-				int toolbarWidth = t.getWidth();
-				if (toolbarWidth == 0) return;
-
-				int toolbarFrameWidth = toolbarFrame.getWidth();
-				int padding = toolbarWidth - toolbarFrameWidth;
-				FrameLayout parent = ((FrameLayout) toolbarShowNewPostsBtn.getParent());
-				if (padding == parent.getPaddingStart()) return;
-
-				// toolbar frame goes from screen edge to beginning of right-aligned option buttons.
-				// centering button by applying the same space on the left
-				parent.setPaddingRelative(padding, 0, 0, 0);
-				toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
-
-				switcher.setPivotX(V.dp(28)); // padding + half of icon
-				switcher.setPivotY(switcher.getHeight() / 2f);
-			});
-		}
-
-		if(GithubSelfUpdater.needSelfUpdating()){
-			updateUpdateState(GithubSelfUpdater.getInstance().getState());
-		}
-
-		new GetLists().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(List<ListTimeline> lists) {
-				updateList(lists, listItems);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
-
-		new GetFollowedHashtags().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(HeaderPaginationList<Hashtag> hashtags) {
-				updateList(hashtags, hashtagsItems);
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
-
-		new GetAnnouncements(false).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(List<Announcement> result) {
-				if (getActivity() == null) return;
-				if (result.stream().anyMatch(a -> !a.read)) {
-					announcementsBadged = true;
-					announcements.setVisible(false);
-					announcementsAction.setVisible(true);
-				}
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getActivity());
-			}
-		}).exec(accountID);
-	}
-
-	private void onFabClick(View v){
-		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) {
-			l.onFabClick(v);
-		}
-	}
-
-	private boolean onFabLongClick(View v) {
-		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) {
-			return l.onFabLongClick(v);
-		} else {
-			return false;
-		}
-	}
-
-	private void addListsToOverflowMenu() {
-		Context ctx = getContext();
-		listsMenu.clear();
-		listsMenu.getItem().setVisible(listItems.size() > 0);
-		UiUtils.insetPopupMenuIcon(ctx, UiUtils.makeBackItem(listsMenu));
-		listItems.forEach((id, list) -> {
-			MenuItem item = listsMenu.add(Menu.NONE, id, Menu.NONE, list.title);
-			item.setIcon(R.drawable.ic_fluent_people_24_regular);
-			UiUtils.insetPopupMenuIcon(ctx, item);
-		});
-	}
-
-	private void addHashtagsToOverflowMenu() {
-		Context ctx = getContext();
-		hashtagsMenu.clear();
-		hashtagsMenu.getItem().setVisible(hashtagsItems.size() > 0);
-		UiUtils.insetPopupMenuIcon(ctx, UiUtils.makeBackItem(hashtagsMenu));
-		hashtagsItems.forEach((id, hashtag) -> {
-			MenuItem item = hashtagsMenu.add(Menu.NONE, id, Menu.NONE, hashtag.name);
-			item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
-			UiUtils.insetPopupMenuIcon(ctx, item);
-		});
-	}
-
-	public void updateToolbarLogo(){
-		Toolbar toolbar = getToolbar();
-		ViewParent parentView = toolbarFrame.getParent();
-		if (parentView == toolbar) return;
-		if (parentView instanceof Toolbar parentToolbar) parentToolbar.removeView(toolbarFrame);
-		toolbar.addView(toolbarFrame, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-		toolbar.setOnClickListener(v->scrollToTop());
-		toolbar.setNavigationContentDescription(R.string.back);
-		toolbar.setContentInsetsAbsolute(0, toolbar.getContentInsetRight());
-
-		updateSwitcherIcon(pager.getCurrentItem());
-
-		toolbarShowNewPostsBtn=toolbarFrame.findViewById(R.id.show_new_posts_btn);
-		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N) UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
-		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
-
-		if(newPostsBtnShown){
-			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-			collapsedChevron.setVisibility(View.VISIBLE);
-			collapsedChevron.setAlpha(1f);
-			timelineTitle.setVisibility(View.GONE);
-			timelineTitle.setAlpha(0f);
-		}else{
-			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-			toolbarShowNewPostsBtn.setAlpha(0f);
-			collapsedChevron.setVisibility(View.GONE);
-			collapsedChevron.setAlpha(0f);
-			toolbarShowNewPostsBtn.setScaleX(.8f);
-			toolbarShowNewPostsBtn.setScaleY(.8f);
-			timelineTitle.setVisibility(View.VISIBLE);
-		}
-	}
-
-	private void updateOverflowMenu() {
-		if (getActivity() == null) return;
-		Menu m = overflowPopup.getMenu();
-		m.clear();
-		overflowPopup.inflate(R.menu.home_overflow);
-		announcements = m.findItem(R.id.announcements);
-		settings = m.findItem(R.id.settings);
-		hashtagsMenu = m.findItem(R.id.hashtags).getSubMenu();
-		listsMenu = m.findItem(R.id.lists).getSubMenu();
-
-		announcements.setVisible(!announcementsBadged);
-		announcementsAction.setVisible(announcementsBadged);
-		settings.setVisible(!settingsBadged);
-		settingsAction.setVisible(settingsBadged);
-
-		UiUtils.enablePopupMenuIcons(getContext(), overflowPopup);
-
-		addListsToOverflowMenu();
-		addHashtagsToOverflowMenu();
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !UiUtils.isEMUI()) {
-			m.setGroupDividerEnabled(true);
-		}
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
-		inflater.inflate(R.menu.home, menu);
-
-		menu.findItem(R.id.overflow).setActionView(overflowActionView);
-		announcementsAction = menu.findItem(R.id.announcements_action);
-		settingsAction = menu.findItem(R.id.settings_action);
-
-		updateOverflowMenu();
-	}
-
-	private <T> void updateList(List<T> addItems, Map<Integer, T> items) {
-		if (addItems.size() == 0 || getActivity() == null) return;
-		for (int i = 0; i < addItems.size(); i++) items.put(View.generateViewId(), addItems.get(i));
-		updateOverflowMenu();
-	}
-
-	private void updateSwitcherMenu() {
-		Menu switcherMenu = switcherPopup.getMenu();
-		switcherMenu.clear();
-		timelinesByMenuItem.clear();
-
-		for (TimelineDefinition tl : timelines) {
-			int menuItemId = View.generateViewId();
-			timelinesByMenuItem.put(menuItemId, tl);
-			MenuItem item = switcherMenu.add(0, menuItemId, 0, tl.getTitle(getContext()));
-			item.setIcon(tl.getIcon().iconRes);
-		}
-
-		UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
-	}
-
-	private boolean onSwitcherItemSelected(MenuItem item) {
-		int id = item.getItemId();
-
-		Bundle args = new Bundle();
-		args.putString("account", accountID);
-
-		if (id == R.id.menu_back) {
-			switcher.post(() -> switcherPopup.show());
-			return true;
-		}
-
-		TimelineDefinition tl = timelinesByMenuItem.get(id);
-		if (tl != null) {
-			for (int i = 0; i < timelines.length; i++) {
-				if (timelines[i] == tl) {
-					navigateTo(i);
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-	private void navigateTo(int i) {
-		navigateTo(i, !reduceMotion);
-	}
-
-	private void navigateTo(int i, boolean smooth) {
-		pager.setCurrentItem(i, smooth);
-		updateSwitcherIcon(i);
-	}
-
-	@Override
-	public void showFab() {
-		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.showFab();
-	}
-
-	@Override
-	public void hideFab() {
-		if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment<?> l) l.hideFab();
-	}
-
-	private void updateSwitcherIcon(int i) {
-		timelineIcon.setImageResource(timelines[i].getIcon().iconRes);
-		timelineTitle.setText(timelines[i].getTitle(getContext()));
-		showFab();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		int id = item.getItemId();
-		ListTimeline list;
-		Hashtag hashtag;
-
-		if (item.getItemId() == R.id.menu_back) {
-			getToolbar().post(() -> overflowPopup.show());
-			return true;
-		} else if (id == R.id.settings || id == R.id.settings_action) {
-			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) {
-			Nav.go(getActivity(), EditTimelinesFragment.class, args);
-		} else if ((list = listItems.get(id)) != null) {
-			args.putString("listID", list.id);
-			args.putString("listTitle", list.title);
-			if (list.repliesPolicy != null) args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
-			Nav.go(getActivity(), ListTimelineFragment.class, args);
-		} else if ((hashtag = hashtagsItems.get(id)) != null) {
-			args.putString("hashtag", hashtag.name);
-			args.putBoolean("following", hashtag.following);
-			Nav.go(getActivity(), HashtagTimelineFragment.class, args);
-		}
-		return true;
-	}
-
-	@Override
-	public void scrollToTop(){
-		((ScrollableToTop) fragments[pager.getCurrentItem()]).scrollToTop();
-	}
-
-	public void hideNewPostsButton(){
-		if(!newPostsBtnShown)
-			return;
-		newPostsBtnShown=false;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		timelineTitle.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(timelineTitle, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_Y, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f),
-				ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 0f)
-		);
-		set.setDuration(reduceMotion ? 0 : 300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
-				collapsedChevron.setVisibility(View.GONE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	public void showNewPostsButton(){
-		if(newPostsBtnShown || pager == null || !timelines[pager.getCurrentItem()].equals(TimelineDefinition.HOME_TIMELINE))
-			return;
-		newPostsBtnShown=true;
-		if(currentNewPostsAnim!=null){
-			currentNewPostsAnim.cancel();
-		}
-		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
-		collapsedChevron.setVisibility(View.VISIBLE);
-		AnimatorSet set=new AnimatorSet();
-		set.playTogether(
-				ObjectAnimator.ofFloat(timelineTitle, View.ALPHA, 0f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_X, .8f),
-				ObjectAnimator.ofFloat(timelineTitle, View.SCALE_Y, .8f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
-				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f),
-				ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 1f)
-		);
-		set.setDuration(reduceMotion ? 0 : 300);
-		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		set.addListener(new AnimatorListenerAdapter(){
-			@Override
-			public void onAnimationEnd(Animator animation){
-				timelineTitle.setVisibility(View.GONE);
-				currentNewPostsAnim=null;
-			}
-		});
-		currentNewPostsAnim=set;
-		set.start();
-	}
-
-	public boolean isNewPostsBtnShown() {
-		return newPostsBtnShown;
-	}
-
-	private void onNewPostsBtnClick(View view) {
-		if(newPostsBtnShown){
-			hideNewPostsButton();
-			scrollToTop();
-		}
-	}
-
-	@Override
-	public void onFragmentResult(int reqCode, boolean success, Bundle result){
-		if (reqCode == ANNOUNCEMENTS_RESULT && success) {
-			announcementsBadged = false;
-			announcements.setVisible(true);
-			announcementsAction.setVisible(false);
-		}
-	}
-
-	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
-		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING) {
-			settingsBadged = true;
-			settingsAction.setVisible(true);
-			settings.setVisible(false);
-		}
-	}
-
-	@Subscribe
-	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
-		updateUpdateState(ev.state);
-	}
-
-	@Override
-	public boolean onBackPressed(){
-		if(pager.getCurrentItem() > 0){
-			navigateTo(0);
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		if (overflowPopup != null) {
-			overflowPopup.dismiss();
-			overflowPopup = null;
-		}
-		if (switcherPopup != null) {
-			switcherPopup.dismiss();
-			switcherPopup = null;
-		}
-		if(GithubSelfUpdater.needSelfUpdating()){
-			E.unregister(this);
-		}
-	}
-
-	@Override
-	protected void onShown() {
-		super.onShown();
-		Object pinnedTimelines = GlobalUserPreferences.pinnedTimelines.get(accountID);
-		if (pinnedTimelines != null && timelineDefinitions != pinnedTimelines) UiUtils.restartApp();
-	}
-
-	@Override
-	public void onViewStateRestored(Bundle savedInstanceState) {
-		super.onViewStateRestored(savedInstanceState);
-		if (savedInstanceState == null) return;
-		navigateTo(savedInstanceState.getInt("selectedTab"), false);
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putInt("selectedTab", pager.getCurrentItem());
-	}
-
-	@Subscribe
-	public void onHashtagUpdatedEvent(HashtagUpdatedEvent event) {
-		handleListEvent(hashtagsItems, h -> h.name.equalsIgnoreCase(event.name), event.following, () -> {
-			Hashtag hashtag = new Hashtag();
-			hashtag.name = event.name;
-			hashtag.following = true;
-			return hashtag;
-		});
-	}
-
-	@Subscribe
-	public void onListDeletedEvent(ListDeletedEvent event) {
-		handleListEvent(listItems, l -> l.id.equals(event.id), false, null);
-	}
-
-	@Subscribe
-	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
-		handleListEvent(listItems, l -> l.id.equals(event.id), true, () -> {
-			ListTimeline list = new ListTimeline();
-			list.id = event.id;
-			list.title = event.title;
-			list.repliesPolicy = event.repliesPolicy;
-			return list;
-		});
-	}
-
-	private <T> void handleListEvent(
-			Map<Integer, T> existingThings,
-			Predicate<T> matchExisting,
-			boolean shouldBeInList,
-			Supplier<T> makeNewThing
-	) {
-		Optional<Map.Entry<Integer, T>> existingThing = existingThings.entrySet().stream()
-				.filter(e -> matchExisting.test(e.getValue())).findFirst();
-		if (shouldBeInList) {
-			existingThings.put(existingThing.isPresent()
-					? existingThing.get().getKey() : View.generateViewId(), makeNewThing.get());
-			updateOverflowMenu();
-		} else if (existingThing.isPresent() && !shouldBeInList) {
-			existingThings.remove(existingThing.get().getKey());
-			updateOverflowMenu();
-		}
-	}
-
-	public Collection<Hashtag> getHashtags() {
-		return hashtagsItems.values();
-	}
-
-	public ImageButton getFab() {
-		return fab;
-	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		callFragmentToProvideAssistContent(fragments[pager.getCurrentItem()], assistContent);
-	}
-
-	private class HomePagerAdapter extends RecyclerView.Adapter<SimpleViewHolder> {
-		@NonNull
-		@Override
-		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-			FrameLayout tabView = tabViews[viewType % getItemCount()];
-			ViewGroup tabParent = (ViewGroup) tabView.getParent();
-			if (tabParent != null) tabParent.removeView(tabView);
-			tabView.setVisibility(View.VISIBLE);
-			return new SimpleViewHolder(tabView);
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){}
-
-		@Override
-		public int getItemCount(){
-			return count;
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return position;
-		}
-	}
-}

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

@@ -1,50 +1,78 @@
 package org.joinmastodon.android.fragments;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.net.Uri;
+import android.content.res.ColorStateList;
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toolbar;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import com.squareup.otto.Subscribe;
 
+import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.api.requests.markers.SaveMarkers;
+import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
-public class HomeTimelineFragment extends StatusListFragment {
-	private HomeTabFragment parent;
-	private String maxID;
-	private String lastSavedMarkerID;
+public class HomeTimelineFragment extends StatusListFragment{
+	private ImageButton fab;
+	private ImageView toolbarLogo;
+	private Button toolbarShowNewPostsBtn;
+	private boolean newPostsBtnShown;
+	private AnimatorSet currentNewPostsAnim;
 
-	@Override
-	protected boolean wantsComposeButton() {
-		return true;
+	private String maxID;
+
+	public HomeTimelineFragment(){
+		setListLayoutId(R.layout.recycler_fragment_with_fab);
 	}
 
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		if (getParentFragment() instanceof HomeTabFragment home) parent = home;
+		setHasOptionsMenu(true);
 		loadData();
 	}
 
@@ -62,7 +90,8 @@ public class HomeTimelineFragment extends StatusListFragment {
 				.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
-						if (getActivity() == null) return;
+						if(getActivity()==null)
+							return;
 						List<Status> filteredItems = filterPosts(result.items);
 						onDataLoaded(filteredItems, !result.items.isEmpty());
 						maxID=result.maxID;
@@ -75,15 +104,41 @@ public class HomeTimelineFragment extends StatusListFragment {
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-
+		fab=view.findViewById(R.id.fab);
+		fab.setOnClickListener(this::onFabClick);
+		updateToolbarLogo();
 		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
 			@Override
 			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				if(parent != null && parent.isNewPostsBtnShown() && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
-					parent.hideNewPostsButton();
+				if(newPostsBtnShown && list.getChildAdapterPosition(list.getChildAt(0))<=getMainAdapterOffset()){
+					hideNewPostsButton();
 				}
 			}
 		});
+
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.register(this);
+			updateUpdateState(GithubSelfUpdater.getInstance().getState());
+		}
+	}
+
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
+		inflater.inflate(R.menu.home, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), SettingsFragment.class, args);
+		return true;
+	}
+
+	@Override
+	public void onConfigurationChanged(Configuration newConfig){
+		super.onConfigurationChanged(newConfig);
+		updateToolbarLogo();
 	}
 
 	@Override
@@ -98,33 +153,16 @@ public class HomeTimelineFragment extends StatusListFragment {
 		}
 	}
 
-	@Override
-	protected void onHidden(){
-		super.onHidden();
-		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){
 		prependItems(Collections.singletonList(ev.status), true);
 	}
 
+	private void onFabClick(View v){
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), ComposeFragment.class, args);
+	}
+
 	private void loadNewPosts(){
 		if (!GlobalUserPreferences.loadNewPosts) return;
 		dataLoading=true;
@@ -149,11 +187,13 @@ public class HomeTimelineFragment extends StatusListFragment {
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
-						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
+						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+						if(!filters.isEmpty()){
+							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
+						}
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
-							if (parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
+							showNewPostsButton();
 							AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
 						}
 					}
@@ -165,10 +205,6 @@ public class HomeTimelineFragment extends StatusListFragment {
 					}
 				})
 				.exec(accountID);
-
-		if (parent.getParentFragment() instanceof HomeFragment homeFragment) {
-			homeFragment.updateNotificationBadge();
-		}
 	}
 
 	@Override
@@ -228,14 +264,18 @@ public class HomeTimelineFragment extends StatusListFragment {
 							List<StatusDisplayItem> targetList=displayItems.subList(gapPos, gapPos+1);
 							targetList.clear();
 							List<Status> insertedPosts=data.subList(gapPostIndex+1, gapPostIndex+1);
-							StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, getFilterContext());
+							List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+							outer:
 							for(Status s:result){
 								if(idsBelowGap.contains(s.id))
 									break;
-								if(filterPredicate.test(s)){
-									targetList.addAll(buildDisplayItems(s));
-									insertedPosts.add(s);
+								for(Filter filter:filters){
+									if(filter.matches(s)){
+										continue outer;
+									}
 								}
+								targetList.addAll(buildDisplayItems(s));
+								insertedPosts.add(s);
 							}
 							if(targetList.isEmpty()){
 								// oops. We didn't add new posts, but at least we know there are none.
@@ -273,22 +313,134 @@ public class HomeTimelineFragment extends StatusListFragment {
 			currentRequest=null;
 			dataLoading=false;
 		}
-		if (parent != null) parent.hideNewPostsButton();
 		super.onRefresh();
 	}
 
+	private void updateToolbarLogo(){
+		toolbarLogo=new ImageView(getActivity());
+		toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
+		toolbarLogo.setImageResource(R.drawable.logo);
+		toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+//		toolbarLogo =new TextView(getActivity());
+//		toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+//		toolbarLogo.setTextAppearance(R.style.app_title);
+
+		toolbarShowNewPostsBtn=new Button(getActivity());
+		toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
+		toolbarShowNewPostsBtn.setTextColor(0xffffffff);
+		toolbarShowNewPostsBtn.setStateListAnimator(null);
+		toolbarShowNewPostsBtn.setBackgroundResource(R.drawable.bg_button_new_posts);
+		toolbarShowNewPostsBtn.setText(R.string.see_new_posts);
+		toolbarShowNewPostsBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_fluent_arrow_up_16_filled, 0, 0, 0);
+		toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
+		toolbarShowNewPostsBtn.setCompoundDrawablePadding(V.dp(8));
+		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
+			UiUtils.fixCompoundDrawableTintOnAndroid6(toolbarShowNewPostsBtn);
+		toolbarShowNewPostsBtn.setOnClickListener(this::onNewPostsBtnClick);
+
+		if(newPostsBtnShown){
+			toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+			toolbarLogo.setVisibility(View.INVISIBLE);
+			toolbarLogo.setAlpha(0f);
+		}else{
+			toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+			toolbarShowNewPostsBtn.setAlpha(0f);
+			toolbarShowNewPostsBtn.setScaleX(.8f);
+			toolbarShowNewPostsBtn.setScaleY(.8f);
+			toolbarLogo.setVisibility(View.VISIBLE);
+		}
+
+		FrameLayout logoWrap=new FrameLayout(getActivity());
+		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
+		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
+
+		Toolbar toolbar=getToolbar();
+		toolbar.addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
+	}
+
+	private void showNewPostsButton(){
+		if(newPostsBtnShown)
+			return;
+		newPostsBtnShown=true;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarShowNewPostsBtn.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarLogo.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void hideNewPostsButton(){
+		if(!newPostsBtnShown)
+			return;
+		newPostsBtnShown=false;
+		if(currentNewPostsAnim!=null){
+			currentNewPostsAnim.cancel();
+		}
+		toolbarLogo.setVisibility(View.VISIBLE);
+		AnimatorSet set=new AnimatorSet();
+		set.playTogether(
+				ObjectAnimator.ofFloat(toolbarLogo, View.ALPHA, 1f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.ALPHA, 0f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_X, .8f),
+				ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f)
+		);
+		set.setDuration(300);
+		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
+		set.addListener(new AnimatorListenerAdapter(){
+			@Override
+			public void onAnimationEnd(Animator animation){
+				toolbarShowNewPostsBtn.setVisibility(View.INVISIBLE);
+				currentNewPostsAnim=null;
+			}
+		});
+		currentNewPostsAnim=set;
+		set.start();
+	}
+
+	private void onNewPostsBtnClick(View v){
+		if(newPostsBtnShown){
+			hideNewPostsButton();
+			scrollToTop();
+		}
+	}
+
+	@Override
+	public void onDestroyView(){
+		super.onDestroyView();
+		if(GithubSelfUpdater.needSelfUpdating()){
+			E.unregister(this);
+		}
+	}
+
+	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
+		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
+			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
+	}
+
+	@Subscribe
+	public void onSelfUpdateStateChanged(SelfUpdateStateChangedEvent ev){
+		updateUpdateState(ev.state);
+	}
+
 	@Override
 	protected boolean shouldRemoveAccountPostsWhenUnfollowing(){
 		return true;
 	}
-
-	@Override
-	protected Filter.FilterContext getFilterContext() {
-		return Filter.FilterContext.HOME;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path("/").build();
-	}
 }

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

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

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

@@ -1,133 +1,48 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
+import android.media.MediaRouter;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 
-import androidx.annotation.Nullable;
-
-import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.lists.GetList;
-import org.joinmastodon.android.api.requests.lists.UpdateList;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
-import org.joinmastodon.android.events.ListDeletedEvent;
-import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.model.TimelineDefinition;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.ListTimelineEditor;
-import org.joinmastodon.android.utils.StatusFilterPredicate;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
 
-public class ListTimelineFragment extends PinnableStatusListFragment {
+public class ListTimelineFragment extends StatusListFragment {
     private String listID;
     private String listTitle;
-    @Nullable
-    private ListTimeline.RepliesPolicy repliesPolicy;
+    private ImageButton fab;
 
-    @Override
-    protected boolean wantsComposeButton() {
-        return true;
+    public ListTimelineFragment() {
+        setListLayoutId(R.layout.recycler_fragment_with_fab);
     }
 
     @Override
     public void onAttach(Activity activity){
         super.onAttach(activity);
-        Bundle args = getArguments();
-        listID = args.getString("listID");
-        listTitle = args.getString("listTitle");
-        repliesPolicy = ListTimeline.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
-
+        listID=getArguments().getString("listID");
+        listTitle=getArguments().getString("listTitle");
         setTitle(listTitle);
         setHasOptionsMenu(true);
-
-        new GetList(listID).setCallback(new Callback<>() {
-            @Override
-            public void onSuccess(ListTimeline listTimeline) {
-                if (getActivity() == null) return;
-                // TODO: save updated info
-                if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
-                if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
-                    repliesPolicy = listTimeline.repliesPolicy;
-                }
-            }
-
-            @Override
-            public void onError(ErrorResponse error) {
-                error.showToast(getContext());
-            }
-        });
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.list, menu);
         super.onCreateOptionsMenu(menu, inflater);
-        UiUtils.enableOptionsMenuIcons(getContext(), menu, R.id.pin);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (super.onOptionsItemSelected(item)) return true;
-        if (item.getItemId() == R.id.edit) {
-            ListTimelineEditor editor = new ListTimelineEditor(getContext());
-            editor.applyList(listTitle, repliesPolicy);
-            new M3AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.sk_edit_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_28_regular)
-                    .setView(editor)
-                    .setPositiveButton(R.string.save, (d, which) -> {
-                        String newTitle = editor.getTitle().trim();
-                        setTitle(newTitle);
-                        new UpdateList(listID, newTitle, editor.getRepliesPolicy()).setCallback(new Callback<>() {
-                            @Override
-                            public void onSuccess(ListTimeline list) {
-                                if (getActivity() == null) return;
-                                setTitle(list.title);
-                                listTitle = list.title;
-                                repliesPolicy = list.repliesPolicy;
-                                E.post(new ListUpdatedCreatedEvent(listID, listTitle, repliesPolicy));
-                            }
-
-                            @Override
-                            public void onError(ErrorResponse error) {
-                                setTitle(listTitle);
-                                error.showToast(getContext());
-                            }
-                        }).exec(accountID);
-                    })
-                    .setNegativeButton(R.string.cancel, (d, which) -> {})
-                    .show();
-        } else if (item.getItemId() == R.id.delete) {
-            UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
-                E.post(new ListDeletedEvent(listID));
-                Nav.finish(this);
-            });
-        }
-        return true;
-    }
-
-    @Override
-    protected TimelineDefinition makeTimelineDefinition() {
-        return TimelineDefinition.ofList(listID, listTitle);
+        // TODO: implement edit, delete
+        // inflater.inflate(R.menu.list, menu);
     }
 
     @Override
@@ -136,12 +51,10 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
                 .setCallback(new SimpleCallback<>(this) {
                     @Override
                     public void onSuccess(List<Status> result) {
-                        if (getActivity() == null) return;
-                        result=result.stream().filter(new StatusFilterPredicate(accountID, getFilterContext())).collect(Collectors.toList());
                         onDataLoaded(result, !result.isEmpty());
                     }
                 })
-               .exec(accountID);
+                .exec(accountID);
     }
 
     @Override
@@ -152,7 +65,13 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     }
 
     @Override
-    public void onFabClick(View v){
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        fab=view.findViewById(R.id.fab);
+        fab.setOnClickListener(this::onFabClick);
+    }
+
+    private void onFabClick(View v){
         Bundle args=new Bundle();
         args.putString("account", accountID);
         Nav.go(getActivity(), ComposeFragment.class, args);
@@ -162,15 +81,4 @@ public class ListTimelineFragment extends PinnableStatusListFragment {
     protected void onSetFabBottomInset(int inset) {
         ((ViewGroup.MarginLayoutParams) fab.getLayoutParams()).bottomMargin=V.dp(24)+inset;
     }
-
-
-    @Override
-    protected Filter.FilterContext getFilterContext() {
-        return Filter.FilterContext.HOME;
-    }
-
-    @Override
-    public Uri getWebUri(Uri.Builder base) {
-        return base.path("/lists/" + listID).build();
-    }
 }

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

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

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

@@ -1,270 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
-import org.joinmastodon.android.api.requests.lists.CreateList;
-import org.joinmastodon.android.api.requests.lists.GetLists;
-import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
-import org.joinmastodon.android.events.ListDeletedEvent;
-import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.ui.DividerItemDecoration;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.views.ListTimelineEditor;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.api.SimpleCallback;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class ListsFragment extends RecyclerFragment<ListTimeline> implements ScrollableToTop, ProvidesAssistContent.ProvidesWebUri {
-	private String accountID;
-	private String profileAccountId;
-	private final HashMap<String, Boolean> userInListBefore = new HashMap<>();
-	private final HashMap<String, Boolean> userInList = new HashMap<>();
-	private ListsAdapter adapter;
-
-	public ListsFragment() {
-		super(10);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		Bundle args = getArguments();
-		accountID = args.getString("account");
-		setHasOptionsMenu(true);
-		E.register(this);
-
-		if(args.containsKey("profileAccount")){
-			profileAccountId=args.getString("profileAccount");
-			String profileDisplayUsername = args.getString("profileDisplayUsername");
-			setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-		} else {
-			setTitle(R.string.sk_your_lists);
-		}
-	}
-
-	@Override
-	protected void onShown(){
-		super.onShown();
-		if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
-			loadData();
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.menu_list, menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.create) {
-			ListTimelineEditor editor = new ListTimelineEditor(getContext());
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.sk_create_list_title)
-					.setIcon(R.drawable.ic_fluent_people_add_28_regular)
-					.setView(editor)
-					.setPositiveButton(R.string.sk_create, (d, which) ->
-							new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
-								@Override
-								public void onSuccess(ListTimeline list) {
-									data.add(0, list);
-									adapter.notifyItemRangeInserted(0, 1);
-									E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
-								}
-
-								@Override
-								public void onError(ErrorResponse error) {
-									error.showToast(getContext());
-								}
-							}).exec(accountID)
-					)
-					.setNegativeButton(R.string.cancel, (d, which) -> {})
-					.show();
-		}
-		return true;
-	}
-
-	private void saveListMembership(String listId, boolean isMember) {
-		userInList.put(listId, isMember);
-		List<String> accountIdList = Collections.singletonList(profileAccountId);
-		MastodonAPIRequest<Object> req = isMember ? new AddAccountsToList(listId, accountIdList) : new RemoveAccountsFromList(listId, accountIdList);
-		req.setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Object o) {}
-
-			@Override
-			public void onError(ErrorResponse error) {
-				error.showToast(getContext());
-			}
-		}).exec(accountID);
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		userInListBefore.clear();
-		userInList.clear();
-		currentRequest=(profileAccountId != null ? new GetLists(profileAccountId) : new GetLists())
-				.setCallback(new SimpleCallback<>(this) {
-					@Override
-					public void onSuccess(List<ListTimeline> lists) {
-						if (getActivity() == null) return;
-						for (ListTimeline l : lists) userInListBefore.put(l.id, true);
-						userInList.putAll(userInListBefore);
-						if (profileAccountId == null || !lists.isEmpty()) onDataLoaded(lists, false);
-						if (profileAccountId == null) return;
-
-						currentRequest=new GetLists().setCallback(new SimpleCallback<>(ListsFragment.this) {
-							@Override
-							public void onSuccess(List<ListTimeline> allLists) {
-								if (getActivity() == null) return;
-								List<ListTimeline> newLists = new ArrayList<>();
-								for (ListTimeline l : allLists) {
-									if (lists.stream().noneMatch(e -> e.id.equals(l.id))) newLists.add(l);
-									if (!userInListBefore.containsKey(l.id)) {
-										userInListBefore.put(l.id, false);
-									}
-								}
-								userInList.putAll(userInListBefore);
-								onDataLoaded(newLists, false);
-							}
-						}).exec(accountID);
-					}
-				})
-				.exec(accountID);
-	}
-
-	@Subscribe
-	public void onListDeletedEvent(ListDeletedEvent event) {
-		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
-				data.remove(i);
-				adapter.notifyItemRemoved(i);
-				break;
-			}
-		}
-	}
-
-	@Subscribe
-	public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
-		for (int i = 0; i < data.size(); i++) {
-			ListTimeline item = data.get(i);
-			if (item.id.equals(event.id)) {
-				item.title = event.title;
-				item.repliesPolicy = event.repliesPolicy;
-				adapter.notifyItemChanged(i);
-				break;
-			}
-		}
-	}
-
-	@Override
-	protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
-		return adapter = new ListsAdapter();
-	}
-
-	@Override
-	public void scrollToTop() {
-		smoothScrollRecyclerViewToTop(list);
-	}
-
-	@Override
-	public String getAccountID() {
-		return accountID;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path("/lists").build();
-	}
-
-	private class ListsAdapter extends RecyclerView.Adapter<ListViewHolder>{
-		@NonNull
-		@Override
-		public ListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new ListViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(@NonNull ListViewHolder holder, int position) {
-			holder.bind(data.get(position));
-		}
-
-		@Override
-		public int getItemCount() {
-			return data.size();
-		}
-	}
-
-	private class ListViewHolder extends BindableViewHolder<ListTimeline> implements UsableRecyclerView.Clickable{
-		private final TextView title;
-		private final CheckBox listToggle;
-
-		public ListViewHolder(){
-			super(getActivity(), R.layout.item_text, list);
-			title=findViewById(R.id.title);
-			listToggle=findViewById(R.id.list_toggle);
-		}
-
-		@Override
-		public void onBind(ListTimeline item) {
-			title.setText(item.title);
-			title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_24_regular), null, null, null);
-			if (profileAccountId != null) {
-				Boolean checked = userInList.get(item.id);
-				listToggle.setVisibility(View.VISIBLE);
-				listToggle.setChecked(userInList.containsKey(item.id) && checked != null && checked);
-				listToggle.setOnClickListener(this::onClickToggle);
-			} else {
-				listToggle.setVisibility(View.GONE);
-			}
-		}
-
-		private void onClickToggle(View view) {
-			saveListMembership(item.id, listToggle.isChecked());
-		}
-
-		@Override
-		public void onClick() {
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			args.putString("listID", item.id);
-			args.putString("listTitle", item.title);
-			if (item.repliesPolicy != null) args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
-			Nav.go(getActivity(), ListTimelineFragment.class, args);
-		}
-	}
-}

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

@@ -2,7 +2,6 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.assist.AssistContent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,12 +13,6 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
-
-import com.squareup.otto.Subscribe;
-
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
@@ -31,7 +24,12 @@ import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.squareup.otto.Subscribe;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
@@ -39,16 +37,17 @@ import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.V;
 
-public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, ProvidesAssistContent {
+public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop{
 
 	private TabLayout tabLayout;
 	private ViewPager2 pager;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 
-	private NotificationsListFragment allNotificationsFragment, mentionsFragment;
+	private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment;
 
 	private String accountID;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
@@ -75,26 +74,15 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.notifications, menu);
-		menu.findItem(R.id.clear_notifications).setVisible(GlobalUserPreferences.enableDeleteNotifications);
-		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.follow_requests);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.follow_requests) {
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			Nav.go(getActivity(), FollowRequestsListFragment.class, args);
-			return true;
-		} else if (item.getItemId() == R.id.clear_notifications) {
-			UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{
-				for (int i = 0; i < tabViews.length; i++) {
-					getFragmentForPage(i).reload();
-				}
-			});
-			return true;
-		}
-		return false;
+		if (item.getItemId() != R.id.follow_requests) return false;
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+		return true;
 	}
 
 	@Override
@@ -103,14 +91,14 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
-		UiUtils.reduceSwipeSensitivity(pager);
 
-		tabViews=new FrameLayout[2];
+		tabViews=new FrameLayout[3];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
 				case 0 -> R.id.notifications_all;
 				case 1 -> R.id.notifications_mentions;
+				case 2 -> R.id.notifications_posts;
 				default -> throw new IllegalStateException("Unexpected value: "+i);
 			});
 			tabView.setVisibility(View.GONE);
@@ -120,18 +108,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		tabLayout.setTabTextSize(V.dp(16));
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
-		tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-			@Override
-			public void onTabSelected(TabLayout.Tab tab) {}
-
-			@Override
-			public void onTabUnselected(TabLayout.Tab tab) {}
-
-			@Override
-			public void onTabReselected(TabLayout.Tab tab) {
-				scrollToTop();
-			}
-		});
 
 		pager.setOffscreenPageLimit(4);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
@@ -162,9 +138,15 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 			mentionsFragment=new NotificationsListFragment();
 			mentionsFragment.setArguments(args);
 
+			args=new Bundle(args);
+			args.putBoolean("onlyPosts", true);
+			postsFragment=new NotificationsListFragment();
+			postsFragment.setArguments(args);
+
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.notifications_all, allNotificationsFragment)
 					.add(R.id.notifications_mentions, mentionsFragment)
+					.add(R.id.notifications_posts, postsFragment)
 					.commit();
 		}
 
@@ -174,6 +156,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 				tab.setText(switch(position){
 					case 0 -> R.string.all_notifications;
 					case 1 -> R.string.mentions;
+					case 2 -> R.string.posts;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -188,7 +171,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		new GetFollowRequests(null, 1).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(HeaderPaginationList<Account> accounts) {
-				if (getActivity() == null) return;
 				getToolbar().getMenu().findItem(R.id.follow_requests).setVisible(!accounts.isEmpty());
 			}
 
@@ -217,28 +199,23 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 	protected void updateToolbar(){
 		super.updateToolbar();
 		getToolbar().setOutlineProvider(null);
-		getToolbar().setOnClickListener(v->scrollToTop());
 	}
 
 	private NotificationsListFragment getFragmentForPage(int page){
 		return switch(page){
 			case 0 -> allNotificationsFragment;
 			case 1 -> mentionsFragment;
+			case 2 -> postsFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
 
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
-	}
-
 	private class DiscoverPagerAdapter extends RecyclerView.Adapter<SimpleViewHolder>{
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
+			((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);
@@ -249,7 +226,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 
 		@Override
 		public int getItemCount(){
-			return 2;
+			return 3;
 		}
 
 		@Override

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

@@ -1,9 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
-import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 
 import com.squareup.otto.Subscribe;
@@ -11,27 +9,18 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
-import org.joinmastodon.android.api.requests.notifications.PleromaMarkNotificationsRead;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.events.AllNotificationsSeenEvent;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
-import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.CacheablePaginatedResponse;
-import org.joinmastodon.android.model.Emoji;
-import org.joinmastodon.android.model.Filter;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Notification;
+import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AccountCardStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.ImageStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
-import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
 import org.joinmastodon.android.ui.utils.InsetStatusItemDecoration;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
 import java.util.ArrayList;
@@ -45,17 +34,12 @@ import java.util.stream.Stream;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.SimpleCallback;
+import me.grishka.appkit.utils.V;
 
 public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
 	private boolean onlyMentions;
 	private boolean onlyPosts;
 	private String maxID;
-	private final DiscoverInfoBannerHelper bannerHelper = new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.POST_NOTIFICATIONS);
-
-	@Override
-	protected boolean wantsComposeButton() {
-		return false;
-	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -86,15 +70,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
-		Account reportTarget = n.report == null ? null : n.report.targetAccount == null ? null :
-				n.report.targetAccount;
-		Emoji emoji = new Emoji();
-		if(n.emojiUrl!=null){
-			emoji.shortcode=n.emoji.substring(1,n.emoji.length()-1);
-			emoji.url=n.emojiUrl;
-			emoji.staticUrl=n.emojiUrl;
-			emoji.visibleInPicker=false;
-		}
 		String extraText=switch(n.type){
 			case FOLLOW -> getString(R.string.user_followed_you);
 			case FOLLOW_REQUEST -> getString(R.string.user_sent_follow_request);
@@ -102,26 +77,23 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			case REBLOG -> getString(R.string.notification_boosted);
 			case FAVORITE -> getString(R.string.user_favorited);
 			case POLL -> getString(R.string.poll_ended);
-			case UPDATE -> getString(R.string.sk_post_edited);
-			case SIGN_UP -> getString(R.string.sk_signed_up);
-			case REPORT -> getString(R.string.sk_reported);
-			case REACTION, PLEROMA_EMOJI_REACTION ->
-					n.emoji != null ? getString(R.string.sk_reacted_with, n.emoji) : getString(R.string.sk_reacted);
 		};
-		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, n.emojiUrl!=null ? HtmlParser.parseCustomEmoji(extraText, Collections.singletonList(emoji)) : extraText, n, null) : null;
+		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, null, extraText) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, false, Filter.FilterContext.NOTIFICATIONS);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null);
+			if(titleItem!=null){
+				for(StatusDisplayItem item:items){
+					if(item instanceof ImageStatusDisplayItem imgItem){
+						imgItem.horizontalInset=V.dp(32);
+					}
+				}
+			}
 			if(titleItem!=null)
 				items.add(0, titleItem);
 			return items;
 		}else if(titleItem!=null){
-			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this,
-					reportTarget != null ? reportTarget : n.account, n);
-			TextStatusDisplayItem text = n.report != null && !TextUtils.isEmpty(n.report.comment) ?
-					new TextStatusDisplayItem(n.id, n.report.comment, this,
-							Status.ofFake(n.id, n.report.comment, n.createdAt), true) :
-					null;
-			return text == null ? Arrays.asList(titleItem, card) : Arrays.asList(titleItem, text, card);
+			AccountCardStatusDisplayItem card=new AccountCardStatusDisplayItem(n.id, this, n.account, n);
+			return Arrays.asList(titleItem, card);
 		}else{
 			return Collections.emptyList();
 		}
@@ -133,8 +105,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			knownAccounts.put(s.account.id, s.account);
 		if(s.status!=null && !knownAccounts.containsKey(s.status.account.id))
 			knownAccounts.put(s.status.account.id, s.status.account);
-		if(s.status!=null && s.status.reblog!=null && !knownAccounts.containsKey(s.status.reblog.account.id))
-			knownAccounts.put(s.status.reblog.account.id, s.status.reblog.account);
 	}
 
 	@Override
@@ -143,8 +113,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 				.getAccount(accountID).getCacheController()
 				.getNotifications(offset>0 ? maxID : null, count, onlyMentions, onlyPosts, refreshing, new SimpleCallback<>(this){
 					@Override
-					public void onSuccess(CacheablePaginatedResponse<List<Notification>> result){
-						if (getActivity() == null) return;
+					public void onSuccess(PaginatedResponse<List<Notification>> result){
+						if(getActivity()==null)
+							return;
 						if(refreshing)
 							relationships.clear();
 						onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty());
@@ -155,17 +126,8 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 						loadRelationships(needRelationships);
 						maxID=result.maxID;
 
-						Markers markers = AccountSessionManager.getInstance().getAccount(accountID).markers;
-						if(offset==0 && !result.items.isEmpty() && !result.isFromCache() && markers != null && markers.notifications != null){
-							E.post(new AllNotificationsSeenEvent());
+						if(offset==0 && !result.items.isEmpty()){
 							new SaveMarkers(null, result.items.get(0).id).exec(accountID);
-							AccountSessionManager.getInstance().getAccount(accountID).markers
-									.notifications.lastReadId = result.items.get(0).id;
-							AccountSessionManager.getInstance().writeAccountsFile();
-
-							if (isInstanceAkkoma()) {
-								new PleromaMarkNotificationsRead(result.items.get(0).id).exec(accountID);
-							}
 						}
 					}
 				});
@@ -200,9 +162,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			if(status.inReplyToAccountId!=null && knownAccounts.containsKey(status.inReplyToAccountId))
 				args.putParcelable("inReplyToAccount", Parcels.wrap(knownAccounts.get(status.inReplyToAccountId)));
 			Nav.go(getActivity(), ThreadFragment.class, args);
-		}else if(n.report != null){
-			String domain = AccountSessionManager.getInstance().getAccount(accountID).domain;
-			UiUtils.launchWebBrowser(getActivity(), "https://"+domain+"/admin/reports/"+n.report.id);
 		}else{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -215,7 +174,6 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
 		list.addItemDecoration(new InsetStatusItemDecoration(this));
-		if (onlyPosts) bannerHelper.maybeAddBanner(contentWrap);
 	}
 
 	private Notification getNotificationByID(String id){
@@ -252,7 +210,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		}
 	}
 
-	public void removeNotification(Notification n){
+	private void removeNotification(Notification n){
 		data.remove(n);
 		preloadedData.remove(n);
 		int index=-1;
@@ -272,11 +230,4 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		displayItems.subList(index, lastIndex).clear();
 		adapter.notifyItemRangeRemoved(index, lastIndex-index);
 	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path(isInstanceAkkoma()
-				? "/users/" + getSession().self.username + "/interactions"
-				: "/notifications").build();
-	}
 }

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

@@ -1,69 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.os.Bundle;
-import android.view.HapticFeedbackConstants;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.model.TimelineDefinition;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class PinnableStatusListFragment extends StatusListFragment {
-    protected List<TimelineDefinition> pinnedTimelines;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        pinnedTimelines = new ArrayList<>(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.getDefaultTimelines(accountID)));
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        updatePinButton(menu.findItem(R.id.pin));
-    }
-
-    protected boolean isPinned() {
-        return pinnedTimelines.contains(makeTimelineDefinition());
-    }
-
-    protected void updatePinButton(MenuItem pin) {
-        boolean pinned = isPinned();
-        pin.setIcon(pinned ?
-                R.drawable.ic_fluent_pin_24_filled :
-                R.drawable.ic_fluent_pin_24_regular);
-        pin.setTitle(pinned ? R.string.sk_unpin_timeline : R.string.sk_pin_timeline);
-    }
-
-    protected abstract TimelineDefinition makeTimelineDefinition();
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.pin) {
-            togglePin(item);
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    protected void togglePin(MenuItem pin) {
-        onPinnedUpdated(true);
-        getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
-        TimelineDefinition def = makeTimelineDefinition();
-        boolean pinned = isPinned();
-        if (pinned) pinnedTimelines.remove(def);
-        else pinnedTimelines.add(def);
-        Toast.makeText(getContext(), pinned ? R.string.sk_unpinned_timeline : R.string.sk_pinned_timeline, Toast.LENGTH_SHORT).show();
-        GlobalUserPreferences.pinnedTimelines.put(accountID, pinnedTimelines);
-        GlobalUserPreferences.save();
-        updatePinButton(pin);
-    }
-
-    public void onPinnedUpdated(boolean pinned) {}
-}

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

@@ -337,7 +337,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
 			super.onSelectedChanged(viewHolder, actionState);
 			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG){
-				viewHolder.itemView.setTag(me.grishka.appkit.R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
+				viewHolder.itemView.setTag(R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
 				viewHolder.itemView.animate().translationZ(V.dp(1)).setDuration(200).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
 				draggedViewHolder=viewHolder;
 			}

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

@@ -1,22 +1,26 @@
 package org.joinmastodon.android.fragments;
 
+import static android.content.Context.CLIPBOARD_SERVICE;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.assist.AssistContent;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
@@ -25,18 +29,16 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -58,9 +60,7 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Relationship;
-import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
 import org.joinmastodon.android.ui.drawables.CoverOverlayGradientDrawable;
@@ -69,13 +69,10 @@ import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
-import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.CoverImageView;
-import org.joinmastodon.android.ui.views.LinkedTextView;
 import org.joinmastodon.android.ui.views.NestedRecyclerScrollView;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
 import org.parceler.Parcels;
 
 import java.time.LocalDateTime;
@@ -87,13 +84,9 @@ import java.util.Collections;
 import java.util.List;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.viewpager2.widget.ViewPager2;
-
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -101,46 +94,37 @@ import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.fragments.LoaderFragment;
 import me.grishka.appkit.fragments.OnBackPressedListener;
-import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
-import me.grishka.appkit.imageloader.RecyclerViewDelegate;
 import me.grishka.appkit.imageloader.ViewImageLoader;
-import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
 
-public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop, HasFab, ProvidesAssistContent.ProvidesWebUri {
+public class ProfileFragment extends LoaderFragment implements OnBackPressedListener, ScrollableToTop{
 	private static final int AVATAR_RESULT=722;
 	private static final int COVER_RESULT=343;
 
 	private ImageView avatar;
 	private CoverImageView cover;
-	private View avatarBorder, nameWrap;
+	private View avatarBorder;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel, postsCount, postsLabel;
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
 	private NestedRecyclerScrollView scrollView;
 	private AccountTimelineFragment postsFragment, postsWithRepliesFragment, pinnedPostsFragment, mediaFragment;
-//	private ProfileAboutFragment aboutFragment;
+	private ProfileAboutFragment aboutFragment;
 	private TabLayout tabbar;
 	private SwipeRefreshLayout refreshLayout;
 	private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
 	private float titleTransY;
-	private View postsBtn, followersBtn, followingBtn, profileCounters;
+	private View postsBtn, followersBtn, followingBtn;
 	private EditText nameEdit, bioEdit;
 	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
-	private ViewGroup rolesView;
 
 	private Account account;
 	private String accountID;
-	private String domain;
 	private Relationship relationship;
 	private int statusBarHeight;
 	private boolean isOwnProfile;
@@ -150,21 +134,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private Uri editNewAvatar, editNewCover;
 	private String profileAccountID;
 	private boolean refreshing;
-	private ImageButton fab;
+	private View fab;
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
 
-	private int maxFields = 4;
-
-	// from ProfileAboutFragment
-	public UsableRecyclerView list;
-	private List<AccountField> metadataListData=Collections.emptyList();
-	private MetadataAdapter adapter;
-	private ItemTouchHelper dragHelper=new ItemTouchHelper(new ReorderCallback());
-	private RecyclerView.ViewHolder draggedViewHolder;
-	private ListImageLoaderWrapper imgLoader;
-
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
 	}
@@ -176,7 +150,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			setRetainInstance(true);
 
 		accountID=getArguments().getString("account");
-		domain=AccountSessionManager.getInstance().getAccount(accountID).domain;
 		if(getArguments().containsKey("profileAccount")){
 			account=Parcels.unwrap(getArguments().getParcelable("profileAccount"));
 			profileAccountID=account.id;
@@ -184,8 +157,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			loaded=true;
 			if(!isOwnProfile)
 				loadRelationship();
-			else if (isInstanceAkkoma() && getInstance().isPresent())
-				maxFields = getInstance().get().pleroma.metadata.fieldsLimits.maxFields;
 		}else{
 			profileAccountID=getArguments().getString("profileAccountID");
 			if(!getArguments().getBoolean("noAutoLoad", false))
@@ -193,11 +164,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
-	private String getPrefilledText() {
-		return account == null || AccountSessionManager.getInstance().isSelf(accountID, account)
-				? null : '@'+account.acct+' ';
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -212,10 +178,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		cover=content.findViewById(R.id.cover);
 		avatarBorder=content.findViewById(R.id.avatar_border);
 		name=content.findViewById(R.id.name);
-		nameWrap=content.findViewById(R.id.name_wrap);
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
-		profileCounters=content.findViewById(R.id.profile_counters);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
 		followersBtn=content.findViewById(R.id.followers_btn);
@@ -237,8 +201,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress=content.findViewById(R.id.notify_progress);
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
-		list=content.findViewById(R.id.metadata);
-		rolesView=content.findViewById(R.id.roles);
 
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
@@ -258,7 +220,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			}
 		};
 
-		tabViews=new FrameLayout[4];
+		tabViews=new FrameLayout[5];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			tabView.setId(switch(i){
@@ -274,8 +236,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			tabViews[i]=tabView;
 		}
 
-		UiUtils.reduceSwipeSensitivity(pager);
-		pager.setOffscreenPageLimit(4);
+		pager.setOffscreenPageLimit(5);
 		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new ProfilePagerAdapter());
 		pager.getLayoutParams().height=getResources().getDisplayMetrics().heightPixels;
@@ -309,13 +270,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 
 		actionButton.setOnClickListener(this::onActionButtonClick);
-		actionButton.setOnLongClickListener(this::onActionButtonLongClick);
 		notifyButton.setOnClickListener(this::onNotifyButtonClick);
 		avatar.setOnClickListener(this::onAvatarClick);
 		cover.setOnClickListener(this::onCoverClick);
 		refreshLayout.setOnRefreshListener(this);
 		fab.setOnClickListener(this::onFabClick);
-		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID, getPrefilledText()));
 
 		if(loaded){
 			bindHeaderView();
@@ -329,22 +288,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
 		username.setOnLongClickListener(v->{
-			String usernameString=account.acct;
-			if(!usernameString.contains("@")){
-				usernameString+="@"+domain;
+			String username=account.acct;
+			if(!username.contains("@")){
+				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 			}
-			UiUtils.copyText(username, '@'+usernameString);
+			UiUtils.copyText(getActivity(), '@'+username);
 			return true;
 		});
 
-		// from ProfileAboutFragment
-		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 sizeWrapper;
 	}
 
@@ -354,7 +305,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(Account result){
-						if (getActivity() == null) return;
 						account=result;
 						isOwnProfile=AccountSessionManager.getInstance().isSelf(accountID, account);
 						bindHeaderView();
@@ -400,8 +350,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			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);
-//			aboutFragment=new ProfileAboutFragment();
-			setFields(fields);
+			aboutFragment=new ProfileAboutFragment();
+			aboutFragment.setFields(fields);
 		}
 		pager.getAdapter().notifyDataSetChanged();
 		super.dataLoaded();
@@ -443,7 +393,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			toolbarTitleView.setTranslationY(titleTransY);
 			toolbarSubtitleView.setTranslationY(titleTransY);
 		}
-		RecyclerFragment.setRefreshLayoutColors(refreshLayout);
 	}
 
 	@Override
@@ -495,21 +444,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name.setText(ssb);
 		setTitle(ssb);
 
-		if (account.roles != null && !account.roles.isEmpty()) {
-			rolesView.setVisibility(View.VISIBLE);
-			rolesView.removeAllViews();
-			name.setPadding(0, 0, V.dp(12), 0);
-			for (Account.Role role : account.roles) {
-				TextView roleText = new TextView(getActivity(), null, 0, R.style.role_label);
-				roleText.setText(role.name);
-				if (!TextUtils.isEmpty(role.color) && role.color.startsWith("#")) try {
-					GradientDrawable bg = (GradientDrawable) roleText.getBackground().mutate();
-					bg.setStroke(V.dp(2), Color.parseColor(role.color));
-				} catch (Exception ignored) {}
-				rolesView.addView(roleText);
-			}
-		}
-
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
 		if(account.locked){
@@ -517,7 +451,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			ssb.append(account.acct);
 			if(isSelf){
 				ssb.append('@');
-				ssb.append(domain);
+				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
 			}
 			ssb.append(" ");
 			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock, getActivity().getTheme()).mutate();
@@ -527,7 +461,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
-			username.setText('@'+account.acct+(isSelf ? ('@'+domain) : ""));
+			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
 		if(TextUtils.isEmpty(parsedBio)){
@@ -555,12 +489,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		fields.clear();
 
-		if (account.createdAt != null) {
-			AccountField joined=new AccountField();
-			joined.parsedName=joined.name=getString(R.string.profile_joined);
-			joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
-			fields.add(joined);
-		}
+		AccountField joined=new AccountField();
+		joined.parsedName=joined.name=getString(R.string.profile_joined);
+		joined.parsedValue=joined.value=DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).format(LocalDateTime.ofInstant(account.createdAt, ZoneId.systemDefault()));
+		fields.add(joined);
 
 		for(AccountField field:account.fields){
 			field.parsedValue=ssb=HtmlParser.parse(field.value, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
@@ -579,7 +511,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			fields.add(field);
 		}
 
-		setFields(fields);
+		if(aboutFragment!=null){
+			aboutFragment.setFields(fields);
+		}
 	}
 
 	private void updateToolbar(){
@@ -615,38 +549,21 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
-		boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
-		MenuItem openWithAccounts = menu.findItem(R.id.open_with_account);
-		openWithAccounts.setVisible(hasMultipleAccounts);
-		SubMenu accountsMenu = openWithAccounts.getSubMenu();
-		if (hasMultipleAccounts) {
-			accountsMenu.clear();
-			UiUtils.populateAccountsMenu(accountID, accountsMenu, s-> UiUtils.openURL(
-					getActivity(), s.getID(), account.url, false
-			));
-		}
-		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
+		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
 		if(isOwnProfile)
 			return;
 
-		MenuItem mute = menu.findItem(R.id.mute);
-		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
-		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
-		UiUtils.insetPopupMenuIcon(getContext(), mute);
-
-		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
-		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
-		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
+		menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
+		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
+		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
-			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
-			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
-			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
-			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			menu.findItem(R.id.hide_boosts).setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
+			manageUserLists.setVisible(true);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -666,8 +583,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			confirmToggleMuted();
 		}else if(id==R.id.block){
 			confirmToggleBlocked();
-		}else if(id==R.id.soft_block){
-			confirmSoftBlockUser();
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -706,19 +621,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			if (!isOwnProfile) {
-				args.putString("profileAccount", profileAccountID);
-				args.putString("profileDisplayUsername", account.getDisplayUsername());
-			}
-			Nav.go(getActivity(), ListsFragment.class, args);
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			Nav.go(getActivity(), FollowedHashtagsFragment.class, args);
-		}else if(id==R.id.scheduled){
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			Nav.go(getActivity(), ScheduledStatusListFragment.class, args);
 		}
 		return true;
 	}
@@ -748,7 +657,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void updateRelationship(){
-		if (getActivity() == null) return;
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
 		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);
@@ -758,21 +666,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
-	}
-
-	public ImageButton getFab() {
-		return fab;
-	}
-
-	@Override
-	public void showFab() {
-		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.showFab();
-	}
-
-	@Override
-	public void hideFab() {
-		if (getFragmentForPage(pager.getCurrentItem()) instanceof HasFab fabulous) fabulous.hideFab();
+		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){
@@ -795,8 +689,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		coverGradient.setTopOffset(scrollY);
 		cover.invalidate();
 		titleTransY=getToolbar().getHeight();
-		if(scrollY>nameWrap.getTop()-topBarsH){
-			titleTransY=Math.max(0f, titleTransY-(scrollY-(nameWrap.getTop()-topBarsH)));
+		if(scrollY>name.getTop()-topBarsH){
+			titleTransY=Math.max(0f, titleTransY-(scrollY-(name.getTop()-topBarsH)));
 		}
 		if(toolbarTitleView!=null){
 			toolbarTitleView.setTranslationY(titleTransY);
@@ -813,7 +707,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			case 1 -> postsWithRepliesFragment;
 			case 2 -> pinnedPostsFragment;
 			case 3 -> mediaFragment;
-//			case 4 -> aboutFragment;
+			case 4 -> aboutFragment;
 			default -> throw new IllegalStateException();
 		};
 	}
@@ -833,31 +727,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 	}
 
-	private boolean onActionButtonLongClick(View v) {
-		if (isOwnProfile || AccountSessionManager.getInstance().getLoggedInAccounts().size() < 2) return false;
-		UiUtils.pickAccount(getActivity(), accountID, R.string.sk_follow_as, R.drawable.ic_fluent_person_add_28_regular, session -> {
-			UiUtils.lookupAccount(getActivity(), account, session.getID(), accountID, acc -> {
-				if (acc == null) return;
-				new SetAccountFollowed(acc.id, true, true).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Relationship relationship) {
-						Toast.makeText(
-								getActivity(),
-								getString(R.string.sk_followed_as, session.self.getShortUsername()),
-								Toast.LENGTH_SHORT
-						).show();
-					}
-
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(getActivity());
-					}
-				}).exec(session.getID());
-			});
-		}, null);
-		return true;
-	}
-
 	private void setActionProgressVisible(boolean visible){
 		actionButton.setTextVisible(!visible);
 		actionProgress.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -880,7 +749,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					@Override
 					public void onSuccess(Account result){
 						editModeLoading=false;
-						if (getActivity() == null) return;
+						if(getActivity()==null)
+							return;
 						enterEditMode(result);
 						setActionProgressVisible(false);
 					}
@@ -888,7 +758,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 					@Override
 					public void onError(ErrorResponse error){
 						editModeLoading=false;
-						if (getActivity() == null) return;
+						if(getActivity()==null)
+							return;
 						error.showToast(getActivity());
 						setActionProgressVisible(false);
 					}
@@ -903,12 +774,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		pager.setUserInputEnabled(false);
 		actionButton.setText(R.string.done);
+		pager.setCurrentItem(4);
 		ArrayList<Animator> animators=new ArrayList<>();
-		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay, getActivity().getTheme()).mutate();
+		for(int i=0;i<tabViews.length-1;i++){
+			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, .3f));
+			tabbar.getTabAt(i).view.setEnabled(false);
+		}
+		Drawable overlay=getResources().getDrawable(R.drawable.edit_avatar_overlay).mutate();
 		avatar.setForeground(overlay);
 		animators.add(ObjectAnimator.ofInt(overlay, "alpha", 0, 255));
 
-		nameWrap.setVisibility(View.GONE);
 		nameEdit.setVisibility(View.VISIBLE);
 		nameEdit.setText(account.displayName);
 		RelativeLayout.LayoutParams lp=(RelativeLayout.LayoutParams) username.getLayoutParams();
@@ -920,9 +795,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bioEdit.setText(account.source.note);
 		animators.add(ObjectAnimator.ofFloat(bioEdit, View.ALPHA, 0f, 1f));
 		animators.add(ObjectAnimator.ofFloat(bio, View.ALPHA, 0f));
-		profileCounters.setVisibility(View.GONE);
-		pager.setVisibility(View.GONE);
-		tabbar.setVisibility(View.GONE);
+
+		animators.add(ObjectAnimator.ofFloat(postsBtn, View.ALPHA, .3f));
+		animators.add(ObjectAnimator.ofFloat(followersBtn, View.ALPHA, .3f));
+		animators.add(ObjectAnimator.ofFloat(followingBtn, View.ALPHA, .3f));
 
 		AnimatorSet set=new AnimatorSet();
 		set.playTogether(animators);
@@ -930,12 +806,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		set.setInterpolator(CubicBezierInterpolator.DEFAULT);
 		set.start();
 
-//		aboutFragment.enterEditMode(account.source.fields);
-
-		V.setVisibilityAnimated(fab, View.GONE);
-		metadataListData=account.source.fields;
-		adapter.notifyDataSetChanged();
-		dragHelper.attachToRecyclerView(list);
+		aboutFragment.enterEditMode(account.source.fields);
 	}
 
 	private void exitEditMode(){
@@ -946,14 +817,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		invalidateOptionsMenu();
 		ArrayList<Animator> animators=new ArrayList<>();
 		actionButton.setText(R.string.edit_profile);
+		for(int i=0;i<tabViews.length-1;i++){
+			animators.add(ObjectAnimator.ofFloat(tabbar.getTabAt(i).view, View.ALPHA, 1f));
+		}
 		animators.add(ObjectAnimator.ofInt(avatar.getForeground(), "alpha", 0));
 		animators.add(ObjectAnimator.ofFloat(nameEdit, View.ALPHA, 0f));
 		animators.add(ObjectAnimator.ofFloat(bioEdit, View.ALPHA, 0f));
 		animators.add(ObjectAnimator.ofFloat(bio, View.ALPHA, 1f));
-		profileCounters.setVisibility(View.VISIBLE);
-		pager.setVisibility(View.VISIBLE);
-		tabbar.setVisibility(View.VISIBLE);
-		V.setVisibilityAnimated(nameWrap, View.VISIBLE);
+		animators.add(ObjectAnimator.ofFloat(postsBtn, View.ALPHA, 1f));
+		animators.add(ObjectAnimator.ofFloat(followersBtn, View.ALPHA, 1f));
+		animators.add(ObjectAnimator.ofFloat(followingBtn, View.ALPHA, 1f));
 
 		AnimatorSet set=new AnimatorSet();
 		set.playTogether(animators);
@@ -962,21 +835,20 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		set.addListener(new AnimatorListenerAdapter(){
 			@Override
 			public void onAnimationEnd(Animator animation){
+				for(int i=0;i<tabViews.length-1;i++){
+					tabbar.getTabAt(i).view.setEnabled(true);
+				}
 				pager.setUserInputEnabled(true);
 				nameEdit.setVisibility(View.GONE);
 				bioEdit.setVisibility(View.GONE);
 				RelativeLayout.LayoutParams lp=(RelativeLayout.LayoutParams) username.getLayoutParams();
-				lp.addRule(RelativeLayout.BELOW, R.id.name_wrap);
+				lp.addRule(RelativeLayout.BELOW, R.id.name);
 				username.getParent().requestLayout();
 				avatar.setForeground(null);
-				scrollToTop();
 			}
 		});
 		set.start();
 
-		InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
-		imm.hideSoftInputFromWindow(content.getWindowToken(), 0);
-		V.setVisibilityAnimated(fab, View.VISIBLE);
 		bindHeaderView();
 	}
 
@@ -984,13 +856,12 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(!isInEditMode)
 			throw new IllegalStateException();
 		setActionProgressVisible(true);
-		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), editNewAvatar, editNewCover, metadataListData)
+		new UpdateAccountCredentials(nameEdit.getText().toString(), bioEdit.getText().toString(), editNewAvatar, editNewCover, aboutFragment.getFields())
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Account result){
 						account=result;
 						AccountSessionManager.getInstance().updateAccountInfo(accountID, account);
-						if (getActivity() == null) return;
 						exitEditMode();
 						setActionProgressVisible(false);
 					}
@@ -1012,10 +883,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
 	}
 
-	private void confirmSoftBlockUser(){
-		UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
-	}
-
 	private void updateRelationship(Relationship r){
 		relationship=r;
 		updateRelationship();
@@ -1072,7 +939,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		if(getPrefilledText() != null) args.putString("prefilledText", getPrefilledText());
+		if(!AccountSessionManager.getInstance().isSelf(accountID, account)){
+			args.putString("prefilledText", '@'+account.acct+' ');
+		}
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 
@@ -1121,7 +990,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
 			FrameLayout view=tabViews[viewType];
-			if (view.getParent() != null) ((ViewGroup)view.getParent()).removeView(view);
+			((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);
@@ -1155,242 +1024,4 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return position;
 		}
 	}
-
-	// from ProfileAboutFragment
-	public void setFields(ArrayList<AccountField> fields){
-		metadataListData=fields;
-		if (isInEditMode) {
-			isInEditMode=false;
-			dragHelper.attachToRecyclerView(null);
-		}
-		if (adapter != null) adapter.notifyDataSetChanged();
-	}
-
-	@Override
-	public void onProvideAssistContent(AssistContent assistContent) {
-		callFragmentToProvideAssistContent(getFragmentForPage(pager.getCurrentItem()), assistContent);
-	}
-
-	@Override
-	public String getAccountID() {
-		return accountID;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return Uri.parse(account.url);
-	}
-
-	private class MetadataAdapter extends UsableRecyclerView.Adapter<BaseViewHolder> implements ImageLoaderRecyclerAdapter {
-		public MetadataAdapter(){
-			super(imgLoader);
-		}
-
-		@NonNull
-		@Override
-		public BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return switch(viewType){
-				case 0 -> new AboutViewHolder();
-				case 1 -> new EditableAboutViewHolder();
-				case 2 -> new AddRowViewHolder();
-				default -> throw new IllegalStateException("Unexpected value: "+viewType);
-			};
-		}
-
-		@Override
-		public void onBindViewHolder(BaseViewHolder holder, int position){
-			if(position<metadataListData.size()){
-				holder.bind(metadataListData.get(position));
-			}else{
-				holder.bind(null);
-			}
-			super.onBindViewHolder(holder, position);
-		}
-
-		@Override
-		public int getItemCount(){
-			if(isInEditMode){
-				int size=metadataListData.size();
-				if(size<maxFields)
-					size++;
-				return size;
-			}
-			return metadataListData.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			if(isInEditMode){
-				return position==metadataListData.size() ? 2 : 1;
-			}
-			return 0;
-		}
-
-		@Override
-		public int getImageCountForItem(int position){
-			return isInEditMode || metadataListData.get(position).emojiRequests==null
-					? 0 : metadataListData.get(position).emojiRequests.size();
-		}
-
-		@Override
-		public ImageLoaderRequest getImageRequest(int position, int image){
-			return metadataListData.get(position).emojiRequests.get(image);
-		}
-	}
-
-	private abstract class BaseViewHolder extends BindableViewHolder<AccountField> {
-		public BaseViewHolder(int layout){
-			super(getActivity(), layout, list);
-		}
-	}
-
-	private class AboutViewHolder extends BaseViewHolder implements ImageLoaderViewHolder {
-		private TextView title;
-		private 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);
-			if(item.verifiedAt!=null){
-				int textColor=UiUtils.isDarkTheme() ? 0xFF89bb9c : 0xFF5b8e63;
-				value.setTextColor(textColor);
-				value.setLinkTextColor(textColor);
-				Drawable check=getResources().getDrawable(R.drawable.ic_fluent_checkmark_24_regular, getActivity().getTheme()).mutate();
-				check.setTint(textColor);
-				value.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, check, null);
-			}else{
-				value.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
-				value.setLinkTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.colorAccent));
-				value.setCompoundDrawables(null, null, null, null);
-			}
-		}
-
-		@Override
-		public void setImage(int index, Drawable image){
-			CustomEmojiSpan span=index>=item.nameEmojis.length ? item.valueEmojis[index-item.nameEmojis.length] : item.nameEmojis[index];
-			span.setDrawable(image);
-			title.invalidate();
-			value.invalidate();
-		}
-
-		@Override
-		public void clearImage(int index){
-			setImage(index, null);
-		}
-	}
-
-	private class EditableAboutViewHolder extends BaseViewHolder {
-		private EditText title;
-		private EditText value;
-
-		public EditableAboutViewHolder(){
-			super(R.layout.item_profile_about_editable);
-			title=findViewById(R.id.title);
-			value=findViewById(R.id.value);
-			findViewById(R.id.dragger_thingy).setOnLongClickListener(v->{
-				dragHelper.startDrag(this);
-				return true;
-			});
-			title.addTextChangedListener(new SimpleTextWatcher(e->item.name=e.toString()));
-			value.addTextChangedListener(new SimpleTextWatcher(e->item.value=e.toString()));
-			findViewById(R.id.remove_row_btn).setOnClickListener(this::onRemoveRowClick);
-		}
-
-		@Override
-		public void onBind(AccountField item){
-			title.setText(item.name);
-			value.setText(item.value);
-		}
-
-		private void onRemoveRowClick(View v){
-			int pos=getAbsoluteAdapterPosition();
-			metadataListData.remove(pos);
-			adapter.notifyItemRemoved(pos);
-			for(int i=0;i<list.getChildCount();i++){
-				BaseViewHolder vh=(BaseViewHolder) list.getChildViewHolder(list.getChildAt(i));
-				vh.rebind();
-			}
-		}
-	}
-
-	private class AddRowViewHolder extends BaseViewHolder implements UsableRecyclerView.Clickable{
-		public AddRowViewHolder(){
-			super(R.layout.item_profile_about_add_row);
-		}
-
-		@Override
-		public void onClick(){
-			metadataListData.add(new AccountField());
-			if(metadataListData.size()==maxFields){ // replace this row with new row
-				adapter.notifyItemChanged(metadataListData.size()-1);
-			}else{
-				adapter.notifyItemInserted(metadataListData.size()-1);
-				rebind();
-			}
-		}
-
-		@Override
-		public void onBind(AccountField item) {}
-	}
-
-	private class ReorderCallback extends ItemTouchHelper.SimpleCallback{
-		public ReorderCallback(){
-			super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
-		}
-
-		@Override
-		public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target){
-			if(target instanceof AddRowViewHolder)
-				return false;
-			int fromPosition=viewHolder.getAbsoluteAdapterPosition();
-			int toPosition=target.getAbsoluteAdapterPosition();
-			if (fromPosition<toPosition) {
-				for (int i=fromPosition;i<toPosition;i++) {
-					Collections.swap(metadataListData, i, i+1);
-				}
-			} else {
-				for (int i=fromPosition;i>toPosition;i--) {
-					Collections.swap(metadataListData, i, i-1);
-				}
-			}
-			adapter.notifyItemMoved(fromPosition, toPosition);
-			((BindableViewHolder)viewHolder).rebind();
-			((BindableViewHolder)target).rebind();
-			return true;
-		}
-
-		@Override
-		public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction){
-
-		}
-
-		@Override
-		public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState){
-			super.onSelectedChanged(viewHolder, actionState);
-			if(actionState==ItemTouchHelper.ACTION_STATE_DRAG){
-				viewHolder.itemView.setTag(me.grishka.appkit.R.id.item_touch_helper_previous_elevation, viewHolder.itemView.getElevation()); // prevents the default behavior of changing elevation in onDraw()
-				viewHolder.itemView.animate().translationZ(V.dp(1)).setDuration(200).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
-				draggedViewHolder=viewHolder;
-			}
-		}
-
-		@Override
-		public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder){
-			super.clearView(recyclerView, viewHolder);
-			viewHolder.itemView.animate().translationZ(0).setDuration(100).setInterpolator(CubicBezierInterpolator.DEFAULT).start();
-			draggedViewHolder=null;
-		}
-
-		@Override
-		public boolean isLongPressDragEnabled(){
-			return false;
-		}
-	}
 }

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

@@ -1,50 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import me.grishka.appkit.fragments.BaseRecyclerFragment;
-
-
-public abstract class RecyclerFragment<T> extends BaseRecyclerFragment<T> {
-	public RecyclerFragment(int perPage) {
-		super(perPage);
-	}
-
-	public RecyclerFragment(int layout, int perPage) {
-		super(layout, perPage);
-	}
-
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		if (refreshLayout != null) setRefreshLayoutColors(refreshLayout);
-	}
-
-	public static void setRefreshLayoutColors(SwipeRefreshLayout l) {
-		List<Integer> colors = new ArrayList<>(Arrays.asList(
-				R.color.primary_600,
-				R.color.red_primary_600,
-				R.color.green_primary_600,
-				R.color.blue_primary_600,
-				R.color.purple_600
-		));
-		int primary = UiUtils.getThemeColorRes(l.getContext(), R.attr.colorPrimary600);
-		if (!colors.contains(primary)) colors.add(0, primary);
-		int offset = colors.indexOf(primary);
-		int[] sorted = new int[colors.size()];
-		for (int i = 0; i < colors.size(); i++) {
-			sorted[i] = colors.get((i + offset) % colors.size());
-		}
-		l.setColorSchemeResources(sorted);
-	}
-}

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

@@ -1,191 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageButton;
-
-import com.squareup.otto.Subscribe;
-
-import org.joinmastodon.android.E;
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.statuses.CreateStatus;
-import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
-import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
-import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
-import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.ScheduledStatus;
-import org.joinmastodon.android.model.Status;
-import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.parceler.Parcels;
-
-import java.util.Collections;
-import java.util.List;
-
-import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.SimpleCallback;
-
-public class ScheduledStatusListFragment extends BaseStatusListFragment<ScheduledStatus> {
-	private String nextMaxID;
-	private static final int SCHEDULED_STATUS_LIST_OPENED = 161;
-
-	@Override
-	protected boolean wantsComposeButton() {
-		return true;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		E.register(this);
-	}
-
-	@Override
-	public void onDestroy(){
-		super.onDestroy();
-		E.unregister(this);
-	}
-
-
-	@Override
-	public void onAttach(Activity activity){
-		super.onAttach(activity);
-		setTitle(R.string.sk_unsent_posts);
-		loadData();
-	}
-
-	@Override
-	public void onFabClick(View v) {
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putSerializable("scheduledAt", CreateStatus.getDraftInstant());
-		Nav.go(getActivity(), ComposeFragment.class, args);
-	}
-
-	@Override
-	public boolean onFabLongClick(View v) {
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putSerializable("scheduledAt", CreateStatus.getDraftInstant());
-		return UiUtils.pickAccountForCompose(getActivity(), accountID, args);
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		if (getArguments().getBoolean("hide_fab", false)) fab.setVisibility(View.GONE);
-	}
-
-	@Override
-	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true, null);
-	}
-
-	@Override
-	protected void addAccountToKnown(ScheduledStatus s) {}
-
-	@Override
-	public void onItemClick(String id) {
-		final Bundle args=new Bundle();
-		args.putString("account", accountID);
-		ScheduledStatus scheduledStatus = getStatusByID(id);
-		Status status = scheduledStatus.toStatus();
-		args.putParcelable("scheduledStatus", Parcels.wrap(scheduledStatus));
-		args.putParcelable("editStatus", Parcels.wrap(status));
-		args.putString("sourceText", status.text);
-		args.putString("sourceSpoiler", status.spoilerText);
-		args.putBoolean("redraftStatus", true);
-		args.putString("sourceContentType", scheduledStatus.params.contentType != null ?
-				scheduledStatus.params.contentType.name() : null);
-		setResult(true, null);
-
-		// closing this scheduled status list if another status list is opened from compose fragment
-		Nav.goForResult(getActivity(), ComposeFragment.class, args, SCHEDULED_STATUS_LIST_OPENED, this);
-	}
-
-	@Override
-	public void onFragmentResult(int reqCode, boolean success, Bundle result) {
-		if (reqCode == SCHEDULED_STATUS_LIST_OPENED && success && getActivity() != null) {
-			Nav.finish(this);
-		}
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetScheduledStatuses(offset==0 ? null : nextMaxID, count)
-				.setCallback(new SimpleCallback<>(this){
-					@Override
-					public void onSuccess(HeaderPaginationList<ScheduledStatus> result){
-						if(result.nextPageUri!=null)
-							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
-						else
-							nextMaxID=null;
-						if (getActivity() == null) return;
-						onDataLoaded(result, nextMaxID!=null);
-					}
-				})
-				.exec(accountID);
-	}
-
-	// copied from StatusListFragment.java
-	@Subscribe
-	public void onScheduledStatusDeleted(ScheduledStatusDeletedEvent ev){
-		if(!ev.accountID.equals(accountID)) return;
-		ScheduledStatus status=getStatusByID(ev.id);
-		if(status==null) return;
-		removeStatus(status);
-	}
-
-	// copied from StatusListFragment.java
-	@Subscribe
-	public void onScheduledStatusCreated(ScheduledStatusCreatedEvent ev){
-		if(!ev.accountID.equals(accountID))	return;
-		prependItems(Collections.singletonList(ev.scheduledStatus), true);
-		scrollToTop();
-	}
-
-	// copied from StatusListFragment.java
-	protected void removeStatus(ScheduledStatus status){
-		data.remove(status);
-		preloadedData.remove(status);
-		int index=-1;
-		for(int i=0;i<displayItems.size();i++){
-			if(status.id.equals(displayItems.get(i).parentID)){
-				index=i;
-				break;
-			}
-		}
-		if(index==-1)
-			return;
-		int lastIndex;
-		for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
-			if(!displayItems.get(lastIndex).parentID.equals(status.id))
-				break;
-		}
-		displayItems.subList(index, lastIndex).clear();
-		adapter.notifyItemRangeRemoved(index, lastIndex-index);
-	}
-
-	// copied from StatusListFragment.java
-	protected ScheduledStatus getStatusByID(String id){
-		for(ScheduledStatus s:data){
-			if(s.id.equals(id)){
-				return s;
-			}
-		}
-		for(ScheduledStatus s:preloadedData){
-			if(s.id.equals(id)){
-				return s;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		// TODO: adapt when frontends finally implement a scheduled posts list
-		return null;
-	}
-}

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

@@ -7,14 +7,11 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.LruCache;
-import android.util.TypedValue;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,7 +21,6 @@ import android.view.animation.LinearInterpolator;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
@@ -44,35 +40,24 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
 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.InstanceRulesFragment;
-import org.joinmastodon.android.model.ContentType;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
-import org.joinmastodon.android.utils.ProvidesAssistContent;
-import org.parceler.Parcels;
 
 import java.util.ArrayList;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageCache;
@@ -80,35 +65,27 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class SettingsFragment extends MastodonToolbarFragment implements ProvidesAssistContent.ProvidesWebUri {
+public class SettingsFragment extends MastodonToolbarFragment{
 	private UsableRecyclerView list;
 	private ArrayList<Item> items=new ArrayList<>();
 	private ThemeItem themeItem;
 	private NotificationPolicyItem notificationPolicyItem;
-	private SwitchItem showNewPostsItem, glitchModeItem, compactReblogReplyLineItem;
-	private ButtonItem defaultContentTypeButtonItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
 	private boolean needAppRestart;
 	private PushSubscription pushSubscription;
 
 	private ImageView themeTransitionWindowView;
-	private TextItem checkForUpdateItem, clearImageCacheItem;
-	private ImageCache imageCache;
-	private Menu contentTypeMenu;
+	private TextItem checkForUpdateItem;
 
-	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		setTitle(R.string.settings);
-		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		Optional<Instance> instance = session.getInstance();
-		String instanceName = UiUtils.getInstanceName(accountID);
 
 		if(GithubSelfUpdater.needSelfUpdating()){
 			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
@@ -121,6 +98,10 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
+		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+			GlobalUserPreferences.disableMarquee=i.checked;
+			GlobalUserPreferences.save();
+		}));
 		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
 			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 			popupMenu.inflate(R.menu.color_palettes);
@@ -137,44 +118,9 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 				case BROWN -> R.string.sk_color_palette_brown;
 				case RED -> R.string.sk_color_palette_red;
 				case YELLOW -> R.string.sk_color_palette_yellow;
+				case NORD -> R.string.sk_color_palette_nord;
 			});
 		}));
-		items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{
-			updatePublishText(b);
-
-			b.setOnClickListener(l->{
-				TextInputFrameLayout input = new TextInputFrameLayout(
-						getContext(),
-						getString(R.string.publish),
-						GlobalUserPreferences.publishButtonText.trim()
-				);
-				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(input)
-						.setPositiveButton(R.string.save, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = input.getEditText().getText().toString().trim();
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNeutralButton(R.string.clear, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = "";
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNegativeButton(R.string.cancel, (d, which) -> {})
-						.show();
-			});
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
-			GlobalUserPreferences.uniformNotificationIcon=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
-			GlobalUserPreferences.disableMarquee=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
-		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
@@ -198,245 +144,58 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_mail_inbox_dismiss_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{
-			GlobalUserPreferences.enableDeleteNotifications=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_disable_alt_text_reminder, R.drawable.ic_fluent_image_alt_text_24_regular, GlobalUserPreferences.disableAltTextReminder, i->{
-			GlobalUserPreferences.disableAltTextReminder=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
-			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;
-			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_show_differentiated_notification_icons, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showDifferentiatedPushNoticationIcons, this::onNotificationStyleChanged));
 
-		items.add(new HeaderItem(R.string.sk_timelines));
+
+		items.add(new HeaderItem(R.string.home_timeline));
 		items.add(new SwitchItem(R.string.sk_settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		if (isInstanceAkkoma()) {
-			items.add(new ButtonItem(R.string.sk_settings_reply_visibility, R.drawable.ic_fluent_chat_24_regular, b->{
-				PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-				popupMenu.inflate(R.menu.reply_visibility);
-				popupMenu.setOnMenuItemClickListener(item -> this.onReplyVisibilityChanged(item, b));
-				b.setOnTouchListener(popupMenu.getDragToOpenListener());
-				b.setOnClickListener(v->popupMenu.show());
-				b.setText(GlobalUserPreferences.replyVisibility == null ?
-						R.string.sk_settings_reply_visibility_all :
-						switch(GlobalUserPreferences.replyVisibility){
-							case "following" -> R.string.sk_settings_reply_visibility_following;
-							case "self" -> R.string.sk_settings_reply_visibility_self;
-							default -> R.string.sk_settings_reply_visibility_all;
-						});
-			}));
-		}
 		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
 			GlobalUserPreferences.showBoosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_sync_24_regular, GlobalUserPreferences.loadNewPosts, i->{
+		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
-			showNewPostsItem.enabled = i.checked;
-			if (!i.checked) {
-				GlobalUserPreferences.showNewPostsButton = false;
-				showNewPostsItem.checked = false;
-			}
-			if (list.findViewHolderForAdapterPosition(items.indexOf(showNewPostsItem)) instanceof SwitchViewHolder svh) svh.rebind();
 			GlobalUserPreferences.save();
 		}));
-		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();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_alt_indicator, R.drawable.ic_fluent_scan_text_24_regular, GlobalUserPreferences.showAltIndicator, i->{
-			GlobalUserPreferences.showAltIndicator=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_no_alt_indicator, R.drawable.ic_fluent_important_24_regular, GlobalUserPreferences.showNoAltIndicator, i->{
-			GlobalUserPreferences.showNoAltIndicator=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_collapse_long_posts, R.drawable.ic_fluent_chevron_down_24_regular, GlobalUserPreferences.collapseLongPosts, i->{
-			GlobalUserPreferences.collapseLongPosts=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_hide_interaction, R.drawable.ic_fluent_eye_24_regular, GlobalUserPreferences.spectatorMode, i->{
-			GlobalUserPreferences.spectatorMode=i.checked;
+		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
+			GlobalUserPreferences.showFederatedTimeline=i.checked;
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_hide_fab, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.autoHideFab, i->{
-			GlobalUserPreferences.autoHideFab=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_reply_line_above_avatar, R.drawable.ic_fluent_arrow_reply_24_regular, GlobalUserPreferences.replyLineAboveHeader, i->{
-			GlobalUserPreferences.replyLineAboveHeader=i.checked;
-			GlobalUserPreferences.compactReblogReplyLine=i.checked;
-			compactReblogReplyLineItem.enabled=i.checked;
-			compactReblogReplyLineItem.checked= GlobalUserPreferences.replyLineAboveHeader;
-			if (list.findViewHolderForAdapterPosition(items.indexOf(compactReblogReplyLineItem)) instanceof SwitchViewHolder svh) svh.rebind();
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(compactReblogReplyLineItem=new SwitchItem(R.string.sk_compact_reblog_reply_line, R.drawable.ic_fluent_re_order_24_regular, GlobalUserPreferences.compactReblogReplyLine, i->{
-			GlobalUserPreferences.compactReblogReplyLine=i.checked;
-			GlobalUserPreferences.save();
-			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;
-		}));
-		boolean translationAvailable = instance
-				.map(i -> i.v2 != null && i.v2.configuration.translation != null && i.v2.configuration.translation.enabled)
-				.orElse(false);
-		items.add(new SmallTextItem(getString(translationAvailable ?
-				R.string.sk_settings_translation_availability_note_available :
-				R.string.sk_settings_translation_availability_note_unavailable, instanceName)));
 
 		items.add(new HeaderItem(R.string.settings_notifications));
 		items.add(notificationPolicyItem=new NotificationPolicyItem());
 		PushSubscription pushSubscription=getPushSubscription();
-		boolean switchEnabled=pushSubscription.policy!=PushSubscription.Policy.NONE;
+		items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i->onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked)));
+		items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked)));
+		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked)));
+		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_at_symbol, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
+		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
 
-		items.add(new SwitchItem(R.string.notify_favorites, R.drawable.ic_fluent_star_24_regular, pushSubscription.alerts.favourite, i->onNotificationsChanged(PushNotification.Type.FAVORITE, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_follow, R.drawable.ic_fluent_person_add_24_regular, pushSubscription.alerts.follow, i->onNotificationsChanged(PushNotification.Type.FOLLOW, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_chat_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.sk_notify_update, R.drawable.ic_fluent_history_24_regular, pushSubscription.alerts.update, i->onNotificationsChanged(PushNotification.Type.UPDATE, i.checked), switchEnabled));
-		items.add(new SwitchItem(R.string.sk_notify_poll_results, R.drawable.ic_fluent_poll_24_regular, pushSubscription.alerts.poll, i->onNotificationsChanged(PushNotification.Type.POLL, i.checked), switchEnabled));
+		items.add(new HeaderItem(R.string.settings_boring));
+		items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
+		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
+		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
 
-		items.add(new HeaderItem(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(instanceName));
-		items.add(new TextItem(R.string.sk_settings_rules, instance.<Runnable>map(i -> () -> {
-			Bundle args = new Bundle();
-			args.putParcelable("instance", Parcels.wrap(i));
-			Nav.go(getActivity(), InstanceRulesFragment.class, args);
-		}).orElse(null), 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));
-		items.add(new SmallTextItem(instance
-				.map(i -> getString(R.string.sk_settings_server_version, i.version))
-				.orElse(getString(R.string.sk_instance_info_unavailable))));
-
-		items.add(new HeaderItem(R.string.sk_instance_features));
-		items.add(new SwitchItem(R.string.sk_settings_content_types, 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(new SmallTextItem(getString(R.string.sk_settings_content_types_explanation)));
-		items.add(defaultContentTypeButtonItem = new ButtonItem(R.string.sk_settings_default_content_type, 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);
-			instance.ifPresent(i -> ContentType.adaptMenuToInstance(contentTypeMenu, i));
-		}));
-		items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation)));
-		items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{
-			glitchModeItem.enabled = i.checked;
-			if (i.checked) {
-				GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
-				if (!isInstanceAkkoma()) {
-					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(new SmallTextItem(getString(R.string.sk_settings_local_only_explanation)));
-		items.add(glitchModeItem = new SwitchItem(R.string.sk_settings_glitch_instance, 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);
-		items.add(new SmallTextItem(getString(R.string.sk_settings_glitch_mode_explanation)));
-
-		items.add(new HeaderItem(R.string.sk_settings_about));
-		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular));
-		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 RedHeaderItem(R.string.settings_spicy));
+		if (GithubSelfUpdater.needSelfUpdating()) {
+			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+			items.add(checkForUpdateItem);
+		}
+		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon")));
+		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
-		if (GithubSelfUpdater.needSelfUpdating()) {
-			items.add(new SwitchItem(R.string.sk_updater_enable_pre_releases, 0, GlobalUserPreferences.enablePreReleases, i->{
-				GlobalUserPreferences.enablePreReleases=i.checked;
-				GlobalUserPreferences.save();
-			}));
-			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
-			items.add(checkForUpdateItem);
-		}
-
-		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(R.string.log_out, this::confirmLogOut));
 
 		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
 	}
 
-	private void updatePublishText(Button btn) {
-		if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
-		else btn.setText(GlobalUserPreferences.publishButtonText);
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -482,7 +241,11 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){
 			AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().updatePushSettings(pushSubscription);
 		}
-		if(needAppRestart) UiUtils.restartApp();
+		if(needAppRestart){
+			Intent intent = Intent.makeRestartActivityTask(MastodonApp.context.getPackageManager().getLaunchIntentForPackage(MastodonApp.context.getPackageName()).getComponent());
+			MastodonApp.context.startActivity(intent);
+			Runtime.getRuntime().exit(0);
+		}
 	}
 
 	@Override
@@ -517,6 +280,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		else if (id == R.id.brown_color) pref = ColorPreference.BROWN;
 		else if (id == R.id.red_color) pref = ColorPreference.RED;
 		else if (id == R.id.yellow_color) pref = ColorPreference.YELLOW;
+		else if (id == R.id.nord_color) pref = ColorPreference.NORD;
 
 		if (pref == null) return false;
 
@@ -526,6 +290,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		return true;
 	}
 
+
 	private void onTrueBlackThemeChanged(SwitchItem item){
 		GlobalUserPreferences.trueBlackTheme=item.checked;
 		GlobalUserPreferences.save();
@@ -542,53 +307,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		}
 	}
 
-	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;
-	}
-
-	private boolean onReplyVisibilityChanged(MenuItem item, Button btn){
-		String pref = null;
-		int id = item.getItemId();
-
-		if (id == R.id.reply_visibility_following) pref = "following";
-		else if (id == R.id.reply_visibility_self) pref = "self";
-
-		GlobalUserPreferences.replyVisibility=pref;
-		GlobalUserPreferences.save();
-		btn.setText(GlobalUserPreferences.replyVisibility == null ?
-				R.string.sk_settings_reply_visibility_all :
-				switch(GlobalUserPreferences.replyVisibility){
-					case "following" -> R.string.sk_settings_reply_visibility_following;
-					case "self" -> R.string.sk_settings_reply_visibility_self;
-					default -> R.string.sk_settings_reply_visibility_all;
-				});
-		return true;
-	}
-
 	private void restartActivityToApplyNewTheme(){
 		// Calling activity.recreate() causes a black screen for like half a second.
 		// So, let's take a screenshot and overlay it on top to create the illusion of a smoother transition.
@@ -631,14 +349,18 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			case FAVORITE -> subscription.alerts.favourite=enabled;
 			case FOLLOW -> subscription.alerts.follow=enabled;
 			case REBLOG -> subscription.alerts.reblog=enabled;
-			case MENTION -> subscription.alerts.mention=enabled;
-			case POLL -> subscription.alerts.poll=enabled;
+			case MENTION -> subscription.alerts.mention=subscription.alerts.poll=enabled;
 			case STATUS -> subscription.alerts.status=enabled;
-			case UPDATE -> subscription.alerts.update=enabled;
 		}
 		needUpdateNotificationSettings=true;
 	}
 
+	private void onNotificationStyleChanged(SwitchItem item){
+		GlobalUserPreferences.showDifferentiatedPushNoticationIcons=item.checked;
+		GlobalUserPreferences.save();
+	}
+
+
 	private void onNotificationsPolicyChanged(PushSubscription.Policy policy){
 		PushSubscription subscription=getPushSubscription();
 		PushSubscription.Policy prevPolicy=subscription.policy;
@@ -653,13 +375,9 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			list.getAdapter().notifyItemChanged(index);
 		}
 		if((prevPolicy==PushSubscription.Policy.NONE)!=(policy==PushSubscription.Policy.NONE)){
-			boolean newState=policy!=PushSubscription.Policy.NONE;
-			for(PushNotification.Type value : PushNotification.Type.values()){
-				onNotificationsChanged(value, newState);
-			}
 			index++;
 			while(items.get(index) instanceof SwitchItem si){
-				si.enabled=si.checked=newState;
+				si.enabled=si.checked=policy!=PushSubscription.Policy.NONE;
 				RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(index);
 				if(holder!=null)
 					((BindableViewHolder<?>)holder).rebind();
@@ -699,7 +417,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 	}
 
 	private void onLoggedOut(){
-		if (getActivity() == null) return;
 		AccountSessionManager.getInstance().removeAccount(accountID);
 		getActivity().finish();
 		Intent intent=new Intent(getActivity(), MainActivity.class);
@@ -709,13 +426,9 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 	private void clearImageCache(){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
-			imageCache.clear();
+			ImageCache.getInstance(getActivity()).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();
-		}
 	}
 
 	@Subscribe
@@ -742,16 +455,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		}
 	}
 
-	@Override
-	public Uri getWebUri(Uri.Builder base) {
-		return base.path(isInstanceAkkoma() ? "/about" : "/settings").build();
-	}
-
-	@Override
-	public String getAccountID() {
-		return accountID;
-	}
-
 	private static abstract class Item{
 		public abstract int getViewType();
 	}
@@ -763,10 +466,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			this.text=getString(text);
 		}
 
-		public HeaderItem(String text){
-			this.text=text;
-		}
-
 		@Override
 		public int getViewType(){
 			return 0;
@@ -787,7 +486,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			this.onChanged=onChanged;
 		}
 
-		public SwitchItem(@StringRes int text, @DrawableRes int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
+		public SwitchItem(@StringRes int text, int icon, boolean checked, Consumer<SwitchItem> onChanged, boolean enabled){
 			this.text=getString(text);
 			this.icon=icon;
 			this.checked=checked;
@@ -818,6 +517,13 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		}
 	}
 
+	public class ColorPicker extends Item{
+		@Override
+		public int getViewType(){
+			return 8;
+		}
+	}
+
 	private static class ThemeItem extends Item{
 
 		@Override
@@ -834,49 +540,19 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		}
 	}
 
-	private class SmallTextItem extends Item {
-		private String text;
-
-		public SmallTextItem(String text) {
-			this.text = text;
-		}
-
-		@Override
-		public int getViewType() {
-			return 9;
-		}
-	}
-
 	private class TextItem extends Item{
 		private String text;
-		private String secondaryText;
 		private Runnable onClick;
 		private boolean loading;
-		private int icon;
 
 		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, null, onClick, false, 0);
+			this(text, onClick, false);
 		}
 
-		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, null, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
-			this(text, secondaryText, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
-			this.icon=icon;
-			this.secondaryText = secondaryText;
-		}
-
-		public TextItem(String text, Runnable onClick){
-			this.text=text;
-			this.onClick=onClick;
 		}
 
 		@Override
@@ -891,10 +567,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			super(text);
 		}
 
-		public RedHeaderItem(String text){
-			super(text);
-		}
-
 		@Override
 		public int getViewType(){
 			return 5;
@@ -937,7 +609,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
 				case 8 -> new ButtonViewHolder();
-				case 9 -> new SmallTextViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -988,12 +659,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		@Override
 		public void onBind(SwitchItem item){
 			text.setText(item.text);
-			if (item.icon == 0) {
-				icon.setVisibility(View.GONE);
-			} else {
-				icon.setVisibility(View.VISIBLE);
-				icon.setImageResource(item.icon);
-			}
+			icon.setImageResource(item.icon);
 			checkbox.setChecked(item.checked && item.enabled);
 			checkbox.setEnabled(item.enabled);
 		}
@@ -1071,6 +737,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 			}
 		}
 	}
+
 	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final ImageView icon;
@@ -1087,11 +754,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		@Override
 		public void onBind(ButtonItem item){
 			text.setText(item.text);
-			if (item.icon == 0) {
-				icon.setVisibility(View.GONE);
-			} else {
-				icon.setImageResource(item.icon);
-			}
+			icon.setImageResource(item.icon);
 			item.buttonConsumer.accept(button);
 		}
 	}
@@ -1140,27 +803,19 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 	}
 
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
-		private final TextView text, secondaryText;
+		private final TextView text;
 		private final ProgressBar progress;
-		private final ImageView icon;
 
 		public TextViewHolder(){
 			super(getActivity(), R.layout.item_settings_text, list);
 			text = itemView.findViewById(R.id.text);
-			secondaryText = itemView.findViewById(R.id.secondary_text);
 			progress = itemView.findViewById(R.id.progress);
-			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
-			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
-			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
-
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
-			icon.setImageResource(item.icon);
-			secondaryText.setText(item.secondaryText);
 		}
 
 		@Override
@@ -1169,24 +824,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		}
 	}
 
-	private class SmallTextViewHolder extends BindableViewHolder<SmallTextItem> {
-		private final TextView text;
-
-		public SmallTextViewHolder(){
-			super(getActivity(), R.layout.item_settings_text, list);
-			text = itemView.findViewById(R.id.text);
-			text.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
-			text.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-			text.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-			text.setPaddingRelative(text.getPaddingStart(), 0, text.getPaddingEnd(), text.getPaddingBottom());
-		}
-
-		@Override
-		public void onBind(SmallTextItem item){
-			text.setText(item.text);
-		}
-	}
-
 	private class FooterViewHolder extends BindableViewHolder<FooterItem>{
 		private final TextView text;
 		public FooterViewHolder(){
@@ -1202,7 +839,7 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 
 	private class UpdateViewHolder extends BindableViewHolder<UpdateItem>{
 
-		private final TextView text, changelog;
+		private final TextView text;
 		private final Button button;
 		private final ImageButton cancelBtn;
 		private final ProgressBar progress;
@@ -1213,7 +850,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 		public UpdateViewHolder(){
 			super(getActivity(), R.layout.item_settings_update, list);
 			text=findViewById(R.id.text);
-			changelog=findViewById(R.id.changelog);
 			button=findViewById(R.id.button);
 			cancelBtn=findViewById(R.id.cancel_btn);
 			progress=findViewById(R.id.progress);
@@ -1257,7 +893,6 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 				progress.setVisibility(View.GONE);
 				progress.removeCallbacks(progressUpdater);
 			}
-			changelog.setText(info.changelog);
 		}
 
 		private void updateProgress(){

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

@@ -1,47 +1,43 @@
 package org.joinmastodon.android.fragments;
 
-import android.graphics.drawable.ColorDrawable;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.style.ReplacementSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.instance.GetInstance;
 import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
 import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment;
-import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.ui.InterpolatingMotionEffect;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
-import org.parceler.Parcels;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.BottomSheet;
 
 public class SplashFragment extends AppKitFragment{
 
-	private static final String DEFAULT_SERVER="mastodon.social";
-
 	private SizeListenerFrameLayout contentView;
 	private View artContainer, blueFill, greenFill;
-	private InterpolatingMotionEffect motionEffect;
+	private ViewPager2 pager;
+	private ViewGroup pagerDots;
 	private View artClouds, artPlaneElephant, artRightHill, artLeftHill, artCenterHill;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		motionEffect=new InterpolatingMotionEffect(MastodonApp.context);
 	}
 
 	@Nullable
@@ -50,26 +46,44 @@ public class SplashFragment extends AppKitFragment{
 		contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false);
 		contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick);
 		contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick);
-		Button joinDefault=contentView.findViewById(R.id.btn_join_default_server);
-		joinDefault.setText(getString(R.string.join_default_server, DEFAULT_SERVER));
-		joinDefault.setOnClickListener(this::onJoinDefaultServerClick);
-		contentView.findViewById(R.id.btn_learn_more).setOnClickListener(this::onLearnMoreClick);
-
 		artClouds=contentView.findViewById(R.id.art_clouds);
 		artPlaneElephant=contentView.findViewById(R.id.art_plane_elephant);
 		artRightHill=contentView.findViewById(R.id.art_right_hill);
 		artLeftHill=contentView.findViewById(R.id.art_left_hill);
 		artCenterHill=contentView.findViewById(R.id.art_center_hill);
+		pager=contentView.findViewById(R.id.pager);
+		pagerDots=contentView.findViewById(R.id.pager_dots);
+		pager.setAdapter(new PagerAdapter());
+		pager.setOffscreenPageLimit(3);
+		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
+			@Override
+			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels){
+				for(int i=0;i<pagerDots.getChildCount();i++){
+					float alpha;
+					if(i==position){
+						alpha=0.3f+0.7f*(1f-positionOffset);
+					}else if(i==position+1){
+						alpha=0.3f+0.7f*positionOffset;
+					}else{
+						alpha=0.3f;
+					}
+					pagerDots.getChildAt(i).setAlpha(alpha);
+				}
+
+				float parallaxProgress=(position+positionOffset)/2f;
+				artClouds.setTranslationX(V.dp(-27)*(position>=1 ? 1f : positionOffset));
+				artPlaneElephant.setTranslationX(V.dp(101.55f)*parallaxProgress);
+				artLeftHill.setTranslationX(V.dp(-88)*parallaxProgress);
+				artLeftHill.setTranslationY(V.dp(24)*parallaxProgress);
+				artRightHill.setTranslationX(V.dp(-88)*parallaxProgress);
+				artRightHill.setTranslationY(V.dp(-24)*parallaxProgress);
+				artCenterHill.setTranslationX(V.dp(-40)*parallaxProgress);
+			}
+		});
 
 		artContainer=contentView.findViewById(R.id.art_container);
 		blueFill=contentView.findViewById(R.id.blue_fill);
 		greenFill=contentView.findViewById(R.id.green_fill);
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artClouds, V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artRightHill, V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artLeftHill, V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artCenterHill, V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
-		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artPlaneElephant, V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
-		artContainer.setOnTouchListener(motionEffect);
 
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
@@ -95,38 +109,6 @@ public class SplashFragment extends AppKitFragment{
 		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
-	private void onJoinDefaultServerClick(View v){
-		new GetInstance()
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(Instance result){
-						if(getActivity()==null)
-							return;
-						Bundle args=new Bundle();
-						args.putParcelable("instance", Parcels.wrap(result));
-						Nav.go(getActivity(), InstanceRulesFragment.class, args);
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						if(getActivity()==null)
-							return;
-						error.showToast(getActivity());
-					}
-				})
-				.wrapProgress(getActivity(), R.string.loading_instance, true)
-				.execNoAuth(DEFAULT_SERVER);
-	}
-
-	private void onLearnMoreClick(View v){
-		View sheetView=getActivity().getLayoutInflater().inflate(R.layout.intro_bottom_sheet, null);
-		BottomSheet sheet=new BottomSheet(getActivity());
-		sheet.setContentView(sheetView);
-		sheet.setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Surface),
-				UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme());
-		sheet.show();
-	}
-
 	private void updateArtSize(int w, int h){
 		float scale=w/(float)V.dp(360);
 		artContainer.setScaleX(scale);
@@ -157,15 +139,91 @@ public class SplashFragment extends AppKitFragment{
 		return true;
 	}
 
-	@Override
-	protected void onShown(){
-		super.onShown();
-		motionEffect.activate();
+	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
+
+		@NonNull
+		@Override
+		public PagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new PagerViewHolder(viewType);
+		}
+
+		@Override
+		public void onBindViewHolder(@NonNull PagerViewHolder holder, int position){}
+
+		@Override
+		public int getItemCount(){
+			return 3;
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return position;
+		}
 	}
 
-	@Override
-	protected void onHidden(){
-		super.onHidden();
-		motionEffect.deactivate();
+	private class PagerViewHolder extends RecyclerView.ViewHolder{
+		public PagerViewHolder(int page){
+			super(new LinearLayout(getActivity()));
+			LinearLayout ll=(LinearLayout) itemView;
+			ll.setOrientation(LinearLayout.VERTICAL);
+			int pad=V.dp(16);
+			ll.setPadding(pad, pad, pad, pad);
+			ll.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+			TextView title=new TextView(getActivity());
+			title.setTextAppearance(R.style.m3_headline_medium);
+			title.setText(switch(page){
+				case 0 -> {
+					String src=getString(R.string.welcome_page1_title);
+					SpannableString ss=new SpannableString(src);
+					int start=src.indexOf("{logo}");
+					if(start!=-1){
+						LogoSpan span=new LogoSpan(getResources().getDrawable(R.drawable.splash_logo, getActivity().getTheme()));
+						ss.setSpan(span, start, start+6, 0);
+					}
+					yield ss;
+				}
+				case 1 -> getString(R.string.welcome_page2_title);
+				case 2 -> getString(R.string.welcome_page3_title);
+				default -> throw new IllegalStateException("Unexpected value: "+page);
+			});
+			title.setTextColor(0xFF17063B);
+			LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(page==0 ? 46 : 36));
+			lp.bottomMargin=V.dp(page==0 ? 4 : 14);
+			ll.addView(title, lp);
+
+			TextView text=new TextView(getActivity());
+			text.setTextAppearance(R.style.m3_body_medium);
+			text.setText(switch(page){
+				case 0 -> R.string.welcome_page1_text;
+				case 1 -> R.string.welcome_page2_text;
+				case 2 -> R.string.welcome_page3_text;
+				default -> throw new IllegalStateException("Unexpected value: "+page);
+			});
+			text.setTextColor(0xFF17063B);
+			ll.addView(text, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+		}
+	}
+
+	private class LogoSpan extends ReplacementSpan{
+		private final Drawable drawable;
+
+		private LogoSpan(Drawable drawable){
+			this.drawable=drawable;
+		}
+
+		@Override
+		public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, @Nullable Paint.FontMetricsInt fm){
+			return drawable.getIntrinsicWidth();
+		}
+
+		@Override
+		public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint){
+			drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+			canvas.save();
+			canvas.translate(x, y-V.dp(20));
+			drawable.draw(canvas);
+			canvas.restore();
+		}
 	}
 }