vjrj
a7f3ab6974
- Fix AppState: remove removed connectivity package, fix imports (latlong2), make nullable fields optional - Fix User model: use const empty strings in const constructor instead of null - Fix model builders: add required ObjectId parameters to YourLocation and FireNotification - Implement Comparable instead of extending it for BasicLocation - Fix nullable callback handling in appActions and middleware (Completer<Null>?) - Add null checks for BuildContext in dialogs (fireAlert, homePage, etc.) - Fix nullable scaffold state access using ?. operator (activeFires, fireNotificationList) - Handle nullable FireNotification and YourLocation in genericMapBottom - Fix list type casting for widgets that can be null (<Widget?> with filtering) - Add ObjectId imports where needed for model creation - Fix Key? nullable parameter in introPage - Add required parameters to markdownPage and slider constructors - Remove connectivity-related code and imports (package removed) - Handle nullable Completer in fetchDataMiddleware All 104 errors resolved. 0 errors, 61 warnings/info remaining.
123 lines
4.5 KiB
Dart
123 lines
4.5 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:comunes_flutter/comunes_flutter.dart';
|
|
import 'package:fires_flutter/models/fireNotification.dart';
|
|
import 'package:fires_flutter/models/yourLocation.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
import 'package:json_annotation/json_annotation.dart';
|
|
import 'package:latlong2/latlong.dart';
|
|
import 'package:meta/meta.dart';
|
|
|
|
import 'fireMapState.dart';
|
|
import 'user.dart';
|
|
|
|
export 'fireMapState.dart';
|
|
|
|
part 'appState.g.dart';
|
|
|
|
@immutable
|
|
@JsonSerializable(nullable: false)
|
|
class AppState {
|
|
@JsonKey(ignore: true)
|
|
final bool isLoading;
|
|
@JsonKey(ignore: true)
|
|
final bool isLoaded;
|
|
@JsonKey(ignore: true)
|
|
final String error;
|
|
@JsonKey(ignore: true)
|
|
final User user;
|
|
@JsonKey(ignore: true)
|
|
final String gmapKey;
|
|
@JsonKey(ignore: true)
|
|
final String serverUrl;
|
|
@JsonKey(ignore: true)
|
|
final String firesApiKey;
|
|
@JsonKey(ignore: true)
|
|
final String firesApiUrl;
|
|
final List<YourLocation> yourLocations;
|
|
final List<FireNotification> fireNotifications;
|
|
@JsonKey(ignore: true)
|
|
final List<Polyline> monitoredAreas;
|
|
@JsonKey(ignore: true)
|
|
final int fireNotificationsUnread;
|
|
@JsonKey(ignore: true)
|
|
final FireMapState fireMapState;
|
|
|
|
@JsonKey(ignore: true)
|
|
factory AppState.fromJson(Map<String, dynamic> json) =>
|
|
_$AppStateFromJson(json);
|
|
|
|
AppState(
|
|
{this.yourLocations = const <YourLocation>[],
|
|
this.fireNotifications = const <FireNotification>[],
|
|
this.fireNotificationsUnread = 0,
|
|
this.user = const User.initial(),
|
|
this.isLoading = false,
|
|
this.isLoaded = false,
|
|
this.error = '',
|
|
this.gmapKey = '',
|
|
this.firesApiKey = '',
|
|
this.firesApiUrl = '',
|
|
this.serverUrl = '',
|
|
this.monitoredAreas = const <Polyline>[],
|
|
this.fireMapState = const FireMapState.initial()});
|
|
|
|
AppState copyWith(
|
|
{bool? isLoading,
|
|
bool? isLoaded,
|
|
User? user,
|
|
String? error,
|
|
String? gmapKey,
|
|
String? firesApiKey,
|
|
String? serverUrl,
|
|
String? firesApiUrl,
|
|
List<YourLocation>? yourLocations,
|
|
List<FireNotification>? fireNotifications,
|
|
int? fireNotificationsUnread,
|
|
FireMapState? fireMapState,
|
|
List<Polyline>? monitoredAreas}) {
|
|
return new AppState(
|
|
isLoading: isLoading ?? this.isLoading,
|
|
isLoaded: isLoaded ?? this.isLoaded,
|
|
user: user ?? this.user,
|
|
error: error ?? this.error,
|
|
gmapKey: gmapKey ?? this.gmapKey,
|
|
firesApiKey: firesApiKey ?? this.firesApiKey,
|
|
firesApiUrl: firesApiUrl ?? this.firesApiUrl,
|
|
serverUrl: serverUrl ?? this.serverUrl,
|
|
yourLocations: yourLocations ?? this.yourLocations,
|
|
fireNotifications: fireNotifications ?? this.fireNotifications,
|
|
fireNotificationsUnread:
|
|
fireNotificationsUnread ?? this.fireNotificationsUnread,
|
|
monitoredAreas: monitoredAreas ?? this.monitoredAreas,
|
|
fireMapState: fireMapState ?? this.fireMapState);
|
|
}
|
|
|
|
@override
|
|
String toString() {
|
|
return 'AppState{\nuser: $user\nisLoading: $isLoading\nisLoaded: $isLoaded\napiKey: ${ellipse(firesApiKey, 8)}\napiUrl: $firesApiUrl\nserverUrl: $serverUrl\nfireMapState: $fireMapState\nyourLocations count: ${yourLocations.length}\nunread notif: $fireNotificationsUnread\nfireNotifications: $fireNotifications\nyourLocations: $yourLocations}';
|
|
}
|
|
}
|
|
|
|
typedef void AddYourLocationFunction(YourLocation loc);
|
|
typedef void DeleteYourLocationFunction(YourLocation loc);
|
|
typedef void OnRefreshYourLocationsFunction(Completer<Null> callback);
|
|
typedef void ToggleSubscriptionFunction(YourLocation loc);
|
|
typedef void OnLocationTapFunction(YourLocation loc);
|
|
typedef void OnSubscribeFunction(YourLocation loc);
|
|
typedef void OnSubscribeDistanceChangeFunction(YourLocation loc);
|
|
typedef void OnUnSubscribeFunction(YourLocation loc);
|
|
typedef void OnSubscribeConfirmedFunction(YourLocation loc);
|
|
typedef void OnLocationEdit(YourLocation loc);
|
|
typedef void OnLocationEditing(YourLocation loc);
|
|
typedef void OnLocationEditConfirm(YourLocation loc);
|
|
typedef void OnLocationEditCancel(YourLocation loc);
|
|
typedef void TapFireNotificationFunction(FireNotification notif);
|
|
typedef void OnFirePressedInMap(LatLng latLng, DateTime when, String source);
|
|
// typedef void OnReceivedFireNotificationFunction(FireNotification notif);
|
|
typedef void DeleteFireNotificationFunction(FireNotification notif);
|
|
typedef void DeleteAllFireNotificationFunction();
|
|
|
|
// unused
|
|
// typedef void UpdateYourLocationFunction(ObjectId id, YourLocation loc);
|