From 1c01e98ddd1b440b519f83978f44abe58f4a31c9 Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Sun, 16 Feb 2025 11:44:00 +0100
Subject: [PATCH] refactor: Migrate to maintained badge package

---
 lib/utils/background_push.dart                |  6 +++---
 licenses.yaml                                 |  1 +
 macos/Flutter/GeneratedPluginRegistrant.swift |  4 ++--
 pubspec.lock                                  | 18 +++++++++---------
 pubspec.yaml                                  |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart
index 1ba2659a6..7b70165ca 100644
--- a/lib/utils/background_push.dart
+++ b/lib/utils/background_push.dart
@@ -24,9 +24,9 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import 'package:flutter_app_badger/flutter_app_badger.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_new_badger/flutter_new_badger.dart';
 import 'package:http/http.dart' as http;
 import 'package:matrix/matrix.dart';
 import 'package:unifiedpush/unifiedpush.dart';
@@ -133,9 +133,9 @@ class BackgroundPush {
           .where((room) => room.isUnreadOrInvited && room.id != roomId)
           .length;
       if (unreadCount == 0) {
-        FlutterAppBadger.removeBadge();
+        FlutterNewBadger.removeBadge();
       } else {
-        FlutterAppBadger.updateBadgeCount(unreadCount);
+        FlutterNewBadger.setBadge(unreadCount);
       }
       return;
     }
diff --git a/licenses.yaml b/licenses.yaml
index ebab43440..02b7ad97e 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -25,6 +25,7 @@ packageLicenseOverride:
   latlong2: Apache-2.0
   platform_detect: Apache-2.0
   rxdart: Apache-2.0
+  flutter_new_badger: MIT
 
   # flutter's internal packages
   flutter_driver: BSD-3-Clause
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 30043fd20..279cea329 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -12,8 +12,8 @@ import device_info_plus
 import dynamic_color
 import emoji_picker_flutter
 import file_selector_macos
-import flutter_app_badger
 import flutter_local_notifications
+import flutter_new_badger
 import flutter_secure_storage_macos
 import flutter_web_auth_2
 import flutter_webrtc
@@ -41,8 +41,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FlutterAppBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterAppBadgerPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
+  FlutterNewBadgerPlugin.register(with: registry.registrar(forPlugin: "FlutterNewBadgerPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
   FlutterWebRTCPlugin.register(with: registry.registrar(forPlugin: "FlutterWebRTCPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 84e685055..b108e1fcb 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -459,14 +459,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_app_badger:
-    dependency: "direct main"
-    description:
-      name: flutter_app_badger
-      sha256: "64d4a279bab862ed28850431b9b446b9820aaae0bf363322d51077419f930fa8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.0"
   flutter_cache_manager:
     dependency: "direct main"
     description:
@@ -605,6 +597,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.1"
+  flutter_new_badger:
+    dependency: "direct main"
+    description:
+      name: flutter_new_badger
+      sha256: d3742ace8009663db1ac6ba0377b092f479c35deb33e05514ba05cc0b0a5aaaa
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   flutter_olm:
     dependency: "direct main"
     description:
@@ -2303,5 +2303,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.5.1 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 42035cfd0..289f6f9e2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,7 +29,6 @@ dependencies:
   file_selector: ^1.0.3
   flutter:
     sdk: flutter
-  flutter_app_badger: ^1.5.0
   flutter_cache_manager: ^3.4.1
   flutter_foreground_task: ^6.1.3
   flutter_highlighter: ^0.1.1
@@ -38,6 +37,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_map: ^6.1.0
+  flutter_new_badger: ^1.1.1
   flutter_olm: 1.3.2 # Keep in sync with scripts/prepare-web.sh ! 1.4.0 does currently not build on Android
   flutter_openssl_crypto: ^0.3.0
   flutter_ringtone_player: ^4.0.0+2