From 9732c48fde5fb079c7189f2f3c66d4648e0958a2 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <moshidon.app@gmail.com>
Date: Sat, 26 Aug 2023 17:48:53 -0300
Subject: [PATCH] feat: update profile note edit design

---
 .../android/fragments/ProfileFragment.java    |  2 +-
 .../src/main/res/drawable/bg_note_edit.xml    | 28 ++++++++++++++++---
 .../src/main/res/layout/fragment_profile.xml  |  9 +++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 43550d929..6581efba7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -270,7 +270,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		noteEdit = content.findViewById(R.id.note_edit);
 		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
+		ImageButton noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
 
 		noteEditConfirm.setOnClickListener((v -> {
 			if (!noteEdit.getText().toString().trim().equals(note)) {
diff --git a/mastodon/src/main/res/drawable/bg_note_edit.xml b/mastodon/src/main/res/drawable/bg_note_edit.xml
index 5f6087637..2f956cfe5 100644
--- a/mastodon/src/main/res/drawable/bg_note_edit.xml
+++ b/mastodon/src/main/res/drawable/bg_note_edit.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorM3SurfaceVariant"/>
-    <corners android:radius="10dp"/>
-</shape>
\ No newline at end of file
+<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:gravity="center_vertical">
+		<selector>
+			<item android:state_enabled="true">
+				<shape>
+					<stroke android:color="?colorM3Outline" android:width="1dp"/>
+					<corners android:radius="32dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
+					<corners android:radius="32dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center_vertical">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="32dp"/>
+		</shape>
+	</item>
+</ripple>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index e21befcb8..2d5a041fb 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -206,18 +206,19 @@
 						android:visibility="gone"
 						android:hint="@string/mo_personal_note"/>
 
-					<Button
+					<ImageButton
 						android:id="@+id/note_edit_confirm"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginEnd="8dp"
-						android:paddingBottom="8dp"
+						android:paddingHorizontal="6dp"
+						android:layout_marginBottom="8dp"
 						android:visibility="invisible"
-						android:backgroundTint="?colorM3SurfaceVariant"
 						android:layout_gravity="right|bottom"
+						android:background="@drawable/bg_button_m3_tonal_circle"
 						android:tooltipText="@string/mo_personal_note_confirm"
 						android:contentDescription="@string/mo_personal_note_confirm"
-						android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
+						android:src="@drawable/ic_fluent_checkmark_24_regular"
 						/>
 				</FrameLayout>