Fix invalid simulator slice upload

Update Chinese translation

.github/workflows/build-artifacts.yml

@@ -12,7 +12,7 @@ permissions:
   id-token: write
 
 env:
-  FLUTTER_VERSION: "3.35.6"
+  FLUTTER_VERSION: "3.41.4"
   APP_NAME: meshcore-sar
   ANDROID_NDK_VERSION: "27.0.12077973"
 

.github/workflows/build-multiplatform.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-  FLUTTER_VERSION: '3.35.6'
+  FLUTTER_VERSION: '3.41.4'
 
 jobs:
   analyze:

ios/Podfile.lock

@@ -59,10 +59,6 @@ PODS:
     - Flutter
   - nsd_ios (0.0.1):
     - Flutter
-  - ObjectBox (4.4.1)
-  - objectbox_flutter_libs (0.0.1):
-    - Flutter
-    - ObjectBox (= 4.4.1)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -103,7 +99,6 @@ DEPENDENCIES:
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - nsd_ios (from `.symlinks/plugins/nsd_ios/ios`)
-  - objectbox_flutter_libs (from `.symlinks/plugins/objectbox_flutter_libs/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -118,7 +113,6 @@ SPEC REPOS:
   trunk:
     - DKImagePickerController
     - DKPhotoGallery
-    - ObjectBox
     - SDWebImage
     - SwiftyGif
 
@@ -149,8 +143,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   nsd_ios:
     :path: ".symlinks/plugins/nsd_ios/ios"
-  objectbox_flutter_libs:
-    :path: ".symlinks/plugins/objectbox_flutter_libs/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -182,12 +174,10 @@ SPEC CHECKSUMS:
   flutter_background_service_ios: 00d31bdff7b4bfe06d32375df358abe0329cf87e
   flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3
   flutter_compass: b236ab69b61545cce89fd58527f401a7587d5cc1
-  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
+  flutter_local_notifications: 643a3eda1ce1c0599413ca31672536d423dee214
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
   nsd_ios: 596ad79109ddd3e52d665f650f36428049e3653e
-  ObjectBox: 7da4aceb5013d041bfafdbc6d744a26918b09757
-  objectbox_flutter_libs: 09b1dec1b4cd27bf1a5f9bae7ccaa7e43588bf31
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -511,7 +511,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -530,7 +530,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -547,7 +547,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -679,7 +679,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -702,7 +702,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 98;
+				CURRENT_PROJECT_VERSION = 105;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -43,9 +43,11 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>98</string>
+	<string>105</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>MeshCore SAR needs Bluetooth to communicate with MeshCore devices for Search &amp; Rescue operations</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

ios/fastlane/report.xml

@@ -5,22 +5,24 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000209">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000243">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.489082">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.511584">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="115.233655">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="95.467725">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="296.0895">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="240.60994">
+        
+          <failure message="/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/actions/actions_helper.rb:67:in &apos;Fastlane::Actions.execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:255:in &apos;block in Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:229:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:229:in &apos;Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:157:in &apos;Fastlane::Runner#trigger_action_by_name&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/fast_file.rb:159:in &apos;Fastlane::FastFile#method_missing&apos;&#10;Fastfile:23:in &apos;block (2 levels) in Fastlane::FastFile#parsing_binding&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/lane.rb:41:in &apos;Fastlane::Lane#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:49:in &apos;block in Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:45:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/runner.rb:45:in &apos;Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/lane_manager.rb:46:in &apos;Fastlane::LaneManager.cruise_lane&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/command_line_handler.rb:34:in &apos;Fastlane::CommandLineHandler.handle&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/commands_generator.rb:110:in &apos;block (2 levels) in Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/commander-4.6.0/lib/commander/command.rb:187:in &apos;Commander::Command#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/commander-4.6.0/lib/commander/command.rb:157:in &apos;Commander::Command#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/commander-4.6.0/lib/commander/runner.rb:444:in &apos;Commander::Runner#run_active_command&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in &apos;Commander::Runner#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/commander-4.6.0/lib/commander/delegates.rb:18:in &apos;Commander::Delegates#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/commands_generator.rb:363:in &apos;Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/commands_generator.rb:43:in &apos;Fastlane::CommandsGenerator.start&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/fastlane/lib/fastlane/cli_tools_distributor.rb:132:in &apos;Fastlane::CLIToolsDistributor.take_off&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/gems/fastlane-2.231.1/bin/fastlane:23:in &apos;&lt;top (required)&gt;&apos;&#10;/opt/homebrew/Cellar/ruby/4.0.1/lib/ruby/4.0.0/rubygems.rb:303:in &apos;Kernel#load&apos;&#10;/opt/homebrew/Cellar/ruby/4.0.1/lib/ruby/4.0.0/rubygems.rb:303:in &apos;Gem.activate_and_load_bin_path&apos;&#10;/opt/homebrew/Cellar/fastlane/2.231.1/libexec/bin/fastlane:25:in &apos;&lt;main&gt;&apos;&#10;&#10;Error uploading ipa file: &#10; [Application Loader Error Output]: [ContentDelivery.Uploader.104B12FA0] 
 &#10;[Application Loader Error Output]: [altool.104B12FA0] Validation failed (409) Invalid executable. The “Runner.app/Frameworks/objective_c.framework/objective_c” executable references an unsupported platform in the arm64 slice. Since your app targets the iOS platform, it should only include executables that support the iOS platform. Simulator platforms aren’t permitted. (ID: 678497bb-0ad4-4cd7-b636-f9aef1caa269)
 " />
         

lib/l10n/app_localizations.dart

@@ -12,6 +12,7 @@ import 'app_localizations_es.dart';
 import 'app_localizations_fr.dart';
 import 'app_localizations_hr.dart';
 import 'app_localizations_it.dart';
+import 'app_localizations_ru.dart';
 import 'app_localizations_sl.dart';
 import 'app_localizations_zh.dart';
 
@@ -108,6 +109,7 @@ abstract class AppLocalizations {
     Locale('fr'),
     Locale('hr'),
     Locale('it'),
+    Locale('ru'),
     Locale('sl'),
     Locale('zh'),
   ];
@@ -4226,6 +4228,7 @@ class _AppLocalizationsDelegate
     'fr',
     'hr',
     'it',
+    'ru',
     'sl',
     'zh',
   ].contains(locale.languageCode);
@@ -4251,6 +4254,8 @@ AppLocalizations lookupAppLocalizations(Locale locale) {
       return AppLocalizationsHr();
     case 'it':
       return AppLocalizationsIt();
+    case 'ru':
+      return AppLocalizationsRu();
     case 'sl':
       return AppLocalizationsSl();
     case 'zh':

lib/l10n/app_ru.arb

@@ -0,0 +1,685 @@
+{
+  "@@locale": "ru",
+
+  "appTitle": "MeshCore SAR",
+  "messages": "Сообщения",
+  "contacts": "Контакты",
+  "map": "Карта",
+  "settings": "Настройки",
+  "connect": "Подключить",
+  "disconnect": "Отключить",
+  "scanningForDevices": "Поиск устройств...",
+  "noDevicesFound": "Устройства не найдены",
+  "scanAgain": "Повторить поиск",
+  "tapToConnect": "Нажмите для подключения",
+  "deviceNotConnected": "Устройство не подключено",
+  "locationPermissionDenied": "Доступ к геолокации запрещён",
+  "locationPermissionPermanentlyDenied": "Доступ к геолокации запрещён навсегда. Включите его в настройках.",
+  "locationPermissionRequired": "Доступ к геолокации необходим для GPS-трекинга и координации команды. Вы можете включить его позже в настройках.",
+  "locationServicesDisabled": "Службы геолокации отключены. Пожалуйста, включите их в настройках.",
+  "failedToGetGpsLocation": "Не удалось получить GPS-координаты",
+  "advertisedAtLocation": "Транслируется в {latitude}, {longitude}",
+  "failedToAdvertise": "Ошибка трансляции: {error}",
+  "reconnecting": "Переподключение... ({attempt}/{max})",
+  "cancelReconnection": "Отменить переподключение",
+  "mapManagement": "Управление картой",
+  "general": "Основные",
+  "theme": "Тема",
+  "chooseTheme": "Выбрать тему",
+  "light": "Светлая",
+  "dark": "Тёмная",
+  "blueLightTheme": "Синяя светлая тема",
+  "blueDarkTheme": "Синяя тёмная тема",
+  "sarRed": "SAR Красная",
+  "alertEmergencyMode": "Режим тревоги / ЧС",
+  "sarGreen": "SAR Зелёная",
+  "safeAllClearMode": "Режим «Всё в порядке»",
+  "autoSystem": "Авто (Система)",
+  "followSystemTheme": "Следовать системной теме",
+  "showRxTxIndicators": "Показывать индикаторы RX/TX",
+  "displayPacketActivity": "Отображать активность пакетов в верхней панели",
+  "simpleMode": "Простой режим",
+  "simpleModeDescription": "Скрыть второстепенную информацию в сообщениях и контактах",
+  "disableMap": "Отключить карту",
+  "disableMapDescription": "Скрыть вкладку карты для экономии заряда батареи",
+  "language": "Язык",
+  "chooseLanguage": "Выбрать язык",
+  "english": "Английский",
+  "slovenian": "Словенский",
+  "croatian": "Хорватский",
+  "german": "Немецкий",
+  "spanish": "Испанский",
+  "french": "Французский",
+  "italian": "Итальянский",
+  "russian": "Русский",
+  "locationBroadcasting": "Трансляция местоположения",
+  "autoLocationTracking": "Авто-отслеживание геолокации",
+  "automaticallyBroadcastPosition": "Автоматически транслировать обновления позиции",
+  "configureTracking": "Настроить отслеживание",
+  "distanceAndTimeThresholds": "Пороги расстояния и времени",
+  "locationTrackingConfiguration": "Настройка отслеживания геолокации",
+  "configureWhenLocationBroadcasts": "Настройте условия отправки обновлений геолокации в mesh-сеть",
+  "minimumDistance": "Минимальное расстояние",
+  "broadcastAfterMoving": "Транслировать только после перемещения на {distance} м",
+  "maximumDistance": "Максимальное расстояние",
+  "alwaysBroadcastAfterMoving": "Всегда транслировать после перемещения на {distance} м",
+  "minimumTimeInterval": "Минимальный интервал времени",
+  "alwaysBroadcastEvery": "Всегда транслировать каждые {duration}",
+  "save": "Сохранить",
+  "cancel": "Отмена",
+  "close": "Закрыть",
+  "about": "О приложении",
+  "appVersion": "Версия приложения",
+  "appName": "Название приложения",
+  "aboutMeshCoreSar": "О MeshCore SAR",
+  "aboutDescription": "Приложение для поисково-спасательных операций, разработанное для аварийно-спасательных служб. Возможности:\n\n• BLE mesh-сеть для связи между устройствами\n• Офлайн-карты с несколькими вариантами слоёв\n• Отслеживание членов команды в реальном времени\n• Тактические маркеры SAR (найденный человек, пожар, место сбора)\n• Управление контактами и обмен сообщениями\n• GPS-трекинг с показанием курса компаса\n• Кэширование тайлов карт для работы офлайн",
+  "technologiesUsed": "Используемые технологии:",
+  "technologiesList": "• Flutter для кросс-платформенной разработки\n• BLE (Bluetooth Low Energy) для mesh-сети\n• OpenStreetMap для карт\n• Provider для управления состоянием\n• SharedPreferences для локального хранилища",
+  "moreInfo": "Подробнее",
+  "learnMoreAbout": "Узнать больше о MeshCore SAR",
+  "developer": "Разработчик",
+  "packageName": "Имя пакета",
+  "sampleData": "Тестовые данные",
+  "sampleDataDescription": "Загрузить или очистить тестовые контакты, сообщения каналов и маркеры SAR",
+  "loadSampleData": "Загрузить тестовые данные",
+  "clearAllData": "Очистить все данные",
+  "clearAllDataConfirmTitle": "Очистить все данные",
+  "clearAllDataConfirmMessage": "Это удалит все контакты и маркеры SAR. Вы уверены?",
+  "clear": "Очистить",
+  "loadedSampleData": "Загружено: {teamCount} членов команды, {channelCount} каналов, {sarCount} маркеров SAR, {messageCount} сообщений",
+  "failedToLoadSampleData": "Не удалось загрузить тестовые данные: {error}",
+  "allDataCleared": "Все данные очищены",
+  "failedToStartBackgroundTracking": "Не удалось запустить фоновое отслеживание. Проверьте разрешения и BLE-соединение.",
+  "locationBroadcast": "Трансляция геолокации: {latitude}, {longitude}",
+  "defaultPinInfo": "PIN-код по умолчанию для устройств без экрана — 123456. Проблемы с сопряжением? Удалите устройство из Bluetooth в системных настройках.",
+  "noMessagesYet": "Сообщений пока нет",
+  "pullDownToSync": "Потяните вниз для синхронизации сообщений",
+  "deleteContact": "Удалить контакт",
+  "delete": "Удалить",
+  "viewOnMap": "Показать на карте",
+  "refresh": "Обновить",
+  "sendDirectMessage": "Отправить",
+  "resetPath": "Сбросить маршрут (перепроложить)",
+  "publicKeyCopied": "Публичный ключ скопирован в буфер обмена",
+  "copiedToClipboard": "{label} скопировано в буфер обмена",
+  "pleaseEnterPassword": "Пожалуйста, введите пароль",
+  "failedToSyncContacts": "Не удалось синхронизировать контакты: {error}",
+  "loggedInSuccessfully": "Вход выполнен! Ожидание сообщений комнаты...",
+  "loginFailed": "Ошибка входа — неверный пароль",
+  "loggingIn": "Вход в {roomName}...",
+  "failedToSendLogin": "Не удалось отправить данные входа: {error}",
+  "lowLocationAccuracy": "Низкая точность геолокации",
+  "continue_": "Продолжить",
+  "sendSarMarker": "Отправить маркер SAR",
+  "deleteDrawing": "Удалить рисунок",
+  "drawingTools": "Инструменты рисования",
+  "drawLine": "Нарисовать линию",
+  "drawLineDesc": "Нарисуйте произвольную линию на карте",
+  "drawRectangle": "Нарисовать прямоугольник",
+  "drawRectangleDesc": "Нарисуйте прямоугольную область на карте",
+  "measureDistance": "Измерить расстояние",
+  "measureDistanceDesc": "Долгое нажатие на две точки для измерения",
+  "clearMeasurement": "Сбросить измерение",
+  "distanceLabel": "Расстояние: {distance}",
+  "longPressForSecondPoint": "Долгое нажатие для второй точки",
+  "longPressToStartMeasurement": "Долгое нажатие для установки первой точки",
+  "longPressToStartNewMeasurement": "Долгое нажатие для начала нового измерения",
+  "shareDrawings": "Поделиться рисунками",
+  "clearAllDrawings": "Удалить все рисунки",
+  "completeLine": "Завершить линию",
+  "broadcastDrawingsToTeam": "Транслировать {count} рисун{plural} команде",
+  "removeAllDrawings": "Удалить все {count} рисун{plural}",
+  "deleteAllDrawingsConfirm": "Удалить все {count} рисун{plural} с карты?",
+  "drawing": "Рисунок",
+  "shareDrawingsCount": "Поделиться {count} рисун{plural}",
+  "sentDrawingsToRoom": "Отправлено {count} рисун{plural} в {roomName}",
+  "sharedDrawingsToRoom": "Передано {success}/{total} рисун{plural} в {roomName}",
+  "showReceivedDrawings": "Показать полученные рисунки",
+  "showingAllDrawings": "Показаны все рисунки",
+  "showingOnlyYourDrawings": "Показаны только ваши рисунки",
+  "showSarMarkers": "Показать маркеры SAR",
+  "showingSarMarkers": "Маркеры SAR отображаются",
+  "hidingSarMarkers": "Маркеры SAR скрыты",
+  "clearAll": "Очистить всё",
+  "noLocalDrawings": "Нет локальных рисунков для отправки",
+  "publicChannel": "Публичный канал",
+  "broadcastToAll": "Трансляция всем ближайшим узлам (временно)",
+  "storedPermanently": "Сохранено постоянно в комнате",
+  "drawingsSentToPublicChannel": "Отправлено {count} рисун{plural} в публичный канал",
+  "drawingsSharedToPublicChannel": "Передано {success}/{total} рисунков в публичный канал",
+  "notConnectedToDevice": "Устройство не подключено",
+  "directMessage": "Личное сообщение",
+  "directMessageSentTo": "Личное сообщение отправлено {contactName}",
+  "failedToSend": "Не удалось отправить: {error}",
+  "directMessageInfo": "Это сообщение будет отправлено напрямую {contactName}. Оно также появится в общей ленте сообщений.",
+  "typeYourMessage": "Введите сообщение...",
+  "quickLocationMarker": "Быстрый маркер местоположения",
+  "markerType": "Тип маркера",
+  "sendTo": "Отправить в",
+  "noDestinationsAvailable": "Нет доступных получателей.",
+  "selectDestination": "Выберите получателя...",
+  "ephemeralBroadcastInfo": "Временно: передаётся по эфиру. Не сохраняется — узлы должны быть онлайн.",
+  "persistentRoomInfo": "Постоянно: хранится неизменно в комнате. Синхронизируется автоматически и доступно офлайн.",
+  "location": "Местоположение",
+  "myLocation": "Моё местоположение",
+  "fromMap": "С карты",
+  "gettingLocation": "Получение местоположения...",
+  "locationError": "Ошибка геолокации",
+  "retry": "Повторить",
+  "refreshLocation": "Обновить местоположение",
+  "accuracyMeters": "Точность: ±{accuracy}м",
+  "notesOptional": "Заметки (необязательно)",
+  "addAdditionalInformation": "Добавьте дополнительную информацию...",
+  "lowAccuracyWarning": "Точность геолокации: ±{accuracy}м. Этого может быть недостаточно для операций SAR.\n\nПродолжить всё равно?",
+  "loginToRoom": "Войти в комнату",
+  "enterPasswordInfo": "Введите пароль для доступа к этой комнате. Пароль будет сохранён для дальнейшего использования.",
+  "password": "Пароль",
+  "enterRoomPassword": "Введите пароль комнаты",
+  "loggingInDots": "Вход...",
+  "login": "Войти",
+  "failedToAddRoom": "Не удалось добавить комнату на устройство: {error}\n\nВозможно, комната ещё не объявила себя.\nПопробуйте подождать, пока комната не выйдет на связь.",
+  "direct": "Напрямую",
+  "flood": "Широковещательно",
+  "admin": "Администратор",
+  "loggedIn": "Вход выполнен",
+  "noGpsData": "Нет данных GPS",
+  "distance": "Расстояние",
+  "pingingDirect": "Пинг {name} (напрямую по маршруту)...",
+  "pingingFlood": "Пинг {name} (широковещательно — нет маршрута)...",
+  "directPingTimeout": "Таймаут прямого пинга — повтор {name} широковещательно...",
+  "pingSuccessful": "Пинг успешен: {name}{fallback}",
+  "viaFloodingFallback": " (через широковещательный резерв)",
+  "pingFailed": "Пинг не удался: {name} — ответ не получен",
+  "deleteContactConfirmation": "Вы уверены, что хотите удалить \"{name}\"?\n\nЭто удалит контакт как из приложения, так и с сопряжённого радиоустройства.",
+  "removingContact": "Удаление {name}...",
+  "contactRemoved": "Контакт \"{name}\" удалён",
+  "failedToRemoveContact": "Не удалось удалить контакт: {error}",
+  "type": "Тип",
+  "publicKey": "Публичный ключ",
+  "lastSeen": "Последнее появление",
+  "roomStatus": "Статус комнаты",
+  "loginStatus": "Статус входа",
+  "notLoggedIn": "Не выполнен вход",
+  "adminAccess": "Доступ администратора",
+  "yes": "Да",
+  "no": "Нет",
+  "permissions": "Разрешения",
+  "passwordSaved": "Пароль сохранён",
+  "locationColon": "Местоположение:",
+  "telemetry": "Телеметрия",
+  "requestingTelemetry": "Запрос телеметрии от {name}...",
+  "voltage": "Напряжение",
+  "battery": "Батарея",
+  "temperature": "Температура",
+  "humidity": "Влажность",
+  "pressure": "Давление",
+  "gpsTelemetry": "GPS (телеметрия)",
+  "updated": "Обновлено",
+  "pathResetInfo": "Маршрут сброшен для {name}. Следующее сообщение найдёт новый путь.",
+  "reLoginToRoom": "Войти в комнату повторно",
+  "heading": "Курс",
+  "elevation": "Высота",
+  "accuracy": "Точность",
+  "bearing": "Азимут",
+  "direction": "Направление",
+  "filterMarkers": "Фильтр маркеров",
+  "filterMarkersTooltip": "Фильтровать маркеры",
+  "contactsFilter": "Контакты",
+  "repeatersFilter": "Ретрансляторы",
+  "sarMarkers": "Маркеры SAR",
+  "foundPerson": "Найденный человек",
+  "fire": "Пожар",
+  "stagingArea": "Место сбора",
+  "showAll": "Показать все",
+  "nearbyContacts": "Ближайшие контакты",
+  "locationUnavailable": "Местоположение недоступно",
+  "ahead": "впереди",
+  "degreesRight": "{degrees}° вправо",
+  "degreesLeft": "{degrees}° влево",
+  "latLonFormat": "Ш: {latitude} Д: {longitude}",
+  "noContactsYet": "Контактов пока нет",
+  "connectToDeviceToLoadContacts": "Подключите устройство для загрузки контактов",
+  "teamMembers": "Члены команды",
+  "repeaters": "Ретрансляторы",
+  "rooms": "Комнаты",
+  "channels": "Каналы",
+  "cacheStatistics": "Статистика кэша",
+  "totalTiles": "Всего тайлов",
+  "cacheSize": "Размер кэша",
+  "storeName": "Имя хранилища",
+  "noCacheStatistics": "Статистика кэша недоступна",
+  "downloadRegion": "Скачать регион",
+  "mapLayer": "Слой карты",
+  "regionBounds": "Границы региона",
+  "north": "Север",
+  "south": "Юг",
+  "east": "Восток",
+  "west": "Запад",
+  "zoomLevels": "Уровни масштаба",
+  "minZoom": "Мин: {zoom}",
+  "maxZoom": "Макс: {zoom}",
+  "downloadingDots": "Загрузка...",
+  "cancelDownload": "Отменить загрузку",
+  "downloadRegionButton": "Скачать регион",
+  "downloadNote": "Внимание: большие регионы или высокие уровни масштаба могут потребовать значительного времени и места.",
+  "cacheManagement": "Управление кэшем",
+  "clearAllMaps": "Очистить все карты",
+  "clearMapsConfirmTitle": "Очистить все карты",
+  "clearMapsConfirmMessage": "Вы уверены, что хотите удалить все загруженные карты? Это действие нельзя отменить.",
+  "mapDownloadCompleted": "Загрузка карты завершена!",
+  "cacheClearedSuccessfully": "Кэш успешно очищен!",
+  "downloadCancelled": "Загрузка отменена",
+  "startingDownload": "Начало загрузки...",
+  "downloadingMapTiles": "Загрузка тайлов карты...",
+  "downloadCompletedSuccessfully": "Загрузка успешно завершена!",
+  "cancellingDownload": "Отмена загрузки...",
+  "errorLoadingStats": "Ошибка загрузки статистики: {error}",
+  "downloadFailed": "Ошибка загрузки: {error}",
+  "cancelFailed": "Ошибка отмены: {error}",
+  "clearCacheFailed": "Ошибка очистки кэша: {error}",
+  "minZoomError": "Мин. масштаб: {error}",
+  "maxZoomError": "Макс. масштаб: {error}",
+  "minZoomGreaterThanMax": "Минимальный масштаб должен быть меньше или равен максимальному",
+  "selectMapLayer": "Выбрать слой карты",
+  "mapOptions": "Параметры карты",
+  "showLegend": "Показать легенду",
+  "displayMarkerTypeCounts": "Отображать счётчики типов маркеров",
+  "rotateMapWithHeading": "Поворачивать карту по курсу",
+  "mapFollowsDirection": "Карта следует вашему направлению движения",
+  "resetMapRotation": "Сбросить поворот",
+  "resetMapRotationTooltip": "Вернуть карту на север",
+  "showMapDebugInfo": "Показать отладочную информацию карты",
+  "displayZoomLevelBounds": "Отображать уровень масштаба и границы",
+  "fullscreenMode": "Полноэкранный режим",
+  "hideUiFullMapView": "Скрыть все элементы интерфейса для полного вида карты",
+  "openStreetMap": "OpenStreetMap",
+  "openTopoMap": "OpenTopoMap",
+  "esriSatellite": "ESRI Спутник",
+  "googleHybrid": "Google Гибрид",
+  "googleRoadmap": "Google Дороги",
+  "googleTerrain": "Google Рельеф",
+  "downloadVisibleArea": "Скачать видимую область",
+  "initializingMap": "Инициализация карты...",
+  "dragToPosition": "Перетащите для позиционирования",
+  "createSarMarker": "Создать маркер SAR",
+  "compass": "Компас",
+  "navigationAndContacts": "Навигация и контакты",
+  "sarAlert": "ТРЕВОГА SAR",
+  "messageSentToPublicChannel": "Сообщение отправлено в публичный канал",
+  "pleaseSelectRoomToSendSar": "Пожалуйста, выберите комнату для отправки маркера SAR",
+  "failedToSendSarMarker": "Не удалось отправить маркер SAR: {error}",
+  "sarMarkerSentTo": "Маркер SAR отправлен в {roomName}",
+  "notConnectedCannotSync": "Нет подключения — синхронизация невозможна",
+  "syncedMessageCount": "Синхронизировано {count} сообщение(й)",
+  "noNewMessages": "Новых сообщений нет",
+  "syncFailed": "Синхронизация не удалась: {error}",
+  "failedToResendMessage": "Не удалось повторно отправить сообщение",
+  "retryingMessage": "Повторная отправка сообщения...",
+  "retryFailed": "Повтор не удался: {error}",
+  "textCopiedToClipboard": "Текст скопирован в буфер обмена",
+  "cannotReplySenderMissing": "Не удаётся ответить: нет информации об отправителе",
+  "cannotReplyContactNotFound": "Не удаётся ответить: контакт не найден",
+  "messageDeleted": "Сообщение удалено",
+  "copyText": "Копировать текст",
+  "saveAsTemplate": "Сохранить как шаблон",
+  "templateSaved": "Шаблон успешно сохранён",
+  "templateAlreadyExists": "Шаблон с таким эмодзи уже существует",
+  "deleteMessage": "Удалить сообщение",
+  "deleteMessageConfirmation": "Вы уверены, что хотите удалить это сообщение?",
+  "shareLocation": "Поделиться местоположением",
+  "shareLocationText": "{markerInfo}\n\nКоординаты: {lat}, {lon}\n\nGoogle Maps: {url}",
+  "sarLocationShare": "Местоположение SAR",
+  "locationShared": "Местоположение передано",
+  "refreshedContacts": "Контакты обновлены",
+  "justNow": "Только что",
+  "minutesAgo": "{minutes}м назад",
+  "hoursAgo": "{hours}ч назад",
+  "daysAgo": "{days}д назад",
+  "secondsAgo": "{seconds}с назад",
+  "sending": "Отправка...",
+  "sent": "Отправлено",
+  "delivered": "Доставлено",
+  "deliveredWithTime": "Доставлено ({time}мс)",
+  "failed": "Ошибка",
+  "broadcast": "Трансляция",
+  "deliveredToContacts": "Доставлено {delivered}/{total} контактам",
+  "allDelivered": "Все доставлено",
+  "recipientDetails": "Детали получателей",
+  "pending": "Ожидание",
+  "sarMarkerFoundPerson": "Найденный человек",
+  "sarMarkerFire": "Место пожара",
+  "sarMarkerStagingArea": "Место сбора",
+  "sarMarkerObject": "Найденный объект",
+  "from": "От",
+  "coordinates": "Координаты",
+  "tapToViewOnMap": "Нажмите, чтобы открыть на карте",
+  "radioSettings": "Настройки радио",
+  "frequencyMHz": "Частота (МГц)",
+  "frequencyExample": "например, 869.618",
+  "bandwidth": "Полоса пропускания",
+  "spreadingFactor": "Коэффициент расширения",
+  "codingRate": "Скорость кодирования",
+  "txPowerDbm": "Мощность TX (дБм)",
+  "maxPowerDbm": "Макс: {power} дБм",
+  "you": "Вы",
+  "offlineVectorMaps": "Офлайн-векторные карты",
+  "offlineVectorMapsDescription": "Импортируйте офлайн-векторные тайлы карт (формат MBTiles) для использования без интернета",
+  "importMbtiles": "Импортировать файл MBTiles",
+  "importMbtilesNote": "Поддерживаются файлы MBTiles с векторными тайлами (формат PBF/MVT). Отлично подходят выгрузки Geofabrik!",
+  "noMbtilesFiles": "Офлайн-векторные карты не найдены",
+  "mbtilesImportedSuccessfully": "Файл MBTiles успешно импортирован",
+  "failedToImportMbtiles": "Не удалось импортировать файл MBTiles",
+  "deleteMbtilesConfirmTitle": "Удалить офлайн-карту",
+  "deleteMbtilesConfirmMessage": "Вы уверены, что хотите удалить \"{name}\"? Офлайн-карта будет удалена безвозвратно.",
+  "mbtilesDeletedSuccessfully": "Офлайн-карта успешно удалена",
+  "failedToDeleteMbtiles": "Не удалось удалить офлайн-карту",
+  "importExportCachedTiles": "Импорт/Экспорт кэшированных тайлов",
+  "importExportDescription": "Резервное копирование, обмен и восстановление загруженных тайлов карт между устройствами",
+  "exportTilesToFile": "Экспортировать тайлы в файл",
+  "importTilesFromFile": "Импортировать тайлы из файла",
+  "selectExportLocation": "Выберите место для экспорта",
+  "selectImportFile": "Выберите архив тайлов",
+  "exportingTiles": "Экспорт тайлов...",
+  "importingTiles": "Импорт тайлов...",
+  "exportSuccess": "Экспортировано {count} тайлов",
+  "importSuccess": "Импортировано {count} хранилищ",
+  "exportFailed": "Ошибка экспорта: {error}",
+  "importFailed": "Ошибка импорта: {error}",
+  "exportNote": "Создаёт сжатый архив (.fmtc), которым можно поделиться и импортировать на других устройствах.",
+  "importNote": "Импортирует тайлы карт из ранее экспортированного архива. Тайлы будут объединены с существующим кэшем.",
+  "noTilesToExport": "Нет доступных тайлов для экспорта",
+  "archiveContainsStores": "Архив содержит {count} хранилищ",
+  "vectorTiles": "Векторные тайлы",
+  "schema": "Схема",
+  "unknown": "Неизвестно",
+  "bounds": "Границы",
+  "onlineLayers": "Онлайн-слои",
+  "offlineLayers": "Офлайн-слои",
+  "locationTrail": "Трек местоположения",
+  "showTrailOnMap": "Показать трек на карте",
+  "trailVisible": "Трек отображается на карте",
+  "trailHiddenRecording": "Трек скрыт (запись продолжается)",
+  "duration": "Продолжительность",
+  "points": "Точки",
+  "clearTrail": "Очистить трек",
+  "clearTrailQuestion": "Очистить трек?",
+  "clearTrailConfirmation": "Вы уверены, что хотите очистить текущий трек? Это действие нельзя отменить.",
+  "noTrailRecorded": "Трек ещё не записан",
+  "startTrackingToRecord": "Запустите отслеживание геолокации для записи трека",
+  "trailControls": "Управление треком",
+  "exportTrailToGpx": "Экспортировать трек в GPX",
+  "importTrailFromGpx": "Импортировать трек из GPX",
+  "trailExportedSuccessfully": "Трек успешно экспортирован!",
+  "failedToExportTrail": "Не удалось экспортировать трек",
+  "failedToImportTrail": "Не удалось импортировать трек: {error}",
+  "importTrail": "Импортировать трек",
+  "importTrailQuestion": "Импортировать трек из {pointCount} точек?\n\nВы можете заменить текущий трек или просмотреть его рядом.",
+  "viewAlongside": "Просмотреть рядом",
+  "replaceCurrent": "Заменить текущий",
+  "trailImported": "Трек импортирован! ({pointCount} точек)",
+  "trailReplaced": "Трек заменён! ({pointCount} точек)",
+  "contactTrails": "Треки контактов",
+  "showAllContactTrails": "Показать все треки контактов",
+  "noContactsWithLocationHistory": "Нет контактов с историей местоположения",
+  "showingTrailsForContacts": "Показаны треки для {count} контактов",
+  "individualContactTrails": "Индивидуальные треки контактов",
+  "deviceInformation": "Информация об устройстве",
+  "bleName": "Имя BLE",
+  "meshName": "Имя в сети Mesh",
+  "notSet": "Не задано",
+  "model": "Модель",
+  "version": "Версия",
+  "buildDate": "Дата сборки",
+  "firmware": "Прошивка",
+  "maxContacts": "Макс. контактов",
+  "maxChannels": "Макс. каналов",
+  "publicInfo": "Публичная информация",
+  "meshNetworkName": "Название сети Mesh",
+  "nameBroadcastInMesh": "Имя, транслируемое в mesh-объявлениях",
+  "telemetryAndLocationSharing": "Телеметрия и передача местоположения",
+  "lat": "Ш",
+  "lon": "Д",
+  "useCurrentLocation": "Использовать текущее местоположение",
+  "noneUnknown": "Нет/Неизвестно",
+  "chatNode": "Узел чата",
+  "repeater": "Ретранслятор",
+  "roomChannel": "Комната/Канал",
+  "typeNumber": "Тип {number}",
+  "copiedToClipboardShort": "{label} скопировано в буфер обмена",
+  "failedToSave": "Не удалось сохранить: {error}",
+  "failedToGetLocation": "Не удалось получить местоположение: {error}",
+  "sarTemplates": "Шаблоны SAR",
+  "manageSarTemplates": "Управление шаблонами целеуказания",
+  "addTemplate": "Добавить шаблон",
+  "editTemplate": "Изменить шаблон",
+  "deleteTemplate": "Удалить шаблон",
+  "templateName": "Название шаблона",
+  "templateNameHint": "например, Найденный человек",
+  "templateEmoji": "Эмодзи",
+  "emojiRequired": "Требуется эмодзи",
+  "nameRequired": "Требуется название",
+  "templateDescription": "Описание (необязательно)",
+  "templateDescriptionHint": "Добавьте дополнительный контекст...",
+  "templateColor": "Цвет",
+  "previewFormat": "Предпросмотр (формат сообщения SAR)",
+  "importFromClipboard": "Импорт",
+  "exportToClipboard": "Экспорт",
+  "deleteTemplateConfirmation": "Удалить шаблон '{name}'?",
+  "templateAdded": "Шаблон добавлен",
+  "templateUpdated": "Шаблон обновлён",
+  "templateDeleted": "Шаблон удалён",
+  "templatesImported": "{count, plural, =0{Шаблоны не импортированы} =1{Импортирован 1 шаблон} other{Импортировано {count} шаблонов}}",
+  "templatesExported": "{count, plural, =1{1 шаблон экспортирован в буфер обмена} other{{count} шаблонов экспортировано в буфер обмена}}",
+  "resetToDefaults": "Сбросить до умолчаний",
+  "resetToDefaultsConfirmation": "Все пользовательские шаблоны будут удалены и восстановлены 4 шаблона по умолчанию. Продолжить?",
+  "reset": "Сбросить",
+  "resetComplete": "Шаблоны сброшены до умолчаний",
+  "noTemplates": "Шаблоны недоступны",
+  "tapAddToCreate": "Нажмите +, чтобы создать первый шаблон",
+  "ok": "ОК",
+  "permissionsSection": "Разрешения",
+  "locationPermission": "Разрешение геолокации",
+  "checking": "Проверка...",
+  "locationPermissionGrantedAlways": "Разрешено (всегда)",
+  "locationPermissionGrantedWhileInUse": "Разрешено (при использовании)",
+  "locationPermissionDeniedTapToRequest": "Запрещено — нажмите для запроса",
+  "locationPermissionPermanentlyDeniedOpenSettings": "Запрещено навсегда — откройте настройки",
+  "locationPermissionDialogContent": "Доступ к геолокации запрещён навсегда. Включите его в настройках устройства для GPS-трекинга и обмена местоположением.",
+  "openSettings": "Открыть настройки",
+  "locationPermissionGranted": "Разрешение геолокации получено!",
+  "locationPermissionRequiredForGps": "Разрешение геолокации необходимо для GPS-трекинга и обмена местоположением.",
+  "locationPermissionAlreadyGranted": "Разрешение геолокации уже предоставлено.",
+  "sarNavyBlue": "SAR Тёмно-синяя",
+  "sarNavyBlueDescription": "Профессиональный / оперативный режим",
+  "selectRecipient": "Выбрать получателя",
+  "broadcastToAllNearby": "Трансляция всем ближайшим",
+  "searchRecipients": "Поиск получателей...",
+  "noContactsFound": "Контакты не найдены",
+  "noRoomsFound": "Комнаты не найдены",
+  "noContactsOrRoomsAvailable": "Нет доступных контактов или комнат",
+  "noRecipientsAvailable": "Нет доступных получателей",
+  "noChannelsFound": "Каналы не найдены",
+  "messagesWillBeSentToPublicChannel": "Сообщения будут отправлены в публичный канал",
+  "newMessage": "Новое сообщение",
+  "channel": "Канал",
+  "samplePoliceLead": "Руководитель группы полиции",
+  "sampleDroneOperator": "Оператор дрона",
+  "sampleFirefighterAlpha": "Пожарный",
+  "sampleMedicCharlie": "Медик",
+  "sampleCommandDelta": "Командование",
+  "sampleFireEngine": "Пожарная машина",
+  "sampleAirSupport": "Авиационная поддержка",
+  "sampleBaseCoordinator": "Базовый координатор",
+  "channelEmergency": "Аварийный",
+  "channelCoordination": "Координация",
+  "channelUpdates": "Обновления",
+  "sampleTeamMember": "Тестовый член команды",
+  "sampleScout": "Тестовый разведчик",
+  "sampleBase": "Тестовая база",
+  "sampleSearcher": "Тестовый поисковик",
+  "sampleObjectBackpack": " Найден рюкзак синего цвета",
+  "sampleObjectVehicle": " Брошенный автомобиль — установить владельца",
+  "sampleObjectCamping": " Обнаружено туристическое снаряжение",
+  "sampleObjectTrailMarker": " Указатель тропы найден вне маршрута",
+  "sampleMsgAllTeamsCheckIn": "Всем группам: сообщить о готовности",
+  "sampleMsgWeatherUpdate": "Погода: ясно, температура 18°C",
+  "sampleMsgBaseCamp": "Базовый лагерь развёрнут у места сбора",
+  "sampleMsgTeamAlpha": "Группа выдвигается в сектор 2",
+  "sampleMsgRadioCheck": "Проверка связи — всем станциям ответить",
+  "sampleMsgWaterSupply": "Вода доступна на контрольной точке 3",
+  "sampleMsgTeamBravo": "Группа докладывает: сектор 1 чист",
+  "sampleMsgEtaRallyPoint": "Прибытие на место сбора: 15 минут",
+  "sampleMsgSupplyDrop": "Сброс снаряжения подтверждён на 14:00",
+  "sampleMsgDroneSurvey": "Разведка дроном завершена — ничего не обнаружено",
+  "sampleMsgTeamCharlie": "Группа запрашивает подкрепление",
+  "sampleMsgRadioDiscipline": "Всем подразделениям: соблюдать радиодисциплину",
+  "sampleMsgUrgentMedical": "СРОЧНО: нужна медицинская помощь в секторе 4",
+  "sampleMsgAdultMale": " Взрослый мужчина, в сознании",
+  "sampleMsgFireSpotted": "Обнаружен пожар — координаты следуют",
+  "sampleMsgSpreadingRapidly": " Распространяется быстро!",
+  "sampleMsgPriorityHelicopter": "ПРИОРИТЕТ: нужна поддержка вертолёта",
+  "sampleMsgMedicalTeamEnRoute": "Медицинская группа движется к вашему местоположению",
+  "sampleMsgEvacHelicopter": "Вертолёт эвакуации: прибытие через 10 минут",
+  "sampleMsgEmergencyResolved": "Чрезвычайная ситуация ликвидирована — опасности нет",
+  "sampleMsgEmergencyStagingArea": " Аварийное место сбора",
+  "sampleMsgEmergencyServices": "Аварийные службы уведомлены и реагируют",
+  "sampleAlphaTeamLead": "Руководитель группы",
+  "sampleBravoScout": "Разведчик",
+  "sampleCharlieMedic": "Медик",
+  "sampleDeltaNavigator": "Навигатор",
+  "sampleEchoSupport": "Поддержка",
+  "sampleBaseCommand": "Базовое командование",
+  "sampleFieldCoordinator": "Полевой координатор",
+  "sampleMedicalTeam": "Медицинская группа",
+  "mapDrawing": "Рисунок на карте",
+  "navigateToDrawing": "Перейти к рисунку",
+  "copyCoordinates": "Копировать координаты",
+  "hideFromMap": "Скрыть с карты",
+  "lineDrawing": "Линия",
+  "rectangleDrawing": "Прямоугольник",
+  "coordinatesCopiedToClipboard": "Координаты скопированы в буфер обмена",
+  "manualCoordinates": "Ввод координат вручную",
+  "enterCoordinatesManually": "Ввести координаты вручную",
+  "latitudeLabel": "Широта",
+  "longitudeLabel": "Долгота",
+  "invalidLatitude": "Неверная широта (от -90 до 90)",
+  "invalidLongitude": "Неверная долгота (от -180 до 180)",
+  "exampleCoordinates": "Пример: 55.7558, 37.6173",
+  "drawingShared": "Рисунок на карте",
+  "drawingHidden": "Рисунок скрыт с карты",
+  "alreadyShared": "{count, plural, =1{1 уже передан} other{{count} уже передано}}",
+  "newDrawingsShared": "Передано {count} новых рисунк{plural}",
+  "shareDrawing": "Поделиться рисунком",
+  "shareWithAllNearbyDevices": "Поделиться со всеми ближайшими устройствами",
+  "shareToRoom": "Отправить в комнату",
+  "sendToPersistentStorage": "Отправить в постоянное хранилище комнаты",
+  "deleteDrawingConfirm": "Вы уверены, что хотите удалить этот рисунок?",
+  "drawingDeleted": "Рисунок удалён",
+  "yourDrawingsCount": "Ваши рисунки ({count})",
+  "shared": "Передано",
+  "line": "Линия",
+  "rectangle": "Прямоугольник",
+  "updateAvailable": "Доступно обновление",
+  "currentVersion": "Текущая",
+  "latestVersion": "Последняя",
+  "downloadUpdate": "Скачать",
+  "updateLater": "Позже",
+  "cadastralParcels": "Кадастровые участки",
+  "forestRoads": "Лесные дороги",
+  "showCadastralParcels": "Показать кадастровые участки",
+  "showForestRoads": "Показать лесные дороги",
+  "wmsOverlays": "WMS-наложения",
+  "hikingTrails": "Туристические маршруты",
+  "mainRoads": "Главные дороги",
+  "houseNumbers": "Номера домов",
+  "fireHazardZones": "Пожароопасные зоны",
+  "historicalFires": "Исторические пожары",
+  "firebreaks": "Противопожарные просеки",
+  "krasFireZones": "Пожарные зоны Краса",
+  "placeNames": "Названия мест",
+  "municipalityBorders": "Границы муниципалитетов",
+  "topographicMap": "Топографическая карта 1:25000",
+  "recentMessages": "Последние сообщения",
+  "addChannel": "Добавить канал",
+  "channelName": "Название канала",
+  "channelNameHint": "например, Группа спасения Альфа",
+  "channelSecret": "Секрет канала",
+  "channelSecretHint": "Общий пароль для этого канала",
+  "channelSecretHelp": "Этот секрет необходимо передать всем членам команды, которым нужен доступ к каналу",
+  "channelTypesInfo": "Hash-каналы (#команда): секрет генерируется из названия автоматически. Одно название = один канал на всех устройствах.\n\nЗакрытые каналы: используется явный секрет. Войти могут только те, у кого есть секрет.",
+  "hashChannelInfo": "Hash-канал: секрет будет автоматически создан из названия. Все, кто использует одно и то же имя, окажутся в одном канале.",
+  "channelNameRequired": "Требуется название канала",
+  "channelNameTooLong": "Название канала не должно превышать 31 символ",
+  "channelSecretRequired": "Требуется секрет канала",
+  "channelSecretTooLong": "Секрет канала не должен превышать 32 символа",
+  "invalidAsciiCharacters": "Разрешены только символы ASCII",
+  "channelCreatedSuccessfully": "Канал успешно создан",
+  "channelCreationFailed": "Не удалось создать канал: {error}",
+  "deleteChannel": "Удалить канал",
+  "deleteChannelConfirmation": "Вы уверены, что хотите удалить канал \"{channelName}\"? Это действие нельзя отменить.",
+  "channelDeletedSuccessfully": "Канал успешно удалён",
+  "channelDeletionFailed": "Не удалось удалить канал: {error}",
+  "allChannelSlotsInUse": "Все слоты каналов заняты (максимум 39 пользовательских каналов)",
+  "createChannel": "Создать канал",
+  "wizardBack": "Назад",
+  "wizardSkip": "Пропустить",
+  "wizardNext": "Далее",
+  "wizardGetStarted": "Начать",
+  "wizardWelcomeTitle": "Добро пожаловать в MeshCore SAR",
+  "wizardWelcomeDescription": "Мощный инструмент связи вне сети для поисково-спасательных операций. Поддерживайте связь с командой через mesh-радио, когда традиционные сети недоступны.",
+  "wizardConnectingTitle": "Подключение к радиоустройству",
+  "wizardConnectingDescription": "Подключите смартфон к радиоустройству MeshCore по Bluetooth для связи вне сети.",
+  "wizardConnectingFeature1": "Поиск ближайших устройств MeshCore",
+  "wizardConnectingFeature2": "Сопряжение с радиоустройством по Bluetooth",
+  "wizardConnectingFeature3": "Работает полностью офлайн — интернет не нужен",
+  "wizardSimpleModeTitle": "Простой режим",
+  "wizardSimpleModeDescription": "Впервые работаете с mesh-сетью? Включите простой режим для упрощённого интерфейса с основными функциями.",
+  "wizardSimpleModeFeature1": "Удобный для новичков интерфейс с основными функциями",
+  "wizardSimpleModeFeature2": "Переключиться в расширенный режим можно в любое время в настройках",
+  "wizardChannelTitle": "Каналы",
+  "wizardChannelDescription": "Транслируйте сообщения всем участникам канала — идеально для общих объявлений и координации команды.",
+  "wizardChannelFeature1": "Публичный канал для общей связи команды",
+  "wizardChannelFeature2": "Создавайте пользовательские каналы для отдельных групп",
+  "wizardChannelFeature3": "Сообщения автоматически ретранслируются через mesh",
+  "wizardContactsTitle": "Контакты",
+  "wizardContactsDescription": "Члены вашей команды появляются автоматически по мере подключения к mesh-сети. Отправляйте им личные сообщения или просматривайте их местоположение.",
+  "wizardContactsFeature1": "Контакты обнаруживаются автоматически",
+  "wizardContactsFeature2": "Отправка личных сообщений",
+  "wizardContactsFeature3": "Просмотр уровня заряда и времени последнего появления",
+  "wizardMapTitle": "Карта и местоположение",
+  "wizardMapDescription": "Отслеживайте команду в реальном времени и отмечайте важные места для поисково-спасательных операций.",
+  "wizardMapFeature1": "Маркеры SAR для найденных людей, пожаров и мест сбора",
+  "wizardMapFeature2": "GPS-отслеживание членов команды в реальном времени",
+  "wizardMapFeature3": "Загрузка офлайн-карт для отдалённых районов",
+  "wizardMapFeature4": "Рисование фигур и обмен тактической информацией",
+  "viewWelcomeTutorial": "Просмотреть обучение",
+  "allTeamContacts": "Все контакты команды",
+  "directMessagesInfo": "Личные сообщения с подтверждением. Отправлено {count} членам команды.",
+  "sarMarkerSentToContacts": "Маркер SAR отправлен {count} контактам",
+  "noContactsAvailable": "Нет доступных контактов команды",
+  "reply": "Ответить",
+  "technicalDetails": "Технические детали",
+  "messageTechnicalDetails": "Технические детали сообщения",
+  "linkQuality": "Качество связи",
+  "delivery": "Доставка",
+  "status": "Статус",
+  "expectedAckTag": "Ожидаемый тег ACK",
+  "roundTrip": "Время отклика",
+  "retryAttempt": "Попытка повтора",
+  "floodFallback": "Широковещательный резерв",
+  "identity": "Идентификатор",
+  "messageId": "ID сообщения",
+  "sender": "Отправитель",
+  "senderKey": "Ключ отправителя",
+  "recipient": "Получатель",
+  "recipientKey": "Ключ получателя",
+  "voice": "Голос",
+  "voiceId": "ID голоса",
+  "envelope": "Конверт",
+  "sessionProgress": "Прогресс сессии",
+  "complete": "Завершено",
+  "rawDump": "Необработанные данные",
+  "cannotRetryMissingRecipient": "Повтор невозможен: нет информации о получателе",
+  "voiceUnavailable": "Голос сейчас недоступен",
+  "requestingVoice": "Запрос голоса"
+}

lib/main.dart

@@ -17,7 +17,6 @@ import 'providers/app_provider.dart';
 import 'providers/sensors_provider.dart';
 import 'services/voice_codec_service.dart';
 import 'services/voice_player_service.dart';
-import 'services/tile_cache_service.dart';
 import 'services/notification_service.dart';
 import 'services/locale_preferences.dart';
 import 'services/update_checker_service.dart';
@@ -248,18 +247,14 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
         // Image provider (fragment reassembly + outgoing session cache)
         ChangeNotifierProvider(create: (_) => ip.ImageProvider()),
 
-        // Tile cache service
-        Provider(create: (_) => TileCacheService()),
-
         // App provider that coordinates everything
         // VoiceProvider is read via context.read inside create since it's already registered above
-        ChangeNotifierProxyProvider6<
+        ChangeNotifierProxyProvider5<
           ConnectionProvider,
           ContactsProvider,
           MessagesProvider,
           DrawingProvider,
           ChannelsProvider,
-          TileCacheService,
           AppProvider
         >(
           create: (context) => AppProvider(
@@ -270,7 +265,6 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
             channelsProvider: context.read<ChannelsProvider>(),
             voiceProvider: context.read<VoiceProvider>(),
             imageProvider: context.read<ip.ImageProvider>(),
-            tileCacheService: context.read<TileCacheService>(),
           ),
           update:
               (
@@ -280,7 +274,6 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
                 messages,
                 drawings,
                 channels,
-                tileCache,
                 previous,
               ) =>
                   previous ??
@@ -292,7 +285,6 @@ class _MeshCoreSarAppState extends State<MeshCoreSarApp> {
                     channelsProvider: channels,
                     voiceProvider: context.read<VoiceProvider>(),
                     imageProvider: context.read<ip.ImageProvider>(),
-                    tileCacheService: tileCache,
                   ),
         ),
       ],

lib/models/contact.dart

@@ -46,12 +46,19 @@ class ContactRouteCodec {
   static const int maxPathBytes = 64;
   static const int _unknownDescriptor = 0xFF;
 
-  static ParsedContactRoute parse(String input) {
+  static ParsedContactRoute parse(String input, {int? expectedHashSize}) {
     final normalized = input.trim().toUpperCase();
     if (normalized.isEmpty) {
       throw const ContactRouteFormatException('Route cannot be empty.');
     }
 
+    if (expectedHashSize != null &&
+        (expectedHashSize < 1 || expectedHashSize > maxHashSize)) {
+      throw const ContactRouteFormatException(
+        'Hash size must be 1, 2, or 3 bytes.',
+      );
+    }
+
     final hopTokens = normalized
         .split(',')
         .map((token) => token.trim())
@@ -80,6 +87,13 @@ class ContactRouteCodec {
         );
       }
 
+      if (expectedHashSize != null && currentHashSize != expectedHashSize) {
+        throw ContactRouteFormatException(
+          'Hop "$token" must be $expectedHashSize '
+          'byte${expectedHashSize == 1 ? '' : 's'}.',
+        );
+      }
+
       hashSize ??= currentHashSize;
       if (hashSize != currentHashSize) {
         throw const ContactRouteFormatException(
@@ -217,10 +231,10 @@ extension ContactLocalization on Contact {
   }
 
   String get routeSummary {
-    if (routeIsUnknown || !routeHasPath) {
+    if (routeIsUnknown) {
       return 'Flood/Unknown';
     }
-    if (routeHopCount == 0) {
+    if (!routeHasPath || routeHopCount == 0) {
       return 'Direct';
     }
     return '$routeHopCount hop${routeHopCount == 1 ? '' : 's'} via $routeHashSize-byte hashes';

lib/models/map_layer.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import '../l10n/app_localizations.dart';
@@ -10,6 +9,7 @@ enum MapLayerType {
   googleHybrid,
   googleRoadmap,
   googleTerrain,
+  // Kept for stored preference compatibility after MBTiles removal.
   vectorMbtiles,
   wmsBase,
 }
@@ -21,13 +21,6 @@ class MapLayer {
   final String attribution;
   final double maxZoom;
 
-  // Vector tile specific properties
-  final bool isVector;
-  final File? mbtilesFile;
-  final String? styleUrl;
-  final String? sourceName;
-  final bool? isGzipped;
-
   // WMS specific properties
   final bool isWms;
   final String? wmsBaseUrl;
@@ -43,11 +36,6 @@ class MapLayer {
     required this.urlTemplate,
     required this.attribution,
     required this.maxZoom,
-    this.isVector = false,
-    this.mbtilesFile,
-    this.styleUrl,
-    this.sourceName,
-    this.isGzipped,
     this.isWms = false,
     this.wmsBaseUrl,
     this.wmsLayers,
@@ -74,7 +62,7 @@ class MapLayer {
       case MapLayerType.googleTerrain:
         return localizations.googleTerrain;
       case MapLayerType.vectorMbtiles:
-        // For vector tiles, use the name from metadata
+        // Legacy value kept only for preference migration compatibility.
         return name;
       case MapLayerType.wmsBase:
         // For WMS layers, use the name (will be localized separately)
@@ -182,28 +170,4 @@ class MapLayer {
   static MapLayer fromType(MapLayerType type) {
     return allLayers.firstWhere((layer) => layer.type == type);
   }
-
-  /// Create a MapLayer from an MBTiles file
-  static MapLayer fromMbtilesFile({
-    required String name,
-    required File mbtilesFile,
-    required String styleUrl,
-    required String sourceName,
-    required double maxZoom,
-    required bool isGzipped,
-    String? attribution,
-  }) {
-    return MapLayer(
-      type: MapLayerType.vectorMbtiles,
-      name: name,
-      urlTemplate: '', // Not used for vector tiles
-      attribution: attribution ?? 'MBTiles',
-      maxZoom: maxZoom,
-      isVector: true,
-      mbtilesFile: mbtilesFile,
-      styleUrl: styleUrl,
-      sourceName: sourceName,
-      isGzipped: isGzipped,
-    );
-  }
 }

lib/providers/app_provider.dart

@@ -11,7 +11,6 @@ import 'voice_provider.dart';
 import 'image_provider.dart' as ip;
 import 'helpers/fragment_ack_wait_registry.dart';
 import 'helpers/session_metadata_restore.dart';
-import '../services/tile_cache_service.dart';
 import '../services/location_tracking_service.dart';
 import '../services/packet_capture_storage_service.dart';
 import '../models/contact.dart';
@@ -24,6 +23,7 @@ import '../utils/voice_message_parser.dart';
 import '../utils/image_message_parser.dart';
 import '../utils/media_swarm_protocol.dart';
 import '../utils/message_airtime_estimator.dart';
+import '../utils/fast_gps_packet.dart';
 
 /// Main App Provider - coordinates all other providers
 class AppProvider with ChangeNotifier {
@@ -35,7 +35,6 @@ class AppProvider with ChangeNotifier {
   final ChannelsProvider channelsProvider;
   final VoiceProvider voiceProvider;
   final ip.ImageProvider imageProvider;
-  final TileCacheService tileCacheService;
   final LocationTrackingService locationTrackingService =
       LocationTrackingService();
   final PacketCaptureStorageService packetCaptureStorageService =
@@ -44,8 +43,7 @@ class AppProvider with ChangeNotifier {
   bool _isInitialized = false;
   bool get isInitialized => _isInitialized;
 
-  bool _isSimpleMode = true;
-  bool get isSimpleMode => _isSimpleMode;
+  bool get isSimpleMode => true;
 
   bool _isMapEnabled = true;
   bool get isMapEnabled => _isMapEnabled;
@@ -79,6 +77,7 @@ class AppProvider with ChangeNotifier {
   final Map<String, Future<bool>> _pendingMediaSwarmFetches = {};
   final Map<String, Map<String, MediaSwarmAvailability>>
   _pendingMediaSwarmResponses = {};
+  bool _fastLocationScreenActive = false;
   Timer? _packetCaptureFlushTimer;
   String? _lastPersistedPacketSignature;
   bool _isPersistingPacketCapture = false;
@@ -91,12 +90,9 @@ class AppProvider with ChangeNotifier {
     required this.channelsProvider,
     required this.voiceProvider,
     required this.imageProvider,
-    required this.tileCacheService,
   }) {
     _setupCallbacks();
-    _initializeTileCache();
     _initializeLocationTracking();
-    _loadSimpleMode();
     _loadMapEnabled();
     _loadContactsEnabled();
     _loadSensorsEnabled();
@@ -225,29 +221,6 @@ class AppProvider with ChangeNotifier {
     return contact?.advName;
   }
 
-  /// Load simple mode setting from shared preferences
-  Future<void> _loadSimpleMode() async {
-    try {
-      final prefs = await SharedPreferences.getInstance();
-      _isSimpleMode = prefs.getBool('simple_mode') ?? true;
-      notifyListeners();
-    } catch (e) {
-      debugPrint('Error loading simple mode setting: $e');
-    }
-  }
-
-  /// Toggle simple mode on/off
-  Future<void> toggleSimpleMode(bool enabled) async {
-    try {
-      _isSimpleMode = enabled;
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setBool('simple_mode', enabled);
-      notifyListeners();
-    } catch (e) {
-      debugPrint('Error saving simple mode setting: $e');
-    }
-  }
-
   /// Load map enabled setting from shared preferences
   Future<void> _loadMapEnabled() async {
     try {
@@ -436,16 +409,6 @@ class AppProvider with ChangeNotifier {
     }
   }
 
-  /// Initialize tile cache service
-  Future<void> _initializeTileCache() async {
-    try {
-      await tileCacheService.initialize();
-      debugPrint('Tile cache initialized');
-    } catch (e) {
-      debugPrint('Error initializing tile cache: $e');
-    }
-  }
-
   /// Initialize location tracking service
   Future<void> _initializeLocationTracking() async {
     try {
@@ -473,6 +436,10 @@ class AppProvider with ChangeNotifier {
         );
       };
 
+      locationTrackingService.onFastLocationUpdate = (position, reason) {
+        unawaited(_sendFastLocationUpdate(position, reason: reason));
+      };
+
       debugPrint('✅ [AppProvider] Location tracking service initialized');
     } catch (e) {
       debugPrint('❌ [AppProvider] Error initializing location tracking: $e');
@@ -836,6 +803,18 @@ class AppProvider with ChangeNotifier {
     // Magic 0x69 'i' = image fetch request; 0x56 'V' = voice packet.
     // Magic 0x49 'I' = image packet.
     connectionProvider.onRawDataReceived = (payload, snrRaw, rssiDbm) {
+      final fastGpsPacket = FastGpsPacket.tryParseBinary(payload);
+      if (fastGpsPacket != null) {
+        final sender = _resolveContactByPrefixHex(fastGpsPacket.senderKey6);
+        if (sender != null) {
+          contactsProvider.updateFastGps(
+            sender.publicKey.sublist(0, 6),
+            fastGpsPacket,
+          );
+        }
+        return;
+      }
+
       final rawProbeRequest = RawRouteProbeRequest.tryParseBinary(payload);
       if (rawProbeRequest != null) {
         debugPrint(
@@ -1210,10 +1189,8 @@ class AppProvider with ChangeNotifier {
       // Sync channels to get channel names
       // In simple mode: only sync first 5 channels for faster startup
       // In normal mode: sync all channels (up to device max)
-      final channelsToSync = _isSimpleMode ? 5 : null;
-      debugPrint(
-        '📻 [AppProvider] Syncing channels${_isSimpleMode ? ' (simple mode: max 5)' : ''}...',
-      );
+      const channelsToSync = 5;
+      debugPrint('📻 [AppProvider] Syncing channels (simple mode: max 5)...');
       await connectionProvider.syncChannels(maxChannels: channelsToSync);
       debugPrint('✅ [AppProvider] Channel sync complete');
 
@@ -1382,6 +1359,46 @@ class AppProvider with ChangeNotifier {
     return contactsProvider.findContactByPrefixHex(prefixHex.toLowerCase());
   }
 
+  void setFastLocationUiActive(bool isActive) {
+    if (_fastLocationScreenActive == isActive) return;
+    _fastLocationScreenActive = isActive;
+    locationTrackingService.setFastLocationActiveUse(isActive);
+  }
+
+  Future<void> _sendFastLocationUpdate(
+    dynamic position, {
+    required String reason,
+  }) async {
+    if (!connectionProvider.deviceInfo.isConnected) {
+      return;
+    }
+
+    final publicKey = connectionProvider.deviceInfo.publicKey;
+    if (publicKey == null || publicKey.length < 6) {
+      return;
+    }
+
+    final senderKey6 = publicKey
+        .sublist(0, 6)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+    final packet = FastGpsPacket(
+      senderKey6: senderKey6,
+      latitude: position.latitude as double,
+      longitude: position.longitude as double,
+      timestampSeconds: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+    );
+    debugPrint(
+      '📍 [AppProvider] Sending fast GPS update ($reason): '
+      '${position.latitude}, ${position.longitude}',
+    );
+    try {
+      await connectionProvider.sendRawPrivateMulticast(packet.encodeBinary());
+    } catch (e) {
+      debugPrint('⚠️ [AppProvider] Fast GPS send failed: $e');
+    }
+  }
+
   Contact? _resolveVoiceFetchRequester(VoiceFetchRequest request) {
     final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
     if (liveContact != null) {
@@ -2176,7 +2193,7 @@ class AppProvider with ChangeNotifier {
       await connectionProvider.getContacts();
 
       // Sync channels (respect simple mode settings)
-      final channelsToSync = _isSimpleMode ? 5 : null;
+      const channelsToSync = 5;
       await connectionProvider.syncChannels(maxChannels: channelsToSync);
 
       // Messages are automatically synced via PUSH_CODE_MSG_WAITING events
@@ -2294,6 +2311,7 @@ class AppProvider with ChangeNotifier {
     locationTrackingService.onBroadcastSent = null;
     locationTrackingService.onError = null;
     locationTrackingService.onTrackingStateChanged = null;
+    locationTrackingService.onFastLocationUpdate = null;
     // Dispose the location tracking service to stop GPS stream and clean up resources
     locationTrackingService.dispose();
     for (final timer in _voiceMissingRetryTimers.values) {

lib/providers/connection_provider.dart

@@ -1290,6 +1290,19 @@ class ConnectionProvider with ChangeNotifier {
     );
   }
 
+  /// Send a raw private zero-hop payload.
+  ///
+  /// This wraps the raw custom transport using an empty path to match the
+  /// firmware's private multicast behavior.
+  Future<void> sendRawPrivateMulticast(Uint8List payload) async {
+    if (!_activeService.isConnected) return;
+    await _activeService.sendRawVoicePacket(
+      contactPathLen: 0,
+      contactPath: Uint8List(0),
+      payload: payload,
+    );
+  }
+
   /// Request telemetry from contact
   ///
   /// COMPATIBILITY NOTE: This method sends CMD_SEND_TELEMETRY_REQ (39).
@@ -2015,6 +2028,7 @@ class ConnectionProvider with ChangeNotifier {
     }
 
     try {
+      _error = null;
       await _activeService.resetPath(contactPublicKey);
     } catch (e) {
       _error = 'Failed to reset path: $e';
@@ -2034,6 +2048,7 @@ class ConnectionProvider with ChangeNotifier {
     }
 
     try {
+      _error = null;
       final updatedContact = contact.copyWith(
         outPathLen: signedEncodedPathLen,
         outPath: Uint8List.fromList(paddedPathBytes),

lib/providers/contacts_provider.dart

@@ -4,6 +4,7 @@ import '../models/contact.dart';
 import '../models/message_contact_location.dart';
 import '../services/cayenne_lpp_parser.dart';
 import '../services/contact_storage_service.dart';
+import '../utils/fast_gps_packet.dart';
 import '../utils/key_comparison.dart';
 
 class PendingAdvert {
@@ -282,45 +283,16 @@ class ContactsProvider with ChangeNotifier {
     }
 
     // Check if this is a new contact
-    final isNewContact = !_contacts.containsKey(contact.publicKeyHex);
+    final existingContact = _contacts[contact.publicKeyHex];
+    final isNewContact = existingContact == null;
     debugPrint(
       '   isNew: $isNewContact, total contacts before: ${_contacts.length}',
     );
 
-    Contact updatedContact;
-    if (isNewContact) {
-      // New contact - add initial location to history if available
-      updatedContact = contact.copyWith(isNew: true);
-      if (contact.advertLocation != null) {
-        final timestamp = DateTime.fromMillisecondsSinceEpoch(
-          contact.lastAdvert * 1000,
-        );
-        updatedContact = updatedContact.addAdvertLocation(
-          contact.advertLocation!,
-          timestamp,
-        );
-      }
-    } else {
-      // Existing contact - preserve history and isNew status
-      final existingContact = _contacts[contact.publicKeyHex]!;
-
-      // Start with existing contact
-      updatedContact = contact.copyWith(
-        isNew: existingContact.isNew,
-        advertHistory: existingContact.advertHistory,
-      );
-
-      // Add new location to history if location has changed
-      if (contact.advertLocation != null) {
-        final timestamp = DateTime.fromMillisecondsSinceEpoch(
-          contact.lastAdvert * 1000,
-        );
-        updatedContact = updatedContact.addAdvertLocation(
-          contact.advertLocation!,
-          timestamp,
-        );
-      }
-    }
+    final updatedContact = _mergeIncomingContact(
+      incomingContact: contact,
+      existingContact: existingContact,
+    );
 
     _contacts[contact.publicKeyHex] = updatedContact;
     _pendingAdverts.remove(contact.publicKeyHex);
@@ -346,7 +318,11 @@ class ContactsProvider with ChangeNotifier {
         excluded++;
         continue;
       }
-      _contacts[contact.publicKeyHex] = contact;
+      final existingContact = _contacts[contact.publicKeyHex];
+      _contacts[contact.publicKeyHex] = _mergeIncomingContact(
+        incomingContact: contact,
+        existingContact: existingContact,
+      );
       _pendingAdverts.remove(contact.publicKeyHex);
     }
     if (excluded > 0) {
@@ -358,6 +334,60 @@ class ContactsProvider with ChangeNotifier {
     notifyListeners();
   }
 
+  Contact _mergeIncomingContact({
+    required Contact incomingContact,
+    Contact? existingContact,
+  }) {
+    if (existingContact == null) {
+      var newContact = incomingContact.copyWith(isNew: true);
+      if (incomingContact.advertLocation != null) {
+        final timestamp = DateTime.fromMillisecondsSinceEpoch(
+          incomingContact.lastAdvert * 1000,
+        );
+        newContact = newContact.addAdvertLocation(
+          incomingContact.advertLocation!,
+          timestamp,
+        );
+      }
+      return newContact;
+    }
+
+    final mergedTelemetry = _mergeTelemetryForContact(
+      existingTelemetry: existingContact.telemetry,
+      incomingTelemetry: incomingContact.telemetry,
+    );
+    final incomingAdvertLocation = incomingContact.advertLocation;
+    final existingAdvertLocation = existingContact.advertLocation;
+
+    var updatedContact = incomingContact.copyWith(
+      isNew: existingContact.isNew,
+      advertHistory: existingContact.advertHistory,
+      telemetry: mergedTelemetry,
+      advLat: incomingAdvertLocation != null
+          ? incomingContact.advLat
+          : existingAdvertLocation != null
+          ? existingContact.advLat
+          : incomingContact.advLat,
+      advLon: incomingAdvertLocation != null
+          ? incomingContact.advLon
+          : existingAdvertLocation != null
+          ? existingContact.advLon
+          : incomingContact.advLon,
+    );
+
+    if (incomingAdvertLocation != null) {
+      final timestamp = DateTime.fromMillisecondsSinceEpoch(
+        incomingContact.lastAdvert * 1000,
+      );
+      updatedContact = updatedContact.addAdvertLocation(
+        incomingAdvertLocation,
+        timestamp,
+      );
+    }
+
+    return updatedContact;
+  }
+
   /// Update contact telemetry
   void updateTelemetry(Uint8List publicKeyPrefix, Uint8List lppData) {
     debugPrint('📊 [ContactsProvider] updateTelemetry() called');
@@ -397,23 +427,22 @@ class ContactsProvider with ChangeNotifier {
         );
       }
 
-      // Keep last valid GPS for router/chat/room contacts when current
-      // telemetry does not provide a valid GPS fix.
-      if (_shouldRetainLastValidGps(contact, telemetry.gpsLocation)) {
-        debugPrint(
-          '  ⚠️ Retaining last valid GPS. Incoming telemetry GPS is invalid/missing: $incomingGps',
-        );
-        final previousGps = _getValidGpsOrNull(contact.telemetry?.gpsLocation);
-        telemetry = ContactTelemetry(
-          gpsLocation: previousGps,
-          batteryPercentage: telemetry.batteryPercentage,
-          batteryMilliVolts: telemetry.batteryMilliVolts,
-          temperature: telemetry.temperature,
-          timestamp: telemetry.timestamp,
-          humidity: telemetry.humidity,
-          pressure: telemetry.pressure,
-          extraSensorData: telemetry.extraSensorData,
-        );
+      final previousTelemetry = contact.telemetry;
+
+      final mergedTelemetry = _mergeTelemetryForContact(
+        existingTelemetry: previousTelemetry,
+        incomingTelemetry: telemetry,
+      );
+      if (mergedTelemetry != null) {
+        if (_shouldRetainLastValidGps(
+          previousTelemetry,
+          telemetry.gpsLocation,
+        )) {
+          debugPrint(
+            '  ⚠️ Retaining last valid GPS. Incoming telemetry GPS is invalid/missing: $incomingGps',
+          );
+        }
+        telemetry = mergedTelemetry;
       }
 
       // Update contact with new telemetry AND last seen time
@@ -448,6 +477,42 @@ class ContactsProvider with ChangeNotifier {
     }
   }
 
+  void updateFastGps(Uint8List publicKeyPrefix, FastGpsPacket packet) {
+    final contact = _findContactByPrefix(publicKeyPrefix);
+    if (contact == null) {
+      debugPrint(
+        '⚠️ [ContactsProvider] Fast GPS sender not found: ${packet.senderKey6}',
+      );
+      return;
+    }
+
+    final updatedTelemetry = _mergeTelemetryForContact(
+      existingTelemetry: contact.telemetry,
+      incomingTelemetry: ContactTelemetry(
+        gpsLocation: LatLng(packet.latitude, packet.longitude),
+        batteryPercentage: null,
+        batteryMilliVolts: null,
+        temperature: null,
+        timestamp: DateTime.fromMillisecondsSinceEpoch(
+          packet.timestampSeconds * 1000,
+        ),
+        humidity: null,
+        pressure: null,
+        extraSensorData: null,
+      ),
+    );
+
+    final updatedContact = contact.copyWith(
+      telemetry: updatedTelemetry,
+      lastAdvert: packet.timestampSeconds,
+      advLat: _coordinateToAdvertMicrodegrees(packet.latitude),
+      advLon: _coordinateToAdvertMicrodegrees(packet.longitude),
+    );
+    _contacts[contact.publicKeyHex] = updatedContact;
+    _persistContacts();
+    notifyListeners();
+  }
+
   bool _isInvalidTelemetryGps(LatLng? location) {
     if (location == null) return false;
     final lat = location.latitude;
@@ -467,15 +532,12 @@ class ContactsProvider with ChangeNotifier {
     return location;
   }
 
-  bool _shouldRetainLastValidGps(Contact contact, LatLng? incomingGps) {
-    final isSupportedType =
-        contact.isChat || contact.isRepeater || contact.isRoom;
-    if (!isSupportedType) {
-      return false;
-    }
-
+  bool _shouldRetainLastValidGps(
+    ContactTelemetry? existingTelemetry,
+    LatLng? incomingGps,
+  ) {
     final hasPreviousValidGps =
-        _getValidGpsOrNull(contact.telemetry?.gpsLocation) != null;
+        _getValidGpsOrNull(existingTelemetry?.gpsLocation) != null;
     if (!hasPreviousValidGps) {
       return false;
     }
@@ -483,6 +545,42 @@ class ContactsProvider with ChangeNotifier {
     return incomingGps == null;
   }
 
+  ContactTelemetry? _mergeTelemetryForContact({
+    ContactTelemetry? existingTelemetry,
+    ContactTelemetry? incomingTelemetry,
+  }) {
+    if (incomingTelemetry == null) {
+      return existingTelemetry;
+    }
+
+    // Telemetry packets and contact refreshes are often sparse. Preserve the
+    // last known reading for any field that is omitted in the incoming update.
+    final incomingGps = _getValidGpsOrNull(incomingTelemetry.gpsLocation);
+    final previousGps = _getValidGpsOrNull(existingTelemetry?.gpsLocation);
+    final mergedExtraSensorData = <String, dynamic>{
+      ...?existingTelemetry?.extraSensorData,
+      ...?incomingTelemetry.extraSensorData,
+    };
+
+    return ContactTelemetry(
+      gpsLocation: incomingGps ?? previousGps,
+      batteryPercentage:
+          incomingTelemetry.batteryPercentage ??
+          existingTelemetry?.batteryPercentage,
+      batteryMilliVolts:
+          incomingTelemetry.batteryMilliVolts ??
+          existingTelemetry?.batteryMilliVolts,
+      temperature:
+          incomingTelemetry.temperature ?? existingTelemetry?.temperature,
+      timestamp: incomingTelemetry.timestamp,
+      humidity: incomingTelemetry.humidity ?? existingTelemetry?.humidity,
+      pressure: incomingTelemetry.pressure ?? existingTelemetry?.pressure,
+      extraSensorData: mergedExtraSensorData.isEmpty
+          ? null
+          : mergedExtraSensorData,
+    );
+  }
+
   int _coordinateToAdvertMicrodegrees(double coordinate) {
     return (coordinate * 1e6).round();
   }

lib/providers/sensors_provider.dart

@@ -10,36 +10,28 @@ import 'contacts_provider.dart';
 
 enum SensorRefreshState { idle, refreshing, success, timeout, unavailable }
 
-enum SensorMetric {
-  lastSeen,
-  voltage,
-  battery,
-  temperature,
-  humidity,
-  pressure,
-  gps,
-  updated,
-}
-
 class SensorsProvider with ChangeNotifier {
+  static const Duration _successStateRetention = Duration(minutes: 1);
   static const String _watchedSensorsKey = 'watched_sensor_keys';
   static const String _visibleSensorMetricsKey = 'visible_sensor_metrics';
-  static const Set<SensorMetric> _defaultVisibleMetrics = <SensorMetric>{
-    SensorMetric.lastSeen,
-    SensorMetric.voltage,
-    SensorMetric.battery,
-    SensorMetric.temperature,
-    SensorMetric.humidity,
-    SensorMetric.pressure,
-    SensorMetric.gps,
-    SensorMetric.updated,
+  static const String _fieldSpanKey = 'sensor_field_spans';
+  static const Set<String> _defaultVisibleFields = <String>{
+    'voltage',
+    'battery',
+    'temperature',
+    'humidity',
+    'pressure',
+    'gps',
   };
 
   final List<String> _watchedSensorKeys = <String>[];
   final Map<String, SensorRefreshState> _refreshStates =
       <String, SensorRefreshState>{};
-  final Map<String, Set<SensorMetric>> _visibleMetricsBySensor =
-      <String, Set<SensorMetric>>{};
+  final Map<String, DateTime> _refreshStateUpdatedAt = <String, DateTime>{};
+  final Map<String, Set<String>> _visibleFieldsBySensor =
+      <String, Set<String>>{};
+  final Map<String, Map<String, int>> _fieldSpansBySensor =
+      <String, Map<String, int>>{};
   bool _isLoaded = false;
   bool _isRefreshingAll = false;
 
@@ -59,25 +51,33 @@ class SensorsProvider with ChangeNotifier {
       final prefs = await SharedPreferences.getInstance();
       final stored = prefs.getStringList(_watchedSensorsKey) ?? <String>[];
       final storedMetricsJson = prefs.getString(_visibleSensorMetricsKey);
+      final storedSpansJson = prefs.getString(_fieldSpanKey);
       _watchedSensorKeys
         ..clear()
         ..addAll(stored);
-      _visibleMetricsBySensor.clear();
+      _visibleFieldsBySensor.clear();
+      _fieldSpansBySensor.clear();
       if (storedMetricsJson != null && storedMetricsJson.isNotEmpty) {
         final decoded = jsonDecode(storedMetricsJson) as Map<String, dynamic>;
         for (final entry in decoded.entries) {
-          final metricNames = (entry.value as List<dynamic>).cast<String>();
-          _visibleMetricsBySensor[entry.key] = metricNames
-              .map(_metricFromName)
-              .whereType<SensorMetric>()
+          _visibleFieldsBySensor[entry.key] = (entry.value as List<dynamic>)
+              .cast<String>()
               .toSet();
         }
       }
+      if (storedSpansJson != null && storedSpansJson.isNotEmpty) {
+        final decoded = jsonDecode(storedSpansJson) as Map<String, dynamic>;
+        for (final entry in decoded.entries) {
+          _fieldSpansBySensor[entry.key] = (entry.value as Map<String, dynamic>)
+              .map((key, value) => MapEntry(key, value as int));
+        }
+      }
       for (final key in _watchedSensorKeys) {
-        _visibleMetricsBySensor.putIfAbsent(
+        _visibleFieldsBySensor.putIfAbsent(
           key,
-          () => Set<SensorMetric>.from(_defaultVisibleMetrics),
+          () => Set<String>.from(_defaultVisibleFields),
         );
+        _fieldSpansBySensor.putIfAbsent(key, () => <String, int>{});
       }
     } catch (e) {
       debugPrint('Error loading watched sensors: $e');
@@ -100,8 +100,8 @@ class SensorsProvider with ChangeNotifier {
     try {
       final prefs = await SharedPreferences.getInstance();
       final encoded = <String, List<String>>{};
-      for (final entry in _visibleMetricsBySensor.entries) {
-        encoded[entry.key] = entry.value.map((metric) => metric.name).toList();
+      for (final entry in _visibleFieldsBySensor.entries) {
+        encoded[entry.key] = entry.value.toList();
       }
       await prefs.setString(_visibleSensorMetricsKey, jsonEncode(encoded));
     } catch (e) {
@@ -109,35 +109,63 @@ class SensorsProvider with ChangeNotifier {
     }
   }
 
-  Set<SensorMetric> visibleMetricsFor(String publicKeyHex) =>
-      Set<SensorMetric>.unmodifiable(
-        _visibleMetricsBySensor[publicKeyHex] ?? _defaultVisibleMetrics,
-      );
+  Future<void> _persistFieldSpans() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString(_fieldSpanKey, jsonEncode(_fieldSpansBySensor));
+    } catch (e) {
+      debugPrint('Error saving sensor field spans: $e');
+    }
+  }
 
-  bool showsMetric(String publicKeyHex, SensorMetric metric) =>
-      visibleMetricsFor(publicKeyHex).contains(metric);
+  Set<String> visibleFieldsFor(String publicKeyHex) => Set<String>.unmodifiable(
+    _visibleFieldsBySensor[publicKeyHex] ?? _defaultVisibleFields,
+  );
+
+  bool showsField(String publicKeyHex, String fieldKey) =>
+      visibleFieldsFor(publicKeyHex).contains(fieldKey);
+
+  int fieldSpanFor(String publicKeyHex, String fieldKey) {
+    final sensorSpans = _fieldSpansBySensor[publicKeyHex];
+    final span = sensorSpans?[fieldKey] ?? 1;
+    return span == 2 ? 2 : 1;
+  }
 
   Future<void> toggleMetric(
     String publicKeyHex,
-    SensorMetric metric,
+    String fieldKey,
     bool visible,
   ) async {
-    final visibleMetrics = _visibleMetricsBySensor.putIfAbsent(
+    final visibleFields = _visibleFieldsBySensor.putIfAbsent(
       publicKeyHex,
-      () => Set<SensorMetric>.from(_defaultVisibleMetrics),
+      () => Set<String>.from(_defaultVisibleFields),
     );
     if (visible) {
-      visibleMetrics.add(metric);
+      visibleFields.add(fieldKey);
     } else {
-      if (visibleMetrics.length == 1 && visibleMetrics.contains(metric)) {
+      if (visibleFields.length == 1 && visibleFields.contains(fieldKey)) {
         return;
       }
-      visibleMetrics.remove(metric);
+      visibleFields.remove(fieldKey);
     }
     await _persistVisibleMetrics();
     notifyListeners();
   }
 
+  Future<void> setFieldSpan(
+    String publicKeyHex,
+    String fieldKey,
+    int span,
+  ) async {
+    final sensorSpans = _fieldSpansBySensor.putIfAbsent(
+      publicKeyHex,
+      () => <String, int>{},
+    );
+    sensorSpans[fieldKey] = span == 2 ? 2 : 1;
+    await _persistFieldSpans();
+    notifyListeners();
+  }
+
   bool isWatched(String publicKeyHex) =>
       _watchedSensorKeys.contains(publicKeyHex);
 
@@ -151,19 +179,24 @@ class SensorsProvider with ChangeNotifier {
 
     _watchedSensorKeys.add(contact.publicKeyHex);
     await _persistWatchedSensors();
-    _visibleMetricsBySensor[contact.publicKeyHex] = Set<SensorMetric>.from(
-      _defaultVisibleMetrics,
+    _visibleFieldsBySensor[contact.publicKeyHex] = Set<String>.from(
+      _defaultVisibleFields,
     );
+    _fieldSpansBySensor[contact.publicKeyHex] = <String, int>{'gps': 2};
     await _persistVisibleMetrics();
+    await _persistFieldSpans();
     notifyListeners();
   }
 
   Future<void> removeSensor(String publicKeyHex) async {
     _watchedSensorKeys.remove(publicKeyHex);
     _refreshStates.remove(publicKeyHex);
-    _visibleMetricsBySensor.remove(publicKeyHex);
+    _refreshStateUpdatedAt.remove(publicKeyHex);
+    _visibleFieldsBySensor.remove(publicKeyHex);
+    _fieldSpansBySensor.remove(publicKeyHex);
     await _persistWatchedSensors();
     await _persistVisibleMetrics();
+    await _persistFieldSpans();
     notifyListeners();
   }
 
@@ -190,31 +223,11 @@ class SensorsProvider with ChangeNotifier {
 
     try {
       for (final key in _watchedSensorKeys) {
-        Contact? contact;
-        for (final entry in contactsProvider.contacts) {
-          if (entry.publicKeyHex == key) {
-            contact = entry;
-            break;
-          }
-        }
-        if (contact == null) {
-          _refreshStates[key] = SensorRefreshState.unavailable;
-          notifyListeners();
-          continue;
-        }
-
-        _refreshStates[key] = SensorRefreshState.refreshing;
-        notifyListeners();
-
-        final result = await connectionProvider.smartPing(
-          contactPublicKey: contact.publicKey,
-          hasPath: contact.hasPath,
+        await refreshSensor(
+          publicKeyHex: key,
+          contactsProvider: contactsProvider,
+          connectionProvider: connectionProvider,
         );
-
-        _refreshStates[key] = result.success
-            ? SensorRefreshState.success
-            : SensorRefreshState.timeout;
-        notifyListeners();
       }
     } finally {
       _isRefreshingAll = false;
@@ -222,12 +235,66 @@ class SensorsProvider with ChangeNotifier {
     }
   }
 
-  SensorMetric? _metricFromName(String name) {
-    for (final metric in SensorMetric.values) {
-      if (metric.name == name) {
-        return metric;
+  Future<void> refreshSensor({
+    required String publicKeyHex,
+    required ContactsProvider contactsProvider,
+    required ConnectionProvider connectionProvider,
+  }) async {
+    Contact? contact;
+    for (final entry in contactsProvider.contacts) {
+      if (entry.publicKeyHex == publicKeyHex) {
+        contact = entry;
+        break;
       }
     }
-    return null;
+
+    if (contact == null) {
+      _setRefreshState(publicKeyHex, SensorRefreshState.unavailable);
+      return;
+    }
+
+    _setRefreshState(publicKeyHex, SensorRefreshState.refreshing);
+
+    final result = await connectionProvider.smartPing(
+      contactPublicKey: contact.publicKey,
+      hasPath: contact.hasPath,
+    );
+
+    _setRefreshState(
+      publicKeyHex,
+      result.success ? SensorRefreshState.success : SensorRefreshState.timeout,
+    );
+  }
+
+  void clearExpiredRefreshStates({DateTime? now}) {
+    final cutoff = (now ?? DateTime.now()).subtract(_successStateRetention);
+    final keysToClear = <String>[];
+
+    for (final entry in _refreshStates.entries) {
+      if (entry.value != SensorRefreshState.success) {
+        continue;
+      }
+
+      final updatedAt = _refreshStateUpdatedAt[entry.key];
+      if (updatedAt == null || !updatedAt.isAfter(cutoff)) {
+        keysToClear.add(entry.key);
+      }
+    }
+
+    if (keysToClear.isEmpty) {
+      return;
+    }
+
+    for (final key in keysToClear) {
+      _refreshStates.remove(key);
+      _refreshStateUpdatedAt.remove(key);
+    }
+    notifyListeners();
+  }
+
+  void _setRefreshState(String publicKeyHex, SensorRefreshState state) {
+    _refreshStates[publicKeyHex] = state;
+    _refreshStateUpdatedAt[publicKeyHex] = DateTime.now();
+    notifyListeners();
   }
 }

lib/screens/device_config_screen.dart

@@ -398,26 +398,51 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
   Widget build(BuildContext context) {
     final deviceInfo = context.watch<ConnectionProvider>().deviceInfo;
     final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final locationSet =
+        (deviceInfo.advLat != null && deviceInfo.advLat != 0) ||
+        (deviceInfo.advLon != null && deviceInfo.advLon != 0);
 
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
-      body: ListView(
-        padding: const EdgeInsets.all(16),
-        children: [
-          // Device Info Card
-          Card(
-            child: Padding(
-              padding: const EdgeInsets.all(16),
+      body: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.fromLTRB(16, 12, 16, 24),
+          children: [
+            _ConfigHeroCard(
+              title: deviceInfo.selfName ?? deviceInfo.deviceName ?? 'MeshCore',
+              subtitle:
+                  '${_getDeviceTypeString(context, deviceInfo.deviceType)} • ${deviceInfo.semanticVersion ?? deviceInfo.manufacturerModel ?? AppLocalizations.of(context)!.unknown}',
+              chips: [
+                _StatusChipData(
+                  icon: Icons.bluetooth,
+                  label:
+                      '${AppLocalizations.of(context)!.bleName}: ${deviceInfo.deviceName ?? AppLocalizations.of(context)!.unknown}',
+                ),
+                _StatusChipData(
+                  icon: Icons.my_location,
+                  label: locationSet ? 'Location ready' : 'Location off',
+                  emphasized: locationSet,
+                ),
+                _StatusChipData(
+                  icon: Icons.settings_input_antenna,
+                  label: '${_freqController.text} MHz • $_selectedBandwidth',
+                ),
+                _StatusChipData(
+                  icon: Icons.key,
+                  label: 'FW v${deviceInfo.firmwareVersion?.toString() ?? "?"}',
+                ),
+              ],
+            ),
+            const SizedBox(height: 20),
+            _ConfigSectionCard(
+              title: AppLocalizations.of(context)!.deviceInformation,
+              subtitle:
+                  '${deviceInfo.manufacturerModel ?? AppLocalizations.of(context)!.unknown} • ${deviceInfo.firmwareBuildDate ?? AppLocalizations.of(context)!.unknown}',
+              icon: Icons.memory_rounded,
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(
-                    AppLocalizations.of(context)!.deviceInformation,
-                    style: theme.textTheme.titleLarge?.copyWith(
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  const SizedBox(height: 16),
                   _InfoRow(
                     AppLocalizations.of(context)!.bleName,
                     deviceInfo.deviceName ??
@@ -467,42 +492,75 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                 ],
               ),
             ),
-          ),
-
-          const SizedBox(height: 24),
-
-          // Public Info Section
-          Card(
-            child: Padding(
-              padding: const EdgeInsets.all(16),
+            const SizedBox(height: 20),
+            _ConfigSectionCard(
+              title: AppLocalizations.of(context)!.publicInfo,
+              subtitle: AppLocalizations.of(context)!.nameBroadcastInMesh,
+              icon: Icons.public_rounded,
+              trailing: FilledButton.icon(
+                onPressed: _savePublicInfo,
+                icon: const Icon(Icons.save_outlined),
+                label: Text(AppLocalizations.of(context)!.save),
+              ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        AppLocalizations.of(context)!.publicInfo,
-                        style: theme.textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.bold,
+                  Container(
+                    padding: const EdgeInsets.all(14),
+                    decoration: BoxDecoration(
+                      color: colorScheme.surfaceContainerHighest.withValues(
+                        alpha: 0.45,
+                      ),
+                      borderRadius: BorderRadius.circular(18),
+                    ),
+                    child: Row(
+                      children: [
+                        Icon(
+                          _telemetryEnabled
+                              ? Icons.travel_explore
+                              : Icons.location_disabled,
+                          color: _telemetryEnabled
+                              ? colorScheme.primary
+                              : colorScheme.onSurfaceVariant,
                         ),
-                      ),
-                      Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          const SizedBox(width: 8),
-                          IconButton.filled(
-                            onPressed: _savePublicInfo,
-                            icon: const Icon(Icons.save),
-                            tooltip: AppLocalizations.of(context)!.save,
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                AppLocalizations.of(
+                                  context,
+                                )!.telemetryAndLocationSharing,
+                                style: theme.textTheme.titleSmall?.copyWith(
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                              const SizedBox(height: 2),
+                              Text(
+                                _telemetryEnabled
+                                    ? 'This device advertises position data to the mesh.'
+                                    : 'Position broadcasting is currently disabled.',
+                                style: theme.textTheme.bodySmall?.copyWith(
+                                  color: colorScheme.onSurfaceVariant,
+                                ),
+                              ),
+                            ],
                           ),
-                        ],
-                      ),
-                    ],
+                        ),
+                        const SizedBox(width: 12),
+                        Switch(
+                          value: _telemetryEnabled,
+                          onChanged: (value) {
+                            setState(() {
+                              _telemetryEnabled = value;
+                            });
+                          },
+                        ),
+                      ],
+                    ),
                   ),
-                  const SizedBox(height: 16),
-
-                  // Mesh Network Name
+                  const SizedBox(height: 18),
                   TextField(
                     controller: _nameController,
                     decoration: InputDecoration(
@@ -513,62 +571,21 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                       )!.nameBroadcastInMesh,
                     ),
                   ),
-                  const SizedBox(height: 8),
-
-                  // Telemetry Toggle - Compact version
-                  Row(
-                    children: [
-                      Expanded(
-                        child: Text(
-                          AppLocalizations.of(
-                            context,
-                          )!.telemetryAndLocationSharing,
-                          style: theme.textTheme.bodyMedium,
-                        ),
-                      ),
-                      Switch(
-                        value: _telemetryEnabled,
-                        onChanged: (value) {
-                          setState(() {
-                            _telemetryEnabled = value;
-                          });
-                        },
-                      ),
-                    ],
-                  ),
-
-                  // GPS Coordinates (only show if telemetry enabled)
                   if (_telemetryEnabled) ...[
-                    const SizedBox(height: 12),
+                    const SizedBox(height: 16),
                     Row(
                       children: [
                         Expanded(
-                          child: TextField(
+                          child: _CompactCoordinateField(
                             controller: _latController,
-                            decoration: InputDecoration(
-                              labelText: AppLocalizations.of(context)!.lat,
-                              border: const OutlineInputBorder(),
-                              isDense: true,
-                            ),
-                            keyboardType: const TextInputType.numberWithOptions(
-                              decimal: true,
-                              signed: true,
-                            ),
+                            label: AppLocalizations.of(context)!.lat,
                           ),
                         ),
                         const SizedBox(width: 8),
                         Expanded(
-                          child: TextField(
+                          child: _CompactCoordinateField(
                             controller: _lonController,
-                            decoration: InputDecoration(
-                              labelText: AppLocalizations.of(context)!.lon,
-                              border: const OutlineInputBorder(),
-                              isDense: true,
-                            ),
-                            keyboardType: const TextInputType.numberWithOptions(
-                              decimal: true,
-                              signed: true,
-                            ),
+                            label: AppLocalizations.of(context)!.lon,
                           ),
                         ),
                         const SizedBox(width: 8),
@@ -585,36 +602,45 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                 ],
               ),
             ),
-          ),
-
-          const SizedBox(height: 24),
-
-          // Radio Settings Section
-          Card(
-            child: Padding(
-              padding: const EdgeInsets.all(16),
+            const SizedBox(height: 20),
+            _ConfigSectionCard(
+              title: AppLocalizations.of(context)!.radioSettings,
+              subtitle:
+                  '${_freqController.text} MHz • SF$_selectedSpreadingFactor • CR$_selectedCodingRate',
+              icon: Icons.settings_input_antenna_rounded,
+              trailing: FilledButton.icon(
+                onPressed: _saveRadioSettings,
+                icon: const Icon(Icons.save_outlined),
+                label: Text(AppLocalizations.of(context)!.save),
+              ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      Text(
-                        AppLocalizations.of(context)!.radioSettings,
-                        style: theme.textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.bold,
+                      Expanded(
+                        child: _RadioMetricTile(
+                          label: AppLocalizations.of(context)!.bandwidth,
+                          value: _selectedBandwidth,
                         ),
                       ),
-                      IconButton.filled(
-                        onPressed: _saveRadioSettings,
-                        icon: const Icon(Icons.save),
-                        tooltip: AppLocalizations.of(context)!.save,
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: _RadioMetricTile(
+                          label: AppLocalizations.of(context)!.spreadingFactor,
+                          value: 'SF$_selectedSpreadingFactor',
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: _RadioMetricTile(
+                          label: AppLocalizations.of(context)!.codingRate,
+                          value: 'CR$_selectedCodingRate',
+                        ),
                       ),
                     ],
                   ),
                   const SizedBox(height: 16),
-
-                  // LoRa Frequency
                   TextField(
                     controller: _freqController,
                     decoration: InputDecoration(
@@ -629,8 +655,6 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     ),
                   ),
                   const SizedBox(height: 16),
-
-                  // Bandwidth
                   DropdownButtonFormField<String>(
                     initialValue: _selectedBandwidth,
                     decoration: InputDecoration(
@@ -652,8 +676,6 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     },
                   ),
                   const SizedBox(height: 16),
-
-                  // Spreading Factor
                   DropdownButtonFormField<int>(
                     initialValue: _selectedSpreadingFactor,
                     decoration: InputDecoration(
@@ -677,8 +699,6 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     },
                   ),
                   const SizedBox(height: 16),
-
-                  // Coding Rate
                   DropdownButtonFormField<int>(
                     initialValue: _selectedCodingRate,
                     decoration: InputDecoration(
@@ -702,8 +722,6 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     },
                   ),
                   const SizedBox(height: 16),
-
-                  // TX Power
                   TextField(
                     controller: _txPowerController,
                     decoration: InputDecoration(
@@ -715,37 +733,42 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
                     ),
                     keyboardType: TextInputType.number,
                   ),
-
-                  // Repeat Mode (firmware v9+)
                   if (deviceInfo.clientRepeat != null) ...[
-                    const SizedBox(height: 8),
-                    SwitchListTile(
-                      contentPadding: EdgeInsets.zero,
-                      title: const Text('Client Repeat Mode'),
-                      subtitle:
-                          deviceInfo.allowedRepeatFreqRanges != null &&
-                              deviceInfo.allowedRepeatFreqRanges!.isNotEmpty
-                          ? Text(
-                              'Allowed: ${deviceInfo.allowedRepeatFreqRanges!.map((r) => r.lower == r.upper ? '${(r.lower / 1000).toStringAsFixed(3)} MHz' : '${(r.lower / 1000).toStringAsFixed(3)}–${(r.upper / 1000).toStringAsFixed(3)} MHz').join(', ')}',
-                            )
-                          : const Text(
-                              'Repeat packets on behalf of nearby nodes',
-                            ),
-                      value: _repeatEnabled,
-                      onChanged: (value) {
-                        setState(() {
-                          _repeatEnabled = value;
-                        });
-                      },
+                    const SizedBox(height: 16),
+                    Container(
+                      padding: const EdgeInsets.all(14),
+                      decoration: BoxDecoration(
+                        color: colorScheme.surfaceContainerHighest.withValues(
+                          alpha: 0.45,
+                        ),
+                        borderRadius: BorderRadius.circular(18),
+                      ),
+                      child: SwitchListTile(
+                        contentPadding: EdgeInsets.zero,
+                        title: const Text('Client Repeat Mode'),
+                        subtitle:
+                            deviceInfo.allowedRepeatFreqRanges != null &&
+                                deviceInfo.allowedRepeatFreqRanges!.isNotEmpty
+                            ? Text(
+                                'Allowed: ${deviceInfo.allowedRepeatFreqRanges!.map((r) => r.lower == r.upper ? '${(r.lower / 1000).toStringAsFixed(3)} MHz' : '${(r.lower / 1000).toStringAsFixed(3)}–${(r.upper / 1000).toStringAsFixed(3)} MHz').join(', ')}',
+                              )
+                            : const Text(
+                                'Repeat packets on behalf of nearby nodes',
+                              ),
+                        value: _repeatEnabled,
+                        onChanged: (value) {
+                          setState(() {
+                            _repeatEnabled = value;
+                          });
+                        },
+                      ),
                     ),
                   ],
                 ],
               ),
             ),
-          ),
-
-          const SizedBox(height: 24),
-        ],
+          ],
+        ),
       ),
     );
   }
@@ -772,6 +795,276 @@ class _DeviceConfigScreenState extends State<DeviceConfigScreen> {
   }
 }
 
+class _ConfigHeroCard extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final List<_StatusChipData> chips;
+
+  const _ConfigHeroCard({
+    required this.title,
+    required this.subtitle,
+    required this.chips,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          colors: [
+            colorScheme.primaryContainer,
+            colorScheme.surfaceContainerHighest,
+          ],
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+        ),
+        borderRadius: BorderRadius.circular(28),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Container(
+                width: 52,
+                height: 52,
+                decoration: BoxDecoration(
+                  color: colorScheme.onPrimaryContainer.withValues(alpha: 0.12),
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Icon(
+                  Icons.tune_rounded,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+              ),
+              const SizedBox(width: 14),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      title,
+                      style: theme.textTheme.headlineSmall?.copyWith(
+                        fontWeight: FontWeight.w800,
+                        color: colorScheme.onPrimaryContainer,
+                      ),
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      subtitle,
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        color: colorScheme.onPrimaryContainer.withValues(
+                          alpha: 0.82,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 18),
+          Wrap(
+            spacing: 10,
+            runSpacing: 10,
+            children: chips.map(_StatusChip.new).toList(),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ConfigSectionCard extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final IconData icon;
+  final Widget child;
+  final Widget? trailing;
+
+  const _ConfigSectionCard({
+    required this.title,
+    required this.subtitle,
+    required this.icon,
+    required this.child,
+    this.trailing,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(18),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Container(
+                  width: 42,
+                  height: 42,
+                  decoration: BoxDecoration(
+                    color: colorScheme.primary.withValues(alpha: 0.10),
+                    borderRadius: BorderRadius.circular(14),
+                  ),
+                  child: Icon(icon, color: colorScheme.primary),
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        title,
+                        style: theme.textTheme.titleLarge?.copyWith(
+                          fontWeight: FontWeight.w800,
+                        ),
+                      ),
+                      const SizedBox(height: 3),
+                      Text(
+                        subtitle,
+                        style: theme.textTheme.bodySmall?.copyWith(
+                          color: colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                if (trailing != null) ...[const SizedBox(width: 12), trailing!],
+              ],
+            ),
+            const SizedBox(height: 18),
+            child,
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _StatusChipData {
+  final IconData icon;
+  final String label;
+  final bool emphasized;
+
+  const _StatusChipData({
+    required this.icon,
+    required this.label,
+    this.emphasized = false,
+  });
+}
+
+class _StatusChip extends StatelessWidget {
+  final _StatusChipData data;
+
+  const _StatusChip(this.data);
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final chipColor = data.emphasized
+        ? colorScheme.primary.withValues(alpha: 0.14)
+        : colorScheme.onPrimaryContainer.withValues(alpha: 0.10);
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+      decoration: BoxDecoration(
+        color: chipColor,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(data.icon, size: 16, color: colorScheme.onPrimaryContainer),
+          const SizedBox(width: 8),
+          Text(
+            data.label,
+            style: theme.textTheme.labelLarge?.copyWith(
+              color: colorScheme.onPrimaryContainer,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _CompactCoordinateField extends StatelessWidget {
+  final TextEditingController controller;
+  final String label;
+
+  const _CompactCoordinateField({
+    required this.controller,
+    required this.label,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return TextField(
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: label,
+        border: const OutlineInputBorder(),
+        isDense: true,
+      ),
+      keyboardType: const TextInputType.numberWithOptions(
+        decimal: true,
+        signed: true,
+      ),
+    );
+  }
+}
+
+class _RadioMetricTile extends StatelessWidget {
+  final String label;
+  final String value;
+
+  const _RadioMetricTile({required this.label, required this.value});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.45),
+        borderRadius: BorderRadius.circular(18),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            label,
+            style: theme.textTheme.labelMedium?.copyWith(
+              color: colorScheme.onSurfaceVariant,
+            ),
+          ),
+          const SizedBox(height: 6),
+          Text(
+            value,
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w800,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
 class _InfoRow extends StatelessWidget {
   final String label;
   final String value;

lib/screens/home_screen.dart

@@ -14,7 +14,6 @@ import 'messages_tab.dart';
 import 'contacts_tab.dart';
 import 'sensors_tab.dart';
 import 'map_tab.dart';
-import 'map_management_screen.dart';
 import 'settings_screen.dart';
 import 'device_config_screen.dart';
 import 'packet_log_screen.dart';
@@ -27,6 +26,8 @@ import '../utils/battery_display_helper.dart';
 
 enum _HomeTab { messages, contacts, sensors, map }
 
+enum _AdvertMode { flood, direct }
+
 class HomeScreen extends StatefulWidget {
   final Function(AppThemeMode) onThemeChanged;
   final Function(Locale?) onLocaleChanged;
@@ -47,7 +48,8 @@ class HomeScreen extends StatefulWidget {
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
-class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
+class _HomeScreenState extends State<HomeScreen>
+    with TickerProviderStateMixin, WidgetsBindingObserver {
   late TabController _tabController;
   late final AppProvider _appProvider;
   int _currentIndex = 0;
@@ -56,6 +58,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
   bool _isMapEnabled = true;
   bool _isContactsEnabled = true;
   bool _isSensorsEnabled = false;
+  AppLifecycleState _lifecycleState = AppLifecycleState.resumed;
 
   List<_HomeTab> get _enabledTabs {
     return [
@@ -77,6 +80,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     _appProvider = context.read<AppProvider>();
     _isMapEnabled = _appProvider.isMapEnabled;
     _isContactsEnabled = _appProvider.isContactsEnabled;
@@ -182,6 +186,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
   }
 
   void _handleTabActivated(_HomeTab tab) {
+    _syncFastLocationUiState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
 
@@ -200,6 +205,20 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     });
   }
 
+  void _syncFastLocationUiState() {
+    final isActiveTab =
+        _currentTab == _HomeTab.map || _currentTab == _HomeTab.messages;
+    _appProvider.setFastLocationUiActive(
+      _lifecycleState == AppLifecycleState.resumed && isActiveTab,
+    );
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    _lifecycleState = state;
+    _syncFastLocationUiState();
+  }
+
   Future<void> _loadRxTxPreference() async {
     final prefs = await SharedPreferences.getInstance();
     if (mounted) {
@@ -211,6 +230,8 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
 
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _appProvider.setFastLocationUiActive(false);
     _appProvider.removeListener(_handleAppProviderChanged);
     _tabController.removeListener(_onTabChanged);
     _tabController.dispose();
@@ -245,7 +266,187 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
     );
   }
 
-  Future<void> _advertiseDevice(BuildContext context) async {
+  Future<void> _triggerAdvertFeedback() async {
+    final platform = Theme.of(context).platform;
+
+    try {
+      if (platform == TargetPlatform.iOS) {
+        await HapticFeedback.lightImpact();
+        await Future.delayed(const Duration(milliseconds: 50));
+        await HapticFeedback.lightImpact();
+      } else {
+        if (await Vibration.hasVibrator()) {
+          await Vibration.vibrate(duration: 50);
+        } else {
+          await HapticFeedback.mediumImpact();
+        }
+      }
+    } catch (e) {
+      debugPrint('Haptic feedback error: $e');
+      await HapticFeedback.vibrate();
+    }
+  }
+
+  Future<_AdvertMode?> _showAdvertModeSheet(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    final theme = Theme.of(context);
+
+    return showModalBottomSheet<_AdvertMode>(
+      context: context,
+      showDragHandle: true,
+      builder: (context) => SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'Advert mode',
+                style: theme.textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              const SizedBox(height: 6),
+              Text(
+                'Choose how far this announcement should travel.',
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  color: theme.colorScheme.onSurfaceVariant,
+                ),
+              ),
+              const SizedBox(height: 16),
+              ListTile(
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 4,
+                  vertical: 4,
+                ),
+                leading: Container(
+                  width: 40,
+                  height: 40,
+                  decoration: BoxDecoration(
+                    color: theme.colorScheme.primaryContainer,
+                    borderRadius: BorderRadius.circular(14),
+                  ),
+                  child: Icon(
+                    Icons.hub_rounded,
+                    color: theme.colorScheme.onPrimaryContainer,
+                  ),
+                ),
+                title: Text(l10n.flood),
+                subtitle: const Text('Relay through repeaters across the mesh'),
+                trailing: const Icon(Icons.chevron_right_rounded),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20),
+                ),
+                onTap: () => Navigator.of(context).pop(_AdvertMode.flood),
+              ),
+              const SizedBox(height: 8),
+              ListTile(
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 4,
+                  vertical: 4,
+                ),
+                leading: Container(
+                  width: 40,
+                  height: 40,
+                  decoration: BoxDecoration(
+                    color: theme.colorScheme.secondaryContainer,
+                    borderRadius: BorderRadius.circular(14),
+                  ),
+                  child: Icon(
+                    Icons.near_me_rounded,
+                    color: theme.colorScheme.onSecondaryContainer,
+                  ),
+                ),
+                title: Text(l10n.direct),
+                subtitle: const Text('Nearby only, without repeater flooding'),
+                trailing: const Icon(Icons.chevron_right_rounded),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(20),
+                ),
+                onTap: () => Navigator.of(context).pop(_AdvertMode.direct),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildActivityBadge({
+    required String label,
+    required int count,
+    required bool isActive,
+    required Color activeColor,
+  }) {
+    final color = isActive ? activeColor : Colors.grey;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.12),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Container(
+            width: 7,
+            height: 7,
+            decoration: BoxDecoration(shape: BoxShape.circle, color: color),
+          ),
+          const SizedBox(width: 6),
+          Text(
+            '$label:$count',
+            style: TextStyle(
+              fontSize: 11,
+              fontWeight: FontWeight.w600,
+              color: color,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCompactActivityIndicator({
+    required bool rxActive,
+    required bool txActive,
+  }) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+      decoration: BoxDecoration(
+        color: Colors.black.withValues(alpha: 0.06),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Container(
+            width: 7,
+            height: 7,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: rxActive ? Colors.green : Colors.grey,
+            ),
+          ),
+          const SizedBox(width: 6),
+          Container(
+            width: 7,
+            height: 7,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: txActive ? Colors.blue : Colors.grey,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _advertiseDevice(
+    BuildContext context, {
+    bool floodMode = true,
+  }) async {
     final connectionProvider = context.read<ConnectionProvider>();
 
     if (!connectionProvider.deviceInfo.isConnected) {
@@ -325,8 +526,14 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       // Small delay to ensure the lat/lon is set
       await Future.delayed(const Duration(milliseconds: 100));
 
-      // Send flood advertisement
-      await connectionProvider.sendSelfAdvert(floodMode: true);
+      await connectionProvider.sendSelfAdvert(floodMode: floodMode);
+
+      if (context.mounted) {
+        ToastLogger.success(
+          context,
+          floodMode ? 'Flood advert sent' : 'Direct advert sent',
+        );
+      }
     } catch (e) {
       debugPrint('❌ Failed to advertise device: $e');
       if (context.mounted) {
@@ -367,6 +574,8 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       appBar: shouldHideUI
           ? null
           : AppBar(
+              toolbarHeight: 64,
+              titleSpacing: 8,
               title: _buildCompactStatusBar(),
               actions: [
                 Consumer<ConnectionProvider>(
@@ -390,30 +599,6 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
                 PopupMenuButton(
                   icon: const Icon(Icons.more_vert),
                   itemBuilder: (context) => [
-                    PopupMenuItem(
-                      child: Row(
-                        children: [
-                          const Icon(Icons.map),
-                          const SizedBox(width: 8),
-                          Text(AppLocalizations.of(context)!.mapManagement),
-                        ],
-                      ),
-                      onTap: () {
-                        // Capture context-dependent objects before async gap
-                        final navigator = Navigator.of(context);
-                        final appProvider = context.read<AppProvider>();
-                        Future.delayed(Duration.zero, () {
-                          if (!mounted) return;
-                          navigator.push(
-                            MaterialPageRoute(
-                              builder: (context) => MapManagementScreen(
-                                tileCacheService: appProvider.tileCacheService,
-                              ),
-                            ),
-                          );
-                        });
-                      },
-                    ),
                     PopupMenuItem(
                       child: Row(
                         children: [
@@ -565,7 +750,6 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
         final deviceInfo = provider.deviceInfo;
         final isConnected = deviceInfo.isConnected;
         final isTcpConnected = provider.connectionMode == ConnectionMode.tcp;
-        final isBleConnected = isConnected && !isTcpConnected;
 
         if (!isConnected) {
           // Disconnected state: show connect button
@@ -627,241 +811,244 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
           );
         }
 
-        // Connected state: LEFT | CENTER | RIGHT layout
-        return Row(
-          children: [
-            // LEFT: Name + BT/Battery + Cog
-            Expanded(
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Flexible(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
+        final theme = Theme.of(context);
+        final subtitleColor = theme.colorScheme.onSurfaceVariant;
+        final signalColor = isTcpConnected
+            ? Colors.green
+            : (deviceInfo.signalRssi != null
+                  ? BatteryDisplayHelper.getSignalColor(deviceInfo.signalRssi!)
+                  : Colors.grey);
+
+        return LayoutBuilder(
+          builder: (context, constraints) {
+            final isTight = constraints.maxWidth < 360;
+
+            return Row(
+              children: [
+                Flexible(
+                  fit: FlexFit.loose,
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 8,
+                      vertical: 4,
+                    ),
+                    decoration: BoxDecoration(
+                      color: theme.colorScheme.surfaceContainerHighest
+                          .withValues(alpha: 0.55),
+                      borderRadius: BorderRadius.circular(22),
+                    ),
+                    child: Row(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        Text(
-                          deviceInfo.selfName ??
-                              AppLocalizations.of(context)!.appTitle,
-                          style: const TextStyle(
-                            fontSize: 18,
-                            fontWeight: FontWeight.bold,
+                        Flexible(
+                          fit: FlexFit.loose,
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                deviceInfo.selfName ??
+                                    AppLocalizations.of(context)!.appTitle,
+                                style:
+                                    (isTight
+                                            ? theme.textTheme.titleSmall
+                                            : theme.textTheme.titleMedium)
+                                        ?.copyWith(fontWeight: FontWeight.w700),
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                              const SizedBox(height: 2),
+                              Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  Icon(
+                                    isTcpConnected
+                                        ? Icons.wifi_rounded
+                                        : Icons.bluetooth_connected_rounded,
+                                    size: 13,
+                                    color: signalColor,
+                                  ),
+                                  if (!isTcpConnected &&
+                                      deviceInfo.signalRssi != null) ...[
+                                    const SizedBox(width: 4),
+                                    SizedBox(
+                                      width: 28,
+                                      child: Text(
+                                        '${deviceInfo.signalRssi}',
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          fontWeight: FontWeight.w600,
+                                          color: signalColor,
+                                        ),
+                                        maxLines: 1,
+                                      ),
+                                    ),
+                                  ],
+                                  if (deviceInfo.batteryPercent != null) ...[
+                                    const SizedBox(width: 8),
+                                    Icon(
+                                      BatteryDisplayHelper.getBatteryIcon(
+                                        deviceInfo.batteryPercent!,
+                                      ),
+                                      size: 13,
+                                      color:
+                                          BatteryDisplayHelper.getBatteryColor(
+                                            deviceInfo.batteryPercent!,
+                                          ),
+                                    ),
+                                    const SizedBox(width: 4),
+                                    SizedBox(
+                                      width: 30,
+                                      child: Text(
+                                        '${deviceInfo.batteryPercent!.round()}%',
+                                        overflow: TextOverflow.ellipsis,
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          fontWeight: FontWeight.w600,
+                                          color:
+                                              BatteryDisplayHelper.getBatteryColor(
+                                                deviceInfo.batteryPercent!,
+                                              ),
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ],
+                              ),
+                            ],
                           ),
-                          overflow: TextOverflow.ellipsis,
                         ),
-                        Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            Icon(
-                              isTcpConnected
-                                  ? Icons.wifi
-                                  : Icons.bluetooth_connected,
-                              color: isTcpConnected
-                                  ? Colors.green
-                                  : (deviceInfo.signalRssi != null
-                                        ? BatteryDisplayHelper.getSignalColor(
-                                            deviceInfo.signalRssi!,
-                                          )
-                                        : Colors.grey),
-                              size: 13,
+                        const SizedBox(width: 4),
+                        IconButton(
+                          onPressed: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (context) =>
+                                    const DeviceConfigScreen(),
+                              ),
+                            );
+                          },
+                          onLongPress: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (context) => PacketLogScreen(
+                                  bleService: provider.bleService,
+                                ),
+                              ),
+                            );
+                          },
+                          tooltip: AppLocalizations.of(context)!.settings,
+                          icon: const Icon(Icons.tune_rounded),
+                          color: subtitleColor,
+                          style: IconButton.styleFrom(
+                            backgroundColor: theme.colorScheme.surface,
+                            foregroundColor: subtitleColor,
+                            minimumSize: Size.square(isTight ? 38 : 40),
+                            padding: EdgeInsets.zero,
+                          ),
+                        ),
+                        const SizedBox(width: 4),
+                        GestureDetector(
+                          onTap: () async {
+                            await _triggerAdvertFeedback();
+                            if (!mounted || !context.mounted) return;
+                            await _advertiseDevice(context);
+                          },
+                          onLongPress: () async {
+                            await _triggerAdvertFeedback();
+                            if (!mounted || !context.mounted) return;
+
+                            final mode = await _showAdvertModeSheet(context);
+                            if (!mounted || !context.mounted || mode == null) {
+                              return;
+                            }
+
+                            await _advertiseDevice(
+                              context,
+                              floodMode: mode == _AdvertMode.flood,
+                            );
+                          },
+                          child: Container(
+                            width: isTight ? 38 : 40,
+                            height: isTight ? 38 : 40,
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                colors: [
+                                  theme.colorScheme.primary,
+                                  theme.colorScheme.primary.withValues(
+                                    alpha: 0.78,
+                                  ),
+                                ],
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                              ),
+                              borderRadius: BorderRadius.circular(12),
                             ),
-                            if (isBleConnected &&
-                                deviceInfo.signalRssi != null) ...[
-                              const SizedBox(width: 3),
-                              Text(
-                                '${deviceInfo.signalRssi}',
-                                style: TextStyle(
-                                  fontSize: 11,
-                                  color: BatteryDisplayHelper.getSignalColor(
-                                    deviceInfo.signalRssi!,
-                                  ),
-                                ),
-                              ),
-                            ],
-                            if (isTcpConnected) ...[
-                              const SizedBox(width: 3),
-                              Text(
-                                'WiFi',
-                                style: const TextStyle(
-                                  fontSize: 11,
-                                  color: Colors.green,
-                                ),
-                              ),
-                            ],
-                            if (deviceInfo.batteryPercent != null) ...[
-                              const SizedBox(width: 8),
-                              Icon(
-                                BatteryDisplayHelper.getBatteryIcon(
-                                  deviceInfo.batteryPercent!,
-                                ),
-                                color: BatteryDisplayHelper.getBatteryColor(
-                                  deviceInfo.batteryPercent!,
-                                ),
-                                size: 13,
-                              ),
-                              const SizedBox(width: 3),
-                              Text(
-                                '${deviceInfo.batteryPercent!.round()}%',
-                                style: TextStyle(
-                                  fontSize: 11,
-                                  color: BatteryDisplayHelper.getBatteryColor(
-                                    deviceInfo.batteryPercent!,
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ],
+                            child: Icon(
+                              Icons.campaign_rounded,
+                              color: Colors.white,
+                              size: isTight ? 18 : 20,
+                            ),
+                          ),
                         ),
                       ],
                     ),
                   ),
-                  // Settings cog - hidden in simple mode
-                  if (!context.watch<AppProvider>().isSimpleMode) ...[
-                    const SizedBox(width: 8),
-                    GestureDetector(
-                      onTap: () {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) => const DeviceConfigScreen(),
-                          ),
-                        );
-                      },
-                      onLongPress: () {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) => PacketLogScreen(
-                              bleService: provider.bleService,
+                ),
+                SizedBox(width: isTight ? 8 : 12),
+                if (_showRxTxIndicators)
+                  GestureDetector(
+                    onLongPress: () {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) =>
+                              PacketLogScreen(bleService: provider.bleService),
+                        ),
+                      );
+                    },
+                    child: isTight
+                        ? _buildCompactActivityIndicator(
+                            rxActive: provider.rxActivity,
+                            txActive: provider.txActivity,
+                          )
+                        : Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 10,
+                              vertical: 8,
+                            ),
+                            decoration: BoxDecoration(
+                              color: theme.colorScheme.surfaceContainerHigh
+                                  .withValues(alpha: 0.85),
+                              borderRadius: BorderRadius.circular(20),
+                            ),
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              children: [
+                                _buildActivityBadge(
+                                  label: 'RX',
+                                  count: provider.rxPacketCount,
+                                  isActive: provider.rxActivity,
+                                  activeColor: Colors.green,
+                                ),
+                                const SizedBox(height: 6),
+                                _buildActivityBadge(
+                                  label: 'TX',
+                                  count: provider.txPacketCount,
+                                  isActive: provider.txActivity,
+                                  activeColor: Colors.blue,
+                                ),
+                              ],
                             ),
                           ),
-                        );
-                      },
-                      child: Container(
-                        width: 32,
-                        height: 32,
-                        alignment: Alignment.center,
-                        child: const Icon(Icons.settings, size: 18),
-                      ),
-                    ),
-                  ],
-                ],
-              ),
-            ),
-
-            // CENTER: Broadcast button
-            const SizedBox(width: 8),
-            FilledButton(
-              onPressed: () async {
-                // Capture platform before async operations
-                final platform = Theme.of(context).platform;
-                // iOS: Use haptic feedback (always works)
-                // Android: Try vibration package for better control
-                try {
-                  if (platform == TargetPlatform.iOS) {
-                    // iOS: Try multiple haptic types for reliability
-                    await HapticFeedback.lightImpact();
-                    await Future.delayed(const Duration(milliseconds: 50));
-                    await HapticFeedback.lightImpact();
-                  } else {
-                    // Android vibration
-                    if (await Vibration.hasVibrator()) {
-                      await Vibration.vibrate(duration: 50);
-                    } else {
-                      await HapticFeedback.mediumImpact();
-                    }
-                  }
-                } catch (e) {
-                  // Fallback if anything fails
-                  debugPrint('Haptic feedback error: $e');
-                  await HapticFeedback.vibrate();
-                }
-                if (!mounted) return;
-                if (!context.mounted) return;
-                _advertiseDevice(context);
-              },
-              style: FilledButton.styleFrom(
-                backgroundColor: Colors.blue.shade700,
-                foregroundColor: Colors.white,
-                padding: const EdgeInsets.all(10),
-                minimumSize: const Size(40, 40),
-                shape: const CircleBorder(),
-              ),
-              child: const Icon(Icons.campaign, size: 20),
-            ),
-            const SizedBox(width: 8),
-
-            // RIGHT: RX/TX indicators
-            if (_showRxTxIndicators)
-              GestureDetector(
-                onLongPress: () {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) =>
-                          PacketLogScreen(bleService: provider.bleService),
-                    ),
-                  );
-                },
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: [
-                    Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Container(
-                          width: 7,
-                          height: 7,
-                          decoration: BoxDecoration(
-                            shape: BoxShape.circle,
-                            color: provider.rxActivity
-                                ? Colors.green
-                                : Colors.grey.withValues(alpha: 0.3),
-                          ),
-                        ),
-                        const SizedBox(width: 3),
-                        Text(
-                          'RX:${provider.rxPacketCount}',
-                          style: const TextStyle(
-                            fontSize: 10,
-                            color: Colors.grey,
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 3),
-                    Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Container(
-                          width: 7,
-                          height: 7,
-                          decoration: BoxDecoration(
-                            shape: BoxShape.circle,
-                            color: provider.txActivity
-                                ? Colors.blue
-                                : Colors.grey.withValues(alpha: 0.3),
-                          ),
-                        ),
-                        const SizedBox(width: 3),
-                        Text(
-                          'TX:${provider.txPacketCount}',
-                          style: const TextStyle(
-                            fontSize: 10,
-                            color: Colors.grey,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              )
-            else
-              const SizedBox(
-                width: 52,
-              ), // Placeholder to maintain layout balance
-          ],
+                  )
+                else
+                  SizedBox(width: isTight ? 24 : 74),
+              ],
+            );
+          },
         );
       },
     );

lib/screens/messages_tab.dart

@@ -1436,10 +1436,6 @@ class _MessagesTabState extends State<MessagesTab> {
     // Get all recent messages
     final allMessages = messagesProvider.getRecentMessages(count: 100);
 
-    // Get simple mode setting from AppProvider
-    final appProvider = context.read<AppProvider>();
-    final isSimpleMode = appProvider.isSimpleMode;
-
     List<Message> filteredMessages;
 
     // If channel destination is selected, filter by selected channel.
@@ -1492,14 +1488,9 @@ class _MessagesTabState extends State<MessagesTab> {
       filteredMessages = allMessages;
     }
 
-    // In simple mode, filter out system messages (toast logs)
-    if (isSimpleMode) {
-      filteredMessages = filteredMessages
-          .where((message) => !message.isSystemMessage)
-          .toList();
-    }
-
-    return filteredMessages;
+    return filteredMessages
+        .where((message) => !message.isSystemMessage)
+        .toList();
   }
 
   void _handleMessageTap(Message message) {

lib/screens/sensors_tab.dart

@@ -1,4 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart' as flutter_map;
+import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
 
 import '../l10n/app_localizations.dart';
@@ -6,10 +10,55 @@ import '../models/contact.dart';
 import '../providers/connection_provider.dart';
 import '../providers/contacts_provider.dart';
 import '../providers/sensors_provider.dart';
+import '../utils/location_formats.dart';
 
-class SensorsTab extends StatelessWidget {
+class SensorsTab extends StatefulWidget {
   const SensorsTab({super.key});
 
+  @override
+  State<SensorsTab> createState() => _SensorsTabState();
+}
+
+class _SensorsTabState extends State<SensorsTab> {
+  Timer? _minuteTicker;
+
+  @override
+  void initState() {
+    super.initState();
+    _scheduleMinuteTicker();
+  }
+
+  @override
+  void dispose() {
+    _minuteTicker?.cancel();
+    super.dispose();
+  }
+
+  void _scheduleMinuteTicker() {
+    _minuteTicker?.cancel();
+
+    final now = DateTime.now();
+    final nextMinute = DateTime(
+      now.year,
+      now.month,
+      now.day,
+      now.hour,
+      now.minute + 1,
+    );
+    final delay = nextMinute.difference(now);
+
+    _minuteTicker = Timer(delay, () {
+      if (!mounted) return;
+      context.read<SensorsProvider>().clearExpiredRefreshStates();
+      setState(() {});
+      _minuteTicker = Timer.periodic(const Duration(minutes: 1), (_) {
+        if (!mounted) return;
+        context.read<SensorsProvider>().clearExpiredRefreshStates();
+        setState(() {});
+      });
+    });
+  }
+
   Future<void> _showAddSensorSheet(BuildContext context) async {
     final sensorsProvider = context.read<SensorsProvider>();
     final contactsProvider = context.read<ContactsProvider>();
@@ -83,15 +132,15 @@ class SensorsTab extends StatelessWidget {
   Future<void> _showMetricSelector(
     BuildContext context,
     String publicKeyHex,
+    Contact? contact,
   ) async {
     await showModalBottomSheet<void>(
       context: context,
       showDragHandle: true,
       builder: (sheetContext) => Consumer<SensorsProvider>(
         builder: (context, sensorsProvider, child) {
-          final visibleMetrics = sensorsProvider.visibleMetricsFor(
-            publicKeyHex,
-          );
+          final visibleFields = sensorsProvider.visibleFieldsFor(publicKeyHex);
+          final options = _fieldOptionsFor(contact);
           return SafeArea(
             child: ListView(
               shrinkWrap: true,
@@ -107,24 +156,48 @@ class SensorsTab extends StatelessWidget {
                   style: Theme.of(context).textTheme.bodyMedium,
                 ),
                 const SizedBox(height: 20),
-                Wrap(
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: SensorMetric.values.map((metric) {
-                    final visible = visibleMetrics.contains(metric);
-                    return FilterChip(
-                      selected: visible,
-                      label: Text(_metricLabel(metric)),
-                      onSelected: (value) {
-                        sensorsProvider.toggleMetric(
-                          publicKeyHex,
-                          metric,
-                          value,
-                        );
-                      },
-                    );
-                  }).toList(),
-                ),
+                ...options.map((option) {
+                  final visible = visibleFields.contains(option.key);
+                  final span = sensorsProvider.fieldSpanFor(
+                    publicKeyHex,
+                    option.key,
+                  );
+                  return Padding(
+                    padding: const EdgeInsets.only(bottom: 12),
+                    child: Row(
+                      children: [
+                        Expanded(
+                          child: FilterChip(
+                            selected: visible,
+                            label: Text(option.label),
+                            onSelected: (value) {
+                              sensorsProvider.toggleMetric(
+                                publicKeyHex,
+                                option.key,
+                                value,
+                              );
+                            },
+                          ),
+                        ),
+                        const SizedBox(width: 10),
+                        SegmentedButton<int>(
+                          segments: const [
+                            ButtonSegment<int>(value: 1, label: Text('1x')),
+                            ButtonSegment<int>(value: 2, label: Text('2x')),
+                          ],
+                          selected: <int>{span},
+                          onSelectionChanged: (selection) {
+                            sensorsProvider.setFieldSpan(
+                              publicKeyHex,
+                              option.key,
+                              selection.first,
+                            );
+                          },
+                        ),
+                      ],
+                    ),
+                  );
+                }),
               ],
             ),
           );
@@ -170,11 +243,23 @@ class SensorsTab extends StatelessWidget {
                     return _SensorCard(
                       contact: contact,
                       state: sensorsProvider.stateFor(key),
-                      visibleMetrics: sensorsProvider.visibleMetricsFor(key),
+                      visibleFields: sensorsProvider.visibleFieldsFor(key),
+                      fieldSpans: {
+                        for (final field in sensorsProvider.visibleFieldsFor(
+                          key,
+                        ))
+                          field: sensorsProvider.fieldSpanFor(key, field),
+                      },
                       onRemove: () async {
                         await sensorsProvider.removeSensor(key);
                       },
-                      onCustomize: () => _showMetricSelector(context, key),
+                      onCustomize: () =>
+                          _showMetricSelector(context, key, contact),
+                      onRefresh: () => sensorsProvider.refreshSensor(
+                        publicKeyHex: key,
+                        contactsProvider: contactsProvider,
+                        connectionProvider: context.read<ConnectionProvider>(),
+                      ),
                     );
                   }),
               ],
@@ -265,15 +350,19 @@ class _EmptySensorsState extends StatelessWidget {
 class _SensorCard extends StatelessWidget {
   final Contact? contact;
   final SensorRefreshState state;
-  final Set<SensorMetric> visibleMetrics;
+  final Set<String> visibleFields;
+  final Map<String, int> fieldSpans;
   final Future<void> Function() onRemove;
+  final Future<void> Function() onRefresh;
   final VoidCallback onCustomize;
 
   const _SensorCard({
     required this.contact,
     required this.state,
-    required this.visibleMetrics,
+    required this.visibleFields,
+    required this.fieldSpans,
     required this.onRemove,
+    required this.onRefresh,
     required this.onCustomize,
   });
 
@@ -303,7 +392,7 @@ class _SensorCard extends StatelessWidget {
         ],
       ),
       child: Padding(
-        padding: const EdgeInsets.all(18),
+        padding: const EdgeInsets.all(12),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -331,11 +420,36 @@ class _SensorCard extends StatelessWidget {
                       ),
                       if (telemetry != null) ...[
                         const SizedBox(height: 2),
-                        Text(
-                          '${_formatTelemetryDateTime(telemetry.timestamp)} • ${_formatTelemetryTime(telemetry.timestamp)}',
-                          style: theme.textTheme.bodySmall?.copyWith(
-                            color: theme.colorScheme.onSurfaceVariant,
-                          ),
+                        Wrap(
+                          spacing: 6,
+                          runSpacing: 4,
+                          crossAxisAlignment: WrapCrossAlignment.center,
+                          children: [
+                            Text(
+                              '${_formatTelemetryDateTime(telemetry.timestamp)} • ${_formatTelemetryTime(telemetry.timestamp)}',
+                              style: theme.textTheme.bodySmall?.copyWith(
+                                color: theme.colorScheme.onSurfaceVariant,
+                              ),
+                            ),
+                            if (state == SensorRefreshState.refreshing)
+                              const _InlineStateMeta(
+                                label: 'Refreshing',
+                                color: Color(0xFF266AC2),
+                                spinning: true,
+                              ),
+                            if (state == SensorRefreshState.success)
+                              const _InlineStateMeta(
+                                label: 'Updated',
+                                color: Color(0xFF218B63),
+                                icon: Icons.check_circle,
+                              ),
+                            if (state == SensorRefreshState.unavailable)
+                              const _InlineStateMeta(
+                                label: 'Unavailable',
+                                color: Color(0xFFB13B55),
+                                icon: Icons.error_outline,
+                              ),
+                          ],
                         ),
                       ],
                     ],
@@ -343,18 +457,24 @@ class _SensorCard extends StatelessWidget {
                 ),
                 PopupMenuButton<String>(
                   onSelected: (value) async {
-                    if (value == 'remove') {
+                    if (value == 'refresh') {
+                      await onRefresh();
+                    } else if (value == 'remove') {
                       await onRemove();
                     } else if (value == 'customize') {
                       onCustomize();
                     }
                   },
-                  itemBuilder: (context) => const [
+                  itemBuilder: (context) => [
                     PopupMenuItem<String>(
+                      value: 'refresh',
+                      child: Text(l10n.refresh),
+                    ),
+                    const PopupMenuItem<String>(
                       value: 'customize',
                       child: Text('Customize fields'),
                     ),
-                    PopupMenuItem<String>(
+                    const PopupMenuItem<String>(
                       value: 'remove',
                       child: Text('Remove'),
                     ),
@@ -363,47 +483,41 @@ class _SensorCard extends StatelessWidget {
               ],
             ),
             const SizedBox(height: 12),
-            if (((state != SensorRefreshState.idle &&
-                        state != SensorRefreshState.timeout) ||
-                    state == SensorRefreshState.unavailable) ||
-                (contact != null &&
-                    visibleMetrics.contains(SensorMetric.lastSeen)))
-              Padding(
-                padding: const EdgeInsets.only(bottom: 12),
-                child: Wrap(
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: [
-                    if (state != SensorRefreshState.idle &&
-                        state != SensorRefreshState.timeout)
-                      _StatusPill(state: state),
-                    if (contact != null &&
-                        visibleMetrics.contains(SensorMetric.lastSeen))
-                      _InfoPill(
-                        icon: Icons.schedule,
-                        label:
-                            '${l10n.lastSeen}: ${contact!.timeSinceLastSeen}',
-                      ),
-                  ],
-                ),
-              ),
             if (contact == null)
               const Text(
                 'This node is no longer available in the contact list.',
               )
             else if (telemetry == null)
-              const Text('No telemetry received yet. Pull down to fetch it.')
+              const Text(
+                'No telemetry received yet. Use Refresh from the menu or pull down to fetch it.',
+              )
             else if (metrics.isEmpty)
               const Text(
                 'All fields are hidden. Use Visible fields to choose what to show.',
               )
             else
-              Wrap(
-                spacing: 12,
-                runSpacing: 12,
-                children: metrics
-                    .map((metric) => _MetricTile(data: metric))
-                    .toList(),
+              LayoutBuilder(
+                builder: (context, constraints) {
+                  const spacing = 8.0;
+                  final compactWidth = (constraints.maxWidth - spacing) / 2;
+
+                  return Wrap(
+                    spacing: spacing,
+                    runSpacing: spacing,
+                    children: metrics
+                        .map(
+                          (metric) => _MetricTile(
+                            data: metric,
+                            width:
+                                (fieldSpans[metric.fieldKey] == 2 ||
+                                    metric.wide)
+                                ? constraints.maxWidth
+                                : compactWidth,
+                          ),
+                        )
+                        .toList(),
+                  );
+                },
               ),
           ],
         ),
@@ -418,10 +532,11 @@ class _SensorCard extends StatelessWidget {
   ) {
     final items = <_MetricCardData>[];
 
-    if (visibleMetrics.contains(SensorMetric.voltage) &&
+    if (visibleFields.contains('voltage') &&
         telemetry.batteryMilliVolts != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'voltage',
           icon: Icons.bolt,
           label: l10n.voltage,
           value: '${(telemetry.batteryMilliVolts! / 1000).toStringAsFixed(3)}V',
@@ -429,10 +544,11 @@ class _SensorCard extends StatelessWidget {
         ),
       );
     }
-    if (visibleMetrics.contains(SensorMetric.battery) &&
+    if (visibleFields.contains('battery') &&
         telemetry.batteryPercentage != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'battery',
           icon: Icons.battery_5_bar,
           label: l10n.battery,
           value: '${telemetry.batteryPercentage!.toStringAsFixed(0)}%',
@@ -440,10 +556,11 @@ class _SensorCard extends StatelessWidget {
         ),
       );
     }
-    if (visibleMetrics.contains(SensorMetric.temperature) &&
+    if (visibleFields.contains('temperature') &&
         telemetry.temperature != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'temperature',
           icon: Icons.thermostat,
           label: l10n.temperature,
           value: '${telemetry.temperature!.toStringAsFixed(1)}°C',
@@ -451,10 +568,10 @@ class _SensorCard extends StatelessWidget {
         ),
       );
     }
-    if (visibleMetrics.contains(SensorMetric.humidity) &&
-        telemetry.humidity != null) {
+    if (visibleFields.contains('humidity') && telemetry.humidity != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'humidity',
           icon: Icons.water_drop,
           label: l10n.humidity,
           value: '${telemetry.humidity!.toStringAsFixed(1)}%',
@@ -462,10 +579,10 @@ class _SensorCard extends StatelessWidget {
         ),
       );
     }
-    if (visibleMetrics.contains(SensorMetric.pressure) &&
-        telemetry.pressure != null) {
+    if (visibleFields.contains('pressure') && telemetry.pressure != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'pressure',
           icon: Icons.compress,
           label: l10n.pressure,
           value: '${telemetry.pressure!.toStringAsFixed(1)} hPa',
@@ -473,35 +590,38 @@ class _SensorCard extends StatelessWidget {
         ),
       );
     }
-    if (visibleMetrics.contains(SensorMetric.gps) &&
-        telemetry.gpsLocation != null) {
+    if (visibleFields.contains('gps') && telemetry.gpsLocation != null) {
       items.add(
         _MetricCardData(
+          fieldKey: 'gps',
           icon: Icons.place,
           label: l10n.gpsTelemetry,
           value:
               '${telemetry.gpsLocation!.latitude.toStringAsFixed(5)}, ${telemetry.gpsLocation!.longitude.toStringAsFixed(5)}',
           accent: const Color(0xFFAA3F57),
           wide: true,
-        ),
-      );
-    }
-    if (visibleMetrics.contains(SensorMetric.updated)) {
-      items.add(
-        _MetricCardData(
-          icon: Icons.update,
-          label: l10n.updated,
-          value: _formatTelemetryTime(telemetry.timestamp),
-          accent: const Color(0xFF6C727F),
+          mapLocation: LatLng(
+            telemetry.gpsLocation!.latitude,
+            telemetry.gpsLocation!.longitude,
+          ),
+          secondaryValue: formatPlusCode(
+            telemetry.gpsLocation!.latitude,
+            telemetry.gpsLocation!.longitude,
+          ),
         ),
       );
     }
     if (telemetry.extraSensorData != null) {
       for (final entry in telemetry.extraSensorData!.entries) {
+        final fieldKey = _extraFieldKey(entry.key);
+        if (!visibleFields.contains(fieldKey)) {
+          continue;
+        }
         items.add(
           _MetricCardData(
+            fieldKey: fieldKey,
             icon: Icons.sensors,
-            label: entry.key,
+            label: _formatExtraFieldLabel(entry.key),
             value: '${entry.value}',
             accent: const Color(0xFF3E657C),
           ),
@@ -514,7 +634,7 @@ class _SensorCard extends StatelessWidget {
 
   String _formatTelemetryTime(DateTime timestamp) {
     final diff = DateTime.now().difference(timestamp);
-    if (diff.inMinutes < 1) return 'just now';
+    if (diff.inMinutes < 1) return 'now';
     if (diff.inMinutes < 60) return '${diff.inMinutes}m ago';
     if (diff.inHours < 24) return '${diff.inHours}h ago';
     return '${diff.inDays}d ago';
@@ -531,81 +651,48 @@ class _SensorCard extends StatelessWidget {
   }
 }
 
-class _StatusPill extends StatelessWidget {
-  final SensorRefreshState state;
-
-  const _StatusPill({required this.state});
-
-  @override
-  Widget build(BuildContext context) {
-    final (label, color, icon) = switch (state) {
-      SensorRefreshState.idle => (
-        'Idle',
-        const Color(0xFF5D7185),
-        Icons.sensors,
-      ),
-      SensorRefreshState.refreshing => (
-        'Refreshing',
-        const Color(0xFF266AC2),
-        Icons.sync,
-      ),
-      SensorRefreshState.success => (
-        'Updated',
-        const Color(0xFF218B63),
-        Icons.check_circle,
-      ),
-      SensorRefreshState.timeout => (
-        'No response',
-        const Color(0xFFC17B1D),
-        Icons.schedule,
-      ),
-      SensorRefreshState.unavailable => (
-        'Unavailable',
-        const Color(0xFFB13B55),
-        Icons.error_outline,
-      ),
-    };
-
-    return _InfoPill(
-      icon: icon,
-      label: label,
-      foreground: color,
-      background: color.withValues(alpha: 0.10),
-    );
-  }
-}
-
-class _InfoPill extends StatelessWidget {
-  final IconData icon;
+class _InlineStateMeta extends StatelessWidget {
   final String label;
-  final Color? foreground;
-  final Color? background;
+  final Color color;
+  final IconData? icon;
+  final bool spinning;
 
-  const _InfoPill({
-    required this.icon,
+  const _InlineStateMeta({
     required this.label,
-    this.foreground,
-    this.background,
+    required this.color,
+    this.icon,
+    this.spinning = false,
   });
 
   @override
   Widget build(BuildContext context) {
-    final color = foreground ?? Theme.of(context).colorScheme.onSurfaceVariant;
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11),
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
       decoration: BoxDecoration(
-        color:
-            background ?? Theme.of(context).colorScheme.surfaceContainerHighest,
-        borderRadius: BorderRadius.circular(18),
+        color: color.withValues(alpha: 0.10),
+        borderRadius: BorderRadius.circular(999),
       ),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Icon(icon, size: 18, color: color),
-          const SizedBox(width: 8),
+          if (spinning)
+            SizedBox(
+              width: 11,
+              height: 11,
+              child: CircularProgressIndicator(
+                strokeWidth: 1.7,
+                valueColor: AlwaysStoppedAnimation<Color>(color),
+              ),
+            )
+          else if (icon != null)
+            Icon(icon, size: 11, color: color),
+          const SizedBox(width: 4),
           Text(
             label,
-            style: TextStyle(color: color, fontWeight: FontWeight.w600),
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: color,
+              fontWeight: FontWeight.w700,
+            ),
           ),
         ],
       ),
@@ -639,89 +726,374 @@ class _InlineAlertBadge extends StatelessWidget {
 
 class _MetricTile extends StatelessWidget {
   final _MetricCardData data;
+  final double width;
 
-  const _MetricTile({required this.data});
+  const _MetricTile({required this.data, required this.width});
+
+  Future<void> _showExpandedMap(BuildContext context) async {
+    final location = data.mapLocation;
+    if (location == null) return;
+
+    await Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (pageContext) {
+          return Scaffold(
+            appBar: AppBar(
+              title: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(data.label),
+                  Text(
+                    data.value,
+                    style: Theme.of(pageContext).textTheme.bodySmall,
+                  ),
+                ],
+              ),
+            ),
+            body: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (data.secondaryValue != null)
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+                    child: Text(
+                      data.secondaryValue!,
+                      style: Theme.of(pageContext).textTheme.bodyMedium,
+                    ),
+                  ),
+                Expanded(
+                  child: flutter_map.FlutterMap(
+                    options: flutter_map.MapOptions(
+                      initialCenter: location,
+                      initialZoom: 15,
+                    ),
+                    children: [
+                      flutter_map.TileLayer(
+                        urlTemplate:
+                            'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        userAgentPackageName:
+                            'com.meshcore.sar.meshcore_sar_app',
+                      ),
+                      flutter_map.MarkerLayer(
+                        markers: [
+                          flutter_map.Marker(
+                            point: location,
+                            width: 40,
+                            height: 40,
+                            child: Icon(
+                              Icons.location_on,
+                              color: data.accent,
+                              size: 34,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+        fullscreenDialog: true,
+      ),
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
-    final width = data.wide ? 320.0 : 168.0;
-
     return Container(
       width: width,
-      padding: const EdgeInsets.all(14),
+      padding: const EdgeInsets.all(8),
       decoration: BoxDecoration(
         color: data.accent.withValues(alpha: 0.08),
         borderRadius: BorderRadius.circular(22),
         border: Border.all(color: data.accent.withValues(alpha: 0.14)),
       ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Container(
-            width: 36,
-            height: 36,
-            decoration: BoxDecoration(
-              color: data.accent.withValues(alpha: 0.14),
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: Icon(data.icon, color: data.accent, size: 20),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Column(
+      child: data.mapLocation == null
+          ? Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
-                  data.label,
-                  style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                    color: data.accent,
-                    fontWeight: FontWeight.w700,
-                  ),
+                _MetricIcon(accent: data.accent, icon: data.icon),
+                const SizedBox(width: 10),
+                Expanded(child: _MetricText(data: data)),
+              ],
+            )
+          : Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    _MetricIcon(accent: data.accent, icon: data.icon),
+                    const SizedBox(width: 10),
+                    Expanded(child: _MetricText(data: data)),
+                  ],
                 ),
-                const SizedBox(height: 6),
-                Text(
-                  data.value,
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                    fontWeight: FontWeight.w700,
-                    height: 1.1,
+                const SizedBox(height: 10),
+                Material(
+                  color: Colors.transparent,
+                  child: InkWell(
+                    borderRadius: BorderRadius.circular(14),
+                    onTap: () => _showExpandedMap(context),
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(14),
+                      child: SizedBox(
+                        height: 104,
+                        width: double.infinity,
+                        child: Stack(
+                          children: [
+                            flutter_map.FlutterMap(
+                              options: flutter_map.MapOptions(
+                                initialCenter: data.mapLocation!,
+                                initialZoom: 14,
+                                interactionOptions:
+                                    const flutter_map.InteractionOptions(
+                                      flags: flutter_map.InteractiveFlag.none,
+                                    ),
+                              ),
+                              children: [
+                                flutter_map.TileLayer(
+                                  urlTemplate:
+                                      'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                                  userAgentPackageName:
+                                      'com.meshcore.sar.meshcore_sar_app',
+                                ),
+                                flutter_map.MarkerLayer(
+                                  markers: [
+                                    flutter_map.Marker(
+                                      point: data.mapLocation!,
+                                      width: 32,
+                                      height: 32,
+                                      child: Icon(
+                                        Icons.location_on,
+                                        color: data.accent,
+                                        size: 28,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                            Positioned(
+                              right: 8,
+                              bottom: 8,
+                              child: Container(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 6,
+                                  vertical: 3,
+                                ),
+                                decoration: BoxDecoration(
+                                  color: Colors.black.withValues(alpha: 0.55),
+                                  borderRadius: BorderRadius.circular(999),
+                                ),
+                                child: const Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    Icon(
+                                      Icons.open_in_full,
+                                      size: 12,
+                                      color: Colors.white,
+                                    ),
+                                    SizedBox(width: 4),
+                                    Text(
+                                      'Open map',
+                                      style: TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 11,
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
                   ),
                 ),
               ],
             ),
+    );
+  }
+}
+
+class _MetricIcon extends StatelessWidget {
+  final Color accent;
+  final IconData icon;
+
+  const _MetricIcon({required this.accent, required this.icon});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 32,
+      height: 32,
+      decoration: BoxDecoration(
+        color: accent.withValues(alpha: 0.14),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Icon(icon, color: accent, size: 18),
+    );
+  }
+}
+
+class _MetricText extends StatelessWidget {
+  final _MetricCardData data;
+
+  const _MetricText({required this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          data.label,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context).textTheme.labelMedium?.copyWith(
+            color: data.accent,
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          data.value,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context).textTheme.titleSmall?.copyWith(
+            fontWeight: FontWeight.w700,
+            height: 1.1,
+          ),
+        ),
+        if (data.secondaryValue != null) ...[
+          const SizedBox(height: 4),
+          Text(
+            data.secondaryValue!,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+              fontWeight: FontWeight.w600,
+            ),
           ),
         ],
-      ),
+      ],
     );
   }
 }
 
 class _MetricCardData {
+  final String fieldKey;
   final IconData icon;
   final String label;
   final String value;
+  final String? secondaryValue;
   final Color accent;
   final bool wide;
+  final LatLng? mapLocation;
 
   const _MetricCardData({
+    required this.fieldKey,
     required this.icon,
     required this.label,
     required this.value,
+    this.secondaryValue,
     required this.accent,
     this.wide = false,
+    this.mapLocation,
   });
 }
 
-String _metricLabel(SensorMetric metric) {
-  return switch (metric) {
-    SensorMetric.lastSeen => 'Last seen',
-    SensorMetric.voltage => 'Voltage',
-    SensorMetric.battery => 'Battery',
-    SensorMetric.temperature => 'Temperature',
-    SensorMetric.humidity => 'Humidity',
-    SensorMetric.pressure => 'Pressure',
-    SensorMetric.gps => 'GPS',
-    SensorMetric.updated => 'Updated',
+class _FieldOption {
+  final String key;
+  final String label;
+
+  const _FieldOption({required this.key, required this.label});
+}
+
+List<_FieldOption> _fieldOptionsFor(Contact? contact) {
+  final telemetry = contact?.telemetry;
+  final options = <_FieldOption>[
+    if (telemetry?.batteryMilliVolts != null)
+      const _FieldOption(key: 'voltage', label: 'Voltage'),
+    if (telemetry?.batteryPercentage != null)
+      const _FieldOption(key: 'battery', label: 'Battery'),
+    if (telemetry?.temperature != null)
+      const _FieldOption(key: 'temperature', label: 'Temperature'),
+    if (telemetry?.humidity != null)
+      const _FieldOption(key: 'humidity', label: 'Humidity'),
+    if (telemetry?.pressure != null)
+      const _FieldOption(key: 'pressure', label: 'Pressure'),
+    if (telemetry?.gpsLocation != null)
+      const _FieldOption(key: 'gps', label: 'GPS'),
+  ];
+
+  final extraSensorData = telemetry?.extraSensorData;
+  if (extraSensorData != null) {
+    for (final key in extraSensorData.keys) {
+      options.add(
+        _FieldOption(
+          key: _extraFieldKey(key),
+          label: _formatExtraFieldLabel(key),
+        ),
+      );
+    }
+  }
+
+  return options;
+}
+
+String _extraFieldKey(String label) {
+  return 'extra:$label';
+}
+
+String _formatExtraFieldLabel(String rawKey) {
+  final knownPrefixes = <String, String>{
+    'altitude': 'Altitude',
+    'illuminance': 'Illuminance',
+    'presence': 'Presence',
+    'digital_input': 'Digital input',
+    'digital_output': 'Digital output',
+    'analog_input': 'Analog input',
+    'analog_output': 'Analog output',
+    'accelerometer': 'Accelerometer',
+    'gyrometer': 'Gyrometer',
   };
+
+  for (final entry in knownPrefixes.entries) {
+    final prefix = '${entry.key}_';
+    if (rawKey == entry.key) {
+      return entry.value;
+    }
+    if (rawKey.startsWith(prefix)) {
+      final suffix = rawKey.substring(prefix.length);
+      final channel = int.tryParse(suffix);
+      if (channel != null) {
+        return '${entry.value} (ch $channel)';
+      }
+      return entry.value;
+    }
+  }
+
+  final parts = rawKey.split('_');
+  if (parts.isEmpty) return rawKey;
+  final channel = parts.length > 1 ? parts.last : null;
+  final base = parts.length > 1
+      ? parts.sublist(0, parts.length - 1).join(' ')
+      : rawKey;
+  final title = base
+      .split(' ')
+      .where((part) => part.isNotEmpty)
+      .map((part) => '${part[0].toUpperCase()}${part.substring(1)}')
+      .join(' ');
+  if (channel != null && int.tryParse(channel) != null) {
+    return '$title (ch $channel)';
+  }
+  return title;
 }
 
 IconData _typeIcon(Contact contact) {

lib/screens/welcome_wizard_screen.dart

@@ -15,7 +15,7 @@ class WelcomeWizardScreen extends StatefulWidget {
 class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
   final PageController _pageController = PageController();
   int _currentPage = 0;
-  static const int _totalPages = 6;
+  static const int _totalPages = 5;
 
   @override
   void dispose() {
@@ -99,7 +99,6 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
                 children: [
                   _buildWelcomePage(context, l10n, colorScheme),
                   _buildConnectingPage(context, l10n, colorScheme),
-                  _buildSimpleModePage(context, l10n, colorScheme),
                   _buildChannelPage(context, l10n, colorScheme),
                   _buildContactsPage(context, l10n, colorScheme),
                   _buildMapPage(context, l10n, colorScheme),
@@ -182,42 +181,9 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
       title: l10n.wizardConnectingTitle,
       description: l10n.wizardConnectingDescription,
       features: [
-        _FeatureItem(
-          icon: Icons.radio,
-          text: l10n.wizardConnectingFeature1,
-        ),
-        _FeatureItem(
-          icon: Icons.link,
-          text: l10n.wizardConnectingFeature2,
-        ),
-        _FeatureItem(
-          icon: Icons.wifi_off,
-          text: l10n.wizardConnectingFeature3,
-        ),
-      ],
-      colorScheme: colorScheme,
-    );
-  }
-
-  Widget _buildSimpleModePage(
-    BuildContext context,
-    AppLocalizations l10n,
-    ColorScheme colorScheme,
-  ) {
-    return _buildPage(
-      icon: Icons.toggle_on,
-      iconColor: Colors.green,
-      title: l10n.wizardSimpleModeTitle,
-      description: l10n.wizardSimpleModeDescription,
-      features: [
-        _FeatureItem(
-          icon: Icons.check_circle_outline,
-          text: l10n.wizardSimpleModeFeature1,
-        ),
-        _FeatureItem(
-          icon: Icons.settings,
-          text: l10n.wizardSimpleModeFeature2,
-        ),
+        _FeatureItem(icon: Icons.radio, text: l10n.wizardConnectingFeature1),
+        _FeatureItem(icon: Icons.link, text: l10n.wizardConnectingFeature2),
+        _FeatureItem(icon: Icons.wifi_off, text: l10n.wizardConnectingFeature3),
       ],
       colorScheme: colorScheme,
     );
@@ -234,18 +200,9 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
       title: l10n.wizardChannelTitle,
       description: l10n.wizardChannelDescription,
       features: [
-        _FeatureItem(
-          icon: Icons.public,
-          text: l10n.wizardChannelFeature1,
-        ),
-        _FeatureItem(
-          icon: Icons.groups,
-          text: l10n.wizardChannelFeature2,
-        ),
-        _FeatureItem(
-          icon: Icons.send,
-          text: l10n.wizardChannelFeature3,
-        ),
+        _FeatureItem(icon: Icons.public, text: l10n.wizardChannelFeature1),
+        _FeatureItem(icon: Icons.groups, text: l10n.wizardChannelFeature2),
+        _FeatureItem(icon: Icons.send, text: l10n.wizardChannelFeature3),
       ],
       colorScheme: colorScheme,
     );
@@ -262,14 +219,8 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
       title: l10n.wizardContactsTitle,
       description: l10n.wizardContactsDescription,
       features: [
-        _FeatureItem(
-          icon: Icons.person_add,
-          text: l10n.wizardContactsFeature1,
-        ),
-        _FeatureItem(
-          icon: Icons.chat,
-          text: l10n.wizardContactsFeature2,
-        ),
+        _FeatureItem(icon: Icons.person_add, text: l10n.wizardContactsFeature1),
+        _FeatureItem(icon: Icons.chat, text: l10n.wizardContactsFeature2),
         _FeatureItem(
           icon: Icons.battery_std,
           text: l10n.wizardContactsFeature3,
@@ -290,22 +241,13 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
       title: l10n.wizardMapTitle,
       description: l10n.wizardMapDescription,
       features: [
-        _FeatureItem(
-          icon: Icons.location_on,
-          text: l10n.wizardMapFeature1,
-        ),
+        _FeatureItem(icon: Icons.location_on, text: l10n.wizardMapFeature1),
         _FeatureItem(
           icon: Icons.person_pin_circle,
           text: l10n.wizardMapFeature2,
         ),
-        _FeatureItem(
-          icon: Icons.offline_pin,
-          text: l10n.wizardMapFeature3,
-        ),
-        _FeatureItem(
-          icon: Icons.draw,
-          text: l10n.wizardMapFeature4,
-        ),
+        _FeatureItem(icon: Icons.offline_pin, text: l10n.wizardMapFeature3),
+        _FeatureItem(icon: Icons.draw, text: l10n.wizardMapFeature4),
       ],
       colorScheme: colorScheme,
     );
@@ -332,20 +274,16 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
               color: iconColor.withValues(alpha: 0.1),
               shape: BoxShape.circle,
             ),
-            child: Icon(
-              icon,
-              size: 80,
-              color: iconColor,
-            ),
+            child: Icon(icon, size: 80, color: iconColor),
           ),
           const SizedBox(height: 32),
           // Title
           Text(
             title,
             style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: colorScheme.onSurface,
-                ),
+              fontWeight: FontWeight.bold,
+              color: colorScheme.onSurface,
+            ),
             textAlign: TextAlign.center,
           ),
           const SizedBox(height: 16),
@@ -353,36 +291,33 @@ class _WelcomeWizardScreenState extends State<WelcomeWizardScreen> {
           Text(
             description,
             style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: colorScheme.onSurface.withValues(alpha: 0.7),
-                  height: 1.5,
-                ),
+              color: colorScheme.onSurface.withValues(alpha: 0.7),
+              height: 1.5,
+            ),
             textAlign: TextAlign.center,
           ),
           if (features != null && features.isNotEmpty) ...[
             const SizedBox(height: 32),
             // Features list
-            ...features.map((feature) => Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 8.0),
-                  child: Row(
-                    children: [
-                      Icon(
-                        feature.icon,
-                        color: colorScheme.primary,
-                        size: 24,
-                      ),
-                      const SizedBox(width: 16),
-                      Expanded(
-                        child: Text(
-                          feature.text,
-                          style:
-                              Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    color: colorScheme.onSurface,
-                                  ),
+            ...features.map(
+              (feature) => Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Row(
+                  children: [
+                    Icon(feature.icon, color: colorScheme.primary, size: 24),
+                    const SizedBox(width: 16),
+                    Expanded(
+                      child: Text(
+                        feature.text,
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          color: colorScheme.onSurface,
                         ),
                       ),
-                    ],
-                  ),
-                )),
+                    ),
+                  ],
+                ),
+              ),
+            ),
           ],
           const SizedBox(height: 20),
         ],

lib/services/locale_preferences.dart

@@ -15,6 +15,8 @@ class LocalePreferences {
     Locale('fr'), // French
     Locale('it'), // Italian
     Locale('el'), // Greek
+    Locale('ru'), // Russian
+    Locale('zh'), // Chinese
   ];
 
   /// Get the saved locale or return null to use system locale
@@ -64,6 +66,8 @@ class LocalePreferences {
         return 'Italiano';
       case 'el':
         return 'Greek';
+      case 'ru':
+        return 'Русский';
       case 'zh':
         return '简体中文';
       default:
@@ -90,6 +94,8 @@ class LocalePreferences {
         return 'Italiano';
       case 'el':
         return 'Ελληνικά';
+      case 'ru':
+        return 'Русский';
       case 'zh':
         return '简体中文';
       default:

lib/services/location_tracking_service.dart

@@ -41,6 +41,12 @@ class LocationTrackingService {
   static const String _prefKeyGpsUpdateDistance = 'map_gps_update_distance';
   static const String _prefKeyLastLat = 'background_last_lat';
   static const String _prefKeyLastLon = 'background_last_lon';
+  static const String _prefKeyFastLocationEnabled =
+      'fast_location_updates_enabled';
+  static const String _prefKeyFastMovementThreshold =
+      'fast_location_movement_threshold_meters';
+  static const String _prefKeyFastActiveCadence =
+      'fast_location_active_cadence_seconds';
 
   // ============================================================================
   // Configuration Properties
@@ -58,6 +64,15 @@ class LocationTrackingService {
   /// GPS update distance filter for position stream
   double gpsUpdateDistance = 10.0;
 
+  /// Whether private fast GPS updates are enabled
+  bool fastLocationUpdatesEnabled = false;
+
+  /// Distance threshold for fast GPS updates
+  double fastLocationMovementThresholdMeters = 10.0;
+
+  /// Cadence for active-use fast GPS updates
+  int fastLocationActiveCadenceSeconds = 10;
+
   // ============================================================================
   // State Properties
   // ============================================================================
@@ -84,6 +99,11 @@ class LocationTrackingService {
   /// Position stream subscription
   StreamSubscription<Position>? _positionSubscription;
 
+  Timer? _fastLocationTimer;
+  bool _isFastLocationActiveUse = false;
+  DateTime? _lastFastLocationSentAt;
+  Position? _lastFastLocationSentPosition;
+
   // ============================================================================
   // Callback Properties
   // ============================================================================
@@ -100,6 +120,9 @@ class LocationTrackingService {
   /// Called when tracking state changes
   void Function(bool isTracking)? onTrackingStateChanged;
 
+  /// Called when a fast private GPS update should be sent
+  void Function(Position position, String reason)? onFastLocationUpdate;
+
   // ============================================================================
   // Initialization
   // ============================================================================
@@ -178,7 +201,9 @@ class LocationTrackingService {
     for (int attempt = 0; attempt <= retryCount; attempt++) {
       try {
         if (attempt > 0) {
-          debugPrint('🔄 [LocationTracking] Retry attempt $attempt/$retryCount');
+          debugPrint(
+            '🔄 [LocationTracking] Retry attempt $attempt/$retryCount',
+          );
           // Exponential backoff: wait 2^attempt seconds before retry
           await Future.delayed(Duration(seconds: 1 << attempt));
         }
@@ -192,21 +217,29 @@ class LocationTrackingService {
 
         currentPosition = position;
         if (attempt > 0) {
-          debugPrint('✅ [LocationTracking] Position acquired after $attempt retries');
+          debugPrint(
+            '✅ [LocationTracking] Position acquired after $attempt retries',
+          );
         }
         return position;
       } catch (e) {
         final isLastAttempt = attempt == retryCount;
         if (isLastAttempt) {
-          debugPrint('❌ [LocationTracking] Failed to get position after $retryCount retries: $e');
+          debugPrint(
+            '❌ [LocationTracking] Failed to get position after $retryCount retries: $e',
+          );
           // Only call error callback on final failure, and make it user-friendly
           if (e.toString().contains('TimeoutException')) {
-            onError?.call('GPS signal weak. Position stream will continue trying...');
+            onError?.call(
+              'GPS signal weak. Position stream will continue trying...',
+            );
           } else {
             onError?.call('Failed to get GPS position. Check device settings.');
           }
         } else {
-          debugPrint('⚠️ [LocationTracking] Position attempt $attempt failed: $e');
+          debugPrint(
+            '⚠️ [LocationTracking] Position attempt $attempt failed: $e',
+          );
         }
 
         if (isLastAttempt) {
@@ -244,16 +277,16 @@ class LocationTrackingService {
   /// GPS tracking works WITHOUT BLE connection - device broadcasts are simply skipped.
   Future<bool> startTracking({double? distanceThreshold}) async {
     if (!_isInitialized) {
-      debugPrint(
-        '⚠️ [LocationTracking] Service not initialized',
-      );
+      debugPrint('⚠️ [LocationTracking] Service not initialized');
       onError?.call('Location tracking service not initialized');
       return false;
     }
 
     // Allow tracking without BLE connection - broadcasts will be skipped
     if (_bleService == null || !_bleService!.isConnected) {
-      debugPrint('ℹ️ [LocationTracking] Starting GPS tracking without BLE connection (broadcasts disabled)');
+      debugPrint(
+        'ℹ️ [LocationTracking] Starting GPS tracking without BLE connection (broadcasts disabled)',
+      );
     }
 
     // Check permissions
@@ -271,17 +304,20 @@ class LocationTrackingService {
 
     // Try to get initial position in background (non-blocking)
     // This will populate currentPosition but won't block tracking startup
-    getCurrentPosition(
-      timeLimit: const Duration(seconds: 10),
-      retryCount: 1,
-    ).then((position) {
-      if (position != null) {
-        debugPrint('✅ [LocationTracking] Initial position acquired in background');
-      }
-    }).catchError((error) {
-      debugPrint('⚠️ [LocationTracking] Background initial position failed: $error');
-      // Not critical - position stream will eventually provide position
-    });
+    getCurrentPosition(timeLimit: const Duration(seconds: 10), retryCount: 1)
+        .then((position) {
+          if (position != null) {
+            debugPrint(
+              '✅ [LocationTracking] Initial position acquired in background',
+            );
+          }
+        })
+        .catchError((error) {
+          debugPrint(
+            '⚠️ [LocationTracking] Background initial position failed: $error',
+          );
+          // Not critical - position stream will eventually provide position
+        });
 
     // Start position stream immediately (don't wait for initial position)
     try {
@@ -296,6 +332,7 @@ class LocationTrackingService {
 
       isTracking = true;
       onTrackingStateChanged?.call(true);
+      _refreshFastLocationTimer();
 
       debugPrint(
         '✅ [LocationTracking] Tracking started with ${threshold}m threshold',
@@ -318,6 +355,7 @@ class LocationTrackingService {
 
     isTracking = false;
     onTrackingStateChanged?.call(false);
+    _refreshFastLocationTimer();
 
     // Reset first position flag so next connection starts fresh
     _firstPositionSet = false;
@@ -361,6 +399,8 @@ class LocationTrackingService {
     // Notify listeners
     onPositionUpdate?.call(position);
 
+    _evaluateFastLocationMovement(position);
+
     // SPECIAL CASE: First stable position after connection
     // Set lat/lon on device WITHOUT broadcasting to mesh network
     if (!_firstPositionSet) {
@@ -378,12 +418,16 @@ class LocationTrackingService {
   /// Updates the device's advertised lat/lon but does NOT send an advertisement.
   void _setInitialPosition(Position position) async {
     if (_bleService == null || !_bleService!.isConnected) {
-      debugPrint('⚠️ [LocationTracking] Cannot set initial position: BLE not connected');
+      debugPrint(
+        '⚠️ [LocationTracking] Cannot set initial position: BLE not connected',
+      );
       return;
     }
 
     try {
-      debugPrint('📍 [LocationTracking] Setting initial position (no broadcast)');
+      debugPrint(
+        '📍 [LocationTracking] Setting initial position (no broadcast)',
+      );
 
       // Update device's advertised location WITHOUT sending advertisement
       await _bleService!.setAdvertLatLon(
@@ -414,7 +458,94 @@ class LocationTrackingService {
   void _checkAndBroadcast(Position position) {
     // Automatic broadcasting disabled
     // Use the manual advert button instead
-    debugPrint('   ⏸️ [LocationTracking] Automatic broadcasting disabled (use advert button)');
+    debugPrint(
+      '   ⏸️ [LocationTracking] Automatic broadcasting disabled (use advert button)',
+    );
+  }
+
+  void setFastLocationActiveUse(bool isActive) {
+    if (_isFastLocationActiveUse == isActive) return;
+    _isFastLocationActiveUse = isActive;
+    _refreshFastLocationTimer();
+  }
+
+  Future<void> setFastLocationUpdatesEnabled(bool enabled) async {
+    fastLocationUpdatesEnabled = enabled;
+    await saveSettings();
+    _refreshFastLocationTimer();
+  }
+
+  Future<void> updateFastLocationMovementThreshold(double meters) async {
+    fastLocationMovementThresholdMeters = meters.clamp(1.0, 1000.0);
+    await saveSettings();
+  }
+
+  Future<void> updateFastLocationActiveCadenceSeconds(int seconds) async {
+    fastLocationActiveCadenceSeconds = seconds.clamp(5, 60);
+    await saveSettings();
+    _refreshFastLocationTimer();
+  }
+
+  void _evaluateFastLocationMovement(Position position) {
+    if (!fastLocationUpdatesEnabled) return;
+    final previous = _lastFastLocationSentPosition;
+    if (previous == null) {
+      _emitFastLocationUpdate(position, reason: 'initial');
+      return;
+    }
+
+    final distance = Geolocator.distanceBetween(
+      previous.latitude,
+      previous.longitude,
+      position.latitude,
+      position.longitude,
+    );
+    if (distance >= fastLocationMovementThresholdMeters) {
+      _emitFastLocationUpdate(position, reason: 'movement');
+    }
+  }
+
+  void _refreshFastLocationTimer() {
+    _fastLocationTimer?.cancel();
+    _fastLocationTimer = null;
+    if (!isTracking ||
+        !fastLocationUpdatesEnabled ||
+        !_isFastLocationActiveUse) {
+      return;
+    }
+
+    _fastLocationTimer = Timer.periodic(
+      Duration(seconds: fastLocationActiveCadenceSeconds),
+      (_) {
+        final position = currentPosition;
+        if (position == null) return;
+        _emitFastLocationUpdate(position, reason: 'active_use');
+      },
+    );
+  }
+
+  void _emitFastLocationUpdate(Position position, {required String reason}) {
+    if (!fastLocationUpdatesEnabled) return;
+
+    final now = DateTime.now();
+    final previous = _lastFastLocationSentPosition;
+    final previousTime = _lastFastLocationSentAt;
+    if (previous != null && previousTime != null) {
+      final distance = Geolocator.distanceBetween(
+        previous.latitude,
+        previous.longitude,
+        position.latitude,
+        position.longitude,
+      );
+      final elapsedMs = now.difference(previousTime).inMilliseconds;
+      if (distance < 1.0 && elapsedMs < 3000) {
+        return;
+      }
+    }
+
+    _lastFastLocationSentPosition = position;
+    _lastFastLocationSentAt = now;
+    onFastLocationUpdate?.call(position, reason);
   }
 
   // ============================================================================
@@ -457,7 +588,9 @@ class LocationTrackingService {
       await _bleService!.sendSelfAdvert(floodMode: true);
 
       debugPrint('✅ [LocationTracking] Manual broadcast successful');
-      debugPrint('   Automatic broadcasts will resume after ${minTimeIntervalSeconds}s');
+      debugPrint(
+        '   Automatic broadcasts will resume after ${minTimeIntervalSeconds}s',
+      );
       onBroadcastSent?.call(position);
 
       return true;
@@ -480,12 +613,24 @@ class LocationTrackingService {
     maxDistanceMeters = prefs.getDouble(_prefKeyMaxDistance) ?? 100.0;
     minTimeIntervalSeconds = prefs.getInt(_prefKeyMinTimeInterval) ?? 30;
     gpsUpdateDistance = prefs.getDouble(_prefKeyGpsUpdateDistance) ?? 10.0;
+    fastLocationUpdatesEnabled =
+        prefs.getBool(_prefKeyFastLocationEnabled) ?? false;
+    fastLocationMovementThresholdMeters =
+        (prefs.getDouble(_prefKeyFastMovementThreshold) ?? gpsUpdateDistance)
+            .clamp(1.0, 1000.0);
+    fastLocationActiveCadenceSeconds =
+        (prefs.getInt(_prefKeyFastActiveCadence) ?? 10).clamp(5, 60);
 
     debugPrint('✅ [LocationTracking] Settings loaded');
     debugPrint('    Min distance: ${minDistanceMeters}m');
     debugPrint('    Max distance: ${maxDistanceMeters}m');
     debugPrint('    Min time interval: ${minTimeIntervalSeconds}s');
     debugPrint('    GPS update distance: ${gpsUpdateDistance}m');
+    debugPrint('    Fast updates enabled: $fastLocationUpdatesEnabled');
+    debugPrint(
+      '    Fast movement threshold: ${fastLocationMovementThresholdMeters}m',
+    );
+    debugPrint('    Fast active cadence: ${fastLocationActiveCadenceSeconds}s');
   }
 
   /// Save settings to SharedPreferences
@@ -497,6 +642,18 @@ class LocationTrackingService {
     await prefs.setInt(_prefKeyMinTimeInterval, minTimeIntervalSeconds);
     await prefs.setDouble(_prefKeyGpsUpdateDistance, gpsUpdateDistance);
     await prefs.setBool(_prefKeyEnabled, isTracking);
+    await prefs.setBool(
+      _prefKeyFastLocationEnabled,
+      fastLocationUpdatesEnabled,
+    );
+    await prefs.setDouble(
+      _prefKeyFastMovementThreshold,
+      fastLocationMovementThresholdMeters,
+    );
+    await prefs.setInt(
+      _prefKeyFastActiveCadence,
+      fastLocationActiveCadenceSeconds,
+    );
 
     debugPrint('✅ [LocationTracking] Settings saved');
   }
@@ -509,6 +666,7 @@ class LocationTrackingService {
   void dispose() {
     debugPrint('🗑️ [LocationTracking] Disposing service');
     _positionSubscription?.cancel();
+    _fastLocationTimer?.cancel();
     _positionSubscription = null;
     _bleService = null;
     _isInitialized = false;

lib/services/mbtiles_service.dart

@@ -1,273 +0,0 @@
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:mbtiles/mbtiles.dart';
-
-/// Metadata information extracted from an MBTiles file
-class MbtilesMetadata {
-  final String name;
-  final String? description;
-  final String? version;
-  final String? attribution;
-  final String? bounds; // "minLon,minLat,maxLon,maxLat"
-  final String? center; // "lon,lat,zoom"
-  final int? minZoom;
-  final int? maxZoom;
-  final String? format; // "pbf", "png", "jpg", etc.
-  final String? type; // "overlay", "baselayer"
-  final String? json; // Additional metadata JSON
-  final File file;
-  final int fileSize;
-
-  const MbtilesMetadata({
-    required this.name,
-    this.description,
-    this.version,
-    this.attribution,
-    this.bounds,
-    this.center,
-    this.minZoom,
-    this.maxZoom,
-    this.format,
-    this.type,
-    this.json,
-    required this.file,
-    required this.fileSize,
-  });
-
-  /// Check if this is a vector tile MBTiles file
-  bool get isVector => format == 'pbf' || format == 'mvt';
-
-  /// Parse bounds string into [minLon, minLat, maxLon, maxLat]
-  List<double>? get boundsCoordinates {
-    if (bounds == null) return null;
-    try {
-      final parts = bounds!.split(',');
-      if (parts.length != 4) return null;
-      return parts.map((s) => double.parse(s.trim())).toList();
-    } catch (e) {
-      debugPrint('Error parsing bounds: $e');
-      return null;
-    }
-  }
-
-  /// Parse center string into [lon, lat, zoom]
-  List<double>? get centerCoordinates {
-    if (center == null) return null;
-    try {
-      final parts = center!.split(',');
-      if (parts.length < 2) return null;
-      return parts.map((s) => double.parse(s.trim())).toList();
-    } catch (e) {
-      debugPrint('Error parsing center: $e');
-      return null;
-    }
-  }
-
-  /// Get file size in human-readable format
-  String get fileSizeFormatted {
-    if (fileSize < 1024) {
-      return '$fileSize B';
-    } else if (fileSize < 1024 * 1024) {
-      return '${(fileSize / 1024).toStringAsFixed(1)} KB';
-    } else if (fileSize < 1024 * 1024 * 1024) {
-      return '${(fileSize / (1024 * 1024)).toStringAsFixed(1)} MB';
-    } else {
-      return '${(fileSize / (1024 * 1024 * 1024)).toStringAsFixed(2)} GB';
-    }
-  }
-}
-
-/// Service for managing MBTiles files for offline vector maps
-class MbtilesService {
-  static const String _mbtilesDirectory = 'offline_maps';
-
-  /// Get the directory where MBTiles files are stored
-  Future<Directory> getMbtilesDirectory() async {
-    final appDocDir = await getApplicationDocumentsDirectory();
-    final mbtilesDir = Directory('${appDocDir.path}/$_mbtilesDirectory');
-
-    // Create directory if it doesn't exist
-    if (!await mbtilesDir.exists()) {
-      await mbtilesDir.create(recursive: true);
-    }
-
-    return mbtilesDir;
-  }
-
-  /// List all MBTiles files in the offline maps directory
-  Future<List<File>> listMbtilesFiles() async {
-    final dir = await getMbtilesDirectory();
-
-    try {
-      final files = await dir
-          .list()
-          .where((entity) => entity is File && entity.path.endsWith('.mbtiles'))
-          .map((entity) => entity as File)
-          .toList();
-
-      return files;
-    } catch (e) {
-      debugPrint('Error listing MBTiles files: $e');
-      return [];
-    }
-  }
-
-  /// Get metadata from an MBTiles file
-  Future<MbtilesMetadata?> getMetadata(File file) async {
-    try {
-      // Check if file exists
-      if (!await file.exists()) {
-        debugPrint('MBTiles file does not exist: ${file.path}');
-        return null;
-      }
-
-      // Get file size
-      final fileSize = await file.length();
-
-      // Open MBTiles file
-      final mbtiles = MbTiles(mbtilesPath: file.path);
-
-      // Get metadata from MBTiles
-      final metadata = mbtiles.getMetadata();
-
-      // Convert bounds object to string if available
-      String? boundsStr;
-      if (metadata.bounds != null) {
-        boundsStr = metadata.bounds.toString();
-      }
-
-      return MbtilesMetadata(
-        name: metadata.name,
-        description: metadata.description,
-        version: metadata.version?.toString(),
-        attribution: null, // Not available in new API
-        bounds: boundsStr,
-        center: null, // Not available in new API
-        minZoom: metadata.minZoom?.toInt(),
-        maxZoom: metadata.maxZoom?.toInt(),
-        format: metadata.format,
-        type: metadata.type?.name,
-        json: null, // Not available in new API
-        file: file,
-        fileSize: fileSize,
-      );
-    } catch (e) {
-      debugPrint('Error reading MBTiles metadata from ${file.path}: $e');
-      return null;
-    }
-  }
-
-  /// Get metadata for all MBTiles files
-  Future<List<MbtilesMetadata>> getAllMetadata() async {
-    final files = await listMbtilesFiles();
-    final metadataList = <MbtilesMetadata>[];
-
-    for (final file in files) {
-      final metadata = await getMetadata(file);
-      if (metadata != null) {
-        metadataList.add(metadata);
-      }
-    }
-
-    return metadataList;
-  }
-
-  /// Import an MBTiles file from an external location
-  Future<File?> importMbtilesFile(String sourcePath) async {
-    try {
-      final sourceFile = File(sourcePath);
-
-      // Verify source file exists
-      if (!await sourceFile.exists()) {
-        debugPrint('Source file does not exist: $sourcePath');
-        return null;
-      }
-
-      // Get destination directory
-      final destDir = await getMbtilesDirectory();
-      final fileName = _getFileName(sourceFile);
-      final destPath = '${destDir.path}/$fileName';
-
-      // Copy file to destination
-      final destFile = await sourceFile.copy(destPath);
-      debugPrint('Imported MBTiles file to: $destPath');
-
-      return destFile;
-    } catch (e) {
-      debugPrint('Error importing MBTiles file: $e');
-      return null;
-    }
-  }
-
-  /// Delete an MBTiles file
-  Future<bool> deleteMbtilesFile(File file) async {
-    try {
-      if (await file.exists()) {
-        await file.delete();
-        debugPrint('Deleted MBTiles file: ${file.path}');
-        return true;
-      }
-      return false;
-    } catch (e) {
-      debugPrint('Error deleting MBTiles file: $e');
-      return false;
-    }
-  }
-
-  /// Check if data in MBTiles is gzip compressed
-  Future<bool> isGzipCompressed(File file) async {
-    try {
-      // Open MBTiles and check a sample tile
-      final mbtiles = MbTiles(mbtilesPath: file.path);
-
-      // Try to get metadata to check for compression hints
-      final metadata = mbtiles.getMetadata();
-      final format = metadata.format;
-
-      // For Geofabrik files, format is 'pbf' and data is gzipped
-      // We can infer this from common patterns, but ideally we'd check actual tile data
-      if (format == 'pbf') {
-        // Geofabrik MBTiles are typically gzipped
-        // Could also check tile data headers, but this is a reasonable heuristic
-        return true;
-      }
-
-      return false;
-    } catch (e) {
-      debugPrint('Error checking gzip compression: $e');
-      return false;
-    }
-  }
-
-  /// Determine the vector tile schema from metadata
-  String? getVectorSchema(MbtilesMetadata metadata) {
-    // Try to infer schema from metadata
-    final json = metadata.json;
-    if (json != null) {
-      if (json.contains('shortbread')) {
-        return 'shortbread';
-      } else if (json.contains('openmaptiles')) {
-        return 'openmaptiles';
-      }
-    }
-
-    // Check description
-    final description = metadata.description?.toLowerCase();
-    if (description != null) {
-      if (description.contains('shortbread')) {
-        return 'shortbread';
-      } else if (description.contains('openmaptiles')) {
-        return 'openmaptiles';
-      }
-    }
-
-    // Default to unknown
-    return null;
-  }
-
-  /// Helper: Get file name from path
-  String _getFileName(File file) {
-    return file.path.split(Platform.pathSeparator).last;
-  }
-}

lib/services/notification_service.dart

@@ -58,7 +58,6 @@ class NotificationService {
         requestAlertPermission: true,
         requestBadgePermission: true,
         requestSoundPermission: true,
-        requestCriticalPermission: true, // For urgent SAR notifications
       );
 
       // Combined initialization settings
@@ -100,8 +99,6 @@ class NotificationService {
           alert: true,
           badge: true,
           sound: true,
-          critical:
-              true, // Request critical alert permission for urgent SAR notifications
         );
         _permissionGranted = granted ?? false;
         debugPrint(
@@ -274,8 +271,7 @@ class NotificationService {
         badgeNumber: 1,
         threadIdentifier: 'sar_markers',
         categoryIdentifier: 'SAR_ALERT',
-        interruptionLevel:
-            InterruptionLevel.critical, // Critical alert (bypasses silent mode)
+        interruptionLevel: InterruptionLevel.timeSensitive,
       );
 
       // Combined notification details

lib/services/route_hash_preferences.dart

@@ -0,0 +1,26 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class RouteHashPreferences {
+  static const String _hashSizeKey = 'route_hash_size';
+  static const int defaultHashSize = 1;
+
+  static Future<int> getHashSize() async {
+    final prefs = await SharedPreferences.getInstance();
+    final value = prefs.getInt(_hashSizeKey) ?? defaultHashSize;
+    return _normalize(value);
+  }
+
+  static Future<void> setHashSize(int value) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setInt(_hashSizeKey, _normalize(value));
+  }
+
+  static int normalizeSync(int value) => _normalize(value);
+
+  static int _normalize(int value) {
+    if (value < 1 || value > 3) {
+      return defaultHashSize;
+    }
+    return value;
+  }
+}

lib/services/tile_cache_service.dart

@@ -1,284 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
-import 'package:vector_map_tiles_mbtiles/vector_map_tiles_mbtiles.dart';
-import 'package:mbtiles/mbtiles.dart';
-import '../models/map_layer.dart';
-
-class TileCacheService {
-  static const String _storeName = 'meshcore_sar_tiles';
-
-  // Global flag to ensure ObjectBox is only initialized once
-  static bool _objectBoxInitialized = false;
-  static final _initLock = <String, Future<void>>{};
-
-  late final FMTCStore _store;
-  bool _isInitialized = false;
-  bool _isDownloading = false;
-
-  Future<void> initialize() async {
-    if (_isInitialized) return;
-
-    // Ensure we only initialize ObjectBox once globally
-    if (!_objectBoxInitialized) {
-      // Use a lock to prevent concurrent initialization attempts
-      final initFuture = _initLock.putIfAbsent('objectbox', () async {
-        try {
-          await FMTCObjectBoxBackend().initialise();
-          _objectBoxInitialized = true;
-        } catch (e) {
-          // Already initialized or error - that's okay
-          _objectBoxInitialized = true;
-        }
-      });
-      await initFuture;
-    }
-
-    try {
-      _store = FMTCStore(_storeName);
-      await _store.manage.create();
-      _isInitialized = true;
-    } catch (e) {
-      // Store might already exist
-      _store = FMTCStore(_storeName);
-      _isInitialized = true;
-    }
-  }
-
-  FMTCTileProvider getTileProvider(MapLayer layer) {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-    return FMTCTileProvider(
-      stores: {_storeName: BrowseStoreStrategy.readUpdateCreate},
-      loadingStrategy: BrowseLoadingStrategy.cacheFirst,
-      cachedValidDuration: const Duration(days: 30),
-    );
-  }
-
-  /// Get tile provider for WMS layers with caching support
-  /// WMS layers require special handling because they use WMSTileLayerOptions
-  FMTCTileProvider getTileProviderForWms(MapLayer layer) {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-    if (!layer.isWms) {
-      throw ArgumentError('Layer must be a WMS layer');
-    }
-
-    // Return the same cached tile provider
-    // The WMS URL construction is handled by flutter_map's WMSTileLayerOptions
-    return FMTCTileProvider(
-      stores: {_storeName: BrowseStoreStrategy.readUpdateCreate},
-      loadingStrategy: BrowseLoadingStrategy.cacheFirst,
-      cachedValidDuration: const Duration(days: 30),
-    );
-  }
-
-  Future<void> downloadRegion({
-    required MapLayer layer,
-    required LatLngBounds bounds,
-    required int minZoom,
-    required int maxZoom,
-    Function(double progress)? onProgress,
-  }) async {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-
-    if (_isDownloading) {
-      throw StateError('A download is already in progress. Cancel it first.');
-    }
-
-    _isDownloading = true;
-
-    try {
-      final region = RectangleRegion(bounds);
-
-      final downloadable = region.toDownloadable(
-        minZoom: minZoom,
-        maxZoom: maxZoom,
-        options: TileLayer(urlTemplate: layer.urlTemplate),
-      );
-
-      final download = _store.download.startForeground(region: downloadable);
-
-      await for (final progress in download.downloadProgress) {
-        if (onProgress != null && progress.maxTilesCount > 0) {
-          // Use attemptedTilesCount instead of successfulTilesCount
-          // attemptedTilesCount includes successful + buffered + skipped tiles
-          final percentage = progress.percentageProgress;
-          debugPrint(
-            'Download progress: ${progress.attemptedTilesCount}/${progress.maxTilesCount} = ${percentage.toStringAsFixed(1)}% (successful: ${progress.successfulTilesCount}, buffered: ${progress.bufferedTilesCount}, skipped: ${progress.skippedTilesCount})',
-          );
-          onProgress(percentage);
-        }
-      }
-    } finally {
-      _isDownloading = false;
-    }
-  }
-
-  Future<void> cancelDownload() async {
-    if (!_isInitialized) return;
-    await _store.download.cancel();
-  }
-
-  Future<void> clearCache() async {
-    if (!_isInitialized) return;
-    await _store.manage.delete();
-    await _store.manage.create();
-  }
-
-  Future<int> getCachedTileCount() async {
-    if (!_isInitialized) return 0;
-    final stats = await _store.stats.length;
-    return stats;
-  }
-
-  Future<double> getCacheSizeMB() async {
-    if (!_isInitialized) return 0.0;
-    final stats = await _store.stats.size;
-    return stats / (1024 * 1024);
-  }
-
-  Future<List<String>> getAvailableStores() async {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-
-    final stores = await FMTCRoot.stats.storesAvailable;
-    return stores.map((store) => store.storeName).toList();
-  }
-
-  Future<Map<String, dynamic>> getStoreStats() async {
-    if (!_isInitialized) return {};
-
-    final length = await _store.stats.length;
-    final size = await _store.stats.all.then((a) => a.size);
-
-    return {
-      'tileCount': length,
-      'sizeMB': size / 1024,
-      'storeName': _storeName,
-    };
-  }
-
-  /// Get vector tile provider for MBTiles layers
-  MbTilesVectorTileProvider? getVectorTileProvider(MapLayer layer) {
-    if (!layer.isVector || layer.mbtilesFile == null) {
-      return null;
-    }
-
-    try {
-      final mbtiles = MbTiles(
-        mbtilesPath: layer.mbtilesFile!.path,
-        gzip: layer.isGzipped ?? false,
-      );
-
-      return MbTilesVectorTileProvider(
-        mbtiles: mbtiles,
-      );
-    } catch (e) {
-      debugPrint('Error creating vector tile provider: $e');
-      return null;
-    }
-  }
-
-  /// Export the current tile cache store to an archive file
-  ///
-  /// [outputPath] - Full path where the archive should be saved (e.g., '/path/to/export.fmtc')
-  ///
-  /// Returns the number of tiles exported
-  Future<int> exportStore(String outputPath) async {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-
-    try {
-      final external = FMTCRoot.external(pathToArchive: outputPath);
-      final result = await external.export(storeNames: [_storeName]);
-
-      debugPrint('Export completed: $result tiles exported to $outputPath');
-      return result;
-    } catch (e) {
-      debugPrint('Error exporting store: $e');
-      rethrow;
-    }
-  }
-
-  /// Import a tile cache store from an archive file
-  ///
-  /// [filePath] - Path to the .fmtc archive file to import
-  /// [storeNames] - Optional list of store names to import (null = import all)
-  /// [strategy] - Conflict resolution strategy (default: merge)
-  ///
-  /// Returns a map with import statistics (e.g., tile count, stores imported)
-  Future<Map<String, dynamic>> importStore(
-    String filePath, {
-    List<String>? storeNames,
-    ImportConflictStrategy strategy = ImportConflictStrategy.merge,
-  }) async {
-    if (!_isInitialized) {
-      throw StateError(
-        'TileCacheService not initialized. Call initialize() first.',
-      );
-    }
-
-    try {
-      final external = FMTCRoot.external(pathToArchive: filePath);
-      final result = external.import(storeNames: storeNames, strategy: strategy);
-
-      // Wait for the import to complete and get tile count
-      final tileCount = await result.complete;
-
-      // Wait for store states
-      final storesToStates = await result.storesToStates;
-
-      debugPrint('Import completed: $tileCount tiles imported, ${storesToStates.length} stores');
-
-      // Count successful stores (those that weren't skipped)
-      final successfulCount = storesToStates.values.where((state) => state.name != null).length;
-
-      return {
-        'successfulStores': successfulCount,
-        'tileCount': tileCount,
-        'storesToStates': storesToStates,
-      };
-    } catch (e) {
-      debugPrint('Error importing store: $e');
-      rethrow;
-    }
-  }
-
-  /// List all stores available in an archive file without importing
-  ///
-  /// [filePath] - Path to the .fmtc archive file to inspect
-  ///
-  /// Returns a list of store names contained in the archive
-  Future<List<String>> listArchiveStores(String filePath) async {
-    try {
-      final external = FMTCRoot.external(pathToArchive: filePath);
-      final stores = await external.listStores;
-      debugPrint('Archive contains ${stores.length} stores: $stores');
-      return stores;
-    } catch (e) {
-      debugPrint('Error listing archive stores: $e');
-      rethrow;
-    }
-  }
-
-  void dispose() {
-    _isInitialized = false;
-  }
-}

lib/utils/fast_gps_packet.dart

@@ -0,0 +1,69 @@
+import 'dart:typed_data';
+
+class FastGpsPacket {
+  static const int magic = 0x47; // 'G'
+  static const int _payloadLength = 19;
+  // Store coordinates in microdegrees. This preserves sub-meter precision,
+  // which comfortably satisfies the meter-accuracy requirement.
+  static const double coordinateScale = 1e6;
+
+  final String senderKey6;
+  final double latitude;
+  final double longitude;
+  final int timestampSeconds;
+
+  const FastGpsPacket({
+    required this.senderKey6,
+    required this.latitude,
+    required this.longitude,
+    required this.timestampSeconds,
+  });
+
+  static bool isFastGpsBinary(Uint8List payload) =>
+      payload.length == _payloadLength && payload[0] == magic;
+
+  static FastGpsPacket? tryParseBinary(Uint8List payload) {
+    if (!isFastGpsBinary(payload)) return null;
+
+    final key6 = payload
+        .sublist(1, 7)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+    final data = ByteData.sublistView(payload);
+    final latitude = data.getInt32(7, Endian.little) / coordinateScale;
+    final longitude = data.getInt32(11, Endian.little) / coordinateScale;
+    final timestampSeconds = data.getUint32(15, Endian.little);
+
+    if (!_isValidCoordinate(latitude, longitude)) {
+      return null;
+    }
+
+    return FastGpsPacket(
+      senderKey6: key6,
+      latitude: latitude,
+      longitude: longitude,
+      timestampSeconds: timestampSeconds,
+    );
+  }
+
+  Uint8List encodeBinary() {
+    final out = Uint8List(_payloadLength);
+    final data = ByteData.sublistView(out);
+    out[0] = magic;
+    for (var i = 0; i < 6; i++) {
+      out[1 + i] = int.parse(senderKey6.substring(i * 2, i * 2 + 2), radix: 16);
+    }
+    data.setInt32(7, (latitude * coordinateScale).round(), Endian.little);
+    data.setInt32(11, (longitude * coordinateScale).round(), Endian.little);
+    data.setUint32(15, timestampSeconds, Endian.little);
+    return out;
+  }
+
+  static bool _isValidCoordinate(double latitude, double longitude) {
+    if (!latitude.isFinite || !longitude.isFinite) return false;
+    return latitude >= -90.0 &&
+        latitude <= 90.0 &&
+        longitude >= -180.0 &&
+        longitude <= 180.0;
+  }
+}

lib/widgets/contacts/contact_route_dialog.dart

@@ -1,6 +1,19 @@
 import 'package:flutter/material.dart';
 
 import '../../models/contact.dart';
+import '../../services/route_hash_preferences.dart';
+
+class ContactRouteDialogResult {
+  final ParsedContactRoute? route;
+  final bool shouldClear;
+
+  const ContactRouteDialogResult._({this.route, required this.shouldClear});
+
+  const ContactRouteDialogResult.set(ParsedContactRoute route)
+    : this._(route: route, shouldClear: false);
+
+  const ContactRouteDialogResult.clear() : this._(shouldClear: true);
+}
 
 class ContactRouteDialog extends StatefulWidget {
   final Contact contact;
@@ -12,16 +25,25 @@ class ContactRouteDialog extends StatefulWidget {
     required this.availableContacts,
   });
 
-  static Future<ParsedContactRoute?> show(
+  static Future<ContactRouteDialogResult?> show(
     BuildContext context, {
     required Contact contact,
     required List<Contact> availableContacts,
   }) {
-    return showDialog<ParsedContactRoute>(
+    return showModalBottomSheet<ContactRouteDialogResult>(
       context: context,
-      builder: (context) => ContactRouteDialog(
-        contact: contact,
-        availableContacts: availableContacts,
+      isScrollControlled: true,
+      showDragHandle: true,
+      builder: (context) => SafeArea(
+        child: Padding(
+          padding: EdgeInsets.only(
+            bottom: MediaQuery.of(context).viewInsets.bottom,
+          ),
+          child: ContactRouteDialog(
+            contact: contact,
+            availableContacts: availableContacts,
+          ),
+        ),
       ),
     );
   }
@@ -32,20 +54,18 @@ class ContactRouteDialog extends StatefulWidget {
 
 class _ContactRouteDialogState extends State<ContactRouteDialog> {
   late final TextEditingController _controller;
-  late int _selectedHashSize;
+  int _selectedHashSize = RouteHashPreferences.defaultHashSize;
   ParsedContactRoute? _parsedRoute;
   String? _errorText;
 
   @override
   void initState() {
     super.initState();
-    _selectedHashSize = widget.contact.routeHasPath
-        ? widget.contact.routeHashSize
-        : 1;
     _controller = TextEditingController(
       text: widget.contact.routeCanonicalText,
     );
     _controller.addListener(_reparse);
+    _loadHashSizePreference();
     _reparse();
   }
 
@@ -68,10 +88,12 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     }
 
     try {
-      final parsed = ContactRouteCodec.parse(input);
+      final parsed = ContactRouteCodec.parse(
+        input,
+        expectedHashSize: _selectedHashSize,
+      );
       setState(() {
         _parsedRoute = parsed;
-        _selectedHashSize = parsed.hashSize;
         _errorText = null;
       });
     } on ContactRouteFormatException catch (error) {
@@ -82,6 +104,15 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
     }
   }
 
+  Future<void> _loadHashSizePreference() async {
+    final hashSize = await RouteHashPreferences.getHashSize();
+    if (!mounted) return;
+    setState(() {
+      _selectedHashSize = hashSize;
+    });
+    _reparse();
+  }
+
   String _tokenFor(Contact contact, int hashSize) {
     final hex = contact.publicKeyHex.toUpperCase();
     final length = hashSize * 2;
@@ -108,123 +139,112 @@ class _ContactRouteDialogState extends State<ContactRouteDialog> {
             .toList()
           ..sort((a, b) => a.displayName.compareTo(b.displayName));
 
-    return AlertDialog(
-      title: Text('Set Route for ${widget.contact.displayName}'),
-      content: SizedBox(
-        width: 560,
-        child: SingleChildScrollView(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                'Path hash size',
-                style: Theme.of(context).textTheme.labelLarge,
+    return FractionallySizedBox(
+      heightFactor: 0.85,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Set Route for ${widget.contact.displayName}',
+              style: Theme.of(context).textTheme.headlineSmall,
+            ),
+            const SizedBox(height: 16),
+            TextField(
+              controller: _controller,
+              textCapitalization: TextCapitalization.characters,
+              decoration: InputDecoration(
+                labelText: 'Route',
+                hintText: _selectedHashSize == 1
+                    ? 'AA,BB,CC'
+                    : _selectedHashSize == 2
+                    ? 'AABB,CCDD'
+                    : 'AABBCC,DDEEFF',
+                helperText:
+                    'Use comma-separated hops. Path byte size comes from global Settings. Colon form like AA:BB is also accepted.',
+                errorText: _errorText,
+                border: const OutlineInputBorder(),
               ),
-              const SizedBox(height: 8),
-              Wrap(
-                spacing: 8,
-                children: [1, 2, 3]
-                    .map(
-                      (hashSize) => ChoiceChip(
-                        label: Text(
-                          '$hashSize byte${hashSize == 1 ? '' : 's'}',
-                        ),
-                        selected: _selectedHashSize == hashSize,
-                        onSelected: (_) {
-                          setState(() {
-                            _selectedHashSize = hashSize;
-                          });
-                        },
+            ),
+            const SizedBox(height: 12),
+            Text(
+              _parsedRoute == null
+                  ? 'Preview: enter a route to validate it.'
+                  : 'Preview: ${_parsedRoute!.summary} • ${_parsedRoute!.byteLength} bytes • descriptor 0x${_parsedRoute!.encodedPathLen.toRadixString(16).padLeft(2, '0').toUpperCase()}',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            if (_parsedRoute != null) ...[
+              const SizedBox(height: 4),
+              SelectableText(
+                _parsedRoute!.canonicalText,
+                style: Theme.of(
+                  context,
+                ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
+              ),
+            ],
+            const SizedBox(height: 16),
+            Text(
+              'Pick hops from contacts',
+              style: Theme.of(context).textTheme.labelLarge,
+            ),
+            const SizedBox(height: 8),
+            if (routeCandidates.isEmpty)
+              const Text(
+                'No repeater or room contacts are available for route building.',
+              )
+            else
+              Expanded(
+                child: ListView.builder(
+                  itemCount: routeCandidates.length,
+                  itemBuilder: (context, index) {
+                    final candidate = routeCandidates[index];
+                    return ListTile(
+                      dense: true,
+                      contentPadding: EdgeInsets.zero,
+                      title: Text(candidate.displayName),
+                      subtitle: Text(
+                        '1B ${_tokenFor(candidate, 1)} • 2B ${_tokenFor(candidate, 2)} • 3B ${_tokenFor(candidate, 3)}',
+                        style: const TextStyle(fontFamily: 'monospace'),
                       ),
-                    )
-                    .toList(),
-              ),
-              const SizedBox(height: 16),
-              TextField(
-                controller: _controller,
-                textCapitalization: TextCapitalization.characters,
-                decoration: InputDecoration(
-                  labelText: 'Route',
-                  hintText: _selectedHashSize == 1
-                      ? 'AA,BB,CC'
-                      : _selectedHashSize == 2
-                      ? 'AABB,CCDD'
-                      : 'AABBCC,DDEEFF',
-                  helperText:
-                      'Use comma-separated hops. Colon form like AA:BB is also accepted.',
-                  errorText: _errorText,
-                  border: const OutlineInputBorder(),
+                      trailing: TextButton(
+                        onPressed: () => _appendHop(candidate),
+                        child: Text(
+                          'Use ${_tokenFor(candidate, _selectedHashSize)}',
+                        ),
+                      ),
+                    );
+                  },
                 ),
               ),
-              const SizedBox(height: 12),
-              Text(
-                _parsedRoute == null
-                    ? 'Preview: enter a route to validate it.'
-                    : 'Preview: ${_parsedRoute!.summary} • ${_parsedRoute!.byteLength} bytes • descriptor 0x${_parsedRoute!.encodedPathLen.toRadixString(16).padLeft(2, '0').toUpperCase()}',
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
-              if (_parsedRoute != null) ...[
-                const SizedBox(height: 4),
-                SelectableText(
-                  _parsedRoute!.canonicalText,
-                  style: Theme.of(
-                    context,
-                  ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
+            const SizedBox(height: 16),
+            Row(
+              children: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: const Text('Cancel'),
+                ),
+                if (widget.contact.routeHasPath)
+                  TextButton(
+                    onPressed: () => Navigator.of(
+                      context,
+                    ).pop(const ContactRouteDialogResult.clear()),
+                    child: const Text('Clear Route'),
+                  ),
+                const Spacer(),
+                FilledButton(
+                  onPressed: _parsedRoute == null
+                      ? null
+                      : () => Navigator.of(
+                          context,
+                        ).pop(ContactRouteDialogResult.set(_parsedRoute!)),
+                  child: const Text('Set Route'),
                 ),
               ],
-              const SizedBox(height: 16),
-              Text(
-                'Pick hops from contacts',
-                style: Theme.of(context).textTheme.labelLarge,
-              ),
-              const SizedBox(height: 8),
-              if (routeCandidates.isEmpty)
-                const Text(
-                  'No repeater or room contacts are available for route building.',
-                )
-              else
-                ConstrainedBox(
-                  constraints: const BoxConstraints(maxHeight: 240),
-                  child: ListView.builder(
-                    shrinkWrap: true,
-                    itemCount: routeCandidates.length,
-                    itemBuilder: (context, index) {
-                      final candidate = routeCandidates[index];
-                      return ListTile(
-                        dense: true,
-                        contentPadding: EdgeInsets.zero,
-                        title: Text(candidate.displayName),
-                        subtitle: Text(
-                          '1B ${_tokenFor(candidate, 1)} • 2B ${_tokenFor(candidate, 2)} • 3B ${_tokenFor(candidate, 3)}',
-                          style: const TextStyle(fontFamily: 'monospace'),
-                        ),
-                        trailing: TextButton(
-                          onPressed: () => _appendHop(candidate),
-                          child: Text(
-                            'Use ${_tokenFor(candidate, _selectedHashSize)}',
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                ),
-            ],
-          ),
+            ),
+          ],
         ),
       ),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.of(context).pop(),
-          child: const Text('Cancel'),
-        ),
-        FilledButton(
-          onPressed: _parsedRoute == null
-              ? null
-              : () => Navigator.of(context).pop(_parsedRoute),
-          child: const Text('Set Route'),
-        ),
-      ],
     );
   }
 }

lib/widgets/contacts/contact_tile.dart

@@ -8,12 +8,11 @@ import '../../models/room_login_state.dart';
 import '../../providers/connection_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/map_provider.dart';
-import '../../providers/app_provider.dart';
 import 'contact_route_dialog.dart';
 import 'room_login_sheet.dart';
+import '../common/contact_avatar.dart';
 import '../../utils/location_formats.dart';
 import '../../utils/toast_logger.dart';
-import '../../utils/battery_display_helper.dart';
 import '../../l10n/app_localizations.dart';
 
 class ContactTile extends StatelessWidget {
@@ -45,15 +44,7 @@ class ContactTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final appProvider = context.watch<AppProvider>();
-    final isSimpleMode = appProvider.isSimpleMode;
-
-    final hasTelemetry =
-        contact.telemetry != null && contact.telemetry!.isRecent;
-    final battery = contact.displayBattery;
     final location = contact.displayLocation;
-    final routeHasPath = contact.routeHasPath;
-
     // Calculate distance if both positions are available
     String? distanceText;
     if (location != null &&
@@ -77,439 +68,232 @@ class ContactTile extends StatelessWidget {
     final roomLoginState = contact.type == ContactType.room
         ? connectionProvider.getRoomLoginState(contact.publicKeyPrefix)
         : null;
-
-    return Card(
-      margin: const EdgeInsets.only(bottom: 8),
-      child: ListTile(
-        leading: Stack(
-          children: [
-            CircleAvatar(
-              backgroundColor: _getTypeColor(contact.type, context),
-              child: contact.roleEmoji != null
-                  ? Text(
-                      contact.roleEmoji!,
-                      style: const TextStyle(fontSize: 24),
-                    )
-                  : Icon(_getTypeIcon(contact.type), color: Colors.white),
-            ),
-            // New contact indicator badge (top-right)
-            if (contact.isNew)
-              Positioned(
-                top: 0,
-                right: 0,
-                child: Container(
-                  width: 12,
-                  height: 12,
-                  decoration: BoxDecoration(
-                    color: Colors.blue,
-                    shape: BoxShape.circle,
-                    border: Border.all(color: Colors.white, width: 2),
-                  ),
-                ),
-              ),
-            // Room login status indicator badge (bottom-right)
-            if (contact.type == ContactType.room && roomLoginState != null)
-              Positioned(
-                bottom: 0,
-                right: 0,
-                child: Container(
-                  padding: const EdgeInsets.all(2),
-                  decoration: BoxDecoration(
-                    color: _getRoomStatusColor(roomLoginState),
-                    shape: BoxShape.circle,
-                    border: Border.all(color: Colors.white, width: 2),
-                  ),
-                  child: Icon(
-                    _getRoomStatusIcon(roomLoginState),
-                    size: 12,
-                    color: Colors.white,
-                  ),
-                ),
-              ),
-          ],
-        ),
-        title: Row(
-          children: [
-            Expanded(
-              child: Text(
-                contact.displayName,
-                style: const TextStyle(fontWeight: FontWeight.bold),
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
-            // Battery indicator - hidden in simple mode
-            if (!isSimpleMode && battery != null) ...[
-              const SizedBox(width: 4),
-              Icon(
-                BatteryDisplayHelper.getBatteryIcon(battery),
-                size: 16,
-                color: BatteryDisplayHelper.getBatteryColor(battery),
-              ),
-              const SizedBox(width: 2),
-              Text(
-                '${battery.round()}%',
-                style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                  color: BatteryDisplayHelper.getBatteryColor(battery),
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-            ],
-            // Connection type indicator (direct/flood) - hidden in simple mode
-            if (!isSimpleMode && contact.type != ContactType.channel) ...[
-              const SizedBox(width: 4),
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
-                decoration: BoxDecoration(
-                  color: routeHasPath
-                      ? Colors.green.withValues(alpha: 0.15)
-                      : Colors.orange.withValues(alpha: 0.15),
-                  borderRadius: BorderRadius.circular(3),
-                  border: Border.all(
-                    color: routeHasPath ? Colors.green : Colors.orange,
-                    width: 0.5,
-                  ),
-                ),
+    final trailing = contact.isChannel && !contact.isPublicChannel
+        ? PopupMenuButton<String>(
+            icon: const Icon(Icons.more_vert),
+            onSelected: (value) {
+              if (value == 'delete') {
+                _showDeleteChannelDialog(context, contact);
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'delete',
                 child: Row(
-                  mainAxisSize: MainAxisSize.min,
                   children: [
-                    Icon(
-                      routeHasPath ? Icons.route : Icons.waves,
-                      size: 10,
-                      color: routeHasPath ? Colors.green : Colors.orange,
-                    ),
-                    const SizedBox(width: 2),
+                    const Icon(Icons.delete, color: Colors.red, size: 20),
+                    const SizedBox(width: 8),
                     Text(
-                      routeHasPath
-                          ? AppLocalizations.of(context)!.direct
-                          : AppLocalizations.of(context)!.flood,
-                      style: TextStyle(
-                        fontSize: 9,
-                        fontWeight: FontWeight.w600,
-                        color: routeHasPath ? Colors.green : Colors.orange,
-                      ),
+                      AppLocalizations.of(context)!.deleteChannel,
+                      style: const TextStyle(color: Colors.red),
                     ),
                   ],
                 ),
               ),
             ],
-            if (isPingInProgress) ...[
-              const SizedBox(width: 6),
-              SizedBox(
-                width: 14,
-                height: 14,
-                child: CircularProgressIndicator(
-                  strokeWidth: 2,
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-              ),
-            ],
+          )
+        : null;
+    void handleTap() {
+      if (contact.type == ContactType.chat) {
+        _showSetRouteDialog(context, contact);
+      } else if (contact.type == ContactType.repeater) {
+        _jumpToMapForRepeater(context, contact);
+      } else if (contact.type == ContactType.room && !contact.isPublicChannel) {
+        _showRoomLoginDialog(context, contact);
+      } else {
+        _showContactDetails(context, contact);
+      }
+    }
+
+    final onLongPress = isPingInProgress
+        ? null
+        : () async {
+            final connectionProvider = context.read<ConnectionProvider>();
+            final hasPath = contact.routeHasPath;
+
+            final result = await connectionProvider.smartPing(
+              contactPublicKey: contact.publicKey,
+              hasPath: hasPath,
+              onRetryWithFlooding: () {
+                if (context.mounted) {
+                  ToastLogger.warning(
+                    context,
+                    AppLocalizations.of(
+                      context,
+                    )!.directPingTimeout(contact.displayName),
+                  );
+                }
+              },
+            );
+
+            if (context.mounted && !result.success) {
+              ToastLogger.error(
+                context,
+                AppLocalizations.of(context)!.pingFailed(contact.displayName),
+              );
+            }
+          };
+    final colorScheme = Theme.of(context).colorScheme;
+    final titleStyle = Theme.of(context).textTheme.titleMedium?.copyWith(
+      fontWeight: FontWeight.w800,
+      letterSpacing: -0.3,
+    );
+    final timeAgoText = _getLocalizedTimeSinceLastSeen(context);
+    final timeAgoStyle = Theme.of(context).textTheme.labelSmall?.copyWith(
+      color: contact.isRecentlySeen
+          ? colorScheme.primary
+          : colorScheme.onSurfaceVariant,
+      fontWeight: FontWeight.w600,
+    );
+    final subtitleWidget = Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (location != null) ...[
+          const SizedBox(height: 2),
+          _buildLocationLine(
+            context,
+            latitude: location.latitude,
+            longitude: location.longitude,
+            distanceText: distanceText,
+          ),
+          if (contact.type != ContactType.channel) ...[
+            const SizedBox(height: 6),
+            Row(children: [_buildRoutePill(context, contact)]),
+          ],
+        ] else
+          Padding(
+            padding: const EdgeInsets.only(top: 4),
+            child: Text(
+              AppLocalizations.of(context)!.noGpsData,
+              style: Theme.of(
+                context,
+              ).textTheme.labelSmall?.copyWith(color: Colors.grey),
+            ),
+          ),
+      ],
+    );
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 8),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(18),
+        gradient: LinearGradient(
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+          colors: [
+            colorScheme.surfaceContainerLow,
+            colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
           ],
         ),
-        subtitle: isSimpleMode
-            ? Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const SizedBox(height: 4),
-                  // Simple mode: Show last update time
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.access_time,
-                        size: 12,
-                        color: contact.isRecentlySeen
-                            ? Colors.green
-                            : Colors.grey,
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        '${AppLocalizations.of(context)!.lastSeen}: ${_getLocalizedTimeSinceLastSeen(context)}',
-                        style: Theme.of(context).textTheme.labelSmall,
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 4),
-                  // Simple mode: Show location and distance
-                  if (location != null) ...[
-                    Row(
-                      children: [
-                        const Icon(
-                          Icons.location_on,
-                          size: 12,
-                          color: Colors.blue,
-                        ),
-                        const SizedBox(width: 4),
-                        Expanded(
-                          child: Text(
-                            'GPS: ${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
-                            style: Theme.of(context).textTheme.labelSmall,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ],
-                    ),
-                    if (distanceText != null) ...[
-                      const SizedBox(height: 4),
-                      Row(
-                        children: [
-                          const Icon(
-                            Icons.straighten,
-                            size: 12,
+        border: Border.all(
+          color: colorScheme.outlineVariant.withValues(alpha: 0.35),
+        ),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: 0.045),
+            blurRadius: 12,
+            offset: const Offset(0, 4),
+          ),
+        ],
+      ),
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          borderRadius: BorderRadius.circular(18),
+          onTap: handleTap,
+          onLongPress: onLongPress,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Stack(
+                  clipBehavior: Clip.none,
+                  children: [
+                    ContactAvatar(contact: contact, radius: 24),
+                    if (contact.isNew)
+                      Positioned(
+                        top: -2,
+                        right: -2,
+                        child: Container(
+                          width: 14,
+                          height: 14,
+                          decoration: BoxDecoration(
                             color: Colors.blue,
+                            shape: BoxShape.circle,
+                            border: Border.all(color: Colors.white, width: 2),
                           ),
-                          const SizedBox(width: 4),
-                          Text(
-                            '${AppLocalizations.of(context)!.distance}: $distanceText',
-                            style: Theme.of(context).textTheme.labelSmall
-                                ?.copyWith(
-                                  color: Colors.blue,
-                                  fontWeight: FontWeight.w500,
-                                ),
-                          ),
-                        ],
+                        ),
                       ),
-                    ],
-                  ] else
-                    Text(
-                      AppLocalizations.of(context)!.noGpsData,
-                      style: Theme.of(
-                        context,
-                      ).textTheme.labelSmall?.copyWith(color: Colors.grey),
-                    ),
-                ],
-              )
-            : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const SizedBox(height: 4),
-                  // Room login status badges
-                  if (roomLoginState != null && roomLoginState.isLoggedIn) ...[
-                    Row(
-                      children: [
-                        if (roomLoginState.isAdmin)
-                          Container(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: 4,
-                              vertical: 2,
-                            ),
-                            decoration: BoxDecoration(
-                              color: Colors.red.withValues(alpha: 0.2),
-                              borderRadius: BorderRadius.circular(4),
-                              border: Border.all(color: Colors.red, width: 1),
-                            ),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.min,
+                    if (contact.type == ContactType.room &&
+                        roomLoginState != null)
+                      Positioned(
+                        bottom: -2,
+                        right: -2,
+                        child: Container(
+                          padding: const EdgeInsets.all(3),
+                          decoration: BoxDecoration(
+                            color: _getRoomStatusColor(roomLoginState),
+                            shape: BoxShape.circle,
+                            border: Border.all(color: Colors.white, width: 2),
+                          ),
+                          child: Icon(
+                            _getRoomStatusIcon(roomLoginState),
+                            size: 11,
+                            color: Colors.white,
+                          ),
+                        ),
+                      ),
+                  ],
+                ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                const Icon(
-                                  Icons.admin_panel_settings,
-                                  size: 10,
-                                  color: Colors.red,
-                                ),
-                                const SizedBox(width: 2),
                                 Text(
-                                  AppLocalizations.of(context)!.admin,
-                                  style: Theme.of(context).textTheme.labelSmall
-                                      ?.copyWith(
-                                        color: Colors.red,
-                                        fontWeight: FontWeight.bold,
-                                        fontSize: 10,
-                                      ),
+                                  contact.displayName,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: titleStyle,
                                 ),
                               ],
                             ),
                           ),
-                        if (roomLoginState.isAdmin) const SizedBox(width: 4),
-                        Container(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 4,
-                            vertical: 2,
-                          ),
-                          decoration: BoxDecoration(
-                            color: Colors.green.withValues(alpha: 0.2),
-                            borderRadius: BorderRadius.circular(4),
-                            border: Border.all(color: Colors.green, width: 1),
-                          ),
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              const Icon(
-                                Icons.check_circle,
-                                size: 10,
-                                color: Colors.green,
+                          const SizedBox(width: 8),
+                          Text(timeAgoText, style: timeAgoStyle),
+                          if (isPingInProgress) ...[
+                            const SizedBox(width: 6),
+                            SizedBox(
+                              width: 16,
+                              height: 16,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 2,
+                                color: colorScheme.primary,
                               ),
-                              const SizedBox(width: 2),
-                              Text(
-                                AppLocalizations.of(context)!.loggedIn,
-                                style: Theme.of(context).textTheme.labelSmall
-                                    ?.copyWith(
-                                      color: Colors.green,
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: 10,
-                                    ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 4),
-                  ],
-                  // Last seen + GPS info combined
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.access_time,
-                        size: 12,
-                        color: contact.isRecentlySeen
-                            ? Colors.green
-                            : Colors.grey,
+                            ),
+                          ],
+                          if (trailing != null) ...[
+                            const SizedBox(width: 2),
+                            trailing,
+                          ],
+                        ],
                       ),
-                      const SizedBox(width: 4),
-                      Text(
-                        _getLocalizedTimeSinceLastSeen(context),
-                        style: Theme.of(context).textTheme.labelSmall,
-                      ),
-                      if (location != null) ...[
-                        const SizedBox(width: 8),
-                        const Text('•', style: TextStyle(color: Colors.grey)),
-                        const SizedBox(width: 8),
-                        if (hasTelemetry)
-                          const Icon(
-                            Icons.sensors,
-                            size: 12,
-                            color: Colors.green,
-                          )
-                        else
-                          const Icon(
-                            Icons.sensors_off,
-                            size: 12,
-                            color: Colors.grey,
-                          ),
-                        const SizedBox(width: 4),
-                        Expanded(
-                          child: Text(
-                            'GPS: ${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
-                            style: Theme.of(context).textTheme.labelSmall,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ] else ...[
-                        const SizedBox(width: 8),
-                        const Text('•', style: TextStyle(color: Colors.grey)),
-                        const SizedBox(width: 8),
-                        const Icon(
-                          Icons.sensors_off,
-                          size: 12,
-                          color: Colors.grey,
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          AppLocalizations.of(context)!.noGpsData,
-                          style: Theme.of(context).textTheme.labelSmall,
-                        ),
-                      ],
+                      subtitleWidget,
                     ],
                   ),
-                  // Distance info (new row)
-                  if (distanceText != null) ...[
-                    const SizedBox(height: 4),
-                    Row(
-                      children: [
-                        const Icon(
-                          Icons.straighten,
-                          size: 12,
-                          color: Colors.blue,
-                        ),
-                        const SizedBox(width: 4),
-                        Text(
-                          '${AppLocalizations.of(context)!.distance}: $distanceText',
-                          style: Theme.of(context).textTheme.labelSmall
-                              ?.copyWith(
-                                color: Colors.blue,
-                                fontWeight: FontWeight.w500,
-                              ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ],
-              ),
-        trailing: contact.isChannel && !contact.isPublicChannel
-            ? PopupMenuButton<String>(
-                icon: const Icon(Icons.more_vert),
-                onSelected: (value) {
-                  if (value == 'delete') {
-                    _showDeleteChannelDialog(context, contact);
-                  }
-                },
-                itemBuilder: (context) => [
-                  PopupMenuItem(
-                    value: 'delete',
-                    child: Row(
-                      children: [
-                        const Icon(Icons.delete, color: Colors.red, size: 20),
-                        const SizedBox(width: 8),
-                        Text(
-                          AppLocalizations.of(context)!.deleteChannel,
-                          style: const TextStyle(color: Colors.red),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              )
-            : null,
-        onTap: () {
-          // In simple mode, tap directly opens the route editor for chat contacts
-          if (isSimpleMode && contact.type == ContactType.chat) {
-            _showSetRouteDialog(context, contact);
-          } else if (isSimpleMode && contact.type == ContactType.repeater) {
-            // In simple mode, tapping a repeater jumps to the map
-            _jumpToMapForRepeater(context, contact);
-          } else if (isSimpleMode &&
-              contact.type == ContactType.room &&
-              !contact.isPublicChannel) {
-            _showRoomLoginDialog(context, contact);
-          } else {
-            _showContactDetails(context, contact);
-          }
-        },
-        onLongPress: isPingInProgress
-            ? null
-            : () async {
-                final connectionProvider = context.read<ConnectionProvider>();
-
-                // Determine if we should use flooding (no path) or direct (has path)
-                final hasPath = contact.routeHasPath;
-
-                // Use smart ping with automatic fallback
-                final result = await connectionProvider.smartPing(
-                  contactPublicKey: contact.publicKey,
-                  hasPath: hasPath,
-                  onRetryWithFlooding: () {
-                    // Called when retrying with flooding after direct timeout
-                    if (context.mounted) {
-                      ToastLogger.warning(
-                        context,
-                        AppLocalizations.of(
-                          context,
-                        )!.directPingTimeout(contact.displayName),
-                      );
-                    }
-                  },
-                );
-
-                // Show final result
-                if (context.mounted) {
-                  if (!result.success) {
-                    ToastLogger.error(
-                      context,
-                      AppLocalizations.of(
-                        context,
-                      )!.pingFailed(contact.displayName),
-                    );
-                  }
-                }
-              },
+                ),
+              ],
+            ),
+          ),
+        ),
       ),
     );
   }
@@ -637,18 +421,7 @@ class ContactTile extends StatelessWidget {
                 padding: const EdgeInsets.symmetric(horizontal: 16),
                 child: Row(
                   children: [
-                    CircleAvatar(
-                      backgroundColor: _getTypeColor(contact.type, context),
-                      child: contact.roleEmoji != null
-                          ? Text(
-                              contact.roleEmoji!,
-                              style: const TextStyle(fontSize: 24),
-                            )
-                          : Icon(
-                              _getTypeIcon(contact.type),
-                              color: Colors.white,
-                            ),
-                    ),
+                    ContactAvatar(contact: contact, radius: 20),
                     const SizedBox(width: 12),
                     Expanded(
                       child: Text(
@@ -874,10 +647,11 @@ class ContactTile extends StatelessWidget {
                                 : () async {
                                     final connectionProvider = context
                                         .read<ConnectionProvider>();
-                                    final result = await connectionProvider.smartPing(
-                                      contactPublicKey: contact.publicKey,
-                                      hasPath: contact.routeHasPath,
-                                    );
+                                    final result = await connectionProvider
+                                        .smartPing(
+                                          contactPublicKey: contact.publicKey,
+                                          hasPath: contact.routeHasPath,
+                                        );
 
                                     if (!context.mounted || result.success) {
                                       return;
@@ -1096,17 +870,42 @@ class ContactTile extends StatelessWidget {
         .where((candidate) => candidate.publicKeyHex != contact.publicKeyHex)
         .toList();
 
-    final parsedRoute = await ContactRouteDialog.show(
+    final routeResult = await ContactRouteDialog.show(
       context,
       contact: contact,
       availableContacts: availableContacts,
     );
-    if (parsedRoute == null || !context.mounted) {
+    if (routeResult == null || !context.mounted) {
       return;
     }
 
     final previousSignedPathLen = contact.routeSignedPathLen;
     final previousPathBytes = Uint8List.fromList(contact.outPath);
+    if (routeResult.shouldClear) {
+      contactsProvider.resetContactRouteLocal(contact.publicKey);
+      await connectionProvider.resetPath(contact.publicKey);
+      final error = connectionProvider.error;
+      if (error != null) {
+        contactsProvider.setContactRouteLocal(
+          contact.publicKey,
+          signedEncodedPathLen: previousSignedPathLen,
+          paddedPathBytes: previousPathBytes,
+        );
+        if (context.mounted) {
+          ToastLogger.error(context, 'Failed to clear route: $error');
+        }
+        return;
+      }
+
+      if (context.mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(const SnackBar(content: Text('Route cleared')));
+      }
+      return;
+    }
+
+    final parsedRoute = routeResult.route!;
     contactsProvider.setContactRouteLocal(
       contact.publicKey,
       signedEncodedPathLen: parsedRoute.signedEncodedPathLen,
@@ -1197,6 +996,73 @@ class ContactTile extends StatelessWidget {
     );
   }
 
+  Widget _buildLocationMeta(
+    BuildContext context,
+    double latitude,
+    double longitude, {
+    bool telemetryActive = true,
+  }) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          width: 18,
+          height: 18,
+          decoration: BoxDecoration(
+            color: telemetryActive
+                ? colorScheme.primary.withValues(alpha: 0.12)
+                : colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(999),
+          ),
+          child: Icon(
+            telemetryActive
+                ? Icons.navigation_rounded
+                : Icons.location_searching,
+            size: 11,
+            color: telemetryActive
+                ? colorScheme.primary
+                : colorScheme.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(width: 6),
+        Text(
+          '${latitude.toStringAsFixed(5)}, ${longitude.toStringAsFixed(5)}',
+          style: Theme.of(context).textTheme.labelSmall?.copyWith(
+            fontFamily: 'monospace',
+            color: colorScheme.onSurfaceVariant,
+            letterSpacing: 0.1,
+          ),
+          overflow: TextOverflow.ellipsis,
+        ),
+      ],
+    );
+  }
+
+  Widget _buildLocationLine(
+    BuildContext context, {
+    required double latitude,
+    required double longitude,
+    String? distanceText,
+    bool telemetryActive = true,
+  }) {
+    return Wrap(
+      spacing: 8,
+      runSpacing: 6,
+      crossAxisAlignment: WrapCrossAlignment.center,
+      children: [
+        _buildLocationMeta(
+          context,
+          latitude,
+          longitude,
+          telemetryActive: telemetryActive,
+        ),
+        if (distanceText != null) _buildDistancePill(context, distanceText),
+      ],
+    );
+  }
+
   /// Convert to Degrees Minutes Seconds (DMS) format
   String _convertToDMS(double lat, double lon) {
     String latDir = lat >= 0 ? 'N' : 'S';
@@ -1253,19 +1119,6 @@ class ContactTile extends StatelessWidget {
     return '$zone$letter (approximate)';
   }
 
-  IconData _getTypeIcon(ContactType type) {
-    switch (type) {
-      case ContactType.chat:
-        return Icons.person;
-      case ContactType.repeater:
-        return Icons.router;
-      case ContactType.room:
-        return Icons.tag;
-      default:
-        return Icons.help;
-    }
-  }
-
   Color _getTypeColor(ContactType type, BuildContext context) {
     switch (type) {
       case ContactType.chat:
@@ -1388,4 +1241,84 @@ class ContactTile extends StatelessWidget {
       ),
     );
   }
+
+  Widget _buildRoutePill(BuildContext context, Contact contact) {
+    final hasPath = contact.routeHasPath;
+    final isDirect = !hasPath || contact.routeHopCount <= 0;
+    final scheme = Theme.of(context).colorScheme;
+    final textColor = Theme.of(
+      context,
+    ).textTheme.labelSmall?.color?.withValues(alpha: 0.82);
+    final iconColor = Theme.of(
+      context,
+    ).textTheme.labelSmall?.color?.withValues(alpha: 0.7);
+    final label = isDirect
+        ? AppLocalizations.of(context)!.direct
+        : contact.routeCanonicalText;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+      decoration: BoxDecoration(
+        color: scheme.surfaceContainerHighest.withValues(alpha: 0.65),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            isDirect ? Icons.north_east_rounded : Icons.alt_route,
+            size: 11,
+            color: iconColor,
+          ),
+          const SizedBox(width: 5),
+          Flexible(
+            child: Text(
+              label,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                color: textColor,
+                fontWeight: FontWeight.w600,
+                fontFamily: !isDirect ? 'monospace' : null,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDistancePill(BuildContext context, String distanceText) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+      decoration: BoxDecoration(
+        color: Theme.of(
+          context,
+        ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.65),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(
+            Icons.straighten,
+            size: 11,
+            color: Theme.of(
+              context,
+            ).textTheme.labelSmall?.color?.withValues(alpha: 0.7),
+          ),
+          const SizedBox(width: 5),
+          Text(
+            distanceText,
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: Theme.of(
+                context,
+              ).textTheme.labelSmall?.color?.withValues(alpha: 0.82),
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }

lib/widgets/map/download_area_overlay.dart

@@ -1,108 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-
-/// Overlay widget that displays controls for download area selection.
-/// The actual polygon should be rendered inside FlutterMap's children.
-class DownloadAreaOverlay extends StatelessWidget {
-  final LatLngBounds bounds;
-  final VoidCallback onConfirm;
-  final VoidCallback onCancel;
-
-  const DownloadAreaOverlay({
-    super.key,
-    required this.bounds,
-    required this.onConfirm,
-    required this.onCancel,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        // Control buttons at the top
-        Positioned(
-          top: 16,
-          left: 16,
-          right: 16,
-          child: Card(
-            child: Padding(
-              padding: const EdgeInsets.all(12.0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Text(
-                    'Download Area Selection',
-                    style: Theme.of(context).textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(height: 8),
-                  Text(
-                    'The blue rectangle shows the area to be downloaded. '
-                    'To change the area, tap Cancel and select download again.',
-                    style: Theme.of(context).textTheme.bodySmall,
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(height: 12),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children: [
-                      Expanded(
-                        child: OutlinedButton.icon(
-                          onPressed: onCancel,
-                          icon: const Icon(Icons.close),
-                          label: const Text('Cancel'),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: FilledButton.icon(
-                          onPressed: onConfirm,
-                          icon: const Icon(Icons.check),
-                          label: const Text('Confirm'),
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-
-        // Area info at the bottom
-        Positioned(
-          bottom: 16,
-          left: 16,
-          right: 16,
-          child: Card(
-            child: Padding(
-              padding: const EdgeInsets.all(12.0),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    'Area Bounds',
-                    style: Theme.of(context).textTheme.titleSmall,
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    'N: ${bounds.north.toStringAsFixed(4)}° '
-                    'S: ${bounds.south.toStringAsFixed(4)}°',
-                    style: Theme.of(context).textTheme.bodySmall,
-                  ),
-                  Text(
-                    'E: ${bounds.east.toStringAsFixed(4)}° '
-                    'W: ${bounds.west.toStringAsFixed(4)}°',
-                    style: Theme.of(context).textTheme.bodySmall,
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/widgets/map/drawing_layer.dart

@@ -8,14 +8,8 @@ import '../../l10n/app_localizations.dart';
 class DrawingLayer extends StatelessWidget {
   final List<MapDrawing> drawings;
   final MapDrawing? previewDrawing;
-  final bool isSimpleMode;
 
-  const DrawingLayer({
-    super.key,
-    required this.drawings,
-    this.previewDrawing,
-    this.isSimpleMode = false,
-  });
+  const DrawingLayer({super.key, required this.drawings, this.previewDrawing});
 
   @override
   Widget build(BuildContext context) {
@@ -48,8 +42,7 @@ class DrawingLayer extends StatelessWidget {
       strokeWidth = 4.0;
     } else if (drawing.isReceived) {
       // Received drawing from another node
-      // In simple mode: solid (opacity 1.0), in normal mode: translucent (0.7)
-      opacity = isSimpleMode ? 1.0 : 0.7;
+      opacity = 1.0;
       strokeWidth = 3.0;
     } else {
       // Local drawing (solid line, normal thickness)
@@ -87,7 +80,6 @@ class DrawingMarkersLayer extends StatelessWidget {
   final Function(String drawingId)? onDeleteDrawing;
   final Function(MapDrawing drawing)? onTapDrawing;
   final bool showDeleteButtons;
-  final bool isSimpleMode;
 
   const DrawingMarkersLayer({
     super.key,
@@ -95,7 +87,6 @@ class DrawingMarkersLayer extends StatelessWidget {
     this.onDeleteDrawing,
     this.onTapDrawing,
     this.showDeleteButtons = false,
-    this.isSimpleMode = false,
   });
 
   @override
@@ -132,73 +123,7 @@ class DrawingMarkersLayer extends StatelessWidget {
                       ),
                     ],
                   ),
-                  child: const Icon(
-                    Icons.close,
-                    color: Colors.white,
-                    size: 20,
-                  ),
-                ),
-              ),
-            ),
-          );
-        } else if (drawing.isReceived && drawing.senderName != null && !isSimpleMode) {
-          // Show sender badge for received drawings (when not in drawing mode and not in simple mode)
-          // Make it tappable if message ID is available
-          markers.add(
-            Marker(
-              point: centerPoint,
-              width: 120,
-              height: 30,
-              child: GestureDetector(
-                onTap: drawing.messageId != null && onTapDrawing != null
-                    ? () => onTapDrawing!(drawing)
-                    : null,
-                child: Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-                  decoration: BoxDecoration(
-                    color: drawing.color.withValues(alpha: 0.9),
-                    borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: Colors.white, width: 1.5),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withValues(alpha: 0.3),
-                        blurRadius: 4,
-                        offset: const Offset(0, 2),
-                      ),
-                    ],
-                  ),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      const Icon(
-                        Icons.person,
-                        color: Colors.white,
-                        size: 14,
-                      ),
-                      const SizedBox(width: 4),
-                      Flexible(
-                        child: Text(
-                          drawing.senderName!,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 11,
-                            fontWeight: FontWeight.bold,
-                          ),
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 1,
-                        ),
-                      ),
-                      // Add indicator that this is tappable
-                      if (drawing.messageId != null && onTapDrawing != null) ...[
-                        const SizedBox(width: 4),
-                        const Icon(
-                          Icons.arrow_forward_ios,
-                          color: Colors.white,
-                          size: 10,
-                        ),
-                      ],
-                    ],
-                  ),
+                  child: const Icon(Icons.close, color: Colors.white, size: 20),
                 ),
               ),
             ),
@@ -236,9 +161,7 @@ class DrawingMarkersLayer extends StatelessWidget {
       context: context,
       builder: (context) => AlertDialog(
         title: Text(AppLocalizations.of(context)!.deleteDrawing),
-        content: Text(
-          'Delete this ${drawing.type.name}?',
-        ),
+        content: Text('Delete this ${drawing.type.name}?'),
         actions: [
           TextButton(
             onPressed: () => Navigator.pop(context),
@@ -249,9 +172,7 @@ class DrawingMarkersLayer extends StatelessWidget {
               Navigator.pop(context);
               onDeleteDrawing?.call(drawing.id);
             },
-            style: TextButton.styleFrom(
-              foregroundColor: Colors.red,
-            ),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
             child: Text(AppLocalizations.of(context)!.delete),
           ),
         ],

lib/widgets/map/trail_controls.dart

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../providers/map_provider.dart';
 import '../../providers/contacts_provider.dart';
-import '../../providers/app_provider.dart';
-import '../../services/gpx_service.dart';
 import '../../services/trail_color_service.dart';
 import '../../l10n/app_localizations.dart';
 
@@ -13,10 +11,11 @@ class TrailControls extends StatelessWidget {
 
   void _showTrailMenu(BuildContext context) {
     final mapProvider = Provider.of<MapProvider>(context, listen: false);
-    final contactsProvider = Provider.of<ContactsProvider>(context, listen: false);
-    final appProvider = Provider.of<AppProvider>(context, listen: false);
+    final contactsProvider = Provider.of<ContactsProvider>(
+      context,
+      listen: false,
+    );
     final l10n = AppLocalizations.of(context)!;
-    final isSimpleMode = appProvider.isSimpleMode;
 
     // Get contacts with trails (advertHistory >= 2 points)
     final contactsWithTrails = contactsProvider.contactsWithLocation
@@ -34,258 +33,232 @@ class TrailControls extends StatelessWidget {
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-              Row(
-                children: [
-                  const Icon(Icons.timeline, size: 24),
-                  const SizedBox(width: 12),
-                  Text(
-                    l10n.locationTrail,
-                    style: const TextStyle(
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 20),
-
-              // Trail visibility toggle
-              SwitchListTile(
-                secondary: const Icon(Icons.visibility),
-                title: Text(l10n.showTrailOnMap),
-                subtitle: Text(
-                  mapProvider.isTrailVisible
-                    ? l10n.trailVisible
-                    : l10n.trailHiddenRecording,
-                ),
-                value: mapProvider.isTrailVisible,
-                onChanged: (value) {
-                  mapProvider.toggleTrailVisibility();
-                  setModalState(() {}); // Update modal UI
-                },
-              ),
-              const Divider(),
-              const SizedBox(height: 8),
-
-              // Trail stats
-            if (mapProvider.currentTrail != null && mapProvider.currentTrail!.points.isNotEmpty)
-              Container(
-                padding: const EdgeInsets.all(12),
-                decoration: BoxDecoration(
-                  color: Colors.blue.withValues(alpha: 0.1),
-                  borderRadius: BorderRadius.circular(8),
-                  border: Border.all(color: Colors.blue.withValues(alpha: 0.3)),
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                Row(
                   children: [
-                    _buildStatRow(
-                      icon: Icons.straighten,
-                      label: l10n.distance,
-                      value: _formatDistance(mapProvider.totalTrailDistance),
-                    ),
-                    const SizedBox(height: 8),
-                    _buildStatRow(
-                      icon: Icons.access_time,
-                      label: l10n.duration,
-                      value: _formatDuration(mapProvider.trailDuration),
-                    ),
-                    const SizedBox(height: 8),
-                    _buildStatRow(
-                      icon: Icons.place,
-                      label: l10n.points,
-                      value: '${mapProvider.currentTrail!.points.length}',
+                    const Icon(Icons.timeline, size: 24),
+                    const SizedBox(width: 12),
+                    Text(
+                      l10n.locationTrail,
+                      style: const TextStyle(
+                        fontSize: 20,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                   ],
                 ),
-              ),
+                const SizedBox(height: 20),
 
-            const SizedBox(height: 16),
-
-            // GPX Export/Import buttons (hidden in simple mode)
-            if (!isSimpleMode) ...[
-              if (mapProvider.currentTrail != null && mapProvider.currentTrail!.points.isNotEmpty)
-                ElevatedButton.icon(
-                  onPressed: () async {
-                    final success = await GpxService.exportTrailToFile(mapProvider.currentTrail!);
-                    if (context.mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(success
-                            ? l10n.trailExportedSuccessfully
-                            : l10n.failedToExportTrail),
-                          backgroundColor: success ? Colors.green : Colors.red,
-                        ),
-                      );
-                    }
+                // Trail visibility toggle
+                SwitchListTile(
+                  secondary: const Icon(Icons.visibility),
+                  title: Text(l10n.showTrailOnMap),
+                  subtitle: Text(
+                    mapProvider.isTrailVisible
+                        ? l10n.trailVisible
+                        : l10n.trailHiddenRecording,
+                  ),
+                  value: mapProvider.isTrailVisible,
+                  onChanged: (value) {
+                    mapProvider.toggleTrailVisibility();
+                    setModalState(() {}); // Update modal UI
                   },
-                  icon: const Icon(Icons.upload),
-                  label: Text(l10n.exportTrailToGpx),
-                  style: ElevatedButton.styleFrom(
-                    padding: const EdgeInsets.all(16),
-                  ),
                 ),
+                const Divider(),
+                const SizedBox(height: 8),
 
-              const SizedBox(height: 8),
-
-              ElevatedButton.icon(
-                onPressed: () async {
-                  try {
-                    final trail = await GpxService.importTrailFromFile();
-                    if (trail != null && context.mounted) {
-                      _showImportDialog(context, mapProvider, trail, l10n);
-                    }
-                  } catch (e) {
-                    if (context.mounted) {
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(l10n.failedToImportTrail(e.toString())),
-                          backgroundColor: Colors.red,
-                        ),
-                      );
-                    }
-                  }
-                },
-                icon: const Icon(Icons.download),
-                label: Text(l10n.importTrailFromGpx),
-                style: ElevatedButton.styleFrom(
-                  padding: const EdgeInsets.all(16),
-                ),
-              ),
-
-              const SizedBox(height: 16),
-            ],
-
-            // Clear trail button
-            if (mapProvider.currentTrail != null && mapProvider.currentTrail!.points.isNotEmpty)
-              ElevatedButton.icon(
-                onPressed: () {
-                  _showClearConfirmation(context, mapProvider, l10n);
-                },
-                icon: const Icon(Icons.delete_outline),
-                label: Text(l10n.clearTrail),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: Colors.red,
-                  foregroundColor: Colors.white,
-                  padding: const EdgeInsets.all(16),
-                ),
-              ),
-
-            // No trail message
-            if (mapProvider.currentTrail == null || mapProvider.currentTrail!.points.isEmpty)
-              Padding(
-                padding: const EdgeInsets.all(16),
-                child: Center(
-                  child: Column(
-                    children: [
-                      const Icon(Icons.timeline, size: 48, color: Colors.grey),
-                      const SizedBox(height: 8),
-                      Text(
-                        l10n.noTrailRecorded,
-                        style: const TextStyle(
-                          color: Colors.grey,
-                          fontSize: 16,
-                        ),
+                // Trail stats
+                if (mapProvider.currentTrail != null &&
+                    mapProvider.currentTrail!.points.isNotEmpty)
+                  Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: Colors.blue.withValues(alpha: 0.1),
+                      borderRadius: BorderRadius.circular(8),
+                      border: Border.all(
+                        color: Colors.blue.withValues(alpha: 0.3),
                       ),
-                      const SizedBox(height: 8),
-                      Text(
-                        l10n.startTrackingToRecord,
-                        style: const TextStyle(
-                          color: Colors.grey,
-                          fontSize: 12,
-                        ),
-                        textAlign: TextAlign.center,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-
-            const SizedBox(height: 8),
-            const Divider(),
-            const SizedBox(height: 8),
-
-            // Contact Trails Section
-            Row(
-              children: [
-                const Icon(Icons.people, size: 20),
-                const SizedBox(width: 8),
-                Text(
-                  l10n.contactTrails,
-                  style: const TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 12),
-
-            // Show All Contact Trails toggle
-            SwitchListTile(
-              secondary: const Icon(Icons.route),
-              title: Text(l10n.showAllContactTrails),
-              subtitle: Text(contactsWithTrails.isEmpty
-                  ? l10n.noContactsWithLocationHistory
-                  : mapProvider.showAllContactTrails
-                      ? l10n.showingTrailsForContacts(contactsWithTrails.length)
-                      : l10n.individualContactTrails),
-              value: mapProvider.showAllContactTrails,
-              onChanged: contactsWithTrails.isNotEmpty
-                  ? (value) {
-                      mapProvider.toggleAllContactTrails();
-                      setModalState(() {}); // Update modal UI
-                    }
-                  : null, // Disable if no contacts with trails
-            ),
-
-            // Individual contact trails (when "show all" is OFF)
-            if (!mapProvider.showAllContactTrails && contactsWithTrails.isNotEmpty)
-              ExpansionTile(
-                title: Text(l10n.individualContactTrails),
-                initiallyExpanded: false,
-                children: contactsWithTrails.map((contact) {
-                  final trailColor = TrailColorService.getTrailColor(contact);
-                  final isVisible = mapProvider.isContactPathVisible(contact.publicKeyHex);
-
-                  return SwitchListTile(
-                    // Color indicator with emoji
-                    secondary: Row(
-                      mainAxisSize: MainAxisSize.min,
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        if (contact.roleEmoji != null)
-                          Text(contact.roleEmoji!, style: const TextStyle(fontSize: 18)),
-                        const SizedBox(width: 4),
-                        Container(
-                          width: 16,
-                          height: 16,
-                          decoration: BoxDecoration(
-                            color: trailColor,
-                            border: Border.all(color: Colors.white, width: 2),
-                            borderRadius: BorderRadius.circular(3),
+                        _buildStatRow(
+                          icon: Icons.straighten,
+                          label: l10n.distance,
+                          value: _formatDistance(
+                            mapProvider.totalTrailDistance,
                           ),
                         ),
+                        const SizedBox(height: 8),
+                        _buildStatRow(
+                          icon: Icons.access_time,
+                          label: l10n.duration,
+                          value: _formatDuration(mapProvider.trailDuration),
+                        ),
+                        const SizedBox(height: 8),
+                        _buildStatRow(
+                          icon: Icons.place,
+                          label: l10n.points,
+                          value: '${mapProvider.currentTrail!.points.length}',
+                        ),
                       ],
                     ),
-                    title: Text(contact.displayName),
-                    subtitle: Text('${contact.advertHistory.length} points'),
-                    value: isVisible,
-                    onChanged: (value) {
-                      mapProvider.toggleContactPath(contact.publicKeyHex);
-                      setModalState(() {}); // Update modal UI
+                  ),
+
+                const SizedBox(height: 16),
+
+                // Clear trail button
+                if (mapProvider.currentTrail != null &&
+                    mapProvider.currentTrail!.points.isNotEmpty)
+                  ElevatedButton.icon(
+                    onPressed: () {
+                      _showClearConfirmation(context, mapProvider, l10n);
                     },
-                  );
-                }).toList(),
-              ),
+                    icon: const Icon(Icons.delete_outline),
+                    label: Text(l10n.clearTrail),
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Colors.red,
+                      foregroundColor: Colors.white,
+                      padding: const EdgeInsets.all(16),
+                    ),
+                  ),
 
-            const SizedBox(height: 8),
+                // No trail message
+                if (mapProvider.currentTrail == null ||
+                    mapProvider.currentTrail!.points.isEmpty)
+                  Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Center(
+                      child: Column(
+                        children: [
+                          const Icon(
+                            Icons.timeline,
+                            size: 48,
+                            color: Colors.grey,
+                          ),
+                          const SizedBox(height: 8),
+                          Text(
+                            l10n.noTrailRecorded,
+                            style: const TextStyle(
+                              color: Colors.grey,
+                              fontSize: 16,
+                            ),
+                          ),
+                          const SizedBox(height: 8),
+                          Text(
+                            l10n.startTrackingToRecord,
+                            style: const TextStyle(
+                              color: Colors.grey,
+                              fontSize: 12,
+                            ),
+                            textAlign: TextAlign.center,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
 
-            // Close button
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: Text(l10n.close),
-              ),
-            ],
+                const SizedBox(height: 8),
+                const Divider(),
+                const SizedBox(height: 8),
+
+                // Contact Trails Section
+                Row(
+                  children: [
+                    const Icon(Icons.people, size: 20),
+                    const SizedBox(width: 8),
+                    Text(
+                      l10n.contactTrails,
+                      style: const TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 12),
+
+                // Show All Contact Trails toggle
+                SwitchListTile(
+                  secondary: const Icon(Icons.route),
+                  title: Text(l10n.showAllContactTrails),
+                  subtitle: Text(
+                    contactsWithTrails.isEmpty
+                        ? l10n.noContactsWithLocationHistory
+                        : mapProvider.showAllContactTrails
+                        ? l10n.showingTrailsForContacts(
+                            contactsWithTrails.length,
+                          )
+                        : l10n.individualContactTrails,
+                  ),
+                  value: mapProvider.showAllContactTrails,
+                  onChanged: contactsWithTrails.isNotEmpty
+                      ? (value) {
+                          mapProvider.toggleAllContactTrails();
+                          setModalState(() {}); // Update modal UI
+                        }
+                      : null, // Disable if no contacts with trails
+                ),
+
+                // Individual contact trails (when "show all" is OFF)
+                if (!mapProvider.showAllContactTrails &&
+                    contactsWithTrails.isNotEmpty)
+                  ExpansionTile(
+                    title: Text(l10n.individualContactTrails),
+                    initiallyExpanded: false,
+                    children: contactsWithTrails.map((contact) {
+                      final trailColor = TrailColorService.getTrailColor(
+                        contact,
+                      );
+                      final isVisible = mapProvider.isContactPathVisible(
+                        contact.publicKeyHex,
+                      );
+
+                      return SwitchListTile(
+                        // Color indicator with emoji
+                        secondary: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            if (contact.roleEmoji != null)
+                              Text(
+                                contact.roleEmoji!,
+                                style: const TextStyle(fontSize: 18),
+                              ),
+                            const SizedBox(width: 4),
+                            Container(
+                              width: 16,
+                              height: 16,
+                              decoration: BoxDecoration(
+                                color: trailColor,
+                                border: Border.all(
+                                  color: Colors.white,
+                                  width: 2,
+                                ),
+                                borderRadius: BorderRadius.circular(3),
+                              ),
+                            ),
+                          ],
+                        ),
+                        title: Text(contact.displayName),
+                        subtitle: Text(
+                          '${contact.advertHistory.length} points',
+                        ),
+                        value: isVisible,
+                        onChanged: (value) {
+                          mapProvider.toggleContactPath(contact.publicKeyHex);
+                          setModalState(() {}); // Update modal UI
+                        },
+                      );
+                    }).toList(),
+                  ),
+
+                const SizedBox(height: 8),
+
+                // Close button
+                TextButton(
+                  onPressed: () => Navigator.pop(context),
+                  child: Text(l10n.close),
+                ),
+              ],
             ),
           ),
         ),
@@ -293,7 +266,11 @@ class TrailControls extends StatelessWidget {
     );
   }
 
-  void _showClearConfirmation(BuildContext context, MapProvider mapProvider, AppLocalizations l10n) {
+  void _showClearConfirmation(
+    BuildContext context,
+    MapProvider mapProvider,
+    AppLocalizations l10n,
+  ) {
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
@@ -318,50 +295,6 @@ class TrailControls extends StatelessWidget {
     );
   }
 
-  void _showImportDialog(BuildContext context, MapProvider mapProvider, trail, AppLocalizations l10n) {
-    showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        title: Text(l10n.importTrail),
-        content: Text(l10n.importTrailQuestion(trail.points.length)),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: Text(l10n.cancel),
-          ),
-          TextButton(
-            onPressed: () {
-              mapProvider.setImportedTrail(trail);
-              Navigator.pop(context); // Close dialog
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(l10n.trailImported(trail.points.length)),
-                  backgroundColor: Colors.green,
-                ),
-              );
-            },
-            child: Text(l10n.viewAlongside),
-          ),
-          TextButton(
-            onPressed: () {
-              mapProvider.replaceCurrentTrailWithImport(trail);
-              Navigator.pop(context); // Close dialog
-              Navigator.pop(context); // Close bottom sheet
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(l10n.trailReplaced(trail.points.length)),
-                  backgroundColor: Colors.green,
-                ),
-              );
-            },
-            style: TextButton.styleFrom(foregroundColor: Colors.blue),
-            child: Text(l10n.replaceCurrent),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget _buildStatRow({
     required IconData icon,
     required String label,
@@ -373,18 +306,12 @@ class TrailControls extends StatelessWidget {
         const SizedBox(width: 8),
         Text(
           label,
-          style: const TextStyle(
-            fontWeight: FontWeight.w500,
-            fontSize: 14,
-          ),
+          style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
         ),
         const Spacer(),
         Text(
           value,
-          style: const TextStyle(
-            fontWeight: FontWeight.bold,
-            fontSize: 14,
-          ),
+          style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
         ),
       ],
     );

linux/flutter/generated_plugin_registrant.cc

@@ -9,7 +9,6 @@
 #include <audioplayers_linux/audioplayers_linux_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_avif_linux/flutter_avif_linux_plugin.h>
-#include <objectbox_flutter_libs/objectbox_flutter_libs_plugin.h>
 #include <record_linux/record_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -23,9 +22,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_avif_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterAvifLinuxPlugin");
   flutter_avif_linux_plugin_register_with_registrar(flutter_avif_linux_registrar);
-  g_autoptr(FlPluginRegistrar) objectbox_flutter_libs_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "ObjectboxFlutterLibsPlugin");
-  objectbox_flutter_libs_plugin_register_with_registrar(objectbox_flutter_libs_registrar);
   g_autoptr(FlPluginRegistrar) record_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "RecordLinuxPlugin");
   record_linux_plugin_register_with_registrar(record_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -6,7 +6,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   audioplayers_linux
   file_selector_linux
   flutter_avif_linux
-  objectbox_flutter_libs
   record_linux
   url_launcher_linux
 )

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -14,7 +14,6 @@ import flutter_blue_plus_darwin
 import flutter_local_notifications
 import geolocator_apple
 import nsd_macos
-import objectbox_flutter_libs
 import package_info_plus
 import path_provider_foundation
 import record_macos
@@ -33,7 +32,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
   NsdMacosPlugin.register(with: registry.registrar(forPlugin: "NsdMacosPlugin"))
-  ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin"))

macos/Runner/Info.plist

@@ -20,6 +20,8 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

pubspec.lock

@@ -218,14 +218,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.3"
-  executor_lib:
-    dependency: transitive
-    description:
-      name: executor_lib
-      sha256: "95ddf2957d9942d9702855b38dd49677f0ee6a8b77d7b16c0e509c7669d17386"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
   exif:
     dependency: transitive
     description:
@@ -306,14 +298,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
-  flat_buffers:
-    dependency: transitive
-    description:
-      name: flat_buffers
-      sha256: "380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "23.5.26"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -507,34 +491,34 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "2b50e938a275e1ad77352d6a25e25770f4130baa61eaf02de7a9a884680954ad"
+      sha256: "0d9035862236fe38250fe1644d7ed3b8254e34a21b2c837c9f539fbb3bba5ef1"
       url: "https://pub.dev"
     source: hosted
-    version: "20.1.0"
+    version: "21.0.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: dce0116868cedd2cdf768af0365fc37ff1cbef7c02c4f51d0587482e625868d0
+      sha256: e0f25e243c6c44c825bbbc6b2b2e76f7d9222362adcfe9fd780bf01923c840bd
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "23de31678a48c084169d7ae95866df9de5c9d2a44be3e5915a2ff067aeeba899"
+      sha256: e7db3d5b49c2b7ecc68deba4aaaa67a348f92ee0fef34c8e4b4459dbef0d7307
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "11.0.0"
   flutter_local_notifications_windows:
     dependency: transitive
     description:
       name: flutter_local_notifications_windows
-      sha256: e97a1a3016512437d9c0b12fae7d1491c3c7b9aa7f03a69b974308840656b02a
+      sha256: "3a2654ba104fbb52c618ebed9def24ef270228470718c43b3a6afcd5c81bef0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -543,19 +527,12 @@ packages:
   flutter_map:
     dependency: "direct main"
     description:
-      name: flutter_map
-      sha256: "391e7dc95cc3f5190748210a69d4cfeb5d8f84dcdfa9c3235d0a9d7742ccb3f8"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: master
+      resolved-ref: fdc089aeb4fad05a4f2314f75bbd66c9b7a70668
+      url: "https://github.com/fleaflet/flutter_map.git"
+    source: git
     version: "8.2.2"
-  flutter_map_tile_caching:
-    dependency: "direct main"
-    description:
-      name: flutter_map_tile_caching
-      sha256: "90e097223d8ab74425cf15b449a03adfa4d4c28406dc757e1c396aff0f9beba7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.1.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -670,14 +647,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
-  idb_shim:
-    dependency: transitive
-    description:
-      name: idb_shim
-      sha256: "921301da0a735f336a28fc35c3abdbd4498895cc205fa1ea9f7e785e7d854ceb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.8.2+4"
   image:
     dependency: transitive
     description:
@@ -806,30 +775,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -838,14 +791,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.13.0"
-  mbtiles:
-    dependency: "direct main"
-    description:
-      name: mbtiles
-      sha256: "316af1f8db8ce95888ca70f5dd3f6914906b4e17ceeca8501206d28e78612af8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.2"
   meshcore_client:
     dependency: "direct main"
     description:
@@ -867,10 +812,10 @@ packages:
     dependency: transitive
     description:
       name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
+      sha256: "385e7168ecc77eb545220223c49eef8ab249da7bf57f22781c40a04d23fb196f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   mime:
     dependency: transitive
     description:
@@ -935,22 +880,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
-  objectbox:
-    dependency: transitive
-    description:
-      name: objectbox
-      sha256: "3cc186749178a3556e1020c9082d0897d0f9ecbdefcc27320e65c5bc650f0e57"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.1"
-  objectbox_flutter_libs:
-    dependency: transitive
-    description:
-      name: objectbox_flutter_libs
-      sha256: cd754766e04229a4f51250f121813d9a3c1a74fc21cd68e48b3c6085cbcd6c85
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.1"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -1115,10 +1044,10 @@ packages:
     dependency: "direct main"
     description:
       name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
+      sha256: ddcedc1f7876e62717de43ab3491e2829bdad0b028261805f94aa080967e5859
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.0"
   protobuf:
     dependency: transitive
     description:
@@ -1207,14 +1136,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
-  sembast:
-    dependency: transitive
-    description:
-      name: sembast
-      sha256: "139cf71496105de32e7a08a4e3a1ead0f81c4a616ec9703ed07e8f0d10cdd505"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.8.6"
   share_plus:
     dependency: "direct main"
     description:
@@ -1303,6 +1224,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.4"
+  simple_sparse_list:
+    dependency: transitive
+    description:
+      name: simple_sparse_list
+      sha256: aa648fd240fa39b49dcd11c19c266990006006de6699a412de485695910fbc1f
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1364,14 +1293,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.0"
-  sqlite3:
-    dependency: transitive
-    description:
-      name: sqlite3
-      sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.4"
   stack_trace:
     dependency: transitive
     description:
@@ -1416,18 +1337,18 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.10"
   timezone:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1
+      sha256: "784a5e34d2eb62e1326f24d6f600aaaee452eb8ca8ef2f384a59244e292d158b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.1"
+    version: "0.11.0"
   typed_data:
     dependency: transitive
     description:
@@ -1440,10 +1361,10 @@ packages:
     dependency: transitive
     description:
       name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
+      sha256: a6f7bcfc8ea1d5ce1f6c0b1c39117a9919f4953edd9fd7a64090a9796c499b57
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1"
+    version: "1.1.9"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1516,23 +1437,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.3"
-  vector_map_tiles:
-    dependency: "direct main"
-    description:
-      name: vector_map_tiles
-      sha256: e35f090c428f05e44dd525fa4fedaafd1dbcd28b656cb0ea908528c6ce84a87d
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.0.0-beta.8"
-  vector_map_tiles_mbtiles:
-    dependency: "direct main"
-    description:
-      path: vector_map_tiles_mbtiles
-      ref: HEAD
-      resolved-ref: a09543b7590b373f3ac53f4776e343fee41c7dc6
-      url: "https://github.com/josxha/flutter_map_plugins.git"
-    source: git
-    version: "1.2.1"
   vector_math:
     dependency: transitive
     description:
@@ -1541,30 +1445,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
-  vector_tile:
-    dependency: transitive
-    description:
-      name: vector_tile
-      sha256: "7ae290246e3a8734422672dbe791d3f7b8ab631734489fc6d405f1cc2080e38c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  vector_tile_dem:
-    dependency: transitive
-    description:
-      name: vector_tile_dem
-      sha256: "81a3568d2213817bd2698f919357e5107c0261491ae1014e821ed4fc3c2bf740"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.2"
-  vector_tile_renderer:
-    dependency: "direct main"
-    description:
-      name: vector_tile_renderer
-      sha256: "99530edb073c1cea3c6a4bdb5ca9a5c6779c25ddf1a645678458504708dc221c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
   vibration:
     dependency: "direct main"
     description:
@@ -1647,4 +1527,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.10.0 <4.0.0"
-  flutter: ">=3.38.0"
+  flutter: ">=3.38.1"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2026.0307.4+17
+version: 2026.0308.1+21
 
 environment:
   sdk: ^3.9.2
@@ -66,24 +66,16 @@ dependencies:
   provider: ^6.1.0
 
   # Map display
-  flutter_map: ^8.2.2
+  flutter_map:
+    git:
+      url: https://github.com/fleaflet/flutter_map.git
+      ref: master
   latlong2: ^0.9.0
 
-  # Offline tile caching
-  flutter_map_tile_caching: ^10.1.1
-
-  # Vector map tiles
-  vector_map_tiles: ^9.0.0-beta.8
-  vector_map_tiles_mbtiles:
-    git:
-      url: https://github.com/josxha/flutter_map_plugins.git
-      path: vector_map_tiles_mbtiles
-  vector_tile_renderer: ^6.0.0
-  mbtiles: ^0.4.0
   http: ^1.2.0
 
   # Coordinate system projections for WMS (EPSG:3794)
-  proj4dart: ^2.1.0
+  proj4dart: ^3.0.0
 
   # Permissions
   permission_handler: ^12.0.1
@@ -111,8 +103,8 @@ dependencies:
   flutter_background_service: ^5.0.13
 
   # Notifications
-  flutter_local_notifications: ^20.1.0
-  timezone: ^0.10.0
+  flutter_local_notifications: ^21.0.0
+  timezone: ^0.11.0
 
   # Vibration
   vibration: ^3.1.4
@@ -147,6 +139,9 @@ dev_dependencies:
   fake_async: ^1.3.3
 
 dependency_overrides:
+  # path_provider_foundation 2.6.0 pulls in package:objective_c as a native
+  # asset. That framework has been ending up archived with a macOS platform
+  # slice and fails App Store validation for iOS uploads.
   path_provider_foundation: 2.5.1
 
 flutter_launcher_icons:

test/models/contact_route_codec_test.dart

@@ -67,6 +67,13 @@ void main() {
       );
     });
 
+    test('rejects routes that do not match the configured hash size', () {
+      expect(
+        () => ContactRouteCodec.parse('AABB,CCDD', expectedHashSize: 1),
+        throwsA(isA<ContactRouteFormatException>()),
+      );
+    });
+
     test('rejects invalid tokens', () {
       expect(
         () => ContactRouteCodec.parse('AA,XYZ'),

test/providers/contacts_provider_test.dart

@@ -1,9 +1,11 @@
 import 'dart:typed_data';
 
 import 'package:flutter_test/flutter_test.dart';
+import 'package:latlong2/latlong.dart';
 import 'package:meshcore_sar_app/models/contact.dart';
 import 'package:meshcore_sar_app/providers/contacts_provider.dart';
 import 'package:meshcore_sar_app/services/cayenne_lpp_parser.dart';
+import 'package:meshcore_sar_app/utils/fast_gps_packet.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 void main() {
@@ -133,12 +135,13 @@ void main() {
     });
 
     test(
-      'retains last valid gps for chat/repeater/room when telemetry gps is invalid or missing',
+      'retains last valid gps for any contact when telemetry gps is invalid or missing',
       () {
         final contactTypes = <ContactType>[
           ContactType.chat,
           ContactType.repeater,
           ContactType.room,
+          ContactType.channel,
         ];
 
         for (var i = 0; i < contactTypes.length; i++) {
@@ -197,6 +200,172 @@ void main() {
       },
     );
 
+    test(
+      'retains last known gps when a contact refresh arrives without location',
+      () {
+        final firstFix = CayenneLppParser.createGpsData(
+          latitude: 45.1234,
+          longitude: 13.8765,
+        );
+        provider.updateTelemetry(publicKey.sublist(0, 6), firstFix);
+
+        provider.addOrUpdateContact(
+          Contact(
+            publicKey: publicKey,
+            type: ContactType.chat,
+            flags: 0,
+            outPathLen: 0,
+            outPath: Uint8List(64),
+            advName: 'Test Contact',
+            lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+            advLat: 0,
+            advLon: 0,
+            lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          ),
+        );
+
+        final updated = provider.findContactByKey(publicKey)!;
+        expect(updated.telemetry, isNotNull);
+        expect(updated.telemetry!.gpsLocation, isNotNull);
+        expect(
+          updated.telemetry!.gpsLocation!.latitude,
+          closeTo(45.1234, 0.0001),
+        );
+        expect(
+          updated.telemetry!.gpsLocation!.longitude,
+          closeTo(13.8765, 0.0001),
+        );
+        expect(updated.advLat, equals((45.1234 * 1e6).round()));
+        expect(updated.advLon, equals((13.8765 * 1e6).round()));
+        expect(updated.displayLocation, isNotNull);
+        expect(updated.displayLocation!.latitude, closeTo(45.1234, 0.0001));
+        expect(updated.displayLocation!.longitude, closeTo(13.8765, 0.0001));
+      },
+    );
+
+    test('retains existing telemetry when contact refresh omits telemetry', () {
+      final initialTelemetry = ContactTelemetry(
+        gpsLocation: const LatLng(45.1234, 13.8765),
+        batteryPercentage: 76.5,
+        batteryMilliVolts: 3890,
+        temperature: 21.5,
+        timestamp: DateTime.now().subtract(const Duration(minutes: 5)),
+        humidity: 62.0,
+        pressure: 1008.4,
+        extraSensorData: const {'co2': 415.0},
+      );
+
+      provider.addOrUpdateContact(
+        createContact(
+          key: publicKey,
+          type: ContactType.chat,
+        ).copyWith(telemetry: initialTelemetry),
+      );
+
+      provider.addOrUpdateContact(
+        Contact(
+          publicKey: publicKey,
+          type: ContactType.chat,
+          flags: 0,
+          outPathLen: 0,
+          outPath: Uint8List(64),
+          advName: 'Test Contact Refreshed',
+          lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          advLat: 0,
+          advLon: 0,
+          lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+        ),
+      );
+
+      final updated = provider.findContactByKey(publicKey)!;
+      expect(updated.telemetry, isNotNull);
+      expect(updated.telemetry!.gpsLocation, const LatLng(45.1234, 13.8765));
+      expect(updated.telemetry!.batteryPercentage, equals(76.5));
+      expect(updated.telemetry!.batteryMilliVolts, equals(3890));
+      expect(updated.telemetry!.temperature, equals(21.5));
+      expect(updated.telemetry!.humidity, equals(62.0));
+      expect(updated.telemetry!.pressure, equals(1008.4));
+      expect(updated.telemetry!.extraSensorData, containsPair('co2', 415.0));
+    });
+
+    test('retains existing telemetry during bulk contacts sync', () {
+      final initialTelemetry = ContactTelemetry(
+        gpsLocation: const LatLng(45.1234, 13.8765),
+        batteryPercentage: 76.5,
+        batteryMilliVolts: 3890,
+        temperature: 21.5,
+        timestamp: DateTime.now().subtract(const Duration(minutes: 5)),
+        humidity: 62.0,
+        pressure: 1008.4,
+        extraSensorData: const {'co2': 415.0},
+      );
+
+      provider.addOrUpdateContact(
+        createContact(
+          key: publicKey,
+          type: ContactType.chat,
+        ).copyWith(telemetry: initialTelemetry),
+      );
+
+      provider.addContacts([
+        Contact(
+          publicKey: publicKey,
+          type: ContactType.chat,
+          flags: 0,
+          outPathLen: 0,
+          outPath: Uint8List(64),
+          advName: 'Synced Contact',
+          lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          advLat: 0,
+          advLon: 0,
+          lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+        ),
+      ]);
+
+      final updated = provider.findContactByKey(publicKey)!;
+      expect(updated.telemetry, isNotNull);
+      expect(updated.telemetry!.gpsLocation, const LatLng(45.1234, 13.8765));
+      expect(updated.telemetry!.batteryPercentage, equals(76.5));
+      expect(updated.telemetry!.batteryMilliVolts, equals(3890));
+      expect(updated.telemetry!.temperature, equals(21.5));
+      expect(updated.telemetry!.humidity, equals(62.0));
+      expect(updated.telemetry!.pressure, equals(1008.4));
+      expect(updated.telemetry!.extraSensorData, containsPair('co2', 415.0));
+    });
+
+    test('retains prior telemetry fields across sparse telemetry updates', () {
+      final fullTelemetry = ContactTelemetry(
+        gpsLocation: const LatLng(46.0569, 14.5058),
+        batteryPercentage: 54.0,
+        batteryMilliVolts: 3780,
+        temperature: 19.5,
+        timestamp: DateTime.now().subtract(const Duration(minutes: 2)),
+        humidity: 58.0,
+        pressure: 1011.2,
+        extraSensorData: const {'pm25': 8.0},
+      );
+
+      provider.addOrUpdateContact(
+        createContact(
+          key: publicKey,
+          type: ContactType.chat,
+        ).copyWith(telemetry: fullTelemetry),
+      );
+
+      final batteryOnly = CayenneLppParser.createBatteryData(3.95);
+      provider.updateTelemetry(publicKey.sublist(0, 6), batteryOnly);
+
+      final updated = provider.findContactByKey(publicKey)!;
+      expect(updated.telemetry, isNotNull);
+      expect(updated.telemetry!.gpsLocation, const LatLng(46.0569, 14.5058));
+      expect(updated.telemetry!.batteryMilliVolts, isNotNull);
+      expect(updated.telemetry!.batteryPercentage, isNotNull);
+      expect(updated.telemetry!.temperature, equals(19.5));
+      expect(updated.telemetry!.humidity, equals(58.0));
+      expect(updated.telemetry!.pressure, equals(1011.2));
+      expect(updated.telemetry!.extraSensorData, containsPair('pm25', 8.0));
+    });
+
     test('builds message snapshot from latest valid telemetry', () {
       final telemetryData = CayenneLppParser.createGpsData(
         latitude: 45.0001,
@@ -235,25 +404,28 @@ void main() {
       expect(snapshot.location.longitude, closeTo(14.5058, 0.000001));
     });
 
-    test('persists last valid telemetry gps on the contact across reloads', () async {
-      final telemetryData = CayenneLppParser.createGpsData(
-        latitude: 45.0001,
-        longitude: 13.9999,
-      );
+    test(
+      'persists last valid telemetry gps on the contact across reloads',
+      () async {
+        final telemetryData = CayenneLppParser.createGpsData(
+          latitude: 45.0001,
+          longitude: 13.9999,
+        );
 
-      provider.updateTelemetry(publicKey.sublist(0, 6), telemetryData);
-      await Future<void>.delayed(Duration.zero);
+        provider.updateTelemetry(publicKey.sublist(0, 6), telemetryData);
+        await Future<void>.delayed(Duration.zero);
 
-      final reloadedProvider = ContactsProvider();
-      await reloadedProvider.initializeEarly();
+        final reloadedProvider = ContactsProvider();
+        await reloadedProvider.initializeEarly();
 
-      final reloaded = reloadedProvider.findContactByKey(publicKey)!;
-      expect(reloaded.advLat, equals((45.0001 * 1e6).round()));
-      expect(reloaded.advLon, equals((13.9999 * 1e6).round()));
-      expect(reloaded.advertLocation, isNotNull);
-      expect(reloaded.advertLocation!.latitude, closeTo(45.0001, 0.0001));
-      expect(reloaded.advertLocation!.longitude, closeTo(13.9999, 0.0001));
-    });
+        final reloaded = reloadedProvider.findContactByKey(publicKey)!;
+        expect(reloaded.advLat, equals((45.0001 * 1e6).round()));
+        expect(reloaded.advLon, equals((13.9999 * 1e6).round()));
+        expect(reloaded.advertLocation, isNotNull);
+        expect(reloaded.advertLocation!.latitude, closeTo(45.0001, 0.0001));
+        expect(reloaded.advertLocation!.longitude, closeTo(13.9999, 0.0001));
+      },
+    );
   });
 
   group('ContactsProvider route updates', () {
@@ -300,4 +472,65 @@ void main() {
       expect(updated.routeSummary, 'Flood/Unknown');
     });
   });
+
+  group('ContactsProvider.updateFastGps', () {
+    late ContactsProvider provider;
+    late Uint8List publicKey;
+
+    setUp(() {
+      SharedPreferences.setMockInitialValues({});
+      provider = ContactsProvider();
+      publicKey = createPublicKey(50);
+      provider.addOrUpdateContact(
+        createContact(key: publicKey, type: ContactType.chat, name: 'Fast GPS'),
+      );
+    });
+
+    test('updates gps while preserving other telemetry fields', () {
+      final batteryOnly = CayenneLppParser.createBatteryData(3.9);
+      provider.updateTelemetry(publicKey.sublist(0, 6), batteryOnly);
+
+      provider.updateFastGps(
+        publicKey.sublist(0, 6),
+        const FastGpsPacket(
+          senderKey6: '323334353637',
+          latitude: 44.123456,
+          longitude: 13.654321,
+          timestampSeconds: 1700001234,
+        ),
+      );
+
+      final updated = provider.findContactByKey(publicKey)!;
+      expect(updated.telemetry, isNotNull);
+      expect(updated.telemetry!.gpsLocation, isNotNull);
+      expect(
+        updated.telemetry!.gpsLocation!.latitude,
+        closeTo(44.123456, 0.000001),
+      );
+      expect(
+        updated.telemetry!.gpsLocation!.longitude,
+        closeTo(13.654321, 0.000001),
+      );
+      expect(updated.telemetry!.batteryMilliVolts, isNotNull);
+      expect(updated.advLat, equals((44.123456 * 1e6).round()));
+      expect(updated.advLon, equals((13.654321 * 1e6).round()));
+      expect(updated.lastAdvert, equals(1700001234));
+    });
+
+    test('ignores unknown sender prefix safely', () {
+      final before = provider.findContactByKey(publicKey)!;
+      provider.updateFastGps(
+        Uint8List.fromList([1, 2, 3, 4, 5, 6]),
+        const FastGpsPacket(
+          senderKey6: '010203040506',
+          latitude: 10,
+          longitude: 20,
+          timestampSeconds: 99,
+        ),
+      );
+      final after = provider.findContactByKey(publicKey)!;
+      expect(after.advLat, equals(before.advLat));
+      expect(after.advLon, equals(before.advLon));
+    });
+  });
 }

test/utils/fast_gps_packet_test.dart

@@ -0,0 +1,97 @@
+import 'dart:typed_data';
+import 'dart:math' as math;
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:meshcore_sar_app/utils/fast_gps_packet.dart';
+
+void main() {
+  group('FastGpsPacket', () {
+    test('encodes and parses a valid packet', () {
+      final packet = FastGpsPacket(
+        senderKey6: 'aabbccddeeff',
+        latitude: 46.0569,
+        longitude: 14.5058,
+        timestampSeconds: 1700000000,
+      );
+
+      final encoded = packet.encodeBinary();
+      final parsed = FastGpsPacket.tryParseBinary(encoded);
+
+      expect(parsed, isNotNull);
+      expect(parsed!.senderKey6, equals('aabbccddeeff'));
+      expect(parsed.latitude, closeTo(46.0569, 0.000001));
+      expect(parsed.longitude, closeTo(14.5058, 0.000001));
+      expect(parsed.timestampSeconds, equals(1700000000));
+    });
+
+    test('supports negative coordinates', () {
+      final packet = FastGpsPacket(
+        senderKey6: '001122334455',
+        latitude: -33.8688,
+        longitude: -151.2093,
+        timestampSeconds: 42,
+      );
+
+      final parsed = FastGpsPacket.tryParseBinary(packet.encodeBinary());
+      expect(parsed, isNotNull);
+      expect(parsed!.latitude, closeTo(-33.8688, 0.000001));
+      expect(parsed.longitude, closeTo(-151.2093, 0.000001));
+    });
+
+    test('rejects malformed payloads', () {
+      expect(
+        FastGpsPacket.tryParseBinary(Uint8List.fromList([0x47, 0x01])),
+        isNull,
+      );
+      expect(
+        FastGpsPacket.tryParseBinary(
+          Uint8List.fromList(List<int>.filled(19, 0)..[0] = 0x48),
+        ),
+        isNull,
+      );
+    });
+
+    test('rejects invalid coordinate ranges', () {
+      final payload = Uint8List(19);
+      payload[0] = FastGpsPacket.magic;
+      payload.setRange(1, 7, [0, 1, 2, 3, 4, 5]);
+      final data = ByteData.sublistView(payload);
+      data.setInt32(
+        7,
+        (91.0 * FastGpsPacket.coordinateScale).round(),
+        Endian.little,
+      );
+      data.setInt32(
+        11,
+        (14.5 * FastGpsPacket.coordinateScale).round(),
+        Endian.little,
+      );
+      data.setUint32(15, 1, Endian.little);
+
+      expect(FastGpsPacket.tryParseBinary(payload), isNull);
+    });
+
+    test('preserves at least meter accuracy', () {
+      const latitude = 46.0569123;
+      const longitude = 14.5058123;
+      final packet = FastGpsPacket(
+        senderKey6: 'aabbccddeeff',
+        latitude: latitude,
+        longitude: longitude,
+        timestampSeconds: 1700000000,
+      );
+
+      final parsed = FastGpsPacket.tryParseBinary(packet.encodeBinary());
+      expect(parsed, isNotNull);
+
+      final latMeters = (parsed!.latitude - latitude).abs() * 111320.0;
+      final lonMeters =
+          (parsed.longitude - longitude).abs() *
+          111320.0 *
+          math.cos(latitude * math.pi / 180.0);
+
+      expect(latMeters, lessThan(1.0));
+      expect(lonMeters, lessThan(1.0));
+    });
+  });
+}

windows/flutter/generated_plugin_registrant.cc

@@ -12,7 +12,6 @@
 #include <flutter_blue_plus_winrt/flutter_blue_plus_plugin.h>
 #include <geolocator_windows/geolocator_windows.h>
 #include <nsd_windows/nsd_windows_plugin_c_api.h>
-#include <objectbox_flutter_libs/objectbox_flutter_libs_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <record_windows/record_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
@@ -31,8 +30,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("GeolocatorWindows"));
   NsdWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("NsdWindowsPluginCApi"));
-  ObjectboxFlutterLibsPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ObjectboxFlutterLibsPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   RecordWindowsPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_blue_plus_winrt
   geolocator_windows
   nsd_windows
-  objectbox_flutter_libs
   permission_handler_windows
   record_windows
   share_plus