refactor: remove comunes-flutter dependency and inline components
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)
This commit is contained in:
parent
46305ee587
commit
2bf42ce262
31 changed files with 484 additions and 124 deletions
|
|
@ -1,12 +1,12 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:comunes_flutter/comunes_flutter.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 '../utils/widget_utils.dart';
|
||||
import 'fireMapState.dart';
|
||||
import 'fireNotification.dart';
|
||||
import 'user.dart';
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
part of 'appState.dart';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
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';
|
||||
import '../utils/widget_utils.dart';
|
||||
|
||||
part 'fireNotification.g.dart';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
part of 'fireNotification.dart';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:shared_preferences/src/shared_preferences_legacy.dart';
|
||||
|
||||
import '../globals.dart' as globals;
|
||||
|
|
@ -11,7 +10,8 @@ const String fireNotificationKey = 'fireNotifications';
|
|||
|
||||
Future<List<FireNotification>> loadFireNotifications() async {
|
||||
return globals.prefs.then((SharedPreferences prefs) {
|
||||
final List<String>? FireNotifications = prefs.getStringList(fireNotificationKey);
|
||||
final List<String>? FireNotifications =
|
||||
prefs.getStringList(fireNotificationKey);
|
||||
final List<FireNotification> persistedList = <FireNotification>[];
|
||||
for (final String notificationString in (FireNotifications ?? <String>[])) {
|
||||
final Map<String, dynamic> notificationMap =
|
||||
|
|
@ -26,7 +26,9 @@ void persistFireNotifications(List<FireNotification> notif) {
|
|||
// print('Persisting $notif');
|
||||
globals.prefs.then((SharedPreferences prefs) {
|
||||
final List<String> notifAsString = <String>[];
|
||||
notif.where(notNull).toList().forEach((FireNotification notification) {
|
||||
notif
|
||||
.whereType<FireNotification>()
|
||||
.forEach((FireNotification notification) {
|
||||
notifAsString.add(json.encode(notification.toJson()));
|
||||
});
|
||||
prefs.setStringList(fireNotificationKey, notifAsString);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@ class FiresApi {
|
|||
await _dio.post<Map<String, dynamic>>(url, data: params);
|
||||
if (response.statusCode == 200) {
|
||||
final Map<String, dynamic> data = response.data as Map<String, dynamic>;
|
||||
return data['data']['userId'] as String;
|
||||
final Map<String, dynamic> dataData =
|
||||
data['data'] as Map<String, dynamic>;
|
||||
return dataData['userId'] as String;
|
||||
} else {
|
||||
throw Exception('Unexpected error on create user');
|
||||
}
|
||||
|
|
@ -95,7 +97,9 @@ class FiresApi {
|
|||
await _dio.post<Map<String, dynamic>>(url, data: params);
|
||||
if (response.statusCode == 200) {
|
||||
final Map<String, dynamic> data = response.data as Map<String, dynamic>;
|
||||
return data['data']['subsId'] as String;
|
||||
final Map<String, dynamic> dataData =
|
||||
data['data'] as Map<String, dynamic>;
|
||||
return dataData['subsId'] as String;
|
||||
} else {
|
||||
throw Exception('Unexpected error on subscribe');
|
||||
}
|
||||
|
|
@ -168,10 +172,14 @@ class FiresApi {
|
|||
final Map<String, dynamic> resultDecoded =
|
||||
response.data as Map<String, dynamic>;
|
||||
final List<Polyline> union = <Polyline>[];
|
||||
final Map<String, dynamic> dataData =
|
||||
resultDecoded['data'] as Map<String, dynamic>;
|
||||
final Map<String, dynamic> unionData =
|
||||
dataData['union'] as Map<String, dynamic>;
|
||||
final String unionValue = unionData['value'] as String;
|
||||
final List<dynamic> multipolygon =
|
||||
(json.decode(resultDecoded['data']['union']['value'] as String)
|
||||
as Map<String, dynamic>)['geometry']['coordinates']
|
||||
as List<dynamic>;
|
||||
(json.decode(unionValue) as Map<String, dynamic>)['geometry']
|
||||
['coordinates'] as List<dynamic>;
|
||||
for (final dynamic polygonDynamic in multipolygon) {
|
||||
final List<dynamic> polygon = polygonDynamic as List<dynamic>;
|
||||
for (final dynamic holeDynamic in polygon) {
|
||||
|
|
@ -206,7 +214,11 @@ class FiresApi {
|
|||
final Response<dynamic> response = await _dio.post(url, data: params);
|
||||
if (response.statusCode == 200) {
|
||||
if (globals.isDevelopment) {
|
||||
print(response.data['data']['upsert']);
|
||||
final Map<String, dynamic> data =
|
||||
response.data as Map<String, dynamic>;
|
||||
final Map<String, dynamic> dataData =
|
||||
data['data'] as Map<String, dynamic>;
|
||||
print(dataData['upsert']);
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:meta/meta.dart';
|
||||
|
||||
import '../utils/widget_utils.dart';
|
||||
|
||||
@immutable
|
||||
class User {
|
||||
|
||||
const User({required this.userId, required this.lang, required this.token});
|
||||
|
||||
const User.initial()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
part of 'yourLocation.dart';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:comunes_flutter/comunes_flutter.dart';
|
||||
import 'package:shared_preferences/src/shared_preferences_legacy.dart';
|
||||
|
||||
import '../globals.dart' as globals;
|
||||
|
|
@ -26,7 +25,7 @@ void persistYourLocations(List<YourLocation> yl) {
|
|||
// debugPrint('Persisting $yl');
|
||||
globals.prefs.then((SharedPreferences prefs) {
|
||||
final List<String> ylAsString = <String>[];
|
||||
yl.where(notNull).toList().forEach((YourLocation location) {
|
||||
yl.whereType<YourLocation>().forEach((YourLocation location) {
|
||||
ylAsString.add(json.encode(location.toJson()));
|
||||
});
|
||||
prefs.setStringList(locationKey, ylAsString);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue