From 25c65bd2b1b84ec6db77f6505d86084dda355036 Mon Sep 17 00:00:00 2001 From: ericz Date: Fri, 10 Apr 2026 22:58:57 +0200 Subject: [PATCH 1/4] Cherry-Pick of first commit of PR #373 --- lib/connector/meshcore_connector.dart | 20 ++ lib/l10n/app_bg.arb | 35 ++++ lib/l10n/app_de.arb | 35 ++++ lib/l10n/app_en.arb | 35 ++++ lib/l10n/app_es.arb | 35 ++++ lib/l10n/app_fr.arb | 35 ++++ lib/l10n/app_hu.arb | 35 ++++ lib/l10n/app_it.arb | 35 ++++ lib/l10n/app_ja.arb | 35 ++++ lib/l10n/app_ko.arb | 35 ++++ lib/l10n/app_localizations.dart | 42 ++++ lib/l10n/app_localizations_bg.dart | 30 +++ lib/l10n/app_localizations_de.dart | 30 +++ lib/l10n/app_localizations_en.dart | 30 +++ lib/l10n/app_localizations_es.dart | 30 +++ lib/l10n/app_localizations_fr.dart | 30 +++ lib/l10n/app_localizations_hu.dart | 30 +++ lib/l10n/app_localizations_it.dart | 30 +++ lib/l10n/app_localizations_ja.dart | 29 +++ lib/l10n/app_localizations_ko.dart | 29 +++ lib/l10n/app_localizations_nl.dart | 30 +++ lib/l10n/app_localizations_pl.dart | 30 +++ lib/l10n/app_localizations_pt.dart | 30 +++ lib/l10n/app_localizations_ru.dart | 31 +++ lib/l10n/app_localizations_sk.dart | 30 +++ lib/l10n/app_localizations_sl.dart | 30 +++ lib/l10n/app_localizations_sv.dart | 30 +++ lib/l10n/app_localizations_uk.dart | 30 +++ lib/l10n/app_localizations_zh.dart | 29 +++ lib/l10n/app_nl.arb | 35 ++++ lib/l10n/app_pl.arb | 41 +++- lib/l10n/app_pt.arb | 35 ++++ lib/l10n/app_ru.arb | 41 +++- lib/l10n/app_sk.arb | 35 ++++ lib/l10n/app_sl.arb | 35 ++++ lib/l10n/app_sv.arb | 41 +++- lib/l10n/app_uk.arb | 35 ++++ lib/l10n/app_zh.arb | 35 ++++ lib/models/contact.dart | 2 - lib/screens/discovery_screen.dart | 187 +++++++++++++++++- lib/storage/contact_discovery_store.dart | 50 +++++ linux/flutter/generated_plugin_registrant.cc | 4 + linux/flutter/generated_plugins.cmake | 2 + macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.yaml | 1 + .../flutter/generated_plugin_registrant.cc | 3 + windows/flutter/generated_plugins.cmake | 2 + 47 files changed, 1475 insertions(+), 26 deletions(-) diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 538ee38a..2cf6abca 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -368,6 +368,26 @@ class MeshCoreConnector extends ChangeNotifier { return List.unmodifiable(_discoveredContacts); } + String exportDiscoveredContactsJson() { + return _discoveryContactStore.exportContactsJson(_discoveredContacts); + } + + Future importDiscoveredContactsJson(String json) async { + final newCount = _discoveryContactStore.importContactsJson( + json: json, + existingContacts: _discoveredContacts, + knownContactKeys: _knownContactKeys, + ); + + if (newCount == 0 && _discoveredContacts.isEmpty) { + return 0; + } + + await _persistDiscoveredContacts(); + notifyListeners(); + return newCount; + } + List get channels => List.unmodifiable(_channels); bool get isConnected => _state == MeshCoreConnectionState.connected; bool get isLoadingContacts => _isLoadingContacts; diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb index 45536cf6..6bf82db7 100644 --- a/lib/l10n/app_bg.arb +++ b/lib/l10n/app_bg.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_copyContact": "Копирай контакт в клипборда", "discoveredContacts_deleteContact": "Изтрий контакт", "discoveredContacts_addContact": "Добави контакт", + "discoveredContacts_export": "Експортирай откритите контакти", + "discoveredContacts_import": "Импортирай откритите контакти", + "discoveredContacts_exported": "Откритите контакти са експортирани в {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Неуспешно експортиране на откритите контакти: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Импортирани са {count} открити контакта.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Във файла за импортиране не са намерени контакти.", + "discoveredContacts_importFailed": "Неуспешно импортиране на откритите контакти: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Когато списъкът с контакти е пълен, най-старият неключов контакт ще бъде заменен.", "discoveredContacts_deleteContactAll": "Изтриване на Всички Открити Контакти", "discoveredContacts_deleteContactAllContent": "Сигурни ли сте, че искате да изтриете всички открити контакти?", diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 7f491d4f..2ffd399b 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -1944,6 +1944,41 @@ "common_deleteAll": "Alles löschen", "discoveredContacts_deleteContactAllContent": "Sind Sie sicher, dass Sie alle gefundenen Kontakte löschen möchten?", "discoveredContacts_deleteContactAll": "Alle entdeckten Kontakte löschen", + "discoveredContacts_export": "Entdeckte Kontakte exportieren", + "discoveredContacts_import": "Entdeckte Kontakte importieren", + "discoveredContacts_exported": "Entdeckte Kontakte exportiert nach {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Export von entdeckten Kontakten fehlgeschlagen: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} entdeckte Kontakte importiert.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Keine Kontakte in Importdatei gefunden.", + "discoveredContacts_importFailed": "Import von entdeckten Kontakten fehlgeschlagen: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "map_showGuessedLocations": "Zeige die vermuteten Knotenpositionen", "map_guessedLocation": "Geschätzter Ort", "usbScreenSubtitle": "Wählen Sie ein erkannten serielles Gerät aus und verbinden Sie es direkt mit Ihrem MeshCore-Knoten.", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 456fab56..af2fd917 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -2137,6 +2137,41 @@ "contacts_invalidAdvertFormat": "Invalid contact data", "contacts_contactImported": "Contact has been imported.", "contacts_contactImportFailed": "Failed to import contact.", + "discoveredContacts_export": "Export discovered contacts", + "discoveredContacts_import": "Import discovered contacts", + "discoveredContacts_exported": "Exported discovered contacts to {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Failed to export discovered contacts: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Imported {count} discovered contacts.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "No contacts found in import file.", + "discoveredContacts_importFailed": "Failed to import discovered contacts: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contacts_zeroHopAdvert": "Zero Hop Advert", "contacts_floodAdvert": "Flood Advert", "contacts_copyAdvertToClipboard": "Copy Advert to Clipboard", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index d4cf27da..d43f9248 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -1944,6 +1944,41 @@ "common_deleteAll": "Eliminar todo", "discoveredContacts_deleteContactAll": "Eliminar Todos los Contactos Descubiertos", "discoveredContacts_deleteContactAllContent": "¿Está seguro de que desea eliminar todos los contactos descubiertos!", + "discoveredContacts_export": "Exportar contactos descubiertos", + "discoveredContacts_import": "Importar contactos descubiertos", + "discoveredContacts_exported": "Contactos descubiertos exportados a {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Error al exportar contactos descubiertos: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} contactos descubiertos importados.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "No se encontraron contactos en el archivo de importación.", + "discoveredContacts_importFailed": "Error al importar contactos descubiertos: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "map_guessedLocation": "Ubicación estimada", "map_showGuessedLocations": "Mostrar las ubicaciones estimadas de los nodos.", "usbScreenTitle": "Conecte mediante USB", diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index 7817c20d..73a2fce0 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -1916,6 +1916,41 @@ "common_deleteAll": "Supprimer tout", "discoveredContacts_deleteContactAll": "Supprimer tous les contacts découverts", "discoveredContacts_deleteContactAllContent": "Êtes-vous sûr de vouloir supprimer tous les contacts découverts ?", + "discoveredContacts_export": "Exporter les contacts découverts", + "discoveredContacts_import": "Importer les contacts découverts", + "discoveredContacts_exported": "Contacts découverts exportés vers {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Impossible d'exporter les contacts découverts: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} contacts découverts importés.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Aucun contact trouvé dans le fichier d'importation.", + "discoveredContacts_importFailed": "Impossible d'importer les contacts découverts: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "map_showGuessedLocations": "Afficher les emplacements des nœuds estimés", "map_guessedLocation": "Lieu deviné", "connectionChoiceUsbLabel": "USB", diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb index 97426183..9c767398 100644 --- a/lib/l10n/app_hu.arb +++ b/lib/l10n/app_hu.arb @@ -2037,6 +2037,41 @@ "discoveredContacts_deleteContact": "Törölj a feltalált kapcsolatot", "discoveredContacts_deleteContactAll": "Törölj minden megtalált kapcsolatot", "discoveredContacts_deleteContactAllContent": "Biztos, hogy szeretné törölni az összes eddig megtalált kapcsolatot?", + "discoveredContacts_export": "Felfedezett kapcsolatok exportálása", + "discoveredContacts_import": "Felfedezett kapcsolatok importálása", + "discoveredContacts_exported": "A felfedezett kapcsolatok exportálva ide: {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "A felfedezett kapcsolatok exportálása nem sikerült: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} felfedezett kapcsolat importálva.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Az importfájlban nem találhatók kapcsolatok.", + "discoveredContacts_importFailed": "A felfedezett kapcsolatok importálása nem sikerült: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "chat_sendCooldown": "Kérjük, várjon egy pillanatot, mielőtt újra elküldené.", "appSettings_jumpToOldestUnread": "Jelentkezzen az legörebb, olvasatlan üzenetre", "appSettings_jumpToOldestUnreadSubtitle": "Amikor egy új csevet indítunk, amelyben vannak olvashatatlan üzenetek, görgessük a listát, hogy a legelső, olvashatatlan üzenet megjelenjen, nem pedig az utolsó.", diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb index 664bceef..abb67295 100644 --- a/lib/l10n/app_it.arb +++ b/lib/l10n/app_it.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_contactAdded": "Contatto aggiunto", "discoveredContacts_deleteContact": "Elimina Contatto", "discoveredContacts_copyContact": "Copia contatto negli appunti", + "discoveredContacts_export": "Esporta contatti scoperti", + "discoveredContacts_import": "Importa contatti scoperti", + "discoveredContacts_exported": "Contatti scoperti esportati in {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Esportazione dei contatti scoperti non riuscita: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Importati {count} contatti scoperti.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Nessun contatto trovato nel file di importazione.", + "discoveredContacts_importFailed": "Importazione dei contatti scoperti non riuscita: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Quando l'elenco dei contatti è pieno, il contatto più vecchio non tra i preferiti verrà sostituito.", "common_deleteAll": "Elimina tutto", "discoveredContacts_deleteContactAllContent": "Sei sicuro di voler eliminare tutti i contatti scoperti?", diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 9d2cef21..f6ab75ca 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -2037,6 +2037,41 @@ "discoveredContacts_deleteContact": "発見された連絡先を削除", "discoveredContacts_deleteContactAll": "発見されたすべての連絡先を削除", "discoveredContacts_deleteContactAllContent": "本当に、見つけたすべての連絡先を削除してもよろしいですか?", + "discoveredContacts_export": "発見済みの連絡先をエクスポート", + "discoveredContacts_import": "発見済みの連絡先をインポート", + "discoveredContacts_exported": "発見済みの連絡先を {path} にエクスポートしました。", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "発見済みの連絡先のエクスポートに失敗しました: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} 件の発見済み連絡先をインポートしました。", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "インポートファイルに連絡先が見つかりませんでした。", + "discoveredContacts_importFailed": "発見済みの連絡先のインポートに失敗しました: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "chat_sendCooldown": "再度送信する前に、しばらくお待ちください。", "appSettings_jumpToOldestUnread": "最も古い未読のメッセージへ移動", "appSettings_jumpToOldestUnreadSubtitle": "未読メッセージがあるチャットを開く際、「最新のメッセージ」ではなく、最初に未読のメッセージまでスクロールしてください。", diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb index d778429b..c85019f6 100644 --- a/lib/l10n/app_ko.arb +++ b/lib/l10n/app_ko.arb @@ -2037,6 +2037,41 @@ "discoveredContacts_deleteContact": "발견된 연락처 삭제", "discoveredContacts_deleteContactAll": "발견된 모든 연락처 삭제", "discoveredContacts_deleteContactAllContent": "정말로 모든 검색된 연락처를 삭제하시겠습니까?", + "discoveredContacts_export": "발견된 연락처 내보내기", + "discoveredContacts_import": "발견된 연락처 가져오기", + "discoveredContacts_exported": "발견된 연락처를 {path}(으)로 내보냈습니다.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "발견된 연락처 내보내기에 실패했습니다: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "발견된 연락처 {count}개를 가져왔습니다.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "가져오기 파일에서 연락처를 찾을 수 없습니다.", + "discoveredContacts_importFailed": "발견된 연락처 가져오기에 실패했습니다: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "chat_sendCooldown": "다시 보내기 전에 잠시 기다려 주시기 바랍니다.", "appSettings_jumpToOldestUnread": "가장 오래된, 아직 읽지 않은 항목으로 이동", "appSettings_jumpToOldestUnreadSubtitle": "새로운 메시지가 없는 채팅을 열 때, 최신 메시지가 아닌 첫 번째 읽지 않은 메시지로 스크롤하세요.", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 159d755c..84baa5ea 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -6628,6 +6628,48 @@ abstract class AppLocalizations { /// **'Failed to import contact.'** String get contacts_contactImportFailed; + /// No description provided for @discoveredContacts_export. + /// + /// In en, this message translates to: + /// **'Export discovered contacts'** + String get discoveredContacts_export; + + /// No description provided for @discoveredContacts_import. + /// + /// In en, this message translates to: + /// **'Import discovered contacts'** + String get discoveredContacts_import; + + /// No description provided for @discoveredContacts_exported. + /// + /// In en, this message translates to: + /// **'Exported discovered contacts to {path}.'** + String discoveredContacts_exported(String path); + + /// No description provided for @discoveredContacts_exportFailed. + /// + /// In en, this message translates to: + /// **'Failed to export discovered contacts: {error}'** + String discoveredContacts_exportFailed(String error); + + /// No description provided for @discoveredContacts_imported. + /// + /// In en, this message translates to: + /// **'Imported {count} discovered contacts.'** + String discoveredContacts_imported(int count); + + /// No description provided for @discoveredContacts_importNoContacts. + /// + /// In en, this message translates to: + /// **'No contacts found in import file.'** + String get discoveredContacts_importNoContacts; + + /// No description provided for @discoveredContacts_importFailed. + /// + /// In en, this message translates to: + /// **'Failed to import discovered contacts: {error}'** + String discoveredContacts_importFailed(String error); + /// No description provided for @contacts_zeroHopAdvert. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 409803b2..95434f11 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -3846,6 +3846,36 @@ class AppLocalizationsBg extends AppLocalizations { String get contacts_contactImportFailed => 'Контактът не е успешно импортиран.'; + @override + String get discoveredContacts_export => 'Експортирай откритите контакти'; + + @override + String get discoveredContacts_import => 'Импортирай откритите контакти'; + + @override + String discoveredContacts_exported(String path) { + return 'Откритите контакти са експортирани в $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Неуспешно експортиране на откритите контакти: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Импортирани са $count открити контакта.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Във файла за импортиране не са намерени контакти.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Неуспешно импортиране на откритите контакти: $error'; + } + @override String get contacts_zeroHopAdvert => 'Реклама без скок'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 9f06906d..fb634e34 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -3857,6 +3857,36 @@ class AppLocalizationsDe extends AppLocalizations { String get contacts_contactImportFailed => 'Kontakt konnte nicht importiert werden'; + @override + String get discoveredContacts_export => 'Entdeckte Kontakte exportieren'; + + @override + String get discoveredContacts_import => 'Entdeckte Kontakte importieren'; + + @override + String discoveredContacts_exported(String path) { + return 'Entdeckte Kontakte exportiert nach $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Export von entdeckten Kontakten fehlgeschlagen: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count entdeckte Kontakte importiert.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Keine Kontakte in Importdatei gefunden.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Import von entdeckten Kontakten fehlgeschlagen: $error'; + } + @override String get contacts_zeroHopAdvert => 'Zero-Hop-Ankündigung'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 6def06b7..366dc315 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -3780,6 +3780,36 @@ class AppLocalizationsEn extends AppLocalizations { @override String get contacts_contactImportFailed => 'Failed to import contact.'; + @override + String get discoveredContacts_export => 'Export discovered contacts'; + + @override + String get discoveredContacts_import => 'Import discovered contacts'; + + @override + String discoveredContacts_exported(String path) { + return 'Exported discovered contacts to $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Failed to export discovered contacts: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Imported $count discovered contacts.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'No contacts found in import file.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Failed to import discovered contacts: $error'; + } + @override String get contacts_zeroHopAdvert => 'Zero Hop Advert'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index bb4f40e8..b9d61e9e 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -3846,6 +3846,36 @@ class AppLocalizationsEs extends AppLocalizations { String get contacts_contactImportFailed => 'Contacto no se importó correctamente.'; + @override + String get discoveredContacts_export => 'Exportar contactos descubiertos'; + + @override + String get discoveredContacts_import => 'Importar contactos descubiertos'; + + @override + String discoveredContacts_exported(String path) { + return 'Contactos descubiertos exportados a $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Error al exportar contactos descubiertos: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count contactos descubiertos importados.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'No se encontraron contactos en el archivo de importación.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Error al importar contactos descubiertos: $error'; + } + @override String get contacts_zeroHopAdvert => 'Anuncio de Zero Hop'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index 44e40657..1872f459 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -3868,6 +3868,36 @@ class AppLocalizationsFr extends AppLocalizations { String get contacts_contactImportFailed => 'Échec de l\'importation du contact.'; + @override + String get discoveredContacts_export => 'Exporter les contacts découverts'; + + @override + String get discoveredContacts_import => 'Importer les contacts découverts'; + + @override + String discoveredContacts_exported(String path) { + return 'Contacts découverts exportés vers $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Impossible d\'exporter les contacts découverts: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count contacts découverts importés.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Aucun contact trouvé dans le fichier d\'importation.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Impossible d\'importer les contacts découverts: $error'; + } + @override String get contacts_zeroHopAdvert => 'Annonce Zero saut'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index 298a6fd6..bc58482f 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -3861,6 +3861,36 @@ class AppLocalizationsHu extends AppLocalizations { String get contacts_contactImportFailed => 'Nem sikerült a kapcsolatot importálni.'; + @override + String get discoveredContacts_export => 'Felfedezett kapcsolatok exportálása'; + + @override + String get discoveredContacts_import => 'Felfedezett kapcsolatok importálása'; + + @override + String discoveredContacts_exported(String path) { + return 'A felfedezett kapcsolatok exportálva ide: $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'A felfedezett kapcsolatok exportálása nem sikerült: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count felfedezett kapcsolat importálva.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Az importfájlban nem találhatók kapcsolatok.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'A felfedezett kapcsolatok importálása nem sikerült: $error'; + } + @override String get contacts_zeroHopAdvert => 'Zero Hop reklám'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index e3f7ee58..f37b2c34 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -3851,6 +3851,36 @@ class AppLocalizationsIt extends AppLocalizations { String get contacts_contactImportFailed => 'Contatto non importato con successo.'; + @override + String get discoveredContacts_export => 'Esporta contatti scoperti'; + + @override + String get discoveredContacts_import => 'Importa contatti scoperti'; + + @override + String discoveredContacts_exported(String path) { + return 'Contatti scoperti esportati in $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Esportazione dei contatti scoperti non riuscita: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Importati $count contatti scoperti.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Nessun contatto trovato nel file di importazione.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Importazione dei contatti scoperti non riuscita: $error'; + } + @override String get contacts_zeroHopAdvert => 'Annuncio Zero Hop'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index 263a906e..0002ee7b 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -3648,6 +3648,35 @@ class AppLocalizationsJa extends AppLocalizations { @override String get contacts_contactImportFailed => '連絡先のインポートに失敗しました。'; + @override + String get discoveredContacts_export => '発見済みの連絡先をエクスポート'; + + @override + String get discoveredContacts_import => '発見済みの連絡先をインポート'; + + @override + String discoveredContacts_exported(String path) { + return '発見済みの連絡先を $path にエクスポートしました。'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return '発見済みの連絡先のエクスポートに失敗しました: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count 件の発見済み連絡先をインポートしました。'; + } + + @override + String get discoveredContacts_importNoContacts => 'インポートファイルに連絡先が見つかりませんでした。'; + + @override + String discoveredContacts_importFailed(String error) { + return '発見済みの連絡先のインポートに失敗しました: $error'; + } + @override String get contacts_zeroHopAdvert => 'ゼロホップ広告'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index f9c0d760..79aad394 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -3650,6 +3650,35 @@ class AppLocalizationsKo extends AppLocalizations { @override String get contacts_contactImportFailed => '연락처를 가져오지 못했습니다.'; + @override + String get discoveredContacts_export => '발견된 연락처 내보내기'; + + @override + String get discoveredContacts_import => '발견된 연락처 가져오기'; + + @override + String discoveredContacts_exported(String path) { + return '발견된 연락처를 $path(으)로 내보냈습니다.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return '발견된 연락처 내보내기에 실패했습니다: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '발견된 연락처 $count개를 가져왔습니다.'; + } + + @override + String get discoveredContacts_importNoContacts => '가져오기 파일에서 연락처를 찾을 수 없습니다.'; + + @override + String discoveredContacts_importFailed(String error) { + return '발견된 연락처 가져오기에 실패했습니다: $error'; + } + @override String get contacts_zeroHopAdvert => '제로 홉 광고'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index ad140bf3..8e173e70 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -3831,6 +3831,36 @@ class AppLocalizationsNl extends AppLocalizations { String get contacts_contactImportFailed => 'Contact kon niet geïmporteerd worden.'; + @override + String get discoveredContacts_export => 'Ontdekte contacten exporteren'; + + @override + String get discoveredContacts_import => 'Ontdekte contacten importeren'; + + @override + String discoveredContacts_exported(String path) { + return 'Ontdekte contacten geëxporteerd naar $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Exporteren van ontdekte contacten mislukt: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count ontdekte contacten geïmporteerd.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Geen contacten gevonden in het importbestand.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Importeren van ontdekte contacten mislukt: $error'; + } + @override String get contacts_zeroHopAdvert => 'Zero Hop Reclame'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index 6c7c3696..74721fbb 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -3862,6 +3862,36 @@ class AppLocalizationsPl extends AppLocalizations { String get contacts_contactImportFailed => 'Kontakt nie został zaimportowany.'; + @override + String get discoveredContacts_export => 'Eksportuj odkryte kontakty'; + + @override + String get discoveredContacts_import => 'Importuj odkryte kontakty'; + + @override + String discoveredContacts_exported(String path) { + return 'Wyeksportowano odkryte kontakty do $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Nie udało się wyeksportować odkrytych kontaktów: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Zaimportowano $count odkrytych kontaktów.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Nie znaleziono kontaktów w pliku importu.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Nie udało się zaimportować odkrytych kontaktów: $error'; + } + @override String get contacts_zeroHopAdvert => 'Rozgłoszenie zero-hop'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index e6fd49e3..ab7d83d9 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -3842,6 +3842,36 @@ class AppLocalizationsPt extends AppLocalizations { @override String get contacts_contactImportFailed => 'Contato falhou ao ser importado.'; + @override + String get discoveredContacts_export => 'Exportar contatos descobertos'; + + @override + String get discoveredContacts_import => 'Importar contatos descobertos'; + + @override + String discoveredContacts_exported(String path) { + return 'Contatos descobertos exportados para $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Falha ao exportar contatos descobertos: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return '$count contatos descobertos importados.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Nenhum contato encontrado no arquivo de importação.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Falha ao importar contatos descobertos: $error'; + } + @override String get contacts_zeroHopAdvert => 'Anúncio Zero Hop'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index 25452003..0534902c 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -3852,6 +3852,37 @@ class AppLocalizationsRu extends AppLocalizations { @override String get contacts_contactImportFailed => 'Контакт не удалось импортировать'; + @override + String get discoveredContacts_export => + 'Экспортировать обнаруженные контакты'; + + @override + String get discoveredContacts_import => 'Импортировать обнаруженные контакты'; + + @override + String discoveredContacts_exported(String path) { + return 'Обнаруженные контакты экспортированы в $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Не удалось экспортировать обнаруженные контакты: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Импортировано $count обнаруженных контактов.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'В файле импорта не найдены контакты.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Не удалось импортировать обнаруженные контакты: $error'; + } + @override String get contacts_zeroHopAdvert => 'Реклама Zero Hop'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index 91461385..95f4de35 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -3827,6 +3827,36 @@ class AppLocalizationsSk extends AppLocalizations { String get contacts_contactImportFailed => 'Kontakt sa nepodarilo importovať.'; + @override + String get discoveredContacts_export => 'Exportovať objavené kontakty'; + + @override + String get discoveredContacts_import => 'Importovať objavené kontakty'; + + @override + String discoveredContacts_exported(String path) { + return 'Objavené kontakty boli exportované do $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Export objavených kontaktov zlyhal: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Bolo importovaných $count objavených kontaktov.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'V importovanom súbore sa nenašli žiadne kontakty.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Import objavených kontaktov zlyhal: $error'; + } + @override String get contacts_zeroHopAdvert => 'Inzerát Zero Hop'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 48103647..896bfb6d 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -3821,6 +3821,36 @@ class AppLocalizationsSl extends AppLocalizations { @override String get contacts_contactImportFailed => 'Kontakt ni bil uspešno uvožen.'; + @override + String get discoveredContacts_export => 'Izvozi odkrite stike'; + + @override + String get discoveredContacts_import => 'Uvozi odkrite stike'; + + @override + String discoveredContacts_exported(String path) { + return 'Odkriti stiki so izvoženi v $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Izvoz odkritih stikov ni uspel: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Uvoženih je bilo $count odkritih stikov.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'V uvozni datoteki ni bilo najdenih stikov.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Uvoz odkritih stikov ni uspel: $error'; + } + @override String get contacts_zeroHopAdvert => 'Reklama brez posrednikov'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index 7453c18f..8660b1cb 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -3799,6 +3799,36 @@ class AppLocalizationsSv extends AppLocalizations { @override String get contacts_contactImportFailed => 'Kontakt kunde inte importeras.'; + @override + String get discoveredContacts_export => 'Exportera upptäckta kontakter'; + + @override + String get discoveredContacts_import => 'Importera upptäckta kontakter'; + + @override + String discoveredContacts_exported(String path) { + return 'Upptäckta kontakter exporterades till $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Det gick inte att exportera upptäckta kontakter: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Importerade $count upptäckta kontakter.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'Inga kontakter hittades i importfilen.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Det gick inte att importera upptäckta kontakter: $error'; + } + @override String get contacts_zeroHopAdvert => 'Reklam med nollhopp'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 9c30fd8e..8f58d664 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -3853,6 +3853,36 @@ class AppLocalizationsUk extends AppLocalizations { @override String get contacts_contactImportFailed => 'Контакт не вдалось імпортувати'; + @override + String get discoveredContacts_export => 'Експортувати виявлені контакти'; + + @override + String get discoveredContacts_import => 'Імпортувати виявлені контакти'; + + @override + String discoveredContacts_exported(String path) { + return 'Виявлені контакти експортовано до $path.'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return 'Не вдалося експортувати виявлені контакти: $error'; + } + + @override + String discoveredContacts_imported(int count) { + return 'Імпортовано $count виявлених контактів.'; + } + + @override + String get discoveredContacts_importNoContacts => + 'У файлі імпорту не знайдено контактів.'; + + @override + String discoveredContacts_importFailed(String error) { + return 'Не вдалося імпортувати виявлені контакти: $error'; + } + @override String get contacts_zeroHopAdvert => 'Оголошення без ретрансляції'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index d2304a66..b4c18286 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -3551,6 +3551,35 @@ class AppLocalizationsZh extends AppLocalizations { @override String get contacts_contactImportFailed => '导入联系人失败。'; + @override + String get discoveredContacts_export => '导出已发现的联系人'; + + @override + String get discoveredContacts_import => '导入已发现的联系人'; + + @override + String discoveredContacts_exported(String path) { + return '已将已发现的联系人导出到$path。'; + } + + @override + String discoveredContacts_exportFailed(String error) { + return '导出已发现的联系人失败:$error'; + } + + @override + String discoveredContacts_imported(int count) { + return '已导入$count个已发现的联系人。'; + } + + @override + String get discoveredContacts_importNoContacts => '在导入文件中未找到联系人。'; + + @override + String discoveredContacts_importFailed(String error) { + return '导入已发现的联系人失败:$error'; + } + @override String get contacts_zeroHopAdvert => '发送零跳广播'; diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb index 7e83215b..3b6d7196 100644 --- a/lib/l10n/app_nl.arb +++ b/lib/l10n/app_nl.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_Title": "Ontdekte contacten", "discoveredContacts_contactAdded": "Contact toegevoegd", "discoveredContacts_searchHint": "Ontdekte contacten zoeken", + "discoveredContacts_export": "Ontdekte contacten exporteren", + "discoveredContacts_import": "Ontdekte contacten importeren", + "discoveredContacts_exported": "Ontdekte contacten geëxporteerd naar {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Exporteren van ontdekte contacten mislukt: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} ontdekte contacten geïmporteerd.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Geen contacten gevonden in het importbestand.", + "discoveredContacts_importFailed": "Importeren van ontdekte contacten mislukt: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Wanneer de contactenlijst vol is, wordt de oudste niet-favoriete contactpersoon vervangen.", "common_deleteAll": "Alles verwijderen", "discoveredContacts_deleteContactAll": "Verwijder alle ontdekte contacten", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index 4366e273..c25c7856 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -1950,6 +1950,41 @@ "contactsSettings_autoAddSensorsSubtitle": "Zezwól towarzyszowi na automatyczne dodawanie wykrytych czujników.", "discoveredContacts_noMatching": "Brak pasujących kontaktów", "discoveredContacts_deleteContact": "Usuń kontakt", + "discoveredContacts_export": "Eksportuj odkryte kontakty", + "discoveredContacts_import": "Importuj odkryte kontakty", + "discoveredContacts_exported": "Wyeksportowano odkryte kontakty do {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Nie udało się wyeksportować odkrytych kontaktów: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Zaimportowano {count} odkrytych kontaktów.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Nie znaleziono kontaktów w pliku importu.", + "discoveredContacts_importFailed": "Nie udało się zaimportować odkrytych kontaktów: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Gdy lista kontaktów jest pełna, najstarszy nieulubiony kontakt zostanie zastąpiony.", "common_deleteAll": "Usuń wszystko", "discoveredContacts_deleteContactAllContent": "Czy na pewno chcesz usunąć wszystkie znalezione kontakty?", @@ -2180,12 +2215,6 @@ "scanner_linuxPairingPinTitle": "Kod PIN parowania Bluetooth", "repeater_cliQuickClockSync": "Synchronizacja zegara", "repeater_cliQuickDiscovery": "Odkryj Sąsiadów", - "@repeater_clockSyncAfterLogin": { - "description": "Repeater setting: auto sync device clock after successful login" - }, - "@repeater_clockSyncAfterLoginSubtitle": { - "description": "Repeater setting subtitle: describes the clock sync after login behavior" - }, "repeater_clockSyncAfterLogin": "Synchronizacja zegara po zalogowaniu", "repeater_clockSyncAfterLoginSubtitle": "Automatycznie wysyłaj powiadomienie \"synchronizacja zegara\" po pomyślnym zalogowaniu.", "chat_sendMessage": "Wyślij wiadomość", diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 6b8abbbc..7efa6fbe 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_deleteContact": "Excluir Contato", "discoveredContacts_contactAdded": "Contato adicionado", "discoveredContacts_addContact": "Adicionar Contato", + "discoveredContacts_export": "Exportar contatos descobertos", + "discoveredContacts_import": "Importar contatos descobertos", + "discoveredContacts_exported": "Contatos descobertos exportados para {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Falha ao exportar contatos descobertos: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "{count} contatos descobertos importados.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Nenhum contato encontrado no arquivo de importação.", + "discoveredContacts_importFailed": "Falha ao importar contatos descobertos: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Quando a lista de contatos estiver cheia, o contato mais antigo não favoritado será substituído.", "common_deleteAll": "Excluir Tudo", "discoveredContacts_deleteContactAll": "Excluir Todos os Contatos Descobertos", diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index 5d5bcfc3..25b0d75f 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -1081,6 +1081,41 @@ "discoveredContacts_addContact": "Добавить контакт", "discoveredContacts_Title": "Обнаруженные контакты", "discoveredContacts_deleteContact": "Удалить контакт", + "discoveredContacts_export": "Экспортировать обнаруженные контакты", + "discoveredContacts_import": "Импортировать обнаруженные контакты", + "discoveredContacts_exported": "Обнаруженные контакты экспортированы в {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Не удалось экспортировать обнаруженные контакты: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Импортировано {count} обнаруженных контактов.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "В файле импорта не найдены контакты.", + "discoveredContacts_importFailed": "Не удалось импортировать обнаруженные контакты: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Когда список контактов заполнен, будет заменен самый старый контакт, который не находится в избранном.", "common_deleteAll": "Удалить все", "discoveredContacts_deleteContactAllContent": "Вы уверены, что хотите удалить все обнаруженные контакты?", @@ -1311,12 +1346,6 @@ "scanner_linuxPairingPinTitle": "PIN‑код сопряжения Bluetooth", "repeater_cliQuickDiscovery": "Обнаружить Соседей", "repeater_cliQuickClockSync": "Синхронизация часов", - "@repeater_clockSyncAfterLogin": { - "description": "Repeater setting: auto sync device clock after successful login" - }, - "@repeater_clockSyncAfterLoginSubtitle": { - "description": "Repeater setting subtitle: describes the clock sync after login behavior" - }, "repeater_clockSyncAfterLogin": "Синхронизация часов после входа в систему", "repeater_clockSyncAfterLoginSubtitle": "Автоматически отправлять сообщение \"синхронизация времени\" после успешной авторизации.", "chat_sendMessage": "Отправить сообщение", diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb index 713c3976..b050f9dd 100644 --- a/lib/l10n/app_sk.arb +++ b/lib/l10n/app_sk.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_Title": "Objavené kontakty", "contactsSettings_overwriteOldestTitle": "Prepísať najstaršie", "discoveredContacts_addContact": "Pridať kontakt", + "discoveredContacts_export": "Exportovať objavené kontakty", + "discoveredContacts_import": "Importovať objavené kontakty", + "discoveredContacts_exported": "Objavené kontakty boli exportované do {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Export objavených kontaktov zlyhal: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Bolo importovaných {count} objavených kontaktov.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "V importovanom súbore sa nenašli žiadne kontakty.", + "discoveredContacts_importFailed": "Import objavených kontaktov zlyhal: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Keď je zoznam kontaktov plný, bude nahradený najstarší neoznačený kontakt.", "discoveredContacts_deleteContactAll": "Zmazať všetky objavené kontakty", "common_deleteAll": "Zmazať všetko", diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb index 00930c85..b1031465 100644 --- a/lib/l10n/app_sl.arb +++ b/lib/l10n/app_sl.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_Title": "Odkriti stiki", "discoveredContacts_searchHint": "Najdeni stiki po iskanju", "discoveredContacts_deleteContact": "Izbriši stik", + "discoveredContacts_export": "Izvozi odkrite stike", + "discoveredContacts_import": "Uvozi odkrite stike", + "discoveredContacts_exported": "Odkriti stiki so izvoženi v {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Izvoz odkritih stikov ni uspel: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Uvoženih je bilo {count} odkritih stikov.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "V uvozni datoteki ni bilo najdenih stikov.", + "discoveredContacts_importFailed": "Uvoz odkritih stikov ni uspel: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Ko je seznam stikov poln, bo najstarejši nestarševski stik zamenjan.", "common_deleteAll": "Izbriši vse", "discoveredContacts_deleteContactAllContent": "Ste prepričani, da želite izbrisati vse odkrite kontakte?", diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index 00fd3b08..71254b2b 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -1912,6 +1912,41 @@ "discoveredContacts_contactAdded": "Kontakt tillagd", "discoveredContacts_addContact": "Lägg till kontakt", "discoveredContacts_copyContact": "Kopiera kontakt till urklipp", + "discoveredContacts_export": "Exportera upptäckta kontakter", + "discoveredContacts_import": "Importera upptäckta kontakter", + "discoveredContacts_exported": "Upptäckta kontakter exporterades till {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Det gick inte att exportera upptäckta kontakter: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Importerade {count} upptäckta kontakter.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "Inga kontakter hittades i importfilen.", + "discoveredContacts_importFailed": "Det gick inte att importera upptäckta kontakter: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "När kontaktlistan är full ersätts den äldsta icke-favoriterade kontakten.", "common_deleteAll": "Ta bort alla", "discoveredContacts_deleteContactAllContent": "Är du säker på att du vill ta bort alla upptäckta kontakter?", @@ -2143,12 +2178,6 @@ "scanner_linuxPairingHidePin": "Dölj PIN", "repeater_cliQuickDiscovery": "Upptäck grannar", "repeater_cliQuickClockSync": "Synkronisera klocka", - "@repeater_clockSyncAfterLogin": { - "description": "Repeater setting: auto sync device clock after successful login" - }, - "@repeater_clockSyncAfterLoginSubtitle": { - "description": "Repeater setting subtitle: describes the clock sync after login behavior" - }, "repeater_clockSyncAfterLoginSubtitle": "Automatiskt skicka \"klocksynkronisering\" efter en lyckad inloggning.", "repeater_clockSyncAfterLogin": "Synkronisera klockan efter inloggning", "repeater_guest": "Information om repetorer", diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 8330d364..106f2353 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -1922,6 +1922,41 @@ "discoveredContacts_deleteContact": "Видалити контакт", "discoveredContacts_copyContact": "Копіювати контакт у буфер обміну", "discoveredContacts_addContact": "Додати контакт", + "discoveredContacts_export": "Експортувати виявлені контакти", + "discoveredContacts_import": "Імпортувати виявлені контакти", + "discoveredContacts_exported": "Виявлені контакти експортовано до {path}.", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "Не вдалося експортувати виявлені контакти: {error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "Імпортовано {count} виявлених контактів.", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "У файлі імпорту не знайдено контактів.", + "discoveredContacts_importFailed": "Не вдалося імпортувати виявлені контакти: {error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "Коли список контактів заповнений, найстарший контакт без позначки улюбленого буде замінений.", "common_deleteAll": "Видалити все", "discoveredContacts_deleteContactAll": "Видалити всі виявлені контакти", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 1e289315..0cbb3f97 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -1917,6 +1917,41 @@ "discoveredContacts_noMatching": "没有匹配的联系人", "discoveredContacts_Title": "已发现的联系人", "discoveredContacts_copyContact": "复制联系人到剪贴板", + "discoveredContacts_export": "导出已发现的联系人", + "discoveredContacts_import": "导入已发现的联系人", + "discoveredContacts_exported": "已将已发现的联系人导出到{path}。", + "@discoveredContacts_exported": { + "placeholders": { + "path": { + "type": "String" + } + } + }, + "discoveredContacts_exportFailed": "导出已发现的联系人失败:{error}", + "@discoveredContacts_exportFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, + "discoveredContacts_imported": "已导入{count}个已发现的联系人。", + "@discoveredContacts_imported": { + "placeholders": { + "count": { + "type": "int" + } + } + }, + "discoveredContacts_importNoContacts": "在导入文件中未找到联系人。", + "discoveredContacts_importFailed": "导入已发现的联系人失败:{error}", + "@discoveredContacts_importFailed": { + "placeholders": { + "error": { + "type": "String" + } + } + }, "contactsSettings_overwriteOldestSubtitle": "当联系人列表已满时,将替换最老的非收藏联系人。", "common_deleteAll": "删除全部", "discoveredContacts_deleteContactAllContent": "您确定要删除所有发现的联系人吗?", diff --git a/lib/models/contact.dart b/lib/models/contact.dart index 01d10a9c..74f0cd31 100644 --- a/lib/models/contact.dart +++ b/lib/models/contact.dart @@ -19,7 +19,6 @@ class Contact { final DateTime lastMessageAt; final DateTime? lastModified; final bool isActive; - final bool wasPulled; final Uint8List? rawPacket; Contact({ @@ -37,7 +36,6 @@ class Contact { this.lastModified, DateTime? lastMessageAt, this.isActive = true, - this.wasPulled = false, this.rawPacket, }) : lastMessageAt = lastMessageAt ?? lastSeen; diff --git a/lib/screens/discovery_screen.dart b/lib/screens/discovery_screen.dart index f9f0e07e..5859f60f 100644 --- a/lib/screens/discovery_screen.dart +++ b/lib/screens/discovery_screen.dart @@ -1,8 +1,13 @@ import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; +import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:path_provider/path_provider.dart'; import 'package:provider/provider.dart'; +import 'package:share_plus/share_plus.dart'; import '../connector/meshcore_connector.dart'; import '../connector/meshcore_protocol.dart'; @@ -66,9 +71,44 @@ class _DiscoveryScreenState extends State { ), centerTitle: true, actions: [ - PopupMenuButton( - itemBuilder: (context) => [ - PopupMenuItem( + PopupMenuButton( + onSelected: (value) { + switch (value) { + case 'export': + unawaited(_exportDiscoveredContacts(context, connector)); + break; + case 'import': + unawaited(_importDiscoveredContacts(context, connector)); + break; + case 'delete_all': + _deleteContacts(context, connector); + break; + } + }, + itemBuilder: (context) => >[ + PopupMenuItem( + value: 'export', + child: Row( + children: [ + const Icon(Icons.upload_file), + const SizedBox(width: 8), + Text(l10n.discoveredContacts_export), + ], + ), + ), + PopupMenuItem( + value: 'import', + child: Row( + children: [ + const Icon(Icons.download), + const SizedBox(width: 8), + Text(l10n.discoveredContacts_import), + ], + ), + ), + const PopupMenuDivider(), + PopupMenuItem( + value: 'delete_all', child: Row( children: [ const Icon(Icons.delete, color: Colors.red), @@ -76,9 +116,6 @@ class _DiscoveryScreenState extends State { Text(context.l10n.discoveredContacts_deleteContactAll), ], ), - onTap: () { - _deleteContacts(context, connector); - }, ), ], icon: const Icon(Icons.more_vert), @@ -270,6 +307,144 @@ class _DiscoveryScreenState extends State { ); } + Future _exportDiscoveredContacts( + BuildContext context, + MeshCoreConnector connector, + ) async { + final l10n = context.l10n; + final messenger = ScaffoldMessenger.of(context); + final json = connector.exportDiscoveredContactsJson(); + + try { + const filename = 'meshcore_discovered_contacts.json'; + final bytes = Uint8List.fromList(utf8.encode(json)); + + if (PlatformInfo.isDesktop) { + final location = await getSaveLocation( + suggestedName: filename, + acceptedTypeGroups: [ + const XTypeGroup(label: 'JSON', extensions: ['json']), + ], + ); + if (!mounted) return; + if (location == null) return; + final exportFile = XFile.fromData( + bytes, + mimeType: 'application/json', + name: filename, + ); + await exportFile.saveTo(location.path); + if (!mounted) return; + messenger.showSnackBar( + SnackBar( + content: Text(l10n.discoveredContacts_exported(location.path)), + ), + ); + return; + } + + final tempDir = await getTemporaryDirectory(); + final exportPath = '${tempDir.path}/$filename'; + final exportFile = File(exportPath); + await exportFile.writeAsBytes(bytes, flush: true); + + try { + final result = await SharePlus.instance.share( + ShareParams(subject: filename, files: [XFile(exportPath)]), + ); + + if (!mounted) return; + if (result.status == ShareResultStatus.success) { + messenger.showSnackBar( + SnackBar(content: Text(l10n.discoveredContacts_exported(filename))), + ); + } + } finally { + if (await exportFile.exists()) { + await exportFile.delete(); + } + } + } catch (e) { + if (!mounted) return; + messenger.showSnackBar( + SnackBar( + content: Text(l10n.discoveredContacts_exportFailed(e.toString())), + ), + ); + } + } + + Future _importDiscoveredContacts( + BuildContext context, + MeshCoreConnector connector, + ) async { + final l10n = context.l10n; + final messenger = ScaffoldMessenger.of(context); + try { + final json = await _resolveImportJson(context); + if (json == null) { + // User cancelled the file picker — nothing to do. + return; + } + final foundCount = _countContactsInImportJson(json); + if (foundCount == 0) { + if (!mounted) return; + messenger.showSnackBar( + SnackBar(content: Text(l10n.discoveredContacts_importNoContacts)), + ); + return; + } + + final importedCount = await connector.importDiscoveredContactsJson(json); + if (!mounted) return; + messenger.showSnackBar( + SnackBar( + content: Text(l10n.discoveredContacts_imported(importedCount)), + ), + ); + } catch (e) { + if (!mounted) return; + messenger.showSnackBar( + SnackBar( + content: Text(l10n.discoveredContacts_importFailed(e.toString())), + ), + ); + } + } + + Future _resolveImportJson(BuildContext context) async { + final file = await openFile( + acceptedTypeGroups: [ + const XTypeGroup(label: 'JSON', extensions: ['json']), + ], + ); + if (file == null) return null; + final bytes = await file.readAsBytes(); + + if (bytes.isEmpty) return ''; + + // Try UTF-8 first (handles BOM automatically) + try { + final text = utf8.decode(bytes, allowMalformed: true); + // Remove BOM if present + return text.startsWith('\ufeff') ? text.substring(1) : text; + } catch (_) { + return ''; + } + } + + int _countContactsInImportJson(String json) { + try { + final decoded = jsonDecode(json); + if (decoded is List) { + return decoded.length; + } + return 0; + } catch (_) { + return 0; + } + } + Widget _buildFilters( List filteredAndSorted, MeshCoreConnector connector, diff --git a/lib/storage/contact_discovery_store.dart b/lib/storage/contact_discovery_store.dart index 3f6f1718..40b7ba90 100644 --- a/lib/storage/contact_discovery_store.dart +++ b/lib/storage/contact_discovery_store.dart @@ -28,6 +28,55 @@ class ContactDiscoveryStore { await prefs.setString(_keyPrefix, jsonEncode(jsonList)); } + String exportContactsJson(List contacts) { + final jsonList = contacts.map(_toJson).toList(); + return jsonEncode(jsonList); + } + + int importContactsJson({ + required String json, + required List existingContacts, + required Set knownContactKeys, + }) { + try { + final jsonList = jsonDecode(json) as List; + final importedContacts = jsonList + .map((entry) => _fromJson(entry as Map)) + .toList(); + + int newCount = 0; + + // Create a set of existing discovered contact keys for deduplication + final existingKeySet = {}; + for (final contact in existingContacts) { + existingKeySet.add(contact.publicKeyHex); + } + + // Process imported contacts + for (final imported in importedContacts) { + final keyHex = imported.publicKeyHex; + + // Skip if already in device's contact list + if (knownContactKeys.contains(keyHex)) { + continue; + } + + // Skip if already in discovered contacts (existing is always fresher) + if (existingKeySet.contains(keyHex)) { + continue; + } + + // Add as new discovered contact + existingContacts.add(imported); + newCount++; + } + + return newCount; + } catch (_) { + return 0; + } + } + Map _toJson(Contact contact) { return { 'publicKey': base64Encode(contact.publicKey), @@ -45,6 +94,7 @@ class ContactDiscoveryStore { 'lastSeen': contact.lastSeen.millisecondsSinceEpoch, 'lastModified': contact.lastModified?.millisecondsSinceEpoch, 'lastMessageAt': contact.lastMessageAt.millisecondsSinceEpoch, + 'isActive': contact.isActive, 'rawPacket': contact.rawPacket != null ? base64Encode(contact.rawPacket!) : null, diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index f6f23bfe..7299b5cf 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,9 +6,13 @@ #include "generated_plugin_registrant.h" +#include #include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 379e36fa..3893a6f8 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,11 +3,13 @@ # list(APPEND FLUTTER_PLUGIN_LIST + file_selector_linux url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST flserial + jni ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index ffc8c590..380c924f 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,6 +5,7 @@ import FlutterMacOS import Foundation +import file_selector_macos import flutter_blue_plus_darwin import flutter_local_notifications import mobile_scanner @@ -15,6 +16,7 @@ import sqflite_darwin import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FlutterBluePlusPlugin.register(with: registry.registrar(forPlugin: "FlutterBluePlusPlugin")) FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) diff --git a/pubspec.yaml b/pubspec.yaml index 7b43dded..8b7c0e71 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,6 +64,7 @@ dependencies: gpx: ^2.3.0 path_provider: ^2.1.5 share_plus: ^12.0.1 + file_selector: ^1.0.3 build_pipe: ^0.3.1 material_symbols_icons: ^4.2906.0 web: ^1.1.1 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index cd4fc19b..62722cb9 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,11 +6,14 @@ #include "generated_plugin_registrant.h" +#include #include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); FlutterBluePlusPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterBluePlusPlugin")); SharePlusWindowsPluginCApiRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index f02857f4..456b758e 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + file_selector_windows flutter_blue_plus_winrt share_plus url_launcher_windows @@ -11,6 +12,7 @@ list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_FFI_PLUGIN_LIST flserial flutter_local_notifications_windows + jni ) set(PLUGIN_BUNDLED_LIBRARIES) From 5c612b9a4668f5137d6e1a437c787bb6b20351ca Mon Sep 17 00:00:00 2001 From: ericz Date: Sat, 13 Jun 2026 13:22:15 +0200 Subject: [PATCH 2/4] fix onReorder deprication --- lib/screens/channels_screen.dart | 5 +---- lib/theme/mesh_theme.dart | 2 +- lib/widgets/path_editor_sheet.dart | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart index 6c227686..dce3dfc3 100644 --- a/lib/screens/channels_screen.dart +++ b/lib/screens/channels_screen.dart @@ -281,10 +281,7 @@ class _ChannelsScreenState extends State ), buildDefaultDragHandles: false, itemCount: filteredChannels.length, - onReorder: (oldIndex, newIndex) { - if (oldIndex < newIndex) { - newIndex -= 1; - } + onReorderItem: (oldIndex, newIndex) { final reordered = List.from( filteredChannels, ); diff --git a/lib/theme/mesh_theme.dart b/lib/theme/mesh_theme.dart index 39c8381f..883ea2a2 100644 --- a/lib/theme/mesh_theme.dart +++ b/lib/theme/mesh_theme.dart @@ -447,7 +447,7 @@ class MeshTheme { pageTransitionsTheme: const PageTransitionsTheme( builders: { TargetPlatform.android: FadeForwardsPageTransitionsBuilder(), - TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), + TargetPlatform.iOS: FadeForwardsPageTransitionsBuilder(), TargetPlatform.linux: FadeForwardsPageTransitionsBuilder(), TargetPlatform.macOS: FadeForwardsPageTransitionsBuilder(), TargetPlatform.windows: FadeForwardsPageTransitionsBuilder(), diff --git a/lib/widgets/path_editor_sheet.dart b/lib/widgets/path_editor_sheet.dart index 2eebc1bb..ee6ba006 100644 --- a/lib/widgets/path_editor_sheet.dart +++ b/lib/widgets/path_editor_sheet.dart @@ -142,9 +142,6 @@ class _PathEditorSheetState extends State { void _reorderHop(int oldIndex, int newIndex) { setState(() { - if (oldIndex < newIndex) { - newIndex -= 1; - } final hop = _hops.removeAt(oldIndex); _hops.insert(newIndex, hop); _syncHexFromHops(); @@ -287,7 +284,7 @@ class _PathEditorSheetState extends State { physics: const NeverScrollableScrollPhysics(), buildDefaultDragHandles: false, itemCount: _hops.length, - onReorder: _reorderHop, + onReorderItem: _reorderHop, itemBuilder: _hopTile, ), const Divider(), From 6cb8e07173b72a5dd8ee8b7106712e523c74fb7d Mon Sep 17 00:00:00 2001 From: ericz Date: Thu, 8 Oct 2026 21:33:42 +0200 Subject: [PATCH 3/4] add share location to InputBar popup. --- lib/l10n/app_de.arb | 1 + lib/l10n/app_en.arb | 1 + lib/l10n/app_localizations.dart | 6 ++ lib/l10n/app_localizations_bg.dart | 4 + lib/l10n/app_localizations_de.dart | 4 + lib/l10n/app_localizations_en.dart | 4 + lib/l10n/app_localizations_es.dart | 4 + lib/l10n/app_localizations_fr.dart | 4 + lib/l10n/app_localizations_hu.dart | 4 + lib/l10n/app_localizations_it.dart | 4 + lib/l10n/app_localizations_ja.dart | 4 + lib/l10n/app_localizations_ko.dart | 4 + lib/l10n/app_localizations_nl.dart | 4 + lib/l10n/app_localizations_pl.dart | 4 + lib/l10n/app_localizations_pt.dart | 4 + lib/l10n/app_localizations_ru.dart | 4 + lib/l10n/app_localizations_sk.dart | 4 + lib/l10n/app_localizations_sl.dart | 4 + lib/l10n/app_localizations_sv.dart | 4 + lib/l10n/app_localizations_uk.dart | 4 + lib/l10n/app_localizations_zh.dart | 4 + lib/screens/channel_chat_screen.dart | 123 ++++++++++++++++++++++- lib/screens/chat_screen.dart | 142 ++++++++++++++++++++++++++- lib/screens/map_screen.dart | 136 +++++++++++++++++++------ untranslated.json | 66 ++++++++++++- 25 files changed, 511 insertions(+), 36 deletions(-) diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index ff4527fc..ebd598dd 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -711,6 +711,7 @@ "map_shareMarkerHere": "Marker hier teilen", "map_pinLabel": "Pin-Beschriftung", "map_label": "Beschriftung", + "map_labelUpdateHint": "Wenn Sie denselben Namen verwenden wie zuvor, wird die Markierung bei MeshCore Open-Empfängern aktualisiert.", "map_pointOfInterest": "Punkt von Interesse", "map_sendToContact": "An Kontakt senden", "map_sendToChannel": "An Kanal senden", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 06ae5d01..144f0dbc 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1145,6 +1145,7 @@ "map_setAsMyLocation": "Set as my location", "map_pinLabel": "Pin label", "map_label": "Label", + "map_labelUpdateHint": "Using the same label as before will update the marker for MeshCore Open recipients.", "map_pointOfInterest": "Point of interest", "map_sendToContact": "Send to contact", "map_sendToChannel": "Send to channel", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index a1ccd08c..64f132e5 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -3916,6 +3916,12 @@ abstract class AppLocalizations { /// **'Label'** String get map_label; + /// No description provided for @map_labelUpdateHint. + /// + /// In en, this message translates to: + /// **'Using the same label as before will update the marker for MeshCore Open recipients.'** + String get map_labelUpdateHint; + /// No description provided for @map_pointOfInterest. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 8ddb847a..8df652af 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -2190,6 +2190,10 @@ class AppLocalizationsBg extends AppLocalizations { @override String get map_label => 'Етикет'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Точка на интерес'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 1fd2b632..9d8a363a 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -2187,6 +2187,10 @@ class AppLocalizationsDe extends AppLocalizations { @override String get map_label => 'Beschriftung'; + @override + String get map_labelUpdateHint => + 'Wenn Sie denselben Namen verwenden wie zuvor, wird die Markierung bei MeshCore Open-Empfängern aktualisiert.'; + @override String get map_pointOfInterest => 'Punkt von Interesse'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 4af5d2f0..8f139446 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -2154,6 +2154,10 @@ class AppLocalizationsEn extends AppLocalizations { @override String get map_label => 'Label'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Point of interest'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 58e63f45..5238e9b5 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -2182,6 +2182,10 @@ class AppLocalizationsEs extends AppLocalizations { @override String get map_label => 'Etiqueta'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Punto de interés'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index aa6a2822..e9eeaea5 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -2190,6 +2190,10 @@ class AppLocalizationsFr extends AppLocalizations { @override String get map_label => 'Étiquette'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Point d\'intérêt'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index 49d60c26..d4e2b92a 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -2179,6 +2179,10 @@ class AppLocalizationsHu extends AppLocalizations { @override String get map_label => 'Címke'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Érdekes pont'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index 7079893e..8695d351 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -2188,6 +2188,10 @@ class AppLocalizationsIt extends AppLocalizations { @override String get map_label => 'Etichetta'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Punto di interesse'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index 1a2b875e..8c982d52 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -2091,6 +2091,10 @@ class AppLocalizationsJa extends AppLocalizations { @override String get map_label => 'ラベル'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => '興味地点'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index 0842f889..04dc3b1f 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -2097,6 +2097,10 @@ class AppLocalizationsKo extends AppLocalizations { @override String get map_label => '레이블'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => '관심 지점'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index 92f2d27d..3391ab38 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -2173,6 +2173,10 @@ class AppLocalizationsNl extends AppLocalizations { @override String get map_label => 'Label'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Interessepunt'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index b5e95fc6..948cb829 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -2205,6 +2205,10 @@ class AppLocalizationsPl extends AppLocalizations { @override String get map_label => 'Etykieta'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Punkt zainteresowań'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index c0cb6931..7b931b7e 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -2186,6 +2186,10 @@ class AppLocalizationsPt extends AppLocalizations { @override String get map_label => 'Rótulo'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Ponto de interesse'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index f7ff950c..bba694bb 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -2191,6 +2191,10 @@ class AppLocalizationsRu extends AppLocalizations { @override String get map_label => 'Подпись'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Точка интереса'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index 9490e022..7077203d 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -2178,6 +2178,10 @@ class AppLocalizationsSk extends AppLocalizations { @override String get map_label => 'Značka'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Bod záujmu'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 52c311b5..8b8a370a 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -2172,6 +2172,10 @@ class AppLocalizationsSl extends AppLocalizations { @override String get map_label => 'Oznaka'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Točka zanimivosti'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index 84fcfeb9..54ed4112 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -2162,6 +2162,10 @@ class AppLocalizationsSv extends AppLocalizations { @override String get map_label => 'Etikett'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Plats av intresse'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index f8c56dec..1c5097ae 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -2181,6 +2181,10 @@ class AppLocalizationsUk extends AppLocalizations { @override String get map_label => 'Мітка'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => 'Точка інтересу'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 9276c9cc..d69e9382 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -2065,6 +2065,10 @@ class AppLocalizationsZh extends AppLocalizations { @override String get map_label => '标签'; + @override + String get map_labelUpdateHint => + 'Using the same label as before will update the marker for MeshCore Open recipients.'; + @override String get map_pointOfInterest => '兴趣点'; diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart index c3de648e..df85ec2b 100644 --- a/lib/screens/channel_chat_screen.dart +++ b/lib/screens/channel_chat_screen.dart @@ -38,6 +38,7 @@ import '../widgets/received_image_message.dart'; import '../widgets/byte_count_input.dart'; import '../widgets/chat_day_separator.dart'; import '../widgets/empty_state.dart'; + import '../widgets/chat_zoom_wrapper.dart'; import '../widgets/emoji_picker.dart'; import '../widgets/gif_message.dart'; @@ -2011,6 +2012,79 @@ class _ChannelChatScreenState extends State { } Widget _buildInputBar() { + Future promptForMarkerLabel( + BuildContext context, { + required double lat, + required double lon, + required String defaultLabel, + required String flags, + }) async { + final controller = TextEditingController(text: defaultLabel); + controller.selection = TextSelection( + baseOffset: 0, + extentOffset: controller.text.length, + ); + final focusNode = FocusNode(); + + final latStr = lat.toStringAsFixed(6); + final lonStr = lon.toStringAsFixed(6); + final prefix = 'm:$latStr,$lonStr|'; + final suffix = '|$flags'; + final overheadBytes = utf8.encode(prefix + suffix).length; + final maxForContact = maxContactMessageBytes(); + final maxForChannel = maxChannelMessageBytes(null); + final maxPayload = maxForContact < maxForChannel + ? maxForContact + : maxForChannel; + final allowedLabelBytes = (maxPayload - overheadBytes) > 0 + ? (maxPayload - overheadBytes) + : 0; + + try { + final result = await showDialog( + context: context, + builder: (dialogContext) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (dialogContext.mounted) { + focusNode.requestFocus(); + controller.selection = TextSelection( + baseOffset: 0, + extentOffset: controller.text.length, + ); + } + }); + return AlertDialog( + title: Text(dialogContext.l10n.map_pinLabel), + content: ByteCountedTextField( + focusNode: focusNode, + maxBytes: allowedLabelBytes, + controller: controller, + decoration: InputDecoration( + helperText: dialogContext.l10n.map_labelUpdateHint, + helperMaxLines: 3, + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext, null), + child: Text(dialogContext.l10n.common_cancel), + ), + FilledButton( + onPressed: () => + Navigator.pop(dialogContext, controller.text.trim()), + child: Text(dialogContext.l10n.common_share), + ), + ], + ); + }, + ); + return result; + } finally { + focusNode.dispose(); + controller.dispose(); + } + } + final connector = context.watch(); final maxBytes = maxChannelMessageBytes(connector.selfName); final settings = context.watch().settings; @@ -2044,9 +2118,9 @@ class _ChannelChatScreenState extends State { PopupMenuButton( icon: const Icon(Icons.add_circle_outline), position: PopupMenuPosition.over, - offset: Offset(0, showImageAction ? -112 : -64), + offset: Offset(0, showImageAction ? -220 : -160), tooltip: context.l10n.chat_selectSendAction, - onSelected: (action) { + onSelected: (action) async { switch (action) { case 'gif': _showGifPicker(context); @@ -2054,6 +2128,39 @@ class _ChannelChatScreenState extends State { case 'meshcore-image': _showImageSendPreview(); break; + case 'send-my-location': + final connector = context.read(); + if (connector.selfLatitude == null || + connector.selfLongitude == null) { + showDismissibleSnackBar( + context, + content: Text( + context.l10n.map_connectToShareMarkers, + ), + ); + break; + } + final lat = connector.selfLatitude!; + final lon = connector.selfLongitude!; + final initialLabel = + connector.selfName?.isNotEmpty == true + ? connector.selfName! + : context.l10n.map_sharedPin; + final label = await promptForMarkerLabel( + context, + lat: lat, + lon: lon, + defaultLabel: initialLabel, + flags: 'poi', + ); + if (label == null || label.trim().isEmpty) break; + final markerText = + 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; + connector.sendChannelMessage( + widget.channel, + markerText, + ); + break; } }, itemBuilder: (context) => [ @@ -2078,6 +2185,18 @@ class _ChannelChatScreenState extends State { ], ), ), + if (connector.selfLatitude != null && + connector.selfLongitude != null) + PopupMenuItem( + value: 'send-my-location', + child: Row( + children: [ + const Icon(Icons.my_location), + const SizedBox(width: 12), + Text(context.l10n.map_shareMarkerHere), + ], + ), + ), ], ), if (settings.translationEnabled) diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index 05c4e4e7..e5f28687 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -472,6 +472,79 @@ class _ChatScreenState extends State { } Widget _buildInputBar(MeshCoreConnector connector) { + Future promptForMarkerLabel( + BuildContext context, { + required double lat, + required double lon, + required String defaultLabel, + required String flags, + }) async { + final controller = TextEditingController(text: defaultLabel); + controller.selection = TextSelection( + baseOffset: 0, + extentOffset: controller.text.length, + ); + final focusNode = FocusNode(); + + final latStr = lat.toStringAsFixed(6); + final lonStr = lon.toStringAsFixed(6); + final prefix = 'm:$latStr,$lonStr|'; + final suffix = '|$flags'; + final overheadBytes = utf8.encode(prefix + suffix).length; + final maxForContact = maxContactMessageBytes(); + final maxForChannel = maxChannelMessageBytes(null); + final maxPayload = maxForContact < maxForChannel + ? maxForContact + : maxForChannel; + final allowedLabelBytes = (maxPayload - overheadBytes) > 0 + ? (maxPayload - overheadBytes) + : 0; + + try { + final result = await showDialog( + context: context, + builder: (dialogContext) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (dialogContext.mounted) { + focusNode.requestFocus(); + controller.selection = TextSelection( + baseOffset: 0, + extentOffset: controller.text.length, + ); + } + }); + return AlertDialog( + title: Text(dialogContext.l10n.map_pinLabel), + content: ByteCountedTextField( + focusNode: focusNode, + maxBytes: allowedLabelBytes, + controller: controller, + decoration: InputDecoration( + helperText: dialogContext.l10n.map_labelUpdateHint, + helperMaxLines: 3, + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext, null), + child: Text(dialogContext.l10n.common_cancel), + ), + FilledButton( + onPressed: () => + Navigator.pop(dialogContext, controller.text.trim()), + child: Text(dialogContext.l10n.common_share), + ), + ], + ); + }, + ); + return result; + } finally { + focusNode.dispose(); + controller.dispose(); + } + } + final maxBytes = maxContactMessageBytes(); final scheme = Theme.of(context).colorScheme; final settings = context.watch().settings; @@ -486,10 +559,71 @@ class _ChatScreenState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - IconButton( - icon: const Icon(Icons.gif_box_outlined), - tooltip: context.l10n.chat_sendGif, - onPressed: () => _showGifPicker(context), + PopupMenuButton( + icon: const Icon(Icons.add_circle_outline), + position: PopupMenuPosition.over, + offset: const Offset(0, -160), + tooltip: context.l10n.chat_selectSendAction, + onSelected: (action) async { + switch (action) { + case 'gif': + _showGifPicker(context); + break; + case 'send-my-location': + final connector = context.read(); + if (connector.selfLatitude == null || + connector.selfLongitude == null) { + showDismissibleSnackBar( + context, + content: Text(context.l10n.map_connectToShareMarkers), + ); + break; + } + final lat = connector.selfLatitude!; + final lon = connector.selfLongitude!; + final initialLabel = + connector.selfName?.isNotEmpty == true + ? connector.selfName! + : context.l10n.map_sharedPin; + final label = await promptForMarkerLabel( + context, + lat: lat, + lon: lon, + defaultLabel: initialLabel, + flags: 'poi', + ); + if (label == null || label.trim().isEmpty) break; + final markerText = + 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; + connector.sendMessage( + _resolveContact(connector), + markerText, + ); + break; + } + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: 'gif', + child: Row( + children: [ + const Icon(Icons.gif_box), + const SizedBox(width: 12), + Text(context.l10n.chat_sendGif), + ], + ), + ), + PopupMenuItem( + value: 'send-my-location', + child: Row( + children: [ + const Icon(Icons.my_location), + const SizedBox(width: 12), + Text(context.l10n.map_shareMarkerHere), + ], + ), + ), + ], ), if (settings.translationEnabled) MessageTranslationButton( diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart index aec3ba9e..ff4f381a 100644 --- a/lib/screens/map_screen.dart +++ b/lib/screens/map_screen.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:math'; +import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -36,6 +37,7 @@ import 'chat_screen.dart'; import 'contacts_screen.dart'; import '../theme/mesh_theme.dart'; import '../widgets/mesh_ui.dart'; +import '../widgets/byte_count_input.dart'; import '../widgets/repeater_login_dialog.dart'; import '../widgets/room_login_dialog.dart'; import '../helpers/guessed_location_estimator.dart'; @@ -3119,7 +3121,11 @@ class _MapScreenState extends State with DisconnectNavigationMixin { return; } - final label = await _promptForLabel(context, defaultLabel); + final initialLabel = + connector.selfName == null || connector.selfName!.isEmpty + ? defaultLabel + : connector.selfName!; + final label = await _promptForLabel(context, position, initialLabel, flags); if (label == null || !mounted) return; final markerText = _formatMarkerMessage(position, label, flags); @@ -3135,42 +3141,114 @@ class _MapScreenState extends State with DisconnectNavigationMixin { Future _promptForLabel( BuildContext context, + LatLng position, String defaultLabel, + String flags, ) async { final controller = TextEditingController(text: defaultLabel); controller.selection = TextSelection( baseOffset: 0, extentOffset: controller.text.length, ); - return showDialog( - context: context, - builder: (dialogContext) => AlertDialog( - title: Text(context.l10n.map_pinLabel), - content: TextField( - controller: controller, - decoration: InputDecoration( - hintText: context.l10n.map_label, - border: const OutlineInputBorder(), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.pop(dialogContext), - child: Text(context.l10n.common_cancel), - ), - TextButton( - onPressed: () { - final label = controller.text.trim().replaceAll('|', '/'); - Navigator.pop( - dialogContext, - label.isEmpty ? defaultLabel : label, + final focusNode = FocusNode(); + // Compute available bytes for the label taking marker overhead into + // account. Use a conservative limit based on both contact and channel + // message maxima. + final lat = position.latitude.toStringAsFixed(6); + final lon = position.longitude.toStringAsFixed(6); + final prefix = 'm:$lat,$lon|'; + final suffix = '|$flags'; + final overheadBytes = utf8.encode(prefix + suffix).length; + final maxForContact = maxContactMessageBytes(); + final maxForChannel = maxChannelMessageBytes(null); + final maxPayload = maxForContact < maxForChannel + ? maxForContact + : maxForChannel; + final allowedLabelBytes = (maxPayload - overheadBytes) > 0 + ? (maxPayload - overheadBytes) + : 0; + + try { + final result = await showDialog( + context: context, + builder: (dialogContext) { + final scheme = Theme.of(dialogContext).colorScheme; + // Request focus and ensure selection after the frame so the + // keyboard appears and text is selected for replacement. + WidgetsBinding.instance.addPostFrameCallback((_) { + if (dialogContext.mounted) { + focusNode.requestFocus(); + controller.selection = TextSelection( + baseOffset: 0, + extentOffset: controller.text.length, ); - }, - child: Text(context.l10n.common_continue), - ), - ], - ), - ); + } + }); + return AlertDialog( + title: Text(dialogContext.l10n.map_pinLabel), + content: ByteCountedTextField( + focusNode: focusNode, + maxBytes: allowedLabelBytes, + controller: controller, + decoration: InputDecoration( + hintText: dialogContext.l10n.map_label, + helperText: dialogContext.l10n.map_labelUpdateHint, + helperMaxLines: 3, + helperStyle: TextStyle( + color: _overlaySecondaryTextColor, + fontSize: 12, + ), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(MeshRadii.md), + borderSide: BorderSide(color: scheme.outlineVariant), + ), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(MeshRadii.md), + borderSide: BorderSide(color: scheme.outlineVariant), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(MeshRadii.md), + borderSide: BorderSide(color: scheme.primary, width: 1.5), + ), + filled: true, + fillColor: scheme.surfaceContainerLow, + contentPadding: const EdgeInsets.symmetric( + horizontal: 18, + vertical: 12, + ), + ), + onSubmitted: (_) { + final label = controller.text.trim().replaceAll('|', '/'); + Navigator.pop( + dialogContext, + label.isEmpty ? defaultLabel : label, + ); + }, + ), + actions: [ + TextButton( + onPressed: () => Navigator.pop(dialogContext), + child: Text(dialogContext.l10n.common_cancel), + ), + TextButton( + onPressed: () { + final label = controller.text.trim().replaceAll('|', '/'); + Navigator.pop( + dialogContext, + label.isEmpty ? defaultLabel : label, + ); + }, + child: Text(dialogContext.l10n.common_continue), + ), + ], + ); + }, + ); + return result; + } finally { + focusNode.dispose(); + controller.dispose(); + } } String _formatMarkerMessage(LatLng position, String label, String flags) { diff --git a/untranslated.json b/untranslated.json index 9e26dfee..beb95225 100644 --- a/untranslated.json +++ b/untranslated.json @@ -1 +1,65 @@ -{} \ No newline at end of file +{ + "bg": [ + "map_labelUpdateHint" + ], + + "es": [ + "map_labelUpdateHint" + ], + + "fr": [ + "map_labelUpdateHint" + ], + + "hu": [ + "map_labelUpdateHint" + ], + + "it": [ + "map_labelUpdateHint" + ], + + "ja": [ + "map_labelUpdateHint" + ], + + "ko": [ + "map_labelUpdateHint" + ], + + "nl": [ + "map_labelUpdateHint" + ], + + "pl": [ + "map_labelUpdateHint" + ], + + "pt": [ + "map_labelUpdateHint" + ], + + "ru": [ + "map_labelUpdateHint" + ], + + "sk": [ + "map_labelUpdateHint" + ], + + "sl": [ + "map_labelUpdateHint" + ], + + "sv": [ + "map_labelUpdateHint" + ], + + "uk": [ + "map_labelUpdateHint" + ], + + "zh": [ + "map_labelUpdateHint" + ] +} From 3cc0f48c731e15a349fa203864912927fa32c074 Mon Sep 17 00:00:00 2001 From: ericz Date: Thu, 8 Oct 2026 22:06:44 +0200 Subject: [PATCH 4/4] reworked popup for correct placement. --- lib/screens/channel_chat_screen.dart | 200 ++++++++++++++++----------- lib/screens/chat_screen.dart | 161 ++++++++++++--------- 2 files changed, 221 insertions(+), 140 deletions(-) diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart index df85ec2b..a3a8cf99 100644 --- a/lib/screens/channel_chat_screen.dart +++ b/lib/screens/channel_chat_screen.dart @@ -2115,89 +2115,135 @@ class _ChannelChatScreenState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - PopupMenuButton( - icon: const Icon(Icons.add_circle_outline), - position: PopupMenuPosition.over, - offset: Offset(0, showImageAction ? -220 : -160), - tooltip: context.l10n.chat_selectSendAction, - onSelected: (action) async { - switch (action) { - case 'gif': - _showGifPicker(context); - break; - case 'meshcore-image': - _showImageSendPreview(); - break; - case 'send-my-location': - final connector = context.read(); - if (connector.selfLatitude == null || - connector.selfLongitude == null) { - showDismissibleSnackBar( - context, - content: Text( - context.l10n.map_connectToShareMarkers, + Builder( + builder: (menuContext) { + return IconButton( + icon: const Icon(Icons.add_circle_outline), + tooltip: context.l10n.chat_selectSendAction, + onPressed: () async { + final RenderBox button = + menuContext.findRenderObject() as RenderBox; + final RenderBox overlay = + Overlay.of(menuContext).context.findRenderObject() + as RenderBox; + final Offset buttonOffset = button.localToGlobal( + Offset.zero, + ancestor: overlay, + ); + final items = >[ + PopupMenuItem( + value: 'gif', + child: Row( + children: [ + const Icon(Icons.gif_box), + const SizedBox(width: 12), + Text(context.l10n.chat_sendGif), + ], + ), + ), + ]; + if (showImageAction) { + items.add( + PopupMenuItem( + value: 'meshcore-image', + child: Row( + children: [ + const Icon(Icons.image_outlined), + const SizedBox(width: 12), + Text(context.l10n.chat_sendImageLora), + ], + ), ), ); - break; } - final lat = connector.selfLatitude!; - final lon = connector.selfLongitude!; - final initialLabel = - connector.selfName?.isNotEmpty == true - ? connector.selfName! - : context.l10n.map_sharedPin; - final label = await promptForMarkerLabel( - context, - lat: lat, - lon: lon, - defaultLabel: initialLabel, - flags: 'poi', + if (context.read().selfLatitude != + null && + context.read().selfLongitude != + null) { + items.add( + PopupMenuItem( + value: 'send-my-location', + child: Row( + children: [ + const Icon(Icons.my_location), + const SizedBox(width: 12), + Text(context.l10n.map_shareMarkerHere), + ], + ), + ), + ); + } + + final menuHeight = + items.length * kMinInteractiveDimension + 16; + final menuTop = (buttonOffset.dy - menuHeight).clamp( + 8.0, + overlay.size.height, ); - if (label == null || label.trim().isEmpty) break; - final markerText = - 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; - connector.sendChannelMessage( - widget.channel, - markerText, + final position = RelativeRect.fromLTRB( + buttonOffset.dx, + menuTop, + overlay.size.width - + buttonOffset.dx - + button.size.width, + overlay.size.height - buttonOffset.dy, ); - break; - } + + final selected = await showMenu( + context: menuContext, + position: position, + items: items, + ); + if (!mounted || !menuContext.mounted) return; + if (selected == null) return; + switch (selected) { + case 'gif': + _showGifPicker(context); + break; + case 'meshcore-image': + _showImageSendPreview(); + break; + case 'send-my-location': + final connector = context + .read(); + if (connector.selfLatitude == null || + connector.selfLongitude == null) { + showDismissibleSnackBar( + context, + content: Text( + context.l10n.map_connectToShareMarkers, + ), + ); + break; + } + final lat = connector.selfLatitude!; + final lon = connector.selfLongitude!; + final initialLabel = + connector.selfName?.isNotEmpty == true + ? connector.selfName! + : context.l10n.map_sharedPin; + final label = await promptForMarkerLabel( + context, + lat: lat, + lon: lon, + defaultLabel: initialLabel, + flags: 'poi', + ); + if (label == null || label.trim().isEmpty) break; + if (!mounted || !menuContext.mounted) break; + final connector2 = context + .read(); + final markerText = + 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; + connector2.sendChannelMessage( + widget.channel, + markerText, + ); + break; + } + }, + ); }, - itemBuilder: (context) => [ - PopupMenuItem( - value: 'gif', - child: Row( - children: [ - const Icon(Icons.gif_box), - const SizedBox(width: 12), - Text(context.l10n.chat_sendGif), - ], - ), - ), - if (showImageAction) - PopupMenuItem( - value: 'meshcore-image', - child: Row( - children: [ - const Icon(Icons.image_outlined), - const SizedBox(width: 12), - Text(context.l10n.chat_sendImageLora), - ], - ), - ), - if (connector.selfLatitude != null && - connector.selfLongitude != null) - PopupMenuItem( - value: 'send-my-location', - child: Row( - children: [ - const Icon(Icons.my_location), - const SizedBox(width: 12), - Text(context.l10n.map_shareMarkerHere), - ], - ), - ), - ], ), if (settings.translationEnabled) MessageTranslationButton( diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index e5f28687..4db6db3d 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -559,71 +559,106 @@ class _ChatScreenState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - PopupMenuButton( - icon: const Icon(Icons.add_circle_outline), - position: PopupMenuPosition.over, - offset: const Offset(0, -160), - tooltip: context.l10n.chat_selectSendAction, - onSelected: (action) async { - switch (action) { - case 'gif': - _showGifPicker(context); - break; - case 'send-my-location': - final connector = context.read(); - if (connector.selfLatitude == null || - connector.selfLongitude == null) { - showDismissibleSnackBar( - context, - content: Text(context.l10n.map_connectToShareMarkers), - ); - break; + Builder( + builder: (menuContext) { + return IconButton( + icon: const Icon(Icons.add_circle_outline), + tooltip: context.l10n.chat_selectSendAction, + onPressed: () async { + final RenderBox button = + menuContext.findRenderObject() as RenderBox; + final RenderBox overlay = + Overlay.of(menuContext).context.findRenderObject() + as RenderBox; + final Offset buttonOffset = button.localToGlobal( + Offset.zero, + ancestor: overlay, + ); + const menuHeight = 2 * kMinInteractiveDimension + 16; + final menuTop = (buttonOffset.dy - menuHeight).clamp( + 8.0, + overlay.size.height, + ); + final position = RelativeRect.fromLTRB( + buttonOffset.dx, + menuTop, + overlay.size.width - + buttonOffset.dx - + button.size.width, + overlay.size.height - buttonOffset.dy, + ); + + final selected = await showMenu( + context: menuContext, + position: position, + items: [ + PopupMenuItem( + value: 'gif', + child: Row( + children: [ + const Icon(Icons.gif_box), + const SizedBox(width: 12), + Text(context.l10n.chat_sendGif), + ], + ), + ), + PopupMenuItem( + value: 'send-my-location', + child: Row( + children: [ + const Icon(Icons.my_location), + const SizedBox(width: 12), + Text(context.l10n.map_shareMarkerHere), + ], + ), + ), + ], + ); + if (!mounted || !menuContext.mounted) return; + if (selected == null) return; + switch (selected) { + case 'gif': + _showGifPicker(context); + break; + case 'send-my-location': + final connector = context.read(); + if (connector.selfLatitude == null || + connector.selfLongitude == null) { + showDismissibleSnackBar( + context, + content: Text( + context.l10n.map_connectToShareMarkers, + ), + ); + break; + } + final lat = connector.selfLatitude!; + final lon = connector.selfLongitude!; + final initialLabel = + connector.selfName?.isNotEmpty == true + ? connector.selfName! + : context.l10n.map_sharedPin; + final label = await promptForMarkerLabel( + context, + lat: lat, + lon: lon, + defaultLabel: initialLabel, + flags: 'poi', + ); + if (label == null || label.trim().isEmpty) break; + if (!mounted || !menuContext.mounted) break; + final connector2 = context.read(); + final markerText = + 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; + connector2.sendMessage( + _resolveContact(connector2), + markerText, + ); + break; } - final lat = connector.selfLatitude!; - final lon = connector.selfLongitude!; - final initialLabel = - connector.selfName?.isNotEmpty == true - ? connector.selfName! - : context.l10n.map_sharedPin; - final label = await promptForMarkerLabel( - context, - lat: lat, - lon: lon, - defaultLabel: initialLabel, - flags: 'poi', - ); - if (label == null || label.trim().isEmpty) break; - final markerText = - 'm:${lat.toStringAsFixed(6)},${lon.toStringAsFixed(6)}|${label.trim()}|poi'; - connector.sendMessage( - _resolveContact(connector), - markerText, - ); - break; - } + }, + ); }, - itemBuilder: (context) => [ - PopupMenuItem( - value: 'gif', - child: Row( - children: [ - const Icon(Icons.gif_box), - const SizedBox(width: 12), - Text(context.l10n.chat_sendGif), - ], - ), - ), - PopupMenuItem( - value: 'send-my-location', - child: Row( - children: [ - const Icon(Icons.my_location), - const SizedBox(width: 12), - Text(context.l10n.map_shareMarkerHere), - ], - ), - ), - ], ), if (settings.translationEnabled) MessageTranslationButton(