release apk

lib/components/pages/new_entry.dart

@@ -83,11 +83,16 @@ class _NewEntryPageState extends State<NewEntryPage> {
   Widget _buildTripSelector(BuildContext context) {
     final trips = context.watch<DataService>().tripList;
     final sorted = [...trips]..sort((a, b) => b.tripId.compareTo(a.tripId));
+    final tripIds = sorted.map((t) => t.tripId).toSet();
+    final selectedValue =
+        (_selectedTripId != null && tripIds.contains(_selectedTripId))
+            ? _selectedTripId
+            : null;
     return Row(
       children: [
         Expanded(
-          child: DropdownButtonFormField<int>(
-            value: _selectedTripId,
+          child: DropdownButtonFormField<int?>(
+            value: selectedValue,
             decoration: const InputDecoration(
               labelText: 'Trip',
               border: OutlineInputBorder(),
@@ -96,7 +101,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
               const DropdownMenuItem(value: null, child: Text('No trip')),
               ...sorted.map(
                 (t) =>
-                    DropdownMenuItem(value: t.tripId, child: Text(t.tripName)),
+                    DropdownMenuItem<int?>(value: t.tripId, child: Text(t.tripName)),
               ),
             ],
             onChanged: (val) {
@@ -350,9 +355,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
     _notesController.clear();
     _mileageController.clear();
     _networkController.clear();
+    final now = DateTime.now();
     setState(() {
-      _selectedDate = DateTime.now();
-      _selectedTime = TimeOfDay.now();
+      _selectedDate = now;
+      _selectedTime = TimeOfDay.fromDateTime(now);
       _useManualMileage = false;
       _routeResult = null;
       _tractionItems
@@ -600,18 +606,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
               _buildTractionList(),
             ]);
 
-            final mileagePanel = _section('Mileage', [
-              SwitchListTile(
-                title: const Text('Use manual mileage'),
-                subtitle: const Text('Turn on to enter mileage manually'),
-                value: _useManualMileage,
-                onChanged: (val) {
-                  setState(() {
-                    _useManualMileage = val;
-                  });
-                  _saveDraft();
-                },
-              ),
+            final mileagePanel = _section(
+              'Mileage',
+              [
               if (_useManualMileage)
                 TextFormField(
                   controller: _mileageController,
@@ -635,12 +632,21 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 Align(
                   alignment: Alignment.centerLeft,
                   child: ElevatedButton.icon(
-                    onPressed: _openCalculator,
-                    icon: const Icon(Icons.calculate),
-                    label: const Text('Open mileage calculator'),
-                  ),
+                  onPressed: _openCalculator,
+                  icon: const Icon(Icons.calculate),
+                  label: const Text('Open mileage calculator'),
                 ),
-            ]);
+                ),
+              ],
+              trailing: FilterChip(
+                label: Text(_useManualMileage ? 'Manual' : 'Automatic'),
+                selected: _useManualMileage,
+                onSelected: (val) {
+                  setState(() => _useManualMileage = val);
+                  _saveDraft();
+                },
+              ),
+            );
 
             return SingleChildScrollView(
               padding: const EdgeInsets.all(16),
@@ -666,6 +672,14 @@ class _NewEntryPageState extends State<NewEntryPage> {
                           ],
                         ),
                   const SizedBox(height: 12),
+                  OutlinedButton.icon(
+                    onPressed: _submitting
+                        ? null
+                        : () => _resetFormState(clearDraft: true),
+                    icon: const Icon(Icons.clear),
+                    label: const Text('Clear form'),
+                  ),
+                  const SizedBox(height: 8),
                   ElevatedButton.icon(
                     onPressed: _submitting ? null : _submit,
                     icon: _submitting
@@ -767,18 +781,24 @@ class _NewEntryPageState extends State<NewEntryPage> {
     );
   }
 
-  Widget _section(String title, List<Widget> children) {
+  Widget _section(String title, List<Widget> children, {Widget? trailing}) {
     return Card(
       child: Padding(
         padding: const EdgeInsets.all(12.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
-              title,
-              style: Theme.of(
-                context,
-              ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  title,
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                if (trailing != null) trailing,
+              ],
             ),
             const SizedBox(height: 8),
             ...children.map(

lib/components/pages/traction.dart

@@ -721,13 +721,11 @@ class _TractionPageState extends State<TractionPage> {
     if (field.enumValues != null && field.enumValues!.isNotEmpty) {
       final options = field.enumValues!.map((e) => e.toString()).toSet().toList();
       final currentValue = _enumSelections[field.name];
-      if (currentValue != null && !options.contains(currentValue)) {
-        options.insert(0, currentValue);
-      }
+      final safeValue = options.contains(currentValue) ? currentValue : null;
       return SizedBox(
         width: width,
         child: DropdownButtonFormField<String?>(
-          value: currentValue,
+          value: safeValue,
           decoration: InputDecoration(
             labelText: field.display,
             border: const OutlineInputBorder(),