Remove the external comunes-flutter library dependency and replace all its components with local implementations: - Utility functions: Created lib/utils/widget_utils.dart with compactWidgets() and ellipse() functions, replacing the comunes-flutter helpers with modern Dart null-safety patterns (whereType instead of where(notNull)) - Secret loader: Inlined as lib/utils/secret_loader.dart for loading JSON config - Layout widgets: Replaced CenteredRow/CenteredColumn with standard Row/Column with MainAxisAlignment.center - Intro screens: Copied AppIntroPage and MaterialAppWithIntro locally in lib/widgets/ with cleaned-up deprecated code patterns - Button widget: Created lib/widgets/rounded_btn.dart for the RoundedBtn used in activeFires.dart Changes span 20 files: - 5 new utility/widget files created - Updated imports in 15 files - Removed path dependency from pubspec.yaml - All functionality preserved, build verified with flutter pub get Impact: - Removes external dependency, simplifying project structure - Modern Dart patterns (proper null-safety) - Better code clarity with explicit widget properties - Easier onboarding (no 'what is comunes-flutter?' questions)
106 lines
2.9 KiB
Dart
106 lines
2.9 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:json_annotation/json_annotation.dart';
|
|
import 'package:objectid/objectid.dart';
|
|
|
|
import '../objectIdUtils.dart';
|
|
import '../utils/widget_utils.dart';
|
|
|
|
part 'fireNotification.g.dart';
|
|
|
|
@immutable
|
|
@JsonSerializable()
|
|
class FireNotification {
|
|
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});
|
|
|
|
factory FireNotification.fromJson(Map<String, dynamic> json) =>
|
|
_$FireNotificationFromJson(json);
|
|
@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;
|
|
|
|
FireNotification copyWith(
|
|
{ObjectId? id,
|
|
double? lat,
|
|
double? lon,
|
|
String? description,
|
|
bool? read,
|
|
DateTime? when,
|
|
String? sealed,
|
|
ObjectId? subsId}) {
|
|
return 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<void>> routes = <String, Route<void>>{};
|
|
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()));
|
|
},
|
|
),
|
|
);
|
|
} */
|
|
}
|