From 14bbe1ffefabb0413a91d05de76cdeb2dfbdf0a1 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Mon, 12 Jun 2023 18:50:06 +0300
Subject: [PATCH] Update the update icon

---
 .../android/fragments/HomeTimelineFragment.java   |  7 +------
 .../main/res/drawable/ic_settings_24_badged.xml   | 10 ----------
 .../res/drawable/ic_settings_updateready_24px.xml | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/ic_settings_24_badged.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_settings_updateready_24px.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 4297376bf..1c7b64048 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -431,12 +431,7 @@ public class HomeTimelineFragment extends StatusListFragment{
 
 	private void updateUpdateState(GithubSelfUpdater.UpdateState state){
 		if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
-			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
-	}
-
-	@Override
-	protected boolean wantsToolbarMenuIconsTinted(){
-		return false;
+			getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_updateready_24px);
 	}
 
 	@Subscribe
diff --git a/mastodon/src/main/res/drawable/ic_settings_24_badged.xml b/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
deleted file mode 100644
index 9c1148ae4..000000000
--- a/mastodon/src/main/res/drawable/ic_settings_24_badged.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@drawable/ic_settings_24px" 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="?colorM3Error" android:width="2dp"/>
-			<solid android:color="?colorM3Error"/>
-		</shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_settings_updateready_24px.xml b/mastodon/src/main/res/drawable/ic_settings_updateready_24px.xml
new file mode 100644
index 000000000..0b39cd71f
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_settings_updateready_24px.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.629,11.013L21.45,10.37C22.01,9.93 22.17,9.15 21.81,8.49L19.97,5.31C19.63,4.69 18.86,4.4 18.15,4.66L16.35,5.38C16.09,5.21 15.83,5.06 15.56,4.92L15.29,3.03C15.2,2.3 14.58,1.76 13.84,1.76H10.14C9.41,1.76 8.79,2.31 8.7,3.01L8.43,4.92C8.17,5.06 7.91,5.21 7.65,5.38L5.84,4.65C5.16,4.38 4.39,4.66 4.05,5.28L2.2,8.47C1.83,9.09 1.98,9.9 2.57,10.35L4.09,11.54C4.08,11.69 4.07,11.85 4.07,12C4.07,12.16 4.08,12.31 4.09,12.46L2.56,13.65C2,14.09 1.85,14.87 2.2,15.53L4.03,18.7C4.37,19.32 5.14,19.61 5.84,19.35L7.64,18.63C7.9,18.8 8.16,18.95 8.43,19.09L8.7,20.98C8.79,21.71 9.41,22.25 10.15,22.25H12.37C11.06,21.094 10.186,19.455 10.026,17.611L9.71,17.48C9.24,17.29 8.81,17.04 8.38,16.71L7.93,16.36L5.54,17.32L4.16,14.92L6.19,13.34L6.12,12.78C6.08,12.53 6.06,12.26 6.06,12C6.06,11.74 6.09,11.47 6.12,11.21L6.19,10.65L4.16,9.07L5.55,6.68L7.93,7.63L8.38,7.3C8.84,6.95 9.28,6.7 9.72,6.51L10.25,6.3L10.62,3.75H13.38L13.75,6.3L14.27,6.52C14.73,6.71 15.18,6.97 15.6,7.29L16.05,7.64L18.44,6.68L19.83,9.08L18.454,10.151C19.235,10.316 19.968,10.611 20.629,11.013Z"
+      android:fillColor="?colorM3OnSurfaceVariant"/>
+  <path
+      android:pathData="M10.276,15.047C10.942,12.751 12.751,10.942 15.047,10.276C14.446,9.216 13.307,8.5 12,8.5C10.067,8.5 8.5,10.067 8.5,12C8.5,13.306 9.216,14.445 10.276,15.047Z"
+      android:fillColor="?colorM3OnSurfaceVariant"/>
+  <path
+      android:pathData="M17,20L20,17L19.3,16.3L17.5,18.1V14H16.5V18.1L14.7,16.3L14,17L17,20ZM17,22C15.617,22 14.433,21.517 13.45,20.55C12.483,19.567 12,18.383 12,17C12,15.617 12.483,14.442 13.45,13.475C14.433,12.492 15.617,12 17,12C18.383,12 19.558,12.492 20.525,13.475C21.508,14.442 22,15.617 22,17C22,18.383 21.508,19.567 20.525,20.55C19.558,21.517 18.383,22 17,22Z"
+      android:fillColor="?colorM3OnSurfaceVariant"/>
+</vector>