Merge pull request #606 from wared2003/issue-37-selective-notifs
feat: add per-channel notification modes (all/mentions only/muted)
This commit is contained in:
49 files changed
+904
-97
No files matched your search
@@ -42,7 +42,7 @@ Message notifications can be answered without opening the app, from the notifica
|
||||
- **Reply** sends through the connected radio exactly like the chat screen: same length limits, SMAZ and Cyr2Lat handling, and retries. Your reply is then added to the notification.
|
||||
- **Replies over the message limit** are split at word boundaries into up to 3 messages. Longer replies are not sent; a "Reply not sent" notification asks you to open the app.
|
||||
- **Mark as read** clears the unread count on the phone only. MeshCore has no read receipts, so nothing is sent over the mesh.
|
||||
- **Mute channel** (phone and watch) mutes that channel, the same as the bell icon in the channel chat.
|
||||
- **Mute channel** (phone and watch) sets that channel to **Muted**, the same as choosing Muted from the bell icon in the channel chat.
|
||||
- If the radio is disconnected, the conversation is no longer on the radio, the radio reports a send error, or the app isn't running, a "Reply not sent" notification explains why. The reply is not queued. If a split reply fails partway, earlier parts may already have been sent.
|
||||
- Replies are sent as typed; composer translation is not applied.
|
||||
|
||||
@@ -107,15 +107,24 @@ Access via **App Settings → Notifications**:
|
||||
| Channel Message Notifications | On | Channel alerts (greyed out if master is off) |
|
||||
| Advertisement Notifications | On | New node alerts (greyed out if master is off) |
|
||||
|
||||
### Per-Channel Muting
|
||||
### Per-Channel Notification Modes
|
||||
|
||||
Mute or unmute a channel from any of these places. Muted channels do not generate OS notifications.
|
||||
Each channel supports three notification modes:
|
||||
|
||||
- The bell icon in the channel chat app bar
|
||||
- Long-press a channel in the channels list → "Mute channel" / "Unmute channel"
|
||||
- **Mute channel** on a channel notification (Android)
|
||||
| Mode | Icon | Behavior |
|
||||
|---|---|---|
|
||||
| **All messages** | 🔔 | Receive notifications for every message |
|
||||
| **Mentions only** | 🔔! | Only notify when a message mentions your name (see below) |
|
||||
| **Muted** | 🔕 | No notifications |
|
||||
|
||||
There is no per-contact muting.
|
||||
Set the mode from:
|
||||
|
||||
- The notifications icon in the channel chat app bar (tap to open the mode picker)
|
||||
- Long-press a channel in the channels list → **Notification settings** → select mode
|
||||
|
||||
The Android **Mute channel** notification action sets the channel to **Muted**; it cannot choose another mode.
|
||||
|
||||
A message mentions you if it contains `@[yourname]` or `@yourname`, case-insensitively. The plain `@yourname` form must stand alone as a word, so `@bobby` does not mention `bob` and `x@bob.com` is not a mention; names with spaces must be written in full. Detection (`MeshCoreConnector.textMentionsName`) runs on the original text, before any automatic translation.
|
||||
|
||||
## Rate Limiting
|
||||
|
||||
|
||||
@@ -38,7 +38,8 @@ import '../services/image_codec_service.dart';
|
||||
import '../services/received_image_store.dart';
|
||||
import '../services/message_retry_service.dart';
|
||||
import '../services/path_history_service.dart';
|
||||
import '../services/app_settings_service.dart';
|
||||
import '../services/app_settings_service.dart'
|
||||
show AppSettingsService, ChannelNotificationMode;
|
||||
import '../services/background_service.dart';
|
||||
import '../services/timeout_prediction_service.dart';
|
||||
import '../services/translation_service.dart';
|
||||
@@ -1265,8 +1266,9 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
/// (notification shade, watch, or Android Auto).
|
||||
Future<void> handleNotificationReply(NotificationReply reply) async {
|
||||
if (reply.action == NotificationReplyAction.mute) {
|
||||
await _appSettingsService?.muteChannel(
|
||||
await _appSettingsService?.setChannelNotificationMode(
|
||||
_channelDisplayName(reply.channelIndex!),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
await _notificationService.clearChannelNotification(
|
||||
reply.channelIndex!,
|
||||
@@ -7431,7 +7433,12 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
}
|
||||
|
||||
final label = channelName ?? _channelDisplayName(channelIndex);
|
||||
if (_appSettingsService!.isChannelMuted(label)) return;
|
||||
final notificationMode = _appSettingsService!.getChannelNotificationMode(
|
||||
label,
|
||||
);
|
||||
|
||||
// Check if channel is muted
|
||||
if (notificationMode == ChannelNotificationMode.muted) return;
|
||||
|
||||
// Reuse translation result only if completed and non-empty; else use original text
|
||||
final resolvedText =
|
||||
@@ -7440,6 +7447,14 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
translationResult.translatedText.trim().isNotEmpty)
|
||||
? translationResult.translatedText.trim()
|
||||
: message.text.trim();
|
||||
|
||||
// Mentions are matched on the untranslated text.
|
||||
if (notificationMode == ChannelNotificationMode.mentionsOnly) {
|
||||
if (!textMentionsName(message.originalText ?? message.text, _selfName)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
unawaited(() async {
|
||||
await _notificationService.showChannelMessageNotification(
|
||||
channelName: label,
|
||||
@@ -7452,6 +7467,22 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
}());
|
||||
}
|
||||
|
||||
/// Whether [text] mentions [name], case-insensitively, as either
|
||||
/// `@[name]` (the reply/mention prefix the app sends) or a plain `@name`.
|
||||
/// The plain form needs a word boundary on both sides, so `@bobby` does
|
||||
/// not mention `bob` and `x@bob.com` is not a mention. Names containing
|
||||
/// spaces must be written out in full.
|
||||
@visibleForTesting
|
||||
static bool textMentionsName(String text, String? name) {
|
||||
if (name == null || name.isEmpty) return false;
|
||||
final escaped = RegExp.escape(name);
|
||||
return RegExp(
|
||||
'@\\[$escaped\\]|(?<![\\p{L}\\p{N}_])@$escaped(?![\\p{L}\\p{N}_])',
|
||||
caseSensitive: false,
|
||||
unicode: true,
|
||||
).hasMatch(text);
|
||||
}
|
||||
|
||||
/// Handles RESP_CODE_CHANNEL_DATA_RECV (GRP_DATA). Frames whose dataType is
|
||||
/// not 0xAE1C — or that arrive before an [ImageChunkTransport] is installed —
|
||||
/// are ignored without disturbing any other behaviour.
|
||||
|
||||
@@ -359,6 +359,10 @@
|
||||
"channels_public": "Публично",
|
||||
"channels_private": "Частен",
|
||||
"channels_editChannel": "Редактирай канал",
|
||||
"channels_notificationSettings": "Настройки за известия",
|
||||
"channels_notifyAll": "Всички съобщения",
|
||||
"channels_notifyMentionsOnly": "Само споменавания",
|
||||
"channels_notifyNone": "Заглушено",
|
||||
"channels_muteChannel": "Заглуши канала",
|
||||
"channels_unmuteChannel": "Включи известията на канала",
|
||||
"channels_deleteChannel": "Изтрий канала",
|
||||
|
||||
@@ -369,6 +369,10 @@
|
||||
"channels_public": "Öffentlich",
|
||||
"channels_private": "Privat",
|
||||
"channels_editChannel": "Kanal bearbeiten",
|
||||
"channels_notificationSettings": "Benachrichtigungseinstellungen",
|
||||
"channels_notifyAll": "Alle Nachrichten",
|
||||
"channels_notifyMentionsOnly": "Nur Erwähnungen",
|
||||
"channels_notifyNone": "Stummgeschaltet",
|
||||
"channels_muteChannel": "Kanal stummschalten",
|
||||
"channels_unmuteChannel": "Kanal Stummschaltung aufheben",
|
||||
"channels_deleteChannel": "Kanal löschen",
|
||||
|
||||
@@ -716,6 +716,18 @@
|
||||
"channels_addSectionCreate": "Create new",
|
||||
"channels_dragToReorder": "Drag to reorder",
|
||||
"channels_editChannel": "Edit channel",
|
||||
"channels_notificationSettings": "Notification settings",
|
||||
"channels_notifyAll": "All messages",
|
||||
"channels_notifyMentionsOnly": "Mentions only",
|
||||
"channels_notifyNone": "Muted",
|
||||
"channels_notificationModeTooltip": "Notifications: {mode}",
|
||||
"@channels_notificationModeTooltip": {
|
||||
"placeholders": {
|
||||
"mode": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
"channels_muteChannel": "Mute channel",
|
||||
"channels_unmuteChannel": "Unmute channel",
|
||||
"channels_deleteChannel": "Delete channel",
|
||||
|
||||
@@ -369,6 +369,10 @@
|
||||
"channels_public": "Público",
|
||||
"channels_private": "Privado",
|
||||
"channels_editChannel": "Editar canal",
|
||||
"channels_notificationSettings": "Configuración de notificaciones",
|
||||
"channels_notifyAll": "Todos los mensajes",
|
||||
"channels_notifyMentionsOnly": "Solo menciones",
|
||||
"channels_notifyNone": "Silenciado",
|
||||
"channels_muteChannel": "Silenciar canal",
|
||||
"channels_unmuteChannel": "Activar canal",
|
||||
"channels_deleteChannel": "Eliminar canal",
|
||||
|
||||
@@ -369,6 +369,10 @@
|
||||
"channels_public": "Public",
|
||||
"channels_private": "Privé",
|
||||
"channels_editChannel": "Modifier le canal",
|
||||
"channels_notificationSettings": "Paramètres des notifications",
|
||||
"channels_notifyAll": "Tous les messages",
|
||||
"channels_notifyMentionsOnly": "Mentions uniquement",
|
||||
"channels_notifyNone": "Désactivé",
|
||||
"channels_muteChannel": "Désactiver les notifications du canal",
|
||||
"channels_unmuteChannel": "Réactiver les notifications du canal",
|
||||
"channels_deleteChannel": "Supprimer le canal",
|
||||
|
||||
@@ -511,6 +511,10 @@
|
||||
"channels_public": "Nyilvános",
|
||||
"channels_private": "Magán",
|
||||
"channels_editChannel": "Csatorna szerkesztése",
|
||||
"channels_notificationSettings": "Értesítési beállítások",
|
||||
"channels_notifyAll": "Összes üzenet",
|
||||
"channels_notifyMentionsOnly": "Csak említések",
|
||||
"channels_notifyNone": "Némít",
|
||||
"channels_muteChannel": "Csatorna némítása",
|
||||
"channels_unmuteChannel": "Csatorna némításának feloldása",
|
||||
"channels_deleteChannel": "Csatorna törlése",
|
||||
|
||||
@@ -414,6 +414,10 @@
|
||||
"channels_public": "Pubblico",
|
||||
"channels_private": "Privato",
|
||||
"channels_editChannel": "Modifica canale",
|
||||
"channels_notificationSettings": "Impostazioni notifiche",
|
||||
"channels_notifyAll": "Tutti i messaggi",
|
||||
"channels_notifyMentionsOnly": "Solo menzioni",
|
||||
"channels_notifyNone": "Silenziato",
|
||||
"channels_muteChannel": "Silenzia canale",
|
||||
"channels_unmuteChannel": "Attiva notifiche canale",
|
||||
"channels_deleteChannel": "Elimina canale",
|
||||
|
||||
@@ -517,6 +517,10 @@
|
||||
"channels_public": "公開",
|
||||
"channels_private": "非公開",
|
||||
"channels_editChannel": "チャンネルを編集",
|
||||
"channels_notificationSettings": "通知設定",
|
||||
"channels_notifyAll": "すべてのメッセージ",
|
||||
"channels_notifyMentionsOnly": "メンションのみ",
|
||||
"channels_notifyNone": "ミュート",
|
||||
"channels_muteChannel": "チャンネルをミュート",
|
||||
"channels_unmuteChannel": "チャンネルのミュートを解除",
|
||||
"channels_deleteChannel": "チャンネルを削除",
|
||||
|
||||
@@ -511,6 +511,10 @@
|
||||
"channels_public": "대중의",
|
||||
"channels_private": "사립",
|
||||
"channels_editChannel": "채널 편집",
|
||||
"channels_notificationSettings": "알림 설정",
|
||||
"channels_notifyAll": "모든 메시지",
|
||||
"channels_notifyMentionsOnly": "언급만",
|
||||
"channels_notifyNone": "음소거",
|
||||
"channels_muteChannel": "음소거 채널",
|
||||
"channels_unmuteChannel": "채널 음소거 해제",
|
||||
"channels_deleteChannel": "채널 삭제",
|
||||
|
||||
@@ -2626,6 +2626,36 @@ abstract class AppLocalizations {
|
||||
/// **'Edit channel'**
|
||||
String get channels_editChannel;
|
||||
|
||||
/// No description provided for @channels_notificationSettings.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Notification settings'**
|
||||
String get channels_notificationSettings;
|
||||
|
||||
/// No description provided for @channels_notifyAll.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'All messages'**
|
||||
String get channels_notifyAll;
|
||||
|
||||
/// No description provided for @channels_notifyMentionsOnly.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Mentions only'**
|
||||
String get channels_notifyMentionsOnly;
|
||||
|
||||
/// No description provided for @channels_notifyNone.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Muted'**
|
||||
String get channels_notifyNone;
|
||||
|
||||
/// No description provided for @channels_notificationModeTooltip.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Notifications: {mode}'**
|
||||
String channels_notificationModeTooltip(String mode);
|
||||
|
||||
/// No description provided for @channels_muteChannel.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
|
||||
@@ -1468,6 +1468,23 @@ class AppLocalizationsBg extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Редактирай канал';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Настройки за известия';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Всички съобщения';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Само споменавания';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Заглушено';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Заглуши канала';
|
||||
|
||||
|
||||
@@ -1462,6 +1462,23 @@ class AppLocalizationsDe extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Kanal bearbeiten';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Benachrichtigungseinstellungen';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Alle Nachrichten';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Nur Erwähnungen';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Stummgeschaltet';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Kanal stummschalten';
|
||||
|
||||
|
||||
@@ -1442,6 +1442,23 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Edit channel';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Notification settings';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'All messages';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Mentions only';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Muted';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Mute channel';
|
||||
|
||||
|
||||
@@ -1461,6 +1461,23 @@ class AppLocalizationsEs extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Editar canal';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Configuración de notificaciones';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Todos los mensajes';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Solo menciones';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Silenciado';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Silenciar canal';
|
||||
|
||||
|
||||
@@ -1466,6 +1466,23 @@ class AppLocalizationsFr extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Modifier le canal';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Paramètres des notifications';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Tous les messages';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Mentions uniquement';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Désactivé';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Désactiver les notifications du canal';
|
||||
|
||||
|
||||
@@ -1457,6 +1457,23 @@ class AppLocalizationsHu extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Csatorna szerkesztése';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Értesítési beállítások';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Összes üzenet';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Csak említések';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Némít';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Csatorna némítása';
|
||||
|
||||
|
||||
@@ -1465,6 +1465,23 @@ class AppLocalizationsIt extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Modifica canale';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Impostazioni notifiche';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Tutti i messaggi';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Solo menzioni';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Silenziato';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Silenzia canale';
|
||||
|
||||
|
||||
@@ -1389,6 +1389,23 @@ class AppLocalizationsJa extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'チャンネルを編集';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => '通知設定';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'すべてのメッセージ';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'メンションのみ';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'ミュート';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'チャンネルをミュート';
|
||||
|
||||
|
||||
@@ -1394,6 +1394,23 @@ class AppLocalizationsKo extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => '채널 편집';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => '알림 설정';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => '모든 메시지';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => '언급만';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => '음소거';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => '음소거 채널';
|
||||
|
||||
|
||||
@@ -1453,6 +1453,23 @@ class AppLocalizationsNl extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Kanaal bewerken';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Meldingsinstellingen';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Alle berichten';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Alleen vermeldingen';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Gedempt';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Kanaal dempen';
|
||||
|
||||
|
||||
@@ -1479,6 +1479,23 @@ class AppLocalizationsPl extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Edytuj kanał';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Ustawienia powiadomień';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Wszystkie wiadomości';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Tylko wzmianki';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Wyciszone';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Wycisz kanał';
|
||||
|
||||
|
||||
@@ -1464,6 +1464,23 @@ class AppLocalizationsPt extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Editar canal';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Configurações de notificação';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Todas as mensagens';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Apenas menções';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Silenciado';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Silenciar canal';
|
||||
|
||||
|
||||
@@ -1468,6 +1468,23 @@ class AppLocalizationsRu extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Изменить канал';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Настройки уведомлений';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Все сообщения';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Только упоминания';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Без звука';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Отключить уведомления канала';
|
||||
|
||||
|
||||
@@ -1456,6 +1456,23 @@ class AppLocalizationsSk extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Upraviť kanál';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Nastavenia notifikácií';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Všetky správy';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Iba zmienky';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Stíšené';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Stlmiť kanál';
|
||||
|
||||
|
||||
@@ -1454,6 +1454,23 @@ class AppLocalizationsSl extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Uredi kanal';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Nastavitve obvestil';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Vsa sporočila';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Samo omembe';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Utišano';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Utišaj kanal';
|
||||
|
||||
|
||||
@@ -1443,6 +1443,23 @@ class AppLocalizationsSv extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Redigera kanal';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Aviseringsinställningar';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Alla meddelanden';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Endast omnämnanden';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Tyst';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Tysta kanal';
|
||||
|
||||
|
||||
@@ -1459,6 +1459,23 @@ class AppLocalizationsUk extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => 'Редагувати канал';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => 'Налаштування сповіщень';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => 'Усі повідомлення';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => 'Лише згадки';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => 'Вимкнено';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => 'Вимкнути сповіщення каналу';
|
||||
|
||||
|
||||
@@ -1371,6 +1371,23 @@ class AppLocalizationsZh extends AppLocalizations {
|
||||
@override
|
||||
String get channels_editChannel => '编辑频道';
|
||||
|
||||
@override
|
||||
String get channels_notificationSettings => '通知设置';
|
||||
|
||||
@override
|
||||
String get channels_notifyAll => '所有消息';
|
||||
|
||||
@override
|
||||
String get channels_notifyMentionsOnly => '仅提及';
|
||||
|
||||
@override
|
||||
String get channels_notifyNone => '静音';
|
||||
|
||||
@override
|
||||
String channels_notificationModeTooltip(String mode) {
|
||||
return 'Notifications: $mode';
|
||||
}
|
||||
|
||||
@override
|
||||
String get channels_muteChannel => '静音频道';
|
||||
|
||||
|
||||
@@ -375,6 +375,10 @@
|
||||
"channels_addSectionCreate": "Nieuw aanmaken",
|
||||
"channels_dragToReorder": "Sleep om te herschikken",
|
||||
"channels_editChannel": "Kanaal bewerken",
|
||||
"channels_notificationSettings": "Meldingsinstellingen",
|
||||
"channels_notifyAll": "Alle berichten",
|
||||
"channels_notifyMentionsOnly": "Alleen vermeldingen",
|
||||
"channels_notifyNone": "Gedempt",
|
||||
"channels_muteChannel": "Kanaal dempen",
|
||||
"channels_unmuteChannel": "Kanaal dempen opheffen",
|
||||
"channels_deleteChannel": "Kanaal verwijderen",
|
||||
|
||||
@@ -369,6 +369,10 @@
|
||||
"channels_public": "Publiczny",
|
||||
"channels_private": "Prywatny",
|
||||
"channels_editChannel": "Edytuj kanał",
|
||||
"channels_notificationSettings": "Ustawienia powiadomień",
|
||||
"channels_notifyAll": "Wszystkie wiadomości",
|
||||
"channels_notifyMentionsOnly": "Tylko wzmianki",
|
||||
"channels_notifyNone": "Wyciszone",
|
||||
"channels_muteChannel": "Wycisz kanał",
|
||||
"channels_unmuteChannel": "Wyłącz wyciszenie kanału",
|
||||
"channels_deleteChannel": "Usuń kanał",
|
||||
|
||||
@@ -359,6 +359,10 @@
|
||||
"channels_public": "Público",
|
||||
"channels_private": "Privado",
|
||||
"channels_editChannel": "Editar canal",
|
||||
"channels_notificationSettings": "Configurações de notificação",
|
||||
"channels_notifyAll": "Todas as mensagens",
|
||||
"channels_notifyMentionsOnly": "Apenas menções",
|
||||
"channels_notifyNone": "Silenciado",
|
||||
"channels_muteChannel": "Silenciar canal",
|
||||
"channels_unmuteChannel": "Ativar canal",
|
||||
"channels_deleteChannel": "Excluir canal",
|
||||
|
||||
@@ -251,6 +251,10 @@
|
||||
"channels_public": "Публичный",
|
||||
"channels_private": "Приватный",
|
||||
"channels_editChannel": "Изменить канал",
|
||||
"channels_notificationSettings": "Настройки уведомлений",
|
||||
"channels_notifyAll": "Все сообщения",
|
||||
"channels_notifyMentionsOnly": "Только упоминания",
|
||||
"channels_notifyNone": "Без звука",
|
||||
"channels_muteChannel": "Отключить уведомления канала",
|
||||
"channels_unmuteChannel": "Включить уведомления канала",
|
||||
"channels_deleteChannel": "Удалить канал",
|
||||
|
||||
@@ -359,6 +359,10 @@
|
||||
"channels_public": "Veľké verejné",
|
||||
"channels_private": "Osobné",
|
||||
"channels_editChannel": "Upraviť kanál",
|
||||
"channels_notificationSettings": "Nastavenia notifikácií",
|
||||
"channels_notifyAll": "Všetky správy",
|
||||
"channels_notifyMentionsOnly": "Iba zmienky",
|
||||
"channels_notifyNone": "Stíšené",
|
||||
"channels_muteChannel": "Stlmiť kanál",
|
||||
"channels_unmuteChannel": "Zrušiť stlmenie kanála",
|
||||
"channels_deleteChannel": "Odstrániť kanál",
|
||||
|
||||
@@ -359,6 +359,10 @@
|
||||
"channels_public": "Javni",
|
||||
"channels_private": "Zasebni",
|
||||
"channels_editChannel": "Uredi kanal",
|
||||
"channels_notificationSettings": "Nastavitve obvestil",
|
||||
"channels_notifyAll": "Vsa sporočila",
|
||||
"channels_notifyMentionsOnly": "Samo omembe",
|
||||
"channels_notifyNone": "Utišano",
|
||||
"channels_muteChannel": "Utišaj kanal",
|
||||
"channels_unmuteChannel": "Vklopi obvestila kanala",
|
||||
"channels_deleteChannel": "Pošlji kanal",
|
||||
|
||||
@@ -359,6 +359,10 @@
|
||||
"channels_public": "Publik",
|
||||
"channels_private": "Privat",
|
||||
"channels_editChannel": "Redigera kanal",
|
||||
"channels_notificationSettings": "Aviseringsinställningar",
|
||||
"channels_notifyAll": "Alla meddelanden",
|
||||
"channels_notifyMentionsOnly": "Endast omnämnanden",
|
||||
"channels_notifyNone": "Tyst",
|
||||
"channels_muteChannel": "Tysta kanal",
|
||||
"channels_unmuteChannel": "Slå på ljud för kanal",
|
||||
"channels_deleteChannel": "Ta bort kanal",
|
||||
|
||||
@@ -362,6 +362,10 @@
|
||||
"channels_via": "через {path}",
|
||||
"channels_private": "Приватний",
|
||||
"channels_editChannel": "Редагувати канал",
|
||||
"channels_notificationSettings": "Налаштування сповіщень",
|
||||
"channels_notifyAll": "Усі повідомлення",
|
||||
"channels_notifyMentionsOnly": "Лише згадки",
|
||||
"channels_notifyNone": "Вимкнено",
|
||||
"channels_muteChannel": "Вимкнути сповіщення каналу",
|
||||
"channels_unmuteChannel": "Увімкнути сповіщення каналу",
|
||||
"channels_deleteChannel": "Видалити канал",
|
||||
|
||||
@@ -374,6 +374,10 @@
|
||||
"channels_public": "公共",
|
||||
"channels_private": "私有",
|
||||
"channels_editChannel": "编辑频道",
|
||||
"channels_notificationSettings": "通知设置",
|
||||
"channels_notifyAll": "所有消息",
|
||||
"channels_notifyMentionsOnly": "仅提及",
|
||||
"channels_notifyNone": "静音",
|
||||
"channels_muteChannel": "静音频道",
|
||||
"channels_unmuteChannel": "取消静音频道",
|
||||
"channels_deleteChannel": "删除频道",
|
||||
|
||||
@@ -3,6 +3,8 @@ import 'translation_support.dart';
|
||||
|
||||
enum UnitSystem { metric, imperial }
|
||||
|
||||
enum ChannelNotificationMode { all, mentionsOnly, muted }
|
||||
|
||||
extension UnitSystemValue on UnitSystem {
|
||||
String get value {
|
||||
switch (this) {
|
||||
@@ -123,7 +125,7 @@ class AppSettings {
|
||||
final Map<String, String> batteryChemistryByDeviceId;
|
||||
final Map<String, String> batteryChemistryByRepeaterId;
|
||||
final UnitSystem unitSystem;
|
||||
final Set<String> mutedChannels;
|
||||
final Map<String, ChannelNotificationMode> channelNotificationModes;
|
||||
final bool mapShowDiscoveryContacts;
|
||||
final bool evictDiscoveredContactsEnabled;
|
||||
final String tcpServerAddress;
|
||||
@@ -238,7 +240,7 @@ class AppSettings {
|
||||
Map<String, String>? batteryChemistryByDeviceId,
|
||||
Map<String, String>? batteryChemistryByRepeaterId,
|
||||
this.unitSystem = UnitSystem.metric,
|
||||
Set<String>? mutedChannels,
|
||||
Map<String, ChannelNotificationMode>? channelNotificationModes,
|
||||
this.mapShowDiscoveryContacts = true,
|
||||
this.evictDiscoveredContactsEnabled = true,
|
||||
this.tcpServerAddress = '',
|
||||
@@ -264,7 +266,7 @@ class AppSettings {
|
||||
String? selectedCyr2latProfileId,
|
||||
}) : batteryChemistryByDeviceId = batteryChemistryByDeviceId ?? {},
|
||||
batteryChemistryByRepeaterId = batteryChemistryByRepeaterId ?? {},
|
||||
mutedChannels = mutedChannels ?? {},
|
||||
channelNotificationModes = channelNotificationModes ?? {},
|
||||
imageCodecDownloadedModels = imageCodecDownloadedModels ?? const [],
|
||||
translationDownloadedModels = translationDownloadedModels ?? const [],
|
||||
cyr2latProfiles =
|
||||
@@ -322,7 +324,14 @@ class AppSettings {
|
||||
'battery_chemistry_by_device_id': batteryChemistryByDeviceId,
|
||||
'battery_chemistry_by_repeater_id': batteryChemistryByRepeaterId,
|
||||
'unit_system': unitSystem.value,
|
||||
'muted_channels': mutedChannels.toList(),
|
||||
// Written for older builds that only read the muted set.
|
||||
'muted_channels': [
|
||||
for (final entry in channelNotificationModes.entries)
|
||||
if (entry.value == ChannelNotificationMode.muted) entry.key,
|
||||
],
|
||||
'channel_notification_modes': channelNotificationModes.map(
|
||||
(key, value) => MapEntry(key, value.name),
|
||||
),
|
||||
'map_show_discovery_contacts': mapShowDiscoveryContacts,
|
||||
'evict_discovered_contacts_enabled': evictDiscoveredContactsEnabled,
|
||||
'tcp_server_address': tcpServerAddress,
|
||||
@@ -363,6 +372,35 @@ class AppSettings {
|
||||
return UnitSystem.metric;
|
||||
}
|
||||
|
||||
Map<String, ChannelNotificationMode> parseChannelNotificationModes(
|
||||
Map<String, dynamic> json,
|
||||
) {
|
||||
// Migration from old muted_channels (Set<String>) to new system
|
||||
final mutedList = json['muted_channels'] as List?;
|
||||
final newModes = json['channel_notification_modes'] as Map?;
|
||||
|
||||
final result = <String, ChannelNotificationMode>{};
|
||||
|
||||
// Migrate old muted channels
|
||||
if (mutedList != null) {
|
||||
for (final channelName in mutedList) {
|
||||
result[channelName.toString()] = ChannelNotificationMode.muted;
|
||||
}
|
||||
}
|
||||
|
||||
// Load new modes (overrides old muted channels if present)
|
||||
if (newModes != null) {
|
||||
for (final entry in newModes.entries) {
|
||||
final value = entry.value;
|
||||
if (value is! String) continue;
|
||||
final mode = ChannelNotificationMode.values.asNameMap()[value];
|
||||
if (mode != null) result[entry.key.toString()] = mode;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
return AppSettings(
|
||||
clearPathOnMaxRetry: json['clear_path_on_max_retry'] as bool? ?? false,
|
||||
mapShowRepeaters: json['map_show_repeaters'] as bool? ?? true,
|
||||
@@ -425,11 +463,7 @@ class AppSettings {
|
||||
) ??
|
||||
{},
|
||||
unitSystem: parseUnitSystem(json['unit_system']),
|
||||
mutedChannels:
|
||||
((json['muted_channels'] as List?)
|
||||
?.map((e) => e.toString())
|
||||
.toSet()) ??
|
||||
{},
|
||||
channelNotificationModes: parseChannelNotificationModes(json),
|
||||
mapShowDiscoveryContacts:
|
||||
json['map_show_discovery_contacts'] as bool? ?? true,
|
||||
evictDiscoveredContactsEnabled:
|
||||
@@ -554,7 +588,7 @@ class AppSettings {
|
||||
Map<String, String>? batteryChemistryByDeviceId,
|
||||
Map<String, String>? batteryChemistryByRepeaterId,
|
||||
UnitSystem? unitSystem,
|
||||
Set<String>? mutedChannels,
|
||||
Map<String, ChannelNotificationMode>? channelNotificationModes,
|
||||
bool? mapShowDiscoveryContacts,
|
||||
bool? evictDiscoveredContactsEnabled,
|
||||
String? tcpServerAddress,
|
||||
@@ -639,7 +673,8 @@ class AppSettings {
|
||||
batteryChemistryByRepeaterId:
|
||||
batteryChemistryByRepeaterId ?? this.batteryChemistryByRepeaterId,
|
||||
unitSystem: unitSystem ?? this.unitSystem,
|
||||
mutedChannels: mutedChannels ?? this.mutedChannels,
|
||||
channelNotificationModes:
|
||||
channelNotificationModes ?? this.channelNotificationModes,
|
||||
mapShowDiscoveryContacts:
|
||||
mapShowDiscoveryContacts ?? this.mapShowDiscoveryContacts,
|
||||
evictDiscoveredContactsEnabled:
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
import '../services/app_settings_service.dart';
|
||||
import 'dart:convert';
|
||||
|
||||
import '../services/app_settings_service.dart'
|
||||
show AppSettingsService, ChannelNotificationMode;
|
||||
import '../services/storage_service.dart';
|
||||
import '../services/timeout_prediction_service.dart';
|
||||
import '../storage/legacy_key_migration.dart';
|
||||
import '../storage/prefs_manager.dart';
|
||||
import 'review_radio.dart';
|
||||
|
||||
/// Muted channel names as they were when review mode started. Persisted so an
|
||||
/// interrupted session (crash, app killed) is still undone on the next launch.
|
||||
const _savedMutedChannelsKey = 'review_mode_saved_muted_channels';
|
||||
/// Channel notification modes (JSON map of channel name to mode name) as they
|
||||
/// were when review mode started. Persisted so an interrupted session (crash,
|
||||
/// app killed) is still undone on the next launch.
|
||||
const _savedChannelModesKey = 'review_mode_saved_channel_modes';
|
||||
|
||||
/// Prefix for snapshots of app-wide repeater keys (saved passwords, clock sync
|
||||
/// toggles) taken when review mode starts. An empty snapshot means the key did
|
||||
@@ -31,10 +35,11 @@ Future<void> clearReviewModeData() async {
|
||||
/// Starts a review session from a clean slate.
|
||||
///
|
||||
/// The simulated radio's scope never adopts legacy unscoped keys, so real
|
||||
/// radio data cannot be pulled into it. Channel mutes are app-wide and keyed
|
||||
/// by channel name (muting the simulated "Public" would mute the real one),
|
||||
/// so the current mutes are saved for [endReviewModeSession] to put back, as
|
||||
/// are the app-wide repeater keys. Delivery timing is not recorded meanwhile.
|
||||
/// radio data cannot be pulled into it. Channel notification modes are
|
||||
/// app-wide and keyed by channel name (muting the simulated "Public" would
|
||||
/// mute the real one), so the current modes are saved for
|
||||
/// [endReviewModeSession] to put back, as are the app-wide repeater keys.
|
||||
/// Delivery timing is not recorded meanwhile.
|
||||
Future<void> beginReviewModeSession(AppSettingsService? settings) async {
|
||||
scopesWithoutLegacyMigration.add(ReviewRadio.storagePrefix);
|
||||
TimeoutPredictionService.recordingSuspended = true;
|
||||
@@ -47,16 +52,16 @@ Future<void> beginReviewModeSession(AppSettingsService? settings) async {
|
||||
await prefs.setString(savedKey, prefs.getString(key) ?? '');
|
||||
}
|
||||
// An earlier interrupted session's record holds the real pre-review state.
|
||||
if (settings != null && !prefs.containsKey(_savedMutedChannelsKey)) {
|
||||
await prefs.setStringList(
|
||||
_savedMutedChannelsKey,
|
||||
settings.settings.mutedChannels.toList(),
|
||||
if (settings != null && !prefs.containsKey(_savedChannelModesKey)) {
|
||||
final modes = settings.settings.channelNotificationModes.map(
|
||||
(channel, mode) => MapEntry(channel, mode.name),
|
||||
);
|
||||
await prefs.setString(_savedChannelModesKey, jsonEncode(modes));
|
||||
}
|
||||
}
|
||||
|
||||
/// Deletes the review session's data and restores the channel mutes and
|
||||
/// repeater keys saved by [beginReviewModeSession]. Also called at startup to finish a session that
|
||||
/// Deletes the review session's data and restores the channel notification
|
||||
/// modes and repeater keys saved by [beginReviewModeSession]. Also called at startup to finish a session that
|
||||
/// was interrupted; it does nothing when no session was left behind.
|
||||
Future<void> endReviewModeSession(AppSettingsService? settings) async {
|
||||
TimeoutPredictionService.recordingSuspended = false;
|
||||
@@ -73,10 +78,19 @@ Future<void> endReviewModeSession(AppSettingsService? settings) async {
|
||||
}
|
||||
await prefs.remove(savedKey);
|
||||
}
|
||||
final savedMutes = prefs.getStringList(_savedMutedChannelsKey);
|
||||
if (savedMutes == null || settings == null) return;
|
||||
final savedModes = prefs.getString(_savedChannelModesKey);
|
||||
if (savedModes == null || settings == null) return;
|
||||
final restored = <String, ChannelNotificationMode>{};
|
||||
final decoded = jsonDecode(savedModes);
|
||||
if (decoded is Map) {
|
||||
final byName = ChannelNotificationMode.values.asNameMap();
|
||||
for (final entry in decoded.entries) {
|
||||
final mode = byName[entry.value];
|
||||
if (mode != null) restored[entry.key.toString()] = mode;
|
||||
}
|
||||
}
|
||||
await settings.updateSettings(
|
||||
settings.settings.copyWith(mutedChannels: savedMutes.toSet()),
|
||||
settings.settings.copyWith(channelNotificationModes: restored),
|
||||
);
|
||||
await prefs.remove(_savedMutedChannelsKey);
|
||||
await prefs.remove(_savedChannelModesKey);
|
||||
}
|
||||
@@ -26,7 +26,8 @@ import '../l10n/l10n.dart';
|
||||
import '../models/channel.dart';
|
||||
import '../models/channel_message.dart';
|
||||
import '../models/image_codec_support.dart' show aeicRatePointForUi;
|
||||
import '../services/app_settings_service.dart';
|
||||
import '../services/app_settings_service.dart'
|
||||
show AppSettingsService, ChannelNotificationMode;
|
||||
import '../services/chat_text_scale_service.dart';
|
||||
import '../services/image_chunk_transport.dart';
|
||||
import '../services/image_codec_service.dart';
|
||||
@@ -36,6 +37,7 @@ import '../utils/image_save.dart';
|
||||
import '../utils/lora_airtime.dart';
|
||||
import '../widgets/marker_label_dialog.dart';
|
||||
import '../widgets/received_image_message.dart';
|
||||
import '../widgets/channel_notification_mode_sheet.dart';
|
||||
import '../widgets/chat_day_separator.dart';
|
||||
import '../widgets/empty_state.dart';
|
||||
|
||||
@@ -403,19 +405,22 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
||||
Consumer<AppSettingsService>(
|
||||
builder: (context, settings, _) {
|
||||
final muteKey = widget.channel.muteKey;
|
||||
final muted = settings.isChannelMuted(muteKey);
|
||||
final notificationMode = settings.getChannelNotificationMode(
|
||||
muteKey,
|
||||
);
|
||||
return IconButton(
|
||||
tooltip: muted
|
||||
? context.l10n.channels_unmuteChannel
|
||||
: context.l10n.channels_muteChannel,
|
||||
icon: Icon(
|
||||
muted
|
||||
? Icons.notifications_off_outlined
|
||||
: Icons.notifications_outlined,
|
||||
tooltip: context.l10n.channels_notificationModeTooltip(
|
||||
channelNotificationModeLabel(context, notificationMode),
|
||||
),
|
||||
onPressed: () => muted
|
||||
? settings.unmuteChannel(muteKey)
|
||||
: settings.muteChannel(muteKey),
|
||||
icon: Icon(
|
||||
notificationMode == ChannelNotificationMode.muted
|
||||
? Icons.notifications_off
|
||||
: notificationMode == ChannelNotificationMode.mentionsOnly
|
||||
? Icons.notification_important
|
||||
: Icons.notifications,
|
||||
),
|
||||
onPressed: () =>
|
||||
showChannelNotificationModeSheet(context, muteKey),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -10,7 +10,8 @@ import 'package:uuid/uuid.dart';
|
||||
|
||||
import '../connector/meshcore_connector.dart';
|
||||
import '../l10n/l10n.dart';
|
||||
import '../services/app_settings_service.dart';
|
||||
import '../services/app_settings_service.dart'
|
||||
show AppSettingsService, ChannelNotificationMode;
|
||||
import '../services/ui_view_state_service.dart';
|
||||
import '../models/channel.dart';
|
||||
import '../models/community.dart';
|
||||
@@ -19,6 +20,7 @@ import '../theme/mesh_theme.dart';
|
||||
import '../utils/dialog_utils.dart';
|
||||
import '../utils/disconnect_navigation_mixin.dart';
|
||||
import '../utils/route_transitions.dart';
|
||||
import '../widgets/channel_notification_mode_sheet.dart';
|
||||
import '../widgets/list_filter_widget.dart';
|
||||
import '../widgets/empty_state.dart';
|
||||
import '../widgets/mesh_ui.dart';
|
||||
@@ -372,9 +374,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
||||
int listIndex = 0,
|
||||
}) {
|
||||
final unreadCount = connector.getUnreadCountForChannel(channel);
|
||||
final isMuted = context.watch<AppSettingsService>().isChannelMuted(
|
||||
channel.muteKey,
|
||||
);
|
||||
final notificationMode = context
|
||||
.watch<AppSettingsService>()
|
||||
.getChannelNotificationMode(channel.muteKey);
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
|
||||
// Determine icon and colors based on channel type
|
||||
@@ -580,9 +582,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (isMuted) ...[
|
||||
if (notificationMode != ChannelNotificationMode.all) ...[
|
||||
Icon(
|
||||
Icons.notifications_off,
|
||||
channelNotificationModeIcon(notificationMode),
|
||||
size: 18,
|
||||
color: scheme.onSurfaceVariant,
|
||||
),
|
||||
@@ -625,8 +627,6 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
||||
Channel channel,
|
||||
) {
|
||||
final parentContext = context;
|
||||
final settingsService = context.read<AppSettingsService>();
|
||||
final isMuted = settingsService.isChannelMuted(channel.muteKey);
|
||||
|
||||
showMeshSheet(
|
||||
parentContext,
|
||||
@@ -645,23 +645,19 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
||||
}
|
||||
},
|
||||
),
|
||||
// Notification mode selection
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
isMuted
|
||||
? Icons.notifications_outlined
|
||||
: Icons.notifications_off_outlined,
|
||||
),
|
||||
title: Text(
|
||||
isMuted
|
||||
? sheetContext.l10n.channels_unmuteChannel
|
||||
: sheetContext.l10n.channels_muteChannel,
|
||||
),
|
||||
leading: const Icon(Icons.notifications_outlined),
|
||||
title: Text(sheetContext.l10n.channels_notificationSettings),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
onTap: () async {
|
||||
Navigator.pop(sheetContext);
|
||||
if (isMuted) {
|
||||
await settingsService.unmuteChannel(channel.muteKey);
|
||||
} else {
|
||||
await settingsService.muteChannel(channel.muteKey);
|
||||
await Future.delayed(const Duration(milliseconds: 100));
|
||||
if (parentContext.mounted) {
|
||||
showChannelNotificationModeSheet(
|
||||
parentContext,
|
||||
channel.muteKey,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
||||
@@ -3,6 +3,8 @@ import 'package:flutter/foundation.dart';
|
||||
import '../models/app_settings.dart';
|
||||
import '../models/image_codec_support.dart';
|
||||
import '../models/translation_support.dart';
|
||||
|
||||
export '../models/app_settings.dart' show ChannelNotificationMode;
|
||||
import '../storage/prefs_manager.dart';
|
||||
import '../utils/app_logger.dart';
|
||||
import '../helpers/cyr2lat.dart';
|
||||
@@ -286,19 +288,24 @@ class AppSettingsService extends ChangeNotifier {
|
||||
await updateSettings(_settings.copyWith(unitSystem: value));
|
||||
}
|
||||
|
||||
bool isChannelMuted(String channelName) {
|
||||
return _settings.mutedChannels.contains(channelName);
|
||||
ChannelNotificationMode getChannelNotificationMode(String channelName) {
|
||||
return _settings.channelNotificationModes[channelName] ??
|
||||
ChannelNotificationMode.all;
|
||||
}
|
||||
|
||||
Future<void> muteChannel(String channelName) async {
|
||||
final updated = Set<String>.from(_settings.mutedChannels)..add(channelName);
|
||||
await updateSettings(_settings.copyWith(mutedChannels: updated));
|
||||
}
|
||||
|
||||
Future<void> unmuteChannel(String channelName) async {
|
||||
final updated = Set<String>.from(_settings.mutedChannels)
|
||||
..remove(channelName);
|
||||
await updateSettings(_settings.copyWith(mutedChannels: updated));
|
||||
Future<void> setChannelNotificationMode(
|
||||
String channelName,
|
||||
ChannelNotificationMode mode,
|
||||
) async {
|
||||
final updated = Map<String, ChannelNotificationMode>.from(
|
||||
_settings.channelNotificationModes,
|
||||
);
|
||||
if (mode == ChannelNotificationMode.all) {
|
||||
updated.remove(channelName);
|
||||
} else {
|
||||
updated[channelName] = mode;
|
||||
}
|
||||
await updateSettings(_settings.copyWith(channelNotificationModes: updated));
|
||||
}
|
||||
|
||||
Future<void> setTcpServerAddress(String value) async {
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../l10n/l10n.dart';
|
||||
import '../services/app_settings_service.dart'
|
||||
show AppSettingsService, ChannelNotificationMode;
|
||||
import 'mesh_ui.dart';
|
||||
|
||||
/// Localized label for a channel notification [mode].
|
||||
String channelNotificationModeLabel(
|
||||
BuildContext context,
|
||||
ChannelNotificationMode mode,
|
||||
) => switch (mode) {
|
||||
ChannelNotificationMode.all => context.l10n.channels_notifyAll,
|
||||
ChannelNotificationMode.mentionsOnly =>
|
||||
context.l10n.channels_notifyMentionsOnly,
|
||||
ChannelNotificationMode.muted => context.l10n.channels_notifyNone,
|
||||
};
|
||||
|
||||
/// Icon for a channel notification [mode].
|
||||
IconData channelNotificationModeIcon(ChannelNotificationMode mode) =>
|
||||
switch (mode) {
|
||||
ChannelNotificationMode.all => Icons.notifications,
|
||||
ChannelNotificationMode.mentionsOnly => Icons.notification_important,
|
||||
ChannelNotificationMode.muted => Icons.notifications_off,
|
||||
};
|
||||
|
||||
/// Shows the per-channel notification mode picker (all / mentions only /
|
||||
/// muted) for the channel identified by [muteKey].
|
||||
void showChannelNotificationModeSheet(BuildContext context, String muteKey) {
|
||||
final settingsService = context.read<AppSettingsService>();
|
||||
final currentMode = settingsService.getChannelNotificationMode(muteKey);
|
||||
|
||||
showMeshSheet(
|
||||
context,
|
||||
builder: (sheetContext) {
|
||||
final scheme = Theme.of(sheetContext).colorScheme;
|
||||
return SafeArea(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (final mode in ChannelNotificationMode.values)
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
channelNotificationModeIcon(mode),
|
||||
color: mode == currentMode
|
||||
? scheme.primary
|
||||
: scheme.onSurfaceVariant,
|
||||
),
|
||||
title: Text(channelNotificationModeLabel(sheetContext, mode)),
|
||||
trailing: mode == currentMode ? const Icon(Icons.check) : null,
|
||||
onTap: () async {
|
||||
Navigator.pop(sheetContext);
|
||||
await settingsService.setChannelNotificationMode(
|
||||
muteKey,
|
||||
mode,
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:meshcore_open/connector/meshcore_connector.dart';
|
||||
|
||||
void main() {
|
||||
bool mentions(String text, String? name) =>
|
||||
MeshCoreConnector.textMentionsName(text, name);
|
||||
|
||||
test('matches bracketed and plain mentions case-insensitively', () {
|
||||
expect(mentions('@[Bob] hello', 'Bob'), isTrue);
|
||||
expect(mentions('hey @[bob]', 'Bob'), isTrue);
|
||||
expect(mentions('hey @bob, look', 'Bob'), isTrue);
|
||||
expect(mentions('@BOB', 'Bob'), isTrue);
|
||||
expect(mentions('ping @Иван!', 'иван'), isTrue);
|
||||
});
|
||||
|
||||
test('requires a word boundary for plain mentions', () {
|
||||
expect(mentions('hey @bobby', 'Bob'), isFalse);
|
||||
expect(mentions('mail x@bob.com', 'Bob'), isFalse);
|
||||
expect(mentions('hey bob', 'Bob'), isFalse);
|
||||
});
|
||||
|
||||
test('names with spaces or regex characters must match in full', () {
|
||||
expect(mentions('hi @Bob Smith', 'Bob Smith'), isTrue);
|
||||
expect(mentions('hi @Bob', 'Bob Smith'), isFalse);
|
||||
expect(mentions('@[Node (1)] ok', 'Node (1)'), isTrue);
|
||||
expect(mentions('@[Node 1] ok', 'Node (1)'), isFalse);
|
||||
});
|
||||
|
||||
test('no self name never matches', () {
|
||||
expect(mentions('@[Bob] hi', null), isFalse);
|
||||
expect(mentions('@ hi', ''), isFalse);
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:meshcore_open/models/app_settings.dart';
|
||||
|
||||
void main() {
|
||||
test('channel notification modes round-trip by name', () {
|
||||
final settings = AppSettings(
|
||||
channelNotificationModes: {
|
||||
'a': ChannelNotificationMode.mentionsOnly,
|
||||
'b': ChannelNotificationMode.muted,
|
||||
},
|
||||
);
|
||||
final json = settings.toJson();
|
||||
expect(json['channel_notification_modes'], {
|
||||
'a': 'mentionsOnly',
|
||||
'b': 'muted',
|
||||
});
|
||||
expect(json['muted_channels'], ['b']);
|
||||
expect(
|
||||
AppSettings.fromJson(json).channelNotificationModes,
|
||||
settings.channelNotificationModes,
|
||||
);
|
||||
});
|
||||
|
||||
test('invalid channel notification mode entries are skipped', () {
|
||||
final settings = AppSettings.fromJson({
|
||||
'channel_notification_modes': {
|
||||
'ok': 'muted',
|
||||
'unknown': 'loud',
|
||||
'int': 2,
|
||||
'null': null,
|
||||
},
|
||||
});
|
||||
expect(settings.channelNotificationModes, {
|
||||
'ok': ChannelNotificationMode.muted,
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -24,7 +24,10 @@ void main() {
|
||||
test('channel mutes made in review mode are undone on exit', () async {
|
||||
final settings = AppSettingsService();
|
||||
await settings.loadSettings();
|
||||
await settings.muteChannel('Hiking Group');
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
final connector = MeshCoreConnector();
|
||||
addTearDown(connector.dispose);
|
||||
final retryService = MessageRetryService();
|
||||
@@ -39,23 +42,41 @@ void main() {
|
||||
|
||||
await connector.connectReview();
|
||||
// Mutes are keyed by channel name, so these would leak into real radios.
|
||||
await settings.muteChannel('Public');
|
||||
await settings.unmuteChannel('Hiking Group');
|
||||
await settings.setChannelNotificationMode(
|
||||
'Public',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
// Other app preferences are the user's to change, even while reviewing.
|
||||
await PrefsManager.instance.setString('unrelated_key', 'changed');
|
||||
|
||||
await connector.disconnect(manual: true);
|
||||
|
||||
expect(settings.isChannelMuted('Public'), isFalse);
|
||||
expect(settings.isChannelMuted('Hiking Group'), isTrue);
|
||||
expect(
|
||||
settings.getChannelNotificationMode('Public'),
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
expect(
|
||||
settings.getChannelNotificationMode('Hiking Group'),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
expect(PrefsManager.instance.getString('unrelated_key'), 'changed');
|
||||
|
||||
// A fresh launch has nothing left to undo.
|
||||
final relaunched = AppSettingsService();
|
||||
await relaunched.loadSettings();
|
||||
await endReviewModeSession(relaunched);
|
||||
expect(relaunched.isChannelMuted('Public'), isFalse);
|
||||
expect(relaunched.isChannelMuted('Hiking Group'), isTrue);
|
||||
expect(
|
||||
relaunched.getChannelNotificationMode('Public'),
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
expect(
|
||||
relaunched.getChannelNotificationMode('Hiking Group'),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
});
|
||||
|
||||
test(
|
||||
@@ -63,11 +84,20 @@ void main() {
|
||||
() async {
|
||||
final settings = AppSettingsService();
|
||||
await settings.loadSettings();
|
||||
await settings.muteChannel('Hiking Group');
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
|
||||
await beginReviewModeSession(settings);
|
||||
await settings.muteChannel('Public');
|
||||
await settings.unmuteChannel('Hiking Group');
|
||||
await settings.setChannelNotificationMode(
|
||||
'Public',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
await PrefsManager.instance.setString(
|
||||
'contacts${ReviewRadio.storagePrefix}',
|
||||
'[]',
|
||||
@@ -76,11 +106,20 @@ void main() {
|
||||
|
||||
final relaunched = AppSettingsService();
|
||||
await relaunched.loadSettings();
|
||||
expect(relaunched.isChannelMuted('Public'), isTrue);
|
||||
expect(
|
||||
relaunched.getChannelNotificationMode('Public'),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
await endReviewModeSession(relaunched);
|
||||
|
||||
expect(relaunched.isChannelMuted('Public'), isFalse);
|
||||
expect(relaunched.isChannelMuted('Hiking Group'), isTrue);
|
||||
expect(
|
||||
relaunched.getChannelNotificationMode('Public'),
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
expect(
|
||||
relaunched.getChannelNotificationMode('Hiking Group'),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
expect(
|
||||
PrefsManager.instance.getKeys().where(
|
||||
(k) => k.contains(ReviewRadio.storagePrefix),
|
||||
@@ -90,6 +129,61 @@ void main() {
|
||||
},
|
||||
);
|
||||
|
||||
test('every channel notification mode is restored on exit', () async {
|
||||
final settings = AppSettingsService();
|
||||
await settings.loadSettings();
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.mentionsOnly,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Noisy',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
|
||||
await beginReviewModeSession(settings);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Hiking Group',
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Noisy',
|
||||
ChannelNotificationMode.mentionsOnly,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Public',
|
||||
ChannelNotificationMode.mentionsOnly,
|
||||
);
|
||||
await endReviewModeSession(settings);
|
||||
|
||||
expect(
|
||||
settings.getChannelNotificationMode('Hiking Group'),
|
||||
ChannelNotificationMode.mentionsOnly,
|
||||
);
|
||||
expect(
|
||||
settings.getChannelNotificationMode('Noisy'),
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
expect(
|
||||
settings.getChannelNotificationMode('Public'),
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
});
|
||||
|
||||
test('setting a channel back to all drops its stored mode', () async {
|
||||
final settings = AppSettingsService();
|
||||
await settings.loadSettings();
|
||||
await settings.setChannelNotificationMode(
|
||||
'Public',
|
||||
ChannelNotificationMode.muted,
|
||||
);
|
||||
await settings.setChannelNotificationMode(
|
||||
'Public',
|
||||
ChannelNotificationMode.all,
|
||||
);
|
||||
expect(settings.settings.channelNotificationModes, isEmpty);
|
||||
});
|
||||
|
||||
test('the review scope never adopts legacy unscoped data', () async {
|
||||
await PrefsManager.instance.setString('contacts', '[]');
|
||||
await beginReviewModeSession(null);
|
||||
|
||||
@@ -1,5 +1,70 @@
|
||||
{
|
||||
"bg": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"de": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"es": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"fr": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"hu": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"it": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"ja": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"ko": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"nl": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"pl": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"pt": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"ru": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"sk": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"sl": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"sv": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"uk": [
|
||||
"channels_notificationModeTooltip"
|
||||
],
|
||||
|
||||
"zh": [
|
||||
"channels_notificationModeTooltip"
|
||||
"settings_pathHashModeNotApplied"
|
||||
],
|
||||
|
||||
|
||||
Reference in new issue
Block a user