From 02983c76b9dbddbe3081fefe2a5f69a31e247652 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sun, 22 Oct 2023 23:09:35 +0200
Subject: [PATCH] add mutuals follow button state

closes sk22#890
---
 .../android/ui/utils/UiUtils.java             |  4 +--
 .../drawable/bg_button_m3_tonal_outlined.xml  | 27 +++++++++++++++++++
 .../src/main/res/values-de-rDE/strings_sk.xml |  1 +
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 mastodon/src/main/res/values/styles.xml       |  3 +++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_button_m3_tonal_outlined.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index f139d756e0..187b89ac4d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -779,8 +779,8 @@ public static void setRelationshipToActionButtonM3(Relationship relationship, Bu
 			button.setText(relationship.followedBy ? R.string.follow_back : R.string.button_follow);
 			styleRes=R.style.Widget_Mastodon_M3_Button_Filled;
 		}else{
-			button.setText(R.string.button_following);
-			styleRes=R.style.Widget_Mastodon_M3_Button_Tonal;
+			button.setText(relationship.followedBy ? R.string.sk_button_mutuals : R.string.button_following);
+			styleRes=relationship.followedBy ? R.style.Widget_Mastodon_M3_Button_Tonal_Outlined : R.style.Widget_Mastodon_M3_Button_Tonal;
 		}
 
 		TypedArray ta=button.getContext().obtainStyledAttributes(styleRes, new int[]{android.R.attr.background});
diff --git a/mastodon/src/main/res/drawable/bg_button_m3_tonal_outlined.xml b/mastodon/src/main/res/drawable/bg_button_m3_tonal_outlined.xml
new file mode 100644
index 0000000000..d06d0a9f6e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_button_m3_tonal_outlined.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/m3_primary_overlay">
+	<item android:gravity="center_vertical" android:height="40dp">
+		<selector>
+			<item android:state_enabled="true">
+				<shape>
+					<solid android:color="?colorM3SecondaryContainer"/>
+					<stroke android:color="?colorM3OnSecondaryContainer" android:width="1dp"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					<solid android:color="?colorM3DisabledBackground"/>
+					<corners android:radius="20dp"/>
+				</shape>
+			</item>
+		</selector>
+	</item>
+	<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
+		<shape>
+			<solid android:color="#000"/>
+			<corners android:radius="20dp"/>
+		</shape>
+	</item>
+</ripple>
diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index ca92c4d93b..3543a12499 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -415,4 +415,5 @@
     <string name="sk_settings_default_visibility">Standard-Sichtbarkeit für Posts</string>
     <string name="sk_settings_lock_account">Neue Follower_innen manuell genehmigen</string>
     <string name="sk_timeline_cache_cleared">Start-Timeline geleert</string>
+	<string name="sk_button_mutuals">Befreundet</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index aa2a893d07..5717077c7a 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -416,4 +416,5 @@
 	<string name="sk_timeline_cache_cleared">Cleared home timeline cache</string>
     <string name="sk_settings_lock_account">Manually approve new followers</string>
 	<string name="sk_settings_default_visibility">Default posting visibility</string>
+	<string name="sk_button_mutuals">Mutuals</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 71a64a49f3..0c54547146 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -224,6 +224,9 @@
 	<style name="Widget.Mastodon.M3.Button.Tonal.Icon">
 		<item name="android:paddingStart">16dp</item>
 	</style>
+	<style name="Widget.Mastodon.M3.Button.Tonal.Outlined">
+		<item name="android:background">@drawable/bg_button_m3_tonal_outlined</item>
+	</style>
 
 	<style name="Widget.Mastodon.M3.Button.Tonal.Error">
 		<item name="android:background">@drawable/bg_button_m3_tonal_error</item>