Bump version number

closes #157

README.md

@@ -1,23 +1,35 @@
-![Pink logo with pink shark](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
+![MoshidonLogo](mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png)
 
-# Megalodon
+# Moshidon, the material you mastodon client! 
 
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/svg-badge.svg)](https://translate.codeberg.org/engage/megalodon/)
- 
-[![Download latest release](https://img.shields.io/badge/dynamic/json?color=d92aad&label=Download%20APK&query=%24.tag_name&url=https%3A%2F%2Fapi.github.com%2Frepos%2Fsk22%2Fmegalodon%2Freleases%2Flatest&style=flat)](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
+> A fork of [megalodon](https://github.com/sk22/megalodon) which is a fork of [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
 
-<a href="https://play.google.com/store/apps/details?id=org.joinmastodon.android.sk"><img height="50" alt="Get it on Google Play" src="img/google-play-badge.png"></a>
-&nbsp;
-<a href="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/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk)
+
+---
 
 
 ## Key features
 
+### **Material you theme support on Android 12+ devices!**
+
+### **Translate button**
+
+**Allows you to translate posts in instances with the translate feature!**
+
+**Screenshots**
+
+![Screenshot_20221209-135457_1](https://user-images.githubusercontent.com/71328265/206753830-cdb8bc65-7732-4a6a-8bcd-bbc4ca311d19.png)
+![Screenshot_20221209-135409_1](https://user-images.githubusercontent.com/71328265/206753831-7af92a48-d7a5-4780-9beb-90acef4e141b.png)
+
+### **Color themes**
+
+**Allows you to change theme within the app. Supports Purple, pink, green, blue, orange and yellow!**
+
 ### **Unlisted posting**
 
-**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Community”, “Federated” and “Posts”).**
+**Allows you to post publicly without having your post show up in trends, hashtags or public timelines (i.e., in the tabs “Local”, “Community” and “Posts”).**
 
 When posting with Unlisted visibility, your posts will still be publicly accessible in your profile. They will also be shown in people’s Home timelines, but only if they follow you or someone they follow reposted/replied to your post.
   
@@ -43,63 +55,29 @@ This is important to **ensure the content you’re sharing is as accessible as p
 
 On the Fediverse, it’s quite common for people to pin posts they want others to read before following them. You can pin/unpin posts yourself by clicking the `⋯` button in the top right corner of your posts.
 
+### **Bookmarks**
+
+**They allow for quickly saving posts and viewing them through the Bookmarks button on the top right of your profile.**
+
+To bookmark a post, press the button between the Favorite and Share buttons on the bottom of the post. Bookmarks are saved privately, so the post authors won’t know you saved their post – the list of bookmarked posts is only visible to you.
+
 ## Installation
 
-### From app stores
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Moshidon will automatically notify you about new updates inside the app.**
 
-* **[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/LucasGGamerM/moshidon/releases/latest/download/moshidon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-  Note that you'll need to add Izzy's F-Droid repository to your F-Droid app first:
-  
-  `https://apt.izzysoft.de/fdroid/repo`
+Moshidon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
 
-* **[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!
-
----
 
 
 ## Release variants
 
-All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
+All downloads can be found on the [Releases](https://github.com/LucasGGamerM/moshidon/releases) page.
 
-**`megalodon.apk`**
-
-Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
-
-**`upstream-1234abc.apk`**
-
-This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
-
-<!-- **`megalodon-fdroid.apk`**
-
-Variant without the integrated updater. This is the variant to be published to F-Droid.org where an integrated updater is not necessary. -->
-
----
-
-## Contribution
-
-### Translation
-
-As with the source code, the translation is sourced from the official project, which you can contribute to on the official “**Mastodon for Android**” Crowdin project: https://crowdin.com/project/mastodon-for-android
-
-There's also a handful of custom strings exclusive to this projects that would need to be translated. You can help translate **Megalodon** on Weblate: https://translate.codeberg.org/projects/megalodon/
-
-[![Translation status](https://translate.codeberg.org/widgets/megalodon/-/horizontal-auto.svg)](https://translate.codeberg.org/engage/megalodon/)
+**`moshidon.apk`**
 
+Variant with an integrated updater. If you download Moshidon from here (and not from an app store), just download the regular `moshidon.apk`.
 
 ---
 
@@ -128,11 +106,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 +117,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
 * [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
 * [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
-* [No ellipsis for long poll answers](https://github.com/mastodon/mastodon-android/commit/c9aae828e2518adccdc092e41f8d1f0489636271)
-* [Show poll vote button for multiple and single answer polls](https://github.com/mastodon/mastodon-android/commit/e14dfda2fdf32f0fa3043504ac5831683a87559a)
-* [Show own vote after voting](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28) ([Closes issue](https://github.com/mastodon/mastodon-android/commit/4ab9e25fec4fd9c10b7a8ddd1be522b3cc12cf28))
-* [Make inline emoji search case-insensitive and don't only search from start of emoji names](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:better-inline-emoji-search) ([Pull request](https://github.com/mastodon/mastodon-android/pull/445))
-* [Include subject line when sharing e.g. a website to Megalodon](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:external-share-include-subject)
-* [Improve semantics for voting on polls (radio buttons and checkboxes)](https://github.com/sk22/megalodon/commit/6fd58c96827cb1d2da329cebdc170a1425dd18d7)
-* [Copy post URL when long-pressing share button](https://github.com/sk22/megalodon/commit/ba36347f03278763ecec617b1ce57ba89db7be72)
-* [Add option to disable swiping between tabs](https://github.com/sk22/megalodon/commit/1f20b21fc84bf006c1ec14bd2229cbfad5215ec8)
-* [Resolve Fediverse links in the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/open-urls-in-app)
-* [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 +124,6 @@ There's also a handful of custom strings exclusive to this projects that would n
 * [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
 * [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
 * [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
-* [Custom color themes](https://github.com/sk22/megalodon/pull/124) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom "megalodon" text logo](https://github.com/sk22/megalodon/commit/563afd487ca5c608cfbb00fa3909d3c27384acc0) by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Custom login screen](https://github.com/sk22/megalodon/commit/9bbf8c4618dbe13accaeb3b5482bf3fe88cac4c0)
-* [More distinct filled boost icon](https://github.com/sk22/megalodon/commits/more-distinct-filled-boost-icon)
-* Material You color theme by [@LucasGGamerM](https://github.com/LucasGGamerM)
-* [Animations for interaction buttons](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/animate-buttons)
-* [Dedicated icons for different notification types](https://github.com/sk22/megalodon/pull/178) by [@florian-obernberger](https://github.com/florian-obernberger)
 
 
 ## Building
@@ -185,4 +140,4 @@ This project is released under the [GPL-3 License](./LICENSE).
 
 ## Links
 
-<a rel="me" href="https://floss.social/@megalodon">@megalodon<wbr>@floss.social</a>
+<a rel="me" href="https://floss.social/@moshidon">@moshidon<wbr>@floss.social</a>

mastodon/build.gradle

@@ -5,12 +5,12 @@ plugins {
 android {
 	compileSdk 33
 	defaultConfig {
-		archivesBaseName = "megalodon"
-		applicationId "org.joinmastodon.android.sk"
+		archivesBaseName = "moshidon"
+		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 62
-		versionName "1.1.5+fork.62"
+		versionCode 67
+		versionName "1.1.4+fork.67.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"
 	}

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">
@@ -34,7 +33,7 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:scheme="megalodon-android-auth" android:host="callback"/>
+				<data android:scheme="moshidon-android-auth" android:host="callback"/>
 			</intent-filter>
 		</activity>
 		<activity android:name=".ExternalShareActivity" android:exported="true" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize">

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

@@ -52,8 +52,7 @@ public class ExternalShareActivity extends FragmentStackActivity{
 
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
-		String subject = "";
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n\n");
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n");
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;
@@ -81,8 +80,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

@@ -4,6 +4,7 @@ import static org.joinmastodon.android.api.MastodonAPIController.gson;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
@@ -24,16 +25,13 @@ public class GlobalUserPreferences{
 	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;
+	public static Map<String, String> defaultLanguages;
 
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
@@ -56,20 +54,15 @@ public class GlobalUserPreferences{
 		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<>());
-
-		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;
+		if(android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){
+			color=ColorPreference.values()[prefs.getInt("color", 0)];
+		}else{
+			color=ColorPreference.values()[prefs.getInt("color", 1)];
 		}
+
 	}
 
 	public static void save(){
@@ -84,25 +77,21 @@ public class GlobalUserPreferences{
 				.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())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
+				.putInt("color", color.ordinal())
 				.apply();
 	}
 
 	public enum ColorPreference{
 		MATERIAL3,
-		PINK,
 		PURPLE,
+		PINK,
 		GREEN,
 		BLUE,
-		BROWN,
-		RED,
-		YELLOW
+		ORANGE,
+		YELLOW,
+		RED
 	}
 
 	public enum ThemePreference{
@@ -111,4 +100,3 @@ public class GlobalUserPreferences{
 		DARK
 	}
 }
-

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

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

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));
-		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);
-		}
+				.setColor(context.getColor(R.color.shortcut_icon_background));
 		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

@@ -70,8 +70,7 @@ public class StatusInteractionController{
 		SetStatusReblogged req=(SetStatusReblogged) new SetStatusReblogged(status.id, reblogged)
 				.setCallback(new Callback<>(){
 					@Override
-					public void onSuccess(Status reblog){
-						Status result = reblog.getContentStatus();
+					public void onSuccess(Status result){
 						runningReblogRequests.remove(status.id);
 						result.reblogsCount = Math.max(0, status.reblogsCount) + (reblogged ? 1 : -1);
 						cb.accept(result);

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

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

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

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

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

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

mastodon/src/main/java/org/joinmastodon/android/api/requests/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/oauth/CreateOAuthApp.java

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

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

@@ -0,0 +1,20 @@
+package org.joinmastodon.android.api.requests.statuses;
+
+import org.joinmastodon.android.api.AllFieldsAreRequired;
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.BaseModel;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusTranslation;
+
+import java.util.Locale;
+
+public class GetStatusTranslation extends MastodonAPIRequest<StatusTranslation>{
+    public GetStatusTranslation(String id){
+        super(HttpMethod.POST, "/statuses/"+id+"/translate", StatusTranslation.class);
+        Request r = new Request();
+        setRequestBody(r);
+    }
+
+    public static class Request{
+    }
+}

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/AccountSessionManager.java

@@ -63,7 +63,7 @@ import me.grishka.appkit.api.ErrorResponse;
 public class AccountSessionManager{
 	private static final String TAG="AccountSessionManager";
 	public static final String SCOPE="read write follow push";
-	public static final String REDIRECT_URI="megalodon-android-auth://callback";
+	public static final String REDIRECT_URI="moshidon-android-auth://callback";
 
 	private static final AccountSessionManager instance=new AccountSessionManager();
 
@@ -104,7 +104,6 @@ public class AccountSessionManager{
 
 	public void addAccount(Instance instance, Token token, Account self, Application app, AccountActivationInfo activationInfo){
 		instances.put(instance.uri, instance);
-		updateInstanceInfoV2(instance);
 		AccountSession session=new AccountSession(token, self, app, instance.uri, activationInfo==null, activationInfo);
 		sessions.put(session.getID(), session);
 		lastActiveAccountID=session.getID();
@@ -214,7 +213,7 @@ public class AccountSessionManager{
 								.path("/oauth/authorize")
 								.appendQueryParameter("response_type", "code")
 								.appendQueryParameter("client_id", result.clientId)
-								.appendQueryParameter("redirect_uri", "megalodon-android-auth://callback")
+								.appendQueryParameter("redirect_uri", "moshidon-android-auth://callback")
 								.appendQueryParameter("scope", SCOPE)
 								.build();
 
@@ -330,7 +329,9 @@ public class AccountSessionManager{
 						instances.put(domain, instance);
 						updateInstanceEmojis(instance, domain);
 						try {
-							updateInstanceInfoV2(instance);
+							if (Integer.parseInt(instance.version.split("\\.")[0]) >= 4) {
+								updateInstanceInfoV2(domain);
+							}
 						} catch (Exception ignored) {}
 					}
 
@@ -342,17 +343,17 @@ public class AccountSessionManager{
 				.execNoAuth(domain);
 	}
 
-	public void updateInstanceInfoV2(Instance instance) {
+	public void updateInstanceInfoV2(String domain) {
 		new GetInstance.V2().setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Instance.V2 v2) {
-				if (instance != null) instance.v2 = v2;
-				writeAccountsFile();
+				Instance instanceInfo = instances.get(domain);
+				if (instanceInfo != null) instanceInfo.v2 = v2;
 			}
 
 			@Override
 			public void onError(ErrorResponse errorResponse) {}
-		}).execNoAuth(instance.uri);
+		}).execNoAuth(domain);
 	}
 
 	private void updateInstanceEmojis(Instance instance, String domain){

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

@@ -462,6 +462,21 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		Status status=holder.getItem().status;
 		revealSpoiler(status, holder.getItemID());
 	}
+	public void onRevealTranslationClick(HeaderStatusDisplayItem.Holder holder){
+		Status status=holder.getItem().status;
+		revealTranslation(status, holder.getItemID());
+	}
+
+	protected void revealTranslation(Status status, String itemID){
+		status.wantsTranslation=!status.wantsTranslation;
+		TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
+		if(text!=null)
+			adapter.notifyItemChanged(text.getAbsoluteAdapterPosition()-getMainAdapterOffset());
+		HeaderStatusDisplayItem.Holder header=findHolderOfType(itemID, HeaderStatusDisplayItem.Holder.class);
+		if(header!=null)
+			header.rebind();
+		updateImagesSpoilerState(status, itemID);
+	}
 
 	protected void revealSpoiler(Status status, String itemID){
 		status.spoilerRevealed=true;
@@ -787,7 +802,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 +813,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

@@ -155,7 +155,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private int charCount, charLimit, trimmedCharCount;
 
 	private Button publishButton, languageButton;
-	private PopupMenu languagePopup, visibilityPopup;
+	private PopupMenu languagePopup;
 	private ImageButton mediaBtn, pollBtn, emojiBtn, spoilerBtn, visibilityBtn;
 	private ImageView sensitiveIcon;
 	private ComposeMediaLayout attachmentsView;
@@ -203,14 +203,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	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);
@@ -250,7 +246,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			UiUtils.removeCallbacks(updateUploadEtaRunnable);
 			updateUploadEtaRunnable=null;
 		}
-		getActivity().getWindow().setNavigationBarColor(navigationBarColorBefore);
 	}
 
 	@Override
@@ -260,7 +255,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 +295,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(v->visibilityPopup.show());
-		visibilityBtn.setOnTouchListener(visibilityPopup.getDragToOpenListener());
+		visibilityBtn.setOnClickListener(this::onVisibilityClick);
 		sensitiveItem.setOnClickListener(v->toggleSensitive());
 		emojiKeyboard.setOnIconChangedListener(new PopupKeyboard.OnIconChangeListener(){
 			@Override
@@ -393,17 +385,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		if(editingStatus!=null && editingStatus.visibility!=null) {
 			statusVisibility=editingStatus.visibility;
-		} else {
-			loadDefaultStatusVisibility(savedInstanceState);
 		}
 
+		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);
@@ -534,7 +519,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				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);
@@ -607,11 +592,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 +612,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;
-		if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) {
-			publishButton.setText(GlobalUserPreferences.publishButtonText);
-		} else {
-			publishButton.setText(publishText);
-		}
+		publishButton.setText(editingStatus==null || redraftStatus ? R.string.publish : R.string.save);
 		publishButton.setOnClickListener(this::onPublishClick);
 		LinearLayout wrap=new LinearLayout(getActivity());
 		wrap.setOrientation(LinearLayout.HORIZONTAL);
@@ -682,8 +657,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 	@SuppressLint("ClickableViewAccessibility")
 	private Button buildLanguageSelector() {
+		TypedValue typedValue = new TypedValue();
+		getActivity().getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
+
 		languageButton=new Button(getActivity());
-		languageButton.setTextColor(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorSecondary));
+		languageButton.setTextColor(typedValue.data);
 		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);
@@ -1418,13 +1396,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		return attachments.size();
 	}
 
-	private void buildVisibilityPopup(View v){
-		visibilityPopup=new PopupMenu(getActivity(), v);
-		visibilityPopup.inflate(R.menu.compose_visibility);
-		Menu m=visibilityPopup.getMenu();
-		UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
+	private void onVisibilityClick(View v){
+		PopupMenu menu=new PopupMenu(getActivity(), v);
+		menu.inflate(R.menu.compose_visibility);
+		Menu m=menu.getMenu();
+		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 +1426,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				return true;
 			}
 		});
+		menu.show();
 	}
 
 	private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
@@ -1482,7 +1467,7 @@ 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;
 		});
 	}
 

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);
-		logoParams.setMargins(0, V.dp(2), 0, 0);
-		logoWrap.addView(toolbarLogo, logoParams);
+		logoWrap.addView(toolbarLogo, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER));
 		logoWrap.addView(toolbarShowNewPostsBtn, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, V.dp(32), Gravity.CENTER));
 
 		Toolbar toolbar=getToolbar();

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) {
-			Bundle args=new Bundle();
-			args.putString("account", accountID);
-			Nav.go(getActivity(), FollowRequestsListFragment.class, args);
-			return true;
-		} else if (item.getItemId() == R.id.clear_notifications) {
-			UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{
-				for (int i = 0; i < tabViews.length; i++) {
-					getFragmentForPage(i).reload();
-				}
-			});
-			return true;
-		}
-		return false;
+		if (item.getItemId() != R.id.follow_requests) return false;
+		Bundle args=new Bundle();
+		args.putString("account", accountID);
+		Nav.go(getActivity(), FollowRequestsListFragment.class, args);
+		return true;
 	}
 
 	@Override
@@ -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;
 
@@ -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;
 		});
 

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

@@ -9,7 +9,6 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -19,11 +18,8 @@ import android.view.WindowInsets;
 import android.view.WindowManager;
 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;
@@ -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;
@@ -55,6 +50,7 @@ import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 import androidx.annotation.DrawableRes;
@@ -90,7 +86,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();
@@ -107,58 +102,9 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
-			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
-			popupMenu.inflate(R.menu.color_palettes);
-			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 ColorPicker());
 
 		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();
@@ -175,21 +121,6 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			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->{
@@ -204,6 +135,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.loadNewPosts=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		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 HeaderItem(R.string.settings_notifications));
 		items.add(notificationPolicyItem=new NotificationPolicyItem());
@@ -211,48 +147,30 @@ 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 TextItem(R.string.sk_settings_profile, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/profile"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_posting, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/settings/preferences/other"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_filters, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/filters"), R.drawable.ic_fluent_open_24_regular));
-		items.add(new TextItem(R.string.sk_settings_auth, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit"), R.drawable.ic_fluent_open_24_regular));
+		items.add(new HeaderItem(R.string.settings_boring));
+		items.add(new TextItem(R.string.settings_account, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/auth/edit")));
+		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
+		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms")));
 
-		String instanceName = instance != null && !instance.title.isBlank() ? instance.title : session.domain;
-		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));
+		items.add(new RedHeaderItem(R.string.settings_spicy));
 		if (GithubSelfUpdater.needSelfUpdating()) {
 			checkForUpdateItem = new TextItem(R.string.sk_check_for_update, GithubSelfUpdater.getInstance()::checkForUpdates);
 			items.add(checkForUpdateItem);
 		}
+		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon")));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
+		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 
 		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
 	}
 
-	private void updatePublishText(Button btn) {
-		if (GlobalUserPreferences.publishButtonText.isBlank()) btn.setText(R.string.publish);
-		else btn.setText(GlobalUserPreferences.publishButtonText);
-	}
-
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
@@ -325,25 +243,11 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		restartActivityToApplyNewTheme();
 	}
 
-	private boolean onColorPreferenceClick(MenuItem item){
-		ColorPreference pref = null;
-		int id = item.getItemId();
+	private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){
 
-		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.color=color;
 		GlobalUserPreferences.save();
 		restartActivityToApplyNewTheme();
-		return true;
 	}
 
 	private void onTrueBlackThemeChanged(SwitchItem item){
@@ -515,10 +419,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 +453,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	public class ButtonItem 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;
-		}
-
+	public class ColorPicker extends Item{
 		@Override
 		public int getViewType(){
 			return 8;
@@ -586,42 +476,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) {
-			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){
+		public TextItem(@StringRes int text, Runnable onClick, boolean loading){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
-			this.icon=icon;
 		}
 
 		@Override
@@ -677,8 +544,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
-				case 8 -> new ButtonViewHolder();
-				case 9 -> new SmallTextViewHolder();
+				case 8 -> new ColorPickerViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -807,24 +673,81 @@ 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(){
-			super(getActivity(), R.layout.item_settings_button, list);
-			text=findViewById(R.id.text);
+		public ColorPickerViewHolder(){
+			super(getActivity(), R.layout.item_settings_color_picker, list);
 			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 if(id==R.id.red_color) {
+					pref = GlobalUserPreferences.ColorPreference.RED;
+					onColorPreferenceClick(pref);
+				}
+				else if(id==R.id.m3_color) {
+					if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+						pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
+						onColorPreferenceClick(pref);
+					}else{
+						Toast.makeText(getActivity(), R.string.sk_not_supported,
+								Toast.LENGTH_LONG).show();
+					}
+				}
+				else
+					return false;
+				return true;
+			});
+//			UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
+			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
+			button.setOnTouchListener(popupMenu.getDragToOpenListener());
+			button.setOnClickListener(v->popupMenu.show());
 		}
 
 		@Override
-		public void onBind(ButtonItem item){
-			text.setText(item.text);
-			icon.setImageResource(item.icon);
-			item.buttonConsumer.accept(button);
+		public void onBind(ColorPicker item){
+			icon.setImageResource(R.drawable.ic_color_theme_preference);
+			button.setText(switch(GlobalUserPreferences.color){
+				case PINK -> R.string.sk_color_theme_pink;
+				case PURPLE -> R.string.sk_color_theme_purple;
+				case GREEN -> R.string.sk_color_theme_green;
+				case BLUE -> R.string.sk_color_theme_blue;
+				case ORANGE -> R.string.sk_color_theme_brown;
+				case YELLOW -> R.string.sk_color_theme_yellow;
+				case RED -> R.string.sk_color_theme_red;
+				case MATERIAL3 -> R.string.sk_color_theme_material3;
+			});
 		}
 	}
 
@@ -874,20 +797,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 +816,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(){

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)){
-					s.getContentStatus().update(ev);
+				if(s.id.equals(ev.id)){
+					s.update(ev);
 				}
 			}
 		}

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

@@ -88,11 +88,11 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			tabView.setId(switch(switchIndex){
 				case 0 -> R.id.discover_local_timeline;
 				case 1 -> R.id.discover_federated_timeline;
-				case 2 -> R.id.discover_hashtags;
-				case 3 -> R.id.discover_posts;
-				case 4 -> R.id.discover_news;
-				case 5 -> R.id.discover_users;
-				case 6 -> R.id.discover_lists;
+				case 2 -> R.id.discover_lists;
+				case 3 -> R.id.discover_hashtags;
+				case 4 -> R.id.discover_posts;
+				case 5 -> R.id.discover_news;
+				case 6 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -104,7 +104,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
@@ -166,11 +165,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
 					case 1 -> R.string.sk_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 2 -> R.string.sk_list_timelines;
+					case 3 -> R.string.hashtags;
+					case 4 -> R.string.posts;
+					case 5 -> R.string.news;
+					case 6 -> R.string.for_you;
+
 					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

@@ -96,9 +96,9 @@ public class AccountActivationFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -36,10 +36,10 @@ import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class CustomWelcomeFragment extends InstanceCatalogFragment {
+public class CustomLoginFragment extends InstanceCatalogFragment {
 	private View headerView;
 
-	public CustomWelcomeFragment() {
+	public CustomLoginFragment() {
 		super(R.layout.fragment_welcome_custom, 1);
 	}
 
@@ -55,9 +55,9 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		dataLoaded();
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 
 		if (!canGoBack()) {
 			ImageView toolbarLogo=new ImageView(getActivity());
@@ -137,10 +137,9 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 		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.username)).setText("@moshidon");
 		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
+		((TextView) headerView.findViewById(R.id.timestamp)).setText(R.string.time_now);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
 		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
 
@@ -169,7 +168,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		return mergeAdapter;
 	}
 
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder> {
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
 		public InstancesAdapter(){
 			super(imgLoader);
 		}
@@ -205,6 +204,11 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 
 		public InstanceViewHolder(){
 			super(getActivity(), R.layout.item_instance_custom, list);
+
+//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
+//			TypedValue value = new TypedValue();
+//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
+//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
 			userCount=findViewById(R.id.user_count);

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

@@ -115,9 +115,9 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -80,7 +80,6 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 	private LinearLayout filtersWrap;
 	private HorizontalScrollView filtersScroll;
 	private ImageButton backBtn, clearSearchBtn;
-	private View focusThing;
 
 	private FilterChipView categoryGeneral, categorySpecialInterests;
 	private List<FilterChipView> regionalFilters;
@@ -286,13 +285,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 
 		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);
-		}
+		langFilter.setText(R.string.server_filter_any_language);
 		langFilterMenu=new PopupMenu(getContext(), langFilter);
 		langFilter.setOnTouchListener(langFilterMenu.getDragToOpenListener());
 		langFilter.setOnClickListener(v->langFilterMenu.show());
@@ -308,12 +301,8 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		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);
+		speedFilter.setText(R.string.server_filter_instant_signup);
+		speedFilter.setSelected(true);
 		filtersWrap.addView(speedFilter, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
 
 		speedFilterMenu.setOnMenuItemClickListener(item->{
@@ -339,13 +328,11 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 		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->{
@@ -364,8 +351,6 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			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){
@@ -565,7 +550,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment imple
 			searchEdit.setCompoundDrawableTintList(ColorStateList.valueOf(0));
 		}else{
 			filtersScroll.setVisibility(View.VISIBLE);
-			focusThing.requestFocus();
+			searchEdit.clearFocus();
 			searchEdit.setText("");
 			lp.addRule(RelativeLayout.END_OF, R.id.btn_back);
 			getActivity().getSystemService(InputMethodManager.class).hideSoftInputFromWindow(searchEdit.getWindowToken(), 0);

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

@@ -106,13 +106,13 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 				.execNoAuth("");
 	}
 
-	@Override
-	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
-		Toolbar toolbar=getToolbar();
-		toolbar.setElevation(0);
-		toolbar.setBackground(null);
-	}
+//	@Override
+//	protected void onUpdateToolbar(){
+//		super.onUpdateToolbar();
+//		Toolbar toolbar=getToolbar();
+//		toolbar.setElevation(0);
+//		toolbar.setBackground(null);
+//	}
 
 	@Override
 	protected RecyclerView.Adapter getAdapter(){

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

@@ -81,9 +81,9 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}

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

@@ -147,15 +147,15 @@ public class SignupFragment extends ToolbarFragment{
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
-	@Override
+//	@Override
 	protected void onUpdateToolbar(){
-		super.onUpdateToolbar();
+//		super.onUpdateToolbar();
 		getToolbar().setBackground(null);
 		getToolbar().setElevation(0);
 	}
 
 	private void onButtonClick(){
-		if(!password.getText().toString().equals(passwordConfirm.getText().toString())){
+		if(!password.getText().equals(passwordConfirm.getText())){
 			passwordConfirm.setError(getString(R.string.signup_passwords_dont_match));
 			passwordConfirmWrap.setErrorState();
 			return;

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/Status.java

@@ -40,6 +40,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 	public long favouritesCount;
 	public long repliesCount;
 	public Instant editedAt;
+	public boolean wantsTranslation;
 
 	public String url;
 	public String inReplyToId;

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

@@ -0,0 +1,146 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.api.ObjectValidationException;
+import org.joinmastodon.android.api.RequiredField;
+import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.parceler.Parcel;
+
+import java.time.Instant;
+import java.util.List;
+
+@Parcel
+public class StatusTranslation extends BaseModel implements DisplayItemsParent{
+//    @RequiredField
+    public String id;
+//    @RequiredField
+    public String uri;
+//    @RequiredField
+    public Instant createdAt;
+//    @RequiredField
+    public Account account;
+    //	@RequiredField
+    public String content;
+//    @RequiredField
+    public StatusPrivacy visibility;
+    public boolean sensitive;
+//    @RequiredField
+    public String spoilerText;
+//    @RequiredField
+    public List<Attachment> mediaAttachments;
+    public Application application;
+//    @RequiredField
+    public List<Mention> mentions;
+//    @RequiredField
+    public List<Hashtag> tags;
+//    @RequiredField
+    public List<Emoji> emojis;
+    public long reblogsCount;
+    public long favouritesCount;
+    public long repliesCount;
+    public Instant editedAt;
+
+    public String url;
+    public String inReplyToId;
+    public String inReplyToAccountId;
+    public Status reblog;
+    public Poll poll;
+    public Card card;
+    public String language;
+    public String text;
+
+    public boolean favourited;
+    public boolean reblogged;
+    public boolean muted;
+    public boolean bookmarked;
+    public boolean pinned;
+
+    public transient boolean spoilerRevealed;
+    public transient boolean hasGapAfter;
+    private transient String strippedText;
+
+    @Override
+    public void postprocess() throws ObjectValidationException{
+        super.postprocess();
+//        if(application!=null)
+//            application.postprocess();
+//        for(Mention m:mentions)
+//            m.postprocess();
+//        for(Hashtag t:tags)
+//            t.postprocess();
+//        for(Emoji e:emojis)
+//            e.postprocess();
+//        for(Attachment a:mediaAttachments)
+//            a.postprocess();
+//        account.postprocess();
+//        if(poll!=null)
+//            poll.postprocess();
+//        if(card!=null)
+//            card.postprocess();
+//        if(reblog!=null)
+//            reblog.postprocess();
+
+//        spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
+    }
+
+    @Override
+    public String toString(){
+        return "Status{"+
+                "id='"+id+'\''+
+                ", uri='"+uri+'\''+
+                ", createdAt="+createdAt+
+                ", account="+account+
+                ", content='"+content+'\''+
+                ", visibility="+visibility+
+                ", sensitive="+sensitive+
+                ", spoilerText='"+spoilerText+'\''+
+                ", mediaAttachments="+mediaAttachments+
+                ", application="+application+
+                ", mentions="+mentions+
+                ", tags="+tags+
+                ", emojis="+emojis+
+                ", reblogsCount="+reblogsCount+
+                ", favouritesCount="+favouritesCount+
+                ", repliesCount="+repliesCount+
+                ", url='"+url+'\''+
+                ", inReplyToId='"+inReplyToId+'\''+
+                ", inReplyToAccountId='"+inReplyToAccountId+'\''+
+                ", reblog="+reblog+
+                ", poll="+poll+
+                ", card="+card+
+                ", language='"+language+'\''+
+                ", text='"+text+'\''+
+                ", favourited="+favourited+
+                ", reblogged="+reblogged+
+                ", muted="+muted+
+                ", bookmarked="+bookmarked+
+                ", pinned="+pinned+
+                '}';
+    }
+
+    @Override
+    public String getID(){
+        return id;
+    }
+
+    public void update(StatusCountersUpdatedEvent ev){
+        favouritesCount=ev.favorites;
+        reblogsCount=ev.reblogs;
+        repliesCount=ev.replies;
+        favourited=ev.favorited;
+        reblogged=ev.reblogged;
+        bookmarked=ev.bookmarked;
+        pinned=ev.pinned;
+    }
+
+    public StatusTranslation getContentStatus(){
+        return this;
+    }
+
+    public String getStrippedText(){
+        if(strippedText==null)
+            strippedText=HtmlParser.strip(content);
+        return strippedText;
+    }
+}

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/ui/AccountSwitcherSheet.java

@@ -23,7 +23,7 @@ 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.onboarding.CustomLoginFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -77,7 +77,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, CustomLoginFragment.class, null);
 			dismiss();
 		}));
 

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

@@ -6,11 +6,12 @@ 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.view.animation.AnimationSet;
+import android.view.animation.ScaleAnimation;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -25,6 +26,8 @@ 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.V;
@@ -50,9 +53,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		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
 			public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info){
@@ -63,12 +63,12 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		};
 
 		static {
-			opacityOut = new AlphaAnimation(1, 0.55f);
-			opacityOut.setDuration(300);
+			opacityOut = new AlphaAnimation(1, 0.5f);
+			opacityOut.setDuration(200);
 			opacityOut.setInterpolator(CubicBezierInterpolator.DEFAULT);
 			opacityOut.setFillAfter(true);
-			opacityIn = new AlphaAnimation(0.55f, 1);
-			opacityIn.setDuration(300);
+			opacityIn = new AlphaAnimation(0.5f, 1);
+			opacityIn.setDuration(150);
 			opacityIn.setInterpolator(CubicBezierInterpolator.DEFAULT);
 		}
 
@@ -95,7 +95,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			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);
@@ -105,7 +104,6 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			bookmark.setAccessibilityDelegate(buttonAccessibilityDelegate);
 			share.setOnTouchListener(this::onButtonTouch);
 			share.setOnClickListener(this::onShareClick);
-			share.setOnLongClickListener(this::onShareLongClick);
 			share.setAccessibilityDelegate(buttonAccessibilityDelegate);
 		}
 
@@ -131,35 +129,28 @@ 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));
 			Nav.go(item.parentFragment.getActivity(), ComposeFragment.class, args);
 		}
 
+		private boolean onButtonTouch(View v, MotionEvent event){
+			int action = event.getAction();
+			// 20dp to center in middle of icon, because: (icon width = 24dp) / 2 + (paddingStart = 8dp)
+			v.setPivotX(V.dp(20));
+			if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+				v.animate().scaleX(1).scaleY(1).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(100).start();
+				if (action == MotionEvent.ACTION_UP) v.performClick();
+			} else if (action == MotionEvent.ACTION_DOWN) {
+				v.animate().scaleX(0.85f).scaleY(0.85f).setInterpolator(CubicBezierInterpolator.DEFAULT).setDuration(50).start();
+			}
+			return true;
+		}
+
 		private void onBoostClick(View v){
+			v.startAnimation(opacityOut);
 			boost.setSelected(!item.status.reblogged);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setReblogged(item.status, !item.status.reblogged, r->{
 				v.startAnimation(opacityIn);
@@ -167,19 +158,8 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 			});
 		}
 
-		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){
+			v.startAnimation(opacityOut);
 			favorite.setSelected(!item.status.favourited);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setFavorited(item.status, !item.status.favourited, r->{
 				v.startAnimation(opacityIn);
@@ -188,25 +168,20 @@ public class FooterStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onBookmarkClick(View v){
-			bookmark.setSelected(!item.status.bookmarked);
+			v.startAnimation(opacityOut);
+			bookmark.setSelected(item.status.bookmarked);
 			AccountSessionManager.getInstance().getAccount(item.accountID).getStatusInteractionController().setBookmarked(item.status, !item.status.bookmarked, r->{
 				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;

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;
@@ -64,11 +60,11 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private SpannableStringBuilder parsedName;
 	public final Status status;
 	private boolean hasVisibilityToggle;
+	private boolean hasTranslateToggle;
 	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,10 +72,10 @@ 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){
+			hasTranslateToggle=true;
 			hasVisibilityToggle=status.sensitive || !TextUtils.isEmpty(status.spoilerText);
 			if(!hasVisibilityToggle && !status.mediaAttachments.isEmpty()){
 				for(Attachment att:status.mediaAttachments){
@@ -113,7 +109,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, translate;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -127,24 +123,20 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_header, parent);
+			translate=findViewById(R.id.translate);
 			name=findViewById(R.id.name);
 			username=findViewById(R.id.username);
 			timestamp=findViewById(R.id.timestamp);
 			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);
-				}
-			}));
+			translate.setOnClickListener(v->item.parentFragment.onRevealTranslationClick(this));
 
 			optionsMenu=new PopupMenu(activity, more);
 			optionsMenu.inflate(R.menu.post);
@@ -238,7 +230,7 @@ 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);
+			translate.setVisibility(item.hasTranslateToggle ? 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));
@@ -246,6 +238,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					visibility.setTooltipText(visibility.getContentDescription());
 				}
 			}
+			if(item.hasTranslateToggle){
+				translate.setImageResource(R.drawable.ic_translate);
+				translate.setSelected(item.status.wantsTranslation);
+			}
 			itemView.setPadding(itemView.getPaddingLeft(), itemView.getPaddingTop(), itemView.getPaddingRight(), item.needBottomPadding ? V.dp(16) : 0);
 			if(TextUtils.isEmpty(item.extraText)){
 				extraText.setVisibility(View.GONE);

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

@@ -89,12 +89,10 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{
 				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/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

@@ -8,24 +8,18 @@ import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.Button;
+import android.widget.LinearLayout;
 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.api.requests.statuses.GetStatusTranslation;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.StatusTranslation;
 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;
@@ -33,7 +27,6 @@ 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,21 +35,18 @@ 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);
 		this.text=text;
 		this.status=status;
+//		this.wantsTranslation=wantsTranslation;
 		emojiHelper.setText(text);
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
 			spoilerEmojiHelper=new CustomEmojiHelper();
 			spoilerEmojiHelper.setText(parsedSpoilerText);
 		}
-		session = AccountSessionManager.getInstance().getAccount(parentFragment.getAccountID());
 	}
 
 	@Override
@@ -81,10 +71,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 View spoilerOverlay, borderTop, borderBottom, textWrap, translateWrap, translateProgress;
-		private final int backgroundColor, borderColor;
-		private final Button translateButton;
+		private final TextView spoilerTitle, spoilerTitleInline;
+		private final View spoilerOverlay, borderTop, borderBottom;
+		private final Drawable backgroundColor, borderColor;
 
 		public Holder(Activity activity, ViewGroup parent){
 			super(activity, R.layout.display_item_text, parent);
@@ -95,90 +84,66 @@ 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
-							? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
-							: item.text);
+			if(item.status.wantsTranslation){
+				new GetStatusTranslation(item.status.id)
+						.setCallback(new Callback<StatusTranslation>(){
+							@Override
+							public void onSuccess(StatusTranslation status){
+								text.setText(status.getStrippedText());
+							}
+							@Override
+							public void onError(ErrorResponse error){
+								item.status.wantsTranslation=false;
+								text.setText(item.text);
+								error.showToast(item.parentFragment.getActivity());
+							}
+
+						})
+						.wrapProgress(item.parentFragment.getActivity(), R.string.loading, true)
+						.exec(item.parentFragment.getAccountID());
+			}else{
+				text.setText(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);
-			borderBottom.setBackgroundColor(item.inset ? 0 : borderColor);
+			borderTop.setBackground(item.inset ? null : borderColor);
+			borderBottom.setBackground(item.inset ? null : borderColor);
 			if(!TextUtils.isEmpty(item.status.spoilerText)){
 				spoilerTitle.setText(item.parsedSpoilerText);
 				spoilerTitleInline.setText(item.parsedSpoilerText);
 				if(item.status.spoilerRevealed){
 					spoilerOverlay.setVisibility(View.GONE);
 					spoilerHeader.setVisibility(View.VISIBLE);
-					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/text/HtmlParser.java

@@ -111,7 +111,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" -> {
@@ -182,7 +182,7 @@ public class HtmlParser{
 						ssb.append("…", new DeleteWhenCopiedSpan(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 					}else if(blockElements.contains(el.nodeName()) && node.nextSibling()!=null){
 						ssb.append("\n"); // line end
-						ssb.append("\n", new RelativeSizeSpan(0.65f), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); // margin after block
+						ssb.append("\n", new RelativeSizeSpan(0.75f), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); // margin after block
 					}
 				}
 			}

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/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;
@@ -471,25 +458,6 @@ public class UiUtils{
 		);
 	}
 
-	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);
 	}
@@ -688,76 +656,103 @@ public class UiUtils{
 	}
 
 	public static void setUserPreferredTheme(Context context){
-		context.setTheme(switch (theme) {
-			case LIGHT -> R.style.Theme_Mastodon_Light;
-			case DARK -> trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
-			default -> trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
-		});
-
-		ColorPalette palette = ColorPalette.palettes.get(GlobalUserPreferences.color);
-		if (palette != null) palette.apply(context);
-	}
-	public static boolean isDarkTheme(){
-		if(theme==GlobalUserPreferences.ThemePreference.AUTO)
-			return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
-		return theme==GlobalUserPreferences.ThemePreference.DARK;
-	}
-
-	// https://mastodon.foo.bar/@User
-	// https://mastodon.foo.bar/@User/43456787654678
-	// https://pleroma.foo.bar/users/User
-	// https://pleroma.foo.bar/users/9qTHT2ANWUdXzENqC0
-	// https://pleroma.foo.bar/notice/9sBHWIlwwGZi5QGlHc
-	// https://pleroma.foo.bar/objects/d4643c42-3ae0-4b73-b8b0-c725f5819207
-	// https://friendica.foo.bar/profile/user
-	// https://friendica.foo.bar/display/d4643c42-3ae0-4b73-b8b0-c725f5819207
-	// https://misskey.foo.bar/notes/83w6r388br (always lowercase)
-	// https://pixelfed.social/p/connyduck/391263492998670833
-	// https://pixelfed.social/connyduck
-	// https://gts.foo.bar/@goblin/statuses/01GH9XANCJ0TA8Y95VE9H3Y0Q2
-	// https://gts.foo.bar/@goblin
-	// https://foo.microblog.pub/o/5b64045effd24f48a27d7059f6cb38f5
-	//
-	// 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) {
-		URI uri;
-		try {
-			uri = new URI(urlString);
-		} catch (URISyntaxException e) {
-			return false;
+//		boolean isDarkTheme = isDarkTheme();
+		switch(GlobalUserPreferences.color){
+			case PINK:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack : R.style.Theme_Mastodon_AutoLightDark;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack : R.style.Theme_Mastodon_Dark;
+				});
+				break;
+			case PURPLE:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Original : R.style.Theme_Mastodon_AutoLightDark_Original;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Original;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Original : R.style.Theme_Mastodon_Dark_Original;
+				});
+				break;
+			case GREEN:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Green : R.style.Theme_Mastodon_AutoLightDark_Green;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Green;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Green : R.style.Theme_Mastodon_Dark_Green;
+				});
+				break;
+			case BLUE:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Blue : R.style.Theme_Mastodon_AutoLightDark_Blue;
+					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;
+			case RED:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Red : R.style.Theme_Mastodon_AutoLightDark_Red;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Red;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Red : R.style.Theme_Mastodon_Dark_Red;
+				});
+				break;
+			case MATERIAL3:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Material3 : R.style.Theme_Mastodon_AutoLightDark_Material3;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Material3;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Material3 : R.style.Theme_Mastodon_Dark_Material3;
+				});
+				break;
 		}
 
-		if (uri.getQuery() != null || uri.getFragment() != null || uri.getPath() == null) return false;
-
-		String it = uri.getPath();
-		return it.matches("^/@[^/]+$") ||
-			it.matches("^/@[^/]+/\\d+$") ||
-			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 boolean isDarkTheme(){
+		if(GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.AUTO)
+			return (MastodonApp.context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)==Configuration.UI_MODE_NIGHT_YES;
+		return GlobalUserPreferences.theme==GlobalUserPreferences.ThemePreference.DARK;
 	}
 
-	public static void openURL(Context context, 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);
-			});
-		};
-
+	public static void openURL(Context context, @Nullable String accountID, String url){
 		Uri uri=Uri.parse(url);
-		List<String> path=uri.getPathSegments();
-		if(accountID!=null && "https".equals(uri.getScheme())){
-			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())){
+		if(accountID!=null && "https".equals(uri.getScheme()) && AccountSessionManager.getInstance().getAccount(accountID).domain.equalsIgnoreCase(uri.getAuthority())){
+			List<String> path=uri.getPathSegments();
+			// Match URLs like https://mastodon.social/@Gargron/108132679274083591
+			if(path.size()==2 && path.get(0).matches("^@[a-zA-Z0-9_]+$") && path.get(1).matches("^[0-9]+$")){
 				new GetStatusByID(path.get(1))
 						.setCallback(new Callback<>(){
 							@Override
@@ -774,61 +769,11 @@ public class UiUtils{
 								launchWebBrowser(context, url);
 							}
 						})
-						.wrapProgress((Activity)context, R.string.loading, true, transformDialogForLookup)
-						.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)
+						.wrapProgress((Activity)context, R.string.loading, true)
 						.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/utils/MastodonLanguage.java

@@ -7,6 +7,7 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.LocaleList;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.model.Instance;
 
 import java.util.ArrayList;

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="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
+	<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="?colorButtonBackgroundPrimaryLightOnDarkDisabled"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
+	<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="?colorButtonBackgroundSecondaryDarkOnLightDisabled"/>
+	<item android:color="?colorBackgroundLightest" android:state_enabled="true"/>
+	<item android:color="?android:colorBackground"/>
 </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="?colorButtonBackgroundSecondaryLightOnDarkDisabled"/>
+	<item android:color="?colorPollVoted" android:state_enabled="true"/>
+	<item android:color="?colorSearchHint"/>
 </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="?colorButtonTextPrimaryDarkOnLightDisabled"/>
+	<item android:color="?colorSecondary" android:state_enabled="true"/>
+	<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="?colorButtonTextPrimaryLightOnDarkDisabled"/>
+	<item android:color="@color/black" android:state_enabled="true"/>
+	<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="?colorButtonTextSecondaryDarkOnLightDisabled"/>
+	<item android:color="?android:colorPrimary" android:state_enabled="true"/>
+	<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/translate_icon.xml

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

mastodon/src/main/res/drawable-anydpi-v24/ic_ntf_logo.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.9699526"
+      android:scaleY="0.9699526"
+      android:translateX="0.96"
+      android:translateY="6.925208">
+    <path
+        android:pathData="m3.639,-0c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L2.482,10.464L2.482,4.378c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L7.125,2.504 6.506,1.466C5.87,0.488 4.909,-0 3.639,-0Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m18.947,10.464q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM18.947,8.759q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#000000"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>

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

@@ -1,5 +1,18 @@
-<vector android:height="108dp" android:viewportHeight="320"
-    android:viewportWidth="320" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M166.45,143.88c-4.6,-0.61 -9.13,5 -10.12,12.53s1.93,14.12 6.53,14.72 9.13,-5 10.12,-12.53S171.05,144.48 166.45,143.88ZM166.53,164.39a3.65,3.65 0,1 1,2 -4.78A3.66,3.66 0,0 1,166.53 164.39Z"/>
-    <path android:fillColor="#fff" android:pathData="M233.41,296.2c-0.41,-7.41 -1.13,-14.84 -1.84,-22.24l-0.24,-2.52c0,-0.18 0,-0.36 -0.05,-0.54 -0.11,-1.1 -0.21,-2.19 -0.31,-3.29q-0.54,-5.83 -1,-11.72 -0.71,-8.82 -1.37,-17.7 -0.24,-3 -0.46,-5.91c-0.63,-7.89 -1.29,-15.8 -2.09,-23.68 -1.13,-11.06 -2.54,-22.09 -4.49,-33a6.62,6.62 0,0 0,-0.9 0.48c-8.37,5.44 -14.27,29.16 -17.82,37.65a1.24,1.24 0,0 1,-2.37 -0.36c-0.09,-0.92 -0.16,-1.83 -0.21,-2.75l2.78,-1.79 -2.91,-2.2c0,-0.23 0,-0.45 0,-0.68v-0.48c0,-0.26 0,-0.51 0,-0.77l2.71,-1.72 -2.58,-3c0,-0.62 0.05,-1.25 0.09,-1.87l3.57,-1 -3.19,-3.83c0.05,-0.58 0.12,-1.16 0.18,-1.74l4.77,-1.39 -4,-4.46 0.24,-1.5 5.55,-1.61 -4.54,-4c0.08,-0.4 0.17,-0.8 0.26,-1.2l5,-1.44 -3.93,-3.22c0.08,-0.34 0.15,-0.69 0.23,-1l6.51,-1.89 -4.68,-5.41c0.07,-0.25 0.14,-0.5 0.22,-0.75l5.89,-0.82 -3.72,-5.48 0.3,-0.69 5.59,1.21 -3.33,-5.65c0.18,-0.3 0.37,-0.59 0.55,-0.88l5.95,0.95 -2.68,-5 0,0c-1.39,-6.49 -6.72,-19.33 -6.72,-19.33a62.21,62.21 0,0 0,-5.78 -11.48c-9.59,-15.31 -27.16,-28.64 -44.56,-28.64a32.59,32.59 0,0 0,-7.59 0.89c-17.93,4.31 -32.31,24.52 -40.65,39.83 -9.37,17.22 -14.3,36.39 -18.8,55.34 -6.77,28.47 -10.5,57.56 -13.22,86.66 -2.25,24 -10,50.88 14.49,65.32 11.22,6.6 24.36,10.79 37.17,12.9a98,98 0,0 0,16 1.15c4.72,0 9.45,-0.22 14.16,-0.44l49.8,-2.29c0.72,0 1.46,-0.06 2.21,-0.06 4,0 8.15,0.65 10.26,3.85 0.25,-2.66 -2.08,-7 -4.86,-11.6l5.7,-1.29c0.15,-4.58 0.6,-8 2.5,-5.38 0.93,1.29 2.19,2.73 3.78,2.54 1.86,-0.23 2.65,-2.45 3,-4.3C234,319.42 234.06,307.82 233.41,296.2ZM158.81,334.39c-4.45,0.2 -9.06,0.42 -13.47,0.42a83.24,83.24 0,0 1,-13.54 -0.95c-12,-2 -23.1,-5.8 -32,-11 -5.66,-3.33 -8.42,-7.32 -9.52,-13.75 -1.25,-7.35 -0.11,-16.53 1.1,-26.24 0.45,-3.59 0.91,-7.3 1.26,-11 3.25,-34.69 7.22,-60.78 12.88,-84.59 4.38,-18.42 9,-36.24 17.39,-51.64 9.79,-18 21.37,-30.11 31,-32.42a17.66,17.66 0,0 1,4.08 -0.47c6.64,0 14.53,3.54 21.63,9.71 6.86,6 12.19,13.64 14.36,20.64 -5.36,13.5 -10.52,31.41 -12.51,44.37 -5.36,34.75 -9,99.6 -7.6,156.26Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.5091188"
+      android:scaleY="2.5091188">
+    <path
+        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#000000"/>
+  </group>
 </vector>

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="?colorWindowBackground"/>
 	<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_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>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.0653,14.9329C14.0639,14.9132 14.0475,14.8978 14.0278,14.8978C14.0125,14.8978 13.9987,14.9072 13.993,14.9214C13.6711,15.7244 13.2265,16.3336 12.6594,16.7489C12.0948,17.1603 11.4132,17.366 10.6146,17.366C9.5096,17.366 8.6183,16.9587 7.9407,16.144C7.2632,15.3293 6.9244,14.2202 6.9244,12.8167C6.9244,10.9857 7.3922,9.4773 8.3279,8.2916C9.2716,7.1059 10.4574,6.513 11.8851,6.513C12.4658,6.513 12.9659,6.6421 13.3854,6.9002C13.8048,7.1583 14.0992,7.489 14.2686,7.8923H14.317L14.3417,7.6527C14.3964,7.122 14.8435,6.7187 15.3769,6.7187C15.9898,6.7187 16.4699,7.246 16.4136,7.8562C16.2791,9.3148 16.1731,10.4964 16.0956,11.4011C16.0069,12.5223 15.9625,13.216 15.9625,13.4822C15.9544,14.1839 16.0512,14.7082 16.2529,15.0551C16.4545,15.4019 16.761,15.5753 17.1724,15.5753C17.9226,15.5753 18.5477,15.1276 19.0478,14.2323C19.5479,13.337 19.7979,12.1754 19.7979,10.7477C19.7979,8.7151 19.1446,7.0494 17.8379,5.7508C16.5312,4.4521 14.7284,3.8028 12.4295,3.8028C10.0177,3.8028 8.0415,4.6094 6.5009,6.2226C4.9683,7.8358 4.2021,9.8484 4.2021,12.2601C4.2021,14.6316 4.9159,16.5191 6.3436,17.9226C7.7713,19.318 9.7193,20.0157 12.1875,20.0157C13.1393,20.0157 14.0307,19.923 14.8615,19.7374C15.3602,19.6309 15.8386,19.4953 16.2966,19.3307C16.7909,19.153 17.3563,19.3639 17.5632,19.8467C17.7578,20.3007 17.5634,20.8314 17.1019,21.0073C16.5257,21.2269 15.9039,21.4046 15.2365,21.5402C14.2525,21.75 13.1837,21.8548 12.0302,21.8548C9.0135,21.8548 6.5856,20.9837 4.7465,19.2414C2.9155,17.4991 2,15.1922 2,12.3206C2,9.3765 2.9679,6.9204 4.9038,4.9522C6.8397,2.9841 9.3442,2 12.4174,2C15.2002,2 17.491,2.7985 19.2898,4.3956C21.0966,5.9847 22,8.0738 22,10.663C22,12.6473 21.4878,14.2605 20.4634,15.5027C19.4471,16.7449 18.217,17.366 16.7731,17.366C15.9504,17.366 15.3051,17.1482 14.8373,16.7126C14.3765,16.2837 14.1192,15.6904 14.0653,14.9329ZM12.1512,8.2674C11.2398,8.2674 10.5098,8.707 9.9613,9.5862C9.4128,10.4573 9.1385,11.5342 9.1385,12.8167C9.1385,13.6798 9.32,14.3573 9.683,14.8494C10.054,15.3333 10.542,15.5753 11.147,15.5753C12.0423,15.5753 12.7481,15.1236 13.2644,14.2202C13.7806,13.3087 14.0387,12.0988 14.0387,10.5904C14.0387,9.8403 13.8734,9.2676 13.5426,8.8723C13.2119,8.4691 12.7481,8.2674 12.1512,8.2674Z"
+      android:fillColor="#667085"/>
+</vector>

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

@@ -0,0 +1,23 @@
+
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06 0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38 1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+</vector>

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

@@ -3,21 +3,21 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M9,9.123C7.423,9.123 6.125,10.421 6.125,11.994C6.125,12.523 6.269,13.014 6.514,13.434C6.514,13.435 6.513,13.436 6.514,13.438L6.619,13.607L6.623,13.613C6.666,13.679 6.706,13.747 6.744,13.816L7.787,12.775C9.015,11.549 10.977,11.548 12.205,12.775C12.789,13.359 13.077,14.104 13.105,14.863L15.002,14.863C16.579,14.863 17.875,13.567 17.875,11.992C17.875,11.463 17.731,10.972 17.486,10.553L17.486,10.549L17.381,10.379C17.337,10.311 17.295,10.241 17.256,10.17L16.215,11.211C14.986,12.439 13.025,12.44 11.797,11.213C11.218,10.634 10.931,9.885 10.902,9.123L9,9.123z"
-      android:strokeWidth="3"
-      android:fillColor="#212121"/>
-  <path
-      android:pathData="M20.787,8.06C20.603,7.828 20.319,7.678 20,7.678c-0.552,0 -1,0.447 -1,0.999 0,0.208 0.064,0.401 0.172,0.561C19.695,10.028 20,10.975 20,11.993c0,2.759 -2.238,4.996 -4.999,4.996l-5.586,-0.001 1.294,-1.291 0.084,-0.095c0.281,-0.362 0.279,-0.872 -0.006,-1.231L10.709,14.284 10.614,14.2C10.252,13.92 9.741,13.922 9.382,14.206L9.294,14.284 6.289,17.287 6.206,17.382c-0.281,0.362 -0.279,0.872 0.006,1.231l0.078,0.087 3.005,3.003 0.094,0.083c0.392,0.305 0.96,0.277 1.32,-0.083 0.363,-0.362 0.389,-0.934 0.078,-1.326l-0.078,-0.087 -1.304,-1.303 5.596,0.001 0.241,-0.004C18.996,18.857 22,15.776 22,11.993 22,10.534 21.552,9.178 20.787,8.057Z"
-      android:fillColor="#212121"/>
-  <path
-      android:pathData="M14.712,2.289 L14.625,2.211C14.233,1.901 13.661,1.926 13.298,2.289L13.22,2.376C12.91,2.768 12.936,3.34 13.298,3.702l1.299,1.297 -5.598,0 -0.241,0.004C5.004,5.13 2,8.211 2,11.993c0,1.445 0.438,2.787 1.189,3.898 0.182,0.251 0.477,0.415 0.811,0.415 0.552,0 1,-0.447 1,-0.999C5,15.091 4.931,14.891 4.815,14.729L4.68,14.511C4.248,13.772 4,12.911 4,11.993 4,9.234 6.238,6.998 8.999,6.998L14.595,6.998 13.298,8.295 13.22,8.382c-0.311,0.392 -0.285,0.964 0.078,1.326 0.391,0.39 1.024,0.39 1.414,0L17.718,6.705 17.795,6.618C18.106,6.226 18.08,5.654 17.718,5.292Z"
-      android:strokeWidth="3"
-      android:fillColor="#212121"/>
-  <path
-      android:pathData="M20.11,5.619L20.11,5.619A1.393,0.037 0,0 1,21.503 5.656L21.503,5.656A1.393,0.037 0,0 1,20.11 5.693L20.11,5.693A1.393,0.037 0,0 1,18.717 5.656L18.717,5.656A1.393,0.037 0,0 1,20.11 5.619z"
-      android:strokeWidth="52.513"
-      android:fillColor="#613583"
-      android:fillType="evenOdd"
-      android:fillAlpha="0.0156863"/>
+    <path
+        android:pathData="M9,9.123C7.423,9.123 6.125,10.421 6.125,11.994C6.125,12.523 6.269,13.014 6.514,13.434C6.514,13.435 6.513,13.436 6.514,13.438L6.619,13.607L6.623,13.613C6.666,13.679 6.706,13.747 6.744,13.816L7.787,12.775C9.015,11.549 10.977,11.548 12.205,12.775C12.789,13.359 13.077,14.104 13.105,14.863L15.002,14.863C16.579,14.863 17.875,13.567 17.875,11.992C17.875,11.463 17.731,10.972 17.486,10.553L17.486,10.549L17.381,10.379C17.337,10.311 17.295,10.241 17.256,10.17L16.215,11.211C14.986,12.439 13.025,12.44 11.797,11.213C11.218,10.634 10.931,9.885 10.902,9.123L9,9.123z"
+        android:strokeWidth="3"
+        android:fillColor="#212121"/>
+    <path
+        android:pathData="M20.787,8.06C20.603,7.828 20.319,7.678 20,7.678c-0.552,0 -1,0.447 -1,0.999 0,0.208 0.064,0.401 0.172,0.561C19.695,10.028 20,10.975 20,11.993c0,2.759 -2.238,4.996 -4.999,4.996l-5.586,-0.001 1.294,-1.291 0.084,-0.095c0.281,-0.362 0.279,-0.872 -0.006,-1.231L10.709,14.284 10.614,14.2C10.252,13.92 9.741,13.922 9.382,14.206L9.294,14.284 6.289,17.287 6.206,17.382c-0.281,0.362 -0.279,0.872 0.006,1.231l0.078,0.087 3.005,3.003 0.094,0.083c0.392,0.305 0.96,0.277 1.32,-0.083 0.363,-0.362 0.389,-0.934 0.078,-1.326l-0.078,-0.087 -1.304,-1.303 5.596,0.001 0.241,-0.004C18.996,18.857 22,15.776 22,11.993 22,10.534 21.552,9.178 20.787,8.057Z"
+        android:fillColor="#212121"/>
+    <path
+        android:pathData="M14.712,2.289 L14.625,2.211C14.233,1.901 13.661,1.926 13.298,2.289L13.22,2.376C12.91,2.768 12.936,3.34 13.298,3.702l1.299,1.297 -5.598,0 -0.241,0.004C5.004,5.13 2,8.211 2,11.993c0,1.445 0.438,2.787 1.189,3.898 0.182,0.251 0.477,0.415 0.811,0.415 0.552,0 1,-0.447 1,-0.999C5,15.091 4.931,14.891 4.815,14.729L4.68,14.511C4.248,13.772 4,12.911 4,11.993 4,9.234 6.238,6.998 8.999,6.998L14.595,6.998 13.298,8.295 13.22,8.382c-0.311,0.392 -0.285,0.964 0.078,1.326 0.391,0.39 1.024,0.39 1.414,0L17.718,6.705 17.795,6.618C18.106,6.226 18.08,5.654 17.718,5.292Z"
+        android:strokeWidth="3"
+        android:fillColor="#212121"/>
+    <path
+        android:pathData="M20.11,5.619L20.11,5.619A1.393,0.037 0,0 1,21.503 5.656L21.503,5.656A1.393,0.037 0,0 1,20.11 5.693L20.11,5.693A1.393,0.037 0,0 1,18.717 5.656L18.717,5.656A1.393,0.037 0,0 1,20.11 5.619z"
+        android:strokeWidth="52.513"
+        android:fillColor="#613583"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.0156863"/>
 </vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M8.5 4h3c0-0.828-0.672-1.5-1.5-1.5S8.5 3.172 8.5 4zm-1 0c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5h5C17.776 4 18 4.224 18 4.5S17.776 5 17.5 5h-1.054l-1.194 10.344C15.077 16.858 13.796 18 12.272 18H7.728c-1.524 0-2.805-1.142-2.98-2.656L3.554 5H2.5C2.224 5 2 4.776 2 4.5S2.224 4 2.5 4h5zM9 8c0-0.276-0.224-0.5-0.5-0.5S8 7.724 8 8v6c0 0.276 0.224 0.5 0.5 0.5S9 14.276 9 14V8zm2.5-0.5C11.224 7.5 11 7.724 11 8v6c0 0.276 0.224 0.5 0.5 0.5S12 14.276 12 14V8c0-0.276-0.224-0.5-0.5-0.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M3.897 4.054L3.97 3.97c0.266-0.267 0.683-0.29 0.976-0.073L5.03 3.97 10 8.939l4.97-4.97c0.266-0.266 0.683-0.29 0.976-0.072L16.03 3.97c0.267 0.266 0.29 0.683 0.073 0.976L16.03 5.03 11.061 10l4.97 4.97c0.266 0.266 0.29 0.683 0.072 0.976L16.03 16.03c-0.266 0.267-0.683 0.29-0.976 0.073L14.97 16.03 10 11.061l-4.97 4.97c-0.266 0.266-0.683 0.29-0.976 0.072L3.97 16.03c-0.267-0.266-0.29-0.683-0.073-0.976L3.97 14.97 8.939 10l-4.97-4.97C3.704 4.764 3.68 4.347 3.898 4.054L3.97 3.97 3.897 4.054z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M12.82 5.58l-0.821 0.822-0.823-0.823c-2.1-2.1-5.503-2.1-7.602 0-2.099 2.099-2.099 5.502 0 7.601l7.896 7.896c0.293 0.293 0.767 0.293 1.06 0l7.902-7.897c2.094-2.106 2.098-5.5-0.002-7.6-2.103-2.102-5.507-2.102-7.61 0zm6.548 6.541L12 19.485 4.635 12.12c-1.513-1.514-1.513-3.967 0-5.48 1.513-1.514 3.967-1.514 5.48 0l1.357 1.357c0.298 0.298 0.783 0.292 1.074-0.013L13.88 6.64c1.517-1.517 3.973-1.517 5.49 0 1.513 1.514 1.51 3.96-0.002 5.481z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +1,3 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M20.998 6.25c0-1.795-1.454-3.25-3.25-3.25H6.25C4.455 3 3 4.455 3 6.25v11.499c0 1.795 1.455 3.25 3.25 3.25h4.914l0.356-1.424 0.02-0.076H6.25c-0.204 0-0.4-0.035-0.582-0.1l5.807-5.685 0.083-0.07c0.291-0.213 0.7-0.19 0.966 0.07l2.079 2.036 1.06-1.06-2.09-2.048-0.128-0.116c-0.878-0.738-2.187-0.7-3.02 0.116l-5.822 5.7C4.536 18.157 4.5 17.957 4.5 17.75V6.25c0-0.966 0.783-1.75 1.75-1.75h11.499c0.966 0 1.75 0.784 1.75 1.75v4.983c0.478-0.19 0.993-0.264 1.5-0.22V6.25zm-3.495 2.502c0-1.244-1.008-2.252-2.252-2.252-1.244 0-2.252 1.008-2.252 2.252 0 1.243 1.008 2.252 2.252 2.252 1.244 0 2.252-1.009 2.252-2.252zm-3.004 0C14.499 8.336 14.836 8 15.251 8s0.752 0.336 0.752 0.752c0 0.415-0.337 0.752-0.752 0.752s-0.752-0.337-0.752-0.752zm4.6 3.917l-5.902 5.901c-0.345 0.345-0.589 0.776-0.707 1.248l-0.457 1.83c-0.2 0.797 0.522 1.518 1.318 1.319l1.83-0.458c0.472-0.118 0.904-0.362 1.248-0.706L22.33 15.9c0.892-0.893 0.892-2.34 0-3.232-0.893-0.893-2.34-0.893-3.233 0z" android:fillColor="?colorGray25"/>
+    <path android:pathData="M20.998 6.25c0-1.795-1.454-3.25-3.25-3.25H6.25C4.455 3 3 4.455 3 6.25v11.499c0 1.795 1.455 3.25 3.25 3.25h4.914l0.356-1.424 0.02-0.076H6.25c-0.204 0-0.4-0.035-0.582-0.1l5.807-5.685 0.083-0.07c0.291-0.213 0.7-0.19 0.966 0.07l2.079 2.036 1.06-1.06-2.09-2.048-0.128-0.116c-0.878-0.738-2.187-0.7-3.02 0.116l-5.822 5.7C4.536 18.157 4.5 17.957 4.5 17.75V6.25c0-0.966 0.783-1.75 1.75-1.75h11.499c0.966 0 1.75 0.784 1.75 1.75v4.983c0.478-0.19 0.993-0.264 1.5-0.22V6.25zm-3.495 2.502c0-1.244-1.008-2.252-2.252-2.252-1.244 0-2.252 1.008-2.252 2.252 0 1.243 1.008 2.252 2.252 2.252 1.244 0 2.252-1.009 2.252-2.252zm-3.004 0C14.499 8.336 14.836 8 15.251 8s0.752 0.336 0.752 0.752c0 0.415-0.337 0.752-0.752 0.752s-0.752-0.337-0.752-0.752zm4.6 3.917l-5.902 5.901c-0.345 0.345-0.589 0.776-0.707 1.248l-0.457 1.83c-0.2 0.797 0.522 1.518 1.318 1.319l1.83-0.458c0.472-0.118 0.904-0.362 1.248-0.706L22.33 15.9c0.892-0.893 0.892-2.34 0-3.232-0.893-0.893-2.34-0.893-3.233 0z" android:fillColor="@color/gray_25"/>
 </vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="28dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,5v14h17L20,5L3,5zM7,7v2L5,9L5,7h2zM5,13v-2h2v2L5,13zM5,15h2v2L5,17v-2zM18,17L9,17v-2h9v2zM18,13L9,13v-2h9v2zM18,9L9,9L9,7h9v2z"/>
+</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M22 6.5c0 3.038-2.462 5.5-5.5 5.5S11 9.538 11 6.5 13.462 1 16.5 1 22 3.462 22 6.5zm-7.146-2.354c-0.196-0.195-0.512-0.195-0.708 0-0.195 0.196-0.195 0.512 0 0.708L15.793 6.5l-1.647 1.646c-0.195 0.196-0.195 0.512 0 0.707 0.196 0.196 0.512 0.196 0.708 0L16.5 7.208l1.646 1.647c0.196 0.195 0.512 0.195 0.708 0 0.195-0.196 0.195-0.512 0-0.707L17.207 6.5l1.647-1.646c0.195-0.196 0.195-0.512 0-0.708-0.196-0.195-0.512-0.195-0.708 0L16.5 5.793l-1.646-1.647zM19.5 14v-1.732c0.551-0.287 1.056-0.651 1.5-1.078v7.56c0 1.733-1.357 3.15-3.066 3.245L17.75 22H6.25c-1.733 0-3.15-1.357-3.245-3.066L3 18.75V7.25C3 5.517 4.356 4.1 6.066 4.005L6.25 4h4.248c-0.198 0.474-0.34 0.977-0.422 1.5H6.25c-0.918 0-1.671 0.707-1.744 1.606L4.5 7.25V14H9c0.38 0 0.694 0.282 0.743 0.648L9.75 14.75C9.75 15.993 10.757 17 12 17c1.19 0 2.166-0.925 2.245-2.096l0.005-0.154c0-0.38 0.282-0.694 0.648-0.743L15 14h4.5zm-15 1.5v3.25c0 0.918 0.707 1.671 1.606 1.744L6.25 20.5h11.5c0.918 0 1.671-0.707 1.744-1.607L19.5 18.75V15.5h-3.825c-0.335 1.648-1.75 2.904-3.475 2.995L12 18.5c-1.747 0-3.215-1.195-3.632-2.812L8.325 15.5H4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
-    <path android:pathData="M10 2c4.418 0 8 3.582 8 8 0 2.706-1.142 4.5-3 4.5-1.226 0-2.14-0.781-2.62-2.09C11.784 13.393 10.781 14 9.5 14 7.36 14 6 12.307 6 10c0-2.337 1.313-4 3.5-4 1.052 0 1.901 0.385 2.5 1.044V6.5C12 6.224 12.224 6 12.5 6c0.245 0 0.45 0.177 0.492 0.41L13 6.5V10c0 2.223 0.813 3.5 2 3.5s2-1.277 2-3.5c0-3.866-3.134-7-7-7s-7 3.134-7 7 3.134 7 7 7c0.823 0 1.626-0.142 2.383-0.416 0.26-0.094 0.547 0.04 0.64 0.3 0.095 0.26-0.04 0.546-0.3 0.64C11.859 17.838 10.94 18 10 18c-4.418 0-8-3.582-8-8s3.582-8 8-8zM9.5 7C7.924 7 7 8.17 7 10c0 1.797 0.966 3 2.5 3s2.5-1.203 2.5-3c0-1.83-0.924-3-2.5-3z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M12 2c5.43 0 9.848 4.327 9.996 9.72L22 12v1.525c-0.014 2.198-1.8 3.975-4 3.975-1.446 0-2.712-0.767-3.415-1.916-0.8 0.834-1.882 1.35-3.085 1.35-2.515 0-4.5-2.25-4.5-4.967C7 9.25 8.985 7 11.5 7c0.937 0 1.8 0.312 2.514 0.844C14.087 7.366 14.501 7 15 7c0.513 0 0.935 0.386 0.993 0.883L16 8v5.5c0 1.105 0.895 2 2 2 1.054 0 1.918-0.816 1.994-1.85L20 13.474V12c0-4.418-3.582-8-8-8s-8 3.582-8 8 3.582 8 8 8c0.921 0 1.82-0.155 2.67-0.456 0.52-0.184 1.092 0.089 1.276 0.61 0.184 0.52-0.089 1.091-0.61 1.276C14.275 21.806 13.15 22 12 22 6.477 22 2 17.523 2 12S6.477 2 12 2zm-0.35 7.005L11.5 9C10.15 9 9 10.302 9 11.967c0 1.664 1.15 2.966 2.5 2.966 1.3 0 2.415-1.207 2.495-2.783L14 11.93c-0.017-1.586-1.075-2.834-2.35-2.925L11.5 9l0.15 0.005z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M22 12v1.75c0 2.071-1.679 3.75-3.75 3.75-1.504 0-2.802-0.886-3.399-2.164C14.033 16.356 12.84 17 11.5 17 8.992 17 7 14.742 7 12s1.992-5 4.5-5c1.159 0 2.208 0.482 3.001 1.272L14.5 7.75C14.5 7.336 14.836 7 15.25 7c0.38 0 0.694 0.282 0.743 0.648L16 7.75v6c0 1.243 1.007 2.25 2.25 2.25 1.19 0 2.166-0.925 2.245-2.096L20.5 13.75V12c0-4.694-3.806-8.5-8.5-8.5S3.5 7.306 3.5 12s3.806 8.5 8.5 8.5c1.033 0 2.04-0.184 2.985-0.539 0.388-0.145 0.82 0.051 0.966 0.439 0.145 0.388-0.051 0.82-0.439 0.966C14.398 21.783 13.214 22 12 22 6.477 22 2 17.523 2 12S6.477 2 12 2c5.43 0 9.848 4.327 9.996 9.72L22 12v1.75V12zM11.5 8.5c-1.634 0-3 1.548-3 3.5s1.366 3.5 3 3.5 3-1.548 3-3.5-1.366-3.5-3-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M6.25 4.5C5.283 4.5 4.5 5.284 4.5 6.25v11.5c0 0.966 0.783 1.75 1.75 1.75h11.5c0.966 0 1.75-0.784 1.75-1.75v-4c0-0.414 0.335-0.75 0.75-0.75 0.414 0 0.75 0.336 0.75 0.75v4c0 1.795-1.456 3.25-3.25 3.25H6.25C4.455 21 3 19.545 3 17.75V6.25C3 4.455 4.455 3 6.25 3h4C10.664 3 11 3.336 11 3.75S10.664 4.5 10.25 4.5h-4zM13 3.75C13 3.336 13.335 3 13.75 3h6.5C20.664 3 21 3.336 21 3.75v6.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75V5.56l-5.22 5.22c-0.293 0.293-0.768 0.293-1.06 0-0.293-0.293-0.293-0.768 0-1.06l5.22-5.22h-4.69C13.335 4.5 13 4.164 13 3.75z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M11 17.5c0-1.289 0.376-2.49 1.023-3.5h-7.77c-1.242 0-2.25 1.007-2.25 2.25v0.919c0 0.572 0.18 1.13 0.511 1.596C4.056 20.929 6.58 22 10 22c0.932 0 1.797-0.08 2.592-0.24C11.601 20.62 11 19.13 11 17.5zm4-10.495c0-2.761-2.238-5-5-5-2.761 0-5 2.239-5 5s2.239 5 5 5c2.762 0 5-2.239 5-5zM23 17.5c0-3.037-2.462-5.5-5.5-5.5-3.037 0-5.5 2.463-5.5 5.5 0 3.038 2.463 5.5 5.5 5.5 3.038 0 5.5-2.462 5.5-5.5zm-5.59-3.492L17.5 14l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402L18 14.5V17h2.504l0.09 0.008c0.204 0.037 0.365 0.198 0.402 0.402l0.008 0.09-0.008 0.09c-0.037 0.204-0.198 0.365-0.402 0.402L20.504 18H18v2.5l-0.008 0.09c-0.037 0.204-0.198 0.365-0.402 0.402L17.5 21l-0.09-0.008c-0.204-0.037-0.364-0.198-0.402-0.402L17 20.5V18h-2.496l-0.09-0.008c-0.204-0.037-0.365-0.198-0.402-0.402l-0.008-0.09 0.008-0.09c0.037-0.204 0.198-0.365 0.402-0.402L14.504 17H17v-2.5l0.008-0.09c0.038-0.204 0.198-0.365 0.402-0.402z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.694 12L2.299 3.27C2.063 2.664 2.655 2.083 3.241 2.29l0.093 0.039 18 9c0.518 0.259 0.55 0.968 0.097 1.284l-0.097 0.058-18 9c-0.583 0.291-1.216-0.245-1.065-0.848l0.03-0.095L5.694 12 2.299 3.27 5.694 12zM4.402 4.54l2.61 6.71h6.627c0.38 0 0.693 0.282 0.743 0.648L14.389 12c0 0.38-0.282 0.693-0.649 0.743l-0.1 0.007H7.01l-2.609 6.71L19.322 12 4.401 4.54z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M8.502 11.5c0.554 0 1.002 0.448 1.002 1.002 0 0.553-0.448 1.002-1.002 1.002-0.553 0-1.002-0.449-1.002-1.002 0-0.554 0.449-1.003 1.002-1.003zM12 4.353v6.651h7.442L17.72 9.28c-0.267-0.266-0.29-0.683-0.073-0.977L17.72 8.22c0.266-0.266 0.683-0.29 0.976-0.072L18.78 8.22l2.997 2.998c0.266 0.266 0.29 0.682 0.073 0.976l-0.073 0.084-2.996 3.003c-0.293 0.294-0.767 0.294-1.06 0.002-0.267-0.266-0.292-0.683-0.075-0.977l0.073-0.084 1.713-1.717h-7.431L12 19.25c0 0.466-0.421 0.82-0.88 0.738l-8.5-1.501C2.26 18.424 2 18.112 2 17.748V5.75c0-0.368 0.266-0.681 0.628-0.74l8.5-1.396C11.585 3.539 12 3.89 12 4.354zm-1.5 0.883l-7 1.15v10.732l7 1.236V5.237zM13 18.5h0.765l0.102-0.007c0.366-0.05 0.649-0.364 0.648-0.744l-0.007-4.25H13v5zm0.002-8.502L13 8.726V5h0.745c0.38 0 0.693 0.281 0.743 0.647l0.007 0.101L14.502 10h-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.997 12c0 0.38 0.282 0.694 0.647 0.743l0.102 0.007H19.44l-2.216 2.22c-0.266 0.266-0.29 0.683-0.073 0.976l0.073 0.084c0.266 0.267 0.682 0.29 0.975 0.073l0.084-0.073 3.497-3.5c0.267-0.266 0.29-0.683 0.073-0.976L21.78 11.47l-3.497-3.5c-0.292-0.293-0.767-0.293-1.06 0-0.265 0.266-0.29 0.683-0.072 0.976l0.073 0.084 2.216 2.22H6.746c-0.414 0-0.75 0.336-0.75 0.75zM2 12c0 2.761 2.237 5 4.996 5 2.143 0 3.972-1.351 4.68-3.25h-1.651C9.42 14.797 8.29 15.5 6.995 15.5 5.066 15.5 3.5 13.933 3.5 12s1.565-3.5 3.497-3.5c1.294 0 2.425 0.704 3.03 1.75h1.651C10.968 8.352 9.14 7 6.996 7 4.236 7 2 9.239 2 12z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>

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

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M16.953 5.303c0.167-0.526-0.124-1.088-0.65-1.256-0.526-0.167-1.089 0.124-1.256 0.65-0.124 0.389-0.236 0.899-0.324 1.344-0.565 0.012-1.12 0-1.652-0.038-0.55-0.04-1.03 0.375-1.069 0.926-0.039 0.55 0.376 1.03 0.927 1.069 0.46 0.032 0.934 0.048 1.416 0.047-0.106 0.612-0.184 1.176-0.24 1.697-1.263 0.717-2.142 1.685-2.636 2.701-0.624 1.283-0.7 2.857 0.239 3.883 0.675 0.736 1.704 0.758 2.499 0.588 0.322-0.068 0.654-0.176 0.988-0.32 0.255 0.346 0.716 0.5 1.142 0.348 0.52-0.186 0.79-0.759 0.604-1.278L16.9 15.549c1.148-0.931 2.202-2.307 2.735-4.06 0.286 0.251 0.507 0.55 0.658 0.864 0.284 0.594 0.334 1.271 0.099 1.91-0.234 0.633-0.78 1.313-1.84 1.843-0.493 0.247-0.694 0.847-0.447 1.341 0.247 0.494 0.848 0.695 1.342 0.448 1.44-0.72 2.385-1.758 2.821-2.94 0.434-1.176 0.332-2.414-0.17-3.464-0.44-0.918-1.171-1.68-2.104-2.165C19.998 9.22 20 9.11 20 9c0-0.552-0.448-1-1-1-0.473 0-0.87 0.329-0.974 0.77-0.567-0.045-1.17-0.003-1.796 0.138 0.047-0.304 0.102-0.626 0.166-0.964 0.977-0.094 1.944-0.253 2.842-0.473 0.536-0.131 0.864-0.672 0.733-1.209-0.131-0.536-0.673-0.864-1.21-0.733-0.621 0.152-1.285 0.272-1.963 0.358 0.048-0.208 0.1-0.409 0.155-0.583zm-3.686 8.015c0.166-0.34 0.414-0.697 0.758-1.037 0.02 0.348 0.053 0.67 0.098 0.973 0.083 0.56 0.207 1.048 0.341 1.477-0.243 0.109-0.47 0.184-0.674 0.227-0.429 0.092-0.588 0.019-0.614 0.006l-0.004-0.001c-0.162-0.193-0.329-0.774 0.095-1.645zm4.498-2.562c-0.308 1.112-0.89 2.03-1.568 2.73-0.035-0.164-0.067-0.338-0.095-0.525-0.076-0.513-0.117-1.132-0.088-1.904 0.033-0.013 0.067-0.024 0.1-0.036l1.651-0.265zm-1.651 0.265l1.651-0.265c-0.495-0.025-1.049 0.053-1.651 0.265zM7.536 6.29c-2.02-0.589-3.67-0.038-4.456 0.33-0.5 0.234-0.716 0.83-0.482 1.33 0.234 0.5 0.83 0.715 1.33 0.481 0.53-0.248 1.66-0.626 3.048-0.222 0.365 0.107 0.569 0.248 0.69 0.37 0.122 0.123 0.204 0.27 0.258 0.454 0.067 0.225 0.087 0.446 0.09 0.69C7.84 9.68 7.655 9.64 7.459 9.606c-1.146-0.199-2.733-0.215-4.262 0.64-1.271 0.713-1.796 2.168-1.682 3.448 0.12 1.326 0.94 2.679 2.572 3.136 1.48 0.414 2.913-0.045 3.877-0.507l0.08-0.04c0.122 0.416 0.506 0.719 0.96 0.719 0.553 0 1-0.448 1-1V10.5c0-0.053 0.002-0.12 0.005-0.2 0.012-0.417 0.034-1.16-0.168-1.838C9.71 8.023 9.48 7.57 9.086 7.172S8.176 6.478 7.538 6.29H7.537zm-0.419 5.287c0.344 0.06 0.647 0.143 0.887 0.222v2.197c-0.224 0.156-0.538 0.35-0.904 0.525-0.792 0.38-1.682 0.605-2.473 0.384-0.698-0.195-1.06-0.742-1.119-1.389-0.062-0.693 0.243-1.286 0.667-1.523 0.987-0.553 2.06-0.569 2.943-0.415z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

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

@@ -1,3 +1,3 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
     <path android:pathData="M16.961 5.987c0.13-0.394-0.082-0.818-0.475-0.949-0.393-0.13-0.818 0.083-0.948 0.476-0.148 0.445-0.304 1.04-0.42 1.512-0.736 0.026-1.446 0.018-2.067-0.024-0.413-0.028-0.771 0.284-0.8 0.697-0.027 0.413 0.285 0.771 0.698 0.8 0.563 0.038 1.19 0.05 1.844 0.037-0.144 0.765-0.241 1.449-0.3 2.064-1.215 0.642-2.061 1.504-2.539 2.412-0.613 1.166-0.66 2.556 0.206 3.443 0.571 0.584 1.408 0.64 2.129 0.485 0.405-0.087 0.825-0.248 1.24-0.474l0.018 0.046c0.145 0.389 0.577 0.586 0.965 0.44 0.388-0.144 0.585-0.576 0.44-0.964-0.056-0.152-0.114-0.291-0.17-0.424 1.023-0.936 1.915-2.308 2.285-4.047 0.638 0.312 1.07 0.836 1.278 1.4 0.227 0.613 0.213 1.312-0.097 1.952-0.308 0.636-0.933 1.265-2.015 1.681-0.387 0.149-0.58 0.583-0.431 0.97 0.149 0.386 0.582 0.579 0.969 0.43 1.387-0.533 2.33-1.402 2.827-2.427 0.494-1.02 0.518-2.143 0.154-3.127-0.414-1.116-1.3-2.01-2.505-2.424 0.002-0.073 0.003-0.147 0.003-0.222C19.25 9.336 18.914 9 18.5 9c-0.405 0-0.735 0.322-0.75 0.724-0.524-0.005-1.084 0.07-1.672 0.237 0.064-0.455 0.148-0.953 0.257-1.5 1.185-0.089 2.364-0.252 3.337-0.48 0.403-0.095 0.653-0.5 0.558-0.902-0.095-0.404-0.498-0.654-0.902-0.559-0.767 0.18-1.69 0.318-2.637 0.406 0.085-0.33 0.18-0.67 0.27-0.94zm-3.68 7.723c0.227-0.43 0.6-0.886 1.147-1.3 0.017 0.492 0.065 0.926 0.137 1.317 0.094 0.52 0.236 0.974 0.386 1.373-0.306 0.171-0.632 0.3-0.977 0.374-0.485 0.104-0.687-0.012-0.742-0.068-0.24-0.245-0.394-0.853 0.05-1.696zm4.315-2.487c-0.21 0.966-0.7 2.022-1.414 2.848-0.052-0.184-0.1-0.385-0.142-0.612-0.089-0.49-0.14-1.092-0.111-1.866 0.11-0.042 0.222-0.082 0.339-0.12 0.481-0.16 0.924-0.238 1.328-0.25zM7.96 6.53C5.72 5.878 3.958 6.681 3.385 6.997c-0.363 0.2-0.494 0.657-0.294 1.02C3.29 8.378 3.747 8.51 4.11 8.31c0.405-0.223 1.736-0.833 3.43-0.34 0.773 0.227 1.098 0.64 1.264 1.056 0.133 0.332 0.175 0.691 0.188 1.042-0.27-0.075-0.581-0.15-0.923-0.21-1.132-0.202-2.682-0.263-4.122 0.427-1.586 0.76-2.13 2.316-1.902 3.697 0.224 1.356 1.216 2.666 2.8 2.951 1.43 0.258 2.806-0.256 3.757-0.761 0.14-0.074 0.271-0.148 0.396-0.222v0.3c0 0.414 0.335 0.75 0.75 0.75 0.414 0 0.75-0.336 0.75-0.75v-5.79c0-0.454 0-1.236-0.3-1.99-0.331-0.829-1.005-1.578-2.236-1.94H7.96zm-0.153 4.804c0.483 0.086 0.898 0.206 1.19 0.305v2.506l-0.105 0.078C8.653 14.4 8.31 14.63 7.9 14.847c-0.84 0.447-1.85 0.779-2.788 0.61-0.845-0.152-1.445-0.866-1.586-1.72-0.138-0.83 0.179-1.673 1.07-2.1 1.037-0.496 2.226-0.478 3.212-0.303z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
+</vector>

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>

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

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.5091188"
+      android:scaleY="2.5091188">
+    <path
+        android:pathData="M0,0h43.043v43.043h-43.043z"
+        android:strokeWidth="1.53886"
+        android:fillColor="#282c37"/>
+    <path
+        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#eed7f4"/>
+    <path
+        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#eed7f4"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>

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

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.5091188"
+      android:scaleY="2.5091188">
+    <path
+        android:pathData="m13.779,16.29c-1.097,0 -1.983,0.387 -2.658,1.141 -0.655,0.754 -0.981,1.771 -0.981,3.053l0,6.27L12.622,26.754L12.622,20.668c0,-1.284 0.539,-1.935 1.618,-1.935 1.192,0 1.791,0.773 1.791,2.3l0,3.331l2.468,0l0,-3.331c0,-1.527 0.598,-2.3 1.791,-2.3 1.078,0 1.618,0.651 1.618,1.935l0,6.085l2.482,0l0,-6.27c0,-1.281 -0.326,-2.299 -0.981,-3.053 -0.676,-0.754 -1.56,-1.141 -2.658,-1.141 -1.27,0 -2.232,0.488 -2.868,1.466L17.265,18.794 16.646,17.756C16.01,16.778 15.049,16.29 13.779,16.29Z"
+        android:strokeWidth="0.796"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="m29.087,26.754q-1.113,0 -1.986,-0.493 -0.873,-0.507 -1.366,-1.366 -0.479,-0.873 -0.479,-1.958 0,-1.07 0.479,-1.944 0.493,-0.873 1.366,-1.366 0.873,-0.507 1.986,-0.507 1.099,0 1.972,0.507 0.873,0.493 1.352,1.366 0.493,0.873 0.493,1.944 0,1.085 -0.493,1.958 -0.479,0.859 -1.352,1.366 -0.873,0.493 -1.972,0.493zM29.087,25.049q0.535,0 0.986,-0.254 0.451,-0.254 0.718,-0.732 0.268,-0.479 0.268,-1.127 0,-0.634 -0.268,-1.113 -0.268,-0.479 -0.718,-0.732 -0.451,-0.254 -0.986,-0.254 -0.535,0 -0.986,0.254 -0.451,0.254 -0.732,0.732 -0.268,0.479 -0.268,1.113 0,0.634 0.268,1.127 0.282,0.479 0.732,0.732 0.451,0.254 0.986,0.254z"
+        android:strokeWidth="0.687"
+        android:fillColor="#000000"/>
+  </group>
+</vector>

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

@@ -1,10 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="320"
-    android:viewportWidth="320" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:rotation="90" android:translateX="304" android:translateY="16" android:scaleX=".9" android:scaleY=".9">
-        <clip-path android:pathData="M0,0 0,320 320,320 320,0">
-            <path android:fillColor="#fff" android:pathData="M331.17,455.15c-0.9,-16.19 -2.47,-32.4 -4,-48.56 -0.18,-1.83 -0.35,-3.66 -0.53,-5.49 0,-0.4 -0.07,-0.79 -0.11,-1.19 -0.23,-2.39 -0.45,-4.79 -0.67,-7.18q-1.17,-12.75 -2.2,-25.6c-1,-12.83 -2,-25.72 -3,-38.63q-0.5,-6.45 -1,-12.91c-1.36,-17.23 -2.81,-34.48 -4.56,-51.69 -2.47,-24.15 -5.54,-48.22 -9.8,-72a13.13,13.13 0,0 0,-2 1c-18.27,11.86 -31.15,63.65 -38.89,82.19a2.7,2.7 0,0 1,-5.18 -0.79c-0.53,-5.37 -0.76,-10.78 -0.77,-16.2v-1.05a303.5,303.5 0,0 1,7.59 -65.79c4.46,-19.78 9.28,-44 23.15,-59.59 0.23,-0.26 1.83,-1.9 1.83,-1.9 -3,-14.17 -14.66,-42.19 -14.67,-42.2a136.07,136.07 0,0 0,-12.61 -25.07C242.82,29.09 204.46,0 166.47,0a70.43,70.43 0,0 0,-16.56 1.94c-39.17,9.42 -70.55,53.52 -88.75,87C40.69,126.5 29.93,168.34 20.1,209.72 5.32,271.87 -2.82,335.37 -8.77,398.91 -13.67,451.32 -30.7,510 22.87,541.51c24.5,14.41 53.18,23.56 81.15,28.16a213.92,213.92 0,0 0,34.86 2.51c10.31,0 20.64,-0.47 30.93,-0.95l108.72,-5c1.57,-0.07 3.2,-0.12 4.83,-0.12 8.69,0 17.78,1.42 22.39,8.4 0.55,-5.81 -4.53,-15.25 -10.6,-25.33l12.44,-2.81c0.31,-10 1.32,-17.53 5.46,-11.76 2,2.84 4.78,6 8.24,5.55 4.06,-0.49 5.79,-5.35 6.52,-9.37C332.36,505.83 332.59,480.52 331.17,455.15ZM168.3,538.52c-9.72,0.45 -19.77,0.91 -29.42,0.91a180.1,180.1 0,0 1,-29.54 -2.07C83.06,533 58.9,524.71 39.48,513.28c-12.37,-7.27 -18.39,-16 -20.79,-30 -2.74,-16 -0.24,-36.07 2.41,-57.29 1,-7.83 2,-15.93 2.74,-24C30.92,326.23 39.59,269.28 52,217.29c9.57,-40.22 19.67,-79.12 38,-112.74 21.38,-39.27 46.67,-65.73 67.64,-70.77a37.8,37.8 0,0 1,8.91 -1c14.5,0 31.71,7.73 47.22,21.2C228.67,67 240.3,83.72 245,99c-11.69,29.46 -22.95,68.57 -27.31,96.85C206,271.74 198.13,413.31 201.13,537Z"/>
-            <path android:fillColor="#fff" android:pathData="M177.15,182.12a30.01,18.34 97.5,1 0,7.83 -59.51a30.01,18.34 97.5,1 0,-7.83 59.51z"/>
-            <path android:fillColor="#fff" android:pathData="M0,320 320,320 288,288 32,288"/>
-        </clip-path>
-    </group>
-</vector>

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

@@ -5,5 +5,5 @@
     android:viewportHeight="4">
   <path
       android:pathData="M4,2C4,3.1046 3.1046,4 2,4C0.8954,4 0,3.1046 0,2C0,0.8954 0.8954,0 2,0C3.1046,0 4,0.8954 4,2ZM10,2C10,3.1046 9.1046,4 8,4C6.8954,4 6,3.1046 6,2C6,0.8954 6.8954,0 8,0C9.1046,0 10,0.8954 10,2ZM14,4C15.1046,4 16,3.1046 16,2C16,0.8954 15.1046,0 14,0C12.8954,0 12,0.8954 12,2C12,3.1046 12.8954,4 14,4Z"
-      android:fillColor="?colorGray500"/>
+      android:fillColor="@color/gray_500"/>
 </vector>

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

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

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

@@ -1,34 +1,31 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="124.78dp"
-    android:height="22.75dp"
-    android:viewportWidth="124.78"
-    android:viewportHeight="22.75">
+    android:width="109.08dp"
+    android:height="18.02dp"
+    android:viewportWidth="109.08"
+    android:viewportHeight="18.02">
   <path
-      android:pathData="m26.16,17.57q-1.82,0 -3.29,-0.84 -1.46,-0.84 -2.3,-2.3 -0.82,-1.49 -0.82,-3.34 0,-1.75 0.82,-3.24 0.82,-1.51 2.26,-2.4 1.44,-0.89 3.22,-0.89 1.9,0 3.26,0.82 1.37,0.82 2.06,2.23 0.72,1.42 0.72,3.14 0,0.55 -0.07,1.06h-9.19q0.24,1.46 1.15,2.23 0.94,0.74 2.23,0.74 1.08,0 1.85,-0.46 0.79,-0.48 1.25,-1.27l2.54,1.25q-1.87,3.26 -5.69,3.26zM29.07,9.58q-0.05,-0.58 -0.43,-1.13 -0.36,-0.58 -1.03,-0.94 -0.65,-0.38 -1.54,-0.38 -1.13,0 -1.94,0.67 -0.79,0.65 -1.15,1.78z"
+      android:pathData="m26.28,18.02q-1.9,0 -3.38,-0.84 -1.49,-0.86 -2.33,-2.33 -0.82,-1.49 -0.82,-3.34 0,-1.82 0.82,-3.31 0.84,-1.49 2.33,-2.33 1.49,-0.86 3.38,-0.86 1.87,0 3.36,0.86 1.49,0.84 2.3,2.33 0.84,1.49 0.84,3.31 0,1.85 -0.84,3.34 -0.82,1.46 -2.3,2.33 -1.49,0.84 -3.36,0.84zM26.28,15.12q0.91,0 1.68,-0.43 0.77,-0.43 1.22,-1.25 0.46,-0.82 0.46,-1.92 0,-1.08 -0.46,-1.9 -0.46,-0.82 -1.22,-1.25 -0.77,-0.43 -1.68,-0.43 -0.91,0 -1.68,0.43 -0.77,0.43 -1.25,1.25 -0.46,0.82 -0.46,1.9 0,1.08 0.46,1.92 0.48,0.82 1.25,1.25 0.77,0.43 1.68,0.43z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m40.27,22.75q-2.33,0 -3.86,-1.06 -1.54,-1.03 -2.06,-2.5l2.95,-1.2q0.38,0.91 1.18,1.44 0.79,0.53 1.8,0.53 1.49,0 2.35,-0.91 0.89,-0.91 0.89,-2.59v-0.96h-0.19q-0.58,0.82 -1.51,1.25 -0.94,0.43 -2.14,0.43 -1.51,0 -2.83,-0.77 -1.3,-0.79 -2.09,-2.21 -0.79,-1.44 -0.79,-3.34 0,-1.9 0.79,-3.31 0.79,-1.44 2.09,-2.21 1.32,-0.79 2.83,-0.79 1.2,0 2.14,0.43 0.94,0.43 1.51,1.25h0.19v-1.3h3.02L46.54,16.34q0,1.97 -0.77,3.41 -0.77,1.44 -2.18,2.21 -1.42,0.79 -3.31,0.79zM40.32,14.33q1.32,0 2.26,-0.91 0.94,-0.94 0.94,-2.54 0,-1.66 -0.94,-2.54 -0.91,-0.91 -2.26,-0.91 -1.34,0 -2.28,0.91 -0.94,0.91 -0.94,2.54 0,1.63 0.94,2.54 0.94,0.91 2.28,0.91z"
+      android:pathData="m39.72,18.02q-2.23,0 -3.62,-0.91 -1.37,-0.91 -1.92,-2.38l2.81,-1.22q0.38,0.86 1.08,1.32 0.72,0.43 1.66,0.43 0.86,0 1.44,-0.26 0.58,-0.29 0.58,-0.91 0,-0.6 -0.53,-0.89 -0.53,-0.31 -1.58,-0.55l-1.44,-0.31q-1.49,-0.36 -2.47,-1.3 -0.98,-0.96 -0.98,-2.38 0,-1.06 0.62,-1.9 0.65,-0.84 1.73,-1.3 1.1,-0.46 2.42,-0.46 3.79,0 5.06,2.66l-2.69,1.18q-0.72,-1.3 -2.3,-1.3 -0.82,0 -1.3,0.31 -0.48,0.29 -0.48,0.74 0,0.86 1.63,1.3l1.8,0.43q1.82,0.46 2.74,1.39 0.94,0.94 0.94,2.3 0,1.18 -0.7,2.09 -0.67,0.89 -1.87,1.39 -1.18,0.5 -2.62,0.5z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m53.23,17.57q-1.94,0 -3.19,-1.13 -1.25,-1.15 -1.25,-3 0,-1.22 0.65,-2.16 0.65,-0.94 1.78,-1.44 1.13,-0.5 2.5,-0.5 1.9,0 3.24,0.55L56.95,9.36q0,-1.01 -0.77,-1.63 -0.74,-0.62 -2.02,-0.62 -0.86,0 -1.68,0.41 -0.79,0.38 -1.32,1.03l-2.02,-1.58q0.89,-1.15 2.23,-1.78 1.34,-0.62 2.93,-0.62 2.81,0 4.27,1.3 1.46,1.3 1.46,3.79v7.54h-3.1v-1.25h-0.19q-0.55,0.72 -1.46,1.18 -0.89,0.46 -2.06,0.46zM53.98,15.12q1.37,0 2.16,-0.86 0.82,-0.89 0.82,-2.06 -1.22,-0.58 -2.57,-0.58 -2.45,0 -2.45,1.82 0,0.74 0.53,1.22 0.53,0.46 1.51,0.46z"
+      android:pathData="m47.19,0.46h3.14L50.33,4.8l-0.19,2.14h0.19q0.53,-0.86 1.54,-1.39 1.01,-0.53 2.18,-0.53 2.23,0 3.41,1.34 1.2,1.32 1.2,3.67v7.61h-3.14v-7.22q0,-1.18 -0.65,-1.82 -0.62,-0.65 -1.68,-0.65 -1.25,0 -2.06,1.01 -0.79,1.01 -0.79,2.47v6.22h-3.14z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m62.95,0h3.14L66.1,17.18h-3.14z"
+      android:pathData="m63.41,4.06q-0.84,0 -1.44,-0.6 -0.6,-0.6 -0.6,-1.44 0,-0.84 0.6,-1.42 0.6,-0.6 1.44,-0.6 0.84,0 1.42,0.6 0.6,0.58 0.6,1.42 0,0.84 -0.6,1.44 -0.58,0.6 -1.42,0.6zM61.83,5.4h3.14L64.97,17.64h-3.14z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m74.93,17.57q-1.9,0 -3.38,-0.84 -1.49,-0.86 -2.33,-2.33 -0.82,-1.49 -0.82,-3.34 0,-1.82 0.82,-3.31 0.84,-1.49 2.33,-2.33 1.49,-0.86 3.38,-0.86 1.87,0 3.36,0.86 1.49,0.84 2.3,2.33 0.84,1.49 0.84,3.31 0,1.85 -0.84,3.34 -0.82,1.46 -2.3,2.33 -1.49,0.84 -3.36,0.84zM74.93,14.66q0.91,0 1.68,-0.43 0.77,-0.43 1.22,-1.25 0.46,-0.82 0.46,-1.92 0,-1.08 -0.46,-1.9 -0.46,-0.82 -1.22,-1.25 -0.77,-0.43 -1.68,-0.43 -0.91,0 -1.68,0.43 -0.77,0.43 -1.25,1.25 -0.46,0.82 -0.46,1.9 0,1.08 0.46,1.92 0.48,0.82 1.25,1.25 0.77,0.43 1.68,0.43z"
+      android:pathData="m73.39,18.02q-1.66,0 -3.02,-0.82 -1.34,-0.84 -2.14,-2.3 -0.77,-1.49 -0.77,-3.38 0,-1.87 0.77,-3.36 0.79,-1.49 2.14,-2.3 1.37,-0.84 3.02,-0.84 1.25,0 2.21,0.55 0.96,0.53 1.46,1.32h0.19l-0.19,-1.73L77.07,0.46h3.12L80.19,17.64h-2.93v-1.46h-0.19q-0.48,0.79 -1.46,1.32 -0.96,0.53 -2.21,0.53zM73.92,15.12q0.89,0 1.66,-0.46 0.77,-0.46 1.22,-1.27 0.46,-0.82 0.46,-1.87 0,-1.06 -0.46,-1.87 -0.46,-0.82 -1.22,-1.25 -0.77,-0.46 -1.66,-0.46 -0.86,0 -1.63,0.46 -0.77,0.43 -1.22,1.25 -0.46,0.82 -0.46,1.87 0,1.06 0.46,1.87 0.46,0.82 1.22,1.27 0.77,0.46 1.63,0.46z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m89.09,17.57q-1.66,0 -3.02,-0.82 -1.34,-0.84 -2.14,-2.3 -0.77,-1.49 -0.77,-3.38 0,-1.87 0.77,-3.36 0.79,-1.49 2.14,-2.3 1.37,-0.84 3.02,-0.84 1.25,0 2.21,0.55 0.96,0.53 1.46,1.32h0.19l-0.19,-1.73L92.76,0h3.12L95.88,17.18h-2.93v-1.46h-0.19q-0.48,0.79 -1.46,1.32 -0.96,0.53 -2.21,0.53zM89.62,14.66q0.89,0 1.66,-0.46 0.77,-0.46 1.22,-1.27 0.46,-0.82 0.46,-1.87 0,-1.06 -0.46,-1.87 -0.46,-0.82 -1.22,-1.25 -0.77,-0.46 -1.66,-0.46 -0.86,0 -1.63,0.46 -0.77,0.43 -1.22,1.25 -0.46,0.82 -0.46,1.87 0,1.06 0.46,1.87 0.46,0.82 1.22,1.27 0.77,0.46 1.63,0.46z"
+      android:pathData="m89.02,18.02q-1.9,0 -3.38,-0.84 -1.49,-0.86 -2.33,-2.33 -0.82,-1.49 -0.82,-3.34 0,-1.82 0.82,-3.31 0.84,-1.49 2.33,-2.33 1.49,-0.86 3.38,-0.86 1.87,0 3.36,0.86 1.49,0.84 2.3,2.33 0.84,1.49 0.84,3.31 0,1.85 -0.84,3.34 -0.82,1.46 -2.3,2.33 -1.49,0.84 -3.36,0.84zM89.02,15.12q0.91,0 1.68,-0.43 0.77,-0.43 1.22,-1.25 0.46,-0.82 0.46,-1.92 0,-1.08 -0.46,-1.9 -0.46,-0.82 -1.22,-1.25 -0.77,-0.43 -1.68,-0.43 -0.91,0 -1.68,0.43 -0.77,0.43 -1.25,1.25 -0.46,0.82 -0.46,1.9 0,1.08 0.46,1.92 0.48,0.82 1.25,1.25 0.77,0.43 1.68,0.43z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m104.72,17.57q-1.9,0 -3.38,-0.84 -1.49,-0.86 -2.33,-2.33 -0.82,-1.49 -0.82,-3.34 0,-1.82 0.82,-3.31 0.84,-1.49 2.33,-2.33 1.49,-0.86 3.38,-0.86 1.87,0 3.36,0.86 1.49,0.84 2.3,2.33 0.84,1.49 0.84,3.31 0,1.85 -0.84,3.34 -0.82,1.46 -2.3,2.33 -1.49,0.84 -3.36,0.84zM104.72,14.66q0.91,0 1.68,-0.43 0.77,-0.43 1.22,-1.25 0.46,-0.82 0.46,-1.92 0,-1.08 -0.46,-1.9 -0.46,-0.82 -1.22,-1.25 -0.77,-0.43 -1.68,-0.43 -0.91,0 -1.68,0.43 -0.77,0.43 -1.25,1.25 -0.46,0.82 -0.46,1.9 0,1.08 0.46,1.92 0.48,0.82 1.25,1.25 0.77,0.43 1.68,0.43z"
+      android:pathData="m97.68,5.4h2.95v1.54h0.19q0.55,-0.89 1.56,-1.39 1.01,-0.53 2.18,-0.53 2.21,0 3.36,1.34 1.15,1.34 1.15,3.67v7.61h-3.14v-7.22q0,-1.18 -0.6,-1.82 -0.6,-0.65 -1.68,-0.65 -1.27,0 -2.06,0.98 -0.77,0.98 -0.77,2.47v6.24h-3.14z"
       android:fillColor="#282c37"/>
   <path
-      android:pathData="m113.38,4.94h2.95v1.54h0.19q0.55,-0.89 1.56,-1.39 1.01,-0.53 2.18,-0.53 2.21,0 3.36,1.34 1.15,1.34 1.15,3.67v7.61h-3.14v-7.22q0,-1.18 -0.6,-1.82 -0.6,-0.65 -1.68,-0.65 -1.27,0 -2.06,0.98 -0.77,0.98 -0.77,2.47v6.24h-3.14z"
-      android:fillColor="#282c37"/>
-  <path
-      android:pathData="m4.53,4.54c-1.37,0 -2.47,0.48 -3.31,1.42C0.41,6.9 0,8.16 0,9.76v7.8h3.09v-7.57c0,-1.6 0.67,-2.41 2.01,-2.41 1.48,0 2.23,0.96 2.23,2.86v4.14h3.07v-4.14c0,-1.9 0.74,-2.86 2.23,-2.86 1.34,0 2.01,0.81 2.01,2.41v7.57h3.09v-7.8c0,-1.59 -0.41,-2.86 -1.22,-3.8 -0.84,-0.94 -1.94,-1.42 -3.31,-1.42 -1.58,0 -2.78,0.61 -3.57,1.82l-0.77,1.29 -0.77,-1.29C7.3,5.15 6.11,4.54 4.53,4.54Z"
+      android:pathData="m4.53,5c-1.37,0 -2.47,0.48 -3.31,1.42C0.41,7.35 0,8.62 0,10.21v7.8h3.09v-7.57c0,-1.6 0.67,-2.41 2.01,-2.41 1.48,0 2.23,0.96 2.23,2.86v4.14h3.07v-4.14c0,-1.9 0.74,-2.86 2.23,-2.86 1.34,0 2.01,0.81 2.01,2.41v7.57h3.09v-7.8c0,-1.59 -0.41,-2.86 -1.22,-3.8 -0.84,-0.94 -1.94,-1.42 -3.31,-1.42 -1.58,0 -2.78,0.61 -3.57,1.82l-0.77,1.29 -0.77,-1.29C7.3,5.6 6.11,5 4.53,5Z"
       android:strokeWidth="0.990258"
       android:fillColor="#282c37"/>
 </vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 	<corners android:radius="27dp"/>
-	<stroke android:width="2dp" android:color="?colorGray25"/>
+	<stroke android:width="2dp" android:color="@color/gray_25"/>
 </shape>