mirror of
https://github.com/zjs81/meshcore-open.git
synced 2026-04-20 22:13:48 +00:00
Merge branch 'main' into chrome/main
This commit is contained in:
commit
7740698cde
6 changed files with 32 additions and 14 deletions
|
|
@ -262,7 +262,7 @@
|
|||
}
|
||||
},
|
||||
"contacts_manageRepeater": "Gérer le répéteur",
|
||||
"contacts_roomLogin": "Connexion Salle",
|
||||
"contacts_roomLogin": "Connexion Room Server",
|
||||
"contacts_openChat": "Ouverture du Chat",
|
||||
"contacts_editGroup": "Modifier le groupe",
|
||||
"contacts_deleteGroup": "Supprimer le groupe",
|
||||
|
|
@ -798,7 +798,7 @@
|
|||
"dialog_disconnect": "Déconnecter",
|
||||
"dialog_disconnectConfirm": "Êtes-vous sûr de vouloir vous déconnecter de cet appareil ?",
|
||||
"login_repeaterLogin": "Connexion au répéteur",
|
||||
"login_roomLogin": "Connexion Salle",
|
||||
"login_roomLogin": "Connexion Room Server",
|
||||
"login_password": "Mot de passe",
|
||||
"login_enterPassword": "Entrez votre mot de passe",
|
||||
"login_savePassword": "Sauvegarder le mot de passe",
|
||||
|
|
@ -1393,7 +1393,7 @@
|
|||
"settings_locationIntervalSec": "Intervalle de mise-à-jour du GPS (Secondes)",
|
||||
"settings_locationIntervalInvalid": "L'intervalle doit être compris entre 60 et 86400 secondes.",
|
||||
"contacts_manageRoom": "Gérer le Room Server",
|
||||
"room_management": "Administración del Servidor de Habitación",
|
||||
"room_management": "Administrattion Room Server",
|
||||
"@community_joinConfirmation": {
|
||||
"placeholders": {
|
||||
"name": {
|
||||
|
|
|
|||
|
|
@ -711,7 +711,7 @@ class AppLocalizationsFr extends AppLocalizations {
|
|||
String get contacts_manageRoom => 'Gérer le Room Server';
|
||||
|
||||
@override
|
||||
String get contacts_roomLogin => 'Connexion Salle';
|
||||
String get contacts_roomLogin => 'Connexion Room Server';
|
||||
|
||||
@override
|
||||
String get contacts_openChat => 'Ouverture du Chat';
|
||||
|
|
@ -1574,7 +1574,7 @@ class AppLocalizationsFr extends AppLocalizations {
|
|||
String get login_repeaterLogin => 'Connexion au répéteur';
|
||||
|
||||
@override
|
||||
String get login_roomLogin => 'Connexion Salle';
|
||||
String get login_roomLogin => 'Connexion Room Server';
|
||||
|
||||
@override
|
||||
String get login_password => 'Mot de passe';
|
||||
|
|
@ -1699,7 +1699,7 @@ class AppLocalizationsFr extends AppLocalizations {
|
|||
String get repeater_management => 'Gestion des répéteurs';
|
||||
|
||||
@override
|
||||
String get room_management => 'Administración del Servidor de Habitación';
|
||||
String get room_management => 'Administrattion Room Server';
|
||||
|
||||
@override
|
||||
String get repeater_managementTools => 'Outils de Gestion';
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import 'dart:math';
|
|||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:meshcore_open/storage/channel_message_store.dart';
|
||||
import 'package:meshcore_open/widgets/app_bar.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
|
@ -105,6 +106,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final connector = context.watch<MeshCoreConnector>();
|
||||
final channelMessageStore = ChannelMessageStore();
|
||||
|
||||
// Auto-navigate back to scanner if disconnected
|
||||
if (!checkConnectionAndNavigate(connector)) {
|
||||
|
|
@ -304,6 +306,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
return _buildChannelTile(
|
||||
context,
|
||||
connector,
|
||||
channelMessageStore,
|
||||
channel,
|
||||
showDragHandle: true,
|
||||
dragIndex: index,
|
||||
|
|
@ -323,6 +326,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
return _buildChannelTile(
|
||||
context,
|
||||
connector,
|
||||
channelMessageStore,
|
||||
channel,
|
||||
);
|
||||
},
|
||||
|
|
@ -352,6 +356,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
Widget _buildChannelTile(
|
||||
BuildContext context,
|
||||
MeshCoreConnector connector,
|
||||
ChannelMessageStore channelMessageStore,
|
||||
Channel channel, {
|
||||
bool showDragHandle = false,
|
||||
int? dragIndex,
|
||||
|
|
@ -468,7 +473,12 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
);
|
||||
}
|
||||
},
|
||||
onLongPress: () => _showChannelActions(context, connector, channel),
|
||||
onLongPress: () => _showChannelActions(
|
||||
context,
|
||||
connector,
|
||||
channelMessageStore,
|
||||
channel,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
@ -476,6 +486,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
void _showChannelActions(
|
||||
BuildContext context,
|
||||
MeshCoreConnector connector,
|
||||
ChannelMessageStore channelMessageStore,
|
||||
Channel channel,
|
||||
) {
|
||||
final settingsService = context.read<AppSettingsService>();
|
||||
|
|
@ -528,7 +539,12 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
Navigator.pop(context);
|
||||
await Future.delayed(const Duration(milliseconds: 100));
|
||||
if (context.mounted) {
|
||||
_confirmDeleteChannel(context, connector, channel);
|
||||
_confirmDeleteChannel(
|
||||
context,
|
||||
connector,
|
||||
channelMessageStore,
|
||||
channel,
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
|
@ -1474,6 +1490,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
void _confirmDeleteChannel(
|
||||
BuildContext context,
|
||||
MeshCoreConnector connector,
|
||||
ChannelMessageStore channelMessageStore,
|
||||
Channel channel,
|
||||
) {
|
||||
showDialog(
|
||||
|
|
@ -1492,6 +1509,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
|
|||
onPressed: () {
|
||||
Navigator.pop(dialogContext);
|
||||
connector.deleteChannel(channel.index);
|
||||
channelMessageStore.clearChannelMessages(channel.index);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue