Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'improve-compose-toolbar-hitbox'

This commit is contained in:
sk 2023-01-23 15:32:02 +01:00
parent 82534f7c4a 32a8d38edf
commit 626614c03d
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
mastodon/src/main/res/layout/fragment_compose.xml
View File

@ -260,9 +260,10 @@
android:background="?colorBackgroundLightest" android:background="?colorBackgroundLightest"
android:elevation="2dp" android:elevation="2dp"
android:outlineProvider="bounds" android:outlineProvider="bounds"
android:paddingLeft="16dp" android:paddingStart="8dp"
android:paddingRight="12dp" android:paddingEnd="6dp"
android:layoutDirection="locale"> android:layoutDirection="locale">
<LinearLayout <LinearLayout
android:id="@+id/schedule_draft_view" android:id="@+id/schedule_draft_view"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -275,6 +276,7 @@
android:id="@+id/schedule_draft_text" android:id="@+id/schedule_draft_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:drawableStart="@drawable/ic_fluent_drafts_20_regular" android:drawableStart="@drawable/ic_fluent_drafts_20_regular"
android:drawableTint="?android:textColorSecondary" android:drawableTint="?android:textColorSecondary"
android:drawablePadding="16dp" android:drawablePadding="16dp"
@ -301,15 +303,16 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="?android:textColorSecondary" android:drawableTint="?android:textColorSecondary"
tools:text="Dec 12, 2021, 12:42 PM"/> tools:text="Dec 12, 2021, 12:42 PM"/>
<ImageButton <ImageButton
android:id="@+id/schedule_draft_dismiss" android:id="@+id/schedule_draft_dismiss"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/ic_fluent_dismiss_20_filled" android:src="@drawable/ic_fluent_dismiss_20_filled"
android:background="?android:selectableItemBackgroundBorderless" android:background="?android:actionBarItemBackground"
android:contentDescription="@string/sk_compose_no_schedule" android:contentDescription="@string/sk_compose_no_schedule" />
android:padding="4dp"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -320,10 +323,10 @@
<ImageButton <ImageButton
android:id="@+id/btn_media" android:id="@+id/btn_media"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/actionBarItemBackground"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
android:tintMode="src_in" android:tintMode="src_in"
@ -333,10 +336,10 @@
<ImageButton <ImageButton
android:id="@+id/btn_poll" android:id="@+id/btn_poll"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/actionBarItemBackground"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
android:tintMode="src_in" android:tintMode="src_in"
@ -346,10 +349,10 @@
<ImageButton <ImageButton
android:id="@+id/btn_emoji" android:id="@+id/btn_emoji"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/actionBarItemBackground"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
android:tintMode="src_in" android:tintMode="src_in"
@ -359,10 +362,10 @@
<ImageButton <ImageButton
android:id="@+id/btn_spoiler" android:id="@+id/btn_spoiler"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/actionBarItemBackground"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
android:tintMode="src_in" android:tintMode="src_in"
@ -372,10 +375,10 @@
<ImageButton <ImageButton
android:id="@+id/btn_visibility" android:id="@+id/btn_visibility"
android:layout_width="24dp" android:layout_width="36dp"
android:layout_height="24dp" android:layout_height="36dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/actionBarItemBackground"
android:padding="0px" android:padding="0px"
android:tint="@color/compose_button" android:tint="@color/compose_button"
android:tintMode="src_in" android:tintMode="src_in"
@ -392,6 +395,7 @@
android:id="@+id/char_counter" android:id="@+id/char_counter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:textAppearance="@style/m3_body_large" android:textAppearance="@style/m3_body_large"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
tools:text="500"/> tools:text="500"/>