From c2f6b16affa727a79a026253eab44e2179889941 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 31 Oct 2024 10:09:42 +0300
Subject: [PATCH] Support grouping follow notifications (AND-230)

---
 mastodon/build.gradle                                         | 4 ++--
 .../java/org/joinmastodon/android/model/NotificationType.java | 4 ++--
 .../ui/displayitems/NotificationHeaderStatusDisplayItem.java  | 1 +
 mastodon/src/main/res/values/strings.xml                      | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 302aefc0b..a6bffa89d 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,8 +13,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 34
-		versionCode 123
-		versionName "2.7.3"
+		versionCode 125
+		versionName "2.8.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/NotificationType.java b/mastodon/src/main/java/org/joinmastodon/android/model/NotificationType.java
index a9ce26f13..f46a1f73c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/NotificationType.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/NotificationType.java
@@ -27,10 +27,10 @@ public enum NotificationType{
 	MODERATION_WARNING;
 
 	public boolean canBeGrouped(){
-		return this==REBLOG || this==FAVORITE;
+		return this==REBLOG || this==FAVORITE || this==FOLLOW;
 	}
 
 	public static EnumSet<NotificationType> getGroupableTypes(){
-		return EnumSet.of(FAVORITE, REBLOG);
+		return EnumSet.of(FAVORITE, REBLOG, FOLLOW);
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
index 786d373c5..d112cbc34 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.java
@@ -73,6 +73,7 @@ public class NotificationHeaderStatusDisplayItem extends StatusDisplayItem{
 				text=parentFragment.getResources().getQuantityString(switch(notification.notification.type){
 					case FAVORITE -> R.plurals.user_and_x_more_favorited;
 					case REBLOG -> R.plurals.user_and_x_more_boosted;
+					case FOLLOW -> R.plurals.user_and_x_more_followed;
 					default -> throw new IllegalStateException("Unexpected value: " + notification.notification.type);
 				}, notification.notification.notificationsCount-1, "{{name}}", notification.notification.notificationsCount-1);
 			}else if(notification.notification.type==NotificationType.POLL){
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 45a27b6a1..aa4104d62 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -814,4 +814,8 @@
 	<string name="avatar_move_and_scale">Move and scale</string>
 	<string name="confirm_avatar_crop">Choose</string>
 	<string name="settings_use_dynamic_colors">Use system dynamic color</string>
+	<plurals name="user_and_x_more_followed">
+		<item quantity="one">%1$s and %2$,d other followed you</item>
+		<item quantity="other">%1$s and %2$,d others followed you</item>
+	</plurals>
 </resources>
\ No newline at end of file