Remove unused resources and fix ripple colors

2023-06-25 02:41:45 +03:00 · 2023-06-25 02:41:45 +03:00 · ca2384ba8c
parent ded23342db
commit ca2384ba8c
248 changed files with 69 additions and 4210 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@ -473,7 +473,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
 			}
 			ssb.append(" ");
-			Drawable lock=username.getResources().getDrawable(R.drawable.ic_fluent_lock_closed_20_filled, getActivity().getTheme()).mutate();
+			Drawable lock=username.getResources().getDrawable(R.drawable.ic_lock_fill1_20px, getActivity().getTheme()).mutate();
 			lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BOTTOM), 0);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@ -176,7 +176,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		searchBack.setImportantForAccessibility(searchActive ? View.IMPORTANT_FOR_ACCESSIBILITY_YES : View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 		searchBack.setOnClickListener(v->exitSearch());
 		if(searchActive){
-			searchBack.setImageResource(R.drawable.ic_fluent_arrow_left_24_regular);
+			searchBack.setImageResource(R.drawable.ic_arrow_back);
 			pager.setVisibility(View.GONE);
 			tabLayout.setVisibility(View.GONE);
 			searchView.setVisibility(View.VISIBLE);
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/GoogleMadeMeAddThisFragment.java
@ -75,7 +75,7 @@ public class GoogleMadeMeAddThisFragment extends ToolbarFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));

 		items.add(new Item("Mastodon for Android Privacy Policy", getString(R.string.privacy_policy_explanation), "joinmastodon.org", "https://joinmastodon.org/android/privacy", "https://joinmastodon.org/favicon-32x32.png"));
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@ -45,7 +45,7 @@ public class InstanceRulesFragment extends ToolbarFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		instance=Parcels.unwrap(getArguments().getParcelable("instance"));
 		setTitle(R.string.instance_rules_title);
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingProfileSetupFragment.java
@ -60,7 +60,7 @@ public class OnboardingProfileSetupFragment extends ToolbarFragment implements R
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		accountID=getArguments().getString("account");
 		setTitle(R.string.profile_setup);
 	}
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/BaseReportChoiceFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/BaseReportChoiceFragment.java
@ -55,7 +55,7 @@ public abstract class BaseReportChoiceFragment extends MastodonToolbarFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		accountID=getArguments().getString("account");
 		reportAccount=Parcels.unwrap(getArguments().getParcelable("reportAccount"));
 		reportStatus=Parcels.unwrap(getArguments().getParcelable("status"));
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java
@ -60,7 +60,7 @@ public class ReportDoneFragment extends MastodonToolbarFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		accountID=getArguments().getString("account");
 		reportAccount=Parcels.unwrap(getArguments().getParcelable("reportAccount"));
 		reason=ReportReason.valueOf(getArguments().getString("reason"));
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportReasonChoiceFragment.java
@ -75,7 +75,7 @@ public class ReportReasonChoiceFragment extends StatusListFragment{
 	@Override
 	public void onAttach(Activity activity){
 		super.onAttach(activity);
-		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorWindowBackground));
+		setNavigationBarColor(UiUtils.getThemeColor(activity, R.attr.colorM3Surface));
 		accountID=getArguments().getString("account");
 		reportAccount=Parcels.unwrap(getArguments().getParcelable("reportAccount"));
 		reportStatus=Parcels.unwrap(getArguments().getParcelable("status"));
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/SawtoothTearDrawable.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/SawtoothTearDrawable.java
@ -61,9 +61,9 @@ public class SawtoothTearDrawable extends Drawable{
 		}
 		path.close();
 		Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
-		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorWindowBackground));
+		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorM3Surface));
 		c.drawPath(path, paint);
-		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorPollVoted));
+		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorM3OutlineVariant));
 		paint.setStrokeWidth(actualStrokeWidth);
 		paint.setStyle(Paint.Style.STROKE);
 		c.drawPath(path, paint);
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/SeekBarThumbDrawable.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/drawables/SeekBarThumbDrawable.java
@ -1,76 +0,0 @@
-package org.joinmastodon.android.ui.drawables;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import me.grishka.appkit.utils.V;
-
-public class SeekBarThumbDrawable extends Drawable{
-	private Bitmap shadow1, shadow2;
-	private Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
-	private Context context;
-
-	public SeekBarThumbDrawable(Context context){
-		this.context=context;
-		shadow1=Bitmap.createBitmap(V.dp(24), V.dp(24), Bitmap.Config.ALPHA_8);
-		shadow2=Bitmap.createBitmap(V.dp(24), V.dp(24), Bitmap.Config.ALPHA_8);
-		Paint paint=new Paint(Paint.ANTI_ALIAS_FLAG);
-		paint.setColor(0xFF000000);
-		paint.setShadowLayer(V.dp(2), 0, V.dp(1), 0xFF000000);
-		new Canvas(shadow1).drawCircle(V.dp(12), V.dp(12), V.dp(9), paint);
-		paint.setShadowLayer(V.dp(3), 0, V.dp(1), 0xFF000000);
-		new Canvas(shadow2).drawCircle(V.dp(12), V.dp(12), V.dp(9), paint);
-	}
-
-	@Override
-	public void draw(@NonNull Canvas canvas){
-		float centerX=getBounds().centerX();
-		float centerY=getBounds().centerY();
-		paint.setStyle(Paint.Style.FILL);
-		paint.setColor(0x4d000000);
-		canvas.drawBitmap(shadow1, centerX-shadow1.getWidth()/2f, centerY-shadow1.getHeight()/2f, paint);
-		paint.setColor(0x26000000);
-		canvas.drawBitmap(shadow2, centerX-shadow2.getWidth()/2f, centerY-shadow2.getHeight()/2f, paint);
-		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorButtonText));
-		canvas.drawCircle(centerX, centerY, V.dp(7), paint);
-		paint.setStyle(Paint.Style.STROKE);
-		paint.setColor(UiUtils.getThemeColor(context, R.attr.colorAccentLight));
-		paint.setStrokeWidth(V.dp(4));
-		canvas.drawCircle(centerX, centerY, V.dp(7), paint);
-	}
-
-	@Override
-	public void setAlpha(int alpha){
-
-	}
-
-	@Override
-	public void setColorFilter(@Nullable ColorFilter colorFilter){
-
-	}
-
-	@Override
-	public int getOpacity(){
-		return PixelFormat.TRANSLUCENT;
-	}
-
-	@Override
-	public int getIntrinsicWidth(){
-		return V.dp(24);
-	}
-
-	@Override
-	public int getIntrinsicHeight(){
-		return V.dp(24);
-	}
-}
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
@ -174,7 +174,7 @@ public class PhotoViewer implements ZoomPanView.Listener{
 		toolbarWrap=uiOverlay.findViewById(R.id.toolbar_wrap);
 		toolbar=uiOverlay.findViewById(R.id.toolbar);
 		toolbar.setNavigationOnClickListener(v->onStartSwipeToDismissTransition(0));
-		toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_fluent_arrow_download_24_regular).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+		toolbar.getMenu().add(R.string.download).setIcon(R.drawable.ic_download_24px).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		toolbar.setOnMenuItemClickListener(item->{
 			saveCurrentFile();
 			return true;
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
@ -9,7 +9,6 @@ import android.view.View;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.ui.displayitems.NotificationHeaderStatusDisplayItem;
-import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;

 import java.util.List;
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@ -454,41 +454,6 @@ public class UiUtils{
 			delete.run();
 	}

-	public static void setRelationshipToActionButton(Relationship relationship, Button button){
-		boolean secondaryStyle;
-		if(relationship.blocking){
-			button.setText(R.string.button_blocked);
-			secondaryStyle=true;
-		}else if(relationship.blockedBy){
-			button.setText(R.string.button_follow);
-			secondaryStyle=false;
-		}else if(relationship.requested){
-			button.setText(R.string.button_follow_pending);
-			secondaryStyle=true;
-		}else if(!relationship.following){
-			button.setText(relationship.followedBy ? R.string.follow_back : R.string.button_follow);
-			secondaryStyle=false;
-		}else{
-			button.setText(R.string.button_following);
-			secondaryStyle=true;
-		}
-
-		button.setEnabled(!relationship.blockedBy);
-		int attr=secondaryStyle ? R.attr.secondaryButtonStyle : android.R.attr.buttonStyle;
-		TypedArray ta=button.getContext().obtainStyledAttributes(new int[]{attr});
-		int styleRes=ta.getResourceId(0, 0);
-		ta.recycle();
-		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
-		button.setBackground(ta.getDrawable(0));
-		ta.recycle();
-		ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.textColor});
-		if(relationship.blocking)
-			button.setTextColor(button.getResources().getColorStateList(R.color.error_600));
-		else
-			button.setTextColor(ta.getColorStateList(0));
-		ta.recycle();
-	}
-
 	public static void setRelationshipToActionButtonM3(Relationship relationship, Button button){
 		int styleRes;
 		if(relationship.blocking){
--- a/mastodon/src/main/res/color/boost_icon.xml
+++ b/mastodon/src/main/res/color/boost_icon.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/boost_selected" android:state_selected="true"/>
-	<item android:color="?android:textColorSecondary" android:state_enabled="true"/>
-	<item android:color="?android:textColorSecondary" android:alpha="0.3"/>
-</selector>
--- a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_800" android:state_enabled="true"/>
-	<item android:color="@color/gray_300"/>
-</selector>
--- a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_100" android:state_enabled="true"/>
-	<item android:color="@color/gray_500"/>
-</selector>
--- a/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_25" android:state_enabled="true"/>
-	<item android:color="@color/gray_100"/>
-</selector>
--- a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_600" android:state_enabled="true"/>
-	<item android:color="@color/gray_300"/>
-</selector>
--- a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_50" android:state_enabled="true"/>
-	<item android:color="@color/gray_400"/>
-</selector>
--- a/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
+++ b/mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_800" android:state_enabled="true"/>
-	<item android:color="@color/gray_400"/>
-</selector>
--- a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
+++ b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/gray_800" android:state_enabled="true"/>
-	<item android:color="@color/gray_400"/>
-</selector>
--- a/mastodon/src/main/res/color/discover_tab.xml
+++ b/mastodon/src/main/res/color/discover_tab.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?android:textColorPrimary" android:state_selected="true"/>
-	<item android:color="?colorTabInactive"/>
-</selector>
--- a/mastodon/src/main/res/color/favorite_icon.xml
+++ b/mastodon/src/main/res/color/favorite_icon.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="@color/favorite_selected" android:state_selected="true"/>
-	<item android:color="?android:textColorSecondary"/>
-</selector>
--- a/mastodon/src/main/res/color/m3_on_primary_overlay.xml
+++ b/mastodon/src/main/res/color/m3_on_primary_overlay.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="?colorM3OnPrimary" android:alpha="0.12"/>
+	 <item android:color="?colorM3OnPrimary" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/m3_on_secondary_container_overlay.xml
+++ b/mastodon/src/main/res/color/m3_on_secondary_container_overlay.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="?colorM3OnSecondaryContainer" android:alpha="0.12"/>
+	 <item android:color="?colorM3OnSecondaryContainer" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/m3_on_surface_overlay.xml
+++ b/mastodon/src/main/res/color/m3_on_surface_overlay.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="?colorM3OnSurface" android:alpha="0.12"/>
+	 <item android:color="?colorM3OnSurface" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/m3_on_surface_variant_overlay.xml
+++ b/mastodon/src/main/res/color/m3_on_surface_variant_overlay.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="?colorM3OnSurfaceVariant" android:alpha="0.12"/>
+	 <item android:color="?colorM3OnSurfaceVariant" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/m3_pressed_overlay.xml
+++ b/mastodon/src/main/res/color/m3_pressed_overlay.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="?colorM3PressedOverlay" android:alpha="0.12"/>
+	 <item android:color="?colorM3PressedOverlay" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/m3_primary_overlay.xml
+++ b/mastodon/src/main/res/color/m3_primary_overlay.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="?colorM3Primary" android:alpha="0.12"/>
+	 <item android:color="?colorM3Primary" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml
+++ b/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="@color/gray_50"/>
+	 <item android:color="#FFF" android:alpha="@dimen/overlay_ripple_alpha"/>
 </selector>
--- a/mastodon/src/main/res/color/mtrl_switch_thumb_icon_tint.xml
+++ b/mastodon/src/main/res/color/mtrl_switch_thumb_icon_tint.xml
@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- State Disabled, Unchecked -->
-  <item
-    android:alpha="@dimen/m3_comp_switch_disabled_unselected_icon_opacity"
-    android:color="@macro/m3_comp_switch_disabled_unselected_icon_color"
-    android:state_enabled="false" android:state_checked="false"/>
-
-  <!-- State Disabled, Checked -->
-  <item
-    android:alpha="@dimen/m3_comp_switch_disabled_selected_icon_opacity"
-    android:color="@macro/m3_comp_switch_disabled_selected_icon_color"
-    android:state_enabled="false" android:state_checked="true"/>
-
-  <!-- State Checked -->
-  <item android:color="@macro/m3_comp_switch_selected_icon_color" android:state_checked="true"/>
-
-  <!-- State Unchecked -->
-  <item android:color="@macro/m3_comp_switch_unselected_icon_color"/>
-</selector>
--- a/mastodon/src/main/res/color/poll_option_progress.xml
+++ b/mastodon/src/main/res/color/poll_option_progress.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:color="?colorPollMostVoted" android:state_selected="true"/>
-	<item android:color="?colorPollVoted"/>
-</selector>
--- a/mastodon/src/main/res/color/window_bg_alpha95.xml
+++ b/mastodon/src/main/res/color/window_bg_alpha95.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="?colorWindowBackground" android:alpha="0.95"/>
+	 <item android:color="?colorM3Surface" android:alpha="0.95"/>
 </selector>
--- a/mastodon/src/main/res/drawable-mdpi/theme_auto.webp
+++ b/mastodon/src/main/res/drawable-mdpi/theme_auto.webp
--- a/mastodon/src/main/res/drawable-mdpi/theme_auto_trueblack.webp
+++ b/mastodon/src/main/res/drawable-mdpi/theme_auto_trueblack.webp
--- a/mastodon/src/main/res/drawable-mdpi/theme_dark.webp
+++ b/mastodon/src/main/res/drawable-mdpi/theme_dark.webp
--- a/mastodon/src/main/res/drawable-mdpi/theme_dark_trueblack.webp
+++ b/mastodon/src/main/res/drawable-mdpi/theme_dark_trueblack.webp
--- a/mastodon/src/main/res/drawable-mdpi/theme_light.webp
+++ b/mastodon/src/main/res/drawable-mdpi/theme_light.webp
--- a/mastodon/src/main/res/drawable-nodpi/default_avatar.webp
+++ b/mastodon/src/main/res/drawable-nodpi/default_avatar.webp
--- a/mastodon/src/main/res/drawable-xhdpi/theme_auto.webp
+++ b/mastodon/src/main/res/drawable-xhdpi/theme_auto.webp
--- a/mastodon/src/main/res/drawable-xhdpi/theme_auto_trueblack.webp
+++ b/mastodon/src/main/res/drawable-xhdpi/theme_auto_trueblack.webp
--- a/mastodon/src/main/res/drawable-xhdpi/theme_dark.webp
+++ b/mastodon/src/main/res/drawable-xhdpi/theme_dark.webp
--- a/mastodon/src/main/res/drawable-xhdpi/theme_dark_trueblack.webp
+++ b/mastodon/src/main/res/drawable-xhdpi/theme_dark_trueblack.webp
--- a/mastodon/src/main/res/drawable-xhdpi/theme_light.webp
+++ b/mastodon/src/main/res/drawable-xhdpi/theme_light.webp
--- a/mastodon/src/main/res/drawable-xxhdpi/theme_auto.webp
+++ b/mastodon/src/main/res/drawable-xxhdpi/theme_auto.webp
--- a/mastodon/src/main/res/drawable-xxhdpi/theme_auto_trueblack.webp
+++ b/mastodon/src/main/res/drawable-xxhdpi/theme_auto_trueblack.webp
--- a/mastodon/src/main/res/drawable-xxhdpi/theme_dark.webp
+++ b/mastodon/src/main/res/drawable-xxhdpi/theme_dark.webp
--- a/mastodon/src/main/res/drawable-xxhdpi/theme_dark_trueblack.webp
+++ b/mastodon/src/main/res/drawable-xxhdpi/theme_dark_trueblack.webp
--- a/mastodon/src/main/res/drawable-xxhdpi/theme_light.webp
+++ b/mastodon/src/main/res/drawable-xxhdpi/theme_light.webp
--- a/mastodon/src/main/res/drawable/bg_button_green.xml
+++ b/mastodon/src/main/res/drawable/bg_button_green.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<ripple android:color="@color/highlight_over_dark">
-			<item>
-				<shape>
-					<solid android:color="#58AC81"/>
-					<corners android:radius="10dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple android:color="@color/m3_white_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
 		<selector>
 			<item android:state_enabled="true">
--- a/mastodon/src/main/res/drawable/bg_button_m3_text_white.xml
+++ b/mastodon/src/main/res/drawable/bg_button_m3_text_white.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
+<ripple android:color="@color/m3_white_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@android:id/mask">
 		 <shape>
 			   <solid android:color="#000"/>
--- a/mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
+++ b/mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<ripple android:color="@color/highlight_over_dark">
-			<item>
-				<shape>
-					<solid android:color="@color/button_bg_primary_dark_on_light"/>
-					<corners android:radius="10dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
+++ b/mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<ripple android:color="@color/highlight_over_light">
-			<item>
-				<shape>
-					<solid android:color="@color/button_bg_primary_light_on_dark"/>
-					<corners android:radius="10dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml
+++ b/mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<ripple android:color="@color/highlight_over_light">
-			<item>
-				<shape>
-					<solid android:color="@color/button_bg_secondary_dark_on_light"/>
-					<corners android:radius="10dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml
+++ b/mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<ripple android:color="@color/highlight_over_dark">
-			<item>
-				<shape>
-					<solid android:color="@color/button_bg_secondary_light_on_dark"/>
-					<corners android:radius="10dp"/>
-				</shape>
-			</item>
-		</ripple>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_catalog_tabs.xml
+++ b/mastodon/src/main/res/drawable/bg_catalog_tabs.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:height="2dp" android:gravity="bottom">
-		<shape>
-			<solid android:color="?colorPollVoted"/>
-		</shape>
-	</item>
-</layer-list>
--- a/mastodon/src/main/res/drawable/bg_discover_tabs.xml
+++ b/mastodon/src/main/res/drawable/bg_discover_tabs.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape>
-			<solid android:color="?android:statusBarColor"/>
-		</shape>
-	</item>
-	<item android:height="2dp" android:gravity="bottom">
-		<shape>
-			<solid android:color="?colorPollVoted"/>
-		</shape>
-	</item>
-</layer-list>
--- a/mastodon/src/main/res/drawable/bg_edittext_dark.xml
+++ b/mastodon/src/main/res/drawable/bg_edittext_dark.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/gray_800"/>
-	<corners android:radius="10dp"/>
-	<padding android:top="16dp" android:left="16dp" android:right="16dp" android:bottom="16dp"/>
-</shape>
--- a/mastodon/src/main/res/drawable/bg_edittext_light.xml
+++ b/mastodon/src/main/res/drawable/bg_edittext_light.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/gray_25"/>
-	<corners android:radius="10dp"/>
-	<padding android:top="16dp" android:left="16dp" android:right="16dp" android:bottom="16dp"/>
-</shape>
--- a/mastodon/src/main/res/drawable/bg_fab.xml
+++ b/mastodon/src/main/res/drawable/bg_fab.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?android:colorControlHighlight">
+	android:color="@color/m3_primary_overlay">
 	<item android:id="@android:id/mask">
 		<shape>
 			<solid android:color="#000"/>
--- a/mastodon/src/main/res/drawable/bg_inline_button.xml
+++ b/mastodon/src/main/res/drawable/bg_inline_button.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
-	<item>
-		<shape>
-			<solid android:color="?colorPollVoted"/>
-			<corners android:radius="4dp"/>
-		</shape>
-	</item>
-</ripple>
--- a/mastodon/src/main/res/drawable/bg_poll_option.xml
+++ b/mastodon/src/main/res/drawable/bg_poll_option.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="?android:colorBackground"/>
-	<corners android:radius="10dp"/>
-</shape>
--- a/mastodon/src/main/res/drawable/bg_profile_field_edit_text.xml
+++ b/mastodon/src/main/res/drawable/bg_profile_field_edit_text.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_focused="true">
-		<layer-list>
-			<item android:gravity="bottom">
-				<shape>
-					<size android:height="1dp"/>
-					<solid android:color="?android:colorAccent"/>
-				</shape>
-			</item>
-		</layer-list>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_settings_update.xml
+++ b/mastodon/src/main/res/drawable/bg_settings_update.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="?colorPollVoted"/>
-	<corners android:radius="4dp"/>
-</shape>
--- a/mastodon/src/main/res/drawable/bg_tab_profile.xml
+++ b/mastodon/src/main/res/drawable/bg_tab_profile.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true">
-		<layer-list>
-			<item android:gravity="center" android:width="29dp" android:height="29dp">
-				<shape android:shape="oval">
-					<stroke android:color="?android:colorPrimary" android:width="2dp"/>
-				</shape>
-			</item>
-		</layer-list>
-	</item>
-</selector>
--- a/mastodon/src/main/res/drawable/bg_text_button.xml
+++ b/mastodon/src/main/res/drawable/bg_text_button.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
-	<item android:id="@android:id/mask">
-		<shape>
-			<solid android:color="#000"/>
-			<corners android:radius="4dp"/>
-		</shape>
-	</item>
-</ripple>
--- a/mastodon/src/main/res/drawable/bg_timeline_gap.xml
+++ b/mastodon/src/main/res/drawable/bg_timeline_gap.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
-		<color android:color="?colorBackgroundLightest"/>
+		<color android:color="?colorM3SurfaceVariant"/>
 	</item>
 	<item android:drawable="?android:selectableItemBackground"/>
 </layer-list>
--- a/mastodon/src/main/res/drawable/bg_update_download_progress.xml
+++ b/mastodon/src/main/res/drawable/bg_update_download_progress.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorForeground">
-	<item android:id="@android:id/mask">
-		<shape android:shape="oval">
-			<solid android:color="#18000000"/>
-		</shape>
-	</item>
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="?android:colorBackground"/>
-		</shape>
-	</item>
-</ripple>
--- a/mastodon/src/main/res/drawable/bg_upload_progress.xml
+++ b/mastodon/src/main/res/drawable/bg_upload_progress.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/gray_600"/>
-		</shape>
-	</item>
-</ripple>
--- a/mastodon/src/main/res/drawable/discover_ava_bg.xml
+++ b/mastodon/src/main/res/drawable/discover_ava_bg.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<corners android:radius="14dp"/>
-	<stroke android:width="2dp" android:color="?colorBackgroundLight"/>
-</shape>
--- a/mastodon/src/main/res/drawable/edit_text_border.xml
+++ b/mastodon/src/main/res/drawable/edit_text_border.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape>
-			<solid android:color="?attr/colorSearchField"/>
-			<stroke android:color="?attr/colorTabInactive" android:width="1dp"/>
-			<corners android:radius="4dp"/>
-			<padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp"/>
-		</shape>
-	</item>
-</layer-list>
--- a/mastodon/src/main/res/drawable/ic_at_symbol.xml
+++ b/mastodon/src/main/res/drawable/ic_at_symbol.xml
@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M14.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>
--- a/mastodon/src/main/res/drawable/ic_boost.xml
+++ b/mastodon/src/main/res/drawable/ic_boost.xml
@ -1,6 +0,0 @@
-<?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_arrow_repeat_all_24_filled"/>
-	<item android:state_enabled="true" android:drawable="@drawable/ic_fluent_arrow_repeat_all_24_regular"/>
-	<item android:drawable="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-</selector>
--- a/mastodon/src/main/res/drawable/ic_download_24px.xml
+++ b/mastodon/src/main/res/drawable/ic_download_24px.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:fillColor="@android:color/white"
+      android:pathData="M6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V15H6V18Q6,18 6,18Q6,18 6,18H18Q18,18 18,18Q18,18 18,18V15H20V18Q20,18.825 19.413,19.413Q18.825,20 18,20ZM12,16 L7,11 8.4,9.55 11,12.15V4H13V12.15L15.6,9.55L17,11Z"/>
+</vector>
--- a/mastodon/src/main/res/drawable/ic_edit_34.xml
+++ b/mastodon/src/main/res/drawable/ic_edit_34.xml
@ -1,5 +0,0 @@
-<vector android:height="34dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="34dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_add_circle_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_add_circle_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.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm0 5c-0.38 0-0.694 0.282-0.743 0.648L11.25 7.75v3.5h-3.5C7.336 11.25 7 11.586 7 12c0 0.38 0.282 0.694 0.648 0.743L7.75 12.75h3.5v3.5c0 0.414 0.336 0.75 0.75 0.75 0.38 0 0.694-0.282 0.743-0.648l0.007-0.102v-3.5h3.5c0.414 0 0.75-0.336 0.75-0.75 0-0.38-0.282-0.694-0.648-0.743L16.25 11.25h-3.5v-3.5C12.75 7.336 12.414 7 12 7z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_add_circle_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_add_circle_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 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm0 1.5c-4.694 0-8.5 3.806-8.5 8.5s3.806 8.5 8.5 8.5 8.5-3.806 8.5-8.5-3.806-8.5-8.5-8.5zM12 7c0.414 0 0.75 0.336 0.75 0.75v3.5h3.5c0.414 0 0.75 0.336 0.75 0.75s-0.336 0.75-0.75 0.75h-3.5v3.5c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75v-3.5h-3.5C7.336 12.75 7 12.414 7 12s0.336-0.75 0.75-0.75h3.5v-3.5C11.25 7.336 11.586 7 12 7z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_alert_28_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_alert_28_filled.xml
@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M17.466 22.002c-0.244 1.697-1.703 3-3.466 3-1.764 0-3.223-1.303-3.466-3h6.932zM14 3c4.61 0 8.363 3.669 8.497 8.246v0.255h0.004v4.112l1.414 3.644c0.038 0.099 0.064 0.201 0.077 0.306l0.01 0.157c0 0.663-0.504 1.208-1.15 1.274L22.723 21H5.275c-0.159 0-0.316-0.03-0.464-0.087-0.618-0.24-0.943-0.907-0.77-1.532l0.04-0.125 1.417-3.644v-4.11C5.499 6.805 9.306 3 14 3z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_alert_28_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_alert_28_regular.xml
@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M14 3c4.61 0 8.363 3.669 8.497 8.246l0.004 0.255v4.612l1.414 3.644c0.038 0.098 0.064 0.201 0.077 0.305l0.01 0.158c0 0.663-0.504 1.208-1.15 1.273l-0.13 0.007-5.22 0.001c0 1.934-1.568 3.502-3.502 3.502-1.87 0-3.397-1.465-3.496-3.31L10.498 21.5H5.275c-0.159 0-0.316-0.03-0.464-0.087-0.618-0.24-0.943-0.907-0.77-1.533l0.04-0.124 1.417-3.644v-4.61C5.499 6.805 9.306 3 14 3zm1.996 18.65L16 21.5l-4.002 0.002c0 1.105 0.897 2.002 2.002 2.002 1.055 0 1.92-0.817 1.996-1.853zM14 4.5c-3.786 0-6.87 3.005-6.997 6.76l-0.004 0.241v4.752c0 0.062-0.008 0.124-0.023 0.184l-0.028 0.088L5.596 20H22.4l-1.348-3.474c-0.022-0.058-0.037-0.118-0.045-0.18L21 16.254v-4.752C21.001 7.635 17.867 4.5 14 4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_alert_28_selector.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_alert_28_selector.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_alert_28_filled" android:state_activated="true"/>
-    <item android:drawable="@drawable/ic_fluent_alert_28_filled" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_fluent_alert_28_filled" android:state_selected="true"/>
-    <item android:drawable="@drawable/ic_fluent_alert_28_regular"/>
-</selector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_clockwise_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_clockwise_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 4.75c-4.004 0-7.25 3.246-7.25 7.25s3.246 7.25 7.25 7.25 7.25-3.246 7.25-7.25c0-0.286-0.017-0.567-0.049-0.844C19.133 10.568 19.56 10 20.151 10c0.515 0 0.968 0.358 1.03 0.87 0.046 0.37 0.069 0.747 0.069 1.13 0 5.109-4.141 9.25-9.25 9.25S2.75 17.109 2.75 12 6.891 2.75 12 2.75c2.173 0 4.171 0.75 5.75 2.004V4.25c0-0.552 0.448-1 1-1s1 0.448 1 1v2.698L19.784 7H19.75v0.25c0 0.552-0.448 1-1 1h-3c-0.552 0-1-0.448-1-1s0.448-1 1-1h0.666c-1.222-0.94-2.754-1.5-4.416-1.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_download_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_download_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="M18.25 20.5c0.414 0 0.75 0.337 0.75 0.75 0 0.415-0.336 0.75-0.75 0.75l-13 0.005c-0.414 0-0.75-0.336-0.75-0.75s0.336-0.75 0.75-0.75l13-0.004zM11.648 2.014l0.102-0.007c0.38 0 0.694 0.282 0.743 0.648L12.5 2.756 12.499 16.44l3.722-3.72c0.266-0.267 0.683-0.29 0.976-0.073l0.085 0.073c0.266 0.266 0.29 0.683 0.072 0.976l-0.073 0.084-4.997 4.997c-0.266 0.266-0.683 0.29-0.976 0.073l-0.085-0.073-5.003-4.996c-0.293-0.293-0.293-0.768 0-1.061 0.265-0.267 0.682-0.291 0.976-0.073L7.28 12.72l3.719 3.714L11 2.756c0-0.38 0.282-0.694 0.648-0.743l0.102-0.007-0.102 0.007z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_left_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_left_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="M10.733 19.79c0.3 0.286 0.774 0.275 1.06-0.025 0.286-0.3 0.274-0.775-0.026-1.06L5.516 12.75H20.25c0.414 0 0.75-0.336 0.75-0.75 0-0.415-0.336-0.75-0.75-0.75H5.516l6.251-5.955c0.3-0.286 0.312-0.76 0.026-1.06-0.286-0.3-0.76-0.312-1.06-0.026l-7.42 7.067c-0.168 0.16-0.268 0.366-0.3 0.58C3.006 11.901 3 11.95 3 12c0 0.05 0.005 0.098 0.014 0.145 0.031 0.213 0.131 0.418 0.3 0.579l7.419 7.067z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_20_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_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="M15.75 6.01c0.18 0 0.344 0.063 0.473 0.168 1.088 0.914 1.78 2.287 1.78 3.822 0 2.689-2.122 4.882-4.783 4.995L13.003 15H8.56l1.22 1.22c0.266 0.266 0.29 0.683 0.072 0.976L9.781 17.28c-0.267 0.267-0.683 0.29-0.977 0.073L8.72 17.28l-2.5-2.5c-0.266-0.266-0.29-0.683-0.072-0.976L6.22 13.72l2.5-2.5c0.293-0.293 0.768-0.293 1.06 0 0.267 0.266 0.291 0.683 0.073 0.976L9.781 12.28 8.56 13.5h4.442c1.868 0 3.395-1.464 3.495-3.308L16.503 10c0-1.081-0.49-2.048-1.26-2.69C15.093 7.175 15 6.98 15 6.76c0-0.414 0.335-0.75 0.75-0.75zm-5.53-3.29c0.266-0.267 0.683-0.29 0.977-0.073L11.28 2.72l2.5 2.5 0.072 0.084c0.194 0.26 0.197 0.619 0.008 0.882L13.78 6.28l-2.5 2.5-0.084 0.073c-0.261 0.194-0.62 0.196-0.883 0.007L10.22 8.78l-0.072-0.084C9.954 8.436 9.95 8.077 10.14 7.814l0.08-0.094 1.22-1.22H7c-1.87 0-3.396 1.464-3.496 3.308L3.498 10c0 1.083 0.492 2.051 1.265 2.693C4.909 12.83 5 13.023 5 13.24c0 0.414-0.335 0.75-0.75 0.75-0.19 0-0.365-0.072-0.498-0.19-1.073-0.913-1.754-2.277-1.754-3.8 0-2.689 2.122-4.882 4.783-4.995L6.998 5h4.441L10.22 3.78l-0.072-0.084C9.93 3.403 9.954 2.986 10.22 2.72z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_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="M14.712 2.289L14.625 2.21c-0.392-0.31-0.964-0.285-1.327 0.078L13.22 2.376c-0.31 0.392-0.285 0.964 0.078 1.326l1.299 1.297H8.999L8.76 5.003C5.004 5.13 2 8.211 2 11.993c0 1.445 0.438 2.788 1.189 3.899C3.37 16.143 3.666 16.307 4 16.307c0.552 0 1-0.448 1-1 0-0.216-0.069-0.416-0.185-0.578L4.68 14.51C4.248 13.77 4 12.91 4 11.993c0-2.759 2.238-4.995 5-4.995h5.595l-1.297 1.297-0.078 0.087c-0.31 0.392-0.285 0.964 0.078 1.326 0.39 0.39 1.024 0.39 1.414 0l3.006-3.003 0.077-0.087c0.311-0.392 0.285-0.964-0.078-1.326l-3.005-3.003zm6.075 5.771C20.602 7.827 20.319 7.678 20 7.678c-0.552 0-1 0.448-1 1 0 0.208 0.064 0.4 0.172 0.56 0.523 0.79 0.828 1.737 0.828 2.755 0 2.76-2.238 4.996-5 4.996H9.416l1.294-1.292 0.083-0.095c0.281-0.361 0.28-0.871-0.006-1.23l-0.077-0.088-0.095-0.084c-0.362-0.28-0.873-0.278-1.232 0.006l-0.088 0.078-3.005 3.003-0.083 0.095c-0.281 0.361-0.28 0.872 0.006 1.231L6.289 18.7l3.005 3.003 0.095 0.084c0.392 0.304 0.96 0.277 1.32-0.084 0.362-0.362 0.388-0.933 0.077-1.326L10.71 20.29l-1.304-1.303h5.596l0.24-0.003C18.996 18.857 22 15.776 22 11.994c0-1.46-0.448-2.816-1.213-3.937V8.06z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_regular.xml
@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M14.61 2.47l-0.077-0.067C14.24 2.18 13.818 2.201 13.55 2.47l-0.068 0.077c-0.223 0.296-0.201 0.718 0.068 0.988l1.971 1.977H8.5L8.267 5.516C4.785 5.639 2 8.51 2 12.036c0 1.69 0.64 3.23 1.692 4.39l0.072 0.069c0.131 0.111 0.3 0.179 0.486 0.179 0.414 0 0.75-0.337 0.75-0.753 0-0.173-0.058-0.332-0.156-0.46l-0.2-0.23C3.93 14.363 3.5 13.249 3.5 12.035c0-2.771 2.239-5.018 5-5.018h6.881l-1.832 1.84-0.067 0.078C13.26 9.23 13.281 9.653 13.55 9.922c0.292 0.294 0.767 0.294 1.06 0l3.182-3.194 0.067-0.077c0.224-0.295 0.202-0.717-0.067-0.987L14.61 2.471zm5.62 5.101c-0.13-0.109-0.297-0.174-0.48-0.174-0.414 0-0.75 0.337-0.75 0.752 0 0.187 0.068 0.358 0.18 0.488 0.82 0.894 1.32 2.088 1.32 3.398 0 2.772-2.239 5.019-5 5.019H8.558l1.905-1.911 0.074-0.086c0.197-0.267 0.195-0.636-0.007-0.902l-0.067-0.077-0.084-0.073c-0.267-0.199-0.635-0.197-0.9 0.006l-0.076 0.067-3.182 3.194-0.073 0.085c-0.198 0.267-0.196 0.636 0.006 0.902l0.067 0.077 3.182 3.194 0.084 0.072c0.293 0.22 0.71 0.195 0.976-0.073 0.269-0.269 0.291-0.692 0.068-0.987l-0.068-0.077-1.899-1.906H15.5l0.233-0.004C19.215 18.432 22 15.56 22 12.035c0-1.693-0.643-3.236-1.697-4.395L20.23 7.57z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_off_24_regular.xml
@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M3.196 2.147L3.28 2.22l18.5 18.5c0.293 0.293 0.293 0.767 0 1.06-0.266 0.267-0.683 0.29-0.976 0.073L20.72 21.78l-3.509-3.508c-0.436 0.12-0.89 0.194-1.358 0.219L15.5 18.5H8.564l1.9 1.9 0.066 0.076c0.224 0.294 0.202 0.715-0.067 0.984-0.266 0.266-0.683 0.29-0.976 0.072L9.403 21.46 6.22 18.278 6.154 18.2c-0.202-0.265-0.204-0.632-0.006-0.899l0.073-0.085 3.182-3.182 0.076-0.067c0.265-0.201 0.633-0.203 0.9-0.006l0.084 0.073 0.068 0.077c0.2 0.264 0.203 0.632 0.005 0.899l-0.073 0.085L8.558 17H15.5c0.142 0 0.283-0.006 0.421-0.017L6.402 7.46C4.687 8.254 3.5 9.988 3.5 12c0 1.296 0.493 2.477 1.302 3.365C4.925 15.497 5 15.675 5 15.872c0 0.414-0.336 0.75-0.75 0.75-0.222 0-0.421-0.097-0.559-0.25C2.641 15.22 2 13.684 2 12c0-2.421 1.324-4.533 3.287-5.652L2.22 3.28c-0.293-0.293-0.293-0.767 0-1.06 0.266-0.267 0.683-0.29 0.976-0.073zM19.75 7.378c0.22 0 0.416 0.094 0.553 0.244C21.357 8.775 22 10.312 22 12c0 2.057-0.955 3.89-2.446 5.081l-1.069-1.07C19.708 15.1 20.5 13.644 20.5 12c0-1.306-0.5-2.495-1.32-3.386-0.112-0.13-0.18-0.3-0.18-0.486 0-0.414 0.336-0.75 0.75-0.75zm-5.217-4.976L14.61 2.47l3.182 3.182c0.269 0.268 0.291 0.69 0.067 0.984l-0.067 0.076-3.182 3.182c-0.293 0.293-0.768 0.293-1.06 0-0.269-0.268-0.291-0.69-0.068-0.984l0.068-0.076L15.38 7H9.473l-1.48-1.48c0.091-0.007 0.182-0.013 0.274-0.016L8.5 5.5h7.021L13.55 3.53c-0.268-0.268-0.29-0.69-0.067-0.983L13.55 2.47c0.268-0.269 0.69-0.291 0.983-0.068z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_reply_20_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_reply_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="M4.31 9.5l2.963 2.963c0.293 0.293 0.293 0.768 0 1.06-0.266 0.267-0.683 0.29-0.977 0.073l-0.084-0.073L1.97 9.281C1.703 9.014 1.68 8.598 1.897 8.304L1.97 8.22l4.242-4.243c0.293-0.292 0.768-0.292 1.061 0 0.266 0.267 0.29 0.683 0.073 0.977L7.273 5.038 4.31 8H10c4.198 0 7.616 3.338 7.746 7.504l0.004 0.247c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75c0-3.376-2.675-6.126-6.02-6.246L10 9.5H4.31l2.963 2.963L4.31 9.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_reply_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_reply_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="M9.277 16.221c0.293 0.293 0.293 0.768 0 1.06-0.293 0.294-0.768 0.293-1.061 0l-4.997-5.003c-0.292-0.293-0.292-0.768 0-1.06L8.217 6.22c0.293-0.293 0.768-0.293 1.06 0C9.57 6.513 9.57 6.987 9.278 7.28L5.557 11h7.842c1.595 0 2.81 0.242 3.889 0.764l0.246 0.126c1.109 0.593 1.983 1.467 2.576 2.576 0.61 1.14 0.89 2.418 0.89 4.135 0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75c0-1.484-0.228-2.52-0.713-3.428-0.453-0.847-1.113-1.507-1.96-1.96-0.838-0.448-1.786-0.676-3.094-0.709L13.4 12.5H5.562l3.715 3.721z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_arrow_up_16_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_arrow_up_16_filled.xml
@ -1,3 +1,3 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
-    <path android:pathData="M8 14c-0.414 0-0.75-0.336-0.75-0.75V4.463L4.309 7.75c-0.276 0.31-0.75 0.335-1.06 0.06-0.308-0.276-0.334-0.75-0.058-1.06L7.441 2C7.583 1.842 7.787 1.75 8 1.75c0.213 0 0.417 0.09 0.559 0.25l4.25 4.75c0.276 0.309 0.25 0.783-0.059 1.059-0.309 0.276-0.783 0.25-1.059-0.059L8.75 4.463v8.787C8.75 13.664 8.414 14 8 14z" android:fillColor="@color/fluent_default_icon_tint"/>
+    <path android:pathData="M8 14c-0.414 0-0.75-0.336-0.75-0.75V4.463L4.309 7.75c-0.276 0.31-0.75 0.335-1.06 0.06-0.308-0.276-0.334-0.75-0.058-1.06L7.441 2C7.583 1.842 7.787 1.75 8 1.75c0.213 0 0.417 0.09 0.559 0.25l4.25 4.75c0.276 0.309 0.25 0.783-0.059 1.059-0.309 0.276-0.783 0.25-1.059-0.059L8.75 4.463v8.787C8.75 13.664 8.414 14 8 14z" android:fillColor="#fff"/>
 </vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_bookmark_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_bookmark_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.19 21.855c-0.495 0.357-1.187 0.002-1.187-0.61V6.25C5.003 4.455 6.458 3 8.253 3h7.498c1.795 0 3.25 1.455 3.25 3.25v14.996c0 0.611-0.692 0.966-1.188 0.609l-5.81-4.181-5.812 4.18zM17.502 6.25c0-0.966-0.783-1.75-1.75-1.75H8.253c-0.967 0-1.75 0.784-1.75 1.75v13.532l5.061-3.641c0.262-0.188 0.614-0.188 0.876 0l5.061 3.641V6.25z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_multiple_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="M9.562 3c-4.143 0-7.5 3.358-7.5 7.5 0 1.133 0.251 2.209 0.702 3.173L2.04 16.515c-0.233 0.913 0.59 1.744 1.504 1.524 0.75-0.18 1.903-0.457 2.93-0.702C7.417 17.763 8.463 18 9.563 18c4.142 0 7.5-3.358 7.5-7.5 0-4.142-3.358-7.5-7.5-7.5zm-6 7.5c0-3.314 2.686-6 6-6 3.313 0 6 2.686 6 6s-2.687 6-6 6c-0.961 0-1.867-0.225-2.67-0.625l-0.244-0.121-0.264 0.063c-0.923 0.22-1.99 0.475-2.788 0.667l0.69-2.708 0.07-0.276-0.13-0.253C3.8 12.425 3.562 11.49 3.562 10.5zm11 10.5c-1.97 0-3.762-0.759-5.1-2h0.1c0.718 0 1.415-0.089 2.08-0.257 0.865 0.482 1.86 0.757 2.92 0.757 0.96 0 1.866-0.225 2.67-0.625l0.243-0.121 0.264 0.063c0.922 0.22 1.966 0.445 2.74 0.61-0.175-0.751-0.414-1.756-0.642-2.651l-0.07-0.276 0.13-0.253c0.425-0.822 0.665-1.755 0.665-2.747 0-2.115-1.094-3.974-2.747-5.042-0.179-0.724-0.45-1.41-0.8-2.048 2.937 1.017 5.047 3.807 5.047 7.09 0 1.133-0.252 2.21-0.703 3.174 0.253 1.008 0.509 2.1 0.671 2.803 0.205 0.885-0.575 1.686-1.467 1.5-0.727-0.152-1.87-0.396-2.913-0.64C16.706 20.763 15.66 21 14.561 21z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_chat_warning_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_warning_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="M22 11.998c0-5.523-4.477-10-10-10s-10 4.477-10 10c0 1.643 0.397 3.23 1.145 4.65l-1.116 4.289c-0.037 0.14-0.037 0.288 0 0.428 0.118 0.454 0.582 0.727 1.036 0.608l4.29-1.117c1.42 0.746 3.005 1.142 4.645 1.142 5.523 0 10-4.477 10-10zM12 6.5c0.414 0 0.75 0.335 0.75 0.75v6.25c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75V7.25c0-0.415 0.336-0.75 0.75-0.75zm1 9.997c0 0.553-0.448 1-1 1s-1-0.447-1-1c0-0.552 0.448-1 1-1s1 0.448 1 1z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_chat_warning_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_warning_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 6.5c0.414 0 0.75 0.336 0.75 0.75v6.25c0 0.414-0.336 0.75-0.75 0.75s-0.75-0.336-0.75-0.75V7.25c0-0.414 0.336-0.75 0.75-0.75zm0 10.998c0.552 0 1-0.448 1-1 0-0.553-0.448-1-1-1s-1 0.447-1 1c0 0.552 0.448 1 1 1zM12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10c-1.618 0-3.182-0.385-4.587-1.112l-3.826 1.067c-0.665 0.186-1.354-0.202-1.54-0.867-0.062-0.22-0.062-0.453 0-0.673l1.068-3.823C2.386 15.186 2 13.62 2 12 2 6.477 6.477 2 12 2zm0 1.5c-4.694 0-8.5 3.806-8.5 8.5 0 1.47 0.373 2.883 1.073 4.137l0.15 0.27-1.112 3.984 3.986-1.112 0.27 0.15C9.12 20.13 10.532 20.5 12 20.5c4.694 0 8.5-3.806 8.5-8.5S16.694 3.5 12 3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_chat_warning_24_selector.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_chat_warning_24_selector.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--~ Copyright (c) 2022. ~ Microsoft Corporation. All rights reserved.-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_fluent_chat_warning_24_filled" android:state_activated="true"/>
-    <item android:drawable="@drawable/ic_fluent_chat_warning_24_filled" android:state_checked="true"/>
-    <item android:drawable="@drawable/ic_fluent_chat_warning_24_filled" android:state_selected="true"/>
-    <item android:drawable="@drawable/ic_fluent_chat_warning_24_regular"/>
-</selector>
--- a/mastodon/src/main/res/drawable/ic_fluent_checkmark_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_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="M8.5 16.586l-3.793-3.793c-0.39-0.39-1.024-0.39-1.414 0-0.39 0.39-0.39 1.024 0 1.414l4.5 4.5c0.39 0.39 1.024 0.39 1.414 0l11-11c0.39-0.39 0.39-1.024 0-1.414-0.39-0.39-1.024-0.39-1.414 0L8.5 16.586z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_checkmark_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_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="M4.53 12.97c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l4.5 4.5c0.293 0.293 0.767 0.293 1.06 0l11-11c0.293-0.293 0.293-0.767 0-1.06-0.293-0.293-0.767-0.293-1.06 0L8.5 16.94l-3.97-3.97z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_checkmark_circle_24_filled.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_circle_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.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm3.22 6.97l-4.47 4.47-1.97-1.97c-0.293-0.293-0.767-0.293-1.06 0-0.293 0.293-0.293 0.767 0 1.06l2.5 2.5c0.293 0.293 0.767 0.293 1.06 0l5-5c0.293-0.293 0.293-0.767 0-1.06-0.293-0.293-0.767-0.293-1.06 0z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/mastodon/src/main/res/drawable/ic_fluent_checkmark_circle_24_regular.xml
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_circle_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 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm0 1.5c-4.694 0-8.5 3.806-8.5 8.5s3.806 8.5 8.5 8.5 8.5-3.806 8.5-8.5-3.806-8.5-8.5-8.5zm-1.25 9.94l4.47-4.47c0.293-0.293 0.767-0.293 1.06 0 0.267 0.266 0.29 0.683 0.073 0.976L16.28 10.03l-5 5c-0.266 0.267-0.683 0.29-0.976 0.073L10.22 15.03l-2.5-2.5c-0.293-0.293-0.293-0.767 0-1.06 0.266-0.267 0.683-0.29 0.976-0.073L8.78 11.47l1.97 1.97 4.47-4.47-4.47 4.47z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
--- a/Show More
+++ b/Show More