Compare commits
No commits in common. "44500835d751da2726b858274f3b1392200cfa93" and "65f0f4451b41d6190b15ab616105fd9c4e611f86" have entirely different histories.
44500835d7
...
65f0f4451b
@ -24,13 +24,10 @@ android {
|
||||
applicationId = "com.goutezplanb.planb_logistic"
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://flutter.dev/to/review-gradle-config.
|
||||
minSdk = flutter.minSdkVersion // Required for Google Navigation Flutter
|
||||
minSdk = 23 // Required for Google Navigation Flutter
|
||||
targetSdk = flutter.targetSdkVersion
|
||||
versionCode = flutter.versionCode
|
||||
versionName = flutter.versionName
|
||||
|
||||
// OAuth redirect scheme for flutter_appauth
|
||||
manifestPlaceholders["appAuthRedirectScheme"] = "com.goutezplanb.delivery"
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
|
||||
@ -312,7 +312,7 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
|
||||
// Calculate dynamic padding for bottom button bar
|
||||
final topPadding = 0.0;
|
||||
final bottomPadding = 110.0;
|
||||
final bottomPadding = widget.selectedDelivery != null ? 110.0 : 0.0;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
@ -327,34 +327,10 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
_navigationController = controller;
|
||||
// Apply dark mode style with a small delay to ensure map is ready
|
||||
await Future.delayed(const Duration(milliseconds: 500));
|
||||
|
||||
// Safety check: ensure widget is still mounted before proceeding
|
||||
if (!mounted) return;
|
||||
|
||||
await _applyDarkModeStyle();
|
||||
|
||||
// Wrap camera animation in try-catch to handle "No valid view found" errors
|
||||
// This can happen on Android when the view isn't fully ready
|
||||
try {
|
||||
if (mounted && _navigationController != null) {
|
||||
await controller.animateCamera(
|
||||
controller.animateCamera(
|
||||
CameraUpdate.newLatLngZoom(initialPosition, 12),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('Camera animation error (view may not be ready): $e');
|
||||
// Retry once after a longer delay
|
||||
await Future.delayed(const Duration(milliseconds: 1000));
|
||||
if (mounted && _navigationController != null) {
|
||||
try {
|
||||
await controller.animateCamera(
|
||||
CameraUpdate.newLatLngZoom(initialPosition, 12),
|
||||
);
|
||||
} catch (e2) {
|
||||
debugPrint('Camera animation retry failed: $e2');
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
initialCameraPosition: CameraPosition(
|
||||
target: initialPosition,
|
||||
@ -362,7 +338,8 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
),
|
||||
),
|
||||
),
|
||||
// Bottom action button bar - 4 equal-width buttons (always visible)
|
||||
// Bottom action button bar
|
||||
if (widget.selectedDelivery != null)
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
@ -384,47 +361,53 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
// Start button
|
||||
// Recenter button
|
||||
Expanded(
|
||||
child: _buildBottomActionButton(
|
||||
label: _isNavigating ? 'Stop' : 'Start',
|
||||
icon: _isNavigating ? Icons.stop : Icons.navigation,
|
||||
onPressed: _isStartingNavigation || _isInitializing || (widget.selectedDelivery == null && !_isNavigating)
|
||||
? null
|
||||
: (_isNavigating ? _stopNavigation : _startNavigation),
|
||||
isDanger: _isNavigating,
|
||||
label: 'Recenter',
|
||||
icon: Icons.location_on,
|
||||
onPressed: _recenterMap,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
// Photo button
|
||||
const SizedBox(width: 12),
|
||||
// Mark Complete button (if not already delivered)
|
||||
if (!widget.selectedDelivery!.delivered)
|
||||
Expanded(
|
||||
child: _buildBottomActionButton(
|
||||
label: 'Photo',
|
||||
icon: Icons.camera_alt,
|
||||
onPressed: () => widget.onAction?.call('photo'),
|
||||
label: 'Mark Complete',
|
||||
icon: Icons.check_circle,
|
||||
onPressed: () => widget.onAction?.call('complete'),
|
||||
isPrimary: true,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
// Note button
|
||||
if (widget.selectedDelivery!.delivered)
|
||||
Expanded(
|
||||
child: _buildBottomActionButton(
|
||||
label: 'Note',
|
||||
icon: Icons.note_add,
|
||||
onPressed: () => widget.onAction?.call('note'),
|
||||
label: _isInitializing ? 'Initializing...' : 'Start Navigation',
|
||||
icon: Icons.directions,
|
||||
onPressed: _isInitializing ? null : _startNavigation,
|
||||
isPrimary: true,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
// Completed button
|
||||
if (!_isNavigating && !widget.selectedDelivery!.delivered)
|
||||
const SizedBox(width: 12),
|
||||
if (!_isNavigating && !widget.selectedDelivery!.delivered)
|
||||
Expanded(
|
||||
child: _buildBottomActionButton(
|
||||
label: widget.selectedDelivery?.delivered == true ? 'Undo' : 'Completed',
|
||||
icon: widget.selectedDelivery?.delivered == true ? Icons.undo : Icons.check_circle,
|
||||
onPressed: widget.selectedDelivery != null
|
||||
? () => widget.onAction?.call(
|
||||
widget.selectedDelivery!.delivered ? 'uncomplete' : 'complete',
|
||||
)
|
||||
: null,
|
||||
isPrimary: widget.selectedDelivery != null && !widget.selectedDelivery!.delivered,
|
||||
label: _isStartingNavigation || _isInitializing ? 'Loading...' : 'Navigate',
|
||||
icon: Icons.directions,
|
||||
onPressed: _isStartingNavigation || _isInitializing ? null : _startNavigation,
|
||||
),
|
||||
),
|
||||
if (_isNavigating)
|
||||
const SizedBox(width: 12),
|
||||
if (_isNavigating)
|
||||
Expanded(
|
||||
child: _buildBottomActionButton(
|
||||
label: 'Stop',
|
||||
icon: Icons.stop,
|
||||
onPressed: _stopNavigation,
|
||||
isDanger: true,
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -503,12 +486,12 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
Color textColor = Colors.white;
|
||||
|
||||
if (isDanger) {
|
||||
backgroundColor = SvrntyColors.crimsonRed;
|
||||
backgroundColor = Colors.red.shade600;
|
||||
} else if (isPrimary) {
|
||||
backgroundColor = SvrntyColors.crimsonRed;
|
||||
} else {
|
||||
// Use the same slateGray as delivery list badges
|
||||
backgroundColor = SvrntyColors.slateGray;
|
||||
backgroundColor = Theme.of(context).colorScheme.surfaceContainerHighest;
|
||||
textColor = Theme.of(context).colorScheme.onSurface;
|
||||
}
|
||||
|
||||
// Reduce opacity when disabled
|
||||
@ -524,8 +507,8 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 14,
|
||||
vertical: 14,
|
||||
horizontal: 12,
|
||||
vertical: 12,
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
@ -534,15 +517,15 @@ class _DarkModeMapComponentState extends State<DarkModeMapComponent> {
|
||||
Icon(
|
||||
icon,
|
||||
color: textColor,
|
||||
size: 24,
|
||||
size: 18,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
const SizedBox(width: 6),
|
||||
Text(
|
||||
label,
|
||||
style: TextStyle(
|
||||
color: textColor,
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user