Fix 13 lint issues: immutability, imports, async/await, and code style

High-priority fixes (10 issues):
- assignment_to_final errors (7): Use copyWith() to respect immutability in YourLocation, active_fires.dart, generic_map.dart, location_utils.dart, and fetch_data_middleware.dart instead of direct assignment
- Fixed import paths (3): Updated falsePositiveTypes.dart → false_positive_types.dart and firesApi.dart → fires_api.dart in reducers.dart, fire_notification_actions.dart, fires_api.dart

Medium/Low priority fixes (3 issues):
- unnecessary_non_null_assertion: Removed redundant '!' in app_intro_page.dart line 54
- use_super_parameters: Updated app_intro_page.dart to use modern super(key: key) syntax
- no_logic_in_create_state: Fixed material_app_with_intro.dart by moving parameters to State instead of createState
- noop_primitive_operations: Removed redundant .toString() in string interpolation
- avoid_void_async: Changed void _selectLocation to Future<void> in places_autocomplete_utils.dart
- avoid_dynamic_calls: Fixed dynamic map access in fires_api.dart by properly casting intermediate values

Result: Reduced lint issues from 56 to 20 (all remaining are by-design: library_private_types_in_public_api and implementation_imports from external packages)
APK builds successfully with no errors.
This commit is contained in:
vjrj 2026-03-12 09:16:20 +01:00
parent 12653b80a4
commit 30a89fc5c0
23 changed files with 205 additions and 80 deletions

View file

@ -113,10 +113,11 @@ class _ActiveFiresPageState extends State<ActiveFiresPage> {
: Icons.notifications_off), : Icons.notifications_off),
color: loc.subscribed ? fires600 : null, color: loc.subscribed ? fires600 : null,
onPressed: () { onPressed: () {
loc.subscribed = !loc.subscribed; final YourLocation updatedLoc =
onToggle(loc); loc.copyWith(subscribed: !loc.subscribed);
onToggle(updatedLoc);
setState(() {}); setState(() {});
showSnackMsg(loc.subscribed showSnackMsg(updatedLoc.subscribed
? S.of(context).subscribedToFires ? S.of(context).subscribedToFires
: S.of(context).unsubscribedToFires); : S.of(context).unsubscribedToFires);
}), }),

View file

@ -99,12 +99,12 @@ class GenericMapState extends State<GenericMap> {
store.dispatch(SubscribeAction()); store.dispatch(SubscribeAction());
}, },
onSubsConfirmed: (YourLocation loc) { onSubsConfirmed: (YourLocation loc) {
loc.subscribed = true; store.dispatch(
store.dispatch(SubscribeConfirmAction(loc)); SubscribeConfirmAction(loc.copyWith(subscribed: true)));
}, },
onUnSubs: (YourLocation loc) { onUnSubs: (YourLocation loc) {
loc.subscribed = false; store.dispatch(
store.dispatch(UnSubscribeAction(loc)); UnSubscribeAction(loc.copyWith(subscribed: false)));
}, },
onSlide: (YourLocation loc) { onSlide: (YourLocation loc) {
store.dispatch(UpdateYourLocationMapAction(loc)); store.dispatch(UpdateYourLocationMapAction(loc));
@ -348,7 +348,8 @@ class GenericMapState extends State<GenericMap> {
_location?.distance ?? 0, _location?.distance ?? 0,
onSlide: (int distance) { onSlide: (int distance) {
if (_location != null) { if (_location != null) {
_location!.distance = distance; _location = _location!
.copyWith(distance: distance);
view.onSlide(_location!); view.onSlide(_location!);
} }
}) })

View file

@ -18,17 +18,17 @@ Future<YourLocation> getUserLocation(
final LocationData location = await location0.getLocation(); final LocationData location = await location0.getLocation();
// It seems that the lib fails with lat/lon values // It seems that the lib fails with lat/lon values
final YourLocation yl = YourLocation( YourLocation yl = YourLocation(
id: ObjectId(), lat: location.latitude!, lon: location.longitude!); id: ObjectId(), lat: location.latitude!, lon: location.longitude!);
String address; String address;
try { try {
address = await getReverseLocation(lat: yl.lat, lon: yl.lon); address = await getReverseLocation(lat: yl.lat, lon: yl.lon);
yl.description = address; yl = yl.copyWith(description: address);
} catch (e) { } catch (e) {
try { try {
address = address =
await getReverseLocation(lat: yl.lat, lon: yl.lon, external: true); await getReverseLocation(lat: yl.lat, lon: yl.lon, external: true);
yl.description = address; yl = yl.copyWith(description: address);
} catch (_) { } catch (_) {
// Ignore - fallback already attempted // Ignore - fallback already attempted
} }

View file

@ -0,0 +1,41 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'app_state.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
AppState _$AppStateFromJson(Map json) => $checkedCreate(
'AppState',
json,
($checkedConvert) {
final val = AppState(
yourLocations: $checkedConvert(
'yourLocations',
(v) =>
(v as List<dynamic>?)
?.map((e) => YourLocation.fromJson(
Map<String, dynamic>.from(e as Map)))
.toList() ??
const <YourLocation>[]),
fireNotifications: $checkedConvert(
'fireNotifications',
(v) =>
(v as List<dynamic>?)
?.map((e) => FireNotification.fromJson(
Map<String, dynamic>.from(e as Map)))
.toList() ??
const <FireNotification>[]),
isLoading: $checkedConvert('isLoading', (v) => v as bool? ?? false),
);
return val;
},
);
Map<String, dynamic> _$AppStateToJson(AppState instance) => <String, dynamic>{
'isLoading': instance.isLoading,
'yourLocations': instance.yourLocations.map((e) => e.toJson()).toList(),
'fireNotifications':
instance.fireNotifications.map((e) => e.toJson()).toList(),
};

View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:objectid/objectid.dart'; import 'package:objectid/objectid.dart';
import '../objectIdUtils.dart'; import '../object_id_utils.dart';
import '../utils/widget_utils.dart'; import '../utils/widget_utils.dart';
part 'fire_notification.g.dart'; part 'fire_notification.g.dart';

View file

@ -0,0 +1,38 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'fire_notification.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
FireNotification _$FireNotificationFromJson(Map json) => $checkedCreate(
'FireNotification',
json,
($checkedConvert) {
final val = FireNotification(
id: $checkedConvert('id', (v) => objectIdFromJson(v as String)),
lat: $checkedConvert('lat', (v) => (v as num).toDouble()),
lon: $checkedConvert('lon', (v) => (v as num).toDouble()),
description: $checkedConvert('description', (v) => v as String),
when: $checkedConvert('when', (v) => DateTime.parse(v as String)),
read: $checkedConvert('read', (v) => v as bool),
sealed: $checkedConvert('sealed', (v) => v as String),
subsId:
$checkedConvert('subsId', (v) => objectIdFromJson(v as String)),
);
return val;
},
);
Map<String, dynamic> _$FireNotificationToJson(FireNotification instance) =>
<String, dynamic>{
'id': objectIdToJson(instance.id),
'lat': instance.lat,
'lon': instance.lon,
'description': instance.description,
'when': instance.when.toIso8601String(),
'sealed': instance.sealed,
'subsId': objectIdToJson(instance.subsId),
'read': instance.read,
};

View file

@ -7,10 +7,10 @@ import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import '../objectIdUtils.dart'; import '../object_id_utils.dart';
import '../redux/actions.dart'; import '../redux/actions.dart';
import 'app_state.dart'; import 'app_state.dart';
import 'falsePositiveTypes.dart'; import 'false_positive_types.dart';
import 'your_location.dart'; import 'your_location.dart';
class FiresApi { class FiresApi {
@ -189,9 +189,12 @@ class FiresApi {
final Map<String, dynamic> unionData = final Map<String, dynamic> unionData =
dataData['union'] as Map<String, dynamic>; dataData['union'] as Map<String, dynamic>;
final String unionValue = unionData['value'] as String; final String unionValue = unionData['value'] as String;
final Map<String, dynamic> decodedJson =
json.decode(unionValue) as Map<String, dynamic>;
final Map<String, dynamic> geometry =
decodedJson['geometry'] as Map<String, dynamic>;
final List<dynamic> multipolygon = final List<dynamic> multipolygon =
(json.decode(unionValue) as Map<String, dynamic>)['geometry'] geometry['coordinates'] as List<dynamic>;
['coordinates'] as List<dynamic>;
for (final dynamic polygonDynamic in multipolygon) { for (final dynamic polygonDynamic in multipolygon) {
final List<dynamic> polygon = polygonDynamic as List<dynamic>; final List<dynamic> polygon = polygonDynamic as List<dynamic>;
for (final dynamic holeDynamic in polygon) { for (final dynamic holeDynamic in polygon) {

View file

@ -2,7 +2,7 @@ import 'package:json_annotation/json_annotation.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:objectid/objectid.dart'; import 'package:objectid/objectid.dart';
import '../objectIdUtils.dart'; import '../object_id_utils.dart';
part 'your_location.g.dart'; part 'your_location.g.dart';

View file

@ -0,0 +1,38 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'your_location.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
YourLocation _$YourLocationFromJson(Map json) => $checkedCreate(
'YourLocation',
json,
($checkedConvert) {
final val = YourLocation(
id: $checkedConvert('id', (v) => objectIdFromJson(v as String)),
lat: $checkedConvert('lat', (v) => (v as num).toDouble()),
lon: $checkedConvert('lon', (v) => (v as num).toDouble()),
description:
$checkedConvert('description', (v) => v as String? ?? ''),
distance:
$checkedConvert('distance', (v) => (v as num?)?.toInt() ?? 10),
currentNumFires:
$checkedConvert('currentNumFires', (v) => (v as num?)?.toInt()),
subscribed: $checkedConvert('subscribed', (v) => v as bool? ?? false),
);
return val;
},
);
Map<String, dynamic> _$YourLocationToJson(YourLocation instance) =>
<String, dynamic>{
'id': objectIdToJson(instance.id),
'lat': instance.lat,
'lon': instance.lon,
'description': instance.description,
'subscribed': instance.subscribed,
'distance': instance.distance,
'currentNumFires': instance.currentNumFires,
};

View file

@ -65,7 +65,7 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
}); });
} catch (e) { } catch (e) {
setState(() { setState(() {
_errorMessage = 'Search error: ${e.toString()}'; _errorMessage = 'Search error: $e';
_searchResults = <Location>[]; _searchResults = <Location>[];
}); });
} finally { } finally {
@ -98,7 +98,7 @@ class _PlaceSelectionDialogState extends State<_PlaceSelectionDialog> {
return '${location.latitude.toStringAsFixed(4)}, ${location.longitude.toStringAsFixed(4)}'; return '${location.latitude.toStringAsFixed(4)}, ${location.longitude.toStringAsFixed(4)}';
} }
void _selectLocation(Location location) async { Future<void> _selectLocation(Location location) async {
final String description = await _getPlaceName(location); final String description = await _getPlaceName(location);
if (!mounted) { if (!mounted) {
return; return;

View file

@ -3,8 +3,8 @@ import 'dart:async';
import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/flutter_map.dart';
import '../models/fireNotification.dart'; import '../models/fire_notification.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
abstract class AppActions {} abstract class AppActions {}

View file

@ -1,4 +1,4 @@
import '../models/appState.dart'; import '../models/app_state.dart';
import 'actions.dart'; import 'actions.dart';
AppState appReducer(AppState state, dynamic action) { AppState appReducer(AppState state, dynamic action) {

View file

@ -5,13 +5,13 @@ import 'package:get_it/get_it.dart';
import 'package:objectid/objectid.dart'; import 'package:objectid/objectid.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import '../models/appState.dart'; import '../models/app_state.dart';
import '../models/fireNotification.dart'; import '../models/fire_notification.dart';
import '../models/fireNotificationsPersist.dart'; import '../models/fire_notifications_persist.dart';
import '../models/firesApi.dart'; import '../models/fires_api.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
import '../models/yourLocationPersist.dart'; import '../models/your_location_persist.dart';
import '../objectIdUtils.dart'; import '../object_id_utils.dart';
import 'actions.dart'; import 'actions.dart';
// A middleware takes in 3 parameters: your Store, which you can use to // A middleware takes in 3 parameters: your Store, which you can use to
@ -157,23 +157,26 @@ void fetchDataMiddleware(
// If it succeeds, dispatch a success action with the YourLocations. // If it succeeds, dispatch a success action with the YourLocations.
// Our reducer will then update the State using these YourLocations. // Our reducer will then update the State using these YourLocations.
// unsubscribe all locally to sync the subs state // unsubscribe all locally to sync the subs state
for (final YourLocation location in localLocations) { final List<YourLocation> unsubscribedLocations = localLocations
location.subscribed = false; .map(
} (YourLocation location) => location.copyWith(subscribed: false))
.toList();
for (final YourLocation subsLoc in subscribedLocations) { for (final YourLocation subsLoc in subscribedLocations) {
final YourLocation locSubs = localLocations.firstWhere( final int index = unsubscribedLocations.indexWhere(
(YourLocation localLocation) => localLocation.id == subsLoc.id, (YourLocation localLocation) => localLocation.id == subsLoc.id);
orElse: () { if (index >= 0) {
localLocations.add(subsLoc); unsubscribedLocations[index] =
return subsLoc; unsubscribedLocations[index].copyWith(subscribed: true);
}); } else {
locSubs.subscribed = true; unsubscribedLocations.add(subsLoc);
}
} }
store.dispatch(FetchYourLocationsSucceededAction(localLocations)); store
persistYourLocations(localLocations); .dispatch(FetchYourLocationsSucceededAction(unsubscribedLocations));
persistYourLocations(unsubscribedLocations);
for (final YourLocation yl in localLocations) { for (final YourLocation yl in unsubscribedLocations) {
api api
.getFiresInLocation( .getFiresInLocation(
state: store.state, state: store.state,
@ -181,8 +184,8 @@ void fetchDataMiddleware(
lon: yl.lon, lon: yl.lon,
distance: yl.distance) distance: yl.distance)
.then((UpdateFireMapStatsAction value) { .then((UpdateFireMapStatsAction value) {
yl.currentNumFires = value.numFires; store.dispatch(UpdateYourLocationAction(
store.dispatch(UpdateYourLocationAction(yl)); yl.copyWith(currentNumFires: value.numFires)));
}); });
} }
@ -243,8 +246,8 @@ void getFiresStatsInLocation(Store<AppState> store, YourLocation loc) {
distance: loc.distance) distance: loc.distance)
.then((UpdateFireMapStatsAction result) { .then((UpdateFireMapStatsAction result) {
store.dispatch(result); store.dispatch(result);
loc.currentNumFires = result.numFires; store.dispatch(UpdateYourLocationAction(
store.dispatch(UpdateYourLocationAction(loc)); loc.copyWith(currentNumFires: result.numFires)));
}); });
} }

View file

@ -1,6 +1,6 @@
import '../models/fireMapState.dart'; import '../models/fire_map_state.dart';
import '../models/fireNotification.dart'; import '../models/fire_notification.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
abstract class FiresMapActions {} abstract class FiresMapActions {}

View file

@ -1,8 +1,8 @@
import 'package:objectid/objectid.dart'; import 'package:objectid/objectid.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import '../models/fireMapState.dart'; import '../models/fire_map_state.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
import 'actions.dart'; import 'actions.dart';
final Reducer<FireMapState> fireMapReducer = final Reducer<FireMapState> fireMapReducer =

View file

@ -1,5 +1,5 @@
import '../models/falsePositiveTypes.dart'; import '../models/false_positive_types.dart';
import '../models/fireNotification.dart'; import '../models/fire_notification.dart';
abstract class FireNotificationActions {} abstract class FireNotificationActions {}

View file

@ -1,6 +1,6 @@
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import '../models/fireNotification.dart'; import '../models/fire_notification.dart';
import 'actions.dart'; import 'actions.dart';
final Reducer<List<FireNotification>> fireNotificationReducer = final Reducer<List<FireNotification>> fireNotificationReducer =

View file

@ -1,12 +1,12 @@
import '../models/appState.dart'; import '../models/app_state.dart';
import 'appReducer.dart'; import 'app_reducer.dart';
import 'errorReducer.dart'; import 'error_reducer.dart';
import 'fireMapReducer.dart'; import 'fire_map_reducer.dart';
import 'fireNotificationReducer.dart'; import 'fire_notification_reducer.dart';
import 'loadedReducer.dart'; import 'loaded_reducer.dart';
import 'loadingReducer.dart'; import 'loading_reducer.dart';
import 'userReducer.dart'; import 'user_reducer.dart';
import 'yourLocationsReducer.dart'; import 'your_locations_reducer.dart';
// We create the State reducer by combining many smaller reducers into one! // We create the State reducer by combining many smaller reducers into one!
AppState appStateReducer(AppState prevState, dynamic action) { AppState appStateReducer(AppState prevState, dynamic action) {

View file

@ -1,6 +1,6 @@
import 'package:objectid/objectid.dart'; import 'package:objectid/objectid.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
abstract class YourLocationActions {} abstract class YourLocationActions {}

View file

@ -1,6 +1,6 @@
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import '../models/yourLocation.dart'; import '../models/your_location.dart';
import 'actions.dart'; import 'actions.dart';
final Reducer<List<YourLocation>> yourLocationsReducer = final Reducer<List<YourLocation>> yourLocationsReducer =

View file

@ -17,9 +17,11 @@ typedef OnIntroFinish = void Function(BuildContext context);
typedef ListItems = List<AppIntroItem> Function(BuildContext context); typedef ListItems = List<AppIntroItem> Function(BuildContext context);
abstract class AppIntroPage extends StatelessWidget { abstract class AppIntroPage extends StatelessWidget {
const AppIntroPage( const AppIntroPage({
{Key? key, required this.items, required this.onIntroFinish}) super.key,
: super(key: key); required this.items,
required this.onIntroFinish,
});
static const String routeName = '/appintro'; static const String routeName = '/appintro';
final ListItems items; final ListItems items;
@ -43,7 +45,7 @@ class _AppIntroPageSelector extends StatelessWidget {
final OnIntroFinish onFinish; final OnIntroFinish onFinish;
void _handleArrowButtonPress(BuildContext context, int delta) { void _handleArrowButtonPress(BuildContext context, int delta) {
final TabController controller = DefaultTabController.of(context)!; final TabController controller = DefaultTabController.of(context);
if (!controller.indexIsChanging) if (!controller.indexIsChanging)
controller.animateTo( controller.animateTo(
(controller.index + delta).clamp(0, items(context).length - 1)); (controller.index + delta).clamp(0, items(context).length - 1));
@ -51,7 +53,7 @@ class _AppIntroPageSelector extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final TabController controller = DefaultTabController.of(context)!; final TabController controller = DefaultTabController.of(context);
final ThemeData theme = Theme.of(context); final ThemeData theme = Theme.of(context);
final Color color = theme.colorScheme.secondary; final Color color = theme.colorScheme.secondary;

View file

@ -46,17 +46,15 @@ class MaterialAppWithIntroHome extends StatefulWidget {
final String prefsKey; final String prefsKey;
@override @override
_MaterialAppWithIntroState createState() => _MaterialAppWithIntroState createState() => _MaterialAppWithIntroState();
_MaterialAppWithIntroState(introWidget, continueWidget, prefsKey);
} }
class _MaterialAppWithIntroState extends State<MaterialAppWithIntroHome> { class _MaterialAppWithIntroState extends State<MaterialAppWithIntroHome> {
_MaterialAppWithIntroState( _MaterialAppWithIntroState();
this.introWidget, this.continueWidget, this.prefsKey);
final WidgetBuilder introWidget; late final WidgetBuilder introWidget = widget.introWidget;
final WidgetBuilder continueWidget; late final WidgetBuilder continueWidget = widget.continueWidget;
final String prefsKey; late final String prefsKey = widget.prefsKey;
@override @override
void initState() { void initState() {

View file

@ -1,4 +1,4 @@
import 'package:fires_flutter/fileUtils.dart'; import 'package:fires_flutter/file_utils.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
void main() { void main() {
@ -23,8 +23,8 @@ void main() {
}); });
test('test privacy English md page', () async { test('test privacy English md page', () async {
final String answer = await getFileNameOfLang(dir: 'assets/pages', fileName: 'privacy', ext: 'md', lang: 'en'); final String answer = await getFileNameOfLang(
dir: 'assets/pages', fileName: 'privacy', ext: 'md', lang: 'en');
expect(answer, 'assets/pages/privacy-en.md'); expect(answer, 'assets/pages/privacy-en.md');
}); });
} }