vjrj
1864e5b105
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
104 lines
3.7 KiB
Dart
104 lines
3.7 KiB
Dart
import 'package:redux/redux.dart';
|
|
import 'package:fires_flutter/models/yourLocation.dart';
|
|
import 'package:objectid/objectid.dart';
|
|
import '../models/fireMapState.dart';
|
|
import 'actions.dart';
|
|
|
|
final fireMapReducer = combineReducers<FireMapState>([
|
|
new TypedReducer<FireMapState, ShowYourLocationMapAction>(
|
|
_showYourLocationMap),
|
|
new TypedReducer<FireMapState, ShowFireNotificationMapAction>(
|
|
_showFireNotificationMap),
|
|
new TypedReducer<FireMapState, UpdateFireMapStatsAction>(
|
|
_updateYourLocationMapStats),
|
|
new TypedReducer<FireMapState, SubscribeAction>(_subscribeYourLocationMap),
|
|
new TypedReducer<FireMapState, SubscribeConfirmAction>(
|
|
_subscribeConfirmYourLocationMap),
|
|
new TypedReducer<FireMapState, UnSubscribeAction>(
|
|
_unsubscribeYourLocationMap),
|
|
new TypedReducer<FireMapState, EditYourLocationAction>(_editYourLocationMap),
|
|
new TypedReducer<FireMapState, EditConfirmYourLocationAction>(
|
|
_editConfirmYourLocationMap),
|
|
new TypedReducer<FireMapState, EditCancelYourLocationAction>(
|
|
_editCancelYourLocationMap),
|
|
new TypedReducer<FireMapState, SelectMapLayerAction>(_selectMapLayer),
|
|
new TypedReducer<FireMapState, UpdateYourLocationMapAction>(
|
|
_updateYourLocationMap)
|
|
]);
|
|
|
|
FireMapState _updateYourLocationMapStats(
|
|
FireMapState state, UpdateFireMapStatsAction action) {
|
|
return state.copyWith(
|
|
numFires: action.numFires,
|
|
fires: action.fires,
|
|
falsePos: action.falsePos,
|
|
industries: action.industries);
|
|
}
|
|
|
|
FireMapState _updateYourLocationMap(
|
|
FireMapState state, UpdateYourLocationMapAction action) {
|
|
return state.copyWith(yourLocation: action.loc);
|
|
}
|
|
|
|
FireMapState _showYourLocationMap(
|
|
FireMapState state, ShowYourLocationMapAction action) {
|
|
return state.copyWith(
|
|
status: action.loc.subscribed
|
|
? FireMapStatus.unsubscribe
|
|
: FireMapStatus.view,
|
|
yourLocation: action.loc,
|
|
fireNotication: null);
|
|
}
|
|
|
|
FireMapState _showFireNotificationMap(
|
|
FireMapState state, ShowFireNotificationMapAction action) {
|
|
// TODO: use here you real location?
|
|
YourLocation pseudoLoc = new YourLocation(
|
|
id: ObjectId(),
|
|
lat: action.notif.lat,
|
|
lon: action.notif.lon,
|
|
description: action.notif.description);
|
|
return state.copyWith(
|
|
status: FireMapStatus.viewFireNotification,
|
|
yourLocation: pseudoLoc,
|
|
fireNotication: action.notif);
|
|
}
|
|
|
|
FireMapState _subscribeYourLocationMap(
|
|
FireMapState state, SubscribeAction action) {
|
|
return state.copyWith(status: FireMapStatus.subscriptionConfirm);
|
|
}
|
|
|
|
FireMapState _subscribeConfirmYourLocationMap(
|
|
FireMapState state, SubscribeConfirmAction action) {
|
|
return state.copyWith(
|
|
status: FireMapStatus.unsubscribe, yourLocation: action.loc);
|
|
}
|
|
|
|
FireMapState _unsubscribeYourLocationMap(
|
|
FireMapState state, UnSubscribeAction action) {
|
|
return state.copyWith(status: FireMapStatus.view, yourLocation: action.loc);
|
|
}
|
|
|
|
FireMapState _editYourLocationMap(
|
|
FireMapState state, EditYourLocationAction action) {
|
|
return state.copyWith(status: FireMapStatus.edit);
|
|
}
|
|
|
|
FireMapState _editConfirmYourLocationMap(
|
|
FireMapState state, EditConfirmYourLocationAction action) {
|
|
return state.copyWith(status: restoreStatusAfterSave(action.loc));
|
|
}
|
|
|
|
FireMapState _editCancelYourLocationMap(
|
|
FireMapState state, EditCancelYourLocationAction action) {
|
|
return state.copyWith(
|
|
status: restoreStatusAfterSave(action.loc), yourLocation: action.loc);
|
|
}
|
|
|
|
FireMapStatus restoreStatusAfterSave(YourLocation loc) =>
|
|
loc.subscribed ? FireMapStatus.unsubscribe : FireMapStatus.view;
|
|
|
|
FireMapState _selectMapLayer(FireMapState state, SelectMapLayerAction action) {
|
|
return state.copyWith(layer: action.layer);
|
|
}
|