2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: update iOS badge on every notification

Browse source
This commit is contained in:
Krille 2023-08-02 11:37:28 +02:00
commit 1775552cd4
No known key found for this signature in database
4 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/chat/chat.dart
View file

@ -26,7 +26,6 @@ import 'package:fluffychat/pages/chat/recording_dialog.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/utils/error_reporter.dart'; import 'package:fluffychat/utils/error_reporter.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
@ -360,7 +359,6 @@ class ChatController extends State<ChatPageWithRoom> {
_setReadMarkerFuture = timeline.setReadMarker(eventId: eventId).then((_) { _setReadMarkerFuture = timeline.setReadMarker(eventId: eventId).then((_) {
_setReadMarkerFuture = null; _setReadMarkerFuture = null;
}); });
room.client.updateIosBadge();
} }
@override @override

3
lib/pages/story/story_page.dart
View file

@ -17,7 +17,6 @@ import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/utils/date_time_extension.dart'; import 'package:fluffychat/utils/date_time_extension.dart';
import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/room_status_extension.dart'; import 'package:fluffychat/utils/room_status_extension.dart';
import 'package:fluffychat/utils/story_theme_data.dart'; import 'package:fluffychat/utils/story_theme_data.dart';
@ -474,8 +473,6 @@ class StoryPageController extends State<StoryPage> {
void maybeSetReadMarker() { void maybeSetReadMarker() {
final currentEvent = this.currentEvent; final currentEvent = this.currentEvent;
if (currentEvent == null) return; if (currentEvent == null) return;
final room = currentEvent.room;
room.client.updateIosBadge();
if (index == events.length - 1) { if (index == events.length - 1) {
timeline!.setReadMarker(); timeline!.setReadMarker();
return; return;

19
lib/utils/matrix_sdk_extensions/ios_badge_client_extension.dart
View file

@ -1,19 +0,0 @@
import 'package:flutter_app_badger/flutter_app_badger.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/platform_infos.dart';
extension IosBadgeClientExtension on Client {
void updateIosBadge() {
if (!PlatformInfos.isIOS) return;
final unreadCount = rooms.where((room) => room.isUnreadOrInvited).length;
if (unreadCount == 0) {
FlutterAppBadger.removeBadge();
FlutterLocalNotificationsPlugin()
.cancelAll(); // Workaround for iOS not clearing notifications with fcm_shared_isolate
} else {
FlutterAppBadger.updateBadgeCount(unreadCount);
}
}
}

14
lib/widgets/local_notifications_extension.dart
View file

@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
import 'package:desktop_lifecycle/desktop_lifecycle.dart'; import 'package:desktop_lifecycle/desktop_lifecycle.dart';
import 'package:desktop_notifications/desktop_notifications.dart'; import 'package:desktop_notifications/desktop_notifications.dart';
import 'package:flutter_app_badger/flutter_app_badger.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
@ -31,6 +32,19 @@ extension LocalNotificationsExtension on MatrixState {
return; return;
} }
if (room.notificationCount == 0) return; if (room.notificationCount == 0) return;
// Workaround for app icon badge not updating
if (Platform.isIOS) {
final unreadCount =
client.rooms.where((room) => room.isUnreadOrInvited).length;
if (unreadCount == 0) {
FlutterAppBadger.removeBadge();
} else {
FlutterAppBadger.updateBadgeCount(unreadCount);
}
return;
}
final event = Event.fromJson(eventUpdate.content, room); final event = Event.fromJson(eventUpdate.content, room);
final title = final title =
room.getLocalizedDisplayname(MatrixLocals(L10n.of(widget.context)!)); room.getLocalizedDisplayname(MatrixLocals(L10n.of(widget.context)!));