Implemented systematic type safety improvements across the codebase to eliminate all 78 strict analysis errors: ## Phase 1: Quick Wins (Redux & Model Fixes) - Added explicit type annotations to Redux reducer parameters - Fixed copyWith() methods in FireNotification and YourLocation models with proper nullable types - Fixed BasicLocation field initializers with type casts (num to double) - Fixed context parameter inference in IntroPage and PrivacyPage - Regenerated .g.dart files with build_runner ## Phase 2: JSON Deserialization - Fixed homePage.dart Firebase message parameter casting (9 errors) - Fixed firesApi.dart JSON parsing: - Added explicit casts for num to double/int conversions - Fixed array iteration with proper List<dynamic> casting - Added return type annotation to objectIdFromJson() - Fixed nested JSON access in getMonitoredAreas() - Fixed globalFiresBottomStats.dart dynamic to int/String casting - Fixed locationUtils.dart string assignments ## Phase 3: Config & Redux Middleware - Fixed mainCommon.dart config map access with explicit String casts - Fixed mainProd.dart Sentry DSN casting - Fixed fetchDataMiddleware.dart: - Added Store<AppState>, String type annotations to createUser() - Added Function(YourLocation) type to subscribeViaApi callback - Added Exception type to catchError handler - Fixed fireMapReducer.dart restoreStatusAfterSave parameter type - Fixed persist files with Map<String, dynamic> type annotations ## Phase 4: Edge Cases - Fixed slider.dart method return types (Widget sizeText, Widget warningText) - Fixed mainDrawer.dart Key? parameter type annotation Result: 78 errors → 0 errors
106 lines
2.9 KiB
Dart
106 lines
2.9 KiB
Dart
import 'package:comunes_flutter/comunes_flutter.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:json_annotation/json_annotation.dart';
|
|
import 'package:objectid/objectid.dart';
|
|
|
|
import '../objectIdUtils.dart';
|
|
|
|
part 'fireNotification.g.dart';
|
|
|
|
@JsonSerializable(nullable: false)
|
|
class FireNotification {
|
|
@JsonKey(toJson: objectIdToJson, fromJson: objectIdFromJson)
|
|
ObjectId id;
|
|
final double lat;
|
|
final double lon;
|
|
final String description;
|
|
final DateTime when;
|
|
final String sealed;
|
|
@JsonKey(toJson: objectIdToJson, fromJson: objectIdFromJson)
|
|
final ObjectId subsId;
|
|
final bool read;
|
|
|
|
factory FireNotification.fromJson(Map<String, dynamic> json) =>
|
|
_$FireNotificationFromJson(json);
|
|
|
|
FireNotification(
|
|
{required this.id,
|
|
required this.lat,
|
|
required this.lon,
|
|
required this.description,
|
|
required this.when,
|
|
required this.read,
|
|
required this.sealed,
|
|
required this.subsId}) {}
|
|
|
|
FireNotification copyWith(
|
|
{ObjectId? id,
|
|
double? lat,
|
|
double? lon,
|
|
String? description,
|
|
bool? read,
|
|
DateTime? when,
|
|
String? sealed,
|
|
ObjectId? subsId}) {
|
|
return new FireNotification(
|
|
id: id ?? this.id,
|
|
lat: lat ?? this.lat,
|
|
lon: lon ?? this.lon,
|
|
read: read ?? this.read,
|
|
description: description ?? this.description,
|
|
sealed: sealed ?? this.sealed,
|
|
subsId: subsId ?? this.subsId,
|
|
when: when ?? this.when);
|
|
}
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is FireNotification &&
|
|
runtimeType == other.runtimeType &&
|
|
id == other.id &&
|
|
lat == other.lat &&
|
|
lon == other.lon &&
|
|
read == other.read &&
|
|
description == other.description &&
|
|
sealed == other.sealed &&
|
|
subsId == other.subsId &&
|
|
when == other.when;
|
|
|
|
@override
|
|
int get hashCode =>
|
|
id.hashCode ^
|
|
lat.hashCode ^
|
|
lon.hashCode ^
|
|
description.hashCode ^
|
|
when.hashCode ^
|
|
read.hashCode ^
|
|
sealed.hashCode ^
|
|
subsId.hashCode;
|
|
|
|
@override
|
|
String toString() {
|
|
return 'FireNotification {id: $id, lat: $lat, lon: $lon, when: $when, read: $read, subsId: $subsId, sealed ${ellipse(sealed)}';
|
|
}
|
|
|
|
static final Map<String, Route<Null>> routes = <String, Route<Null>>{};
|
|
Map<String, dynamic> toJson() => _$FireNotificationToJson(this);
|
|
|
|
/*
|
|
Route<Null> getRoute(Store store) {
|
|
final String routeName = '/fire/${id}';
|
|
return routes.putIfAbsent(
|
|
routeName,
|
|
() => new MaterialPageRoute<Null>(
|
|
settings: new RouteSettings(name: routeName),
|
|
builder: (BuildContext context) {
|
|
store.dispatch(new ShowFireNotificationMapAction(this));
|
|
Navigator.push(
|
|
context,
|
|
new MaterialPageRoute(
|
|
builder: (context) => new genericMap()));
|
|
},
|
|
),
|
|
);
|
|
} */
|
|
}
|