From 11c7816bb16b6efb3a913254729ebc49798058f7 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 20 Oct 2023 11:43:35 +0200
Subject: [PATCH] make show new posts button less disruptive

---
 .../main/res/drawable/bg_button_new_posts.xml | 10 --------
 mastodon/src/main/res/layout/home_toolbar.xml | 25 +++++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/bg_button_new_posts.xml

diff --git a/mastodon/src/main/res/drawable/bg_button_new_posts.xml b/mastodon/src/main/res/drawable/bg_button_new_posts.xml
deleted file mode 100644
index 2c9e3691b..000000000
--- a/mastodon/src/main/res/drawable/bg_button_new_posts.xml
+++ /dev/null
@@ -1,10 +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>
-			<solid android:color="?colorPrimary800"/>
-			<corners android:radius="16sp"/>
-			<padding android:left="16sp" android:right="16sp"/>
-		</shape>
-	</item>
-</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/home_toolbar.xml b/mastodon/src/main/res/layout/home_toolbar.xml
index 3f801f722..9587bec32 100644
--- a/mastodon/src/main/res/layout/home_toolbar.xml
+++ b/mastodon/src/main/res/layout/home_toolbar.xml
@@ -34,7 +34,7 @@
                 android:visibility="gone" />
             <TextView
                 android:id="@+id/timeline_title"
-                style="?android:attr/titleTextAppearance"
+                style="@style/action_bar_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -47,22 +47,21 @@
         android:layout_height="match_parent">
         <Button
             android:id="@+id/show_new_posts_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingVertical="2dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="20dp"
-            android:minHeight="32sp"
+			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="2"
             android:ellipsize="end"
             android:lineSpacingMultiplier="0.8"
-            android:textAppearance="@style/m3_title_medium"
-            android:textSize="16sp"
-            android:text="@string/see_new_posts"
-            android:textColor="@color/gray_25"
-            android:background="@drawable/bg_button_new_posts"
+			android:textAppearance="@style/m3_title_medium"
+			android:text="@string/see_new_posts"
             android:drawableStart="@drawable/ic_fluent_arrow_up_16_filled"
-            android:drawablePadding="8dp"
             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
+		-->
     </FrameLayout>
 </FrameLayout>