From 6af22b1f0e966c5a8e82d5a7f326649a709eba1f Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 14 Apr 2023 19:17:13 -0300
Subject: [PATCH 1/4] refactor: re-enable releases resource shrinking

---
 mastodon/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 4758fab67..323e38ae7 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -42,8 +42,8 @@ android {
 
 	buildTypes {
 		release {
-//			minifyEnabled true
-//			shrinkResources true
+			minifyEnabled true
+			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{

From e55dd0eacaabdaae4d3151d89aafe63268e4827a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 14 Apr 2023 21:45:36 -0300
Subject: [PATCH 2/4] feat: make yellow theme more yellow

---
 mastodon/src/main/res/values/colors.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
index 0a9fb9e10..6ae536c5c 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -258,10 +258,10 @@
 	<color name="yellow_primary_100">#ffe084</color>
 	<color name="yellow_primary_200">#e8c349</color>
 	<color name="yellow_primary_300">#cba82f</color>
-	<color name="yellow_primary_400">#ae8d10</color>
+	<color name="yellow_primary_400">#FFFF00</color>
 	<color name="yellow_primary_500">#8f7300</color>
 	<color name="yellow_primary_600">#735c00</color>
-	<color name="yellow_primary_700">#574500</color>
+	<color name="yellow_primary_700">#999900</color>
 	<color name="yellow_primary_800">#3c2f00</color>
 	<color name="yellow_primary_900">#231b00</color>
 

From 746717a87595b1018c253a447aef5ce67d883707 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 14 Apr 2023 21:59:48 -0300
Subject: [PATCH 3/4] fix: inconsistent marquee behavior on home timelines.
 Fixes #147

---
 .../org/joinmastodon/android/fragments/HomeTabFragment.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index f6733eef1..0032d2742 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -113,6 +113,10 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
 		fragments = new Fragment[count];
 		tabViews = new FrameLayout[count];
 		timelines = new TimelineDefinition[count];
+		if(GlobalUserPreferences.disableMarquee){
+			setTitleMarqueeEnabled(false);
+			setSubtitleMarqueeEnabled(false);
+		}
 	}
 
 	@Override

From 6a5a506abfeab35e46473116974ca53081290ad2 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 14 Apr 2023 22:11:47 -0300
Subject: [PATCH 4/4] fix: make disable marquee setting require a restart

---
 .../org/joinmastodon/android/fragments/SettingsFragment.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 42b929480..2bc9159cc 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -140,6 +140,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new SwitchItem(R.string.sk_disable_marquee, R.drawable.ic_fluent_text_more_24_regular, GlobalUserPreferences.disableMarquee, i->{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
+			needAppRestart=true;
 		}));
 		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
 			GlobalUserPreferences.uniformNotificationIcon=i.checked;