Merge upstream redesign (#714)

* merge toolbar fragment

* Fix store screenshot generator

* Fix alert color

* Fix #609

* Fix crash

* bigger hitbox for chips

* support mastodon languages

* merge ui utils

* merge stuff

* fix icon

* ensure 48dp touch target

* init local prefs, add helper function for enum values

* update compose action layout

* merge compose-adj files

* update extended footer

* fix poll wrong option checked

closes sk22#641

* no border when disabled

closes sk22#640

* Fix #610

* Minor fixes

* Fix alert color

* Fix #609

* Fix crash

* Fix #610

* Minor fixes

* add resources

* more compatible mastodon language

* fix html parser

* mark as read on refresh

* update tab bar

* tweak m3 buttons

* update compose-adj files

* tweak and update styles

* m3 expand button

* flag icon should be 18dp, actually

* More minor fixes

closes #612

* More minor fixes

closes #612

* Bump version

* fix no create status event when redrafting

* add material 3 assets

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* New translations strings.xml (Thai)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* use new buttons for profile fragment

* merge compose fragment

* merge all the styles! oh dear

* New translations full_description.txt (Indonesian)

* New translations full_description.txt (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations full_description.txt (Chinese Simplified)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* New translations strings.xml (Greek)

* Make the default server configurable

* Pass the system timezone to server when signing up

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Japanese)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* Make the default server configurable

* Pass the system timezone to server when signing up

* oops. accidentally pasted the commit message in the code

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Belarusian)

* prepare merging profile fragment

* merge profile fragment

* New translations strings.xml (Belarusian)

* New translations strings.xml (Greek)

* fix icon padding

* apply post header changes

* minor margin tweaks

* fix footer buttons

* fix header announcement buttons

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations full_description.txt (Japanese)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* fix replying

* New translations strings.xml (Icelandic)

* fix translate button

* fix more button visibility

* fix counts label styling

* fix disabled boost button opacity

* fix tab layouts

* fix notification icon color crash

* New translations strings.xml (Greek)

* implement elevation listener in home tab

* fix elevation and listener in home tab

* add elevation scroll listener to notifications

* New translations strings.xml (Scottish Gaelic)

* Add editorconfig

So that PRs like #625 don't happen again

* Crash fix

* 🤔

* New translations strings.xml (Greek)

* New translations strings.xml (Japanese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* fix notification elevation and integrate divider

* 🤔

* Crash fix

* Add editorconfig

So that PRs like #625 don't happen again

* New translations strings.xml (Turkish)

* save interactions in cache

* New translations strings.xml (Turkish)

* merge new discover/search

* New translations strings.xml (Bengali)

* New translations strings.xml (Scottish Gaelic)

* New translations strings.xml (Bengali)

* merge new settings fragments

* fix no auth callback always being executed

* allow opening server info from profile

closes sk22#593

* fix hide boosts icon color

closes sk22#676

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Turkish)

* update fedinuke list

from source; doesn't contain any modifications regarding a recent issue

* New translations strings.xml (Turkish)

* remove unused class

* fix crash

* darken m3 outline color a bit

* use m3 outline again

* fix misalignment

closes sk22#682

* New translations strings.xml (Turkish)

* New translations full_description.txt (Turkish)

* New translations short_description.txt (Turkish)

* fix crash

* fix metadata sorting

* show pronouns in header/account lists

* fix broken divider line

closes sk22#679

* trim pronouns

* improve pronoun display

* New translations strings.xml (French)

* New translations strings.xml (Japanese)

* fix broken federated timeline

closes sk22#685

* fix broken -1 fallback behavior

closes sk22#681

* don't display nothing if server about request fails

closes sk22#678

* New translations strings.xml (Ukrainian)

* migrate global prefs to local prefs

* do confirm unfollow by default

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* make sure list in prefs are always mutable and nut null

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* fix pronouns edge case

* add back fix for stretched images

closes sk22#636

* fix null pointer on missing default posting language

* fix default posting language not being applied

* bigger username hitbox

closes sk22#688

* fix rtl header username alignment

closes sk22#689

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* hopefully fix crashes

closes sk22#692

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* fix pronoun crash

* New translations strings.xml (Persian)

* New translations strings.xml (Ukrainian)

* re-add true black mode

* asterisk can be a pronoun

* New translations strings.xml (Persian)

* true black mode fixes and clean-ups

* material 3 button background for switcher

* darker tab bar selected background

* better align follow/following button widths

* restore rainbow refresh colors

* fix search transition

* fix min width issue with switcher button

* fix no elevation when true black is enabled in light theme

* use statusForContent to determine spoilerRevealed

closes sk22#694

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* fix profile tab bar in true black theme

* fix m3 default button style

closes sk22#697

* prettier role badges

closes sk22#663

* fix translate button spacing

closes sk22#655

* use m3 switches in dialogs

closes sk22#653

* implement color palette switcher

* fix color palettes being overwritten

* add display and notification settings

* clean up code

* per-account single notification setting

* add missing items to notification types

* add prefix replies setting

* add show replies/boosts and reply visibility

* add load/see new posts settings

* fix spectator mode missing spoiler padding

* add a bunch of display settings

* update fedinuke

* add content type settings

* add settings for local-onlu

* add missing settings items

* fix visibility button icon tint

* hopefully fix some crashes

* normalize padding above edit text

* apparently, some people don't like pills

closes sk22#706

* fix play button color

closes sk22#705

mastodon/src/main/res/layout/fragment_compose.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.joinmastodon.android.ui.views.SizeListenerLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
@@ -13,6 +14,7 @@
 		android:fillViewport="true">
 
 		<LinearLayout
+			android:id="@+id/compose_main_ll"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical">
@@ -25,47 +27,43 @@
 				android:visibility="gone"
 				android:background="?android:selectableItemBackground">
 				<include layout="@layout/display_item_header" />
+				<TextView
+					android:id="@+id/reply_to_spoiler"
+					android:visibility="gone"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginHorizontal="16dp"
+					android:layout_marginTop="16dp"
+					android:paddingVertical="12dp"
+					android:paddingHorizontal="21dp"
+					android:textAppearance="@style/m3_body_large"
+					android:textColor="?colorM3OnSecondaryContainer"
+					android:background="@drawable/bg_cw_edit" />
 				<include layout="@layout/display_item_text" />
 				<View
 					android:layout_width="match_parent"
 					android:layout_height="1dp"
-					android:background="?attr/colorPollVoted"/>
+					android:background="?colorM3OutlineVariant"/>
 
 			</LinearLayout>
-
+			
 			<LinearLayout
 				android:id="@+id/reply_wrap"
 				android:orientation="vertical"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
-
-				<EditText
-					android:id="@+id/content_warning"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:elevation="0dp"
-					android:hint="@string/content_warning"
-					android:inputType="textMultiLine|textCapSentences"
-					android:visibility="gone"
-					android:textColorHint="?android:textColorSecondary"
-					android:background="@drawable/bg_cw_edit"
-					android:padding="16dp"
-					android:minHeight="56dp"
-					android:textSize="16sp"
-					tools:visibility="visible"/>
-
 				<TextView
 					android:id="@+id/reply_text"
-					android:layout_width="wrap_content"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="-12dp"
-					android:layout_marginStart="16dp"
-					android:paddingTop="16dp"
-					android:paddingBottom="6dp"
+					android:layout_marginLeft="16dp"
+					android:layout_marginRight="16dp"
+					android:layout_marginTop="16dp"
 					android:textAppearance="@style/m3_title_small"
 					android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
-					android:drawableTint="?android:textColorSecondary"
+					android:drawableTint="?colorM3OnSurfaceVariant"
 					android:drawablePadding="6dp"
+					android:textColor="?colorM3OnSurfaceVariant"
 					android:singleLine="true"
 					android:text="@string/sk_in_reply"
 					android:ellipsize="end"/>
@@ -85,67 +83,111 @@
 						android:layout_alignParentTop="true"
 						android:layout_marginEnd="12dp" />
 
-					<TextView
-						android:id="@+id/self_name"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_toEndOf="@id/self_avatar"
-						android:layout_above="@+id/self_username"
-						android:ellipsize="end"
-						android:singleLine="true"
-						android:textAppearance="@style/m3_title_medium"
-						tools:text="Eugen" />
-
-					<TextView
-						android:id="@+id/self_extra_text"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginStart="8sp"
-						android:layout_toEndOf="@id/self_name"
-						android:layout_above="@id/self_username"
-						android:ellipsize="end"
-						android:fontFamily="sans-serif"
-						android:singleLine="true"
-						android:textAlignment="viewStart"
-						android:textAppearance="@style/m3_title_medium"
-						tools:text="@string/sk_local_only" />
-
-					<TextView
-						android:id="@id/self_username"
+					<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
+						android:id="@+id/name_wrap"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
+						android:layout_toStartOf="@id/btn_visibility"
+						android:layout_marginEnd="8dp"
+						android:layout_above="@+id/self_username">
+
+						<TextView
+							android:id="@+id/self_name"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:ellipsize="end"
+							android:singleLine="true"
+							android:textAppearance="@style/m3_title_medium"
+							android:textColor="?colorM3OnSurface"
+							android:gravity="start|center_vertical"
+							tools:text="Eugen" />
+
+						<TextView
+							android:id="@+id/self_extra_text"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginStart="8sp"
+							android:ellipsize="end"
+							android:singleLine="true"
+							android:textAppearance="@style/m3_title_medium"
+							android:textAlignment="viewStart"
+							android:textColor="?colorM3OnSurface"
+							tools:text="@string/sk_inline_local_only" />
+
+					</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
+
+					<TextView
+						android:id="@+id/self_username"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
 						android:layout_alignBottom="@id/self_avatar"
-						android:ellipsize="end"
+						android:layout_marginEnd="8dp"
+						android:layout_toStartOf="@id/btn_visibility"
+						android:layout_toEndOf="@id/self_avatar"
+						android:layout_marginBottom="3sp"
 						android:singleLine="true"
-						android:textAppearance="@style/m3_title_small"
-						android:paddingBottom="3sp"
-						tools:text="\@Gargron" />
+						android:ellipsize="end"
+						android:textAppearance="@style/m3_body_medium"
+						android:gravity="center_vertical"
+						android:textColor="?colorM3OnSurfaceVariant"
+						tools:text="9h ago · \@Gargron@mastodon.social"/>
+
+					<Button
+						android:id="@+id/btn_visibility"
+						android:layout_width="wrap_content"
+						android:layout_height="48dp"
+						android:layout_alignParentEnd="true"
+						android:layout_marginTop="8dp"
+						android:textAppearance="@style/m3_label_large"
+						android:background="@drawable/bg_filter_chip"
+						android:textColor="@color/filter_chip_text"
+						android:drawableTint="@color/m3_primary_selector"
+						android:paddingStart="8dp"
+						android:paddingEnd="8dp"
+						android:drawablePadding="8dp"
+						tools:text="@string/visibility_public"/>
 
 				</RelativeLayout>
 
-				<TextView
-					android:id="@+id/reply_text_below"
-					android:layout_width="wrap_content"
+				<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout
+					android:id="@+id/content_warning_wrap"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginTop="-6dp"
-					android:layout_marginBottom="-6dp"
-					android:layout_marginStart="16dp"
-					android:paddingTop="16dp"
-					android:paddingBottom="6dp"
-					android:textAppearance="@style/m3_title_small"
-					android:drawableStart="@drawable/ic_fluent_arrow_reply_20_filled"
-					android:drawableTint="?android:textColorSecondary"
-					android:drawablePadding="6dp"
-					android:singleLine="true"
-					android:text="@string/sk_in_reply"
-					android:ellipsize="end"/>
+					android:layout_marginTop="16dp"
+					android:layout_marginLeft="16dp"
+					android:layout_marginRight="16dp"
+					android:paddingTop="8dp"
+					android:paddingBottom="8dp"
+					android:visibility="gone"
+					android:background="@drawable/bg_cw_edit"
+					android:addStatesFromChildren="true"
+					app:labelTextColor="?colorM3Primary"
+					app:editTextOffsetY="8dp"
+					tools:visibility="visible">
+					<EditText
+						android:id="@+id/content_warning"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:elevation="0dp"
+						android:hint="@string/content_warning"
+						android:inputType="textMultiLine|textCapSentences"
+						android:textColorHint="?colorM3OnSurfaceVariant"
+						android:paddingLeft="21dp"
+						android:paddingRight="21dp"
+						android:paddingTop="8dp"
+						android:paddingBottom="8dp"
+						android:minHeight="40dp"
+						android:textAppearance="@style/m3_body_large"
+						android:textColor="?colorM3OnSurface"
+						android:background="@null"
+						android:maxLines="3"/>
+				</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>
 
 				<FrameLayout
 					android:id="@+id/toot_text_wrap"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="10dp">
+					android:layout_height="wrap_content">
 
 					<org.joinmastodon.android.ui.views.ComposeEditText
 						android:id="@+id/toot_text"
@@ -154,277 +196,315 @@
 						android:paddingLeft="16dp"
 						android:paddingRight="16dp"
 						android:paddingBottom="16dp"
+						android:paddingTop="12dp"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"
 						android:gravity="top"
 						android:background="@null"
 						android:hint="@string/compose_hint"
 						android:elevation="0dp"
+						android:textColor="?colorM3OnSurface"
+						android:textColorHint="?colorM3OnSurfaceVariant"
 						android:inputType="textMultiLine|textCapSentences"/>
 
 				</FrameLayout>
 
-				<LinearLayout
+				<RelativeLayout
 					android:id="@+id/poll_wrap"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:orientation="vertical"
+					android:clipChildren="false"
+					android:clipToPadding="false"
+					android:paddingBottom="16dp"
 					android:visibility="gone"
 					tools:visibility="visible">
+					<LinearLayout
+						android:id="@+id/poll_settings"
+						android:layout_width="match_parent"
+						android:layout_height="48dp"
+						android:layout_marginTop="12dp"
+						android:layout_marginLeft="16dp"
+						android:layout_marginRight="16dp"
+						android:layout_below="@id/poll_options"
+						android:gravity="center_vertical"
+						android:divider="@drawable/divider_vertical_variant_1dp"
+						android:showDividers="middle"
+						android:dividerPadding="8dp">
+
+						<ImageButton
+							android:id="@+id/add_poll_option"
+							android:layout_width="40dp"
+							android:layout_height="40dp"
+							android:layout_marginStart="4dp"
+							android:layout_marginEnd="20dp"
+							android:src="@drawable/ic_add_24px"
+							android:tint="@color/button_text_m3_tonal"
+							android:background="@drawable/bg_button_m3_tonal"
+							android:contentDescription="@string/add_poll_option"/>
+
+						<ImageView
+							android:id="@+id/delete_poll_option"
+							android:layout_width="40dp"
+							android:layout_height="40dp"
+							android:layout_marginStart="4dp"
+							android:layout_marginEnd="20dp"
+							android:src="@drawable/ic_fluent_delete_24_regular"
+							android:scaleType="center"
+							android:tint="?colorM3Error"
+							android:background="@drawable/bg_button_m3_tonal_error"
+							android:visibility="gone"
+							tools:visibility="visible"
+							android:contentDescription="@string/delete_poll_option"/>
+
+						<LinearLayout
+							android:id="@+id/poll_duration"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_marginHorizontal="8dp"
+							android:orientation="vertical"
+							android:paddingHorizontal="8dp"
+							android:gravity="center_vertical"
+							android:background="@drawable/bg_rect_4dp_ripple">
+							
+							<TextView
+								android:layout_width="wrap_content"
+								android:layout_height="16dp"
+								android:textAppearance="@style/m3_label_small"
+								android:textColor="?colorM3Secondary"
+								android:gravity="center_vertical"
+								android:singleLine="true"
+								android:ellipsize="end"
+								android:text="@string/poll_length"/>
+							
+							<TextView
+								android:id="@+id/poll_duration_value"
+								android:layout_width="wrap_content"
+								android:layout_height="20dp"
+								android:layout_marginTop="2dp"
+								android:gravity="center_vertical"
+								android:textAppearance="@style/m3_label_large"
+								android:textColor="?colorM3Primary"
+								android:singleLine="true"
+								android:ellipsize="end"
+								tools:text="1 day"/>
+							
+						</LinearLayout>
+
+						<LinearLayout
+							android:id="@+id/poll_style"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_marginHorizontal="8dp"
+							android:orientation="vertical"
+							android:paddingHorizontal="8dp"
+							android:gravity="center_vertical"
+							android:background="@drawable/bg_rect_4dp_ripple">
+
+							<TextView
+								android:layout_width="wrap_content"
+								android:layout_height="16dp"
+								android:textAppearance="@style/m3_label_small"
+								android:textColor="?colorM3Secondary"
+								android:gravity="center_vertical"
+								android:singleLine="true"
+								android:ellipsize="end"
+								android:text="@string/poll_style"/>
+
+							<TextView
+								android:id="@+id/poll_style_value"
+								android:layout_width="wrap_content"
+								android:layout_height="20dp"
+								android:layout_marginTop="2dp"
+								android:gravity="center_vertical"
+								android:textAppearance="@style/m3_label_large"
+								android:textColor="?colorM3Primary"
+								android:singleLine="true"
+								android:ellipsize="end"
+								tools:text="Pick one"/>
+
+						</LinearLayout>
+
+					</LinearLayout>
 					<org.joinmastodon.android.ui.views.ReorderableLinearLayout
 						android:id="@+id/poll_options"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+						android:layout_alignParentTop="true"
+						android:layout_marginHorizontal="16dp"
+						android:showDividers="middle"
 						android:orientation="vertical"/>
-					<LinearLayout
-						android:id="@+id/add_poll_option"
-						android:layout_width="match_parent"
-						android:layout_height="56dp"
-						android:layout_marginStart="16dp"
-						android:layout_marginEnd="56dp"
-						android:layout_marginBottom="8dp"
-						android:background="@drawable/bg_poll_option_clickable"
-						android:outlineProvider="background"
-						android:elevation="2dp">
-						<ImageView
-							android:id="@+id/add_poll_option_icon"
-							android:layout_width="24dp"
-							android:layout_height="24dp"
-							android:layout_margin="16dp"
-							android:tint="?colorDarkIcon"
-							android:src="@drawable/ic_fluent_add_circle_24_regular"/>
-					</LinearLayout>
-					<TextView
-						android:id="@+id/poll_duration"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="16dp"
-						android:layout_marginRight="16dp"
-						android:layout_marginBottom="8dp"
-						android:textAppearance="@style/m3_label_large"
-						android:textColor="?android:textColorPrimary"
-						tools:text="Duration: 7 days"/>
+					<View
+						android:id="@+id/poll_poof"
+						android:layout_width="40dp"
+						android:layout_height="40dp"
+						android:layout_alignTop="@id/poll_settings"
+						android:layout_alignStart="@id/poll_settings"
+						android:layout_marginStart="4dp"
+						android:layout_marginTop="4dp"
+						android:visibility="invisible"
+						tools:visibility="visible"
+						android:background="@drawable/poof"/>
+				</RelativeLayout>
 
-					<LinearLayout
-						android:id="@+id/poll_allow_multiple"
-						android:orientation="horizontal"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="16dp"
-						android:layout_marginTop="8dp"
-						android:gravity="center_vertical"
-						android:layoutDirection="locale"
-						android:paddingLeft="16dp"
-						android:paddingRight="16dp"
-						android:paddingTop="12dp"
-						android:paddingBottom="12dp"
-						android:background="?android:selectableItemBackground">
-
-						<CheckBox
-							android:id="@+id/poll_allow_multiple_checkbox"
-							android:clickable="false"
-							android:layout_width="wrap_content"
-							android:layout_height="24dp"
-							android:layout_marginEnd="24dp"
-							android:duplicateParentState="true"
-							android:importantForAccessibility="no"/>
-
-						<TextView
-							android:layout_width="0dp"
-							android:layout_height="wrap_content"
-							android:layout_weight="1"
-							android:textSize="16sp"
-							android:singleLine="true"
-							android:text="@string/sk_poll_allow_multiple" />
-					</LinearLayout>
-				</LinearLayout>
-
-				<org.joinmastodon.android.ui.views.ComposeMediaLayout
-					android:id="@+id/attachments"
-					android:layout_width="wrap_content"
+				<org.joinmastodon.android.ui.views.HorizontalScrollViewThatRespectsMatchParent
+					android:id="@+id/attachments_scroller"
+					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_gravity="center_horizontal"
-					android:visibility="gone"/>
+					android:fillViewport="true"
+					android:scrollbars="none"
+					android:clipChildren="false"
+					android:visibility="gone">
+					<org.joinmastodon.android.ui.views.ReorderableLinearLayout
+						android:id="@+id/attachments"
+						android:layout_width="wrap_content"
+						android:layout_height="300dp"
+						android:orientation="horizontal"
+						android:showDividers="middle"
+						android:clipToPadding="false"
+						android:paddingHorizontal="16dp"/>
+				</org.joinmastodon.android.ui.views.HorizontalScrollViewThatRespectsMatchParent>
 
-				<LinearLayout
+				<Button
+					style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
 					android:id="@+id/sensitive_item"
 					android:orientation="horizontal"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="16dp"
 					android:layout_marginTop="8dp"
+					android:layout_marginHorizontal="16dp"
 					android:gravity="center_vertical"
 					android:layoutDirection="locale"
-					android:paddingLeft="16dp"
-					android:paddingRight="16dp"
-					android:paddingTop="12dp"
-					android:paddingBottom="12dp"
-					android:background="?android:selectableItemBackground"
-					android:visibility="gone">
-
-					<ImageView
-						android:id="@+id/sensitive_icon"
-						android:layout_width="24dp"
-						android:layout_height="24dp"
-						android:layout_marginEnd="32dp"
-						android:src="@drawable/ic_fluent_flag_24_selector"
-						android:tint="?android:textColorPrimary"
-						android:importantForAccessibility="no"/>
-
-					<TextView
-						android:layout_width="0dp"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:textSize="16sp"
-						android:singleLine="true"
-						android:text="@string/sk_mark_media_as_sensitive" />
-				</LinearLayout>
+					android:drawableStart="@drawable/ic_fluent_flag_18_selector"
+					android:text="@string/sk_mark_media_as_sensitive"
+					android:visibility="gone" />
 			</LinearLayout>
 		</LinearLayout>
 	</ScrollView>
 
-	<LinearLayout
+	<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+		android:id="@+id/schedule_draft_view"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:background="?colorBackgroundLightest"
-		android:elevation="2dp"
-		android:outlineProvider="bounds"
-		android:paddingStart="8dp"
-		android:paddingEnd="6dp"
-		android:layoutDirection="locale">
+		android:layout_marginStart="12dp"
+		android:gravity="center_vertical"
+		android:visibility="gone"
+		android:minHeight="48dp"
+		android:paddingVertical="4dp">
 
-		<LinearLayout
-			android:id="@+id/schedule_draft_view"
-			android:layout_width="match_parent"
+		<TextView
+			android:id="@+id/schedule_draft_text"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:minHeight="48dp"
-			android:paddingTop="4dp">
+			android:layout_marginStart="6dp"
+			android:drawableStart="@drawable/ic_fluent_drafts_20_regular"
+			android:drawableTint="?android:textColorSecondary"
+			android:drawablePadding="16dp"
+			android:text="@string/sk_compose_draft" />
 
-			<TextView
-				android:id="@+id/schedule_draft_text"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="6dp"
-				android:drawableStart="@drawable/ic_fluent_drafts_20_regular"
-				android:drawableTint="?android:textColorSecondary"
-				android:drawablePadding="16dp"
-				android:text="@string/sk_compose_draft" />
+		<Button
+			android:id="@+id/scheduled_time_btn"
+			style="@style/Widget.Mastodon.M3.Button.Outlined.Icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="12dp"
+			android:gravity="center"
+			android:textSize="14sp"
+			android:textColor="?android:textColorSecondary"
+			android:fontFamily="sans-serif"
+			android:drawableStart="@drawable/ic_fluent_clock_20_regular"
+			android:drawableTint="?android:textColorSecondary"
+			tools:text="Dec 12, 2021, 12:42 PM"/>
 
-			<Space
-				android:layout_width="0dp"
-				android:layout_height="match_parent"
-				android:layout_weight="1" />
+		<Space
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1" />
 
-			<Button
-				android:id="@+id/scheduled_time_btn"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:gravity="center"
-				android:padding="8dp"
-				android:textSize="14sp"
-				android:minHeight="40dp"
-				android:textColor="?android:textColorSecondary"
-				android:background="@drawable/bg_text_button"
-				android:fontFamily="sans-serif"
-				android:drawableStart="@drawable/ic_fluent_clock_20_regular"
-				android:drawablePadding="8dp"
-				android:drawableTint="?android:textColorSecondary"
-				tools:text="Dec 12, 2021, 12:42 PM"/>
+		<ImageButton
+			android:id="@+id/schedule_draft_dismiss"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_marginHorizontal="8dp"
+			android:src="@drawable/ic_fluent_dismiss_20_filled"
+			android:background="@drawable/bg_icon_button"
+			android:tooltipText="@string/sk_compose_no_schedule"
+			android:contentDescription="@string/sk_compose_no_schedule" />
 
-			<ImageButton
-				android:id="@+id/schedule_draft_dismiss"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginStart="8dp"
-				android:src="@drawable/ic_fluent_dismiss_20_filled"
-				android:background="?android:actionBarItemBackground"
-				android:contentDescription="@string/sk_compose_no_schedule" />
+	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
-		</LinearLayout>
+	<LinearLayout
+		android:id="@+id/bottom_bar"
+		android:layout_width="match_parent"
+		android:layout_height="56dp"
+		android:elevation="3dp"
+		android:outlineProvider="bounds"
+		android:gravity="bottom"
+		android:orientation="vertical">
+
+		<View
+			android:id="@+id/bottom_bar_autocomplete_divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginBottom="4dp"
+			android:visibility="invisible"
+			android:background="?colorM3Outline"/>
 
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="48dp"
 			android:orientation="horizontal"
-			android:gravity="center_vertical">
+			android:layout_marginStart="4dp"
+			android:layout_marginVertical="4dp"
+			android:gravity="center_vertical"
+			android:layoutDirection="locale">
 
 			<ImageButton
 				android:id="@+id/btn_media"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/bg_icon_button"
 				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
 				android:contentDescription="@string/add_media"
 				android:tooltipText="@string/add_media"
 				android:src="@drawable/ic_fluent_image_add_24_regular"/>
 
 			<ImageButton
 				android:id="@+id/btn_poll"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/bg_icon_button"
 				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
 				android:contentDescription="@string/add_poll"
 				android:tooltipText="@string/add_poll"
 				android:src="@drawable/ic_fluent_poll_24_selector"/>
 
 			<ImageButton
 				android:id="@+id/btn_emoji"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/bg_icon_button"
 				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
 				android:contentDescription="@string/emoji"
 				android:tooltipText="@string/emoji"
 				android:src="@drawable/ic_fluent_emoji_24_selector"/>
 
 			<ImageButton
 				android:id="@+id/btn_spoiler"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/bg_icon_button"
 				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
 				android:contentDescription="@string/content_warning"
 				android:tooltipText="@string/content_warning"
 				android:src="@drawable/ic_fluent_chat_warning_24_selector"/>
 
-			<ImageButton
-				android:id="@+id/btn_visibility"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
-				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
-				android:contentDescription="@string/post_visibility"
-				android:tooltipText="@string/post_visibility"
-				android:src="@drawable/ic_fluent_earth_24_regular"/>
-
 			<ImageButton
 				android:id="@+id/btn_content_type"
-				android:layout_width="36dp"
-				android:layout_height="36dp"
-				android:layout_marginEnd="12dp"
-				android:background="?android:attr/actionBarItemBackground"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/bg_icon_button"
 				android:padding="0px"
-				android:tint="@color/compose_button"
-				android:tintMode="src_in"
 				android:contentDescription="@string/sk_content_type"
 				android:tooltipText="@string/sk_content_type"
 				android:src="@drawable/ic_fluent_text_edit_style_24_selector"/>
@@ -438,10 +518,11 @@
 				android:id="@+id/char_counter"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginEnd="10dp"
-				android:textAppearance="@style/m3_body_large"
-				android:textColor="?android:textColorSecondary"
+				android:layout_marginEnd="16dp"
+				android:textAppearance="@style/m3_label_large"
+				android:textColor="?colorM3OnSurface"
 				tools:text="500"/>
+
 		</LinearLayout>
 	</LinearLayout>