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

fix see new posts button design

This commit is contained in:
sk 2023-10-21 01:00:51 +02:00
parent c33c3d9112
commit 47d1b182ac
6 changed files with 84 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mastodon/src/main/res/drawable/bg_button_new_posts.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/m3_pressed_overlay">
<item android:gravity="center_vertical" android:height="36dp">
<shape>
<solid android:color="?colorM3Primary"/>
<corners android:radius="18dp"/>
</shape>
</item>
</ripple>

10
mastodon/src/main/res/drawable/bg_button_new_posts_outlined.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/m3_pressed_overlay">
<item android:gravity="center_vertical" android:height="36dp">
<shape>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
<corners android:radius="18dp"/>
</shape>
</item>
</ripple>

22
mastodon/src/main/res/layout/home_toolbar.xml
View File

@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_fluent_home_24_regular" />
android:src="@drawable/ic_fluent_home_24_regular"/>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -31,37 +31,27 @@
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_fluent_chevron_down_16_filled"
android:visibility="gone" />
android:visibility="gone"/>
<TextView
android:id="@+id/timeline_title"
style="@style/action_bar_title"
android:id="@+id/timeline_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:drawablePadding="8dp"
android:drawableEnd="@drawable/ic_fluent_chevron_down_16_filled" />
android:drawableEnd="@drawable/ic_fluent_chevron_down_16_filled"/>
</FrameLayout>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
style="?toolbarActionButtonStyle"
android:id="@+id/show_new_posts_btn"
style="@style/Widget.Mastodon.M3.Button.Tonal.Icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/bg_button_m3_tonal_selector"
android:maxLines="1"
android:ellipsize="end"
android:textAppearance="@style/m3_title_medium"
android:textSize="16sp"
android:text="@string/see_new_posts"
android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
android:layout_gravity="center" />
<!--
using the selector background because..
the selected=false state's border looks better than the one from the outline style
(as per m3 spec) :( i should probably fix this at some point
-->
android:layout_gravity="center"/>
</FrameLayout>
</FrameLayout>

1
mastodon/src/main/res/values/attrs.xml
View File

@ -37,6 +37,7 @@
<attr name="colorM3DarkOnSurface" format="color" />
<attr name="colorTabBarAlpha" format="color" />
<attr name="colorFilledCardAlpha" format="color" />
<attr name="toolbarActionButtonStyle" format="reference" />
<attr name="colorPrimary25" format="color" />
<attr name="colorPrimary50" format="color" />

2
mastodon/src/main/res/values/palettes.xml
View File

@ -67,6 +67,7 @@
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="colorWhite">#FFF</item>
<item name="colorSensitiveOverlay">#a6ffffff</item>
<item name="toolbarActionButtonStyle">@style/Widget.Mastodon.M3.Button.ToolbarAction</item>
<!--
custom themes generally don't have secondary/tertiary accent colors -
@ -155,6 +156,7 @@
<item name="colorM3SecondaryContainer">?colorNeutral800</item>
<item name="colorTabBarAlpha">#00000000</item>
<item name="colorFilledCardAlpha">#00000000</item>
<item name="toolbarActionButtonStyle">@style/Widget.Mastodon.M3.Button.ToolbarAction.Black</item>
</style>
<style name="ColorPalette.Material3">

19
mastodon/src/main/res/values/styles.xml
View File

@ -243,6 +243,25 @@
<item name="android:paddingStart">16dp</item>
</style>
<style name="Widget.Mastodon.M3.Button.ToolbarAction">
<item name="android:paddingStart">14dp</item>
<item name="android:paddingEnd">20dp</item>
<item name="android:textAppearance">@style/m3_title_medium</item>
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
<item name="android:textSize">16sp</item>
<item name="android:stateListAnimator">@animator/m3_button_elevation</item>
<item name="android:background">@drawable/bg_button_new_posts</item>
<item name="android:textColor">@color/button_text_m3_filled</item>
<item name="android:drawableTint">@color/button_text_m3_filled</item>
</style>
<style name="Widget.Mastodon.M3.Button.ToolbarAction.Black">
<item name="android:background">@drawable/bg_button_new_posts_outlined</item>
<item name="android:textColor">@color/button_text_m3_tonal</item>
<item name="android:drawableTint">@color/button_text_m3_tonal</item>
</style>
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
<item name="android:textAppearance">@style/m3_body_large</item>