From 937304f27bbaf73f1221067e5b53f843b6dcca89 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Thu, 24 Aug 2023 00:05:36 +0200
Subject: [PATCH] improve profile metadata editor styles

---
 .../main/res/drawable/ic_drag_handle_24px.xml |  9 ----
 .../res/layout/onboarding_profile_field.xml   | 54 ++++++++++---------
 2 files changed, 30 insertions(+), 33 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/ic_drag_handle_24px.xml

diff --git a/mastodon/src/main/res/drawable/ic_drag_handle_24px.xml b/mastodon/src/main/res/drawable/ic_drag_handle_24px.xml
deleted file mode 100644
index 7428dd8b4..000000000
--- a/mastodon/src/main/res/drawable/ic_drag_handle_24px.xml
+++ /dev/null
@@ -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:fillColor="@android:color/white"
-      android:pathData="M4,15V13H20V15ZM4,11V9H20V11Z"/>
-</vector>
diff --git a/mastodon/src/main/res/layout/onboarding_profile_field.xml b/mastodon/src/main/res/layout/onboarding_profile_field.xml
index cd4d854c8..b649442a3 100644
--- a/mastodon/src/main/res/layout/onboarding_profile_field.xml
+++ b/mastodon/src/main/res/layout/onboarding_profile_field.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingStart="8dp"
+	android:paddingTop="8dp"
 	android:paddingEnd="16dp"
 	android:clipToPadding="false"
-	android:background="?colorM3Background">
+	android:background="?colorM3Background"
+	tools:ignore="RtlSymmetry">
 
 	<ImageView
 		android:id="@+id/dragger_thingy"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
 		android:layout_alignParentStart="true"
-		android:layout_marginEnd="8dp"
 		android:scaleType="center"
 		android:tint="?colorM3OnSurface"
 		android:contentDescription="@string/reorder"
-		android:src="@drawable/ic_drag_handle_24px"/>
+		android:src="@drawable/ic_fluent_re_order_dots_vertical_24_regular"/>
 
 	<ImageButton
 		android:id="@+id/delete"
-		android:layout_width="40dp"
-		android:layout_height="40dp"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
 		android:layout_alignParentEnd="true"
 		android:layout_marginStart="8dp"
 		android:scaleType="center"
@@ -31,32 +32,37 @@
 		android:contentDescription="@string/delete"
 		android:src="@drawable/ic_fluent_delete_24_regular"/>
 
-	<EditText
-		android:id="@+id/content"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:layout_toEndOf="@id/dragger_thingy"
-		android:layout_toStartOf="@id/delete"
-		style="@style/Widget.Mastodon.M3.EditText"
-		android:inputType="textCapSentences"
-		android:hint="@string/field_content"
-		android:saveEnabled="false"
-		android:singleLine="true"/>
-
 	<EditText
 		android:id="@+id/title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_marginBottom="6dp"
 		android:layout_toEndOf="@id/dragger_thingy"
 		android:layout_toStartOf="@id/delete"
-		android:layout_below="@id/content"
 		style="@style/Widget.Mastodon.M3.EditText"
 		android:inputType="textCapSentences"
 		android:hint="@string/field_label"
 		android:saveEnabled="false"
 		android:singleLine="true"/>
 
+	<EditText
+		android:id="@+id/content"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_toEndOf="@id/dragger_thingy"
+		android:layout_toStartOf="@id/delete"
+		android:layout_below="@id/title"
+		style="@style/Widget.Mastodon.M3.EditText"
+		android:inputType="textCapSentences"
+		android:hint="@string/field_content"
+		android:saveEnabled="false"
+		android:singleLine="true"/>
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_below="@id/content"
+		android:layout_marginTop="8dp"
+		android:background="?colorM3SurfaceVariant"/>
+
 </RelativeLayout>
\ No newline at end of file