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
3.6 KiB
Dart
97 lines
3.6 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
import 'package:flutter_redux/flutter_redux.dart';
|
|
import 'package:latlong2/latlong.dart';
|
|
|
|
import 'colors.dart';
|
|
import 'customBottomAppBar.dart';
|
|
import 'generated/i18n.dart';
|
|
import 'mainDrawer.dart';
|
|
import 'models/appState.dart';
|
|
import 'firesSpinner.dart';
|
|
|
|
class _ViewModel {
|
|
List<Polyline> monitoredAreas;
|
|
|
|
_ViewModel(this.monitoredAreas);
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is _ViewModel &&
|
|
runtimeType == other.runtimeType &&
|
|
monitoredAreas == other.monitoredAreas;
|
|
|
|
@override
|
|
int get hashCode => monitoredAreas.hashCode;
|
|
}
|
|
|
|
class MonitoredAreasPage extends StatelessWidget {
|
|
static const String routeName = "monitoredAreasMap";
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return new StoreConnector<AppState, _ViewModel>(
|
|
distinct: true,
|
|
converter: (store) {
|
|
return new _ViewModel(store.state.monitoredAreas);
|
|
},
|
|
builder: (context, view) {
|
|
return new Scaffold(
|
|
appBar:
|
|
new AppBar(title: new Text(S.of(context).monitoredAreasTitle)),
|
|
drawer: new MainDrawer(context, MonitoredAreasPage.routeName),
|
|
bottomNavigationBar: new CustomBottomAppBar(
|
|
fabLocation: FloatingActionButtonLocation.centerDocked,
|
|
showNotch: true,
|
|
color: fires100,
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
actions: <Widget>[
|
|
new Flexible(
|
|
child: new Padding(
|
|
padding: new EdgeInsets.only(left: 10.0, right: 10.0),
|
|
child: new Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
children: [
|
|
new Text(S.of(context).mapPrivacy,
|
|
style: new TextStyle(
|
|
fontStyle: FontStyle.italic,
|
|
color: Colors.black38))
|
|
])))
|
|
]),
|
|
body: !(view.monitoredAreas is List)
|
|
? new FiresSpinner()
|
|
: new Padding(
|
|
padding: new EdgeInsets.all(10.0),
|
|
child: new Column(
|
|
children: [
|
|
new Padding(
|
|
padding: new EdgeInsets.only(
|
|
top: 8.0, bottom: 8.0, left: 0.0, right: 0.0),
|
|
child: new Text(S.of(context).inGreenMonitoredAreas),
|
|
),
|
|
new Flexible(
|
|
child: new FlutterMap(
|
|
options: new MapOptions(
|
|
initialCenter: new LatLng(53.5775, 3.106111),
|
|
initialZoom: 1.0,
|
|
),
|
|
children: [
|
|
new TileLayer(
|
|
urlTemplate:
|
|
"https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png",
|
|
subdomains: ['a', 'b', 'c']),
|
|
new PolylineLayer(
|
|
polylines: view.monitoredAreas,
|
|
)
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
});
|
|
}
|
|
}
|