CalvinBackup/deflock-app
1
0
Fork 0
mirror of https://github.com/FoggedLens/deflock-app.git synced 2026-07-11 14:56:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

UX bones

Browse Source
This commit is contained in:
stopflock
2025-10-02 16:50:07 -05:00
parent b02099e3fe
commit 408b52cdb0
7 changed files with 945 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/widgets/map_view.dart
+29
View File
@@ -21,6 +21,7 @@ import 'map/tile_layer_manager.dart';
import 'map/camera_refresh_controller.dart';
import 'map/gps_controller.dart';
import 'network_status_indicator.dart';
import 'provisional_pin.dart';
import 'proximity_alert_banner.dart';
import '../dev_config.dart';
import '../app_state.dart' show FollowMeMode;
@@ -374,10 +375,33 @@ class MapViewState extends State<MapView> {
}
}
// Build provisional pin for navigation/search mode
if (appState.showProvisionalPin && appState.provisionalPinLocation != null) {
centerMarkers.add(
Marker(
point: appState.provisionalPinLocation!,
width: 48.0,
height: 48.0,
child: const ProvisionalPin(),
),
);
}
// Build route path visualization
final routeLines = <Polyline>[];
if (appState.routePath != null && appState.routePath!.length > 1) {
routeLines.add(Polyline(
points: appState.routePath!,
color: Colors.blue,
strokeWidth: 4.0,
));
}
return Stack(
children: [
PolygonLayer(polygons: overlays),
if (editLines.isNotEmpty) PolylineLayer(polylines: editLines),
if (routeLines.isNotEmpty) PolylineLayer(polylines: routeLines),
MarkerLayer(markers: [...markers, ...centerMarkers]),
],
);
@@ -406,6 +430,11 @@ class MapViewState extends State<MapView> {
appState.updateEditSession(target: pos.center);
}
// Update provisional pin location during navigation search/routing
if (appState.showProvisionalPin) {
appState.updateProvisionalPinLocation(pos.center);
}
// Start dual-source waiting when map moves (user is expecting new tiles AND nodes)
NetworkStatus.instance.setDualSourceWaiting();
lib/widgets/navigation_sheet.dart
+314
View File
@@ -0,0 +1,314 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:latlong2/latlong.dart';
import '../app_state.dart';
class NavigationSheet extends StatelessWidget {
const NavigationSheet({super.key});
String _formatCoordinates(LatLng coordinates) {
return '${coordinates.latitude.toStringAsFixed(6)}, ${coordinates.longitude.toStringAsFixed(6)}';
}
Widget _buildLocationInfo({
required String label,
required LatLng coordinates,
String? address,
}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
label,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
color: Colors.grey[600],
),
),
const SizedBox(height: 4),
if (address != null) ...[
Text(
address,
style: const TextStyle(fontSize: 16),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 2),
],
Text(
_formatCoordinates(coordinates),
style: TextStyle(
fontSize: 14,
color: Colors.grey[600],
fontFamily: 'monospace',
),
),
],
);
}
@override
Widget build(BuildContext context) {
return Consumer<AppState>(
builder: (context, appState, child) {
final navigationMode = appState.navigationMode;
final provisionalLocation = appState.provisionalPinLocation;
final provisionalAddress = appState.provisionalPinAddress;
if (provisionalLocation == null) {
return const SizedBox.shrink();
}
switch (navigationMode) {
case AppNavigationMode.search:
return Container(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Drag handle
Center(
child: Container(
width: 40,
height: 4,
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: Colors.grey[400],
borderRadius: BorderRadius.circular(2),
),
),
),
// Location info
_buildLocationInfo(
label: 'Location',
coordinates: provisionalLocation,
address: provisionalAddress,
),
const SizedBox(height: 16),
// Action buttons
Row(
children: [
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.directions),
label: const Text('Route To'),
onPressed: () {
appState.startRouteSetup(settingStart: false);
},
),
),
const SizedBox(width: 12),
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.my_location),
label: const Text('Route From'),
onPressed: () {
appState.startRouteSetup(settingStart: true);
},
),
),
],
),
],
),
);
case AppNavigationMode.routeSetup:
return Container(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Drag handle
Center(
child: Container(
width: 40,
height: 4,
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: Colors.grey[400],
borderRadius: BorderRadius.circular(2),
),
),
),
// Route points info
if (appState.routeStart != null) ...[
_buildLocationInfo(
label: 'Start',
coordinates: appState.routeStart!,
address: appState.routeStartAddress,
),
const SizedBox(height: 12),
],
if (appState.routeEnd != null) ...[
_buildLocationInfo(
label: 'End',
coordinates: appState.routeEnd!,
address: appState.routeEndAddress,
),
const SizedBox(height: 12),
],
_buildLocationInfo(
label: appState.settingRouteStart ? 'Start (select)' : 'End (select)',
coordinates: provisionalLocation,
address: provisionalAddress,
),
const SizedBox(height: 16),
// Select location button
ElevatedButton.icon(
icon: const Icon(Icons.check),
label: const Text('Select Location'),
onPressed: () {
appState.selectRouteLocation();
},
),
],
),
);
case AppNavigationMode.routeCalculating:
return Container(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// Drag handle
Center(
child: Container(
width: 40,
height: 4,
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: Colors.grey[400],
borderRadius: BorderRadius.circular(2),
),
),
),
const CircularProgressIndicator(),
const SizedBox(height: 16),
const Text('Calculating route...'),
const SizedBox(height: 16),
ElevatedButton(
onPressed: () {
appState.cancelRoute();
},
child: const Text('Cancel'),
),
],
),
);
case AppNavigationMode.routePreview:
case AppNavigationMode.routeOverview:
return Container(
padding: const EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Drag handle
Center(
child: Container(
width: 40,
height: 4,
margin: const EdgeInsets.only(bottom: 16),
decoration: BoxDecoration(
color: Colors.grey[400],
borderRadius: BorderRadius.circular(2),
),
),
),
// Route info
if (appState.routeStart != null) ...[
_buildLocationInfo(
label: 'Start',
coordinates: appState.routeStart!,
address: appState.routeStartAddress,
),
const SizedBox(height: 12),
],
if (appState.routeEnd != null) ...[
_buildLocationInfo(
label: 'End',
coordinates: appState.routeEnd!,
address: appState.routeEndAddress,
),
const SizedBox(height: 12),
],
// Distance info
if (appState.routeDistance != null) ...[
Text(
'Distance: ${(appState.routeDistance! / 1000).toStringAsFixed(1)} km',
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 16),
],
// Action buttons
Row(
children: [
if (navigationMode == AppNavigationMode.routePreview) ...[
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.play_arrow),
label: const Text('Start'),
onPressed: () {
appState.startRoute();
},
),
),
const SizedBox(width: 12),
] else if (navigationMode == AppNavigationMode.routeOverview) ...[
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.play_arrow),
label: const Text('Resume'),
onPressed: () {
appState.returnToActiveRoute();
},
),
),
const SizedBox(width: 12),
],
Expanded(
child: ElevatedButton.icon(
icon: const Icon(Icons.close),
label: const Text('Cancel'),
onPressed: () {
appState.cancelRoute();
},
),
),
],
),
],
),
);
default:
return const SizedBox.shrink();
}
},
);
}
}
lib/widgets/provisional_pin.dart
+60
View File
@@ -0,0 +1,60 @@
import 'package:flutter/material.dart';
/// A pin icon for marking provisional locations during search/routing
class ProvisionalPin extends StatelessWidget {
final double size;
final Color color;
const ProvisionalPin({
super.key,
this.size = 48.0,
this.color = Colors.red,
});
@override
Widget build(BuildContext context) {
return Container(
width: size,
height: size,
child: Stack(
alignment: Alignment.center,
children: [
// Pin shadow
Positioned(
bottom: 0,
child: Container(
width: size * 0.3,
height: size * 0.15,
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.3),
borderRadius: BorderRadius.circular(size * 0.15),
),
),
),
// Main pin
Icon(
Icons.location_pin,
size: size,
color: color,
),
// Inner dot
Positioned(
top: size * 0.15,
child: Container(
width: size * 0.25,
height: size * 0.25,
decoration: BoxDecoration(
color: Colors.white,
shape: BoxShape.circle,
border: Border.all(
color: color.withOpacity(0.8),
width: 2,
),
),
),
),
],
),
);
}
}
lib/widgets/search_bar.dart
+32 -8
View File
@@ -7,10 +7,12 @@ import '../widgets/debouncer.dart';
class LocationSearchBar extends StatefulWidget {
final void Function(SearchResult)? onResultSelected;
final VoidCallback? onCancel;
const LocationSearchBar({
super.key,
this.onResultSelected,
this.onCancel,
});
@override
@@ -50,14 +52,17 @@ class _LocationSearchBarState extends State<LocationSearchBar> {
});
if (query.isEmpty) {
context.read<AppState>().clearSearchResults();
// Clear navigation search results instead of old search state
final appState = context.read<AppState>();
appState.clearNavigationSearchResults();
return;
}
// Debounce search to avoid too many API calls
_searchDebouncer(() {
if (mounted) {
context.read<AppState>().search(query);
final appState = context.read<AppState>();
appState.searchNavigation(query);
}
});
}
@@ -74,12 +79,22 @@ class _LocationSearchBarState extends State<LocationSearchBar> {
void _onClear() {
_controller.clear();
context.read<AppState>().clearSearchResults();
context.read<AppState>().clearNavigationSearchResults();
setState(() {
_showResults = false;
});
}
void _onCancel() {
_controller.clear();
context.read<AppState>().clearNavigationSearchResults();
setState(() {
_showResults = false;
});
_focusNode.unfocus();
widget.onCancel?.call();
}
Widget _buildResultsList(List<SearchResult> results, bool isLoading) {
if (!_showResults) return const SizedBox.shrink();
@@ -166,12 +181,21 @@ class _LocationSearchBarState extends State<LocationSearchBar> {
decoration: InputDecoration(
hintText: 'Search places or coordinates...',
prefixIcon: const Icon(Icons.search),
suffixIcon: _controller.text.isNotEmpty
? IconButton(
suffixIcon: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (_controller.text.isNotEmpty)
IconButton(
icon: const Icon(Icons.clear),
onPressed: _onClear,
)
: null,
),
IconButton(
icon: const Icon(Icons.close),
onPressed: _onCancel,
tooltip: 'Cancel search',
),
],
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(12),
borderSide: BorderSide.none,
@@ -186,7 +210,7 @@ class _LocationSearchBarState extends State<LocationSearchBar> {
onChanged: _onSearchChanged,
),
),
_buildResultsList(appState.searchResults, appState.isSearchLoading),
_buildResultsList(appState.navigationSearchResults, appState.isNavigationSearchLoading),
],
);
},