vjrj
eb0d19621c
- Updated Android build files: gradle plugin 8.2.2, gradle 8.3, SDK 34, minSdk 21 - Ran dart fix --apply for 87 automatic null-safety fixes - Migrated flutter_map v6 API breaking changes: - MapOptions: center → initialCenter, zoom → initialZoom - layers → children structure - TileLayerOptions/MarkerLayerOptions/PolylineLayerOptions → TileLayer/MarkerLayer/PolylineLayer - Removed plugin_api.dart imports - Converted old plugin system (ZoomMapPlugin, AttributionPlugin, etc.) to direct widgets - Updated onTap callback signature: (TapPosition) → (TapPosition, LatLng) - Migrated all marker/polyline creation to v6 API - Fixed FlatButton → TextButton deprecation - Fixed stackTrace access with catch(e, stackTrace) pattern - Removed deprecated flutter_google_places_autocomplete dependency - Removed deprecated dependencies: latlong, connectivity, launch_review - Updated all imports from latlong → latlong2 - Placeholder implementation for places autocomplete (feature temporarily disabled) Remaining tasks (non-blocking for build): - Complete null-safety fixes for _location variables in genericMap.dart - Fix theme.dart MaterialTheme parameter issues - Fix customStepper.dart null-safety issues - Final build and testing
97 lines
2.8 KiB
Dart
97 lines
2.8 KiB
Dart
import 'package:fires_flutter/models/fireNotification.dart';
|
|
import 'package:fires_flutter/models/yourLocation.dart';
|
|
import 'package:meta/meta.dart';
|
|
|
|
enum FireMapStatus {
|
|
view,
|
|
subscriptionConfirm,
|
|
unsubscribe,
|
|
edit,
|
|
viewFireNotification
|
|
}
|
|
enum FireMapLayer { osmcGrey, esriSatellite, osmc, esri, esriTerrain }
|
|
|
|
@immutable
|
|
class FireMapState {
|
|
final FireMapStatus status;
|
|
final FireMapLayer layer;
|
|
final int numFires;
|
|
final FireNotification fireNotification;
|
|
final List<dynamic> fires;
|
|
final List<dynamic> falsePos;
|
|
final List<dynamic> industries;
|
|
final YourLocation yourLocation;
|
|
|
|
const FireMapState.initial()
|
|
: this.status = FireMapStatus.view,
|
|
this.layer = FireMapLayer.osmcGrey,
|
|
this.yourLocation = null,
|
|
this.fireNotification = null,
|
|
this.numFires = 0,
|
|
this.fires = const [],
|
|
this.falsePos = const [],
|
|
this.industries = const [];
|
|
|
|
FireMapState(
|
|
{this.status = FireMapStatus.view,
|
|
this.layer =FireMapLayer.osmcGrey,
|
|
this.yourLocation,
|
|
this.numFires,
|
|
this.fires,
|
|
this.fireNotification,
|
|
this.falsePos,
|
|
this.industries});
|
|
|
|
FireMapState copyWith({
|
|
FireMapStatus status,
|
|
FireMapLayer layer,
|
|
YourLocation yourLocation,
|
|
FireNotification fireNotication,
|
|
int numFires,
|
|
List<dynamic> fires,
|
|
List<dynamic> falsePos,
|
|
List<dynamic> industries,
|
|
}) {
|
|
return new FireMapState(
|
|
yourLocation: yourLocation ?? this.yourLocation,
|
|
fireNotification: fireNotication ?? this.fireNotification,
|
|
numFires: numFires ?? this.numFires,
|
|
fires: fires ?? this.fires,
|
|
falsePos: falsePos ?? this.falsePos,
|
|
industries: industries ?? this.industries,
|
|
layer: layer ?? this.layer,
|
|
status: status ?? this.status);
|
|
}
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is FireMapState &&
|
|
runtimeType == other.runtimeType &&
|
|
status == other.status &&
|
|
layer == other.layer &&
|
|
numFires == other.numFires &&
|
|
fireNotification == other.fireNotification &&
|
|
fires == other.fires &&
|
|
falsePos == other.falsePos &&
|
|
industries == other.industries &&
|
|
yourLocation == other.yourLocation;
|
|
|
|
@override
|
|
int get hashCode =>
|
|
status.hashCode ^
|
|
layer.hashCode ^
|
|
numFires.hashCode ^
|
|
fireNotification.hashCode ^
|
|
fires.hashCode ^
|
|
falsePos.hashCode ^
|
|
industries.hashCode ^
|
|
yourLocation.hashCode;
|
|
|
|
@override
|
|
String toString() {
|
|
return 'FireMapState{status: $status, layer: $layer, numFires: $numFires, fires: ${fires
|
|
.length}, falsePos: ${falsePos.length}, industries: ${industries
|
|
.length}, yourLocation: $yourLocation, fireNotification: $fireNotification}';
|
|
}
|
|
}
|