From 6cb8e07173b72a5dd8ee8b7106712e523c74fb7d Mon Sep 17 00:00:00 2001 From: ericz Date: Thu, 8 Oct 2026 21:33:42 +0200 Subject: [PATCH] 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" + ] +}