Merge pull request #25 from dz0ny/feat/sensor-telemetry-preview

Feat/sensor telemetry preview

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				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 = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				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 = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				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 = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				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 = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				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 = 117;
+				CURRENT_PROJECT_VERSION = 116;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -43,7 +43,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>117</string>
+	<string>116</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>

ios/fastlane/report.xml

@@ -5,22 +5,22 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00024">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000235">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.554978">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.385323">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="100.17557">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="93.530304">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="264.49426">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="210.562484">
         
       </testcase>
     

lib/providers/sensors_provider.dart

@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../models/contact.dart';
-import '../widgets/sensors/sensor_telemetry_card.dart';
 import 'connection_provider.dart';
 import 'contacts_provider.dart';
 
@@ -19,16 +18,7 @@ class SensorsProvider with ChangeNotifier {
   static const String _metricLabelKey = 'sensor_metric_labels';
   static const String _metricOrderKey = 'sensor_metric_order';
   static const String _autoRefreshMinutesKey = 'sensor_auto_refresh_minutes';
-  static const List<int> supportedAutoRefreshIntervals = <int>[
-    0,
-    5,
-    15,
-    30,
-    60,
-    360,
-    720,
-    1440,
-  ];
+  static const List<int> supportedAutoRefreshIntervals = <int>[0, 1, 5, 15];
   static const Set<String> _defaultVisibleFields = <String>{
     'voltage',
     'battery',
@@ -128,9 +118,7 @@ class SensorsProvider with ChangeNotifier {
         final decoded =
             jsonDecode(storedAutoRefreshJson) as Map<String, dynamic>;
         for (final entry in decoded.entries) {
-          final minutes = _normalizeAutoRefreshMinutes(
-            (entry.value as num).toInt(),
-          );
+          final minutes = (entry.value as num).toInt();
           if (minutes > 0) {
             _autoRefreshMinutesBySensor[entry.key] = minutes;
           }
@@ -224,22 +212,6 @@ class SensorsProvider with ChangeNotifier {
     _visibleFieldsBySensor[publicKeyHex] ?? _defaultVisibleFields,
   );
 
-  Set<String> effectiveVisibleFieldsFor(
-    String publicKeyHex,
-    Iterable<String> availableFieldKeys,
-  ) {
-    final storedVisibleFields =
-        _visibleFieldsBySensor[publicKeyHex] ?? _defaultVisibleFields;
-    if (!_shouldAutoIncludeAvailableFields(publicKeyHex, storedVisibleFields)) {
-      return Set<String>.unmodifiable(storedVisibleFields);
-    }
-
-    return Set<String>.unmodifiable(<String>{
-      ...storedVisibleFields,
-      ...availableFieldKeys,
-    });
-  }
-
   bool showsField(String publicKeyHex, String fieldKey) =>
       visibleFieldsFor(publicKeyHex).contains(fieldKey);
 
@@ -286,7 +258,7 @@ class SensorsProvider with ChangeNotifier {
       _autoRefreshMinutesBySensor[publicKeyHex] ?? 0;
 
   Future<void> setAutoRefreshMinutes(String publicKeyHex, int minutes) async {
-    final normalizedMinutes = _normalizeAutoRefreshMinutes(minutes);
+    final normalizedMinutes = minutes <= 0 ? 0 : minutes;
     final currentMinutes = autoRefreshMinutesFor(publicKeyHex);
     if (currentMinutes == normalizedMinutes) {
       return;
@@ -301,32 +273,6 @@ class SensorsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  static int _normalizeAutoRefreshMinutes(int minutes) {
-    if (minutes <= 0) {
-      return 0;
-    }
-
-    if (supportedAutoRefreshIntervals.contains(minutes)) {
-      return minutes;
-    }
-
-    final positiveIntervals = supportedAutoRefreshIntervals.where(
-      (value) => value > 0,
-    );
-    var bestMatch = positiveIntervals.first;
-    var bestDistance = (minutes - bestMatch).abs();
-
-    for (final interval in positiveIntervals.skip(1)) {
-      final distance = (minutes - interval).abs();
-      if (distance < bestDistance) {
-        bestMatch = interval;
-        bestDistance = distance;
-      }
-    }
-
-    return bestMatch;
-  }
-
   List<String> dueAutoRefreshSensorKeys({DateTime? now}) {
     final refreshTime = now ?? DateTime.now();
     final dueKeys = <String>[];
@@ -457,14 +403,14 @@ class SensorsProvider with ChangeNotifier {
     }
 
     _watchedSensorKeys.add(contact.publicKeyHex);
-    final initialVisibleFields = _initialVisibleFieldsForContact(contact);
     await _persistWatchedSensors();
-    _visibleFieldsBySensor[contact.publicKeyHex] = initialVisibleFields;
+    _visibleFieldsBySensor[contact.publicKeyHex] = Set<String>.from(
+      _defaultVisibleFields,
+    );
     _fieldSpansBySensor[contact.publicKeyHex] = <String, int>{'gps': 2};
     _metricLabelsBySensor[contact.publicKeyHex] = <String, String>{};
-    _metricOrderBySensor[contact.publicKeyHex] = metricOrderFor(
-      contact.publicKeyHex,
-      initialVisibleFields,
+    _metricOrderBySensor[contact.publicKeyHex] = List<String>.from(
+      _defaultMetricOrder,
     );
     await _persistVisibleMetrics();
     await _persistFieldSpans();
@@ -473,37 +419,6 @@ class SensorsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  bool _shouldAutoIncludeAvailableFields(
-    String publicKeyHex,
-    Set<String> storedVisibleFields,
-  ) {
-    if (!setEquals(storedVisibleFields, _defaultVisibleFields)) {
-      return false;
-    }
-
-    final storedOrder = _metricOrderBySensor[publicKeyHex];
-    if (storedOrder != null && !listEquals(storedOrder, _defaultMetricOrder)) {
-      return false;
-    }
-
-    final storedLabels = _metricLabelsBySensor[publicKeyHex];
-    if (storedLabels != null && storedLabels.isNotEmpty) {
-      return false;
-    }
-
-    final storedSpans = _fieldSpansBySensor[publicKeyHex];
-    if (storedSpans != null &&
-        !(storedSpans.length == 1 && storedSpans['gps'] == 2)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  Set<String> _initialVisibleFieldsForContact(Contact contact) {
-    return <String>{..._defaultVisibleFields, ...sensorMetricKeysFor(contact)};
-  }
-
   Future<void> removeSensor(String publicKeyHex) async {
     _watchedSensorKeys.remove(publicKeyHex);
     _refreshStates.remove(publicKeyHex);

lib/screens/sensors_tab.dart

@@ -171,26 +171,135 @@ class _SensorsTabState extends State<SensorsTab> {
     String publicKeyHex,
     Contact? contact,
   ) async {
-    await Navigator.of(context).push(
-      MaterialPageRoute<void>(
-        builder: (pageContext) => _SensorCustomizeView(
-          publicKeyHex: publicKeyHex,
-          initialContact: contact,
-          onRenameMetric:
-              ({
-                required BuildContext context,
-                required String publicKeyHex,
-                required SensorMetricOption option,
-                required SensorsProvider sensorsProvider,
-              }) {
-                return _showMetricRenameDialog(
-                  context,
-                  publicKeyHex: publicKeyHex,
-                  option: option,
-                  sensorsProvider: sensorsProvider,
-                );
-              },
-        ),
+    await showModalBottomSheet<void>(
+      context: context,
+      showDragHandle: true,
+      builder: (sheetContext) => Consumer<SensorsProvider>(
+        builder: (context, sensorsProvider, child) {
+          final visibleFields = sensorsProvider.visibleFieldsFor(publicKeyHex);
+          final autoRefreshMinutes = sensorsProvider.autoRefreshMinutesFor(
+            publicKeyHex,
+          );
+          final options = sensorMetricOptionsFor(
+            contact,
+            labelOverrides: sensorsProvider.labelOverridesFor(publicKeyHex),
+          );
+          final orderedFieldKeys = sensorsProvider.metricOrderFor(
+            publicKeyHex,
+            options.map((option) => option.key),
+          );
+          final optionByKey = <String, SensorMetricOption>{
+            for (final option in options) option.key: option,
+          };
+          final orderedOptions = orderedFieldKeys
+              .map((fieldKey) => optionByKey[fieldKey])
+              .whereType<SensorMetricOption>()
+              .toList(growable: false);
+          return SafeArea(
+            child: ListView(
+              shrinkWrap: true,
+              padding: const EdgeInsets.fromLTRB(20, 0, 20, 24),
+              children: [
+                Text(
+                  'Auto refresh telemetry',
+                  style: Theme.of(context).textTheme.titleLarge,
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  'Refresh this contact automatically while the device is connected.',
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+                const SizedBox(height: 12),
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  children: SensorsProvider.supportedAutoRefreshIntervals
+                      .map(
+                        (minutes) => ChoiceChip(
+                          label: Text(minutes == 0 ? 'Off' : '${minutes}m'),
+                          selected: autoRefreshMinutes == minutes,
+                          onSelected: (_) {
+                            sensorsProvider.setAutoRefreshMinutes(
+                              publicKeyHex,
+                              minutes,
+                            );
+                          },
+                        ),
+                      )
+                      .toList(growable: false),
+                ),
+                const SizedBox(height: 20),
+                Text(
+                  'Visible fields',
+                  style: Theme.of(context).textTheme.titleLarge,
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  'Choose which values appear on sensor cards and rename them.',
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+                const SizedBox(height: 8),
+                Text(
+                  'Use the arrows to change card order.',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+                const SizedBox(height: 20),
+                ...orderedOptions.asMap().entries.map((entry) {
+                  final index = entry.key;
+                  final option = entry.value;
+                  final visible = visibleFields.contains(option.key);
+                  final span = sensorsProvider.fieldSpanFor(
+                    publicKeyHex,
+                    option.key,
+                  );
+                  return SensorMetricSelectorItem(
+                    option: option,
+                    visible: visible,
+                    span: span,
+                    canMoveUp: index > 0,
+                    canMoveDown: index < orderedOptions.length - 1,
+                    onToggle: (value) {
+                      sensorsProvider.toggleMetric(
+                        publicKeyHex,
+                        option.key,
+                        value,
+                      );
+                    },
+                    onRename: () => _showMetricRenameDialog(
+                      context,
+                      publicKeyHex: publicKeyHex,
+                      option: option,
+                      sensorsProvider: sensorsProvider,
+                    ),
+                    onMoveUp: index > 0
+                        ? () => sensorsProvider.moveMetric(
+                            publicKeyHex,
+                            availableFieldKeys: orderedFieldKeys,
+                            oldIndex: index,
+                            newIndex: index - 1,
+                          )
+                        : null,
+                    onMoveDown: index < orderedOptions.length - 1
+                        ? () => sensorsProvider.moveMetric(
+                            publicKeyHex,
+                            availableFieldKeys: orderedFieldKeys,
+                            oldIndex: index,
+                            newIndex: index + 1,
+                          )
+                        : null,
+                    onSpanChanged: (selection) {
+                      sensorsProvider.setFieldSpan(
+                        publicKeyHex,
+                        option.key,
+                        selection,
+                      );
+                    },
+                  );
+                }),
+              ],
+            ),
+          );
+        },
       ),
     );
   }
@@ -294,20 +403,19 @@ class _SensorsTabState extends State<SensorsTab> {
                         break;
                       }
                     }
-                    final availableFieldKeys = sensorMetricKeysFor(contact);
-                    final visibleFields = sensorsProvider
-                        .effectiveVisibleFieldsFor(key, availableFieldKeys);
                     return SensorTelemetryCard(
                       contact: contact,
                       state: sensorsProvider.stateFor(key),
-                      visibleFields: visibleFields,
+                      visibleFields: sensorsProvider.visibleFieldsFor(key),
                       fieldOrder: sensorsProvider.metricOrderFor(
                         key,
-                        availableFieldKeys,
+                        sensorsProvider.visibleFieldsFor(key),
                       ),
                       labelOverrides: sensorsProvider.labelOverridesFor(key),
                       fieldSpans: {
-                        for (final field in visibleFields)
+                        for (final field in sensorsProvider.visibleFieldsFor(
+                          key,
+                        ))
                           field: sensorsProvider.fieldSpanFor(key, field),
                       },
                       onRemove: () async {
@@ -331,276 +439,6 @@ class _SensorsTabState extends State<SensorsTab> {
   }
 }
 
-class _SensorCustomizeView extends StatelessWidget {
-  final String publicKeyHex;
-  final Contact? initialContact;
-  final Future<void> Function({
-    required BuildContext context,
-    required String publicKeyHex,
-    required SensorMetricOption option,
-    required SensorsProvider sensorsProvider,
-  })
-  onRenameMetric;
-
-  const _SensorCustomizeView({
-    required this.publicKeyHex,
-    required this.initialContact,
-    required this.onRenameMetric,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer2<SensorsProvider, ContactsProvider>(
-      builder: (context, sensorsProvider, contactsProvider, child) {
-        Contact? contact = initialContact;
-        for (final entry in contactsProvider.contacts) {
-          if (entry.publicKeyHex == publicKeyHex) {
-            contact = entry;
-            break;
-          }
-        }
-
-        final options = sensorMetricOptionsFor(
-          contact,
-          labelOverrides: sensorsProvider.labelOverridesFor(publicKeyHex),
-        );
-        final visibleFields = sensorsProvider.effectiveVisibleFieldsFor(
-          publicKeyHex,
-          options.map((option) => option.key),
-        );
-        final autoRefreshMinutes = sensorsProvider.autoRefreshMinutesFor(
-          publicKeyHex,
-        );
-        final orderedFieldKeys = sensorsProvider.metricOrderFor(
-          publicKeyHex,
-          options.map((option) => option.key),
-        );
-        final optionByKey = <String, SensorMetricOption>{
-          for (final option in options) option.key: option,
-        };
-        final orderedOptions = orderedFieldKeys
-            .map((fieldKey) => optionByKey[fieldKey])
-            .whereType<SensorMetricOption>()
-            .toList(growable: false);
-
-        return Scaffold(
-          appBar: AppBar(
-            title: Text('Customize ${contact?.displayName ?? 'Sensor'}'),
-          ),
-          body: ListView(
-            padding: const EdgeInsets.fromLTRB(16, 16, 16, 24),
-            children: [
-              _SensorCustomizeSectionCard(
-                title: 'Live preview',
-                subtitle:
-                    'Changes apply immediately. This card matches the current dashboard layout for this sensor.',
-                child: SensorTelemetryCard(
-                  contact: contact,
-                  state: sensorsProvider.stateFor(publicKeyHex),
-                  visibleFields: visibleFields,
-                  fieldOrder: sensorsProvider.metricOrderFor(
-                    publicKeyHex,
-                    visibleFields,
-                  ),
-                  labelOverrides: sensorsProvider.labelOverridesFor(
-                    publicKeyHex,
-                  ),
-                  fieldSpans: {
-                    for (final field in visibleFields)
-                      field: sensorsProvider.fieldSpanFor(publicKeyHex, field),
-                  },
-                  margin: EdgeInsets.zero,
-                  emptyMetricsMessage: 'No telemetry fields available yet.',
-                ),
-              ),
-              _SensorCustomizeSectionCard(
-                title: 'Refresh schedule',
-                subtitle:
-                    'Choose how often this sensor should refresh while your device stays connected.',
-                child: SensorAutoRefreshOptions(
-                  selectedMinutes: autoRefreshMinutes,
-                  onSelected: (minutes) {
-                    sensorsProvider.setAutoRefreshMinutes(
-                      publicKeyHex,
-                      minutes,
-                    );
-                  },
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.fromLTRB(4, 8, 4, 12),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      'Field layout',
-                      style: Theme.of(context).textTheme.titleLarge,
-                    ),
-                    const SizedBox(height: 6),
-                    Text(
-                      'Use the same value-card previews shown on the dashboard to control visibility, labels, width, and order.',
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
-                  ],
-                ),
-              ),
-              ...orderedOptions.asMap().entries.map((entry) {
-                final index = entry.key;
-                final option = entry.value;
-                final visible = visibleFields.contains(option.key);
-                final span = sensorsProvider.fieldSpanFor(
-                  publicKeyHex,
-                  option.key,
-                );
-                return SensorMetricSelectorItem(
-                  option: option,
-                  visible: visible,
-                  span: span,
-                  canMoveUp: index > 0,
-                  canMoveDown: index < orderedOptions.length - 1,
-                  onToggle: (value) {
-                    sensorsProvider.toggleMetric(
-                      publicKeyHex,
-                      option.key,
-                      value,
-                    );
-                  },
-                  onRename: () => onRenameMetric(
-                    context: context,
-                    publicKeyHex: publicKeyHex,
-                    option: option,
-                    sensorsProvider: sensorsProvider,
-                  ),
-                  onMoveUp: index > 0
-                      ? () => sensorsProvider.moveMetric(
-                          publicKeyHex,
-                          availableFieldKeys: orderedFieldKeys,
-                          oldIndex: index,
-                          newIndex: index - 1,
-                        )
-                      : null,
-                  onMoveDown: index < orderedOptions.length - 1
-                      ? () => sensorsProvider.moveMetric(
-                          publicKeyHex,
-                          availableFieldKeys: orderedFieldKeys,
-                          oldIndex: index,
-                          newIndex: index + 1,
-                        )
-                      : null,
-                  onSpanChanged: (selection) {
-                    sensorsProvider.setFieldSpan(
-                      publicKeyHex,
-                      option.key,
-                      selection,
-                    );
-                  },
-                );
-              }),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}
-
-class _SensorCustomizeSectionCard extends StatelessWidget {
-  final String title;
-  final String subtitle;
-  final Widget child;
-
-  const _SensorCustomizeSectionCard({
-    required this.title,
-    required this.subtitle,
-    required this.child,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Container(
-      margin: const EdgeInsets.only(bottom: 16),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(28),
-        gradient: LinearGradient(
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-          colors: [
-            colorScheme.surfaceContainerLow,
-            colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
-          ],
-        ),
-        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: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(title, style: Theme.of(context).textTheme.titleMedium),
-            const SizedBox(height: 6),
-            Text(
-              subtitle,
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: colorScheme.onSurfaceVariant,
-              ),
-            ),
-            const SizedBox(height: 14),
-            child,
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class SensorAutoRefreshOptions extends StatelessWidget {
-  final int selectedMinutes;
-  final ValueChanged<int> onSelected;
-
-  const SensorAutoRefreshOptions({
-    super.key,
-    required this.selectedMinutes,
-    required this.onSelected,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Wrap(
-      spacing: 8,
-      runSpacing: 8,
-      children: SensorsProvider.supportedAutoRefreshIntervals
-          .map(
-            (minutes) => ChoiceChip(
-              label: Text(_formatAutoRefreshIntervalLabel(minutes)),
-              selected: selectedMinutes == minutes,
-              onSelected: (_) => onSelected(minutes),
-            ),
-          )
-          .toList(growable: false),
-    );
-  }
-}
-
-String _formatAutoRefreshIntervalLabel(int minutes) {
-  if (minutes <= 0) {
-    return 'Off';
-  }
-  if (minutes >= 360 && minutes % 60 == 0) {
-    return '${minutes ~/ 60}h';
-  }
-  return '${minutes}m';
-}
-
 class SensorMetricSelectorItem extends StatelessWidget {
   final SensorMetricOption option;
   final bool visible;
@@ -630,167 +468,84 @@ class SensorMetricSelectorItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final colorScheme = theme.colorScheme;
-    final showChannelChip = option.channel != null && option.channel != 1;
-    final previewCardData =
-        option.previewCardData ??
-        SensorMetricCardData(
-          fieldKey: option.key,
-          icon: Icons.sensors,
-          label: option.defaultLabel,
-          value: option.valuePreview ?? 'No telemetry yet',
-          accent: colorScheme.primary,
-          channel: option.channel,
-        );
-
-    return Container(
-      margin: const EdgeInsets.only(bottom: 16),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(28),
-        gradient: LinearGradient(
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-          colors: [
-            colorScheme.surfaceContainerLow,
-            colorScheme.surfaceContainerHighest.withValues(alpha: 0.9),
-          ],
-        ),
-        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),
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Expanded(
+                child: FilterChip(
+                  selected: visible,
+                  label: Text(option.label),
+                  onSelected: onToggle,
+                ),
+              ),
+              const SizedBox(width: 8),
+              IconButton(
+                tooltip: 'Rename',
+                onPressed: onRename,
+                icon: const Icon(Icons.edit_outlined),
+              ),
+            ],
           ),
-        ],
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        option.defaultLabel,
-                        style: theme.textTheme.titleSmall?.copyWith(
-                          fontWeight: FontWeight.w700,
+          if (option.valuePreview != null || option.channel != null)
+            Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: Wrap(
+                crossAxisAlignment: WrapCrossAlignment.center,
+                spacing: 8,
+                runSpacing: 6,
+                children: [
+                  if (option.valuePreview != null)
+                    Text(
+                      option.valuePreview!,
+                      key: ValueKey('sensor_selector_value_${option.key}'),
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        color: theme.colorScheme.onSurfaceVariant,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  if (option.channel != null)
+                    Container(
+                      key: ValueKey('sensor_selector_channel_${option.key}'),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 3,
+                      ),
+                      decoration: BoxDecoration(
+                        color: theme.colorScheme.surfaceContainerHighest,
+                        borderRadius: BorderRadius.circular(999),
+                      ),
+                      child: Text(
+                        'ch${option.channel}',
+                        style: theme.textTheme.labelSmall?.copyWith(
+                          color: theme.colorScheme.onSurfaceVariant,
+                          fontWeight: FontWeight.w800,
                         ),
                       ),
-                      const SizedBox(height: 6),
-                      Wrap(
-                        spacing: 8,
-                        runSpacing: 8,
-                        crossAxisAlignment: WrapCrossAlignment.center,
-                        children: [
-                          TextButton.icon(
-                            onPressed: onRename,
-                            style: TextButton.styleFrom(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 12,
-                                vertical: 8,
-                              ),
-                              foregroundColor: colorScheme.primary,
-                              textStyle: theme.textTheme.labelLarge?.copyWith(
-                                fontWeight: FontWeight.w700,
-                              ),
-                            ),
-                            icon: const Icon(Icons.edit_outlined, size: 18),
-                            label: const Text('Rename'),
-                          ),
-                          if (showChannelChip)
-                            Container(
-                              key: ValueKey(
-                                'sensor_selector_channel_${option.key}',
-                              ),
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 10,
-                                vertical: 8,
-                              ),
-                              decoration: BoxDecoration(
-                                color: previewCardData.accent.withValues(
-                                  alpha: 0.10,
-                                ),
-                                borderRadius: BorderRadius.circular(999),
-                              ),
-                              child: Text(
-                                'Channel ${option.channel}',
-                                style: theme.textTheme.labelMedium?.copyWith(
-                                  color: previewCardData.accent,
-                                  fontWeight: FontWeight.w700,
-                                ),
-                              ),
-                            ),
-                        ],
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Container(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 10,
-                    vertical: 5,
-                  ),
-                  decoration: BoxDecoration(
-                    color: visible
-                        ? const Color(0xFF218B63).withValues(alpha: 0.12)
-                        : colorScheme.surfaceContainerHighest,
-                    borderRadius: BorderRadius.circular(999),
-                  ),
-                  child: Text(
-                    visible ? 'Visible' : 'Hidden',
-                    style: theme.textTheme.labelMedium?.copyWith(
-                      color: visible
-                          ? const Color(0xFF218B63)
-                          : colorScheme.onSurfaceVariant,
-                      fontWeight: FontWeight.w700,
                     ),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 12),
-            Opacity(
-              opacity: visible ? 1 : 0.55,
-              child: SensorMetricTile(
-                data: previewCardData,
-                width: double.infinity,
-                keyPrefix: 'sensor_selector_metric',
-                allowMapPreview: false,
+                ],
               ),
             ),
-            const SizedBox(height: 8),
-            Row(
+          const SizedBox(height: 8),
+          Align(
+            alignment: Alignment.centerRight,
+            child: Wrap(
+              crossAxisAlignment: WrapCrossAlignment.center,
+              spacing: 8,
               children: [
-                Expanded(
-                  child: Text(
-                    'Show on sensor card',
-                    style: theme.textTheme.bodyMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
+                IconButton(
+                  tooltip: 'Move up',
+                  onPressed: canMoveUp ? onMoveUp : null,
+                  icon: const Icon(Icons.arrow_upward),
                 ),
-                Switch(value: visible, onChanged: onToggle),
-              ],
-            ),
-            const SizedBox(height: 12),
-            Row(
-              children: [
-                Text(
-                  'Card width',
-                  style: theme.textTheme.labelLarge?.copyWith(
-                    fontWeight: FontWeight.w700,
-                  ),
+                IconButton(
+                  tooltip: 'Move down',
+                  onPressed: canMoveDown ? onMoveDown : null,
+                  icon: const Icon(Icons.arrow_downward),
                 ),
-                const Spacer(),
                 SegmentedButton<int>(
                   segments: const [
                     ButtonSegment<int>(value: 1, label: Text('1x')),
@@ -803,30 +558,8 @@ class SensorMetricSelectorItem extends StatelessWidget {
                 ),
               ],
             ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Text(
-                  'Order',
-                  style: theme.textTheme.labelLarge?.copyWith(
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-                const Spacer(),
-                IconButton(
-                  tooltip: 'Move up',
-                  onPressed: canMoveUp ? onMoveUp : null,
-                  icon: const Icon(Icons.arrow_upward),
-                ),
-                IconButton(
-                  tooltip: 'Move down',
-                  onPressed: canMoveDown ? onMoveDown : null,
-                  icon: const Icon(Icons.arrow_downward),
-                ),
-              ],
-            ),
-          ],
-        ),
+          ),
+        ],
       ),
     );
   }

lib/screens/settings_screen.dart

@@ -1875,7 +1875,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     style: Theme.of(context).textTheme.bodySmall,
                   ),
                 ),
-                Switch(
+                Switch.adaptive(
                   value: _showCurrentImagePreview,
                   onChanged: (value) {
                     setState(() => _showCurrentImagePreview = value);

lib/services/cayenne_lpp_parser.dart

@@ -19,61 +19,7 @@ class CayenneLppParser {
   static const int _lppDirection = 132;
   static const int _lppUnixTime = 133;
   static const int _lppColour = 135;
-  static const int _lppGust = 137;
-  static const int _lppDewPoint = 138;
-  static const int _lppRain = 139;
   static const int _lppSwitch = 142;
-  static const int _lppBinaryBool = 143;
-  static const int _lppBinaryPowerSwitch = 144;
-  static const int _lppBinaryOpen = 145;
-  static const int _lppBinaryBatteryLow = 146;
-  static const int _lppBinaryCharging = 147;
-  static const int _lppBinaryCarbonMonoxide = 148;
-  static const int _lppBinaryCold = 149;
-  static const int _lppBinaryConnectivity = 150;
-  static const int _lppBinaryDoor = 151;
-  static const int _lppBinaryGarageDoor = 152;
-  static const int _lppBinaryGas = 153;
-  static const int _lppBinaryHeat = 154;
-  static const int _lppBinaryLight = 155;
-  static const int _lppBinaryLock = 156;
-  static const int _lppBinaryMoisture = 157;
-  static const int _lppBinaryMotion = 158;
-  static const int _lppBinaryMoving = 159;
-  static const int _lppBinaryOccupancy = 160;
-  static const int _lppBinaryPlug = 161;
-  static const int _lppBinaryPresence = 162;
-  static const int _lppBinaryProblem = 163;
-  static const int _lppBinaryRunning = 164;
-  static const int _lppBinarySafety = 165;
-  static const int _lppBinarySmoke = 166;
-  static const int _lppBinarySound = 167;
-  static const int _lppBinaryTamper = 168;
-  static const int _lppBinaryVibration = 169;
-  static const int _lppBinaryWindow = 170;
-  static const int _lppButtonEvent = 171;
-  static const int _lppDimmer = 172;
-  static const int _lppUv = 173;
-  static const int _lppLightLevel = 174;
-  static const int _lppPm25 = 175;
-  static const int _lppPm10 = 176;
-  static const int _lppCo2 = 177;
-  static const int _lppTvoc = 178;
-  static const int _lppRpm = 179;
-  static const int _lppConductivity = 180;
-  static const int _lppRotation = 181;
-  static const int _lppDuration = 182;
-  static const int _lppAcceleration = 183;
-  static const int _lppGyroRate = 184;
-  static const int _lppVolume = 185;
-  static const int _lppFlowRate = 186;
-  static const int _lppVolumeStorage = 187;
-  static const int _lppWater = 188;
-  static const int _lppGasVolume = 189;
-  static const int _lppMass = 190;
-  static const int _lppSignedSpeed = 191;
-  static const int _lppSignedPower = 192;
-  static const int _lppSignedCurrent = 193;
 
   /// Parse Cayenne LPP data into ContactTelemetry
   static ContactTelemetry parse(Uint8List data) {
@@ -399,212 +345,6 @@ class CayenneLppParser {
             };
             break;
 
-          case _lppGust:
-            final rawValue = reader.readUInt16BE();
-            final value = rawValue / 100.0;
-            debugPrint('      Gust: ${value}m/s');
-            extraSensorData['gust_$channel'] = value;
-            break;
-
-          case _lppDewPoint:
-            final rawValue = reader.readInt16BE();
-            final value = rawValue / 10.0;
-            debugPrint('      Dew point: ${value.toStringAsFixed(1)}°C');
-            extraSensorData['dew_$channel'] = value;
-            break;
-
-          case _lppRain:
-            final rawValue = reader.readUInt16BE();
-            final value = rawValue / 10.0;
-            debugPrint('      Rain: ${value}mm');
-            extraSensorData['rain_$channel'] = value;
-            break;
-
-          case _lppBinaryBool:
-          case _lppBinaryPowerSwitch:
-          case _lppBinaryOpen:
-          case _lppBinaryBatteryLow:
-          case _lppBinaryCharging:
-          case _lppBinaryCarbonMonoxide:
-          case _lppBinaryCold:
-          case _lppBinaryConnectivity:
-          case _lppBinaryDoor:
-          case _lppBinaryGarageDoor:
-          case _lppBinaryGas:
-          case _lppBinaryHeat:
-          case _lppBinaryLight:
-          case _lppBinaryLock:
-          case _lppBinaryMoisture:
-          case _lppBinaryMotion:
-          case _lppBinaryMoving:
-          case _lppBinaryOccupancy:
-          case _lppBinaryPlug:
-          case _lppBinaryPresence:
-          case _lppBinaryProblem:
-          case _lppBinaryRunning:
-          case _lppBinarySafety:
-          case _lppBinarySmoke:
-          case _lppBinarySound:
-          case _lppBinaryTamper:
-          case _lppBinaryVibration:
-          case _lppBinaryWindow:
-            final value = reader.readByte();
-            debugPrint('      Binary state: $value');
-            extraSensorData['${_binaryMetricKeyForType(type)}_$channel'] =
-                value;
-            break;
-
-          case _lppButtonEvent:
-            final value = reader.readByte();
-            debugPrint('      Button event: $value');
-            extraSensorData['button_event_$channel'] = value;
-            break;
-
-          case _lppDimmer:
-            final value = _readInt8(reader);
-            debugPrint('      Dimmer: $value');
-            extraSensorData['dimmer_$channel'] = value;
-            break;
-
-          case _lppUv:
-            final value = reader.readByte() / 10.0;
-            debugPrint('      UV index: $value');
-            extraSensorData['uv_$channel'] = value;
-            break;
-
-          case _lppLightLevel:
-            final value = reader.readByte();
-            debugPrint('      Light level: $value');
-            extraSensorData['light_level_$channel'] = value;
-            break;
-
-          case _lppPm25:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      PM2.5: $value');
-            extraSensorData['pm25_$channel'] = value;
-            break;
-
-          case _lppPm10:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      PM10: $value');
-            extraSensorData['pm10_$channel'] = value;
-            break;
-
-          case _lppCo2:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      CO2: $value');
-            extraSensorData['co2_$channel'] = value;
-            break;
-
-          case _lppTvoc:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      TVOC: $value');
-            extraSensorData['tvoc_$channel'] = value;
-            break;
-
-          case _lppRpm:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      RPM: $value');
-            extraSensorData['rpm_$channel'] = value;
-            break;
-
-          case _lppConductivity:
-            final value = reader.readUInt16BE().toDouble();
-            debugPrint('      Conductivity: $value');
-            extraSensorData['conductivity_$channel'] = value;
-            break;
-
-          case _lppRotation:
-            final rawValue = reader.readInt16BE();
-            final value = rawValue / 10.0;
-            debugPrint('      Rotation: $value');
-            extraSensorData['rotation_$channel'] = value;
-            break;
-
-          case _lppDuration:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Duration: $value s');
-            extraSensorData['duration_$channel'] = value;
-            break;
-
-          case _lppAcceleration:
-            final rawValue = _readInt32BE(reader);
-            final value = rawValue / 1000000.0;
-            debugPrint('      Acceleration: $value');
-            extraSensorData['acceleration_$channel'] = value;
-            break;
-
-          case _lppGyroRate:
-            final rawValue = _readInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Gyro rate: $value');
-            extraSensorData['gyro_rate_$channel'] = value;
-            break;
-
-          case _lppVolume:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Volume: $value');
-            extraSensorData['volume_$channel'] = value;
-            break;
-
-          case _lppFlowRate:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Flow rate: $value');
-            extraSensorData['flow_rate_$channel'] = value;
-            break;
-
-          case _lppVolumeStorage:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Storage volume: $value');
-            extraSensorData['volume_storage_$channel'] = value;
-            break;
-
-          case _lppWater:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Water: $value');
-            extraSensorData['water_$channel'] = value;
-            break;
-
-          case _lppGasVolume:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Gas volume: $value');
-            extraSensorData['gas_volume_$channel'] = value;
-            break;
-
-          case _lppMass:
-            final rawValue = _readUInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Mass: $value');
-            extraSensorData['mass_$channel'] = value;
-            break;
-
-          case _lppSignedSpeed:
-            final rawValue = _readInt32BE(reader);
-            final value = rawValue / 1000000.0;
-            debugPrint('      Signed speed: $value');
-            extraSensorData['signed_speed_$channel'] = value;
-            break;
-
-          case _lppSignedPower:
-            final rawValue = _readInt32BE(reader);
-            final value = rawValue / 100.0;
-            debugPrint('      Signed power: $value');
-            extraSensorData['signed_power_$channel'] = value;
-            break;
-
-          case _lppSignedCurrent:
-            final rawValue = _readInt32BE(reader);
-            final value = rawValue / 1000.0;
-            debugPrint('      Signed current: $value');
-            extraSensorData['signed_current_$channel'] = value;
-            break;
-
           case _lppSwitch:
             final value = reader.readByte();
             debugPrint('      Switch: $value');
@@ -612,16 +352,11 @@ class CayenneLppParser {
             break;
 
           default:
-            final size = _payloadSizeForType(type);
-            if (size == null || reader.remainingBytesCount < size) {
-              debugPrint(
-                '      ⚠️ Unknown type $type with unsupported size, stopping parse',
-              );
-              reader.skip(reader.remainingBytesCount);
-              break;
-            }
-            debugPrint('      ⚠️ Unknown type $type, skipping $size bytes');
-            reader.skip(size);
+            debugPrint(
+              '      ⚠️ Unknown type, skipping remaining ${reader.remainingBytesCount} bytes',
+            );
+            // Unknown type, skip remaining to avoid parsing errors
+            reader.skip(reader.remainingBytesCount);
             break;
         }
       } catch (e) {
@@ -685,154 +420,7 @@ class CayenneLppParser {
     return (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3];
   }
 
-  static int _readInt32BE(BufferReader reader) {
-    final value = _readUInt32BE(reader);
-    if ((value & 0x80000000) != 0) {
-      return value - 0x100000000;
-    }
-    return value;
-  }
-
-  static int _readInt8(BufferReader reader) {
-    final value = reader.readByte();
-    if ((value & 0x80) != 0) {
-      return value - 0x100;
-    }
-    return value;
-  }
-
-  static String _sourceChannelKey(String fieldKey) =>
-      '__source_channel:$fieldKey';
-
-  static String _binaryMetricKeyForType(int type) {
-    switch (type) {
-      case _lppBinaryBool:
-        return 'binary_bool';
-      case _lppBinaryPowerSwitch:
-        return 'binary_power_switch';
-      case _lppBinaryOpen:
-        return 'binary_open';
-      case _lppBinaryBatteryLow:
-        return 'binary_battery_low';
-      case _lppBinaryCharging:
-        return 'binary_charging';
-      case _lppBinaryCarbonMonoxide:
-        return 'binary_carbon_monoxide';
-      case _lppBinaryCold:
-        return 'binary_cold';
-      case _lppBinaryConnectivity:
-        return 'binary_connectivity';
-      case _lppBinaryDoor:
-        return 'binary_door';
-      case _lppBinaryGarageDoor:
-        return 'binary_garage_door';
-      case _lppBinaryGas:
-        return 'binary_gas';
-      case _lppBinaryHeat:
-        return 'binary_heat';
-      case _lppBinaryLight:
-        return 'binary_light';
-      case _lppBinaryLock:
-        return 'binary_lock';
-      case _lppBinaryMoisture:
-        return 'binary_moisture';
-      case _lppBinaryMotion:
-        return 'binary_motion';
-      case _lppBinaryMoving:
-        return 'binary_moving';
-      case _lppBinaryOccupancy:
-        return 'binary_occupancy';
-      case _lppBinaryPlug:
-        return 'binary_plug';
-      case _lppBinaryPresence:
-        return 'binary_presence';
-      case _lppBinaryProblem:
-        return 'binary_problem';
-      case _lppBinaryRunning:
-        return 'binary_running';
-      case _lppBinarySafety:
-        return 'binary_safety';
-      case _lppBinarySmoke:
-        return 'binary_smoke';
-      case _lppBinarySound:
-        return 'binary_sound';
-      case _lppBinaryTamper:
-        return 'binary_tamper';
-      case _lppBinaryVibration:
-        return 'binary_vibration';
-      case _lppBinaryWindow:
-        return 'binary_window';
-    }
-    return 'binary_state';
-  }
-
-  static int? _payloadSizeForType(int type) {
-    if (type >= _lppBinaryBool && type <= _lppBinaryWindow) {
-      return 1;
-    }
-    switch (type) {
-      case MeshCoreConstants.lppDigitalInput:
-      case MeshCoreConstants.lppDigitalOutput:
-      case MeshCoreConstants.lppPresenceSensor:
-      case MeshCoreConstants.lppHumiditySensor:
-      case _lppPercentage:
-      case _lppSwitch:
-      case _lppButtonEvent:
-      case _lppDimmer:
-      case _lppUv:
-      case _lppLightLevel:
-        return 1;
-      case MeshCoreConstants.lppAnalogInput:
-      case MeshCoreConstants.lppAnalogOutput:
-      case MeshCoreConstants.lppIlluminanceSensor:
-      case MeshCoreConstants.lppTemperatureSensor:
-      case MeshCoreConstants.lppBarometer:
-      case MeshCoreConstants.lppVoltageSensor:
-      case _lppCurrent:
-      case _lppAltitude:
-      case _lppConcentration:
-      case _lppPower:
-      case _lppSpeed:
-      case _lppDirection:
-      case _lppGust:
-      case _lppDewPoint:
-      case _lppRain:
-      case _lppPm25:
-      case _lppPm10:
-      case _lppCo2:
-      case _lppTvoc:
-      case _lppRpm:
-      case _lppConductivity:
-      case _lppRotation:
-        return 2;
-      case MeshCoreConstants.lppAccelerometer:
-      case MeshCoreConstants.lppGyrometer:
-        return 6;
-      case MeshCoreConstants.lppGps:
-        return 9;
-      case _lppGenericSensor:
-      case _lppFrequency:
-      case _lppDistance:
-      case _lppEnergy:
-      case _lppUnixTime:
-      case _lppDuration:
-      case _lppAcceleration:
-      case _lppGyroRate:
-      case _lppVolume:
-      case _lppFlowRate:
-      case _lppVolumeStorage:
-      case _lppWater:
-      case _lppGasVolume:
-      case _lppMass:
-      case _lppSignedSpeed:
-      case _lppSignedPower:
-      case _lppSignedCurrent:
-        return 4;
-      case _lppColour:
-        return 3;
-    }
-    return null;
-  }
+  static String _sourceChannelKey(String fieldKey) => '__source_channel:$fieldKey';
 
   static bool _isZeroPaddedTail(Uint8List data, int remainingBytes) {
     final start = data.length - remainingBytes;

lib/theme/app_theme.dart

@@ -1,141 +1,123 @@
 import 'package:flutter/material.dart';
 
-enum AppThemeMode { light, dark, sarRed, sarGreen, sarNavyBlue, system }
+enum AppThemeMode {
+  light,
+  dark,
+  sarRed,
+  sarGreen,
+  sarNavyBlue,
+  system,
+}
 
 class AppTheme {
-  static ThemeData _withSharedControls(ThemeData theme) {
-    final colorScheme = theme.colorScheme;
-    return theme.copyWith(
-      switchTheme: SwitchThemeData(
-        thumbColor: WidgetStateProperty.resolveWith((states) {
-          if (states.contains(WidgetState.disabled)) {
-            return colorScheme.onSurface.withValues(alpha: 0.38);
-          }
-          if (states.contains(WidgetState.selected)) {
-            return colorScheme.onPrimary;
-          }
-          return colorScheme.outline;
-        }),
-        trackColor: WidgetStateProperty.resolveWith((states) {
-          if (states.contains(WidgetState.disabled)) {
-            return colorScheme.onSurface.withValues(alpha: 0.12);
-          }
-          if (states.contains(WidgetState.selected)) {
-            return colorScheme.primary;
-          }
-          return colorScheme.surfaceContainerHighest;
-        }),
-        trackOutlineColor: WidgetStateProperty.resolveWith((states) {
-          if (states.contains(WidgetState.selected)) {
-            return colorScheme.primary;
-          }
-          return colorScheme.outlineVariant;
-        }),
-      ),
-    );
-  }
-
   // Light theme (Blue)
   static ThemeData get lightTheme {
-    return _withSharedControls(
-      ThemeData(
-        useMaterial3: true,
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: Colors.blue,
-          brightness: Brightness.light,
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: Colors.blue,
+        brightness: Brightness.light,
+      ),
+      appBarTheme: const AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+      ),
+      cardTheme: CardThemeData(
+        elevation: 2,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
         ),
-        appBarTheme: const AppBarTheme(centerTitle: true, elevation: 0),
-        cardTheme: CardThemeData(
-          elevation: 2,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-          ),
-        ),
-        inputDecorationTheme: InputDecorationTheme(
-          border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
-          filled: true,
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12),
         ),
+        filled: true,
       ),
     );
   }
 
   // Dark theme (Blue)
   static ThemeData get darkTheme {
-    return _withSharedControls(
-      ThemeData(
-        useMaterial3: true,
-        colorScheme: ColorScheme.fromSeed(
-          seedColor: Colors.blue,
-          brightness: Brightness.dark,
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: Colors.blue,
+        brightness: Brightness.dark,
+      ),
+      appBarTheme: const AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+      ),
+      cardTheme: CardThemeData(
+        elevation: 2,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
         ),
-        appBarTheme: const AppBarTheme(centerTitle: true, elevation: 0),
-        cardTheme: CardThemeData(
-          elevation: 2,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-          ),
-        ),
-        inputDecorationTheme: InputDecorationTheme(
-          border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
-          filled: true,
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12),
         ),
+        filled: true,
       ),
     );
   }
 
   // SAR Red theme (Emergency/Alert tones)
   static ThemeData get sarRedTheme {
-    return _withSharedControls(
-      ThemeData(
-        useMaterial3: true,
-        colorScheme: const ColorScheme.dark(
-          brightness: Brightness.dark,
-          primary: Color(0xFFFF5252), // Bright red
-          onPrimary: Color(0xFF000000),
-          primaryContainer: Color(0xFF8B0000), // Dark red
-          onPrimaryContainer: Color(0xFFFFCDD2),
-          secondary: Color(0xFFFF8A80),
-          onSecondary: Color(0xFF000000),
-          secondaryContainer: Color(0xFFB71C1C),
-          onSecondaryContainer: Color(0xFFFFCDD2),
-          tertiary: Color(0xFFFF6E40),
-          onTertiary: Color(0xFF000000),
-          error: Color(0xFFCF6679),
-          onError: Color(0xFF000000),
-          surface: Color(0xFF1A0000), // Very dark red-tinted
-          onSurface: Color(0xFFFFEBEE),
-          surfaceContainerHighest: Color(0xFF2D0000),
-          onSurfaceVariant: Color(0xFFFFCDD2),
-          outline: Color(0xFFFF5252),
-        ),
-        scaffoldBackgroundColor: const Color(0xFF1A0000),
-        appBarTheme: const AppBarTheme(
-          centerTitle: true,
-          elevation: 0,
-          backgroundColor: Color(0xFF2D0000),
-          foregroundColor: Color(0xFFFFEBEE),
-        ),
-        cardTheme: CardThemeData(
-          elevation: 2,
-          color: const Color(0xFF2D0000),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-            side: const BorderSide(color: Color(0xFFFF5252), width: 1),
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: const ColorScheme.dark(
+        brightness: Brightness.dark,
+        primary: Color(0xFFFF5252), // Bright red
+        onPrimary: Color(0xFF000000),
+        primaryContainer: Color(0xFF8B0000), // Dark red
+        onPrimaryContainer: Color(0xFFFFCDD2),
+        secondary: Color(0xFFFF8A80),
+        onSecondary: Color(0xFF000000),
+        secondaryContainer: Color(0xFFB71C1C),
+        onSecondaryContainer: Color(0xFFFFCDD2),
+        tertiary: Color(0xFFFF6E40),
+        onTertiary: Color(0xFF000000),
+        error: Color(0xFFCF6679),
+        onError: Color(0xFF000000),
+        surface: Color(0xFF1A0000), // Very dark red-tinted
+        onSurface: Color(0xFFFFEBEE),
+        surfaceContainerHighest: Color(0xFF2D0000),
+        onSurfaceVariant: Color(0xFFFFCDD2),
+        outline: Color(0xFFFF5252),
+      ),
+      scaffoldBackgroundColor: const Color(0xFF1A0000),
+      appBarTheme: const AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+        backgroundColor: Color(0xFF2D0000),
+        foregroundColor: Color(0xFFFFEBEE),
+      ),
+      cardTheme: CardThemeData(
+        elevation: 2,
+        color: const Color(0xFF2D0000),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
+          side: const BorderSide(
+            color: Color(0xFFFF5252),
+            width: 1,
           ),
         ),
-        inputDecorationTheme: InputDecorationTheme(
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12),
-            borderSide: const BorderSide(color: Color(0xFFFF5252)),
-          ),
-          filled: true,
-          fillColor: const Color(0xFF2D0000),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12),
+          borderSide: const BorderSide(color: Color(0xFFFF5252)),
         ),
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFFFF5252),
-            foregroundColor: const Color(0xFF000000),
-          ),
+        filled: true,
+        fillColor: const Color(0xFF2D0000),
+      ),
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: const Color(0xFFFF5252),
+          foregroundColor: const Color(0xFF000000),
         ),
       ),
     );
@@ -143,57 +125,58 @@ class AppTheme {
 
   // SAR Green theme (All Clear/Safe tones)
   static ThemeData get sarGreenTheme {
-    return _withSharedControls(
-      ThemeData(
-        useMaterial3: true,
-        colorScheme: const ColorScheme.dark(
-          brightness: Brightness.dark,
-          primary: Color(0xFF69F0AE), // Bright green
-          onPrimary: Color(0xFF000000),
-          primaryContainer: Color(0xFF00695C), // Dark teal-green
-          onPrimaryContainer: Color(0xFFB9F6CA),
-          secondary: Color(0xFF64FFDA),
-          onSecondary: Color(0xFF000000),
-          secondaryContainer: Color(0xFF004D40),
-          onSecondaryContainer: Color(0xFFB9F6CA),
-          tertiary: Color(0xFF1DE9B6),
-          onTertiary: Color(0xFF000000),
-          error: Color(0xFFCF6679),
-          onError: Color(0xFF000000),
-          surface: Color(0xFF001A12), // Very dark green-tinted
-          onSurface: Color(0xFFE8F5E9),
-          surfaceContainerHighest: Color(0xFF002D1F),
-          onSurfaceVariant: Color(0xFFB9F6CA),
-          outline: Color(0xFF69F0AE),
-        ),
-        scaffoldBackgroundColor: const Color(0xFF001A12),
-        appBarTheme: const AppBarTheme(
-          centerTitle: true,
-          elevation: 0,
-          backgroundColor: Color(0xFF002D1F),
-          foregroundColor: Color(0xFFE8F5E9),
-        ),
-        cardTheme: CardThemeData(
-          elevation: 2,
-          color: const Color(0xFF002D1F),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-            side: const BorderSide(color: Color(0xFF69F0AE), width: 1),
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: const ColorScheme.dark(
+        brightness: Brightness.dark,
+        primary: Color(0xFF69F0AE), // Bright green
+        onPrimary: Color(0xFF000000),
+        primaryContainer: Color(0xFF00695C), // Dark teal-green
+        onPrimaryContainer: Color(0xFFB9F6CA),
+        secondary: Color(0xFF64FFDA),
+        onSecondary: Color(0xFF000000),
+        secondaryContainer: Color(0xFF004D40),
+        onSecondaryContainer: Color(0xFFB9F6CA),
+        tertiary: Color(0xFF1DE9B6),
+        onTertiary: Color(0xFF000000),
+        error: Color(0xFFCF6679),
+        onError: Color(0xFF000000),
+        surface: Color(0xFF001A12), // Very dark green-tinted
+        onSurface: Color(0xFFE8F5E9),
+        surfaceContainerHighest: Color(0xFF002D1F),
+        onSurfaceVariant: Color(0xFFB9F6CA),
+        outline: Color(0xFF69F0AE),
+      ),
+      scaffoldBackgroundColor: const Color(0xFF001A12),
+      appBarTheme: const AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+        backgroundColor: Color(0xFF002D1F),
+        foregroundColor: Color(0xFFE8F5E9),
+      ),
+      cardTheme: CardThemeData(
+        elevation: 2,
+        color: const Color(0xFF002D1F),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
+          side: const BorderSide(
+            color: Color(0xFF69F0AE),
+            width: 1,
           ),
         ),
-        inputDecorationTheme: InputDecorationTheme(
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12),
-            borderSide: const BorderSide(color: Color(0xFF69F0AE)),
-          ),
-          filled: true,
-          fillColor: const Color(0xFF002D1F),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12),
+          borderSide: const BorderSide(color: Color(0xFF69F0AE)),
         ),
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFF69F0AE),
-            foregroundColor: const Color(0xFF000000),
-          ),
+        filled: true,
+        fillColor: const Color(0xFF002D1F),
+      ),
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: const Color(0xFF69F0AE),
+          foregroundColor: const Color(0xFF000000),
         ),
       ),
     );
@@ -201,57 +184,58 @@ class AppTheme {
 
   // SAR Navy Blue theme (Professional/Operations tones)
   static ThemeData get sarNavyBlueTheme {
-    return _withSharedControls(
-      ThemeData(
-        useMaterial3: true,
-        colorScheme: const ColorScheme.dark(
-          brightness: Brightness.dark,
-          primary: Color(0xFF5C9FFF), // Bright navy blue
-          onPrimary: Color(0xFF000000),
-          primaryContainer: Color(0xFF003366), // Dark navy
-          onPrimaryContainer: Color(0xFFBBDEFF),
-          secondary: Color(0xFF80B3FF),
-          onSecondary: Color(0xFF000000),
-          secondaryContainer: Color(0xFF002244),
-          onSecondaryContainer: Color(0xFFBBDEFF),
-          tertiary: Color(0xFF4DB8FF),
-          onTertiary: Color(0xFF000000),
-          error: Color(0xFFCF6679),
-          onError: Color(0xFF000000),
-          surface: Color(0xFF00111C), // Very dark blue-tinted
-          onSurface: Color(0xFFE3F2FD),
-          surfaceContainerHighest: Color(0xFF001A2D),
-          onSurfaceVariant: Color(0xFFBBDEFF),
-          outline: Color(0xFF5C9FFF),
-        ),
-        scaffoldBackgroundColor: const Color(0xFF00111C),
-        appBarTheme: const AppBarTheme(
-          centerTitle: true,
-          elevation: 0,
-          backgroundColor: Color(0xFF001A2D),
-          foregroundColor: Color(0xFFE3F2FD),
-        ),
-        cardTheme: CardThemeData(
-          elevation: 2,
-          color: const Color(0xFF001A2D),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-            side: const BorderSide(color: Color(0xFF5C9FFF), width: 1),
+    return ThemeData(
+      useMaterial3: true,
+      colorScheme: const ColorScheme.dark(
+        brightness: Brightness.dark,
+        primary: Color(0xFF5C9FFF), // Bright navy blue
+        onPrimary: Color(0xFF000000),
+        primaryContainer: Color(0xFF003366), // Dark navy
+        onPrimaryContainer: Color(0xFFBBDEFF),
+        secondary: Color(0xFF80B3FF),
+        onSecondary: Color(0xFF000000),
+        secondaryContainer: Color(0xFF002244),
+        onSecondaryContainer: Color(0xFFBBDEFF),
+        tertiary: Color(0xFF4DB8FF),
+        onTertiary: Color(0xFF000000),
+        error: Color(0xFFCF6679),
+        onError: Color(0xFF000000),
+        surface: Color(0xFF00111C), // Very dark blue-tinted
+        onSurface: Color(0xFFE3F2FD),
+        surfaceContainerHighest: Color(0xFF001A2D),
+        onSurfaceVariant: Color(0xFFBBDEFF),
+        outline: Color(0xFF5C9FFF),
+      ),
+      scaffoldBackgroundColor: const Color(0xFF00111C),
+      appBarTheme: const AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+        backgroundColor: Color(0xFF001A2D),
+        foregroundColor: Color(0xFFE3F2FD),
+      ),
+      cardTheme: CardThemeData(
+        elevation: 2,
+        color: const Color(0xFF001A2D),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(12),
+          side: const BorderSide(
+            color: Color(0xFF5C9FFF),
+            width: 1,
           ),
         ),
-        inputDecorationTheme: InputDecorationTheme(
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12),
-            borderSide: const BorderSide(color: Color(0xFF5C9FFF)),
-          ),
-          filled: true,
-          fillColor: const Color(0xFF001A2D),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(12),
+          borderSide: const BorderSide(color: Color(0xFF5C9FFF)),
         ),
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: const Color(0xFF5C9FFF),
-            foregroundColor: const Color(0xFF000000),
-          ),
+        filled: true,
+        fillColor: const Color(0xFF001A2D),
+      ),
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: const Color(0xFF5C9FFF),
+          foregroundColor: const Color(0xFF000000),
         ),
       ),
     );

lib/widgets/contacts/contact_tile.dart

@@ -393,7 +393,7 @@ class ContactTile extends StatelessWidget {
                     Navigator.pop(sheetContext);
                     await Future<void>.delayed(Duration.zero);
                     if (!context.mounted) return;
-                    await _showSensorPreviewView(context, contact);
+                    await _showSensorPreviewSheet(context, contact);
                   },
                 ),
               if (canAddToSensors)
@@ -469,14 +469,49 @@ class ContactTile extends StatelessWidget {
     );
   }
 
-  Future<void> _showSensorPreviewView(
+  Future<void> _showSensorPreviewSheet(
     BuildContext context,
     Contact contact,
   ) async {
-    await Navigator.of(context).push(
-      MaterialPageRoute<void>(
-        fullscreenDialog: true,
-        builder: (pageContext) => _SensorPreviewView(contact: contact),
+    final publicKeyHex = contact.publicKeyHex;
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      showDragHandle: true,
+      builder: (sheetContext) => Consumer2<ContactsProvider, SensorsProvider>(
+        builder: (context, contactsProvider, sensorsProvider, child) {
+          Contact? liveContact;
+          for (final entry in contactsProvider.contacts) {
+            if (entry.publicKeyHex == publicKeyHex) {
+              liveContact = entry;
+              break;
+            }
+          }
+
+          final previewContact = liveContact ?? contact;
+          final visibleFields = sensorMetricKeysFor(previewContact);
+          final fieldOrder = sensorsProvider.metricOrderFor(
+            publicKeyHex,
+            visibleFields,
+          );
+
+          return SafeArea(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
+              child: SensorTelemetryCard(
+                contact: previewContact,
+                state: sensorsProvider.stateFor(publicKeyHex),
+                visibleFields: visibleFields,
+                fieldOrder: fieldOrder,
+                labelOverrides: sensorsProvider.labelOverridesFor(publicKeyHex),
+                fieldSpans: sensorFullWidthFieldSpans(visibleFields),
+                margin: EdgeInsets.zero,
+                emptyMetricsMessage: 'No telemetry fields available yet.',
+              ),
+            ),
+          );
+        },
       ),
     );
   }
@@ -1009,60 +1044,6 @@ class ContactTile extends StatelessWidget {
   }
 }
 
-class _SensorPreviewView extends StatelessWidget {
-  final Contact contact;
-
-  const _SensorPreviewView({required this.contact});
-
-  @override
-  Widget build(BuildContext context) {
-    final publicKeyHex = contact.publicKeyHex;
-    return Consumer2<ContactsProvider, SensorsProvider>(
-      builder: (context, contactsProvider, sensorsProvider, child) {
-        Contact? liveContact;
-        for (final entry in contactsProvider.contacts) {
-          if (entry.publicKeyHex == publicKeyHex) {
-            liveContact = entry;
-            break;
-          }
-        }
-
-        final previewContact = liveContact ?? contact;
-        final visibleFields = sensorMetricKeysFor(previewContact);
-        final fieldOrder = sensorsProvider.metricOrderFor(
-          publicKeyHex,
-          visibleFields,
-        );
-
-        return Scaffold(
-          appBar: AppBar(
-            leading: IconButton(
-              icon: const Icon(Icons.close),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            title: Text(previewContact.displayName),
-          ),
-          body: ListView(
-            padding: const EdgeInsets.fromLTRB(16, 16, 16, 24),
-            children: [
-              SensorTelemetryCard(
-                contact: previewContact,
-                state: sensorsProvider.stateFor(publicKeyHex),
-                visibleFields: visibleFields,
-                fieldOrder: fieldOrder,
-                labelOverrides: sensorsProvider.labelOverridesFor(publicKeyHex),
-                fieldSpans: sensorFullWidthFieldSpans(visibleFields),
-                margin: EdgeInsets.zero,
-                emptyMetricsMessage: 'No telemetry fields available yet.',
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}
-
 class _ContactNameOverrideSheet extends StatefulWidget {
   final String initialValue;
   final String advertisedName;

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.0315.1+31
+version: 2026.0314.1+30
 
 environment:
   sdk: ^3.9.2

test/providers/sensors_provider_test.dart

@@ -75,42 +75,6 @@ void main() {
     );
   }
 
-  Contact buildTelemetrySensorContact() {
-    final publicKey = Uint8List(32);
-    publicKey[0] = 0x55;
-
-    return Contact(
-      publicKey: publicKey,
-      type: ContactType.sensor,
-      flags: 0,
-      outPathLen: 0,
-      outPath: Uint8List(64),
-      advName: 'Weather Station',
-      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      advLat: 0,
-      advLon: 0,
-      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      telemetry: ContactTelemetry(
-        temperature: 11.8,
-        humidity: 51,
-        pressure: 921.9,
-        timestamp: DateTime.now(),
-        extraSensorData: const {
-          '__source_channel:temperature': 3,
-          '__source_channel:humidity': 2,
-          '__source_channel:pressure': 2,
-          'illuminance_2': 19150.0,
-          'temperature_2': 1.99,
-          'voltage_2': 5.2,
-          'switch_2': 0,
-          'speed_2': 2.8,
-          'speed_3': 3.7,
-          'uv_2': 1.0,
-        },
-      ),
-    );
-  }
-
   test('metric label overrides persist across reloads', () async {
     SharedPreferences.setMockInitialValues({});
     final contact = buildSensorContact();
@@ -184,31 +148,16 @@ void main() {
     final provider = SensorsProvider();
     await waitUntilLoaded(provider);
     await provider.addSensor(contact);
-    await provider.setAutoRefreshMinutes(contact.publicKeyHex, 1440);
+    await provider.setAutoRefreshMinutes(contact.publicKeyHex, 5);
 
-    expect(provider.autoRefreshMinutesFor(contact.publicKeyHex), 1440);
+    expect(provider.autoRefreshMinutesFor(contact.publicKeyHex), 5);
 
     final reloadedProvider = SensorsProvider();
     await waitUntilLoaded(reloadedProvider);
 
-    expect(reloadedProvider.autoRefreshMinutesFor(contact.publicKeyHex), 1440);
+    expect(reloadedProvider.autoRefreshMinutesFor(contact.publicKeyHex), 5);
   });
 
-  test(
-    'unsupported auto refresh minutes normalize to nearest option',
-    () async {
-      SharedPreferences.setMockInitialValues({});
-      final contact = buildSensorContact();
-
-      final provider = SensorsProvider();
-      await waitUntilLoaded(provider);
-      await provider.addSensor(contact);
-      await provider.setAutoRefreshMinutes(contact.publicKeyHex, 1);
-
-      expect(provider.autoRefreshMinutesFor(contact.publicKeyHex), 5);
-    },
-  );
-
   test('refreshDueSensors respects per-contact interval', () async {
     SharedPreferences.setMockInitialValues({});
     final contact = buildSensorContact();
@@ -242,32 +191,4 @@ void main() {
     );
     expect(connectionProvider.pingCalls, 2);
   });
-
-  test(
-    'addSensor includes available extra telemetry fields by default',
-    () async {
-      SharedPreferences.setMockInitialValues({});
-      final contact = buildTelemetrySensorContact();
-
-      final provider = SensorsProvider();
-      await waitUntilLoaded(provider);
-      await provider.addSensor(contact);
-
-      expect(
-        provider.visibleFieldsFor(contact.publicKeyHex),
-        containsAll(<String>{
-          'temperature',
-          'humidity',
-          'pressure',
-          'extra:illuminance_2',
-          'extra:temperature_2',
-          'extra:voltage_2',
-          'extra:switch_2',
-          'extra:speed_2',
-          'extra:speed_3',
-          'extra:uv_2',
-        }),
-      );
-    },
-  );
 }

test/screens/sensors_tab_test.dart

@@ -50,7 +50,9 @@ void main() {
     );
   }
 
-  testWidgets('customize action opens full customization view', (tester) async {
+  testWidgets('customize sheet shows metric value previews and channels', (
+    tester,
+  ) async {
     final contact = buildSensorContact();
     final sensorsProvider = SensorsProvider();
     final contactsProvider = ContactsProvider();
@@ -59,39 +61,40 @@ void main() {
     contactsProvider.addOrUpdateContact(contact);
     await sensorsProvider.addSensor(contact);
 
-    await tester.pumpWidget(
-      MultiProvider(
-        providers: [
-          ChangeNotifierProvider<ContactsProvider>.value(
-            value: contactsProvider,
-          ),
-          ChangeNotifierProvider<SensorsProvider>.value(value: sensorsProvider),
+      await tester.pumpWidget(
+        MultiProvider(
+          providers: [
+            ChangeNotifierProvider<ContactsProvider>.value(
+              value: contactsProvider,
+            ),
+            ChangeNotifierProvider<SensorsProvider>.value(value: sensorsProvider),
         ],
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
           home: const SensorsTab(),
+          ),
         ),
-      ),
-    );
-    await tester.pump();
+      );
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 300));
 
-    await tester.tap(find.byIcon(Icons.more_vert));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
-    await tester.tap(find.text('Customize fields'));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
+      await tester.tap(find.byIcon(Icons.more_vert));
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 300));
+      await tester.tap(find.text('Customize fields'));
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 300));
 
-    expect(find.text('Customize WX Station'), findsOneWidget);
-    expect(find.text('Live preview'), findsOneWidget);
-    expect(find.text('Refresh schedule'), findsOneWidget);
     expect(
-      find.byKey(
-        const ValueKey('sensor_selector_metric_channel_extra:illuminance_2'),
-      ),
+      find.byKey(const ValueKey('sensor_selector_value_extra:illuminance_2')),
       findsOneWidget,
     );
-    expect(find.text('Channel 2'), findsOneWidget);
+    expect(find.text('500 lx'), findsOneWidget);
+    expect(
+      find.byKey(const ValueKey('sensor_selector_channel_extra:illuminance_2')),
+      findsOneWidget,
+    );
+    expect(find.text('ch2'), findsOneWidget);
   });
 }

test/services/cayenne_lpp_parser_test.dart

@@ -373,9 +373,6 @@ void main() {
       const lppDirection = 132;
       const lppUnixTime = 133;
       const lppColour = 135;
-      const lppGust = 137;
-      const lppDewPoint = 138;
-      const lppRain = 139;
       const lppSwitch = 142;
 
       final payload = Uint8List.fromList([
@@ -391,9 +388,6 @@ void main() {
         11, lppDirection, 0x01, 0x0E, // 270 deg
         12, lppUnixTime, 0x65, 0xF0, 0x00, 0x00, // 1710221312
         13, lppColour, 0xFF, 0x80, 0x40, // #FF8040
-        15, lppGust, 0x01, 0x72, // 3.70 m/s
-        16, lppDewPoint, 0x00, 0x14, // 2.0 C
-        17, lppRain, 0x00, 0x7B, // 12.3 mm
         14, lppSwitch, 0x01, // on
       ]);
 
@@ -415,59 +409,9 @@ void main() {
         decoded.extraSensorData!['colour_13'],
         equals({'r': 255, 'g': 128, 'b': 64}),
       );
-      expect(decoded.extraSensorData!['gust_15'], closeTo(3.7, 0.001));
-      expect(decoded.extraSensorData!['dew_16'], closeTo(2.0, 0.001));
-      expect(decoded.extraSensorData!['rain_17'], closeTo(12.3, 0.001));
       expect(decoded.extraSensorData!['switch_14'], equals(1));
     });
 
-    test('new MeshCore custom telemetry types decode without truncation', () {
-      const lppBinaryMoisture = 157;
-      const lppButtonEvent = 171;
-      const lppDimmer = 172;
-      const lppUv = 173;
-      const lppPm25 = 175;
-      const lppConductivity = 180;
-      const lppDuration = 182;
-      const lppSignedSpeed = 191;
-      const lppSignedPower = 192;
-      const lppSignedCurrent = 193;
-
-      final payload = Uint8List.fromList([
-        2, lppBinaryMoisture, 0x01,
-        3, lppButtonEvent, 0x04,
-        4, lppDimmer, 0xFB, // -5
-        5, lppUv, 0x0A, // 1.0
-        6, lppPm25, 0x00, 0x0C, // 12
-        7, lppConductivity, 0x01, 0xF4, // 500
-        8, lppDuration, 0x00, 0x00, 0x13, 0x88, // 5.0 s
-        9, lppSignedSpeed, 0xFF, 0xE1, 0x7B, 0x80, // -2.0 m/s
-        10, lppSignedPower, 0xFF, 0xFF, 0xFC, 0x18, // -10.0 W
-        11, lppSignedCurrent, 0xFF, 0xFF, 0xFC, 0x18, // -1.0 A
-        12, MeshCoreConstants.lppTemperatureSensor, 0x00, 0x76, // 11.8 C
-      ]);
-
-      final decoded = CayenneLppParser.parse(payload);
-
-      expect(decoded.extraSensorData!['binary_moisture_2'], equals(1));
-      expect(decoded.extraSensorData!['button_event_3'], equals(4));
-      expect(decoded.extraSensorData!['dimmer_4'], equals(-5));
-      expect(decoded.extraSensorData!['uv_5'], closeTo(1.0, 0.001));
-      expect(decoded.extraSensorData!['pm25_6'], equals(12.0));
-      expect(decoded.extraSensorData!['conductivity_7'], equals(500.0));
-      expect(decoded.extraSensorData!['duration_8'], closeTo(5.0, 0.001));
-      expect(decoded.extraSensorData!['signed_speed_9'], closeTo(-2.0, 0.001));
-      expect(
-        decoded.extraSensorData!['signed_power_10'],
-        closeTo(-10.0, 0.001),
-      );
-      expect(
-        decoded.extraSensorData!['signed_current_11'],
-        closeTo(-1.0, 0.001),
-      );
-      expect(decoded.temperature, closeTo(11.8, 0.1));
-    });
-
     test(
       'percentage battery and non-battery voltage channels are preserved separately',
       () {

test/widgets/contact_tile_test.dart

@@ -156,7 +156,6 @@ void main() {
     await tester.tap(find.text('Preview'));
     await tester.pumpAndSettle();
 
-    expect(find.byIcon(Icons.close), findsOneWidget);
     expect(find.text('Battery'), findsOneWidget);
     expect(find.text('84%'), findsOneWidget);
     expect(find.text('Temperature'), findsOneWidget);
@@ -173,7 +172,10 @@ void main() {
       find.byKey(const ValueKey('sensor_metric_channel_battery')),
       findsOneWidget,
     );
-    expect(find.text('ch1'), findsWidgets);
+    expect(
+      find.text('ch1'),
+      findsWidgets,
+    );
     expect(
       find.byKey(const ValueKey('sensor_metric_channel_extra:illuminance_2')),
       findsOneWidget,
@@ -184,10 +186,5 @@ void main() {
       find.byKey(const ValueKey('sensor_metric_battery')),
     );
     expect(batteryTileSize.width, greaterThan(sensorCardSize.width * 0.8));
-
-    await tester.tap(find.byIcon(Icons.close));
-    await tester.pumpAndSettle();
-
-    expect(find.byType(SensorTelemetryCard), findsNothing);
   });
 }

test/widgets/sensor_auto_refresh_options_test.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:meshcore_sar_app/screens/sensors_tab.dart';
-
-void main() {
-  testWidgets('renders expanded auto refresh intervals and selects value', (
-    tester,
-  ) async {
-    var selected = 0;
-
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: SensorAutoRefreshOptions(
-            selectedMinutes: selected,
-            onSelected: (minutes) {
-              selected = minutes;
-            },
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text('Off'), findsOneWidget);
-    expect(find.text('5m'), findsOneWidget);
-    expect(find.text('15m'), findsOneWidget);
-    expect(find.text('30m'), findsOneWidget);
-    expect(find.text('60m'), findsOneWidget);
-    expect(find.text('6h'), findsOneWidget);
-    expect(find.text('12h'), findsOneWidget);
-    expect(find.text('24h'), findsOneWidget);
-
-    await tester.tap(find.text('24h'));
-    await tester.pump();
-
-    expect(selected, 1440);
-  });
-}

test/widgets/sensor_metric_selector_item_test.dart

@@ -15,14 +15,6 @@ void main() {
               defaultLabel: 'Illuminance',
               channel: 2,
               valuePreview: '500 lx',
-              previewCardData: SensorMetricCardData(
-                fieldKey: 'extra:illuminance_2',
-                icon: Icons.light_mode_outlined,
-                label: 'Illuminance',
-                value: '500 lx',
-                accent: Color(0xFFC17B1D),
-                channel: 2,
-              ),
             ),
             visible: true,
             span: 1,
@@ -38,54 +30,11 @@ void main() {
       ),
     );
 
-    expect(find.text('Show on sensor card'), findsOneWidget);
     expect(find.text('500 lx'), findsOneWidget);
     expect(
       find.byKey(const ValueKey('sensor_selector_channel_extra:illuminance_2')),
       findsOneWidget,
     );
-    expect(find.text('Channel 2'), findsOneWidget);
-  });
-
-  testWidgets('omits duplicate channel chip for channel 1', (tester) async {
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: SensorMetricSelectorItem(
-            option: const SensorMetricOption(
-              key: 'battery',
-              label: 'Battery',
-              defaultLabel: 'Battery',
-              channel: 1,
-              valuePreview: '84%',
-              previewCardData: SensorMetricCardData(
-                fieldKey: 'battery',
-                icon: Icons.battery_5_bar,
-                label: 'Battery',
-                value: '84%',
-                accent: Color(0xFF4B8E2F),
-                channel: 1,
-              ),
-            ),
-            visible: true,
-            span: 1,
-            canMoveUp: true,
-            canMoveDown: true,
-            onToggle: (_) {},
-            onRename: () {},
-            onMoveUp: () {},
-            onMoveDown: () {},
-            onSpanChanged: (_) {},
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text('Rename'), findsOneWidget);
-    expect(
-      find.byKey(const ValueKey('sensor_selector_channel_battery')),
-      findsNothing,
-    );
-    expect(find.text('Channel 1'), findsNothing);
+    expect(find.text('ch2'), findsOneWidget);
   });
 }

test/widgets/sensor_telemetry_card_test.dart

@@ -50,10 +50,9 @@ void main() {
               'temperature': 'Ambient',
               'extra:illuminance_2': 'Light',
             },
-            fieldSpans: sensorFullWidthFieldSpans(const {
-              'temperature',
-              'extra:illuminance_2',
-            }),
+            fieldSpans: sensorFullWidthFieldSpans(
+              const {'temperature', 'extra:illuminance_2'},
+            ),
           ),
         ),
       ),
@@ -112,12 +111,18 @@ void main() {
               'temperature',
               'extra:illuminance_2',
             },
-            fieldOrder: const ['extra:illuminance_2', 'temperature', 'battery'],
-            fieldSpans: sensorFullWidthFieldSpans(const {
-              'battery',
-              'temperature',
+            fieldOrder: const [
               'extra:illuminance_2',
-            }),
+              'temperature',
+              'battery',
+            ],
+            fieldSpans: sensorFullWidthFieldSpans(
+              const {
+                'battery',
+                'temperature',
+                'extra:illuminance_2',
+              },
+            ),
           ),
         ),
       ),
@@ -136,55 +141,4 @@ void main() {
     expect(illuminanceTop.dy, lessThan(temperatureTop.dy));
     expect(temperatureTop.dy, lessThan(batteryTop.dy));
   });
-
-  testWidgets('renders MeshCore custom weather metrics', (tester) async {
-    final publicKey = Uint8List(32);
-    publicKey[0] = 0x46;
-    final contact = Contact(
-      publicKey: publicKey,
-      type: ContactType.sensor,
-      flags: 0,
-      outPathLen: 0,
-      outPath: Uint8List(64),
-      advName: 'WX Station',
-      lastAdvert: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      advLat: 0,
-      advLon: 0,
-      lastMod: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      telemetry: ContactTelemetry(
-        timestamp: DateTime.now().subtract(const Duration(minutes: 1)),
-        extraSensorData: const {'gust_2': 3.7, 'dew_2': 2.0, 'rain_2': 12.3},
-      ),
-    );
-
-    await tester.pumpWidget(
-      MaterialApp(
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-        home: Scaffold(
-          body: SensorTelemetryCard(
-            contact: contact,
-            state: SensorRefreshState.idle,
-            visibleFields: const {
-              'extra:gust_2',
-              'extra:dew_2',
-              'extra:rain_2',
-            },
-            fieldSpans: sensorFullWidthFieldSpans(const {
-              'extra:gust_2',
-              'extra:dew_2',
-              'extra:rain_2',
-            }),
-          ),
-        ),
-      ),
-    );
-
-    expect(find.text('Wind gust'), findsOneWidget);
-    expect(find.text('Dew point'), findsOneWidget);
-    expect(find.text('Rain'), findsOneWidget);
-    expect(find.text('3.7 m/s'), findsOneWidget);
-    expect(find.text('2°C'), findsOneWidget);
-    expect(find.text('12.3 mm'), findsOneWidget);
-  });
 }