Upping the version code once more, and fixing the self updater

Just fixing stuff here and there

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**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.#]
-
-**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/ISSUE_TEMPLATE/feature-ui-request.md

@@ -1,20 +0,0 @@
----
-name: Feature/UI request
-about: Suggest an idea for this project
-title: ''
-labels: feature
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-If applicable: a clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/something-else.md

@@ -1,10 +0,0 @@
----
-name: It's something else…
-about: Issues that can't be categorized as feature requests or bug reports
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

README.md

@@ -1,23 +1,21 @@
 ![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Megalodon
+# Moshidon
 
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
+> A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
- 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
+**Warning! [The last version's integrated updater was broken](https://github.com/sk22/megalodon/issues/106) – I already published a fixed version! If you're not updating through Izzy's F-Droid repository (more sources to come, hopefully!), you'll have to download the current release manually. Sorry about that!**
-&nbsp;
-<a href="https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk"><img height="50" alt="Get it on F-Droid" src="img/f-droid-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%2Fsk22%2Fmastodon-android-fork%2Freleases%2Flatest&style=for-the-badge)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
+
+---
 
 
 ## Key features
 
 ### **Unlisted posting**
 
-**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “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 reposted/replied to your post.
   
@@ -43,32 +41,24 @@ 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
 
-### From app stores
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.**
 
-* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: [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/sk22/megalodon/releases/latest/download/megalodon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
-
-  Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
-  
-  `https://apt.izzysoft.de/fdroid/repo`
-
-* **[Google Play Store](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)**: [play.google.com/store/apps/details?id=org.joinmastodon.android.sk](https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk)
-
-* **[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)
-
-### Directly from GitHub
-
-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!
 
+### Other sources
+
+* **[Izzy's F-Droid repository](https://apt.izzysoft.de/fdroid/repo)**: https://apt.izzysoft.de/fdroid/index/apk/org.joinmastodon.android.sk
+
 ---
 
 
@@ -88,19 +78,6 @@ This is an **unmodified version** of the official [Mastodon for Android](https:/
 
 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/)
-
-
 ---
 
 
@@ -128,11 +105,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
 * [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
 * [Clickable reply line while replying to open original post](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/clickable-reply-line-compose)
-* [Add push notification setting for post notifications](https://github.com/sk22/megalodon/commit/b190480d7739be47f23543d9e7644660f9b4b4ee)
-* [Add option to allow voting for multiple options on polls](https://github.com/sk22/megalodon/commit/5b28468efd49387b4f8b83f142f3adf3104ca60c)
-* [Add translate function](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/translate-button)
-* [Add language selector](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/language-selector)
-* [Implement deleting notifications](https://github.com/sk22/megalodon/commit/b0f9ce081f69f29ad59658fc00ca41372cd2677d) (disabled by default)
 
 
 ### Behavior
@@ -144,17 +116,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)
-* [Long-click boost button to "quote" a post](https://github.com/sk22/megalodon/commit/b25a237c20c6a924ed4d9b357999867c3a32b32b)
-* [Preserve whitespaces in HTML](https://github.com/sk22/megalodon/commit/7d876bddc7a07d98f0fecbf62b13bdb9fcce3412)
 
 
 ### Visual
@@ -162,13 +123,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)
 
 
 ## Building

mastodon/build.gradle

@@ -5,14 +5,17 @@ plugins {
 android {
 	compileSdk 33
 	defaultConfig {
-		archivesBaseName = "megalodon"
+		archivesBaseName = "moshidon"
-		applicationId "org.joinmastodon.android.sk"
+		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 62
+		versionCode 54
-		versionName "1.1.5+fork.62"
+		versionName "1.1.4+fork.54.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
+				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",
+				"ja-rJP", "kab", "ko-rKR", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ru-rRU",
+				"sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
 
 	buildTypes {
@@ -29,11 +32,9 @@ android {
 		githubRelease{
 			initWith release
 		}
-		playRelease{
+		noFederatedRelease{
 			initWith release
-			minifyEnabled true
+			versionNameSuffix '-nofederated'
-			shrinkResources true
-			versionNameSuffix '-play'
 		}
 	}
 	compileOptions {

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

@@ -111,7 +111,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/sk22/megalodon/releases/latest")
+				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){
@@ -144,7 +144,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 				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())){
+					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();
 

mastodon/src/main/AndroidManifest.xml

@@ -4,8 +4,7 @@
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
 	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
 	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
@@ -15,12 +14,12 @@
 	<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"
 		android:roundIcon="@mipmap/ic_launcher_round"
-		android:theme="@style/Theme.Mastodon.AutoLightDark"
+		android:theme="@style/Theme.Mastodon.AutoLightDark.Original"
 		android:largeHeap="true">
 
 		<activity android:name=".MainActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize" android:launchMode="singleTask">

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

@@ -51,11 +51,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		getWindow().setBackgroundDrawable(null);
 
 		Intent intent=getIntent();
-		StringBuilder builder=new StringBuilder();
+		String text=intent.getStringExtra(Intent.EXTRA_TEXT);
-		String subject = "";
-		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())){
 			Uri singleUri=intent.getParcelableExtra(Intent.EXTRA_STREAM);
@@ -81,8 +77,6 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		args.putString("account", accountID);
 		if(!TextUtils.isEmpty(text))
 			args.putString("prefilledText", text);
-		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

@@ -1,18 +1,8 @@
 package org.joinmastodon.android;
 
-import static org.joinmastodon.android.api.MastodonAPIController.gson;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class GlobalUserPreferences{
 	public static boolean playGifs;
 	public static boolean useCustomTabs;
@@ -20,30 +10,16 @@ public class GlobalUserPreferences{
 	public static boolean showReplies;
 	public static boolean showBoosts;
 	public static boolean loadNewPosts;
-	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 String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
 
-	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
-	public static Map<String, List<String>> recentLanguages;
-
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
-	private static <T> T fromJson(String json, Type type, T orElse) {
-		try { return gson.fromJson(json, type); }
-		catch (JsonSyntaxException ignored) { return orElse; }
-	}
-
 	public static void load(){
 		SharedPreferences prefs=getPrefs();
 		playGifs=prefs.getBoolean("playGifs", true);
@@ -52,24 +28,11 @@ public class GlobalUserPreferences{
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		loadNewPosts=prefs.getBoolean("loadNewPosts", true);
-		showFederatedTimeline=prefs.getBoolean("showFederatedTimeline", !BuildConfig.BUILD_TYPE.equals("playRelease"));
 		showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
 		alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
 		disableMarquee=prefs.getBoolean("disableMarquee", false);
-		disableSwipe=prefs.getBoolean("disableSwipe", false);
-		voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true);
-		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", false);
-		translateButtonOpenedOnly=prefs.getBoolean("translateButtonOpenedOnly", false);
-		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
-		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
+		color=ColorPreference.values()[prefs.getInt("color", 1)];
-
-		try {
-			color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name()));
-		} catch (IllegalArgumentException|ClassCastException ignored) {
-			// invalid color name or color was previously saved as integer
-			color=ColorPreference.PINK;
-		}
 	}
 
 	public static void save(){
@@ -79,29 +42,21 @@ public class GlobalUserPreferences{
 				.putBoolean("showReplies", showReplies)
 				.putBoolean("showBoosts", showBoosts)
 				.putBoolean("loadNewPosts", loadNewPosts)
-				.putBoolean("showFederatedTimeline", showFederatedTimeline)
 				.putBoolean("trueBlackTheme", trueBlackTheme)
 				.putBoolean("showInteractionCounts", showInteractionCounts)
 				.putBoolean("alwaysExpandContentWarnings", alwaysExpandContentWarnings)
 				.putBoolean("disableMarquee", disableMarquee)
-				.putBoolean("disableSwipe", disableSwipe)
-				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
-				.putBoolean("translateButtonOpenedOnly", translateButtonOpenedOnly)
-				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
-				.putString("color", color.name())
+				.putInt("color", color.ordinal())
-				.putString("recentLanguages", gson.toJson(recentLanguages))
 				.apply();
 	}
 
 	public enum ColorPreference{
-		MATERIAL3,
 		PINK,
 		PURPLE,
 		GREEN,
 		BLUE,
-		BROWN,
+		ORANGE,
-		RED,
 		YELLOW
 	}
 

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

@@ -14,9 +14,9 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
+import org.joinmastodon.android.fragments.SplashFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +33,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomWelcomeFragment());
+				showFragmentClearingBackStack(new SplashFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;

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

@@ -64,7 +64,7 @@ public class OAuthActivity extends Activity{
 								.setCallback(new Callback<>(){
 									@Override
 									public void onSuccess(Account account){
-										AccountSessionManager.getInstance().addAccount(instance, token, account, app, null);
+										AccountSessionManager.getInstance().addAccount(instance, token, account, app, true);
 										progress.dismiss();
 										finish();
 										// not calling restartMainActivity() here on purpose to have it recreated (notice different flags)

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

@@ -137,20 +137,13 @@ 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, 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, R.attr.colorPrimary700));
+				.setColor(context.getColor(R.color.primary_700));
-		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);
-		}
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));
 		}

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

@@ -20,7 +20,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.StringRes;
@@ -102,14 +101,9 @@ public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	}
 
 	public MastodonAPIRequest<T> wrapProgress(Activity activity, @StringRes int message, boolean cancelable){
-		return wrapProgress(activity, message, cancelable, null);
-	}
-
-	public MastodonAPIRequest<T> wrapProgress(Activity activity, @StringRes int message, boolean cancelable, Consumer<ProgressDialog> transform){
 		progressDialog=new ProgressDialog(activity);
 		progressDialog.setMessage(activity.getString(message));
 		progressDialog.setCancelable(cancelable);
-		if (transform != null) transform.accept(progressDialog);
 		if(cancelable){
 			progressDialog.setOnCancelListener(dialog->cancel());
 		}

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

@@ -370,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

@@ -11,7 +11,6 @@ import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.model.Status;
 
 import java.util.HashMap;
-import java.util.function.Consumer;
 
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -26,7 +25,7 @@ public class StatusInteractionController{
 		this.accountID=accountID;
 	}
 
-	public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
+	public void setFavorited(Status status, boolean favorited){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -39,8 +38,6 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningFavoriteRequests.remove(status.id);
-						result.favouritesCount = Math.max(0, status.favouritesCount) + (favorited ? 1 : -1);
-						cb.accept(result);
 						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
@@ -49,17 +46,24 @@ public class StatusInteractionController{
 						runningFavoriteRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.favourited=!favorited;
-						cb.accept(status);
+						if(favorited)
+							status.favouritesCount--;
+						else
+							status.favouritesCount++;
 						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
+		if(favorited)
+			status.favouritesCount++;
+		else
+			status.favouritesCount--;
 		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
-	public void setReblogged(Status status, boolean reblogged, Consumer<Status> cb){
+	public void setReblogged(Status status, boolean reblogged){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -70,11 +74,8 @@ public class StatusInteractionController{
 		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged)
 				.setCallback(new Callback<>(){
 					@Override
-					public void onSuccess(Status reblog){
+					public void onSuccess(Status result){
-						Status result = reblog.getContentStatus();
 						runningReblogRequests.remove(status.id);
-						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
-						cb.accept(result);
 						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
@@ -83,21 +84,24 @@ public class StatusInteractionController{
 						runningReblogRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.reblogged=!reblogged;
-						cb.accept(status);
+						if(reblogged)
+							status.reblogsCount--;
+						else
+							status.reblogsCount++;
 						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})
 				.exec(accountID);
 		runningReblogRequests.put(status.id, req);
 		status.reblogged=reblogged;
+		if(reblogged)
+			status.reblogsCount++;
+		else
+			status.reblogsCount--;
 		E.post(new StatusCountersUpdatedEvent(status));
 	}
 
 	public void setBookmarked(Status status, boolean bookmarked){
-		setBookmarked(status, bookmarked, r->{});
-	}
-
-	public void setBookmarked(Status status, boolean bookmarked, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
@@ -110,7 +114,6 @@ public class StatusInteractionController{
 					@Override
 					public void onSuccess(Status result){
 						runningBookmarkRequests.remove(status.id);
-						cb.accept(result);
 						E.post(new StatusCountersUpdatedEvent(result));
 					}
 
@@ -119,7 +122,6 @@ public class StatusInteractionController{
 						runningBookmarkRequests.remove(status.id);
 						error.showToast(MastodonApp.context);
 						status.bookmarked=!bookmarked;
-						cb.accept(status);
 						E.post(new StatusCountersUpdatedEvent(status));
 					}
 				})

mastodon/src/main/java/org/joinmastodon/android/api/requests/instance/GetInstance.java

@@ -7,15 +7,4 @@ public class GetInstance extends MastodonAPIRequest<Instance>{
 	public GetInstance(){
 		super(HttpMethod.GET, "/instance", Instance.class);
 	}
-
-	public static class V2 extends MastodonAPIRequest<Instance.V2>{
-		public V2(){
-			super(HttpMethod.GET, "/instance", Instance.V2.class);
-		}
-
-		@Override
-		protected String getPathPrefix() {
-			return "/api/v2";
-		}
-	}
 }

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/statuses/TranslateStatus.java

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

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

@@ -1,11 +0,0 @@
-package org.joinmastodon.android.api.session;
-
-public class AccountActivationInfo{
-	public String email;
-	public long lastEmailConfirmationResend;
-
-	public AccountActivationInfo(String email, long lastEmailConfirmationResend){
-		this.email=email;
-		this.lastEmailConfirmationResend=lastEmailConfirmationResend;
-	}
-}

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

@@ -7,7 +7,6 @@ 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.Preferences;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.model.Token;
 
@@ -29,20 +28,17 @@ public class AccountSession{
 	public long filtersLastUpdated;
 	public List<Filter> wordFilters=new ArrayList<>();
 	public String pushAccountID;
-	public Preferences preferences;
-	public AccountActivationInfo activationInfo;
 	private transient MastodonAPIController apiController;
 	private transient StatusInteractionController statusInteractionController;
 	private transient CacheController cacheController;
 	private transient PushSubscriptionManager pushSubscriptionManager;
 
-	AccountSession(Token token, Account self, Application app, String domain, boolean activated, AccountActivationInfo activationInfo){
+	AccountSession(Token token, Account self, Application app, String domain, boolean activated){
 		this.token=token;
 		this.self=self;
 		this.domain=domain;
 		this.app=app;
 		this.activated=activated;
-		this.activationInfo=activationInfo;
 		infoLastUpdated=System.currentTimeMillis();
 	}
 

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

@@ -22,7 +22,6 @@ import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.api.PushSubscriptionManager;
-import org.joinmastodon.android.api.requests.accounts.GetPreferences;
 import org.joinmastodon.android.api.requests.accounts.GetWordFilters;
 import org.joinmastodon.android.api.requests.instance.GetCustomEmojis;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
@@ -35,7 +34,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.Preferences;
 import org.joinmastodon.android.model.Token;
 
 import java.io.File;
@@ -102,10 +100,9 @@ public class AccountSessionManager{
 		maybeUpdateShortcuts();
 	}
 
-	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
+	public void addAccount(Instance instance, Token token, Account self, Application app, boolean active){
 		instances.put(instance.uri, instance);
-		updateInstanceInfoV2(instance);
+		AccountSession session=new AccountSession(token, self, app, instance.uri, active);
-		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
 		writeAccountsFile();
@@ -251,13 +248,12 @@ public class AccountSessionManager{
 		HashSet<String> domains=new HashSet<>();
 		for(AccountSession session:sessions.values()){
 			domains.add(session.domain.toLowerCase());
-//			if(now-session.infoLastUpdated>24L*3600_000L){
+			if(now-session.infoLastUpdated>24L*3600_000L){
-			updateSessionPreferences(session);
+				updateSessionLocalInfo(session);
-			updateSessionLocalInfo(session);
+			}
-//			}
+			if(now-session.filtersLastUpdated>3600_000L){
-//			if(now-session.filtersLastUpdated>3600_000L){
+				updateSessionWordFilters(session);
-			updateSessionWordFilters(session);
+			}
-//			}
 		}
 		if(loadedInstances){
 			maybeUpdateCustomEmojis(domains);
@@ -267,10 +263,10 @@ public class AccountSessionManager{
 	private void maybeUpdateCustomEmojis(Set<String> domains){
 		long now=System.currentTimeMillis();
 		for(String domain:domains){
-//			Long lastUpdated=instancesLastUpdated.get(domain);
+			Long lastUpdated=instancesLastUpdated.get(domain);
-//			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
+			if(lastUpdated==null || now-lastUpdated>24L*3600_000L){
-			updateInstanceInfo(domain);
+				updateInstanceInfo(domain);
-//			}
+			}
 		}
 	}
 
@@ -292,18 +288,6 @@ public class AccountSessionManager{
 				.exec(session.getID());
 	}
 
-	private void updateSessionPreferences(AccountSession session){
-		new GetPreferences().setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Preferences preferences) {
-				session.preferences=preferences;
-			}
-
-			@Override
-			public void onError(ErrorResponse error) {}
-		}).exec(session.getID());
-	}
-
 	private void updateSessionWordFilters(AccountSession session){
 		new GetWordFilters()
 				.setCallback(new Callback<>(){
@@ -329,9 +313,6 @@ public class AccountSessionManager{
 					public void onSuccess(Instance instance){
 						instances.put(domain, instance);
 						updateInstanceEmojis(instance, domain);
-						try {
-							updateInstanceInfoV2(instance);
-						} catch (Exception ignored) {}
 					}
 
 					@Override
@@ -342,19 +323,6 @@ public class AccountSessionManager{
 				.execNoAuth(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;
-				writeAccountsFile();
-			}
-
-			@Override
-			public void onError(ErrorResponse errorResponse) {}
-		}).execNoAuth(instance.uri);
-	}
-
 	private void updateInstanceEmojis(Instance instance, String domain){
 		new GetCustomEmojis()
 				.setCallback(new Callback<>(){
@@ -430,10 +398,6 @@ 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/fragments/BaseStatusListFragment.java

@@ -400,12 +400,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 	public void onPollOptionClick(PollOptionStatusDisplayItem.Holder holder){
 		Poll poll=holder.getItem().poll;
 		Poll.Option option=holder.getItem().option;
-		if(poll.multiple || GlobalUserPreferences.voteButtonForSingleChoice){
+		if(poll.multiple){
 			if(poll.selectedOptions==null)
 				poll.selectedOptions=new ArrayList<>();
-			boolean optionContained=poll.selectedOptions.contains(option);
+			if(poll.selectedOptions.contains(option)){
-			if(!poll.multiple) poll.selectedOptions.clear();
-			if(optionContained){
 				poll.selectedOptions.remove(option);
 				holder.itemView.setSelected(false);
 			}else{
@@ -414,9 +412,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			}
 			for(int i=0;i<list.getChildCount();i++){
 				RecyclerView.ViewHolder vh=list.getChildViewHolder(list.getChildAt(i));
-				if(!poll.multiple && vh instanceof PollOptionStatusDisplayItem.Holder item){
-					if (item != holder) item.itemView.setSelected(false);
-				}
 				if(vh instanceof PollFooterStatusDisplayItem.Holder footer){
 					if(footer.getItemID().equals(holder.getItemID())){
 						footer.rebind();
@@ -787,7 +782,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 			currentMediaHiddenLayoutsWidth=width;
 			String title=getString(R.string.sensitive_content);
 			TextPaint titlePaint=new TextPaint(Paint.ANTI_ALIAS_FLAG);
-			titlePaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray50));
+			titlePaint.setColor(getResources().getColor(R.color.gray_50));
 			titlePaint.setTextSize(V.dp(22));
 			titlePaint.setTypeface(mediumTypeface);
 			mediaHiddenTitleLayout=StaticLayout.Builder.obtain(title, 0, title.length(), titlePaint, width)
@@ -798,7 +793,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 					.setAlignment(Layout.Alignment.ALIGN_CENTER)
 					.build();
 			TextPaint textPaint=new TextPaint(Paint.ANTI_ALIAS_FLAG);
-			textPaint.setColor(UiUtils.getThemeColor(getContext(), R.attr.colorGray200));
+			textPaint.setColor(getResources().getColor(R.color.gray_200));
 			textPaint.setTextSize(V.dp(16));
 			String text=getString(R.string.sensitive_content_explain);
 			mediaHiddenTextLayout=StaticLayout.Builder.obtain(text, 0, text.length(), textPaint, width)

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

@@ -1,9 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
-import static org.joinmastodon.android.utils.MastodonLanguage.allLanguages;
-import static org.joinmastodon.android.utils.MastodonLanguage.defaultRecentLanguages;
-
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,13 +29,11 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
 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;
@@ -47,7 +41,6 @@ import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
@@ -61,7 +54,6 @@ import android.widget.Toast;
 import com.twitter.twittertext.TwitterTextEmojiRegex;
 
 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;
@@ -102,7 +94,6 @@ import org.joinmastodon.android.ui.views.ComposeEditText;
 import org.joinmastodon.android.ui.views.ComposeMediaLayout;
 import org.joinmastodon.android.ui.views.ReorderableLinearLayout;
 import org.joinmastodon.android.ui.views.SizeListenerLinearLayout;
-import org.joinmastodon.android.utils.MastodonLanguage;
 import org.parceler.Parcel;
 import org.parceler.Parcels;
 
@@ -113,7 +104,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -154,8 +144,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private String accountID;
 	private int charCount, charLimit, trimmedCharCount;
 
-	private Button publishButton, languageButton;
+	private Button publishButton;
-	private PopupMenu languagePopup, visibilityPopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
@@ -164,8 +153,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private View pollWrap;
 	private View addPollOptionBtn;
 	private View sensitiveItem;
-	private View pollAllowMultipleItem;
-	private CheckBox pollAllowMultipleCheckbox;
 	private TextView pollDurationView;
 
 	private ArrayList<DraftPollOption> pollOptions=new ArrayList<>();
@@ -200,17 +187,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private boolean ignoreSelectionChanges=false;
 	private Runnable updateUploadEtaRunnable;
 
-	private String language;
-	private MastodonLanguage.LanguageResolver languageResolver;
-
-	private int navigationBarColorBefore;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
-		navigationBarColorBefore = getActivity().getWindow().getNavigationBarColor();
-		getActivity().getWindow().setNavigationBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLightest));
 
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
@@ -218,7 +198,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		instanceDomain=session.domain;
 		customEmojis=AccountSessionManager.getInstance().getCustomEmojis(instanceDomain);
 		instance=AccountSessionManager.getInstance().getInstanceInfo(instanceDomain);
-		languageResolver=new MastodonLanguage.LanguageResolver(instance);
 		if(getArguments().containsKey("editStatus")){
 			editingStatus=Parcels.unwrap(getArguments().getParcelable("editStatus"));
 			redraftStatus=getArguments().getBoolean("redraftStatus");
@@ -237,6 +216,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			charLimit=instance.configuration.statuses.maxCharacters;
 		else
 			charLimit=500;
+
+		loadDefaultStatusVisibility(savedInstanceState);
 	}
 
 	@Override
@@ -250,7 +231,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
-		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}
 
 	@Override
@@ -260,7 +240,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		wm=activity.getSystemService(WindowManager.class);
 	}
 
-	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		creatingView=true;
@@ -301,9 +280,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollBtn.setOnClickListener(v->togglePoll());
 		emojiBtn.setOnClickListener(v->emojiKeyboard.toggleKeyboardPopup(mainEditText));
 		spoilerBtn.setOnClickListener(v->toggleSpoiler());
-		buildVisibilityPopup(visibilityBtn);
+		visibilityBtn.setOnClickListener(this::onVisibilityClick);
-		visibilityBtn.setOnClickListener(v->visibilityPopup.show());
-		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
 		sensitiveItem.setOnClickListener(v->toggleSensitive());
 		emojiKeyboard.setOnIconChangedListener(new PopupKeyboard.OnIconChangeListener(){
 			@Override
@@ -320,9 +297,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		pollOptionsView=view.findViewById(R.id.poll_options);
 		pollWrap=view.findViewById(R.id.poll_wrap);
 		addPollOptionBtn=view.findViewById(R.id.add_poll_option);
-		pollAllowMultipleItem=view.findViewById(R.id.poll_allow_multiple);
-		pollAllowMultipleCheckbox=view.findViewById(R.id.poll_allow_multiple_checkbox);
-		pollAllowMultipleItem.setOnClickListener(v->this.togglePollAllowMultiple());
 
 		addPollOptionBtn.setOnClickListener(v->{
 			createDraftPollOption().edit.requestFocus();
@@ -337,7 +311,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			pollBtn.setSelected(true);
 			mediaBtn.setEnabled(false);
 			pollWrap.setVisibility(View.VISIBLE);
-			updatePollAllowMultiple(savedInstanceState.getBoolean("pollAllowMultiple", false));
 			for(String oldText:savedInstanceState.getStringArrayList("pollOptions")){
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(oldText);
@@ -348,7 +321,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			pollBtn.setSelected(true);
 			mediaBtn.setEnabled(false);
 			pollWrap.setVisibility(View.VISIBLE);
-			updatePollAllowMultiple(editingStatus.poll.multiple);
 			for(Poll.Option eopt:editingStatus.poll.options){
 				DraftPollOption opt=createDraftPollOption();
 				opt.edit.setText(eopt.title);
@@ -393,17 +365,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		if(editingStatus!=null && editingStatus.visibility!=null) {
 			statusVisibility=editingStatus.visibility;
-		} else {
-			loadDefaultStatusVisibility(savedInstanceState);
 		}
 
 		updateVisibilityIcon();
-		visibilityPopup.getMenu().findItem(switch(statusVisibility){
-			case PUBLIC -> R.id.vis_public;
-			case UNLISTED -> R.id.vis_unlisted;
-			case PRIVATE -> R.id.vis_followers;
-			case DIRECT -> R.id.vis_private;
-		}).setChecked(true);
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
 		autocompleteViewController.setCompletionSelectedListener(this::onAutocompleteOptionSelected);
@@ -427,11 +391,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			outState.putStringArrayList("pollOptions", opts);
 			outState.putInt("pollDuration", pollDuration);
 			outState.putString("pollDurationStr", pollDurationStr);
-			outState.putBoolean("pollAllowMultiple", pollAllowMultipleItem.isSelected());
 		}
 		outState.putBoolean("sensitive", sensitive);
 		outState.putBoolean("hasSpoiler", hasSpoiler);
-		outState.putString("language", language);
 		if(!attachments.isEmpty()){
 			ArrayList<Parcelable> serializedAttachments=new ArrayList<>(attachments.size());
 			for(DraftMediaAttachment att:attachments){
@@ -523,18 +485,18 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		spoilerEdit.addTextChangedListener(new SimpleTextWatcher(e->updateCharCounter()));
 		if(replyTo!=null){
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			int visibilityNameRes = switch (replyTo.visibility) {
+			int visibilityNameRes = switch (statusVisibility) {
 				case PUBLIC -> R.string.visibility_public;
-				case UNLISTED -> R.string.sk_visibility_unlisted;
+				case UNLISTED -> R.string.visibility_unlisted;
 				case PRIVATE -> R.string.visibility_followers_only;
 				case DIRECT -> R.string.visibility_private;
 			};
 			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
-			Drawable visibilityIcon = getActivity().getDrawable(switch(replyTo.visibility){
+			Drawable visibilityIcon = getActivity().getDrawable(switch(statusVisibility){
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
 				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
-				case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
+				case DIRECT -> R.drawable.ic_at_symbol;
 			});
 			visibilityIcon.setBounds(0, 0, V.dp(20), V.dp(20));
 			Drawable replyArrow = getActivity().getDrawable(R.drawable.ic_fluent_arrow_reply_20_filled);
@@ -571,7 +533,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					spoilerEdit.setText(replyTo.spoilerText);
 					spoilerBtn.setSelected(true);
 				}
-				if (replyTo.language != null && !replyTo.language.isEmpty()) updateLanguage(replyTo.language);
 			}
 		}else if (editingStatus==null || editingStatus.inReplyToId==null){
 			// TODO: remove workaround after https://github.com/mastodon/mastodon-android/issues/341 gets fixed
@@ -584,7 +545,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				ignoreSelectionChanges=true;
 				mainEditText.setSelection(mainEditText.length());
 				ignoreSelectionChanges=false;
-				updateLanguage(editingStatus.language);
 				if(!editingStatus.mediaAttachments.isEmpty()){
 					attachmentsView.setVisibility(View.VISIBLE);
 					for(Attachment att:editingStatus.mediaAttachments){
@@ -607,11 +567,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					ignoreSelectionChanges=false;
 					initialText=prefilledText;
 				}
-				if (getArguments().containsKey("selectionStart") || getArguments().containsKey("selectionEnd")) {
-					int selectionStart=getArguments().getInt("selectionStart", 0);
-					int selectionEnd=getArguments().getInt("selectionEnd", selectionStart);
-					mainEditText.setSelection(selectionStart, selectionEnd);
-				}
 				ArrayList<Uri> mediaUris=getArguments().getParcelableArrayList("mediaAttachments");
 				if(mediaUris!=null && !mediaUris.isEmpty()){
 					for(Uri uri:mediaUris){
@@ -632,12 +587,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		publishButton=new Button(getActivity());
-		int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save;
+		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
-		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
-			publishButton.setText(GlobalUserPreferences.publishButtonText);
-		} else {
-			publishButton.setText(publishText);
-		}
 		publishButton.setOnClickListener(this::onPublishClick);
 		LinearLayout wrap=new LinearLayout(getActivity());
 		wrap.setOrientation(LinearLayout.HORIZONTAL);
@@ -657,10 +607,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		sendError.setVisibility(View.GONE);
 		sendProgress.setVisibility(View.GONE);
 
-		LinearLayout.LayoutParams langParams=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		langParams.setMarginEnd(V.dp(8));
-		wrap.addView(buildLanguageSelector(), langParams);
-
 		wrap.addView(publishButton, 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);
@@ -670,56 +616,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		updatePublishButtonState();
 	}
 
-	private void updateLanguage(String lang) {
-		updateLanguage(languageResolver.from(lang));
-	}
-
-	private void updateLanguage(MastodonLanguage loc) {
-		language = loc.getLanguage();
-		languageButton.setText(loc.getLanguageName());
-		languageButton.setContentDescription(getActivity().getString(R.string.sk_post_language, loc.getDefaultName()));
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	private Button buildLanguageSelector() {
-		languageButton=new Button(getActivity());
-		languageButton.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
-		languageButton.setBackground(getActivity().getDrawable(R.drawable.bg_text_button));
-		languageButton.setPadding(V.dp(8), 0, V.dp(8), 0);
-		languageButton.setCompoundDrawablesRelativeWithIntrinsicBounds(getActivity().getDrawable(R.drawable.ic_fluent_local_language_16_regular), null, null, null);
-		languageButton.setCompoundDrawableTintList(languageButton.getTextColors());
-		languageButton.setCompoundDrawablePadding(V.dp(6));
-
-		languagePopup=new PopupMenu(getActivity(), languageButton);
-		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
-		languageButton.setOnClickListener(v->languagePopup.show());
-
-		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
-		updateLanguage(prefs != null && prefs.postingDefaultLanguage != null && prefs.postingDefaultLanguage.length() > 0
-				? languageResolver.from(prefs.postingDefaultLanguage)
-				: languageResolver.getDefault());
-
-		Menu languageMenu = languagePopup.getMenu();
-		for (String recentLanguage : Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages)) {
-			MastodonLanguage l = languageResolver.from(recentLanguage);
-			languageMenu.add(0, allLanguages.indexOf(l), Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));
-		}
-
-		SubMenu allLanguagesMenu = languageMenu.addSubMenu(R.string.sk_available_languages);
-		for (int i = 0; i < allLanguages.size(); i++) {
-			MastodonLanguage l = allLanguages.get(i);
-			allLanguagesMenu.add(0, i, Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));
-		}
-
-		languagePopup.setOnMenuItemClickListener(i->{
-			if (i.hasSubMenu()) return false;
-			updateLanguage(allLanguages.get(i.getItemId()));
-			return true;
-		});
-
-		return languageButton;
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		return true;
@@ -793,7 +689,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		req.status=text;
 		req.visibility=statusVisibility;
 		req.sensitive=sensitive;
-		req.language=language;
 		if(!attachments.isEmpty()){
 			req.mediaIds=attachments.stream().map(a->a.serverAttachment.id).collect(Collectors.toList());
 		}
@@ -803,7 +698,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		if(!pollOptions.isEmpty()){
 			req.poll=new CreateStatus.Request.Poll();
 			req.poll.expiresIn=pollDuration;
-			req.poll.multiple=pollAllowMultipleItem.isSelected();
 			for(DraftPollOption opt:pollOptions)
 				req.poll.options.add(opt.edit.getText().toString());
 		}
@@ -871,14 +765,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 					.setCallback(resCallback)
 					.exec(accountID);
 		}
-
-		if (replyTo == null) {
-			List<String> newRecentLanguages = new ArrayList<>(Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages));
-			newRecentLanguages.remove(language);
-			newRecentLanguages.add(0, language);
-			recentLanguages.put(accountID, newRecentLanguages.stream().limit(4).collect(Collectors.toList()));
-			GlobalUserPreferences.save();
-		}
 	}
 
 	private boolean hasDraft(){
@@ -1322,11 +1208,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		option.view=LayoutInflater.from(getActivity()).inflate(R.layout.compose_poll_option, pollOptionsView, false);
 		option.edit=option.view.findViewById(R.id.edit);
 		option.dragger=option.view.findViewById(R.id.dragger_thingy);
-		ImageView icon = option.view.findViewById(R.id.icon);
-		icon.setImageDrawable(getContext().getDrawable(pollAllowMultipleItem.isSelected() ?
-				R.drawable.ic_poll_checkbox_regular_selector :
-				R.drawable.ic_poll_option_button
-		));
 
 		option.dragger.setOnLongClickListener(v->{
 			pollOptionsView.startDragging(option.view);
@@ -1418,13 +1299,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return attachments.size();
 	}
 
-	private void buildVisibilityPopup(View v){
+	private void onVisibilityClick(View v){
-		visibilityPopup=new PopupMenu(getActivity(), v);
+		PopupMenu menu=new PopupMenu(getActivity(), v);
-		visibilityPopup.inflate(R.menu.compose_visibility);
+		menu.inflate(R.menu.compose_visibility);
-		Menu m=visibilityPopup.getMenu();
+		Menu m=menu.getMenu();
-		UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
+		UiUtils.enablePopupMenuIcons(getActivity(), menu);
 		m.setGroupCheckable(0, true, true);
-		visibilityPopup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
+		m.findItem(switch(statusVisibility){
+			case PUBLIC -> R.id.vis_public;
+			case UNLISTED -> R.id.vis_unlisted;
+			case PRIVATE -> R.id.vis_followers;
+			case DIRECT -> R.id.vis_private;
+		}).setChecked(true);
+		menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
 			@Override
 			public boolean onMenuItemClick(MenuItem item){
 				int id=item.getItemId();
@@ -1442,6 +1329,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				return true;
 			}
 		});
+		menu.show();
 	}
 
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
@@ -1455,23 +1343,34 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
 		}
 
-		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
+		new GetPreferences()
-		if (prefs != null) {
+				.setCallback(new Callback<>(){
-			// Only override the reply visibility if our preference is more private
+					@Override
-			if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) {
+					public void onSuccess(Preferences result){
-				statusVisibility = switch (prefs.postingDefaultVisibility) {
+						// Only override the reply visibility if our preference is more private
-					case PUBLIC -> StatusPrivacy.PUBLIC;
+						if (result.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) {
-					case UNLISTED -> StatusPrivacy.UNLISTED;
+							statusVisibility = switch (result.postingDefaultVisibility) {
-					case PRIVATE -> StatusPrivacy.PRIVATE;
+								case PUBLIC -> StatusPrivacy.PUBLIC;
-					case DIRECT -> StatusPrivacy.DIRECT;
+								case UNLISTED -> StatusPrivacy.UNLISTED;
-				};
+								case PRIVATE -> StatusPrivacy.PRIVATE;
-			}
+								case DIRECT -> StatusPrivacy.DIRECT;
+							};
+						}
 
-			// A saved privacy setting from a previous compose session wins over all
+						// A saved privacy setting from a previous compose session wins over all
-			if(savedInstanceState !=null){
+						if(savedInstanceState !=null){
-				statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
+							statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
-			}
+						}
-		}
+
+						updateVisibilityIcon ();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						Log.w(TAG, "Unable to get user preferences to set default post privacy");
+					}
+				})
+				.exec(accountID);
 	}
 
 	private void updateVisibilityIcon(){
@@ -1482,31 +1381,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			case PUBLIC -> R.drawable.ic_fluent_earth_24_regular;
 			case UNLISTED -> R.drawable.ic_fluent_people_community_24_regular;
 			case PRIVATE -> R.drawable.ic_fluent_people_checkmark_24_regular;
-			case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
+			case DIRECT -> R.drawable.ic_at_symbol;
 		});
 	}
 
-	private void togglePollAllowMultiple() {
-		updatePollAllowMultiple(!pollAllowMultipleItem.isSelected());
-	}
-
-	private void updatePollAllowMultiple(boolean multiple){
-		pollAllowMultipleItem.setSelected(multiple);
-		pollAllowMultipleCheckbox.setChecked(multiple);
-		ImageView btn = addPollOptionBtn.findViewById(R.id.add_poll_option_icon);
-		btn.setImageDrawable(getContext().getDrawable(multiple ?
-				R.drawable.ic_fluent_add_square_24_regular :
-				R.drawable.ic_fluent_add_circle_24_regular
-		));
-		for (DraftPollOption opt:pollOptions) {
-			ImageView icon = opt.view.findViewById(R.id.icon);
-			icon.setImageDrawable(getContext().getDrawable(multiple ?
-					R.drawable.ic_poll_checkbox_regular_selector :
-					R.drawable.ic_poll_option_button
-			));
-		}
-	}
-
 	@Override
 	public void onSelectionChanged(int start, int end){
 		if(ignoreSelectionChanges)

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

@@ -67,7 +67,7 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowReque
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-		setTitle(R.string.sk_follow_requests);
+		setTitle(R.string.follow_requests);
 	}
 
 	@Override
@@ -302,7 +302,7 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment<FollowReque
 				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();
 				if (!rel.requested && !rel.followedBy && adapter != null) {
 					data.remove(item);
-					adapter.notifyItemRemoved(getLayoutPosition());
+					adapter.notifyItemRemoved(getBindingAdapterPosition());
 				} else {
 					rebind();
 				}

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

@@ -57,7 +57,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
-		setTitle(R.string.sk_app_name);
+		setTitle(R.string.app_name);
 
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);

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

@@ -321,6 +321,9 @@ public class HomeTimelineFragment extends StatusListFragment{
 		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);
@@ -348,9 +351,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 		}
 
 		FrameLayout logoWrap=new FrameLayout(getActivity());
-		FrameLayout.LayoutParams logoParams=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
-		logoParams.setMargins(0, V.dp(2), 0, 0);
-		logoWrap.addView(toolbarLogo, logoParams);
 		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
 
 		Toolbar toolbar=getToolbar();

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

@@ -57,7 +57,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
-            setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
+            setTitle(getString(R.string.lists_with_user, profileDisplayUsername));
 //            setHasOptionsMenu(true);
         }
     }

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

@@ -14,7 +14,6 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import org.joinmastodon.android.E;
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
 import org.joinmastodon.android.events.FollowRequestHandledEvent;
@@ -74,25 +73,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);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == R.id.follow_requests) {
+		if (item.getItemId() != R.id.follow_requests) return false;
-			Bundle args=new Bundle();
+		Bundle args=new Bundle();
-			args.putString("account", accountID);
+		args.putString("account", accountID);
-			Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
-			return true;
+		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;
 	}
 
 	@Override
@@ -120,7 +109,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
 
 		pager.setOffscreenPageLimit(4);
-		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new DiscoverPagerAdapter());
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override

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

@@ -2,8 +2,6 @@ package org.joinmastodon.android.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 
 import com.squareup.otto.Subscribe;
@@ -12,6 +10,7 @@ import org.joinmastodon.android.E;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.markers.SaveMarkers;
 import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Notification;
@@ -79,9 +78,9 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 			case FAVORITE -> getString(R.string.user_favorited);
 			case POLL -> getString(R.string.poll_ended);
 		};
-		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, null, extraText, n) : 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);
+			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){
@@ -211,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;

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

@@ -10,7 +10,6 @@ import android.app.Activity;
 import android.app.Fragment;
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -19,8 +18,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
@@ -237,7 +234,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 
 		pager.setOffscreenPageLimit(5);
-		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new ProfilePagerAdapter());
 		pager.getLayoutParams().height=getResources().getDisplayMetrics().heightPixels;
 
@@ -253,7 +249,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				tab.setText(switch(position){
 					case 0 -> R.string.posts;
 					case 1 -> R.string.posts_and_replies;
-					case 2 -> R.string.sk_pinned_posts;
+					case 2 -> R.string.pinned_posts;
 					case 3 -> R.string.media;
 					case 4 -> R.string.profile_about;
 					default -> throw new IllegalStateException();
@@ -292,7 +288,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!username.contains("@")){
 				username+="@"+AccountSessionManager.getInstance().getAccount(accountID).domain;
 			}
-			UiUtils.copyText(getActivity(), '@'+username);
+			getActivity().getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, "@"+username));
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU){ // Android 13+ SystemUI shows its own thing when you put things into the clipboard
+				Toast.makeText(getActivity(), R.string.text_copied, Toast.LENGTH_SHORT).show();
+			}
 			return true;
 		});
 
@@ -556,14 +555,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		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) {
 			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);
+			menu.findItem(R.id.manage_user_lists).setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -662,7 +658,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
+		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username));
 	}
 
 	private void onScrollChanged(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY){

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

@@ -9,21 +9,18 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.TypedValue;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.view.WindowManager;
+import android.view.animation.AlphaAnimation;
 import android.view.animation.LinearInterpolator;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
@@ -36,7 +33,6 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
 import org.joinmastodon.android.MainActivity;
 import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
@@ -46,7 +42,6 @@ import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.PushNotification;
 import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -76,7 +71,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private NotificationPolicyItem notificationPolicyItem;
 	private String accountID;
 	private boolean needUpdateNotificationSettings;
-	private boolean needAppRestart;
 	private PushSubscription pushSubscription;
 
 	private ImageView themeTransitionWindowView;
@@ -90,7 +84,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		setTitle(R.string.settings);
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
 
 		if(GithubSelfUpdater.needSelfUpdating()){
 			GithubSelfUpdater updater=GithubSelfUpdater.getInstance();
@@ -103,62 +96,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new HeaderItem(R.string.settings_theme));
 		items.add(themeItem=new ThemeItem());
 		items.add(new SwitchItem(R.string.theme_true_black, R.drawable.ic_fluent_dark_theme_24_regular, GlobalUserPreferences.trueBlackTheme, this::onTrueBlackThemeChanged));
-		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
+		items.add(new SwitchItem(R.string.disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
+		items.add(new ColorPicker());
-			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.color_palettes);
-			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
-			popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
-			b.setOnTouchListener(popupMenu.getDragToOpenListener());
-			b.setOnClickListener(v->popupMenu.show());
-			b.setText(switch(GlobalUserPreferences.color){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-			});
-		}));
-		items.add(new ButtonItem(R.string.sk_settings_publish_button_text, R.drawable.ic_fluent_send_24_regular, b->{
-			updatePublishText(b);
-
-			b.setOnClickListener(l->{
-				FrameLayout inputWrap = new FrameLayout(getContext());
-				EditText input = new EditText(getContext());
-				input.setHint(R.string.publish);
-				input.setText(GlobalUserPreferences.publishButtonText.trim());
-				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-				params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-				input.setLayoutParams(params);
-				inputWrap.addView(input);
-				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-						.setPositiveButton(R.string.save, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNeutralButton(R.string.clear, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = "";
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNegativeButton(R.string.cancel, (d, which) -> {})
-						.show();
-			});
-		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
-		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
-			GlobalUserPreferences.showFederatedTimeline=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
 		items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
 			GlobalUserPreferences.playGifs=i.checked;
 			GlobalUserPreferences.save();
@@ -167,40 +111,25 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.useCustomTabs=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
+		items.add(new SwitchItem(R.string.settings_show_interaction_counts, R.drawable.ic_fluent_number_row_24_regular, GlobalUserPreferences.showInteractionCounts, i->{
 			GlobalUserPreferences.showInteractionCounts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
+		items.add(new SwitchItem(R.string.settings_always_reveal_content_warnings, R.drawable.ic_fluent_chat_warning_24_regular, GlobalUserPreferences.alwaysExpandContentWarnings, i->{
 			GlobalUserPreferences.alwaysExpandContentWarnings=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_tabs_disable_swipe, R.drawable.ic_fluent_swipe_right_24_regular, GlobalUserPreferences.disableSwipe, i->{
-			GlobalUserPreferences.disableSwipe=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_enable_delete_notifications, R.drawable.ic_fluent_delete_24_regular, GlobalUserPreferences.enableDeleteNotifications, i->{
-			GlobalUserPreferences.enableDeleteNotifications=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_hide_translate_in_timeline, R.drawable.ic_fluent_translate_24_regular, GlobalUserPreferences.translateButtonOpenedOnly, i->{
-			GlobalUserPreferences.translateButtonOpenedOnly=i.checked;
-			GlobalUserPreferences.save();
-			needAppRestart=true;
-		}));
 
 		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->{
+		items.add(new SwitchItem(R.string.settings_show_replies, R.drawable.ic_fluent_chat_multiple_24_regular, GlobalUserPreferences.showReplies, i->{
 			GlobalUserPreferences.showReplies=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
+		items.add(new SwitchItem(R.string.settings_show_boosts, R.drawable.ic_fluent_arrow_repeat_all_24_regular, GlobalUserPreferences.showBoosts, i->{
 			GlobalUserPreferences.showBoosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new SwitchItem(R.string.sk_settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
+		items.add(new SwitchItem(R.string.settings_load_new_posts, R.drawable.ic_fluent_arrow_up_24_regular, GlobalUserPreferences.loadNewPosts, i->{
 			GlobalUserPreferences.loadNewPosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
@@ -211,46 +140,23 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		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_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, 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 HeaderItem(R.string.settings_account));
+		items.add(new HeaderItem(R.string.settings_boring));
-		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.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
-		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.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
-		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.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
-		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
 
-		String instanceName = instance != null && !instance.title.isBlank() ? instance.title : session.domain;
+		items.add(new RedHeaderItem(R.string.settings_spicy));
-		items.add(new HeaderItem(instanceName));
-		items.add(new TextItem(R.string.sk_settings_rules, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_open_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));
-		boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled;
-		items.add(new SmallTextItem(getString(translationAvailable ?
-				R.string.sk_settings_translation_availability_note_available :
-				R.string.sk_settings_translation_availability_note_unavailable, instanceName)));
-
-
-		items.add(new HeaderItem(R.string.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));
 		if (GithubSelfUpdater.needSelfUpdating()) {
-			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
+			checkForUpdateItem = new TextItem(R.string.check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
+		items.add(new TextItem(R.string.settings_contribute_fork, ()->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, ()->{
+		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
-			GlobalUserPreferences.recentLanguages.remove(accountID);
-			GlobalUserPreferences.save();
-		})));
 
-		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
+		items.add(new FooterItem(getString(R.string.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
@@ -298,11 +204,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if(needUpdateNotificationSettings && PushSubscriptionManager.arePushNotificationsAvailable()){
 			AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().updatePushSettings(pushSubscription);
 		}
-		if(needAppRestart){
-			Intent intent = Intent.makeRestartActivityTask(MastodonApp.context.getPackageManager().getLaunchIntentForPackage(MastodonApp.context.getPackageName()).getComponent());
-			MastodonApp.context.startActivity(intent);
-			Runtime.getRuntime().exit(0);
-		}
 	}
 
 	@Override
@@ -325,25 +226,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		restartActivityToApplyNewTheme();
 	}
 
-	private boolean onColorPreferenceClick(MenuItem item){
+	private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){
-		ColorPreference pref = null;
+		GlobalUserPreferences.color=color;
-		int id = item.getItemId();
-
-		if (id == R.id.m3_color) pref = ColorPreference.MATERIAL3;
-		else if (id == R.id.pink_color) pref = ColorPreference.PINK;
-		else if (id == R.id.purple_color) pref = ColorPreference.PURPLE;
-		else if (id == R.id.green_color) pref = ColorPreference.GREEN;
-		else if (id == R.id.blue_color) pref = ColorPreference.BLUE;
-		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;
-
-		if (pref == null) return false;
-
-		GlobalUserPreferences.color=pref;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
-		return true;
 	}
 
 	private void onTrueBlackThemeChanged(SwitchItem item){
@@ -405,7 +291,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			case FOLLOW -> subscription.alerts.follow=enabled;
 			case REBLOG -> subscription.alerts.reblog=enabled;
 			case MENTION -> subscription.alerts.mention=subscription.alerts.poll=enabled;
-			case STATUS -> subscription.alerts.status=enabled;
 		}
 		needUpdateNotificationSettings=true;
 	}
@@ -500,7 +385,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 
 		if (ev.state == GithubSelfUpdater.UpdateState.NO_UPDATE) {
-			Toast.makeText(getActivity(), R.string.sk_no_update_available, Toast.LENGTH_SHORT).show();
+			Toast.makeText(getActivity(), R.string.no_update_available, Toast.LENGTH_SHORT).show();
 		}
 	}
 
@@ -515,10 +400,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			this.text=getString(text);
 		}
 
-		public HeaderItem(String text) {
-			this.text=text;
-		}
-
 		@Override
 		public int getViewType(){
 			return 0;
@@ -553,17 +434,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	public class ButtonItem extends Item{
+	public class ColorPicker extends Item{
-		private int text;
-		private int icon;
-		private Consumer<Button> buttonConsumer;
-
-		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
-			this.text = text;
-			this.icon = icon;
-			this.buttonConsumer = buttonConsumer;
-		}
-
 		@Override
 		public int getViewType(){
 			return 8;
@@ -586,42 +457,19 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	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 Runnable onClick;
 		private boolean loading;
-		private int icon;
 
 		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, onClick, false, 0);
+			this(text, onClick, false);
 		}
 
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading) {
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading){
-			this(text, onClick, loading, 0);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, onClick, false, icon);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading, @DrawableRes int icon){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
-			this.icon=icon;
 		}
 
 		@Override
@@ -677,8 +525,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
-				case 8 -> new ButtonViewHolder();
+				case 8 -> new ColorPickerViewHolder();
-				case 9 -> new SmallTextViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -807,24 +654,65 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
-	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
+	private class ColorPickerViewHolder extends BindableViewHolder<ColorPicker>{
 		private final Button button;
+		private final PopupMenu popupMenu;
 		private final ImageView icon;
-		private final TextView text;
 
 		@SuppressLint("ClickableViewAccessibility")
-		public ButtonViewHolder(){
+		public ColorPickerViewHolder(){
-			super(getActivity(), R.layout.item_settings_button, list);
+			super(getActivity(), R.layout.item_settings_color_picker, list);
-			text=findViewById(R.id.text);
 			icon=findViewById(R.id.icon);
-			button=findViewById(R.id.button);
+			button=findViewById(R.id.color_picker_button);
+			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
+			popupMenu.inflate(R.menu.color_picker);
+			popupMenu.setOnMenuItemClickListener(item->{
+				GlobalUserPreferences.ColorPreference pref;
+				int id=item.getItemId();
+				if(id==R.id.pink_color) {
+					pref = GlobalUserPreferences.ColorPreference.PINK;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.purple_color) {
+					pref = GlobalUserPreferences.ColorPreference.PURPLE;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.green_color) {
+					pref = GlobalUserPreferences.ColorPreference.GREEN;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.blue_color) {
+					pref = GlobalUserPreferences.ColorPreference.BLUE;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.orange_color) {
+					pref = GlobalUserPreferences.ColorPreference.ORANGE;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.yellow_color) {
+					pref = GlobalUserPreferences.ColorPreference.YELLOW;
+					onColorPreferenceClick(pref);
+				}
+				else
+					return false;
+				return true;
+			});
+//			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
+			button.setOnTouchListener(popupMenu.getDragToOpenListener());
+			button.setOnClickListener(v->popupMenu.show());
 		}
 
 		@Override
-		public void onBind(ButtonItem item){
+		public void onBind(ColorPicker item){
-			text.setText(item.text);
+			icon.setImageResource(R.drawable.ic_color_theme_preference);
-			icon.setImageResource(item.icon);
+			button.setText(switch(GlobalUserPreferences.color){
-			item.buttonConsumer.accept(button);
+				case PINK -> R.string.pink_color;
+				case PURPLE -> R.string.purple_color;
+				case GREEN -> R.string.green_color;
+				case BLUE -> R.string.blue_color;
+				case ORANGE -> R.string.orange_color;
+				case YELLOW -> R.string.yellow_color;
+			});
 		}
 	}
 
@@ -874,20 +762,17 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
 		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);
 			progress = itemView.findViewById(R.id.progress);
-			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
-			if (item.icon != 0) icon.setImageDrawable(getActivity().getTheme().getDrawable(item.icon));
 		}
 
 		@Override
@@ -896,24 +781,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	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);
-		}
-
-		@Override
-		public void onBind(SmallTextItem item){
-			text.setText(item.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);
-		}
-	}
-
 	private class FooterViewHolder extends BindableViewHolder<FooterItem>{
 		private final TextView text;
 		public FooterViewHolder(){
@@ -964,10 +831,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			if (state == GithubSelfUpdater.UpdateState.CHECKING) return;
 			GithubSelfUpdater.UpdateInfo info=updater.getUpdateInfo();
 			if(state!=GithubSelfUpdater.UpdateState.DOWNLOADED){
-				text.setText(getString(R.string.sk_update_available, info.version));
+				text.setText(getString(R.string.update_available, info.version));
 				button.setText(getString(R.string.download_update, UiUtils.formatFileSize(getActivity(), info.size, false)));
 			}else{
-				text.setText(getString(R.string.sk_update_ready, info.version));
+				text.setText(getString(R.string.update_ready, info.version));
 				button.setText(R.string.install_update);
 			}
 			if(state==GithubSelfUpdater.UpdateState.DOWNLOADING){

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

@@ -1,28 +1,20 @@
 package org.joinmastodon.android.fragments;
 
-import android.graphics.Canvas;
+import android.content.res.Configuration;
-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.LinearLayout;
-import android.widget.TextView;
 
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment;
+import org.joinmastodon.android.fragments.onboarding.InstanceCatalogFragment;
-import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment;
+import org.joinmastodon.android.ui.InterpolatingMotionEffect;
 import org.joinmastodon.android.ui.views.SizeListenerFrameLayout;
 
-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.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
@@ -31,13 +23,12 @@ public class SplashFragment extends AppKitFragment{
 
 	private SizeListenerFrameLayout contentView;
 	private View artContainer, blueFill, greenFill;
-	private ViewPager2 pager;
+	private InterpolatingMotionEffect motionEffect;
-	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
@@ -46,44 +37,15 @@ 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);
-		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(contentView.findViewById(R.id.art_clouds), V.dp(-5), V.dp(5), V.dp(-5), V.dp(5)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_right_hill), V.dp(-15), V.dp(25), V.dp(-10), V.dp(10)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_left_hill), V.dp(-25), V.dp(15), V.dp(-15), V.dp(15)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_center_hill), V.dp(-14), V.dp(14), V.dp(-5), V.dp(25)));
+		motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(contentView.findViewById(R.id.art_plane_elephant), V.dp(-20), V.dp(12), V.dp(-20), V.dp(12)));
 
 		contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){
 			@Override
@@ -104,16 +66,15 @@ public class SplashFragment extends AppKitFragment{
 
 	private void onButtonClick(View v){
 		Bundle extras=new Bundle();
-		boolean isSignup=v.getId()==R.id.btn_get_started;
+		extras.putBoolean("signup", v.getId()==R.id.btn_get_started);
-		extras.putBoolean("signup", isSignup);
+		Nav.go(getActivity(), InstanceCatalogFragment.class, extras);
-		Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras);
 	}
 
 	private void updateArtSize(int w, int h){
-		float scale=w/(float)V.dp(360);
+		float scale=w/(float)V.dp(412);
 		artContainer.setScaleX(scale);
 		artContainer.setScaleY(scale);
-		blueFill.setScaleY(artContainer.getBottom()-V.dp(90));
+		blueFill.setScaleY(h/2f);
 		greenFill.setScaleY(h-artContainer.getBottom()+V.dp(90));
 	}
 
@@ -139,91 +100,15 @@ public class SplashFragment extends AppKitFragment{
 		return true;
 	}
 
-	private class PagerAdapter extends RecyclerView.Adapter<PagerViewHolder>{
+	@Override
-
+	protected void onShown(){
-		@NonNull
+		super.onShown();
-		@Override
+		motionEffect.activate();
-		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;
-		}
 	}
 
-	private class PagerViewHolder extends RecyclerView.ViewHolder{
+	@Override
-		public PagerViewHolder(int page){
+	protected void onHidden(){
-			super(new LinearLayout(getActivity()));
+		super.onHidden();
-			LinearLayout ll=(LinearLayout) itemView;
+		motionEffect.deactivate();
-			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();
-		}
 	}
 }

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

@@ -54,7 +54,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));

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

@@ -29,7 +29,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected EventListener eventListener=new EventListener();
 
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true, null);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true);
 	}
 
 	@Override
@@ -177,7 +177,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 		public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
 			for(Status s:data){
 				if(s.getContentStatus().id.equals(ev.id)){
-					s.getContentStatus().update(ev);
+					s.update(ev);
 					for(int i=0;i<list.getChildCount();i++){
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder instanceof FooterStatusDisplayItem.Holder footer && footer.getItem().status==s.getContentStatus()){
@@ -189,8 +189,8 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 				}
 			}
 			for(Status s:preloadedData){
-				if(s.getContentStatus().id.equals(ev.id)){
+				if(s.id.equals(ev.id)){
-					s.getContentStatus().update(ev);
+					s.update(ev);
 				}
 			}
 		}

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

@@ -23,7 +23,6 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
@@ -287,17 +286,13 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername())).setVisible(relationship.following);
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.lists_with_user, account.getDisplayUsername()));
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
-			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 			if(relationship.following){
 				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
 				hideBoosts.setVisible(true);
-				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
-				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
-				manageUserLists.setVisible(true);
 			}
 			MenuItem blockDomain=menu.findItem(R.id.block_domain);
 			if(!account.isLocal()){
@@ -374,12 +369,6 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 						})
 						.wrapProgress(getActivity(), R.string.loading, false)
 						.exec(accountID);
-			}else if(id==R.id.manage_user_lists){
-				final Bundle args=new Bundle();
-				args.putString("account", accountID);
-				args.putString("profileAccount", account.id);
-				args.putString("profileDisplayUsername", account.getDisplayUsername());
-				Nav.go(getActivity(), ListTimelinesFragment.class, args);
 			}
 			return true;
 		}

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

@@ -19,7 +19,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.joinmastodon.android.BuildConfig;
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
 import org.joinmastodon.android.fragments.ListTimelinesFragment;
@@ -62,7 +61,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
 
-	private final boolean noFederated = !GlobalUserPreferences.showFederatedTimeline;
+	private static final boolean noFederated = BuildConfig.BUILD_TYPE.equals("noFederatedRelease");
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -104,7 +103,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout.setTabTextColors(UiUtils.getThemeColor(getActivity(), R.attr.colorTabInactive), UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary));
 
 		pager.setOffscreenPageLimit(4);
-		pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
 		pager.setAdapter(new DiscoverPagerAdapter());
 		pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
 			@Override
@@ -165,12 +163,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				if (noFederated && position > 0) position++;
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
-					case 1 -> R.string.sk_federated_timeline;
+					case 1 -> R.string.federated_timeline;
 					case 2 -> R.string.hashtags;
 					case 3 -> R.string.posts;
 					case 4 -> R.string.news;
 					case 5 -> R.string.for_you;
-					case 6 -> R.string.sk_list_timelines;
+					case 6 -> R.string.list_timelines;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);

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

@@ -75,7 +75,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true);
 		};
 	}
 

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

@@ -1,8 +1,8 @@
 package org.joinmastodon.android.fragments.onboarding;
 
-import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -12,21 +12,19 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.joinmastodon.android.MainActivity;
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.ResendConfirmationEmail;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
-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.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.SettingsFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.ui.AccountSwitcherSheet;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.io.File;
@@ -37,50 +35,40 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.ToolbarFragment;
+import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.V;
 
-public class AccountActivationFragment extends ToolbarFragment{
+public class AccountActivationFragment extends AppKitFragment{
 	private String accountID;
 
-	private Button openEmailBtn, resendBtn;
+	private Button btn, backBtn;
-	private View contentView;
+	private View buttonBar;
 	private Handler uiHandler=new Handler(Looper.getMainLooper());
 	private Runnable pollRunnable=this::tryGetAccount;
 	private APIRequest currentRequest;
-	private Runnable resendTimer=this::updateResendTimer;
-	private long lastResendTime;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		accountID=getArguments().getString("account");
-		setTitle(R.string.confirm_email_title);
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		lastResendTime=session.activationInfo!=null ? session.activationInfo.lastEmailConfirmationResend : 0;
 	}
 
 	@Nullable
 	@Override
-	public View onCreateContentView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_activation, container, false);
 
-		openEmailBtn=view.findViewById(R.id.btn_next);
+		btn=view.findViewById(R.id.btn_next);
-		openEmailBtn.setOnClickListener(this::onOpenEmailClick);
+		btn.setOnClickListener(v->onButtonClick());
-		openEmailBtn.setOnLongClickListener(v->{
+		btn.setOnLongClickListener(v->{
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			Nav.go(getActivity(), SettingsFragment.class, args);
 			return true;
 		});
-		resendBtn=view.findViewById(R.id.btn_resend);
+		buttonBar=view.findViewById(R.id.button_bar);
-		resendBtn.setOnClickListener(this::onResendClick);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->onBackButtonClick());
-		TextView text=view.findViewById(R.id.subtitle);
-		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-		text.setText(getString(R.string.confirm_email_subtitle, session.activationInfo!=null ? session.activationInfo.email : "?"));
-		updateResendTimer();
 
-		contentView=view;
 		return view;
 	}
 
@@ -92,32 +80,14 @@ public class AccountActivationFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		getToolbar().setBackground(null);
-		getToolbar().setElevation(0);
-	}
-
-	@Override
-	protected boolean canGoBack(){
-		return true;
-	}
-
-	@Override
-	public void onToolbarNavigationClick(){
-		new AccountSwitcherSheet(getActivity()).show();
 	}
 
 	@Override
 	public void onApplyWindowInsets(WindowInsets insets){
 		if(Build.VERSION.SDK_INT>=27){
 			int inset=insets.getSystemWindowInsetBottom();
-			contentView.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
+			buttonBar.setPadding(0, 0, 0, inset>0 ? Math.max(inset, V.dp(36)) : 0);
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), 0));
 		}else{
 			super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(), insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
@@ -141,7 +111,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 		}
 	}
 
-	private void onOpenEmailClick(View v){
+	private void onButtonClick(){
 		try{
 			startActivity(Intent.makeMainSelectorActivity(Intent.ACTION_MAIN, Intent.CATEGORY_APP_EMAIL).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 		}catch(ActivityNotFoundException x){
@@ -149,21 +119,12 @@ public class AccountActivationFragment extends ToolbarFragment{
 		}
 	}
 
-	private void onResendClick(View v){
+	private void onBackButtonClick(){
 		new ResendConfirmationEmail(null)
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(Object result){
 						Toast.makeText(getActivity(), R.string.resent_email, Toast.LENGTH_SHORT).show();
-						AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
-						if(session.activationInfo==null){
-							session.activationInfo=new AccountActivationInfo("?", System.currentTimeMillis());
-						}else{
-							session.activationInfo.lastEmailConfirmationResend=System.currentTimeMillis();
-						}
-						lastResendTime=session.activationInfo.lastEmailConfirmationResend;
-						AccountSessionManager.getInstance().writeAccountsFile();
-						updateResendTimer();
 					}
 
 					@Override
@@ -191,7 +152,7 @@ public class AccountActivationFragment extends ToolbarFragment{
 						AccountSessionManager mgr=AccountSessionManager.getInstance();
 						AccountSession session=mgr.getAccount(accountID);
 						mgr.removeAccount(accountID);
-						mgr.addAccount(mgr.getInstanceInfo(session.domain), session.token, result, session.app, null);
+						mgr.addAccount(mgr.getInstanceInfo(session.domain), session.token, result, session.app, true);
 						String newID=mgr.getLastActiveAccountID();
 						Bundle args=new Bundle();
 						args.putString("account", newID);
@@ -228,25 +189,4 @@ public class AccountActivationFragment extends ToolbarFragment{
 				})
 				.exec(accountID);
 	}
-
-	@SuppressLint("DefaultLocale")
-	private void updateResendTimer(){
-		long sinceResend=System.currentTimeMillis()-lastResendTime;
-		if(sinceResend>59_000L){
-			resendBtn.setText(R.string.resend);
-			resendBtn.setEnabled(true);
-			return;
-		}
-		int seconds=(int)((60_000L-sinceResend)/1000L);
-		resendBtn.setText(String.format("%s (%d)", getString(R.string.resend), seconds));
-		if(resendBtn.isEnabled())
-			resendBtn.setEnabled(false);
-		resendBtn.postDelayed(resendTimer, 500);
-	}
-
-	@Override
-	public void onDestroyView(){
-		super.onDestroyView();
-		resendBtn.removeCallbacks(resendTimer);
-	}
 }

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

@@ -1,255 +0,0 @@
-package org.joinmastodon.android.fragments.onboarding;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.Space;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.catalog.CatalogInstance;
-import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-import me.grishka.appkit.FragmentStackActivity;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
-import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class CustomWelcomeFragment extends InstanceCatalogFragment {
-	private View headerView;
-
-	public CustomWelcomeFragment() {
-		super(R.layout.fragment_welcome_custom, 1);
-	}
-
-	@Override
-	public void onAttach(Context context){
-		super.onAttach(context);
-		setRefreshEnabled(false);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		dataLoaded();
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-
-		if (!canGoBack()) {
-			ImageView 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)));
-
-			FrameLayout logoWrap=new FrameLayout(getActivity());
-			FrameLayout.LayoutParams logoParams=new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
-			logoParams.setMargins(0, V.dp(2), 0, 0);
-			logoWrap.addView(toolbarLogo, logoParams);
-
-			getToolbar().addView(logoWrap, new Toolbar.LayoutParams(Gravity.CENTER));
-		} else {
-			setTitle(R.string.add_account);
-		}
-	}
-
-	@Override
-	protected void proceedWithAuthOrSignup(Instance instance) {
-		AccountSessionManager.getInstance().authenticate(getActivity(), instance);
-	}
-
-	@Override
-	protected void updateFilteredList(){
-		boolean addFakeInstance = currentSearchQuery.length()>0 && currentSearchQuery.matches("^\\S+\\.[^\\.]+$");
-		if(addFakeInstance){
-			fakeInstance.domain=fakeInstance.normalizedDomain=currentSearchQuery;
-			fakeInstance.description=getString(R.string.loading_instance);
-			if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
-				if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
-					ivh.rebind();
-				}
-			}
-			if(filteredData.isEmpty()){
-				filteredData.add(fakeInstance);
-				adapter.notifyItemInserted(0);
-			}
-		}
-		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
-		filteredData.clear();
-		if(currentSearchQuery.length()>0){
-			boolean foundExactMatch=false;
-			for(CatalogInstance inst:data){
-				if(inst.normalizedDomain.contains(currentSearchQuery)){
-					filteredData.add(inst);
-					if(inst.normalizedDomain.equals(currentSearchQuery))
-						foundExactMatch=true;
-				}
-			}
-			if(!foundExactMatch && addFakeInstance) {
-				filteredData.add(0, fakeInstance);
-				adapter.notifyItemChanged(0);
-			}
-		}
-		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
-		for(int i=0;i<list.getChildCount();i++){
-			list.getChildAt(i).invalidateOutline();
-		}
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		super.onViewCreated(view, savedInstanceState);
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
-		list.setItemAnimator(new BetterItemAnimator());
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count) {}
-
-	@Override
-	protected RecyclerView.Adapter getAdapter(){
-		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_welcome_custom, list, false);
-		searchEdit=headerView.findViewById(R.id.search_edit);
-		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
-
-		headerView.findViewById(R.id.more).setVisibility(View.GONE);
-		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
-		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
-		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
-		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
-		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
-		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
-		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
-
-		searchEdit.addTextChangedListener(new TextWatcher(){
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after){}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count){
-				nextButton.setEnabled(false);
-				chosenInstance = null;
-				searchEdit.removeCallbacks(searchDebouncer);
-				searchEdit.postDelayed(searchDebouncer, 300);
-			}
-
-			@Override
-			public void afterTextChanged(Editable s){}
-		});
-
-		mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
-		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
-		View spacer = new Space(getActivity());
-		spacer.setMinimumHeight(V.dp(8));
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(spacer));
-		return mergeAdapter;
-	}
-
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder> {
-		public InstancesAdapter(){
-			super(imgLoader);
-		}
-
-		@NonNull
-		@Override
-		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new InstanceViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(InstanceViewHolder holder, int position){
-			holder.bind(filteredData.get(position));
-			chosenInstance = filteredData.get(position);
-			if (chosenInstance != fakeInstance) nextButton.setEnabled(true);
-			super.onBindViewHolder(holder, position);
-		}
-
-		@Override
-		public int getItemCount(){
-			return filteredData.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return -1;
-		}
-	}
-
-	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
-		private final TextView title, description, userCount, lang;
-		private final RadioButton radioButton;
-
-		public InstanceViewHolder(){
-			super(getActivity(), R.layout.item_instance_custom, list);
-			title=findViewById(R.id.title);
-			description=findViewById(R.id.description);
-			userCount=findViewById(R.id.user_count);
-			lang=findViewById(R.id.lang);
-			radioButton=findViewById(R.id.radiobtn);
-			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
-					UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
-					UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
-			}
-		}
-
-		@Override
-		public void onBind(CatalogInstance item){
-			title.setText(item.normalizedDomain);
-			description.setText(item.description);
-			if (item == fakeInstance) {
-				userCount.setVisibility(View.GONE);
-				lang.setVisibility(View.GONE);
-			} else {
-				userCount.setVisibility(View.VISIBLE);
-				lang.setVisibility(View.VISIBLE);
-				userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
-				lang.setText(item.language.toUpperCase());
-			}
-			radioButton.setChecked(chosenInstance==item);
-			radioButton.setVisibility(View.GONE);
-		}
-
-		@Override
-		public void onClick(){
-			if(chosenInstance!=null){
-					int idx=filteredData.indexOf(chosenInstance);
-					if(idx!=-1){
-						RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
-						if(holder instanceof InstanceViewHolder ivh){
-							ivh.radioButton.setChecked(false);
-						}
-					}
-			}
-			radioButton.setChecked(true);
-			if(chosenInstance==null)
-					nextButton.setEnabled(true);
-			chosenInstance=item;
-			loadInstanceInfo(chosenInstance.domain, false);
-			onNextClick(null);
-		}
-	}
-}

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

@@ -1,7 +1,6 @@
 package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.Activity;
-import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,7 +15,6 @@ import android.widget.TextView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
 import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.jsoup.Jsoup;
@@ -35,7 +33,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.fragments.AppKitFragment;
-import me.grishka.appkit.fragments.ToolbarFragment;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.BindableViewHolder;
@@ -49,7 +46,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
+public class GoogleMadeMeAddThisFragment extends AppKitFragment{
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -63,7 +60,6 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
 		setRetainInstance(true);
-		setTitle(R.string.privacy_policy_title);
 	}
 
 	@Override
@@ -86,24 +82,37 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	}
 
 	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
 
 		list=view.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		View headerView=inflater.inflate(R.layout.item_list_header_simple, list, false);
+		View headerView=inflater.inflate(R.layout.item_list_header, list, false);
-		TextView text=headerView.findViewById(R.id.text);
+		TextView title=headerView.findViewById(R.id.title);
-		text.setText(R.string.privacy_policy_subtitle);
+		TextView subtitle=headerView.findViewById(R.id.subtitle);
+		headerView.findViewById(R.id.step_counter).setVisibility(View.GONE);
+		title.setText(R.string.privacy_policy_title);
+		subtitle.setText(R.string.privacy_policy_subtitle);
 
 		adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(itemsAdapter=new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
+		list.setSelector(null);
+		list.addItemDecoration(new RecyclerView.ItemDecoration(){
+			@Override
+			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
+				if(parent.getChildViewHolder(view) instanceof ItemViewHolder){
+					outRect.left=outRect.right=V.dp(18.5f);
+					outRect.top=V.dp(16);
+				}
+			}
+		});
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 
 		return view;
 	}
@@ -111,15 +120,7 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		getToolbar().setBackground(null);
-		getToolbar().setElevation(0);
 	}
 
 	protected void onButtonClick(){
@@ -191,17 +192,24 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	}
 
 	private class ItemViewHolder extends BindableViewHolder<Item> implements UsableRecyclerView.Clickable{
-		private final TextView title;
+		private final TextView domain, title;
+		private final ImageView favicon;
 
 		public ItemViewHolder(){
 			super(getActivity(), R.layout.item_privacy_policy_link, list);
+			domain=findViewById(R.id.domain);
 			title=findViewById(R.id.title);
-			title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+			favicon=findViewById(R.id.favicon);
+			itemView.setOutlineProvider(OutlineProviders.roundedRect(10));
+			itemView.setClipToOutline(true);
 		}
 
 		@Override
 		public void onBind(Item item){
+			domain.setText(item.domain);
 			title.setText(item.title);
+
+			ViewImageLoader.load(favicon, null, new UrlImageLoaderRequest(item.faviconUrl));
 		}
 
 		@Override

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

@@ -2,30 +2,46 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.LocaleList;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIController;
+import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.instance.GetInstance;
+import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
+import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
+import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.catalog.CatalogCategory;
 import org.joinmastodon.android.model.catalog.CatalogInstance;
+import org.joinmastodon.android.ui.BetterItemAnimator;
+import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
@@ -43,53 +59,317 @@ import java.util.stream.Collectors;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
 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.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
+import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
 
-abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
+public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
-	protected RecyclerView.Adapter adapter;
+	private InstancesAdapter adapter;
-	protected MergeRecyclerAdapter mergeAdapter;
+	private MergeRecyclerAdapter mergeAdapter;
-	protected CatalogInstance chosenInstance;
+	private View headerView;
-	protected Button nextButton;
+	private CatalogInstance chosenInstance;
-	protected EditText searchEdit;
+	private List<CatalogInstance> filteredData=new ArrayList<>();
-	protected Runnable searchDebouncer=this::onSearchChangedDebounced;
+	private Button nextButton;
-	protected String currentSearchQuery;
+	private MastodonAPIRequest<?> getCategoriesRequest;
-	protected String loadingInstanceDomain;
+	private EditText searchEdit;
-	protected HashMap<String, Instance> instancesCache=new HashMap<>();
+	private TabLayout categoriesList;
-	protected View buttonBar;
+	private Runnable searchDebouncer=this::onSearchChangedDebounced;
-	protected List<CatalogInstance> filteredData=new ArrayList<>();
+	private String currentSearchQuery;
-	protected GetInstance loadingInstanceRequest;
+	private String currentCategory="all";
-	protected Call loadingInstanceRedirectRequest;
+	private List<CatalogCategory> categories=new ArrayList<>();
-	protected ProgressDialog instanceProgressDialog;
+	private String loadingInstanceDomain;
-	protected HashMap<String, String> redirects=new HashMap<>();
+	private GetInstance loadingInstanceRequest;
-	protected HashMap<String, String> redirectsInverse=new HashMap<>();
+	private Call loadingInstanceRedirectRequest;
-	protected boolean isSignup;
+	private HashMap<String, Instance> instancesCache=new HashMap<>();
-	protected CatalogInstance fakeInstance=new CatalogInstance();
+	private ProgressDialog instanceProgressDialog;
+	private View buttonBar;
+	private HashMap<String, String> redirects=new HashMap<>(), redirectsInverse=new HashMap<>();
+
+	private boolean isSignup;
 
 	private static final double DUNBAR=Math.log(800);
 
-	public InstanceCatalogFragment(int layout, int perPage){
+	public InstanceCatalogFragment(){
-		super(layout, perPage);
+		super(R.layout.fragment_onboarding_common, 10);
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
 		super.onCreate(savedInstanceState);
-		isSignup=getArguments() != null && getArguments().getBoolean("signup");
+		isSignup=getArguments().getBoolean("signup");
 	}
 
-	protected abstract void proceedWithAuthOrSignup(Instance instance);
+	@Override
+	public void onAttach(Context context){
+		super.onAttach(context);
+		setRefreshEnabled(false);
+		loadData();
+	}
 
-	protected boolean onSearchEnterPressed(TextView v, int actionId, KeyEvent event){
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetCatalogInstances(null, null)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<CatalogInstance> result){
+						if(getActivity()==null)
+							return;
+						Map<String, List<CatalogInstance>> byLang=result.stream().collect(Collectors.groupingBy(ci->ci.language));
+						for(List<CatalogInstance> group:byLang.values()){
+							Collections.sort(group, (a, b)->{
+								double aa=Math.abs(DUNBAR-Math.log(a.lastWeekUsers));
+								double bb=Math.abs(DUNBAR-Math.log(b.lastWeekUsers));
+								return Double.compare(aa, bb);
+							});
+						}
+						// get the list of user-configured system languages
+						List<String> userLangs;
+						if(Build.VERSION.SDK_INT<24){
+							userLangs=Collections.singletonList(getResources().getConfiguration().locale.getLanguage());
+						}else{
+							LocaleList ll=getResources().getConfiguration().getLocales();
+							userLangs=new ArrayList<>(ll.size());
+							for(int i=0;i<ll.size();i++){
+								userLangs.add(ll.get(i).getLanguage());
+							}
+						}
+						// add instances in preferred languages to the top of the list, in the order of preference
+						ArrayList<CatalogInstance> sortedList=new ArrayList<>();
+						for(String lang:userLangs){
+							List<CatalogInstance> langInstances=byLang.remove(lang);
+							if(langInstances!=null){
+								sortedList.addAll(langInstances);
+							}
+						}
+						// sort the remaining language groups by aggregate lastWeekUsers
+						class InstanceGroup{
+							public int activeUsers;
+							public List<CatalogInstance> instances;
+						}
+						byLang.values().stream().map(il->{
+							InstanceGroup group=new InstanceGroup();
+							group.instances=il;
+							for(CatalogInstance instance:il){
+								group.activeUsers+=instance.lastWeekUsers;
+							}
+							return group;
+						}).sorted(Comparator.comparingInt((InstanceGroup g)->g.activeUsers).reversed()).forEachOrdered(ig->sortedList.addAll(ig.instances));
+						onDataLoaded(sortedList, false);
+						updateFilteredList();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						error.showToast(getActivity());
+						onDataLoaded(Collections.emptyList(), false);
+					}
+				})
+				.execNoAuth("");
+		getCategoriesRequest=new GetCatalogCategories(null)
+				.setCallback(new Callback<>(){
+					@Override
+					public void onSuccess(List<CatalogCategory> result){
+						getCategoriesRequest=null;
+						CatalogCategory all=new CatalogCategory();
+						all.category="all";
+						categories.add(all);
+						result.stream().sorted(Comparator.comparingInt((CatalogCategory cc)->cc.serversCount).reversed()).forEach(categories::add);
+						updateCategories();
+					}
+
+					@Override
+					public void onError(ErrorResponse error){
+						getCategoriesRequest=null;
+						error.showToast(getActivity());
+						CatalogCategory all=new CatalogCategory();
+						all.category="all";
+						categories.add(all);
+						updateCategories();
+					}
+				})
+				.execNoAuth("");
+	}
+
+	private void updateCategories(){
+		categoriesList.removeAllTabs();
+		for(CatalogCategory cat:categories){
+			int titleRes=getTitleForCategory(cat.category);
+			TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
+			ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
+			emoji.setImageResource(getEmojiForCategory(cat.category));
+			categoriesList.addTab(tab);
+		}
+	}
+
+	@Override
+	public void onDestroy(){
+		super.onDestroy();
+		if(getCategoriesRequest!=null)
+			getCategoriesRequest.cancel();
+	}
+
+	@Override
+	protected RecyclerView.Adapter getAdapter(){
+		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_onboarding_instance_catalog, list, false);
+		searchEdit=headerView.findViewById(R.id.search_edit);
+		categoriesList=headerView.findViewById(R.id.categories_list);
+		categoriesList.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener(){
+			@Override
+			public void onTabSelected(TabLayout.Tab tab){
+				CatalogCategory category=categories.get(tab.getPosition());
+				currentCategory=category.category;
+				updateFilteredList();
+			}
+
+			@Override
+			public void onTabUnselected(TabLayout.Tab tab){
+
+			}
+
+			@Override
+			public void onTabReselected(TabLayout.Tab tab){
+
+			}
+		});
+		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
+		searchEdit.addTextChangedListener(new TextWatcher(){
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count, int after){
+
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before, int count){
+				searchEdit.removeCallbacks(searchDebouncer);
+				searchEdit.postDelayed(searchDebouncer, 300);
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){
+			}
+		});
+
+		mergeAdapter=new MergeRecyclerAdapter();
+		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
+		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
+		return mergeAdapter;
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState){
+		super.onViewCreated(view, savedInstanceState);
+		nextButton=view.findViewById(R.id.btn_next);
+		nextButton.setOnClickListener(this::onNextClick);
+		nextButton.setEnabled(chosenInstance!=null);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
+		list.setItemAnimator(new BetterItemAnimator());
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
+		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+		buttonBar=view.findViewById(R.id.button_bar);
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
+	}
+
+	private void onNextClick(View v){
+		String domain=chosenInstance.domain;
+		Instance instance=instancesCache.get(domain);
+		if(instance!=null){
+			proceedWithAuthOrSignup(instance);
+		}else{
+			showProgressDialog();
+			if(!domain.equals(loadingInstanceDomain)){
+				loadInstanceInfo(domain, false);
+			}
+		}
+	}
+
+	private void proceedWithAuthOrSignup(Instance instance){
+		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
+		if(isSignup){
+			if(!instance.registrations){
+				new M3AlertDialogBuilder(getActivity())
+						.setTitle(R.string.error)
+						.setMessage(R.string.instance_signup_closed)
+						.setPositiveButton(R.string.ok, null)
+						.show();
+				return;
+			}
+			Bundle args=new Bundle();
+			args.putParcelable("instance", Parcels.wrap(instance));
+			Nav.go(getActivity(), InstanceRulesFragment.class, args);
+		}else{
+			AccountSessionManager.getInstance().authenticate(getActivity(), instance);
+		}
+	}
+
+//	private String getEmojiForCategory(String category){
+//		return switch(category){
+//			case "all" -> "💬";
+//			case "academia" -> "📚";
+//			case "activism" -> "✊";
+//			case "food" -> "🍕";
+//			case "furry" -> "🦁";
+//			case "games" -> "🕹";
+//			case "general" -> "🐘";
+//			case "journalism" -> "📰";
+//			case "lgbt" -> "🏳️‍🌈";
+//			case "regional" -> "📍";
+//			case "art" -> "🎨";
+//			case "music" -> "🎼";
+//			case "tech" -> "📱";
+//			default -> "❓";
+//		};
+//	}
+
+	private int getEmojiForCategory(String category){
+		return switch(category){
+			case "all" -> R.drawable.ic_category_all;
+			case "academia" -> R.drawable.ic_category_academia;
+			case "activism" -> R.drawable.ic_category_activism;
+			case "food" -> R.drawable.ic_category_food;
+			case "furry" -> R.drawable.ic_category_furry;
+			case "games" -> R.drawable.ic_category_games;
+			case "general" -> R.drawable.ic_category_general;
+			case "journalism" -> R.drawable.ic_category_journalism;
+			case "lgbt" -> R.drawable.ic_category_lgbt;
+			case "regional" -> R.drawable.ic_category_regional;
+			case "art" -> R.drawable.ic_category_art;
+			case "music" -> R.drawable.ic_category_music;
+			case "tech" -> R.drawable.ic_category_tech;
+			default -> R.drawable.ic_category_unknown;
+		};
+	}
+
+	private int getTitleForCategory(String category){
+		return switch(category){
+			case "all" -> R.string.category_all;
+			case "academia" -> R.string.category_academia;
+			case "activism" -> R.string.category_activism;
+			case "food" -> R.string.category_food;
+			case "furry" -> R.string.category_furry;
+			case "games" -> R.string.category_games;
+			case "general" -> R.string.category_general;
+			case "journalism" -> R.string.category_journalism;
+			case "lgbt" -> R.string.category_lgbt;
+			case "regional" -> R.string.category_regional;
+			case "art" -> R.string.category_art;
+			case "music" -> R.string.category_music;
+			case "tech" -> R.string.category_tech;
+			default -> 0;
+		};
+	}
+
+	private boolean onSearchEnterPressed(TextView v, int actionId, KeyEvent event){
 		if(event!=null && event.getAction()!=KeyEvent.ACTION_DOWN)
 			return true;
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
@@ -105,73 +385,60 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 		return true;
 	}
 
-	protected void onSearchChangedDebounced(){
+	private void onSearchChangedDebounced(){
 		currentSearchQuery=searchEdit.getText().toString().toLowerCase();
 		updateFilteredList();
 		loadInstanceInfo(currentSearchQuery, false);
 	}
 
-	protected List<CatalogInstance> sortInstances(List<CatalogInstance> result){
+	private void updateFilteredList(){
-		Map<String, List<CatalogInstance>> byLang=result.stream().collect(Collectors.groupingBy(ci->ci.language));
+		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
-		for(List<CatalogInstance> group:byLang.values()){
+		filteredData.clear();
-			Collections.sort(group, (a, b)->{
+		for(CatalogInstance instance:data){
-				double aa=Math.abs(DUNBAR-Math.log(a.lastWeekUsers));
+			if(currentCategory.equals("all") || instance.categories.contains(currentCategory)){
-				double bb=Math.abs(DUNBAR-Math.log(b.lastWeekUsers));
+				if(TextUtils.isEmpty(currentSearchQuery) || instance.domain.contains(currentSearchQuery)){
-				return Double.compare(aa, bb);
+					if(instance.domain.equals(currentSearchQuery) || !isSignup || !instance.approvalRequired)
-			});
+						filteredData.add(instance);
-		}
+				}
-		// get the list of user-configured system languages
-		List<String> userLangs;
-		if(Build.VERSION.SDK_INT<24){
-			userLangs=Collections.singletonList(getResources().getConfiguration().locale.getLanguage());
-		}else{
-			LocaleList ll=getResources().getConfiguration().getLocales();
-			userLangs=new ArrayList<>(ll.size());
-			for(int i=0;i<ll.size();i++){
-				userLangs.add(ll.get(i).getLanguage());
 			}
 		}
-		// add instances in preferred languages to the top of the list, in the order of preference
+		DiffUtil.calculateDiff(new DiffUtil.Callback(){
-		ArrayList<CatalogInstance> sortedList=new ArrayList<>();
+			@Override
-		for(String lang:userLangs){
+			public int getOldListSize(){
-			List<CatalogInstance> langInstances=byLang.remove(lang);
+				return prevData.size();
-			if(langInstances!=null){
-				sortedList.addAll(langInstances);
 			}
-		}
+
-		// sort the remaining language groups by aggregate lastWeekUsers
+			@Override
-		class InstanceGroup{
+			public int getNewListSize(){
-			public int activeUsers;
+				return filteredData.size();
-			public List<CatalogInstance> instances;
-		}
-		byLang.values().stream().map(il->{
-			InstanceGroup group=new InstanceGroup();
-			group.instances=il;
-			for(CatalogInstance instance:il){
-				group.activeUsers+=instance.lastWeekUsers;
 			}
-			return group;
+
-		}).sorted(Comparator.comparingInt((InstanceGroup g)->g.activeUsers).reversed()).forEachOrdered(ig->sortedList.addAll(ig.instances));
+			@Override
-		return sortedList;
+			public boolean areItemsTheSame(int oldItemPosition, int newItemPosition){
+				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
+			}
+
+			@Override
+			public boolean areContentsTheSame(int oldItemPosition, int newItemPosition){
+				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
+			}
+		}).dispatchUpdatesTo(adapter);
 	}
 
-	protected abstract void updateFilteredList();
+	private void showProgressDialog(){
-
-	protected void showProgressDialog(){
 		instanceProgressDialog=new ProgressDialog(getActivity());
 		instanceProgressDialog.setMessage(getString(R.string.loading_instance));
 		instanceProgressDialog.setOnCancelListener(dialog->cancelLoadingInstanceInfo());
 		instanceProgressDialog.show();
 	}
 
-	protected String normalizeInstanceDomain(String _domain){
+	private String normalizeInstanceDomain(String _domain){
 		if(TextUtils.isEmpty(_domain))
 			return null;
 		if(_domain.contains(":")){
 			try{
 				_domain=Uri.parse(_domain).getAuthority();
-			}catch(Exception ignore){
+			}catch(Exception ignore){}
-			}
 			if(TextUtils.isEmpty(_domain))
 				return null;
 		}
@@ -186,14 +453,12 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 		return domain;
 	}
 
-	protected void loadInstanceInfo(String _domain, boolean isFromRedirect){
+	private void loadInstanceInfo(String _domain, boolean isFromRedirect){
-		if(TextUtils.isEmpty(_domain))
-			return;
 		String domain=normalizeInstanceDomain(_domain);
 		Instance cachedInstance=instancesCache.get(domain);
 		if(cachedInstance!=null){
-			for(CatalogInstance ci : filteredData){
+			for(CatalogInstance ci:filteredData){
-				if(ci.domain.equals(domain) && ci!=fakeInstance)
+				if(ci.domain.equals(domain))
 					return;
 			}
 			CatalogInstance ci=cachedInstance.toCatalogInstance();
@@ -211,57 +476,44 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 		loadingInstanceDomain=domain;
 		loadingInstanceRequest=new GetInstance();
 		loadingInstanceRequest.setCallback(new Callback<>(){
-			@Override
+					@Override
-			public void onSuccess(Instance result){
+					public void onSuccess(Instance result){
-				loadingInstanceRequest=null;
+						loadingInstanceRequest=null;
-				loadingInstanceDomain=null;
+						loadingInstanceDomain=null;
-				result.uri=domain; // needed for instances that use domain redirection
+						result.uri=domain; // needed for instances that use domain redirection
-				instancesCache.put(domain, result);
+						instancesCache.put(domain, result);
-				if(instanceProgressDialog!=null){
+						if(instanceProgressDialog!=null){
-					instanceProgressDialog.dismiss();
+							instanceProgressDialog.dismiss();
-					instanceProgressDialog=null;
+							instanceProgressDialog=null;
-					proceedWithAuthOrSignup(result);
+							proceedWithAuthOrSignup(result);
-				}
+						}
-				if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
+						if(Objects.equals(domain, currentSearchQuery) || Objects.equals(currentSearchQuery, redirects.get(domain)) || Objects.equals(currentSearchQuery, redirectsInverse.get(domain))){
-					boolean found=false;
+							boolean found=false;
-					for(CatalogInstance ci:filteredData){
+							for(CatalogInstance ci:filteredData){
-						if(ci.domain.equals(domain) && ci!=fakeInstance){
+								if(ci.domain.equals(domain)){
-							found=true;
+									found=true;
-							break;
+									break;
+								}
+							}
+							if(!found){
+								CatalogInstance ci=result.toCatalogInstance();
+								filteredData.add(0, ci);
+								adapter.notifyItemInserted(0);
+							}
 						}
 					}
-					if(!found){
-						CatalogInstance ci=result.toCatalogInstance();
-						if(filteredData.size()==1 && filteredData.get(0)==fakeInstance){
-							filteredData.set(0, ci);
-							adapter.notifyItemChanged(0);
-						}else{
-							filteredData.add(0, ci);
-							adapter.notifyItemInserted(0);
-						}
-					}
-				}
-			}
 
-			@Override
+					@Override
-			public void onError(ErrorResponse error){
+					public void onError(ErrorResponse error){
-				loadingInstanceRequest=null;
+						loadingInstanceRequest=null;
-				if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
+						if(!isFromRedirect && error instanceof MastodonErrorResponse me && me.httpStatus==404){
-					fetchDomainFromHostMetaAndMaybeRetry(domain, error);
+							fetchDomainFromHostMetaAndMaybeRetry(domain, error);
-					return;
+							return;
-				}
-				loadingInstanceDomain=null;
-				showInstanceInfoLoadError(domain, error);
-				if(fakeInstance!=null){
-					fakeInstance.description=getString(R.string.error);
-					if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
-						if(list.findViewHolderForAdapterPosition(1) instanceof BindableViewHolder<?> ivh){
-							ivh.rebind();
 						}
+						loadingInstanceDomain=null;
+						showInstanceInfoLoadError(domain, error);
 					}
-				}
+				}).execNoAuth(domain);
-			}
-		}).execNoAuth(domain);
 	}
 
 	private void cancelLoadingInstanceInfo(){
@@ -332,7 +584,7 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 					InputSource source=new InputSource(response.body().charStream());
 					Document doc=DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(source);
 					NodeList list=doc.getElementsByTagName("Link");
-					for(int i=0; i<list.getLength(); i++){
+					for(int i=0;i<list.getLength();i++){
 						if(list.item(i) instanceof Element el){
 							String template=el.getAttribute("template");
 							if("lrdd".equals(el.getAttribute("rel")) && !TextUtils.isEmpty(template) && template.contains("{uri}")){
@@ -364,26 +616,78 @@ abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInsta
 		}
 	}
 
-	@Override
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
-	public void onViewCreated(View view, Bundle savedInstanceState){
+		public InstancesAdapter(){
-		super.onViewCreated(view, savedInstanceState);
+			super(imgLoader);
-		nextButton=view.findViewById(R.id.btn_next);
+		}
-		nextButton.setOnClickListener(this::onNextClick);
+
-		nextButton.setEnabled(chosenInstance!=null);
+		@NonNull
-		buttonBar=view.findViewById(R.id.button_bar);
+		@Override
-		setRefreshEnabled(false);
+		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+			return new InstanceViewHolder();
+		}
+
+		@Override
+		public void onBindViewHolder(InstanceViewHolder holder, int position){
+			holder.bind(filteredData.get(position));
+			super.onBindViewHolder(holder, position);
+		}
+
+		@Override
+		public int getItemCount(){
+			return filteredData.size();
+		}
+
+		@Override
+		public int getItemViewType(int position){
+			return -1;
+		}
 	}
 
-	protected void onNextClick(View v){
+	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
-		String domain=chosenInstance.domain;
+		private final TextView title, description, userCount, lang;
-		Instance instance=instancesCache.get(domain);
+		private final RadioButton radioButton;
-		if(instance!=null){
+
-			proceedWithAuthOrSignup(instance);
+		public InstanceViewHolder(){
-		}else{
+			super(getActivity(), R.layout.item_instance_catalog, list);
-			showProgressDialog();
+			title=findViewById(R.id.title);
-			if(!domain.equals(loadingInstanceDomain)){
+			description=findViewById(R.id.description);
-				loadInstanceInfo(domain, false);
+			userCount=findViewById(R.id.user_count);
+			lang=findViewById(R.id.lang);
+			radioButton=findViewById(R.id.radiobtn);
+			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N){
+				UiUtils.fixCompoundDrawableTintOnAndroid6(userCount);
+				UiUtils.fixCompoundDrawableTintOnAndroid6(lang);
 			}
 		}
+
+		@Override
+		public void onBind(CatalogInstance item){
+			title.setText(item.normalizedDomain);
+			description.setText(item.description);
+			userCount.setText(UiUtils.abbreviateNumber(item.totalUsers));
+			lang.setText(item.language.toUpperCase());
+			radioButton.setChecked(chosenInstance==item);
+		}
+
+		@Override
+		public void onClick(){
+			if(chosenInstance==item)
+				return;
+			if(chosenInstance!=null){
+				int idx=filteredData.indexOf(chosenInstance);
+				if(idx!=-1){
+					RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
+					if(holder instanceof InstanceViewHolder ivh){
+						ivh.radioButton.setChecked(false);
+					}
+				}
+			}
+			radioButton.setChecked(true);
+			if(chosenInstance==null)
+				nextButton.setEnabled(true);
+			chosenInstance=item;
+			loadInstanceInfo(chosenInstance.domain, false);
+		}
 	}
 }

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

@@ -1,713 +0,0 @@
-package org.joinmastodon.android.fragments.onboarding;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.Menu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.HorizontalScrollView;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.RadioButton;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.api.requests.catalog.GetCatalogCategories;
-import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.catalog.CatalogCategory;
-import org.joinmastodon.android.model.catalog.CatalogInstance;
-import org.joinmastodon.android.ui.BetterItemAnimator;
-import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.FilterChipView;
-import org.parceler.Parcels;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DiffUtil;
-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.OnBackPressedListener;
-import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
-import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
-import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
-import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class InstanceCatalogSignupFragment extends InstanceCatalogFragment implements OnBackPressedListener{
-	private MastodonAPIRequest<?> getCategoriesRequest;
-	private String currentCategory="all";
-	private List<CatalogCategory> categories=new ArrayList<>();
-	private View topBar;
-
-	private List<String> languages=Collections.emptyList();
-	private PopupMenu langFilterMenu, speedFilterMenu;
-	private SignupSpeedFilter currentSignupSpeedFilter=SignupSpeedFilter.INSTANT;
-	private String currentLanguage=null;
-	private boolean searchQueryMode;
-	private LinearLayout filtersWrap;
-	private HorizontalScrollView filtersScroll;
-	private ImageButton backBtn, clearSearchBtn;
-	private View focusThing;
-
-	private FilterChipView categoryGeneral, categorySpecialInterests;
-	private List<FilterChipView> regionalFilters;
-	private CatalogInstance.Region chosenRegion;
-	private CategoryChoice categoryChoice;
-
-	public InstanceCatalogSignupFragment(){
-		super(R.layout.fragment_onboarding_common, 10);
-	}
-
-	@Override
-	public void onAttach(Context context){
-		super.onAttach(context);
-		setRefreshEnabled(false);
-		setRetainInstance(true);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		loadData();
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-		currentRequest=new GetCatalogInstances(null, null)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(List<CatalogInstance> result){
-						if(getActivity()==null)
-							return;
-						onDataLoaded(sortInstances(result), false);
-
-						if(langFilterMenu!=null){
-							Menu menu=langFilterMenu.getMenu();
-							menu.clear();
-							menu.add(0, 0, 0, R.string.server_filter_any_language);
-							languages=result.stream().map(i->i.language).distinct().filter(s->s.length()>0).sorted().collect(Collectors.toList());
-							int i=1;
-							for(String lang:languages){
-								Locale locale=Locale.forLanguageTag(lang);
-								String name=locale.getDisplayLanguage(locale);
-								if(name.equals(lang))
-									name=lang.toUpperCase();
-								else
-									name=name.substring(0, 1).toUpperCase()+name.substring(1);
-								menu.add(0, i, 0, name);
-								i++;
-							}
-						}
-
-						updateFilteredList();
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						error.showToast(getActivity());
-						onDataLoaded(Collections.emptyList(), false);
-					}
-				})
-				.execNoAuth("");
-		getCategoriesRequest=new GetCatalogCategories(null)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(List<CatalogCategory> result){
-						getCategoriesRequest=null;
-						CatalogCategory all=new CatalogCategory();
-						all.category="all";
-						categories.add(all);
-						result.stream().sorted(Comparator.comparingInt((CatalogCategory cc)->cc.serversCount).reversed()).forEach(categories::add);
-						updateCategories();
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-						getCategoriesRequest=null;
-						error.showToast(getActivity());
-						CatalogCategory all=new CatalogCategory();
-						all.category="all";
-						categories.add(all);
-						updateCategories();
-					}
-				})
-				.execNoAuth("");
-	}
-
-	private void updateCategories(){
-//		categoriesList.removeAllTabs();
-//		for(CatalogCategory cat:categories){
-//			int titleRes=getTitleForCategory(cat.category);
-//			TabLayout.Tab tab=categoriesList.newTab().setText(titleRes!=0 ? getString(titleRes) : cat.category).setCustomView(R.layout.item_instance_category);
-//			ImageView emoji=tab.getCustomView().findViewById(R.id.emoji);
-//			emoji.setImageResource(getEmojiForCategory(cat.category));
-//			categoriesList.addTab(tab);
-//		}
-	}
-
-	@Override
-	public void onDestroy(){
-		super.onDestroy();
-		if(getCategoriesRequest!=null)
-			getCategoriesRequest.cancel();
-	}
-
-	@Override
-	protected RecyclerView.Adapter getAdapter(){
-		View headerView=new View(getActivity());
-		headerView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
-
-		mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
-		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
-		return mergeAdapter;
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		backBtn=view.findViewById(R.id.btn_back);
-		backBtn.setOnClickListener(v->{
-			if(searchQueryMode){
-				setSearchQueryMode(false);
-			}else{
-				Nav.finish(this);
-			}
-		});
-		clearSearchBtn=view.findViewById(R.id.clear);
-		clearSearchBtn.setOnClickListener(v->searchEdit.setText(""));
-		nextButton.setEnabled(true);
-		list.setItemAnimator(new BetterItemAnimator());
-		setStatusBarColor(0);
-		topBar=view.findViewById(R.id.top_bar);
-
-		LayerDrawable topBg=(LayerDrawable) topBar.getBackground().mutate();
-		topBar.setBackground(topBg);
-		Drawable topOverlay=topBg.findDrawableByLayerId(R.id.color_overlay);
-		topOverlay.setAlpha(0);
-
-		LayerDrawable btmBg=(LayerDrawable) buttonBar.getBackground().mutate();
-		buttonBar.setBackground(btmBg);
-		Drawable btmOverlay=btmBg.findDrawableByLayerId(R.id.color_overlay);
-		btmOverlay.setAlpha(0);
-
-		list.addOnScrollListener(new RecyclerView.OnScrollListener(){
-			private boolean isAtTop=true;
-			private Animator currentPanelsAnim;
-			@Override
-			public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
-				boolean newAtTop=recyclerView.getChildCount()==0 || (recyclerView.getChildAdapterPosition(recyclerView.getChildAt(0))==0 && recyclerView.getChildAt(0).getTop()==recyclerView.getPaddingTop());
-				if(newAtTop!=isAtTop){
-					isAtTop=newAtTop;
-					if(currentPanelsAnim!=null)
-						currentPanelsAnim.cancel();
-
-					AnimatorSet set=new AnimatorSet();
-					set.playTogether(
-							ObjectAnimator.ofInt(topOverlay, "alpha", isAtTop ? 0 : 20),
-							ObjectAnimator.ofInt(btmOverlay, "alpha", isAtTop ? 0 : 20),
-							ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Z, isAtTop ? 0 : V.dp(3)),
-							ObjectAnimator.ofFloat(buttonBar, View.TRANSLATION_Z, isAtTop ? 0 : V.dp(3))
-					);
-					set.setDuration(150);
-					set.setInterpolator(CubicBezierInterpolator.DEFAULT);
-					set.addListener(new AnimatorListenerAdapter(){
-						@Override
-						public void onAnimationEnd(Animator animation){
-							currentPanelsAnim=null;
-						}
-					});
-					set.start();
-					currentPanelsAnim=set;
-				}
-			}
-		});
-
-		searchEdit=view.findViewById(R.id.search_edit);
-		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
-		searchEdit.addTextChangedListener(new TextWatcher(){
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after){
-
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count){
-				searchEdit.removeCallbacks(searchDebouncer);
-				searchEdit.postDelayed(searchDebouncer, 300);
-			}
-
-			@Override
-			public void afterTextChanged(Editable s){
-				if((clearSearchBtn.getVisibility()==View.VISIBLE)!=(s.length()>0)){
-					clearSearchBtn.setVisibility(s.length()>0 ? View.VISIBLE : View.GONE);
-				}
-			}
-		});
-		searchEdit.setOnFocusChangeListener((v, hasFocus)->{
-			if(hasFocus && !searchQueryMode){
-				setSearchQueryMode(true);
-			}
-		});
-
-		FilterChipView langFilter=new FilterChipView(getActivity());
-		langFilter.setDrawableEnd(R.drawable.ic_baseline_arrow_drop_down_18);
-		if(currentLanguage==null){
-			langFilter.setText(R.string.server_filter_any_language);
-		}else{
-			Locale locale=Locale.forLanguageTag(currentLanguage);
-			langFilter.setText(locale.getDisplayLanguage(locale));
-			langFilter.setSelected(true);
-		}
-		langFilterMenu=new PopupMenu(getContext(), langFilter);
-		langFilter.setOnTouchListener(langFilterMenu.getDragToOpenListener());
-		langFilter.setOnClickListener(v->langFilterMenu.show());
-		filtersWrap=view.findViewById(R.id.filters_container);
-		filtersScroll=view.findViewById(R.id.filters_scroll);
-		filtersWrap.addView(langFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-		FilterChipView speedFilter=new FilterChipView(getActivity());
-		speedFilter.setDrawableEnd(R.drawable.ic_baseline_arrow_drop_down_18);
-		speedFilterMenu=new PopupMenu(getContext(), speedFilter);
-		speedFilterMenu.getMenu().add(0, 0, 0, R.string.server_filter_any_signup_speed);
-		speedFilterMenu.getMenu().add(0, 1, 0, R.string.server_filter_instant_signup);
-		speedFilterMenu.getMenu().add(0, 2, 0, R.string.server_filter_manual_review);
-		speedFilter.setOnTouchListener(speedFilterMenu.getDragToOpenListener());
-		speedFilter.setOnClickListener(v->speedFilterMenu.show());
-		speedFilter.setText(switch(currentSignupSpeedFilter){
-			case ANY -> R.string.server_filter_any_signup_speed;
-			case INSTANT -> R.string.server_filter_instant_signup;
-			case REVIEWED -> R.string.server_filter_manual_review;
-		});
-		speedFilter.setSelected(currentSignupSpeedFilter!=SignupSpeedFilter.ANY);
-		filtersWrap.addView(speedFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-		speedFilterMenu.setOnMenuItemClickListener(item->{
-			speedFilter.setText(item.getTitle());
-			speedFilter.setSelected(item.getItemId()>0);
-			currentSignupSpeedFilter=SignupSpeedFilter.values()[item.getItemId()];
-			updateFilteredList();
-			return true;
-		});
-		langFilterMenu.setOnMenuItemClickListener(item->{
-			langFilter.setText(item.getTitle());
-			langFilter.setSelected(item.getItemId()>0);
-			currentLanguage=item.getItemId()==0 ? null : languages.get(item.getItemId()-1);
-			updateFilteredList();
-			return true;
-		});
-
-		View divider=new View(getActivity());
-		divider.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Outline));
-		filtersWrap.addView(divider, new LinearLayout.LayoutParams(V.dp(.5f), ViewGroup.LayoutParams.MATCH_PARENT));
-
-		categoryGeneral=new FilterChipView(getActivity());
-		categoryGeneral.setText(R.string.category_general);
-		categoryGeneral.setTag(CategoryChoice.GENERAL);
-		categoryGeneral.setOnClickListener(this::onCategoryFilterClick);
-		categoryGeneral.setSelected(categoryChoice==CategoryChoice.GENERAL);
-		filtersWrap.addView(categoryGeneral, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		categorySpecialInterests=new FilterChipView(getActivity());
-		categorySpecialInterests.setText(R.string.category_special_interests);
-		categorySpecialInterests.setTag(CategoryChoice.SPECIAL);
-		categorySpecialInterests.setOnClickListener(this::onCategoryFilterClick);
-		categorySpecialInterests.setSelected(categoryChoice==CategoryChoice.SPECIAL);
-		filtersWrap.addView(categorySpecialInterests, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-		regionalFilters=Arrays.stream(CatalogInstance.Region.values()).map(r->{
-			FilterChipView fv=new FilterChipView(getActivity());
-			fv.setTag(r);
-			fv.setText(switch(r){
-				case EUROPE -> R.string.server_filter_region_europe;
-				case NORTH_AMERICA -> R.string.server_filter_region_north_america;
-				case SOUTH_AMERICA -> R.string.server_filter_region_south_america;
-				case AFRICA -> R.string.server_filter_region_africa;
-				case ASIA -> R.string.server_filter_region_asia;
-				case OCEANIA -> R.string.server_filter_region_oceania;
-			});
-			fv.setSelected(r==chosenRegion);
-			fv.setOnClickListener(this::onRegionFilterClick);
-			filtersWrap.addView(fv, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-			return fv;
-		}).collect(Collectors.toList());
-		focusThing=view.findViewById(R.id.focus_thing);
-		focusThing.requestFocus();
-	}
-
-	private void onRegionFilterClick(View v){
-		CatalogInstance.Region r=(CatalogInstance.Region) v.getTag();
-		if(chosenRegion==r){
-			chosenRegion=null;
-			v.setSelected(false);
-		}else{
-			if(chosenRegion!=null)
-				filtersWrap.findViewWithTag(chosenRegion).setSelected(false);
-			chosenRegion=r;
-			v.setSelected(true);
-		}
-		updateFilteredList();
-	}
-
-	private void onCategoryFilterClick(View v){
-		CategoryChoice c=(CategoryChoice) v.getTag();
-		if(categoryChoice==c){
-			categoryChoice=null;
-			v.setSelected(false);
-		}else{
-			if(categoryChoice!=null)
-				filtersWrap.findViewWithTag(categoryChoice).setSelected(false);
-			categoryChoice=c;
-			v.setSelected(true);
-		}
-		updateFilteredList();
-	}
-
-	@Override
-	protected void onNextClick(View v){
-		if(chosenInstance==null){
-			String lang=Locale.getDefault().getLanguage();
-			List<CatalogInstance> instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general"))) && (lang.equals(ci.language) || (ci.languages!=null && ci.languages.contains(lang)))).collect(Collectors.toList());
-			if(instances.isEmpty()){
-				instances=data.stream().filter(ci->!ci.approvalRequired && ("general".equals(ci.category) || (ci.categories!=null && ci.categories.contains("general")))).collect(Collectors.toList());
-			}
-			if(instances.isEmpty()){
-				return;
-			}
-			chosenInstance=instances.get(new Random().nextInt(instances.size()));
-		}
-		super.onNextClick(v);
-	}
-
-	@Override
-	protected void proceedWithAuthOrSignup(Instance instance){
-		getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(contentView.getWindowToken(), 0);
-		if(!instance.registrations){
-			new M3AlertDialogBuilder(getActivity())
-					.setTitle(R.string.error)
-					.setMessage(R.string.instance_signup_closed)
-					.setPositiveButton(R.string.ok, null)
-					.show();
-			return;
-		}
-		Bundle args=new Bundle();
-		args.putParcelable("instance", Parcels.wrap(instance));
-		Nav.go(getActivity(), InstanceRulesFragment.class, args);
-	}
-
-//	private String getEmojiForCategory(String category){
-//		return switch(category){
-//			case "all" -> "💬";
-//			case "academia" -> "📚";
-//			case "activism" -> "✊";
-//			case "food" -> "🍕";
-//			case "furry" -> "🦁";
-//			case "games" -> "🕹";
-//			case "general" -> "🐘";
-//			case "journalism" -> "📰";
-//			case "lgbt" -> "🏳️‍🌈";
-//			case "regional" -> "📍";
-//			case "art" -> "🎨";
-//			case "music" -> "🎼";
-//			case "tech" -> "📱";
-//			default -> "❓";
-//		};
-//	}
-
-	private int getEmojiForCategory(String category){
-		return switch(category){
-			case "all" -> R.drawable.ic_category_all;
-			case "academia" -> R.drawable.ic_category_academia;
-			case "activism" -> R.drawable.ic_category_activism;
-			case "food" -> R.drawable.ic_category_food;
-			case "furry" -> R.drawable.ic_category_furry;
-			case "games" -> R.drawable.ic_category_games;
-			case "general" -> R.drawable.ic_category_general;
-			case "journalism" -> R.drawable.ic_category_journalism;
-			case "lgbt" -> R.drawable.ic_category_lgbt;
-			case "regional" -> R.drawable.ic_category_regional;
-			case "art" -> R.drawable.ic_category_art;
-			case "music" -> R.drawable.ic_category_music;
-			case "tech" -> R.drawable.ic_category_tech;
-			default -> R.drawable.ic_category_unknown;
-		};
-	}
-
-	private int getTitleForCategory(String category){
-		return switch(category){
-			case "all" -> R.string.category_all;
-			case "academia" -> R.string.category_academia;
-			case "activism" -> R.string.category_activism;
-			case "food" -> R.string.category_food;
-			case "furry" -> R.string.category_furry;
-			case "games" -> R.string.category_games;
-			case "general" -> R.string.category_general;
-			case "journalism" -> R.string.category_journalism;
-			case "lgbt" -> R.string.category_lgbt;
-			case "regional" -> R.string.category_regional;
-			case "art" -> R.string.category_art;
-			case "music" -> R.string.category_music;
-			case "tech" -> R.string.category_tech;
-			default -> 0;
-		};
-	}
-
-	@Override
-	protected void updateFilteredList(){
-		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
-		filteredData.clear();
-		if(searchQueryMode){
-			if(!TextUtils.isEmpty(currentSearchQuery)){
-				for(CatalogInstance instance:data){
-					if(instance.domain.contains(currentSearchQuery)){
-						filteredData.add(instance);
-					}
-				}
-			}
-		}else{
-			for(CatalogInstance instance:data){
-				if(categoryChoice==null || categoryChoice.matches(instance.category)){
-					if(chosenRegion==null || instance.region==chosenRegion){
-						boolean signupSpeedMatches=switch(currentSignupSpeedFilter){
-							case ANY -> true;
-							case INSTANT -> !instance.approvalRequired;
-							case REVIEWED -> instance.approvalRequired;
-						};
-						if(signupSpeedMatches){
-							if(currentLanguage==null || instance.languages.contains(currentLanguage)){
-								filteredData.add(instance);
-							}
-						}
-					}
-				}
-			}
-		}
-		DiffUtil.calculateDiff(new DiffUtil.Callback(){
-			@Override
-			public int getOldListSize(){
-				return prevData.size();
-			}
-
-			@Override
-			public int getNewListSize(){
-				return filteredData.size();
-			}
-
-			@Override
-			public boolean areItemsTheSame(int oldItemPosition, int newItemPosition){
-				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
-			}
-
-			@Override
-			public boolean areContentsTheSame(int oldItemPosition, int newItemPosition){
-				return prevData.get(oldItemPosition)==filteredData.get(newItemPosition);
-			}
-		}).dispatchUpdatesTo(adapter);
-	}
-
-	@Override
-	public void onApplyWindowInsets(WindowInsets insets){
-		topBar.setPadding(0, insets.getSystemWindowInsetTop(), 0, 0);
-		super.onApplyWindowInsets(insets.replaceSystemWindowInsets(insets.getSystemWindowInsetLeft(), 0, insets.getSystemWindowInsetRight(), insets.getSystemWindowInsetBottom()));
-	}
-
-	@Override
-	public boolean onBackPressed(){
-		if(searchQueryMode){
-			setSearchQueryMode(false);
-			return true;
-		}
-		return false;
-	}
-
-	private void setSearchQueryMode(boolean enabled){
-		searchQueryMode=enabled;
-		RelativeLayout.LayoutParams lp=(RelativeLayout.LayoutParams) searchEdit.getLayoutParams();
-		if(searchQueryMode){
-			filtersScroll.setVisibility(View.GONE);
-			lp.removeRule(RelativeLayout.END_OF);
-			backBtn.setScaleX(0.83333333f);
-			backBtn.setScaleY(0.83333333f);
-			backBtn.setTranslationX(V.dp(8));
-			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
-		}else{
-			filtersScroll.setVisibility(View.VISIBLE);
-			focusThing.requestFocus();
-			searchEdit.setText("");
-			lp.addRule(RelativeLayout.END_OF, R.id.btn_back);
-			getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);
-			backBtn.setScaleX(1);
-			backBtn.setScaleY(1);
-			backBtn.setTranslationX(0);
-			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), R.attr.colorM3OnSurfaceVariant)));
-		}
-		updateFilteredList();
-	}
-
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceCatalogSignupFragment.InstanceViewHolder> implements ImageLoaderRecyclerAdapter{
-		public InstancesAdapter(){
-			super(imgLoader);
-		}
-
-		@NonNull
-		@Override
-		public InstanceCatalogSignupFragment.InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new InstanceCatalogSignupFragment.InstanceViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(InstanceCatalogSignupFragment.InstanceViewHolder holder, int position){
-			holder.bind(filteredData.get(position));
-			super.onBindViewHolder(holder, position);
-		}
-
-		@Override
-		public int getItemCount(){
-			return filteredData.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return -1;
-		}
-
-		@Override
-		public int getImageCountForItem(int position){
-			return filteredData.get(position).thumbnailRequest!=null ? 1 : 0;
-		}
-
-		@Override
-		public ImageLoaderRequest getImageRequest(int position, int image){
-			return filteredData.get(position).thumbnailRequest;
-		}
-	}
-
-	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.DisableableClickable, ImageLoaderViewHolder{
-		private final TextView title, description;
-		private final RadioButton radioButton;
-		private final ImageView thumbnail;
-		private boolean enabled;
-
-		public InstanceViewHolder(){
-			super(getActivity(), R.layout.item_instance_catalog, list);
-			title=findViewById(R.id.title);
-			description=findViewById(R.id.description);
-			radioButton=findViewById(R.id.radiobtn);
-			thumbnail=findViewById(R.id.image);
-		}
-
-		@Override
-		public void onBind(CatalogInstance item){
-			title.setText(item.normalizedDomain);
-			radioButton.setChecked(chosenInstance==item);
-			if(item.thumbnailRequest==null)
-				thumbnail.setImageDrawable(null);
-			Instance realInstance=instancesCache.get(item.normalizedDomain);
-			float alpha;
-			if(realInstance!=null && !realInstance.registrations){
-				alpha=0.38f;
-				description.setText(R.string.not_accepting_new_members);
-				enabled=false;
-			}else{
-				alpha=1f;
-				description.setText(item.description);
-				enabled=true;
-			}
-			title.setAlpha(alpha);
-			description.setAlpha(alpha);
-			radioButton.setAlpha(alpha);
-			thumbnail.setAlpha(alpha);
-		}
-
-		@Override
-		public void onClick(){
-			if(chosenInstance==item)
-				return;
-			if(chosenInstance!=null){
-				int idx=filteredData.indexOf(chosenInstance);
-				if(idx!=-1){
-					boolean found=false;
-					for(int i=0;i<list.getChildCount();i++){
-						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
-						if(holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx && holder instanceof InstanceViewHolder ivh){
-							ivh.radioButton.setChecked(false);
-							found=true;
-							break;
-						}
-					}
-					if(!found)
-						adapter.notifyItemChanged(idx);
-				}
-			}
-			radioButton.setChecked(true);
-			if(chosenInstance==null)
-				nextButton.setEnabled(true);
-			chosenInstance=item;
-			loadInstanceInfo(chosenInstance.domain, false);
-		}
-
-		@Override
-		public void setImage(int index, Drawable image){
-			thumbnail.setImageDrawable(image);
-		}
-
-		@Override
-		public void clearImage(int index){
-			setImage(index, null);
-		}
-
-		@Override
-		public boolean isEnabled(){
-			return enabled;
-		}
-	}
-
-	private enum SignupSpeedFilter{
-		ANY,
-		INSTANT,
-		REVIEWED
-	}
-
-	private enum CategoryChoice{
-		GENERAL,
-		SPECIAL;
-
-		public boolean matches(String category){
-			boolean isGeneral=(category==null || "general".equals(category));
-			return (this==GENERAL)==isGeneral;
-		}
-	}
-}

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

@@ -1,263 +0,0 @@
-package org.joinmastodon.android.fragments.onboarding;
-
-import android.graphics.Canvas;
-import android.graphics.Outline;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewOutlineProvider;
-import android.widget.ImageButton;
-import android.widget.RadioButton;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.catalog.GetCatalogInstances;
-import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.model.Instance;
-import org.joinmastodon.android.model.catalog.CatalogInstance;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
-import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
-import me.grishka.appkit.utils.V;
-import me.grishka.appkit.views.UsableRecyclerView;
-
-public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
-	private View headerView;
-	private boolean loadedAutocomplete;
-	private ImageButton clearBtn;
-
-	public InstanceChooserLoginFragment(){
-		super(R.layout.fragment_login, 10);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState){
-		super.onCreate(savedInstanceState);
-		dataLoaded();
-		setTitle(R.string.login_title);
-		if(!loadedAutocomplete){
-			loadAutocompleteServers();
-		}
-	}
-
-	@Override
-	protected void proceedWithAuthOrSignup(Instance instance){
-		AccountSessionManager.getInstance().authenticate(getActivity(), instance);
-	}
-
-	@Override
-	protected void updateFilteredList(){
-		ArrayList<CatalogInstance> prevData=new ArrayList<>(filteredData);
-		filteredData.clear();
-		if(currentSearchQuery.length()>0){
-			boolean foundExactMatch=false;
-			for(CatalogInstance inst:data){
-				if(inst.normalizedDomain.contains(currentSearchQuery)){
-					filteredData.add(inst);
-					if(inst.normalizedDomain.equals(currentSearchQuery))
-						foundExactMatch=true;
-				}
-			}
-			if(!foundExactMatch)
-				filteredData.add(0, fakeInstance);
-		}
-		UiUtils.updateList(prevData, filteredData, list, adapter, Objects::equals);
-		for(int i=0;i<list.getChildCount();i++){
-			list.getChildAt(i).invalidateOutline();
-		}
-	}
-
-	@Override
-	protected void doLoadData(int offset, int count){
-
-	}
-
-	private void loadAutocompleteServers(){
-		loadedAutocomplete=true;
-		new GetCatalogInstances(null, null)
-				.setCallback(new Callback<>(){
-					@Override
-					public void onSuccess(List<CatalogInstance> result){
-						data.clear();
-						data.addAll(sortInstances(result));
-					}
-
-					@Override
-					public void onError(ErrorResponse error){
-
-					}
-				})
-				.execNoAuth("");
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		Toolbar toolbar=getToolbar();
-		toolbar.setElevation(0);
-		toolbar.setBackground(null);
-	}
-
-	@Override
-	protected RecyclerView.Adapter getAdapter(){
-		headerView=getActivity().getLayoutInflater().inflate(R.layout.header_onboarding_login, list, false);
-		clearBtn=headerView.findViewById(R.id.search_clear);
-		searchEdit=headerView.findViewById(R.id.search_edit);
-		searchEdit.setOnEditorActionListener(this::onSearchEnterPressed);
-		searchEdit.addTextChangedListener(new TextWatcher(){
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after){
-
-			}
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count){
-				searchEdit.removeCallbacks(searchDebouncer);
-				searchEdit.postDelayed(searchDebouncer, 300);
-
-				if(s.length()>0){
-					fakeInstance.domain=fakeInstance.normalizedDomain=s.toString();
-					fakeInstance.description=getString(R.string.loading_instance);
-					if(filteredData.size()>0 && filteredData.get(0)==fakeInstance){
-						if(list.findViewHolderForAdapterPosition(1) instanceof InstanceViewHolder ivh){
-							ivh.rebind();
-						}
-					}
-					if(filteredData.isEmpty()){
-						filteredData.add(fakeInstance);
-						adapter.notifyItemInserted(0);
-					}
-					clearBtn.setVisibility(View.VISIBLE);
-				}else{
-					clearBtn.setVisibility(View.GONE);
-				}
-			}
-
-			@Override
-			public void afterTextChanged(Editable s){
-			}
-		});
-		clearBtn.setOnClickListener(v->searchEdit.setText(""));
-
-		mergeAdapter=new MergeRecyclerAdapter();
-		mergeAdapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
-		mergeAdapter.addAdapter(adapter=new InstancesAdapter());
-		return mergeAdapter;
-	}
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState){
-		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-
-		list.addItemDecoration(new RecyclerView.ItemDecoration(){
-			@Override
-			public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state){
-				if(parent.getChildViewHolder(view) instanceof InstanceViewHolder){
-					outRect.left=outRect.right=V.dp(16);
-				}
-			}
-		});
-		((UsableRecyclerView)list).setDrawSelectorOnTop(true);
-	}
-
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
-		public InstancesAdapter(){
-			super(imgLoader);
-		}
-
-		@NonNull
-		@Override
-		public InstanceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			return new InstanceViewHolder();
-		}
-
-		@Override
-		public void onBindViewHolder(InstanceViewHolder holder, int position){
-			holder.bind(filteredData.get(position));
-			super.onBindViewHolder(holder, position);
-		}
-
-		@Override
-		public int getItemCount(){
-			return filteredData.size();
-		}
-
-		@Override
-		public int getItemViewType(int position){
-			return -1;
-		}
-	}
-
-	private class InstanceViewHolder extends BindableViewHolder<CatalogInstance> implements UsableRecyclerView.Clickable{
-		private final TextView title, description;
-		private final RadioButton radioButton;
-
-		public InstanceViewHolder(){
-			super(getActivity(), R.layout.item_instance_login, list);
-			title=findViewById(R.id.title);
-			description=findViewById(R.id.description);
-			radioButton=findViewById(R.id.radiobtn);
-			radioButton.setMinWidth(0);
-			radioButton.setMinHeight(0);
-
-			itemView.setOutlineProvider(new ViewOutlineProvider(){
-				@Override
-				public void getOutline(View view, Outline outline){
-					outline.setRoundRect(0, getAbsoluteAdapterPosition()==1 ? 0 : V.dp(-4), view.getWidth(), view.getHeight()+(getAbsoluteAdapterPosition()==filteredData.size() ? 0 : V.dp(4)), V.dp(4));
-				}
-			});
-			itemView.setClipToOutline(true);
-		}
-
-		@Override
-		public void onBind(CatalogInstance item){
-			title.setText(item.normalizedDomain);
-			description.setText(item.description);
-			radioButton.setChecked(chosenInstance==item);
-		}
-
-		@Override
-		public void onClick(){
-			if(chosenInstance==item)
-				return;
-			if(chosenInstance!=null){
-				int idx=filteredData.indexOf(chosenInstance);
-				if(idx!=-1){
-					boolean found=false;
-					for(int i=0;i<list.getChildCount();i++){
-						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
-						if(holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx && holder instanceof InstanceViewHolder ivh){
-							ivh.radioButton.setChecked(false);
-							found=true;
-							break;
-						}
-					}
-					if(!found)
-						adapter.notifyItemChanged(idx);
-				}
-			}
-			radioButton.setChecked(true);
-			if(chosenInstance==null)
-				nextButton.setEnabled(true);
-			chosenInstance=item;
-			loadInstanceInfo(chosenInstance.domain, false);
-		}
-	}
-}

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

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments.onboarding;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,14 +22,14 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.fragments.ToolbarFragment;
+import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class InstanceRulesFragment extends ToolbarFragment{
+public class InstanceRulesFragment extends AppKitFragment{
 	private UsableRecyclerView list;
 	private MergeRecyclerAdapter adapter;
 	private Button btn;
@@ -48,28 +47,31 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		super.onAttach(activity);
 		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
-		setTitle(R.string.instance_rules_title);
 	}
 
 	@Override
-	public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_rules, container, false);
 
 		list=view.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		View headerView=inflater.inflate(R.layout.item_list_header_simple, list, false);
+		View headerView=inflater.inflate(R.layout.item_list_header, list, false);
-		TextView text=headerView.findViewById(R.id.text);
+		TextView title=headerView.findViewById(R.id.title);
-		text.setText(getString(R.string.instance_rules_subtitle, instance.uri));
+		TextView subtitle=headerView.findViewById(R.id.subtitle);
+		headerView.findViewById(R.id.step_counter).setVisibility(View.GONE);
+		title.setText(R.string.instance_rules_title);
+		subtitle.setText(getString(R.string.instance_rules_subtitle, instance.uri));
 
 		adapter=new MergeRecyclerAdapter();
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 16, 16, DividerItemDecoration.NOT_FIRST));
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 
 		return view;
 	}
@@ -77,15 +79,7 @@ public class InstanceRulesFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		getToolbar().setBackground(null);
-		getToolbar().setElevation(0);
 	}
 
 	protected void onButtonClick(){
@@ -125,22 +119,23 @@ public class InstanceRulesFragment extends ToolbarFragment{
 	}
 
 	private class ItemViewHolder extends BindableViewHolder<Instance.Rule>{
-		private final TextView text, number;
+		private final TextView title, subtitle;
+		private final ImageView checkbox;
 
 		public ItemViewHolder(){
-			super(getActivity(), R.layout.item_server_rule, list);
+			super(getActivity(), R.layout.item_report_choice, list);
-			text=findViewById(R.id.text);
+			title=findViewById(R.id.title);
-			number=findViewById(R.id.number);
+			subtitle=findViewById(R.id.subtitle);
+			checkbox=findViewById(R.id.checkbox);
+			subtitle.setVisibility(View.GONE);
 		}
 
-		@SuppressLint("DefaultLocale")
 		@Override
 		public void onBind(Instance.Rule item){
 			if(item.parsedText==null){
 				item.parsedText=HtmlParser.parseLinks(item.text);
 			}
-			text.setText(item.parsedText);
+			title.setText(item.parsedText);
-			number.setText(String.format("%d", getAbsoluteAdapterPosition()));
 		}
 	}
 }

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

@@ -25,15 +25,14 @@ import org.joinmastodon.android.api.MastodonDetailedErrorResponse;
 import org.joinmastodon.android.api.requests.accounts.RegisterAccount;
 import org.joinmastodon.android.api.requests.oauth.CreateOAuthApp;
 import org.joinmastodon.android.api.requests.oauth.GetOauthToken;
-import org.joinmastodon.android.api.session.AccountActivationInfo;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Token;
+import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.FloatingHintEditTextLayout;
 import org.parceler.Parcels;
 
 import java.io.File;
@@ -50,28 +49,30 @@ import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
-import me.grishka.appkit.fragments.ToolbarFragment;
+import me.grishka.appkit.fragments.AppKitFragment;
 import me.grishka.appkit.imageloader.ViewImageLoader;
 import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
 import me.grishka.appkit.utils.V;
 
-public class SignupFragment extends ToolbarFragment{
+public class SignupFragment extends AppKitFragment{
 	private static final int AVATAR_RESULT=198;
 	private static final String TAG="SignupFragment";
 
 	private Instance instance;
 
-	private EditText displayName, username, email, password, passwordConfirm, reason;
+	private EditText displayName, username, email, password, reason;
-	private FloatingHintEditTextLayout displayNameWrap, usernameWrap, emailWrap, passwordWrap, passwordConfirmWrap, reasonWrap;
 	private TextView reasonExplain;
 	private Button btn;
 	private View buttonBar;
 	private TextWatcher buttonStateUpdater=new SimpleTextWatcher(e->updateButtonState());
+	private ImageView avatar;
 	private APIRequest currentBackgroundRequest;
 	private Application apiApplication;
 	private Token apiToken;
 	private boolean submitAfterGettingToken;
 	private ProgressDialog progressDialog;
+	private Uri avatarUri;
+	private File avatarFile;
 	private HashSet<EditText> errorFields=new HashSet<>();
 
 	@Override
@@ -80,30 +81,25 @@ public class SignupFragment extends ToolbarFragment{
 		setRetainInstance(true);
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
 		createAppAndGetToken();
-		setTitle(R.string.signup_title);
 	}
 
 	@Nullable
 	@Override
-	public View onCreateContentView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
 		View view=inflater.inflate(R.layout.fragment_onboarding_signup, container, false);
 
+		TextView title=view.findViewById(R.id.title);
 		TextView domain=view.findViewById(R.id.domain);
 		displayName=view.findViewById(R.id.display_name);
 		username=view.findViewById(R.id.username);
 		email=view.findViewById(R.id.email);
 		password=view.findViewById(R.id.password);
-		passwordConfirm=view.findViewById(R.id.password_confirm);
+		avatar=view.findViewById(R.id.avatar);
 		reason=view.findViewById(R.id.reason);
 		reasonExplain=view.findViewById(R.id.reason_explain);
+		View avaWrap=view.findViewById(R.id.ava_wrap);
 
-		displayNameWrap=view.findViewById(R.id.display_name_wrap);
+		title.setText(getString(R.string.signup_title, instance.uri));
-		usernameWrap=view.findViewById(R.id.username_wrap);
-		emailWrap=view.findViewById(R.id.email_wrap);
-		passwordWrap=view.findViewById(R.id.password_wrap);
-		passwordConfirmWrap=view.findViewById(R.id.password_confirm_wrap);
-		reasonWrap=view.findViewById(R.id.reason_wrap);
-
 		domain.setText('@'+instance.uri);
 
 		username.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
@@ -118,20 +114,23 @@ public class SignupFragment extends ToolbarFragment{
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
 		buttonBar=view.findViewById(R.id.button_bar);
+		view.findViewById(R.id.btn_back).setOnClickListener(v->Nav.finish(this));
 		updateButtonState();
 
 		username.addTextChangedListener(buttonStateUpdater);
 		email.addTextChangedListener(buttonStateUpdater);
 		password.addTextChangedListener(buttonStateUpdater);
-		passwordConfirm.addTextChangedListener(buttonStateUpdater);
 		reason.addTextChangedListener(buttonStateUpdater);
 
 		username.addTextChangedListener(new ErrorClearingListener(username));
 		email.addTextChangedListener(new ErrorClearingListener(email));
 		password.addTextChangedListener(new ErrorClearingListener(password));
-		passwordConfirm.addTextChangedListener(new ErrorClearingListener(passwordConfirm));
 		reason.addTextChangedListener(new ErrorClearingListener(reason));
 
+		avaWrap.setOutlineProvider(OutlineProviders.roundedRect(22));
+		avaWrap.setClipToOutline(true);
+		avaWrap.setOnClickListener(v->onAvatarClick());
+
 		if(!instance.approvalRequired){
 			reason.setVisibility(View.GONE);
 			reasonExplain.setVisibility(View.GONE);
@@ -143,23 +142,10 @@ public class SignupFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorBackgroundLight));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-	}
-
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		getToolbar().setBackground(null);
-		getToolbar().setElevation(0);
 	}
 
 	private void onButtonClick(){
-		if(!password.getText().toString().equals(passwordConfirm.getText().toString())){
-			passwordConfirm.setError(getString(R.string.signup_passwords_dont_match));
-			passwordConfirmWrap.setErrorState();
-			return;
-		}
 		showProgressDialog();
 		if(currentBackgroundRequest!=null){
 			submitAfterGettingToken=true;
@@ -174,8 +160,32 @@ public class SignupFragment extends ToolbarFragment{
 		}
 	}
 
+	private void copyAvatar(Runnable onDone){
+		// Need to copy the avatar from the content provider to somewhere accessible in case the app gets killed between signup and account activation
+		Activity activity=getActivity();
+		MastodonAPIController.runInBackground(()->{
+			String origName=UiUtils.getFileName(avatarUri);
+			avatarFile=new File(activity.getCacheDir(), System.currentTimeMillis()+origName.substring(origName.lastIndexOf('.')));
+			try(InputStream in=activity.getContentResolver().openInputStream(avatarUri);
+				FileOutputStream out=new FileOutputStream(avatarFile)){
+				byte[] buf=new byte[10240];
+				int read;
+				while((read=in.read(buf))>0){
+					out.write(buf, 0, read);
+				}
+			}catch(IOException x){
+				Log.w(TAG, "copyAvatar: error copying", x);
+			}
+			activity.runOnUiThread(onDone);
+		});
+	}
+
 	private void submit(){
-		actuallySubmit();
+		if(avatarUri!=null && (avatarFile==null || !avatarFile.exists())){
+			copyAvatar(this::actuallySubmit);
+		}else{
+			actuallySubmit();
+		}
 	}
 
 	private void actuallySubmit(){
@@ -194,7 +204,9 @@ public class SignupFragment extends ToolbarFragment{
 						fakeAccount.acct=fakeAccount.username=username;
 						fakeAccount.id="tmp"+System.currentTimeMillis();
 						fakeAccount.displayName=displayName.getText().toString();
-						AccountSessionManager.getInstance().addAccount(instance, result, fakeAccount, apiApplication, new AccountActivationInfo(email, System.currentTimeMillis()));
+						if(avatarFile!=null)
+							fakeAccount.avatar=avatarFile.getAbsolutePath();
+						AccountSessionManager.getInstance().addAccount(instance, result, fakeAccount, apiApplication, false);
 						Bundle args=new Bundle();
 						args.putString("account", AccountSessionManager.getInstance().getLastActiveAccountID());
 						Nav.goClearingStack(getActivity(), AccountActivationFragment.class, args);
@@ -213,7 +225,6 @@ public class SignupFragment extends ToolbarFragment{
 									continue;
 								}
 								field.setError(fieldErrors.get(fieldName).stream().map(err->err.description).collect(Collectors.joining("\n")));
-								getFieldWrapByName(fieldName).setErrorState();
 								errorFields.add(field);
 								if(first){
 									first=false;
@@ -241,16 +252,6 @@ public class SignupFragment extends ToolbarFragment{
 		};
 	}
 
-	private FloatingHintEditTextLayout getFieldWrapByName(String name){
-		return switch(name){
-			case "email" -> emailWrap;
-			case "username" -> usernameWrap;
-			case "password" -> passwordWrap;
-			case "reason" -> reasonWrap;
-			default -> null;
-		};
-	}
-
 	private void showProgressDialog(){
 		if(progressDialog==null){
 			progressDialog=new ProgressDialog(getActivity());
@@ -261,7 +262,7 @@ public class SignupFragment extends ToolbarFragment{
 	}
 
 	private void updateButtonState(){
-		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8 && passwordConfirm.length()>=8 && (!instance.approvalRequired || reason.length()>0));
+		btn.setEnabled(username.length()>0 && email.length()>0 && email.getText().toString().contains("@") && password.length()>=8 && (!instance.approvalRequired || reason.length()>0));
 	}
 
 	private void createAppAndGetToken(){
@@ -323,6 +324,20 @@ public class SignupFragment extends ToolbarFragment{
 		}
 	}
 
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data){
+		if(requestCode==AVATAR_RESULT && resultCode==Activity.RESULT_OK){
+			avatarUri=data.getData();
+			if(avatarFile!=null && avatarFile.exists())
+				avatarFile.delete();
+			ViewImageLoader.load(avatar, getResources().getDrawable(R.drawable.default_avatar), new UrlImageLoaderRequest(avatarUri, V.dp(100), V.dp(100)));
+		}
+	}
+
+	private void onAvatarClick(){
+		startActivityForResult(new Intent(Intent.ACTION_GET_CONTENT).setType("image/*").addCategory(Intent.CATEGORY_OPENABLE), AVATAR_RESULT);
+	}
+
 	private class ErrorClearingListener implements TextWatcher{
 		public final EditText editText;
 

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

@@ -237,7 +237,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false);
 		for(StatusDisplayItem item:items){
 			if(item instanceof ImageStatusDisplayItem isdi){
 				isdi.horizontalInset=V.dp(40+32);

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

@@ -82,8 +82,6 @@ public class Instance extends BaseModel{
 	// non-standard field in some Mastodon forks
 	public int maxTootChars;
 
-	public V2 v2;
-
 	@Override
 	public void postprocess() throws ObjectValidationException{
 		super.postprocess();
@@ -178,19 +176,4 @@ public class Instance extends BaseModel{
 		public int minExpiration;
 		public int maxExpiration;
 	}
-
-	@Parcel
-	public static class V2 extends BaseModel {
-		public V2.Configuration configuration;
-
-		@Parcel
-		public static class Configuration {
-			public TranslationConfiguration translation;
-		}
-
-		@Parcel
-		public static class TranslationConfiguration{
-			public boolean enabled;
-		}
-	}
 }

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

@@ -43,9 +43,7 @@ public class PushNotification extends BaseModel{
 		@SerializedName("follow")
 		FOLLOW(R.string.notification_type_follow),
 		@SerializedName("poll")
-		POLL(R.string.notification_type_poll),
+		POLL(R.string.notification_type_poll);
-		@SerializedName("status")
-		STATUS(R.string.sk_notification_type_status);
 
 		@StringRes
 		public final int localizedName;

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

@@ -43,11 +43,10 @@ public class PushSubscription extends BaseModel implements Cloneable{
 		public boolean reblog;
 		public boolean mention;
 		public boolean poll;
-		public boolean status;
 
 		public static Alerts ofAll(){
 			Alerts alerts=new Alerts();
-			alerts.follow=alerts.favourite=alerts.reblog=alerts.mention=alerts.poll=alerts.status=true;
+			alerts.follow=alerts.favourite=alerts.reblog=alerts.mention=alerts.poll=true;
 			return alerts;
 		}
 
@@ -59,7 +58,6 @@ public class PushSubscription extends BaseModel implements Cloneable{
 					", reblog="+reblog+
 					", mention="+mention+
 					", poll="+poll+
-					", status="+status+
 					'}';
 		}
 

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

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

mastodon/src/main/java/org/joinmastodon/android/model/catalog/CatalogInstance.java

@@ -1,10 +1,5 @@
 package org.joinmastodon.android.model.catalog;
 
-import android.graphics.Region;
-import android.text.TextUtils;
-
-import com.google.gson.annotations.SerializedName;
-
 import org.joinmastodon.android.api.AllFieldsAreRequired;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.model.BaseModel;
@@ -12,17 +7,13 @@ import org.joinmastodon.android.model.BaseModel;
 import java.net.IDN;
 import java.util.List;
 
-import me.grishka.appkit.imageloader.requests.UrlImageLoaderRequest;
-import me.grishka.appkit.utils.V;
-
 @AllFieldsAreRequired
 public class CatalogInstance extends BaseModel{
 	public String domain;
 	public String version;
 	public String description;
 	public List<String> languages;
-	@SerializedName("region")
+	public String region;
-	private String _region;
 	public List<String> categories;
 	public String proxiedThumbnail;
 	public int totalUsers;
@@ -31,9 +22,7 @@ public class CatalogInstance extends BaseModel{
 	public String language;
 	public String category;
 
-	public transient Region region;
 	public transient String normalizedDomain;
-	public transient UrlImageLoaderRequest thumbnailRequest;
 
 	@Override
 	public void postprocess() throws ObjectValidationException{
@@ -42,14 +31,6 @@ public class CatalogInstance extends BaseModel{
 			normalizedDomain=IDN.toUnicode(domain);
 		else
 			normalizedDomain=domain;
-		if(!TextUtils.isEmpty(_region)){
-			try{
-				region=Region.valueOf(_region.toUpperCase());
-			}catch(IllegalArgumentException ignore){}
-		}
-		if(!TextUtils.isEmpty(proxiedThumbnail)){
-			thumbnailRequest=new UrlImageLoaderRequest(proxiedThumbnail, 0, V.dp(56));
-		}
 	}
 
 	@Override
@@ -69,13 +50,4 @@ public class CatalogInstance extends BaseModel{
 				", category='"+category+'\''+
 				'}';
 	}
-
-	public enum Region{
-		EUROPE,
-		NORTH_AMERICA,
-		SOUTH_AMERICA,
-		AFRICA,
-		ASIA,
-		OCEANIA
-	}
 }

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

@@ -2,12 +2,14 @@ package org.joinmastodon.android.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -23,7 +25,8 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.SplashFragment;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -77,7 +80,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, CustomWelcomeFragment.class, null);
+			Nav.go(activity, SplashFragment.class, null);
 			dismiss();
 		}));
 
@@ -240,10 +243,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 
 		public WrappedAccount(AccountSession session){
 			this.session=session;
-			if(session.self.avatar!=null)
+			req=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? session.self.avatar : session.self.avatarStatic, V.dp(50), V.dp(50));
-				req=new UrlImageLoaderRequest(GlobalUserPreferences.playGifs ? session.self.avatar : session.self.avatarStatic, V.dp(50), V.dp(50));
-			else
-				req=null;
 		}
 	}
 }

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

@@ -28,7 +28,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -155,16 +154,11 @@ public class ComposeAutocompleteViewController{
 		}else if(mode==Mode.EMOJIS){
 			String _text=text.substring(1); // remove ':'
 			List<WrappedEmoji> oldList=emojis;
-			List<Emoji> allEmojis = AccountSessionManager.getInstance()
+			emojis=AccountSessionManager.getInstance()
 					.getCustomEmojis(AccountSessionManager.getInstance().getAccount(accountID).domain)
 					.stream()
 					.flatMap(ec->ec.emojis.stream())
-					.filter(e->e.visibleInPicker)
+					.filter(e->e.visibleInPicker && e.shortcode.startsWith(_text))
-					.collect(Collectors.toList());
-			List<Emoji> startsWithSearch = allEmojis.stream().filter(e -> e.shortcode.toLowerCase().startsWith(_text.toLowerCase())).collect(Collectors.toList());
-			emojis=Stream.concat(startsWithSearch.stream(), allEmojis.stream()
-					.filter(e -> !startsWithSearch.contains(e))
-					.filter(e -> e.shortcode.toLowerCase().contains(_text.toLowerCase())))
 					.map(WrappedEmoji::new)
 					.collect(Collectors.toList());
 			UiUtils.updateList(oldList, emojis, list, emojisAdapter, (e1, e2)->e1.emoji.shortcode.equals(e2.emoji.shortcode));

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

@@ -45,7 +45,7 @@ public class ImageDescriptionSheet extends BottomSheet{
 		}
 
 		TextView heading=new TextView(activity);
-		heading.setText(R.string.sk_image_description);
+		heading.setText(R.string.image_description);
 		heading.setAllCaps(true);
 		heading.setTypeface(null, Typeface.BOLD);
 		heading.setPadding(0, V.dp(24), 0, V.dp(8));

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

@@ -12,8 +12,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Account;
@@ -25,9 +23,7 @@ import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ProgressBarButton;
 
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -158,18 +154,10 @@ public class AccountCardStatusDisplayItem extends StatusDisplayItem{
 
 		private void onFollowRequestButtonClick(View v) {
 			itemView.setHasTransientState(true);
-			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), null, v == acceptButton, relationship, rel -> {
+			UiUtils.handleFollowRequest((Activity) v.getContext(), item.account, item.parentFragment.getAccountID(), item.notification.id , v == acceptButton, relationship, rel -> {
 				itemView.setHasTransientState(false);
 				item.parentFragment.putRelationship(item.account.id, rel);
-				RecyclerView.Adapter<? extends RecyclerView.ViewHolder> adapter = getBindingAdapter();
+				rebind();
-				if (!rel.requested && !rel.followedBy && adapter != null) {
-					int index = item.parentFragment.getDisplayItems().indexOf(item);
-					item.parentFragment.getDisplayItems().remove(index);
-					item.parentFragment.getDisplayItems().remove(index - 1);
-					adapter.notifyItemRangeRemoved(getLayoutPosition()-1, 2);
-				} else {
-					rebind();
-				}
 			});
 		}
 

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

@@ -98,7 +98,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 				case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
 				case UNLISTED -> R.drawable.ic_fluent_people_community_20_regular;
 				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
-				case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
+				case DIRECT -> R.drawable.ic_at_symbol;
 			});
 		}
 

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

@@ -4,13 +4,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -25,8 +21,10 @@ import org.joinmastodon.android.model.StatusPrivacy;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.parceler.Parcels;
 
+import java.text.DecimalFormat;
+
 import me.grishka.appkit.Nav;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
+import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.utils.V;
 
 public class FooterStatusDisplayItem extends StatusDisplayItem{
@@ -48,10 +46,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<FooterStatusDisplayItem>{
 		private final TextView reply, boost, favorite, bookmark;
 		private final ImageView share;
-		private static final Animation opacityOut, opacityIn;
-
-		private View touchingView = null;
-		private final Runnable longClickRunnable = () -> { if (touchingView != null) touchingView.performLongClick(); };
 
 		private final View.AccessibilityDelegate buttonAccessibilityDelegate=new View.AccessibilityDelegate(){
 			@Override
@@ -62,16 +56,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			}
 		};
 
-		static {
-			opacityOut = new AlphaAnimation(1, 0.55f);
-			opacityOut.setDuration(300);
-			opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
-			opacityOut.setFillAfter(true);
-			opacityIn = new AlphaAnimation(0.55f, 1);
-			opacityIn.setDuration(300);
-			opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
-		}
-
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_footer, parent);
 			reply=findViewById(R.id.reply);
@@ -90,22 +74,15 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			View favorite=findViewById(R.id.favorite_btn);
 			View share=findViewById(R.id.share_btn);
 			View bookmark=findViewById(R.id.bookmark_btn);
-			reply.setOnTouchListener(this::onButtonTouch);
 			reply.setOnClickListener(this::onReplyClick);
 			reply.setAccessibilityDelegate(buttonAccessibilityDelegate);
-			boost.setOnTouchListener(this::onButtonTouch);
 			boost.setOnClickListener(this::onBoostClick);
-			boost.setOnLongClickListener(this::onBoostLongClick);
 			boost.setAccessibilityDelegate(buttonAccessibilityDelegate);
-			favorite.setOnTouchListener(this::onButtonTouch);
 			favorite.setOnClickListener(this::onFavoriteClick);
 			favorite.setAccessibilityDelegate(buttonAccessibilityDelegate);
-			bookmark.setOnTouchListener(this::onButtonTouch);
 			bookmark.setOnClickListener(this::onBookmarkClick);
 			bookmark.setAccessibilityDelegate(buttonAccessibilityDelegate);
-			share.setOnTouchListener(this::onButtonTouch);
 			share.setOnClickListener(this::onShareClick);
-			share.setOnLongClickListener(this::onShareLongClick);
 			share.setAccessibilityDelegate(buttonAccessibilityDelegate);
 		}
 
@@ -131,28 +108,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			}
 		}
 
-		private boolean onButtonTouch(View v, MotionEvent event){
-			int action = event.getAction();
-			long eventDuration = event.getEventTime() - event.getDownTime();
-			if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
-				touchingView = null;
-				v.removeCallbacks(longClickRunnable);
-				v.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
-				if (action == MotionEvent.ACTION_UP && eventDuration < ViewConfiguration.getLongPressTimeout()) v.performClick();
-				else v.startAnimation(opacityIn);
-			} else if (action == MotionEvent.ACTION_DOWN) {
-				touchingView = v;
-				// 20dp to center in middle of icon, because: (icon width = 24dp) / 2 + (paddingStart = 8dp)
-				v.setPivotX(V.dp(20));
-				v.postDelayed(longClickRunnable, ViewConfiguration.getLongPressTimeout());
-				v.startAnimation(opacityOut);
-				v.animate().scaleX(0.85f).scaleY(0.85f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(75).start();
-			}
-			return true;
-		}
-
 		private void onReplyClick(View v){
-			v.startAnimation(opacityIn);
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
 			args.putParcelable("replyTo", Parcels.wrap(item.status));
@@ -160,53 +116,29 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onBoostClick(View v){
-			boost.setSelected(!item.status.reblogged);
+			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged);
-			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, r->{
+			boost.setSelected(item.status.reblogged);
-				v.startAnimation(opacityIn);
+			bindButton(boost, item.status.reblogsCount);
-				bindButton(boost, r.reblogsCount);
-			});
-		}
-
-		private boolean onBoostLongClick(View v){
-			v.setAlpha(1);
-			v.setScaleX(1);
-			v.setScaleY(1);
-			Bundle args=new Bundle();
-			args.putString("account", item.accountID);
-			args.putString("prefilledText", "\n\n" + item.status.url);
-			args.putInt("selectionStart", 0);
-			Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
-			return true;
 		}
 
 		private void onFavoriteClick(View v){
-			favorite.setSelected(!item.status.favourited);
+			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited);
-			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
+			favorite.setSelected(item.status.favourited);
-				v.startAnimation(opacityIn);
+			bindButton(favorite, item.status.favouritesCount);
-				bindButton(favorite, r.favouritesCount);
-			});
 		}
 
 		private void onBookmarkClick(View v){
-			bookmark.setSelected(!item.status.bookmarked);
+			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked);
-			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked, r->{
+			bookmark.setSelected(item.status.bookmarked);
-				v.startAnimation(opacityIn);
-			});
 		}
 
 		private void onShareClick(View v){
-			v.startAnimation(opacityIn);
 			Intent intent=new Intent(Intent.ACTION_SEND);
 			intent.setType("text/plain");
 			intent.putExtra(Intent.EXTRA_TEXT, item.status.url);
 			v.getContext().startActivity(Intent.createChooser(intent, v.getContext().getString(R.string.share_toot_title)));
 		}
 
-		private boolean onShareLongClick(View v){
-			UiUtils.copyText(v.getContext(), item.status.url);
-			return true;
-		}
-
 		private int descriptionForId(int id){
 			if(id==R.id.reply_btn)
 				return R.string.button_reply;
@@ -215,7 +147,7 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			if(id==R.id.favorite_btn)
 				return R.string.button_favorite;
 			if(id==R.id.bookmark_btn)
-				return R.string.add_bookmark;
+				return R.string.button_bookmark;
 			if(id==R.id.share_btn)
 				return R.string.button_share;
 			return 0;

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

@@ -19,8 +19,6 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
@@ -28,13 +26,11 @@ import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ComposeFragment;
-import org.joinmastodon.android.fragments.NotificationsListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.text.HtmlParser;
@@ -66,9 +62,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private boolean hasVisibilityToggle;
 	boolean needBottomPadding;
 	private String extraText;
-	private Notification notification;
 
-	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText, Notification notification){
+	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText){
 		super(parentID, parentFragment);
 		this.user=user;
 		this.createdAt=createdAt;
@@ -76,7 +71,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		this.accountID=accountID;
 		parsedName=new SpannableStringBuilder(user.displayName);
 		this.status=status;
-		this.notification=notification;
 		HtmlParser.parseCustomEmoji(parsedName, user.emojis);
 		emojiHelper.setText(parsedName);
 		if(status!=null){
@@ -113,7 +107,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView name, username, timestamp, extraText;
-		private final ImageView avatar, more, visibility, deleteNotification;
+		private final ImageView avatar, more, visibility;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -133,18 +127,12 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			visibility=findViewById(R.id.visibility);
-			deleteNotification=findViewById(R.id.delete_notification);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
 			avatar.setClipToOutline(true);
 			more.setOnClickListener(this::onMoreClick);
 			visibility.setOnClickListener(v->item.parentFragment.onVisibilityIconClick(this));
-			deleteNotification.setOnClickListener(v->UiUtils.confirmDeleteNotification(activity, item.parentFragment.getAccountID(), item.notification, ()->{
-				if (item.parentFragment instanceof NotificationsListFragment fragment) {
-					fragment.removeNotification(item.notification);
-				}
-			}));
 
 			optionsMenu=new PopupMenu(activity, more);
 			optionsMenu.inflate(R.menu.post);
@@ -238,7 +226,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			else
 				timestamp.setText(item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)));
 			visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE);
-			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if(item.hasVisibilityToggle){
 				visibility.setImageResource(item.status.spoilerRevealed ? R.drawable.ic_visibility_off : R.drawable.ic_visibility);
 				visibility.setContentDescription(item.parentFragment.getString(item.status.spoilerRevealed ? R.string.hide_content : R.string.reveal_content));

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

@@ -6,7 +6,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Poll;
@@ -45,7 +44,7 @@ public class PollFooterStatusDisplayItem extends StatusDisplayItem{
 				text+=" · "+item.parentFragment.getString(R.string.poll_closed);
 			}
 			this.text.setText(text);
-			button.setVisibility(item.poll.isExpired() || item.poll.voted || (!item.poll.multiple && !GlobalUserPreferences.voteButtonForSingleChoice) ? View.GONE : View.VISIBLE);
+			button.setVisibility(item.poll.isExpired() || item.poll.voted || !item.poll.multiple ? View.GONE : View.VISIBLE);
 			button.setEnabled(item.poll.selectedOptions!=null && !item.poll.selectedOptions.isEmpty());
 		}
 	}

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

@@ -5,7 +5,6 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.joinmastodon.android.R;
@@ -61,8 +60,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<PollOptionStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView text, percent;
-		private final View button;
+		private final View icon, button;
-		private final ImageView icon;
 		private final Drawable progressBg;
 
 		public Holder(Activity activity, ViewGroup parent){
@@ -78,23 +76,17 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 		@Override
 		public void onBind(PollOptionStatusDisplayItem item){
 			text.setText(item.text);
+			icon.setVisibility(item.showResults ? View.GONE : View.VISIBLE);
 			percent.setVisibility(item.showResults ? View.VISIBLE : View.GONE);
 			itemView.setClickable(!item.showResults);
-			icon.setImageDrawable(itemView.getContext().getDrawable(item.poll.multiple ?
-					item.showResults ? R.drawable.ic_poll_checkbox_regular_selector : R.drawable.ic_poll_checkbox_filled_selector :
-					item.showResults ? R.drawable.ic_poll_option_button : R.drawable.ic_fluent_radio_button_24_selector
-			));
 			if(item.showResults){
 				progressBg.setLevel(Math.round(10000f*item.votesFraction));
 				button.setBackground(progressBg);
 				itemView.setSelected(item.isMostVoted);
-				icon.setSelected(item.poll.ownVotes.contains(item.poll.options.indexOf(item.option)));
-				icon.setVisibility(item.poll.voted && item.poll.ownVotes.isEmpty() ? View.GONE : View.VISIBLE);
 				percent.setText(String.format(Locale.getDefault(), "%d%%", Math.round(item.votesFraction*100f)));
 			}else{
 				itemView.setSelected(item.poll.selectedOptions!=null && item.poll.selectedOptions.contains(item.option));
 				button.setBackgroundResource(R.drawable.bg_poll_option_clickable);
-				icon.setVisibility(View.VISIBLE);
 			}
 		}
 

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

@@ -1,12 +1,9 @@
 package org.joinmastodon.android.ui.displayitems;
 
-import static org.joinmastodon.android.MastodonApp.context;
-
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.SpannableStringBuilder;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -41,8 +38,6 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 		emojiHelper.setText(ssb);
 		this.icon=icon;
 		this.handleClick=handleClick;
-		TypedValue outValue = new TypedValue();
-		context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
 	}
 
 	@Override
@@ -72,8 +67,6 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
 			text.setText(item.text);
 			text.setCompoundDrawablesRelativeWithIntrinsicBounds(item.icon, 0, 0, 0);
 			if(item.handleClick!=null) text.setOnClickListener(item.handleClick);
-			text.setEnabled(!item.inset);
-			text.setClickable(!item.inset);
 			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.N)
 				UiUtils.fixCompoundDrawableTintOnAndroid6(text);
 		}

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

@@ -14,7 +14,6 @@ import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Poll;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
@@ -74,7 +73,7 @@ public abstract class StatusDisplayItem{
 		};
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
@@ -93,7 +92,7 @@ public abstract class StatusDisplayItem{
 			}));
 		}
 		HeaderStatusDisplayItem header;
-		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, notification));
+		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null));
 		if(!TextUtils.isEmpty(statusForContent.content))
 			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent));
 		else

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

@@ -9,31 +9,19 @@ import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.Button;
 import android.widget.TextView;
 
-import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.statuses.TranslateStatus;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
-import org.joinmastodon.android.model.StatusPrivacy;
-import org.joinmastodon.android.model.TranslatedStatus;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.LinkedTextView;
 
-import me.grishka.appkit.api.Callback;
-import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.MovieDrawable;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class TextStatusDisplayItem extends StatusDisplayItem{
@@ -42,9 +30,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
-	public boolean translated = false;
-	public TranslatedStatus translation = null;
-	private AccountSession session;
 
 	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status){
 		super(parentID, parentFragment);
@@ -56,7 +41,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			spoilerEmojiHelper=new CustomEmojiHelper();
 			spoilerEmojiHelper.setText(parsedSpoilerText);
 		}
-		session = AccountSessionManager.getInstance().getAccount(parentFragment.getAccountID());
 	}
 
 	@Override
@@ -81,10 +65,9 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	public static class Holder extends StatusDisplayItem.Holder<TextStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final LinkedTextView text;
 		private final LinearLayout spoilerHeader;
-		private final TextView spoilerTitle, spoilerTitleInline, translateInfo;
+		private final TextView spoilerTitle, spoilerTitleInline;
-		private final View spoilerOverlay, borderTop, borderBottom, textWrap, translateWrap, translateProgress;
+		private final View spoilerOverlay, borderTop, borderBottom;
-		private final int backgroundColor, borderColor;
+		private final Drawable backgroundColor, borderColor;
-		private final Button translateButton;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
@@ -95,90 +78,47 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			spoilerOverlay=findViewById(R.id.spoiler_overlay);
 			borderTop=findViewById(R.id.border_top);
 			borderBottom=findViewById(R.id.border_bottom);
-			textWrap=findViewById(R.id.text_wrap);
-			translateWrap=findViewById(R.id.translate_wrap);
-			translateButton=findViewById(R.id.translate_btn);
-			translateInfo=findViewById(R.id.translate_info);
-			translateProgress=findViewById(R.id.translate_progress);
 			itemView.setOnClickListener(v->item.parentFragment.onRevealSpoilerClick(this));
-			backgroundColor=UiUtils.getThemeColor(activity, R.attr.colorBackgroundLight);
+
-			borderColor=UiUtils.getThemeColor(activity, R.attr.colorPollVoted);
+			TypedValue outValue=new TypedValue();
+			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLight, outValue, true);
+			backgroundColor=activity.getDrawable(outValue.resourceId);
+//			activity.getTheme().resolveAttribute(R.attr.colorBackgroundLightest, outValue, true);
+//			backgroundColorInset=activity.getDrawable(outValue.resourceId);
+			activity.getTheme().resolveAttribute(R.attr.colorPollVoted, outValue, true);
+			borderColor=activity.getDrawable(outValue.resourceId);
 		}
 
 		@Override
 		public void onBind(TextStatusDisplayItem item){
-			text.setText(item.translated
+			text.setText(item.text);
-							? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
-							: item.text);
 			text.setTextIsSelectable(item.textSelectable);
 			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
-			spoilerTitleInline.setBackgroundColor(item.inset ? 0 : backgroundColor);
+			spoilerTitleInline.setBackground(item.inset ? null : backgroundColor);
 			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
-			borderTop.setBackgroundColor(item.inset ? 0 : borderColor);
+			borderTop.setBackground(item.inset ? null : borderColor);
-			borderBottom.setBackgroundColor(item.inset ? 0 : borderColor);
+			borderBottom.setBackground(item.inset ? null : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
 				spoilerTitleInline.setText(item.parsedSpoilerText);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
 					spoilerHeader.setVisibility(View.VISIBLE);
-					textWrap.setVisibility(View.VISIBLE);
+					text.setVisibility(View.VISIBLE);
 					itemView.setClickable(false);
 				}else{
 					spoilerOverlay.setVisibility(View.VISIBLE);
 					spoilerHeader.setVisibility(View.GONE);
-					textWrap.setVisibility(View.GONE);
+					text.setVisibility(View.GONE);
 					itemView.setClickable(true);
 				}
 			}else{
 				spoilerOverlay.setVisibility(View.GONE);
 				spoilerHeader.setVisibility(View.GONE);
-				textWrap.setVisibility(View.VISIBLE);
+				text.setVisibility(View.VISIBLE);
 				itemView.setClickable(false);
 			}
-
-			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
-			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
-
-			translateWrap.setVisibility(
-					(!GlobalUserPreferences.translateButtonOpenedOnly || item.textSelectable) &&
-					translateEnabled &&
-					!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&
-					item.status.language != null &&
-					(item.session.preferences == null || !item.status.language.equalsIgnoreCase(item.session.preferences.postingDefaultLanguage))
-					? View.VISIBLE : View.GONE);
-			translateButton.setText(item.translated ? R.string.sk_translate_show_original : R.string.sk_translate_post);
-			translateInfo.setText(item.translated ? itemView.getResources().getString(R.string.sk_translated_using, item.translation.provider) : "");
-			translateButton.setOnClickListener(v->{
-				if (item.translation == null) {
-					translateProgress.setVisibility(View.VISIBLE);
-					translateButton.setClickable(false);
-					translateButton.animate().alpha(0.5f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(150).start();
-					new TranslateStatus(item.status.id).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(TranslatedStatus translatedStatus) {
-							item.translation = translatedStatus;
-							item.translated = true;
-							translateProgress.setVisibility(View.GONE);
-							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
-							rebind();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							translateProgress.setVisibility(View.GONE);
-							translateButton.setClickable(true);
-							translateButton.animate().alpha(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
-							error.showToast(itemView.getContext());
-						}
-					}).exec(item.parentFragment.getAccountID());
-				} else {
-					item.translated = !item.translated;
-					rebind();
-				}
-			});
 		}
 
 		@Override

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java

@@ -178,7 +178,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
 		imageDescriptionButton = toolbar.getMenu()
-				.add(R.string.sk_image_description)
+				.add(R.string.image_description)
 				.setIcon(R.drawable.ic_fluent_image_alt_text_24_regular)
 				.setVisible(attachments.get(pager.getCurrentItem()).description != null
 						&& !attachments.get(pager.getCurrentItem()).description.isEmpty())

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

@@ -1,29 +1,12 @@
 package org.joinmastodon.android.ui.text;
 
-import android.graphics.Typeface;
-import android.graphics.fonts.FontFamily;
-import android.graphics.fonts.FontStyle;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.BulletSpan;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.LeadingMarginSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.StrikethroughSpan;
-import android.text.style.StyleSpan;
-import android.text.style.SubscriptSpan;
-import android.text.style.SuperscriptSpan;
-import android.text.style.TypefaceSpan;
-import android.text.style.UnderlineSpan;
-import android.util.TypedValue;
 import android.widget.TextView;
 
 import com.twitter.twittertext.Regex;
 
-import org.joinmastodon.android.MastodonApp;
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Mention;
@@ -32,11 +15,11 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
+import org.jsoup.safety.Cleaner;
 import org.jsoup.safety.Safelist;
 import org.jsoup.select.NodeVisitor;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -46,8 +29,6 @@ import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 
-import me.grishka.appkit.utils.V;
-
 public class HtmlParser{
 	private static final String TAG="HtmlParser";
 	private static final String VALID_URL_PATTERN_STRING =
@@ -86,17 +67,11 @@ public class HtmlParser{
 			public Object span;
 			public int start;
 			public Element element;
-			public boolean more;
 
 			public SpanInfo(Object span, int start, Element element){
-				this(span, start, element, false);
-			}
-
-			public SpanInfo(Object span, int start, Element element, boolean more){
 				this.span=span;
 				this.start=start;
 				this.element=element;
-				this.more=more;
 			}
 		}
 
@@ -111,7 +86,7 @@ public class HtmlParser{
 			@Override
 			public void head(@NonNull Node node, int depth){
 				if(node instanceof TextNode textNode){
-					ssb.append(textNode.getWholeText());
+					ssb.append(textNode.text());
 				}else if(node instanceof Element el){
 					switch(el.nodeName()){
 						case "a" -> {
@@ -144,59 +119,24 @@ public class HtmlParser{
 								openSpans.add(new SpanInfo(new InvisibleSpan(), ssb.length(), el));
 							}
 						}
-						case "li" -> openSpans.add(new SpanInfo(new BulletSpan(V.dp(8)), ssb.length(), el));
-						case "em", "i" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.ITALIC), ssb.length(), el));
-						case "h1", "h2", "h3", "h4", "h5", "h6" -> {
-							// increase line height above heading (multiplying the margin)
-							if (node.previousSibling()!=null) ssb.setSpan(new RelativeSizeSpan(2), ssb.length() - 1, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-							if (!node.nodeName().equals("h1")) {
-								openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
-							}
-							openSpans.add(new SpanInfo(new RelativeSizeSpan(switch(node.nodeName()) {
-								case "h1" -> 1.5f;
-								case "h2" -> 1.25f;
-								case "h3" -> 1.125f;
-								default -> 1;
-							}), ssb.length(), el, !node.nodeName().equals("h1")));
-						}
-						case "strong", "b" -> openSpans.add(new SpanInfo(new StyleSpan(Typeface.BOLD), ssb.length(), el));
-						case "u" -> openSpans.add(new SpanInfo(new UnderlineSpan(), ssb.length(), el));
-						case "s", "del" -> openSpans.add(new SpanInfo(new StrikethroughSpan(), ssb.length(), el));
-						case "sub", "sup" -> {
-							openSpans.add(new SpanInfo(node.nodeName().equals("sub") ? new SubscriptSpan() : new SuperscriptSpan(), ssb.length(), el));
-							openSpans.add(new SpanInfo(new RelativeSizeSpan(0.8f), ssb.length(), el, true));
-						}
-						case "code", "pre" -> openSpans.add(new SpanInfo(new TypefaceSpan("monospace"), ssb.length(), el));
-						case "blockquote" -> openSpans.add(new SpanInfo(new LeadingMarginSpan.Standard(V.dp(10)), ssb.length(), el));
 					}
 				}
 			}
 
-			final static List<String> blockElements = Arrays.asList("p", "ul", "ol", "blockquote", "h1", "h2", "h3", "h4", "h5", "h6");
-
 			@Override
 			public void tail(@NonNull Node node, int depth){
 				if(node instanceof Element el){
-					processOpenSpan(el);
 					if("span".equals(el.nodeName()) && el.hasClass("ellipsis")){
 						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-					}else if(blockElements.contains(el.nodeName()) && node.nextSibling()!=null){
+					}else if("p".equals(el.nodeName())){
-						ssb.append("\n"); // line end
+						if(node.nextSibling()!=null)
-						ssb.append("\n", new RelativeSizeSpan(0.65f), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); // margin after block
+							ssb.append("\n\n");
-					}
+					}else if(!openSpans.isEmpty()){
-				}
+						SpanInfo si=openSpans.get(openSpans.size()-1);
-			}
+						if(si.element==el){
-
+							ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-			private void processOpenSpan(Element el) {
+							openSpans.remove(openSpans.size()-1);
-				if(!openSpans.isEmpty()){
+						}
-					SpanInfo si=openSpans.get(openSpans.size()-1);
-					if(si.element==el){
-						ssb.setSpan(si.span, si.start, ssb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-						openSpans.remove(openSpans.size()-1);
-						if(si.more) processOpenSpan(el);
-					}
-					if("li".equals(el.nodeName()) && el.nextSibling()!=null) {
-						ssb.append('\n');
 					}
 				}
 			}

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

@@ -1,68 +0,0 @@
-package org.joinmastodon.android.ui.utils;
-
-import static org.joinmastodon.android.GlobalUserPreferences.ColorPreference;
-import static org.joinmastodon.android.GlobalUserPreferences.ThemePreference;
-import static org.joinmastodon.android.GlobalUserPreferences.theme;
-import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
-
-import android.content.Context;
-import android.content.res.Resources;
-
-import androidx.annotation.StyleRes;
-
-import org.joinmastodon.android.GlobalUserPreferences;
-import org.joinmastodon.android.R;
-
-import java.util.Map;
-
-public class ColorPalette {
-    public static final Map<GlobalUserPreferences.ColorPreference, ColorPalette> palettes = Map.of(
-            ColorPreference.MATERIAL3, new ColorPalette(R.style.ColorPalette_Material3)
-                    .dark(R.style.ColorPalette_Material3_Dark, R.style.ColorPalette_Material3_AutoLightDark),
-            ColorPreference.PINK, new ColorPalette(R.style.ColorPalette_Pink),
-            ColorPreference.PURPLE, new ColorPalette(R.style.ColorPalette_Purple),
-            ColorPreference.GREEN, new ColorPalette(R.style.ColorPalette_Green),
-            ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
-            ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
-            ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
-            ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow)
-    );
-
-    private @StyleRes int base;
-    private @StyleRes int autoDark;
-    private @StyleRes int light;
-    private @StyleRes int dark;
-    private @StyleRes int black;
-    private @StyleRes int autoBlack;
-
-    public ColorPalette(@StyleRes int baseRes) { base = baseRes; }
-
-    public ColorPalette(@StyleRes int lightRes, @StyleRes int darkRes, @StyleRes int autoDarkRes, @StyleRes int blackRes, @StyleRes int autoBlackRes) {
-        light = lightRes;
-        dark = darkRes;
-        autoDark = autoDarkRes;
-        black = blackRes;
-        autoBlack = autoBlackRes;
-    }
-
-    public ColorPalette light(@StyleRes int res) { light = res; return this; }
-    public ColorPalette dark(@StyleRes int res, @StyleRes int auto) { dark = res; autoDark = auto; return this; }
-    public ColorPalette black(@StyleRes int res, @StyleRes int auto) { dark = res; autoBlack = auto; return this; }
-
-    public void apply(Context context) {
-        if (!((dark != 0 && autoDark != 0) || (black != 0 && autoBlack != 0) || light != 0 || base != 0)) {
-            throw new IllegalStateException("Invalid color scheme definition");
-        }
-
-        Resources.Theme t = context.getTheme();
-        if (base != 0) t.applyStyle(base, true);
-        if (light != 0 && theme.equals(ThemePreference.LIGHT)) t.applyStyle(light, true);
-        else if (theme.equals(ThemePreference.DARK)) {
-            if (dark != 0 && !trueBlackTheme) t.applyStyle(dark, true);
-            else if (black != 0 && trueBlackTheme) t.applyStyle(black, true);
-        } else if (theme.equals(ThemePreference.AUTO)) {
-            if (autoDark != 0 && !trueBlackTheme) t.applyStyle(autoDark, true);
-            else if (autoBlack != 0 && trueBlackTheme) t.applyStyle(autoBlack, true);
-        }
-    }
-}

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

@@ -36,7 +36,7 @@ public class DiscoverInfoBannerHelper{
 				case TRENDING_HASHTAGS -> R.string.trending_hashtags_info_banner;
 				case TRENDING_LINKS -> R.string.trending_links_info_banner;
 				case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
-				case FEDERATED_TIMELINE -> R.string.sk_federated_timeline_info_banner;
+				case FEDERATED_TIMELINE -> R.string.federated_timeline_info_banner;
 			});
 		}
 	}

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

@@ -1,16 +1,9 @@
 package org.joinmastodon.android.ui.utils;
 
-import static org.joinmastodon.android.GlobalUserPreferences.theme;
-import static org.joinmastodon.android.GlobalUserPreferences.trueBlackTheme;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -26,12 +19,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
 import android.provider.OpenableColumns;
+import android.provider.Settings;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,8 +42,6 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
 import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
-import org.joinmastodon.android.api.requests.notifications.DismissNotification;
-import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusByID;
 import org.joinmastodon.android.api.requests.statuses.SetStatusPinned;
@@ -63,6 +52,8 @@ import org.joinmastodon.android.events.NotificationDeletedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
+import org.joinmastodon.android.fragments.BaseStatusListFragment;
+import org.joinmastodon.android.fragments.ComposeFragment;
 import org.joinmastodon.android.fragments.HashtagTimelineFragment;
 import org.joinmastodon.android.fragments.ListTimelineFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
@@ -70,9 +61,7 @@ import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.ListTimeline;
-import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
-import org.joinmastodon.android.model.SearchResults;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
@@ -81,8 +70,6 @@ import org.parceler.Parcels;
 
 import java.io.File;
 import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -424,7 +411,7 @@ public class UiUtils{
 	}
 
 	public static void confirmDeletePost(Activity activity, String accountID, Status status, Consumer<Status> resultCallback, boolean forRedraft){
-		showConfirmationAlert(activity, forRedraft ? R.string.sk_confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.sk_confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.sk_delete_and_redraft : R.string.delete, ()->{
+		showConfirmationAlert(activity, forRedraft ? R.string.confirm_delete_and_redraft_title : R.string.confirm_delete_title, forRedraft ? R.string.confirm_delete_and_redraft : R.string.confirm_delete, forRedraft ? R.string.delete_and_redraft : R.string.delete, ()->{
 			new DeleteStatus(status.id)
 					.setCallback(new Callback<>(){
 						@Override
@@ -446,9 +433,9 @@ public class UiUtils{
 
 	public static void confirmPinPost(Activity activity, String accountID, Status status, boolean pinned, Consumer<Status> resultCallback){
 		showConfirmationAlert(activity,
-				pinned ? R.string.sk_confirm_pin_post_title : R.string.sk_confirm_unpin_post_title,
+				pinned ? R.string.confirm_pin_post_title : R.string.confirm_unpin_post_title,
-				pinned ? R.string.sk_confirm_pin_post : R.string.sk_confirm_unpin_post,
+				pinned ? R.string.confirm_pin_post : R.string.confirm_unpin_post,
-				pinned ? R.string.sk_pin_post : R.string.sk_unpin_post,
+				pinned ? R.string.pin_post : R.string.unpin_post,
 				()->{
 					new SetStatusPinned(status.id, pinned)
 							.setCallback(new Callback<>() {
@@ -465,31 +452,12 @@ public class UiUtils{
 									error.showToast(activity);
 								}
 							})
-							.wrapProgress(activity, pinned ? R.string.sk_pinning : R.string.sk_unpinning, false)
+							.wrapProgress(activity, pinned ? R.string.pinning : R.string.unpinning, false)
 							.exec(accountID);
 				}
 		);
 	}
 
-	public static void confirmDeleteNotification(Activity activity, String accountID, Notification notification, Runnable callback) {
-		showConfirmationAlert(activity,
-				notification == null ? R.string.sk_clear_all_notifications : R.string.sk_delete_notification,
-				notification == null ? R.string.sk_clear_all_notifications_confirm : R.string.sk_delete_notification_confirm,
-				notification == null ? R.string.sk_clear_all_notifications_confirm_action : R.string.sk_delete_notification_confirm_action,
-				()-> new DismissNotification(notification != null ? notification.id : null).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Object o) {
-						callback.run();
-					}
-
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(activity);
-					}
-				}).exec(accountID)
-		);
-	}
-
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		setRelationshipToActionButton(relationship, button, false);
 	}
@@ -540,7 +508,7 @@ public class UiUtils{
 					public void onSuccess(Relationship result) {
 						resultCallback.accept(result);
 						progressCallback.accept(false);
-						Toast.makeText(activity, activity.getString(result.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username), Toast.LENGTH_SHORT).show();
+						Toast.makeText(activity, activity.getString(result.notifying ? R.string.user_post_notifications_on : R.string.user_post_notifications_off, '@'+account.username), Toast.LENGTH_SHORT).show();
 					}
 
 					@Override
@@ -688,76 +656,83 @@ public class UiUtils{
 	}
 
 	public static void setUserPreferredTheme(Context context){
-		context.setTheme(switch (theme) {
+//		boolean isDarkTheme = isDarkTheme();
-			case LIGHT -> R.style.Theme_Mastodon_Light;
+		switch(GlobalUserPreferences.color){
-			case DARK -> trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
+			case PINK:
-			default -> trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
+				context.setTheme(switch(GlobalUserPreferences.theme){
-		});
+					case AUTO ->
-
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
-		ColorPalette palette = ColorPalette.palettes.get(GlobalUserPreferences.color);
+					case LIGHT ->
-		if (palette != null) palette.apply(context);
+							R.style.Theme_Mastodon_Light;
-	}
+					case DARK ->
-	public static boolean isDarkTheme(){
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
-		if(theme==GlobalUserPreferences.ThemePreference.AUTO)
+				});
-			return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
+				break;
-		return theme==GlobalUserPreferences.ThemePreference.DARK;
+			case PURPLE:
-	}
+				context.setTheme(switch(GlobalUserPreferences.theme){
-
+					case AUTO ->
-	// https://mastodon.foo.bar/@User
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Original : R.style.Theme_Mastodon_AutoLightDark_Original;
-	// https://mastodon.foo.bar/@User/43456787654678
+					case LIGHT ->
-	// https://pleroma.foo.bar/users/User
+							R.style.Theme_Mastodon_Light_Original;
-	// https://pleroma.foo.bar/users/9qTHT2ANWUdXzENqC0
+					case DARK ->
-	// https://pleroma.foo.bar/notice/9sBHWIlwwGZi5QGlHc
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Original : R.style.Theme_Mastodon_Dark_Original;
-	// https://pleroma.foo.bar/objects/d4643c42-3ae0-4b73-b8b0-c725f5819207
+				});
-	// https://friendica.foo.bar/profile/user
+				break;
-	// https://friendica.foo.bar/display/d4643c42-3ae0-4b73-b8b0-c725f5819207
+			case GREEN:
-	// https://misskey.foo.bar/notes/83w6r388br (always lowercase)
+				context.setTheme(switch(GlobalUserPreferences.theme){
-	// https://pixelfed.social/p/connyduck/391263492998670833
+					case AUTO ->
-	// https://pixelfed.social/connyduck
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Green : R.style.Theme_Mastodon_AutoLightDark_Green;
-	// https://gts.foo.bar/@goblin/statuses/01GH9XANCJ0TA8Y95VE9H3Y0Q2
+					case LIGHT ->
-	// https://gts.foo.bar/@goblin
+							R.style.Theme_Mastodon_Light_Green;
-	// https://foo.microblog.pub/o/5b64045effd24f48a27d7059f6cb38f5
+					case DARK ->
-	//
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Green : R.style.Theme_Mastodon_Dark_Green;
-	// COPIED FROM https://github.com/tuskyapp/Tusky/blob/develop/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
+				});
-	public static boolean looksLikeMastodonUrl(String urlString) {
+				break;
-		URI uri;
+			case BLUE:
-		try {
+				context.setTheme(switch(GlobalUserPreferences.theme){
-			uri = new URI(urlString);
+					case AUTO ->
-		} catch (URISyntaxException e) {
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Blue : R.style.Theme_Mastodon_AutoLightDark_Blue;
-			return false;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Blue;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue;
+				});
+				break;
+			case ORANGE:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Orange : R.style.Theme_Mastodon_AutoLightDark_Orange;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Orange;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Orange : R.style.Theme_Mastodon_Dark_Orange;
+				});
+				break;
+			case YELLOW:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Yellow : R.style.Theme_Mastodon_AutoLightDark_Yellow;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Yellow;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Yellow : R.style.Theme_Mastodon_Dark_Yellow;
+				});
+				break;
 		}
 
-		if (uri.getQuery() != null || uri.getFragment() != null || uri.getPath() == null) return false;
+	}
-
+	public static boolean isDarkTheme(){
-		String it = uri.getPath();
+		if(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO)
-		return it.matches("^/@[^/]+$") ||
+			return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
-			it.matches("^/@[^/]+/\\d+$") ||
+		return GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK;
-			it.matches("^/users/\\w+$") ||
-			it.matches("^/notice/[a-zA-Z0-9]+$") ||
-			it.matches("^/objects/[-a-f0-9]+$") ||
-			it.matches("^/notes/[a-z0-9]+$") ||
-			it.matches("^/display/[-a-f0-9]+$") ||
-			it.matches("^/profile/\\w+$") ||
-			it.matches("^/p/\\w+/\\d+$") ||
-			it.matches("^/\\w+$") ||
-			it.matches("^/@[^/]+/statuses/[a-zA-Z0-9]+$") ||
-			it.matches("^/o/[a-f0-9]+$");
 	}
 
-	public static void openURL(Context context, String accountID, String url){
+	public static void openURL(Context context, @Nullable String accountID, String url){
-		Consumer<ProgressDialog> transformDialogForLookup = dialog -> {
-			dialog.setTitle(R.string.sk_loading_fediverse_resource_title);
-			dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (d, which) -> d.cancel());
-			dialog.setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.open_in_browser), (d, which) -> {
-				d.cancel();
-				launchWebBrowser(context, url);
-			});
-		};
-
 		Uri uri=Uri.parse(url);
-		List<String> path=uri.getPathSegments();
+		if(accountID!=null && "https".equals(uri.getScheme()) && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())){
-		if(accountID!=null && "https".equals(uri.getScheme())){
+			List<String> path=uri.getPathSegments();
-			if(path.size()==2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$") && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())){
+			// Match URLs like https://mastodon.social/@Gargron/108132679274083591
+			if(path.size()==2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$")){
 				new GetStatusByID(path.get(1))
 						.setCallback(new Callback<>(){
 							@Override
@@ -774,61 +749,11 @@ public class UiUtils{
 								launchWebBrowser(context, url);
 							}
 						})
-						.wrapProgress((Activity)context, R.string.loading, true, transformDialogForLookup)
+						.wrapProgress((Activity)context, R.string.loading, true)
-						.exec(accountID);
-				return;
-			} else if (looksLikeMastodonUrl(url)) {
-				new GetSearchResults(url, null, true)
-						.setCallback(new Callback<>() {
-							@Override
-							public void onSuccess(SearchResults results) {
-								Bundle args=new Bundle();
-								args.putString("account", accountID);
-								if (!results.statuses.isEmpty()) {
-									args.putParcelable("status", Parcels.wrap(results.statuses.get(0)));
-									Nav.go((Activity) context, ThreadFragment.class, args);
-								} else if (!results.accounts.isEmpty()) {
-									args.putParcelable("profileAccount", Parcels.wrap(results.accounts.get(0)));
-									Nav.go((Activity) context, ProfileFragment.class, args);
-								} else {
-									launchWebBrowser(context, url);
-								}
-							}
-
-							@Override
-							public void onError(ErrorResponse error) {
-								error.showToast(context);
-								launchWebBrowser(context, url);
-							}
-						})
-						.wrapProgress((Activity)context, R.string.loading, true, transformDialogForLookup)
 						.exec(accountID);
 				return;
 			}
 		}
 		launchWebBrowser(context, url);
 	}
-
-	public static void copyText(Context context, String text) {
-		context.getSystemService(ClipboardManager.class).setPrimaryClip(ClipData.newPlainText(null, text));
-		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.TIRAMISU || UiUtils.isMIUI()){ // Android 13+ SystemUI shows its own thing when you put things into the clipboard
-			Toast.makeText(context, R.string.text_copied, Toast.LENGTH_SHORT).show();
-		}
-		Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
-		else vibrator.vibrate(50);
-	}
-
-	private static String getSystemProperty(String key){
-		try{
-			Class<?> props=Class.forName("android.os.SystemProperties");
-			Method get=props.getMethod("get", String.class);
-			return (String)get.invoke(null, key);
-		}catch(Exception ignore){}
-		return null;
-	}
-
-	public static boolean isMIUI(){
-		return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.code"));
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/views/FilterChipView.java

@@ -1,59 +0,0 @@
-package org.joinmastodon.android.ui.views;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.widget.Button;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import androidx.annotation.DrawableRes;
-import me.grishka.appkit.utils.V;
-
-public class FilterChipView extends Button{
-
-	private boolean currentlySelected;
-
-	public FilterChipView(Context context){
-		this(context, null);
-	}
-
-	public FilterChipView(Context context, AttributeSet attrs){
-		this(context, attrs, 0);
-	}
-
-	public FilterChipView(Context context, AttributeSet attrs, int defStyle){
-		super(context, attrs, defStyle);
-		setCompoundDrawablePadding(V.dp(8));
-		setBackgroundResource(R.drawable.bg_filter_chip);
-		setTextAppearance(R.style.m3_label_large);
-		setTextColor(getResources().getColorStateList(R.color.filter_chip_text, context.getTheme()));
-		setCompoundDrawableTintList(ColorStateList.valueOf(UiUtils.getThemeColor(context, R.attr.colorM3OnSurface)));
-		updatePadding();
-	}
-
-	@Override
-	protected void drawableStateChanged(){
-		super.drawableStateChanged();
-		if(currentlySelected==isSelected())
-			return;
-		currentlySelected=isSelected();
-		Drawable start=currentlySelected ? getResources().getDrawable(R.drawable.ic_baseline_check_18, getContext().getTheme()) : null;
-		Drawable end=getCompoundDrawablesRelative()[2];
-		setCompoundDrawablesRelativeWithIntrinsicBounds(start, null, end, null);
-		updatePadding();
-	}
-
-	private void updatePadding(){
-		int vertical=V.dp(6);
-		Drawable[] drawables=getCompoundDrawablesRelative();
-		setPaddingRelative(V.dp(drawables[0]==null ? 16 : 8), vertical, V.dp(drawables[2]==null ? 16 : 8), vertical);
-	}
-
-	public void setDrawableEnd(@DrawableRes int drawable){
-		setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, drawable, 0);
-		updatePadding();
-	}
-}

mastodon/src/main/java/org/joinmastodon/android/ui/views/FloatingHintEditTextLayout.java

@@ -1,320 +0,0 @@
-package org.joinmastodon.android.ui.views;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Region;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.InsetDrawable;
-import android.os.Build;
-import android.text.Editable;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.EditText;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import me.grishka.appkit.utils.CubicBezierInterpolator;
-import me.grishka.appkit.utils.V;
-
-public class FloatingHintEditTextLayout extends FrameLayout{
-	private EditText edit;
-	private TextView label;
-	private int labelTextSize;
-	private int offsetY;
-	private boolean hintVisible;
-	private Animator currentAnim;
-	private float animProgress;
-	private RectF tmpRect=new RectF();
-	private ColorStateList labelColors, origHintColors;
-	private boolean errorState;
-
-	public FloatingHintEditTextLayout(Context context){
-		this(context, null);
-	}
-
-	public FloatingHintEditTextLayout(Context context, AttributeSet attrs){
-		this(context, attrs, 0);
-	}
-
-	public FloatingHintEditTextLayout(Context context, AttributeSet attrs, int defStyle){
-		super(context, attrs, defStyle);
-		if(isInEditMode())
-			V.setApplicationContext(context);
-		TypedArray ta=context.obtainStyledAttributes(attrs, R.styleable.FloatingHintEditTextLayout);
-		labelTextSize=ta.getDimensionPixelSize(R.styleable.FloatingHintEditTextLayout_android_labelTextSize, V.dp(12));
-		offsetY=ta.getDimensionPixelOffset(R.styleable.FloatingHintEditTextLayout_editTextOffsetY, 0);
-		labelColors=ta.getColorStateList(R.styleable.FloatingHintEditTextLayout_labelTextColor);
-		ta.recycle();
-		setAddStatesFromChildren(true);
-	}
-
-	@Override
-	protected void onFinishInflate(){
-		super.onFinishInflate();
-		if(getChildCount()>0 && getChildAt(0) instanceof EditText et){
-			edit=et;
-		}else{
-			throw new IllegalStateException("First child must be an EditText");
-		}
-
-		label=new TextView(getContext());
-		label.setTextSize(TypedValue.COMPLEX_UNIT_PX, labelTextSize);
-//		label.setTextColor(labelColors==null ? edit.getHintTextColors() : labelColors);
-		origHintColors=edit.getHintTextColors();
-		label.setText(edit.getHint());
-		label.setSingleLine();
-		label.setPivotX(0f);
-		label.setPivotY(0f);
-		label.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
-		LayoutParams lp=new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.START | Gravity.TOP);
-		lp.setMarginStart(edit.getPaddingStart()+((LayoutParams)edit.getLayoutParams()).getMarginStart());
-		addView(label, lp);
-
-		hintVisible=edit.getText().length()==0;
-		if(hintVisible)
-			label.setAlpha(0f);
-
-		edit.addTextChangedListener(new SimpleTextWatcher(this::onTextChanged));
-	}
-
-	private void onTextChanged(Editable text){
-		if(errorState){
-			errorState=false;
-			setForeground(getResources().getDrawable(R.drawable.bg_m3_outlined_text_field));
-			refreshDrawableState();
-		}
-		boolean newHintVisible=text.length()==0;
-		if(newHintVisible==hintVisible)
-			return;
-		if(currentAnim!=null)
-			currentAnim.cancel();
-		hintVisible=newHintVisible;
-
-		label.setAlpha(1);
-		edit.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
-			@Override
-			public boolean onPreDraw(){
-				edit.getViewTreeObserver().removeOnPreDrawListener(this);
-
-				float scale=edit.getLineHeight()/(float)label.getLineHeight();
-				float transY=edit.getHeight()/2f-edit.getLineHeight()/2f+(edit.getTop()-label.getTop())-(label.getHeight()/2f-label.getLineHeight()/2f);
-
-				AnimatorSet anim=new AnimatorSet();
-				if(hintVisible){
-					anim.playTogether(
-							ObjectAnimator.ofFloat(edit, TRANSLATION_Y, 0),
-							ObjectAnimator.ofFloat(label, SCALE_X, scale),
-							ObjectAnimator.ofFloat(label, SCALE_Y, scale),
-							ObjectAnimator.ofFloat(label, TRANSLATION_Y, transY),
-							ObjectAnimator.ofFloat(FloatingHintEditTextLayout.this, "animProgress", 0f)
-					);
-					edit.setHintTextColor(0);
-				}else{
-					label.setScaleX(scale);
-					label.setScaleY(scale);
-					label.setTranslationY(transY);
-					anim.playTogether(
-							ObjectAnimator.ofFloat(edit, TRANSLATION_Y, offsetY),
-							ObjectAnimator.ofFloat(label, SCALE_X, 1f),
-							ObjectAnimator.ofFloat(label, SCALE_Y, 1f),
-							ObjectAnimator.ofFloat(label, TRANSLATION_Y, 0f),
-							ObjectAnimator.ofFloat(FloatingHintEditTextLayout.this, "animProgress", 1f)
-					);
-				}
-				anim.setDuration(150);
-				anim.setInterpolator(CubicBezierInterpolator.DEFAULT);
-				anim.start();
-				anim.addListener(new AnimatorListenerAdapter(){
-					@Override
-					public void onAnimationEnd(Animator animation){
-						currentAnim=null;
-						if(hintVisible){
-							label.setAlpha(0);
-							edit.setHintTextColor(origHintColors);
-						}
-					}
-				});
-				currentAnim=anim;
-				return true;
-			}
-		});
-	}
-
-	@Keep
-	public void setAnimProgress(float progress){
-		animProgress=progress;
-		invalidate();
-	}
-
-	@Keep
-	public float getAnimProgress(){
-		return animProgress;
-	}
-
-	@Override
-	public void onDrawForeground(Canvas canvas){
-		if(getForeground()!=null && animProgress>0){
-			canvas.save();
-			float width=(label.getWidth()+V.dp(8))*animProgress;
-			float centerX=label.getLeft()+label.getWidth()/2f;
-			tmpRect.set(centerX-width/2f, label.getTop(), centerX+width/2f, label.getBottom());
-			if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O)
-				canvas.clipOutRect(tmpRect);
-			else
-				canvas.clipRect(tmpRect, Region.Op.DIFFERENCE);
-			super.onDrawForeground(canvas);
-			canvas.restore();
-		}else{
-			super.onDrawForeground(canvas);
-		}
-	}
-
-	@Override
-	public void setForeground(Drawable foreground){
-		super.setForeground(new PaddedForegroundDrawable(foreground));
-	}
-
-	@Override
-	public Drawable getForeground(){
-		if(super.getForeground() instanceof PaddedForegroundDrawable pfd){
-			return pfd.wrapped;
-		}
-		return null;
-	}
-
-	@Override
-	protected void drawableStateChanged(){
-		super.drawableStateChanged();
-		if(label==null || errorState)
-			return;
-		ColorStateList color=labelColors==null ? origHintColors : labelColors;
-		label.setTextColor(color.getColorForState(getDrawableState(), 0xff00ff00));
-	}
-
-	public void setErrorState(){
-		if(errorState)
-			return;
-		errorState=true;
-		setForeground(getResources().getDrawable(R.drawable.bg_m3_outlined_text_field_error, getContext().getTheme()));
-		label.setTextColor(UiUtils.getThemeColor(getContext(), R.attr.colorM3Error));
-	}
-
-	private class PaddedForegroundDrawable extends Drawable{
-		private final Drawable wrapped;
-
-		private PaddedForegroundDrawable(Drawable wrapped){
-			this.wrapped=wrapped;
-			wrapped.setCallback(new Callback(){
-				@Override
-				public void invalidateDrawable(@NonNull Drawable who){
-					invalidateSelf();
-				}
-
-				@Override
-				public void scheduleDrawable(@NonNull Drawable who, @NonNull Runnable what, long when){
-					scheduleSelf(what, when);
-				}
-
-				@Override
-				public void unscheduleDrawable(@NonNull Drawable who, @NonNull Runnable what){
-					unscheduleSelf(what);
-				}
-			});
-		}
-
-		@Override
-		public void draw(@NonNull Canvas canvas){
-			wrapped.draw(canvas);
-		}
-
-		@Override
-		public void setAlpha(int alpha){
-			wrapped.setAlpha(alpha);
-		}
-
-		@Override
-		public void setColorFilter(@Nullable ColorFilter colorFilter){
-			wrapped.setColorFilter(colorFilter);
-		}
-
-		@Override
-		public int getOpacity(){
-			return wrapped.getOpacity();
-		}
-
-		@Override
-		public boolean setState(@NonNull int[] stateSet){
-			return wrapped.setState(stateSet);
-		}
-
-		@Override
-		public int getLayoutDirection(){
-			return wrapped.getLayoutDirection();
-		}
-
-		@Override
-		public int getAlpha(){
-			return wrapped.getAlpha();
-		}
-
-		@Nullable
-		@Override
-		public ColorFilter getColorFilter(){
-			return wrapped.getColorFilter();
-		}
-
-		@Override
-		public boolean isStateful(){
-			return wrapped.isStateful();
-		}
-
-		@NonNull
-		@Override
-		public int[] getState(){
-			return wrapped.getState();
-		}
-
-		@NonNull
-		@Override
-		public Drawable getCurrent(){
-			return wrapped.getCurrent();
-		}
-
-		@Override
-		public void applyTheme(@NonNull Resources.Theme t){
-			wrapped.applyTheme(t);
-		}
-
-		@Override
-		public boolean canApplyTheme(){
-			return wrapped.canApplyTheme();
-		}
-
-		@Override
-		protected void onBoundsChange(@NonNull Rect bounds){
-			super.onBoundsChange(bounds);
-			LayoutParams lp=(LayoutParams) edit.getLayoutParams();
-			wrapped.setBounds(bounds.left+lp.leftMargin-V.dp(12), bounds.top, bounds.right-lp.rightMargin+V.dp(12), bounds.bottom);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?attr/colorButtonBackgroundPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
+	<item android:color="?colorPollVoted"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundPrimaryLightOnDarkDisabled"/>
+	<item android:color="?colorPollVoted"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="@color/gray_25" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundSecondaryDarkOnLightDisabled"/>
+	<item android:color="@color/gray_100"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonBackgroundSecondaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorPollVoted" android:state_enabled="true"/>
-	<item android:color="?colorButtonBackgroundSecondaryLightOnDarkDisabled"/>
+	<item android:color="?colorSearchHint"/>
 </selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorM3OnPrimary" android:state_enabled="true"/>
-	<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorM3Primary" android:state_enabled="true"/>
-	<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
-</selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextPrimaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextPrimaryDarkOnLightDisabled"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextPrimaryLightOnDark" android:state_enabled="true"/>
+	<item android:color="?colorButtonText" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextPrimaryLightOnDarkDisabled"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorButtonTextSecondaryDarkOnLight" android:state_enabled="true"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
-	<item android:color="?colorButtonTextSecondaryDarkOnLightDisabled"/>
+	<item android:color="?colorTabInactive"/>
 </selector>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorGray50"/>
+	<item android:color="?colorSecondary"/>
 </selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorM3OnSecondaryContainer" android:state_selected="true"/>
-	<item android:color="?colorM3OnSurface"/>
-</selector>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	 <item android:color="?colorM3OnSecondaryContainer" android:alpha="0.12"/>
-</selector>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	 <item android:color="?colorM3OnSurfaceVariant" android:alpha="0.12"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorM3Primary" android:state_focused="true"/>
-	<item android:color="?colorM3OnSurfaceVariant"/>
-</selector>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	 <item android:color="?colorM3PressedOverlay" android:alpha="0.12"/>
-</selector>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	 <item android:color="?colorM3Primary" android:alpha="0.12"/>
-</selector>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorM3Primary" android:state_checked="true"/>
-	<item android:color="?colorM3OnSurfaceVariant"/>
-</selector>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="true">
-		<ripple android:color="@color/m3_pressed_overlay">
-			<item>
-				<shape>
-					<solid android:color="?colorM3Primary"/>
-					<corners android:radius="20dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-	<item>
-		<shape>
-			<solid android:color="?colorM3DisabledBackground"/>
-			<corners android:radius="20dp"/>
-		</shape>
-	</item>
-</selector>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@android:id/mask">
-		 <shape>
-			   <solid android:color="#000"/>
-			   <corners android:radius="20dp"/>
-		 </shape>
-	</item>
-</ripple>

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

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

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

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

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

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true">
-		<ripple android:color="@color/m3_on_secondary_container_overlay">
-			<item>
-				<shape>
-					<corners android:radius="8dp"/>
-					<solid android:color="?colorM3SecondaryContainer"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-	<item>
-		<ripple android:color="@color/m3_on_surface_variant_overlay">
-			<item android:id="@android:id/mask">
-				<shape>
-					<corners android:radius="8dp"/>
-					<solid android:color="#000"/>
-				</shape>
-			</item>
-			<item>
-				<shape>
-					<corners android:radius="8dp"/>
-					<stroke android:color="?colorM3Outline" android:width="1dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:left="12dp" android:top="12dp" android:right="12dp" android:bottom="12dp">
-		<selector>
-			<item android:state_focused="true">
-				<shape>
-					<stroke android:color="?colorM3Primary" android:width="2dp"/>
-					<corners android:radius="4dp"/>
-				</shape>
-			</item>
-			<item>
-				<shape>
-					 <stroke android:color="?colorM3Outline" android:width="1dp"/>
-					 <corners android:radius="4dp"/>
-				</shape>
-			</item>
-		</selector>
-	</item>
-</layer-list>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:left="12dp" android:top="12dp" android:right="12dp" android:bottom="12dp">
-		<shape>
-			<stroke android:color="?colorM3Error" android:width="2dp"/>
-			<corners android:radius="4dp"/>
-		</shape>
-	</item>
-</layer-list>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<color android:color="?colorM3Background"/>
-	</item>
-	<item android:id="@+id/color_overlay">
-		<color android:color="?colorM3Primary"/>
-	</item>
-</layer-list>

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

@@ -2,7 +2,7 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
 	<item>
 		<shape android:shape="oval">
-			<solid android:color="?colorGray600"/>
+			<solid android:color="?colorSearchHint"/>
 		</shape>
 	</item>
 </ripple>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
-		<shape android:tint="?colorGray800">
+		<shape android:tint="@color/gray_800">
 			<solid android:color="#CC000000"/>
 		</shape>
 	</item>