diff --git a/lib/providers/notification.dart b/lib/providers/notification.dart index 1e53080..c931522 100644 --- a/lib/providers/notification.dart +++ b/lib/providers/notification.dart @@ -103,10 +103,10 @@ class NotificationProvider extends ChangeNotifier { void updateTray() { if (kIsWeb || Platform.isAndroid || Platform.isIOS) return; - if (notifications.isEmpty) { + if (showingTrayCount == 0) { trayManager.setTitle(''); } else { - trayManager.setTitle(' ${notifications.length.toString()}'); + trayManager.setTitle(' $showingTrayCount'); } } diff --git a/lib/screens/chat/call_room.dart b/lib/screens/chat/call_room.dart index cba16aa..5595c87 100644 --- a/lib/screens/chat/call_room.dart +++ b/lib/screens/chat/call_room.dart @@ -155,12 +155,16 @@ class _CallRoomScreenState extends State { text: TextSpan(children: [ TextSpan( text: 'call'.tr(), - style: Theme.of(context).textTheme.titleLarge!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.titleLarge!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor, + ), ), const TextSpan(text: '\n'), TextSpan( text: call.lastDuration.toString(), - style: Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.white), + style: Theme.of(context).textTheme.bodySmall!.copyWith( + color: Theme.of(context).appBarTheme.foregroundColor, + ), ), ]), ),