From ac4458e106c009efe6121d960f4f669478847afb Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 5 Jun 2023 18:07:22 +0200
Subject: [PATCH] fix badged toolbar icons with new appkit version

---
 .../android/fragments/MastodonToolbarFragment.java           | 5 +++++
 .../src/main/res/drawable/ic_announcements_24_badged.xml     | 2 +-
 .../src/main/res/drawable/ic_follow_requests_24_badged.xml   | 2 +-
 mastodon/src/main/res/drawable/ic_settings_24_badged.xml     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonToolbarFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonToolbarFragment.java
index 93cb88fdf..f690f1a39 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonToolbarFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonToolbarFragment.java
@@ -30,4 +30,9 @@ public abstract class MastodonToolbarFragment extends ToolbarFragment{
 			toolbar.setNavigationContentDescription(R.string.back);
 		}
 	}
+
+	@Override
+	protected boolean wantsToolbarMenuIconsTinted() {
+		return false; // else, badged icons don't work :(
+	}
 }
diff --git a/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml b/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
index e5b51e160..1f767581d 100644
--- a/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
+++ b/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
@@ -3,7 +3,7 @@
 	<item android:drawable="@drawable/ic_fluent_megaphone_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
 	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
 		<shape android:shape="oval">
-			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
+			<stroke android:color="?appkitToolbarBackground" android:width="2dp"/>
 			<solid android:color="?android:colorAccent"/>
 		</shape>
 	</item>
diff --git a/mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml b/mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml
index 7f9048281..1eca85d57 100644
--- a/mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml
+++ b/mastodon/src/main/res/drawable/ic_follow_requests_24_badged.xml
@@ -3,7 +3,7 @@
 	<item android:drawable="@drawable/ic_fluent_person_add_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
 	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
 		<shape android:shape="oval">
-			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
+			<stroke android:color="?appkitToolbarBackground" android:width="2dp"/>
 			<solid android:color="?android:colorAccent"/>
 		</shape>
 	</item>
diff --git a/mastodon/src/main/res/drawable/ic_settings_24_badged.xml b/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
index 98a6358e3..9a5ddcf48 100644
--- a/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
+++ b/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
@@ -3,7 +3,7 @@
 	<item android:drawable="@drawable/ic_fluent_settings_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
 	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
 		<shape android:shape="oval">
-			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
+			<stroke android:color="?appkitToolbarBackground" android:width="2dp"/>
 			<solid android:color="?android:colorAccent"/>
 		</shape>
 	</item>