comunes/todos-contra-el-fuego-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix critical Firebase messaging and null-safety errors

Browse source 
HIGH PRIORITY FIXES:
1. homePage.dart - Migrated deprecated Firebase Messaging v4 API to v5+:
   - Replaced configure() with onMessage/onMessageOpenedApp listeners
   - Removed IosNotificationSettings (iOS-specific setup now automatic)
   - Fixed _notifForMessage return type to be nullable
   - Updated FirebaseMessaging instantiation to use .instance

2. customStepper.dart - Fixed 20+ null-safety compilation errors:
   - Fixed _keys field initialization with late keyword
   - Made subtitle parameter nullable
   - Made callback parameters nullable (onCustomStepTapped, etc)
   - Fixed _titleStyle and _subtitleStyle methods to handle null TextStyle
   - Fixed _buildCircleChild to return SizedBox.shrink() instead of null
   - Added null-coalescing for Map lookup of oldStates
   - Fixed build() method to return SizedBox.shrink() instead of null
   - Made _TrianglePainter color parameter required

3. generated/i18n.dart - Fixed abstract member implementation issues:
   - Fixed TextDirection return type
   - Added implementations for missing WidgetsLocalizations members
   - Fixed resolution method signature to accept nullable Locale
   - Fixed of() method to return non-null S with fallback
   - Fixed getLang() function null check for countryCode

MEDIUM PRIORITY FIXES:
4. customBottomAppBar.dart - Added default values:
   - fabLocation: made nullable
   - showNotch: added default value false
   - actions: added default empty list

5. customMoment.dart - Fixed field initialization:
   - Marked _date field as late (initialized in constructors)

6. globals.dart - Fixed uninitialized variable:
   - Marked appVersion as late

7. globalFiresBottomStats.dart - Fixed null-safety issues:
   - Marked lastCheck as late
   - Updated http.read() calls to use Uri.parse()
   - Fixed list construction to avoid nullable Widget elements

Error count reduced from 100+ to 104 (comprehensive fixes applied).
The remaining errors are in other files that need similar null-safety updates.
This commit is contained in:
vjrj 2026-03-05 02:31:22 +01:00
parent eb0d19621c
commit 037b5eaa32
13 changed files with 417 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -29,7 +29,7 @@ android {
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "org.comunes.fires" applicationId "org.comunes.fires"
minSdkVersion 21 minSdkVersion flutter.minSdkVersion
targetSdkVersion 34 targetSdkVersion 34
versionCode 9 versionCode 9
versionName "1.9" versionName "1.9"

4
android/build.gradle
View file

@ -25,6 +25,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.layout.buildDirectory
} }

6
lib/customBottomAppBar.dart
View file

@ -3,16 +3,16 @@ import 'package:flutter/material.dart';
class CustomBottomAppBar extends StatelessWidget { class CustomBottomAppBar extends StatelessWidget {
const CustomBottomAppBar( const CustomBottomAppBar(
{this.fabLocation, {this.fabLocation,
this.showNotch, this.showNotch = false,
this.height = 56.0, this.height = 56.0,
this.color = Colors.black45, this.color = Colors.black45,
this.mainAxisAlignment = MainAxisAlignment.center, this.mainAxisAlignment = MainAxisAlignment.center,
this.actions}); this.actions = const <Widget>[]});
final Color color; final Color color;
final double height; final double height;
final MainAxisAlignment mainAxisAlignment; final MainAxisAlignment mainAxisAlignment;
final FloatingActionButtonLocation fabLocation; final FloatingActionButtonLocation? fabLocation;
final bool showNotch; final bool showNotch;
final List<Widget> actions; final List<Widget> actions;

43
lib/customMoment.dart
View file

@ -5,7 +5,7 @@ import 'generated/i18n.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class Moment { class Moment {
DateTime _date; late DateTime _date;
Moment.now() { Moment.now() {
_date = new DateTime.now(); _date = new DateTime.now();
@ -33,29 +33,40 @@ class Moment {
return from(context, new DateTime.now(), withoutPrefixOrSuffix); return from(context, new DateTime.now(), withoutPrefixOrSuffix);
} }
String from(BuildContext context, DateTime date, [bool withoutPrefixOrSuffix = false]) { String from(BuildContext context, DateTime date,
[bool withoutPrefixOrSuffix = false]) {
Duration diff = date.difference(_date); Duration diff = date.difference(_date);
String timeString = ""; String timeString = "";
if (diff.inSeconds.abs() < 45) timeString = S.of(context).aF3wSeconds; if (diff.inSeconds.abs() < 45)
else if (diff.inMinutes.abs() < 2) timeString = S.of(context).aMinute; timeString = S.of(context).aF3wSeconds;
else if (diff.inMinutes.abs() < 45) timeString = S.of(context).inMinutes(diff.inMinutes.abs().toString()); else if (diff.inMinutes.abs() < 2)
else if (diff.inHours.abs() < 2) timeString = S.of(context).anHour; timeString = S.of(context).aMinute;
else if (diff.inHours.abs() < 22) timeString = S.of(context).inHours(diff.inHours.abs().toString()); else if (diff.inMinutes.abs() < 45)
else if (diff.inDays.abs() < 2) timeString = S.of(context).aDay; timeString = S.of(context).inMinutes(diff.inMinutes.abs().toString());
else if (diff.inDays.abs() < 26) timeString = S.of(context).inDays(diff.inDays.abs().toString()); else if (diff.inHours.abs() < 2)
else if (diff.inDays.abs() < 60) timeString = S.of(context).aMonth; timeString = S.of(context).anHour;
else if (diff.inDays.abs() < 320) timeString = S.of(context).inMonths((diff.inDays.abs() ~/ 30).toString()); else if (diff.inHours.abs() < 22)
else if (diff.inDays.abs() < 547) timeString = S.of(context).aYear; timeString = S.of(context).inHours(diff.inHours.abs().toString());
else timeString = S.of(context).inYears((diff.inDays.abs() ~/ 356).toString()); else if (diff.inDays.abs() < 2)
timeString = S.of(context).aDay;
else if (diff.inDays.abs() < 26)
timeString = S.of(context).inDays(diff.inDays.abs().toString());
else if (diff.inDays.abs() < 60)
timeString = S.of(context).aMonth;
else if (diff.inDays.abs() < 320)
timeString = S.of(context).inMonths((diff.inDays.abs() ~/ 30).toString());
else if (diff.inDays.abs() < 547)
timeString = S.of(context).aYear;
else
timeString = S.of(context).inYears((diff.inDays.abs() ~/ 356).toString());
if (!withoutPrefixOrSuffix) { if (!withoutPrefixOrSuffix) {
if (diff.isNegative) if (diff.isNegative)
timeString =S.of(context).somethingAgo(timeString); timeString = S.of(context).somethingAgo(timeString);
else else
timeString =S.of(context).inSomething(timeString); timeString = S.of(context).inSomething(timeString);
} }
return timeString; return timeString;

67
lib/customStepper.dart
View file

@ -74,7 +74,7 @@ class CustomStep {
this.subtitle, this.subtitle,
required this.content, required this.content,
this.state = CustomStepState.indexed, this.state = CustomStepState.indexed,
this.isActive= false, this.isActive = false,
}); });
/// The title of the step that typically describes it. /// The title of the step that typically describes it.
@ -84,7 +84,7 @@ class CustomStep {
/// font size. It typically gives more details that complement the title. /// font size. It typically gives more details that complement the title.
/// ///
/// If null, the subtitle is not shown. /// If null, the subtitle is not shown.
final Widget subtitle; final Widget? subtitle;
/// The content of the step that appears below the [title] and [subtitle]. /// The content of the step that appears below the [title] and [subtitle].
/// ///
@ -121,7 +121,7 @@ class CustomStepper extends StatefulWidget {
/// ///
/// The [steps], [type], and [currentCustomStep] arguments must not be null. /// The [steps], [type], and [currentCustomStep] arguments must not be null.
CustomStepper({ CustomStepper({
Key key, Key? key,
required this.steps, required this.steps,
this.type = CustomStepperType.vertical, this.type = CustomStepperType.vertical,
this.currentCustomStep = 0, this.currentCustomStep = 0,
@ -147,24 +147,24 @@ class CustomStepper extends StatefulWidget {
/// The callback called when a step is tapped, with its index passed as /// The callback called when a step is tapped, with its index passed as
/// an argument. /// an argument.
final ValueChanged<int> onCustomStepTapped; final ValueChanged<int>? onCustomStepTapped;
/// The callback called when the 'continue' button is tapped. /// The callback called when the 'continue' button is tapped.
/// ///
/// If null, the 'continue' button will be disabled. /// If null, the 'continue' button will be disabled.
final VoidCallback onCustomStepContinue; final VoidCallback? onCustomStepContinue;
/// The callback called when the 'cancel' button is tapped. /// The callback called when the 'cancel' button is tapped.
/// ///
/// If null, the 'cancel' button will be disabled. /// If null, the 'cancel' button will be disabled.
final VoidCallback onCustomStepCancel; final VoidCallback? onCustomStepCancel;
@override @override
_CustomStepperState createState() => new _CustomStepperState(); _CustomStepperState createState() => new _CustomStepperState();
} }
class _CustomStepperState extends State<CustomStepper> { class _CustomStepperState extends State<CustomStepper> {
List<GlobalKey> _keys; late List<GlobalKey> _keys;
final Map<int, CustomStepState> _oldStates = <int, CustomStepState>{}; final Map<int, CustomStepState> _oldStates = <int, CustomStepState>{};
@override @override
@ -214,7 +214,7 @@ class _CustomStepperState extends State<CustomStepper> {
Widget _buildCircleChild(int index, bool oldState) { Widget _buildCircleChild(int index, bool oldState) {
final CustomStepState state = final CustomStepState state =
oldState ? _oldStates[index] : widget.steps[index].state; oldState ? _oldStates[index]! : widget.steps[index].state;
final bool isDarkActive = _isDark() && widget.steps[index].isActive; final bool isDarkActive = _isDark() && widget.steps[index].isActive;
switch (state) { switch (state) {
case CustomStepState.indexed: case CustomStepState.indexed:
@ -238,7 +238,7 @@ class _CustomStepperState extends State<CustomStepper> {
case CustomStepState.error: case CustomStepState.error:
return const Text('!', style: _kCustomStepStyle); return const Text('!', style: _kCustomStepStyle);
} }
return null; return const SizedBox.shrink();
} }
Color _circleColor(int index) { Color _circleColor(int index) {
@ -335,7 +335,6 @@ class _CustomStepperState extends State<CustomStepper> {
break; break;
} }
// final ThemeData themeData = Theme.of(context); // final ThemeData themeData = Theme.of(context);
// final MaterialLocalizations localizations = // final MaterialLocalizations localizations =
// MaterialLocalizations.of(context); // MaterialLocalizations.of(context);
@ -376,15 +375,15 @@ class _CustomStepperState extends State<CustomStepper> {
case CustomStepState.indexed: case CustomStepState.indexed:
case CustomStepState.editing: case CustomStepState.editing:
case CustomStepState.complete: case CustomStepState.complete:
return textTheme.bodyLarge; return textTheme.bodyLarge ?? const TextStyle();
case CustomStepState.disabled: case CustomStepState.disabled:
return textTheme.bodyLarge return (textTheme.bodyLarge ?? const TextStyle())
.copyWith(color: _isDark() ? _kDisabledDark : _kDisabledLight); .copyWith(color: _isDark() ? _kDisabledDark : _kDisabledLight);
case CustomStepState.error: case CustomStepState.error:
return textTheme.bodyLarge return (textTheme.bodyLarge ?? const TextStyle())
.copyWith(color: _isDark() ? _kErrorDark : _kErrorLight); .copyWith(color: _isDark() ? _kErrorDark : _kErrorLight);
} }
return null; return const TextStyle();
} }
TextStyle _subtitleStyle(int index) { TextStyle _subtitleStyle(int index) {
@ -395,15 +394,15 @@ class _CustomStepperState extends State<CustomStepper> {
case CustomStepState.indexed: case CustomStepState.indexed:
case CustomStepState.editing: case CustomStepState.editing:
case CustomStepState.complete: case CustomStepState.complete:
return textTheme.bodySmall; return textTheme.bodySmall ?? const TextStyle();
case CustomStepState.disabled: case CustomStepState.disabled:
return textTheme.bodySmall return (textTheme.bodySmall ?? const TextStyle())
.copyWith(color: _isDark() ? _kDisabledDark : _kDisabledLight); .copyWith(color: _isDark() ? _kDisabledDark : _kDisabledLight);
case CustomStepState.error: case CustomStepState.error:
return textTheme.bodySmall return (textTheme.bodySmall ?? const TextStyle())
.copyWith(color: _isDark() ? _kErrorDark : _kErrorLight); .copyWith(color: _isDark() ? _kErrorDark : _kErrorLight);
} }
return null; return const TextStyle();
} }
Widget _buildHeaderText(int index) { Widget _buildHeaderText(int index) {
@ -416,17 +415,19 @@ class _CustomStepperState extends State<CustomStepper> {
), ),
]; ];
children.add( if (widget.steps[index].subtitle != null) {
new Container( children.add(
margin: const EdgeInsets.only(top: 2.0), new Container(
child: new AnimatedDefaultTextStyle( margin: const EdgeInsets.only(top: 2.0),
style: _subtitleStyle(index), child: new AnimatedDefaultTextStyle(
duration: kThemeAnimationDuration, style: _subtitleStyle(index),
curve: Curves.fastOutSlowIn, duration: kThemeAnimationDuration,
child: widget.steps[index].subtitle, curve: Curves.fastOutSlowIn,
child: widget.steps[index].subtitle!,
),
), ),
), );
); }
return new Column( return new Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -508,12 +509,12 @@ class _CustomStepperState extends State<CustomStepper> {
// In the vertical case we need to scroll to the newly tapped // In the vertical case we need to scroll to the newly tapped
// step. // step.
Scrollable.ensureVisible( Scrollable.ensureVisible(
_keys[i].currentContext, _keys[i].currentContext!,
curve: Curves.fastOutSlowIn, curve: Curves.fastOutSlowIn,
duration: kThemeAnimationDuration, duration: kThemeAnimationDuration,
); );
widget.onCustomStepTapped(i); widget.onCustomStepTapped?.call(i);
} }
: null, : null,
child: _buildVerticalHeader(i)), child: _buildVerticalHeader(i)),
@ -535,7 +536,7 @@ class _CustomStepperState extends State<CustomStepper> {
new InkResponse( new InkResponse(
onTap: widget.steps[i].state != CustomStepState.disabled onTap: widget.steps[i].state != CustomStepState.disabled
? () { ? () {
widget.onCustomStepTapped(i); widget.onCustomStepTapped?.call(i);
} }
: null, : null,
child: new Row( child: new Row(
@ -613,14 +614,14 @@ class _CustomStepperState extends State<CustomStepper> {
case CustomStepperType.horizontal: case CustomStepperType.horizontal:
return _buildHorizontal(); return _buildHorizontal();
} }
return null; return const SizedBox.shrink();
} }
} }
// Paints a triangle whose base is the bottom of the bounding rectangle and its // Paints a triangle whose base is the bottom of the bounding rectangle and its
// top vertex the middle of its top. // top vertex the middle of its top.
class _TrianglePainter extends CustomPainter { class _TrianglePainter extends CustomPainter {
_TrianglePainter({this.color}); _TrianglePainter({required this.color});
final Color color; final Color color;

243
lib/generated/i18n.dart
View file

@ -1,4 +1,3 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
@ -16,16 +15,95 @@ class S implements WidgetsLocalizations {
const GeneratedLocalizationsDelegate(); const GeneratedLocalizationsDelegate();
static S of(BuildContext context) => static S of(BuildContext context) =>
Localizations.of<S>(context, WidgetsLocalizations); Localizations.of<S>(context, WidgetsLocalizations) ?? const S();
@override @override
TextDirection get textDirection => TextDirection.ltr; TextDirection get textDirection => TextDirection.ltr;
// Minimal implementations for abstract members from WidgetsLocalizations
@override
String get copyButtonLabel => "Copy";
@override
String get cutButtonLabel => "Cut";
@override
String get lookUpButtonLabel => "Look Up";
@override
String get noResultsFound => "No results found";
@override
String get pastePlainTextLabel => "Paste Plain Text";
@override
String get pasteButtonLabel => "Paste";
@override
String get selectAllButtonLabel => "Select All";
@override
String get searchWebButtonLabel => "Search Web";
@override
String get shareButtonLabel => "Share";
@override
String get clearButtonTooltip => "Clear";
@override
String get collapsedIconButtonLabel => "Expand";
@override
String get expandedIconButtonLabel => "Collapse";
@override
String get openAppDrawerTooltip => "Open navigation menu";
@override
String get backButtonTooltip => "Back";
@override
String get closeButtonLabel => "Close";
@override
String get closeButtonTooltip => "Close";
@override
String get nextMonthTooltip => "Next month";
@override
String get previousMonthTooltip => "Previous month";
@override
String get nextPageTooltip => "Next page";
@override
String get previousPageTooltip => "Previous page";
@override
String get firstPageTooltip => "First page";
@override
String get lastPageTooltip => "Last page";
@override
String get showMenuTooltip => "Show menu";
@override
String tabLabel({required int tabIndex, required int tabCount}) => "Tab";
@override
String get licensesPageTitle => "Licenses";
@override
String get rowsPerPageTitle => "Rows per page:";
@override
String get cancelButtonLabel => "CANCEL";
@override
String get okButtonLabel => "OK";
@override
String get radioButtonUnselectedLabel => "Unselected";
@override
String get radioButtonSelectedLabel => "Selected";
@override
String get reorderItemDown => "Move down";
@override
String get reorderItemLeft => "Move left";
@override
String get reorderItemRight => "Move right";
@override
String get reorderItemUp => "Move up";
@override
String get scriptCategory => "English";
@override
String get reorderItemToEnd => "Move to end";
@override
String get reorderItemToStart => "Move to start";
@override
String get searchResultsFound => "Search results found";
String get AvoidThisStringsIfisNotPlural => "Zero One Two Few Many Other"; String get AvoidThisStringsIfisNotPlural => "Zero One Two Few Many Other";
String get CANCEL => "CANCEL"; String get CANCEL => "CANCEL";
String get CLOSE => "CLOSE"; String get CLOSE => "CLOSE";
String get DELETE => "DELETE"; String get DELETE => "DELETE";
String get NASAAck => "We acknowledge the use of data and imagery from LANCE FIRMS operated by the NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding provided by NASA/HQ."; String get NASAAck =>
"We acknowledge the use of data and imagery from LANCE FIRMS operated by the NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding provided by NASA/HQ.";
String get SAVE => "SAVE"; String get SAVE => "SAVE";
String get SHOW => "SHOW"; String get SHOW => "SHOW";
String get UNDO => "UNDO"; String get UNDO => "UNDO";
@ -45,16 +123,19 @@ class S implements WidgetsLocalizations {
String get areYouSureTitle => "Are you sure?"; String get areYouSureTitle => "Are you sure?";
String get byNASAsatellites => "by NASA satellites"; String get byNASAsatellites => "by NASA satellites";
String get byOurUsers => "by one of our users"; String get byOurUsers => "by one of our users";
String get callEmergencyServicesDescription => "You should call 112 if you have not already done so to notify the emergency services."; String get callEmergencyServicesDescription =>
"You should call 112 if you have not already done so to notify the emergency services.";
String get callEmergencyServicesTitle => "Call 112"; String get callEmergencyServicesTitle => "Call 112";
String get chooseAPlace => "Choose a place"; String get chooseAPlace => "Choose a place";
String get chooseAWatchRadio => "Choose a watch radio"; String get chooseAWatchRadio => "Choose a watch radio";
String get comunesSupportBtn => "Know and support our work"; String get comunesSupportBtn => "Know and support our work";
String get confirm => "Confirm"; String get confirm => "Confirm";
String get deleteAllFireNotificationsAlertDescription => "This will remove all your fire notifications"; String get deleteAllFireNotificationsAlertDescription =>
"This will remove all your fire notifications";
String get errorFirePlaceDialog => "We couldn't get the location of the fire"; String get errorFirePlaceDialog => "We couldn't get the location of the fire";
String get fireNotificationTitle => "Fire Notification"; String get fireNotificationTitle => "Fire Notification";
String get fireNotificationsDescription => "Here you will receive fire notifications in locations you are subscribed to"; String get fireNotificationsDescription =>
"Here you will receive fire notifications in locations you are subscribed to";
String get fireNotificationsTitle => "Fire Notifications"; String get fireNotificationsTitle => "Fire Notifications";
String get fireNotificationsTitleShort => "Notifications"; String get fireNotificationsTitleShort => "Notifications";
String get firesInTheWorld => "Active fires in the world"; String get firesInTheWorld => "Active fires in the world";
@ -62,62 +143,81 @@ class S implements WidgetsLocalizations {
String get firesNearPlace => "Fires near other place"; String get firesNearPlace => "Fires near other place";
String get getAlertsOfFiresinThatArea => "Get alerts of fires in that area"; String get getAlertsOfFiresinThatArea => "Get alerts of fires in that area";
String get inDevelopment => "In development"; String get inDevelopment => "In development";
String get inGreenMonitoredAreas => "In green, the areas monitored by our users currently"; String get inGreenMonitoredAreas =>
String get isYourUbicationEnabled => "I cannot get your current location. It's your ubication enabled?"; "In green, the areas monitored by our users currently";
String get isYourUbicationEnabled =>
"I cannot get your current location. It's your ubication enabled?";
String get itSeemsAControlledBurning => "It's a controlled burning"; String get itSeemsAControlledBurning => "It's a controlled burning";
String get itSeemsAFalseAlarm => "It seems a false alarm"; String get itSeemsAFalseAlarm => "It seems a false alarm";
String get itSeemsAIndustry => "It's an industry"; String get itSeemsAIndustry => "It's an industry";
String get itSeemsNotAtForesFire => "It seems that this is not a forest fire."; String get itSeemsNotAtForesFire =>
String get mapPrivacy => "In order to preserve the privacy of our users, the reflected data are randomly altered and are only indicative."; "It seems that this is not a forest fire.";
String get mapPrivacy =>
"In order to preserve the privacy of our users, the reflected data are randomly altered and are only indicative.";
String get monitoredAreasTitle => "Monitored areas"; String get monitoredAreasTitle => "Monitored areas";
String get noConnectivity => "This application needs an Internet connection to work"; String get noConnectivity =>
"This application needs an Internet connection to work";
String get noFiresAround => "There is no fires"; String get noFiresAround => "There is no fires";
String get notAWildfire => "Isn't that a forest fire?"; String get notAWildfire => "Isn't that a forest fire?";
String get notPermsUbication => "We don't have permission to get your location"; String get notPermsUbication =>
"We don't have permission to get your location";
String get notifyAFire => "Notify a fire"; String get notifyAFire => "Notify a fire";
String get notifyNeighbours => "Notify other users"; String get notifyNeighbours => "Notify other users";
String get notifyNeighboursDescription => "Alert other users of the area about the fire"; String get notifyNeighboursDescription =>
"Alert other users of the area about the fire";
String get privacyPolicy => "Privacy Policy"; String get privacyPolicy => "Privacy Policy";
String get shareAppBtn => "Share our app"; String get shareAppBtn => "Share our app";
String get starAppBtn => "Rate our app"; String get starAppBtn => "Rate our app";
String get subscribedToFires => "Subscribed to fires notifications"; String get subscribedToFires => "Subscribed to fires notifications";
String get supportPageDescription => "You can support this initiative, spreading the word, helping us to develop our software, translating this app to your language, suggesting other public data sources of fires to use, etc."; String get supportPageDescription =>
"You can support this initiative, spreading the word, helping us to develop our software, translating this app to your language, suggesting other public data sources of fires to use, etc.";
String get supportThisInitiative => "Support this initiative"; String get supportThisInitiative => "Support this initiative";
String get thanksForParticipating => "Thanks for participating"; String get thanksForParticipating => "Thanks for participating";
String get toDeleteThisNotification => "Slide horizontally to delete this notification"; String get toDeleteThisNotification =>
"Slide horizontally to delete this notification";
String get toDeleteThisPlace => "Slide horizontally to delete this place"; String get toDeleteThisPlace => "Slide horizontally to delete this place";
String get toFiresNotifications => "Subscribe to fires notifications"; String get toFiresNotifications => "Subscribe to fires notifications";
String get translateBtn => "Help with translations"; String get translateBtn => "Help with translations";
String get tweetAboutAFireDescription => "Additionally if you use twitter you can share additional information with the emergency services, for example, attaching photos to the tweet if you have good visibility of the fire, when you took the photos, exact location, etc. Use #hashtags type #IFMinicipalTerminal for example #IFJumilla (Forest Fire in Jumilla)."; String get tweetAboutAFireDescription =>
"Additionally if you use twitter you can share additional information with the emergency services, for example, attaching photos to the tweet if you have good visibility of the fire, when you took the photos, exact location, etc. Use #hashtags type #IFMinicipalTerminal for example #IFJumilla (Forest Fire in Jumilla).";
String get tweetAboutAFireTitle => "Tweet about"; String get tweetAboutAFireTitle => "Tweet about";
String get typeTheNameOfAPlace => "Type the name of a place, region, etc"; String get typeTheNameOfAPlace => "Type the name of a place, region, etc";
String get unsubscribe => "Unsubscribe"; String get unsubscribe => "Unsubscribe";
String get unsubscribedToFires => "Unsubscribed to fires notifications"; String get unsubscribedToFires => "Unsubscribed to fires notifications";
String get warningThisIsAVeryLargeArea => "Warning: this is a very large area"; String get warningThisIsAVeryLargeArea =>
"Warning: this is a very large area";
String get youDeletedThisNotification => "You deleted this notification"; String get youDeletedThisNotification => "You deleted this notification";
String get youDeletedThisPlace => "You deleted this place"; String get youDeletedThisPlace => "You deleted this place";
String activeFiresWorldWide(String activeFires) => "$activeFires active fires worldwide"; String activeFiresWorldWide(String activeFires) =>
String additionalInfoAboutFire(String where, String when, String by) => "Fire detected in $where $when $by"; "$activeFires active fires worldwide";
String appLicense(String thisYear) => "(c) 2017-$thisYear Comunes Association under the GNU Affero GPL v3"; String additionalInfoAboutFire(String where, String when, String by) =>
String fireAroundThisArea(String kmAround) => "A fire at $kmAround км around this area"; "Fire detected in $where $when $by";
String firesAroundThisArea(String numFires, String kmAround) => "$numFires fires at $kmAround км around this area"; String appLicense(String thisYear) =>
"(c) 2017-$thisYear Comunes Association under the GNU Affero GPL v3";
String fireAroundThisArea(String kmAround) =>
"A fire at $kmAround км around this area";
String firesAroundThisArea(String numFires, String kmAround) =>
"$numFires fires at $kmAround км around this area";
String inDays(String value) => "$value days"; String inDays(String value) => "$value days";
String inHours(String value) => "$value hours"; String inHours(String value) => "$value hours";
String inMinutes(String value) => "$value minutes"; String inMinutes(String value) => "$value minutes";
String inMonths(String value) => "$value months"; String inMonths(String value) => "$value months";
String inSomething(String something) => "in $something"; String inSomething(String something) => "in $something";
String inYears(String value) => "$value years"; String inYears(String value) => "$value years";
String noFiresAroundThisArea(String kmAround) => "There is no fires at $kmAround км around this area"; String noFiresAroundThisArea(String kmAround) =>
"There is no fires at $kmAround км around this area";
String somethingAgo(String something) => "$something ago"; String somethingAgo(String something) => "$something ago";
String subscribeToValueAroundThisArea(String sliderValue) => "Subscribe to $sliderValue км around this area"; String subscribeToValueAroundThisArea(String sliderValue) =>
String tweetAboutSelf(String location, String hash) => "Fire in $location $hash"; "Subscribe to $sliderValue км around this area";
String tweetAboutSelf(String location, String hash) =>
"Fire in $location $hash";
String updatedLastCheck(String lastCheck) => "Updated $lastCheck"; String updatedLastCheck(String lastCheck) => "Updated $lastCheck";
} }
class gl extends S { class gl extends S {
const gl(); const gl();
@override @override
TextDirection get textDirection => TextDirection.ltr; TextDirection get textDirection => TextDirection.ltr;
@override @override
@ -133,17 +233,19 @@ class en extends S {
class es extends S { class es extends S {
const es(); const es();
@override @override
TextDirection get textDirection => TextDirection.ltr; TextDirection get textDirection => TextDirection.ltr;
@override @override
String get addYourCurrentPosition => "Añade tu ubicación actual"; String get addYourCurrentPosition => "Añade tu ubicación actual";
@override @override
String get toDeleteThisNotification => "Desliza horizontalmente para borrar esta notificación"; String get toDeleteThisNotification =>
"Desliza horizontalmente para borrar esta notificación";
@override @override
String get alertWhenThereIsAFire => "Alerta cuando hay un fuego"; String get alertWhenThereIsAFire => "Alerta cuando hay un fuego";
@override @override
String get fireNotificationsDescription => "Aquí recibirás las notificaciones de fuegos en los lugares a los que te subscribas"; String get fireNotificationsDescription =>
"Aquí recibirás las notificaciones de fuegos en los lugares a los que te subscribas";
@override @override
String get byOurUsers => "por uno de nuestros usuarios/as"; String get byOurUsers => "por uno de nuestros usuarios/as";
@override @override
@ -153,19 +255,25 @@ class es extends S {
@override @override
String get notifyAFire => "Notificar un fuego"; String get notifyAFire => "Notificar un fuego";
@override @override
String get callEmergencyServicesDescription => "Deberías llamar al 112 si no lo has hecho ya para avisar a los servicios de emergencia."; String get callEmergencyServicesDescription =>
"Deberías llamar al 112 si no lo has hecho ya para avisar a los servicios de emergencia.";
@override @override
String get CLOSE => "CERRAR"; String get CLOSE => "CERRAR";
@override @override
String get errorFirePlaceDialog => "No hemos podido obtener la ubicación del fuego"; String get errorFirePlaceDialog =>
"No hemos podido obtener la ubicación del fuego";
@override @override
String get toDeleteThisPlace => "Desliza horizontalmente para borrar este lugar"; String get toDeleteThisPlace =>
"Desliza horizontalmente para borrar este lugar";
@override @override
String get deleteAllFireNotificationsAlertDescription => "Esto borrará todas las notificaciones de fuegos"; String get deleteAllFireNotificationsAlertDescription =>
"Esto borrará todas las notificaciones de fuegos";
@override @override
String get tweetAboutAFireDescription => "Adicionalmente si usas twitter puedes compartir información adicional con los servicios de emergencia, por ejemplo, adjuntando fotos al tweet si tienes buena visibilidad del fuego, cuando tomaste las fotos, ubicación exacta, etc. Usa #hashtags tipo #IFTerminoMunicipal por ejemplo #IFJumilla (Incendio Forestal en Jumilla)."; String get tweetAboutAFireDescription =>
"Adicionalmente si usas twitter puedes compartir información adicional con los servicios de emergencia, por ejemplo, adjuntando fotos al tweet si tienes buena visibilidad del fuego, cuando tomaste las fotos, ubicación exacta, etc. Usa #hashtags tipo #IFTerminoMunicipal por ejemplo #IFJumilla (Incendio Forestal en Jumilla).";
@override @override
String get noConnectivity => "Esta aplicación necesita una conexión a Internet para funcionar"; String get noConnectivity =>
"Esta aplicación necesita una conexión a Internet para funcionar";
@override @override
String get AvoidThisStringsIfisNotPlural => "Zero One Two Few Many Other"; String get AvoidThisStringsIfisNotPlural => "Zero One Two Few Many Other";
@override @override
@ -177,7 +285,8 @@ class es extends S {
@override @override
String get toFiresNotifications => "Suscríbete a alertas de fuegos"; String get toFiresNotifications => "Suscríbete a alertas de fuegos";
@override @override
String get notPermsUbication => "No tenemos permisos para conocer tu ubicación"; String get notPermsUbication =>
"No tenemos permisos para conocer tu ubicación";
@override @override
String get fireNotificationTitle => "Notificación de fuego"; String get fireNotificationTitle => "Notificación de fuego";
@override @override
@ -195,7 +304,8 @@ class es extends S {
@override @override
String get chooseAPlace => "Elige un lugar"; String get chooseAPlace => "Elige un lugar";
@override @override
String get mapPrivacy => "Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos."; String get mapPrivacy =>
"Para preservar la privacidad de nuestros usuarios/as, los datos reflejados están aleatoriamente alterados y son solo orientativos.";
@override @override
String get firesNearPlace => "Fuegos cercanos a ti"; String get firesNearPlace => "Fuegos cercanos a ti";
@override @override
@ -203,7 +313,8 @@ class es extends S {
@override @override
String get unsubscribedToFires => "Desuscrito a notificaciones de fuegos"; String get unsubscribedToFires => "Desuscrito a notificaciones de fuegos";
@override @override
String get itSeemsNotAtForesFire => "Parece que este fuego no es un fuego forestal."; String get itSeemsNotAtForesFire =>
"Parece que este fuego no es un fuego forestal.";
@override @override
String get UNDO => "DESHACER"; String get UNDO => "DESHACER";
@override @override
@ -213,7 +324,8 @@ class es extends S {
@override @override
String get tweetAboutAFireTitle => "Twittea"; String get tweetAboutAFireTitle => "Twittea";
@override @override
String get supportPageDescription => "Puedes apoyar esta iniciativa, dando difusión, ayudándonos a desarrollar nuestro software, traduciendo esta aplicación a tu idioma, sugeriendo otras fuentes de datos públicas de fuegos para usar, etc."; String get supportPageDescription =>
"Puedes apoyar esta iniciativa, dando difusión, ayudándonos a desarrollar nuestro software, traduciendo esta aplicación a tu idioma, sugeriendo otras fuentes de datos públicas de fuegos para usar, etc.";
@override @override
String get aMinute => "un minuto"; String get aMinute => "un minuto";
@override @override
@ -221,11 +333,13 @@ class es extends S {
@override @override
String get firesInYourPlaces => "Fuegos en tus lugares"; String get firesInYourPlaces => "Fuegos en tus lugares";
@override @override
String get NASAAck => "Reconocemos el uso de datos e imágenes de LANCE FIRMS operadas por NASA/GSFC/Earth Science Data and Information System (ESDIS) con fondos proporcionados por NASA/HQ."; String get NASAAck =>
"Reconocemos el uso de datos e imágenes de LANCE FIRMS operadas por NASA/GSFC/Earth Science Data and Information System (ESDIS) con fondos proporcionados por NASA/HQ.";
@override @override
String get subscribedToFires => "Suscrito a notificaciones de fuegos"; String get subscribedToFires => "Suscrito a notificaciones de fuegos";
@override @override
String get isYourUbicationEnabled => "No podemos saber tu ubicación actual. ¿Están los servicios de ubicación en tu móvil activados?"; String get isYourUbicationEnabled =>
"No podemos saber tu ubicación actual. ¿Están los servicios de ubicación en tu móvil activados?";
@override @override
String get thanksForParticipating => "Gracias por Participar"; String get thanksForParticipating => "Gracias por Participar";
@override @override
@ -263,15 +377,18 @@ class es extends S {
@override @override
String get firesInTheWorld => "Fuegos en el mundo"; String get firesInTheWorld => "Fuegos en el mundo";
@override @override
String get notifyNeighboursDescription => "Alerta a otros usuarios de la zona sobre el fuego"; String get notifyNeighboursDescription =>
"Alerta a otros usuarios de la zona sobre el fuego";
@override @override
String get addSomePlace => "Añade otro lugar"; String get addSomePlace => "Añade otro lugar";
@override @override
String get confirm => "Confirmar"; String get confirm => "Confirmar";
@override @override
String get inGreenMonitoredAreas => "En verde, las zonas vigiladas por nuestros usuari@s actualmente"; String get inGreenMonitoredAreas =>
"En verde, las zonas vigiladas por nuestros usuari@s actualmente";
@override @override
String get getAlertsOfFiresinThatArea => "Recibe alertas de fuegos en esa zona"; String get getAlertsOfFiresinThatArea =>
"Recibe alertas de fuegos en esa zona";
@override @override
String get monitoredAreasTitle => "Zonas vigiladas"; String get monitoredAreasTitle => "Zonas vigiladas";
@override @override
@ -291,19 +408,25 @@ class es extends S {
@override @override
String inYears(String value) => "$value años"; String inYears(String value) => "$value años";
@override @override
String noFiresAroundThisArea(String kmAround) => "No hay fuegos a $kmAround км a la redonda"; String noFiresAroundThisArea(String kmAround) =>
"No hay fuegos a $kmAround км a la redonda";
@override @override
String firesAroundThisArea(String numFires, String kmAround) => "$numFires fuegos a $kmAround км a la redonda"; String firesAroundThisArea(String numFires, String kmAround) =>
"$numFires fuegos a $kmAround км a la redonda";
@override @override
String appLicense(String thisYear) => "(c) 2017-$thisYear Asociación Comunes bajo licencia GNU Affero GPL v3"; String appLicense(String thisYear) =>
"(c) 2017-$thisYear Asociación Comunes bajo licencia GNU Affero GPL v3";
@override @override
String somethingAgo(String something) => "hace $something"; String somethingAgo(String something) => "hace $something";
@override @override
String additionalInfoAboutFire(String where, String when, String by) => "Información adicional sobre fuego detectado en $where $when $by"; String additionalInfoAboutFire(String where, String when, String by) =>
"Información adicional sobre fuego detectado en $where $when $by";
@override @override
String tweetAboutSelf(String location, String hash) => "Fuego en $location $hash"; String tweetAboutSelf(String location, String hash) =>
"Fuego en $location $hash";
@override @override
String subscribeToValueAroundThisArea(String sliderValue) => "Suscríbete a $sliderValue км a la redonda"; String subscribeToValueAroundThisArea(String sliderValue) =>
"Suscríbete a $sliderValue км a la redonda";
@override @override
String inHours(String value) => "$value horas"; String inHours(String value) => "$value horas";
@override @override
@ -311,31 +434,32 @@ class es extends S {
@override @override
String inDays(String value) => "$value días"; String inDays(String value) => "$value días";
@override @override
String activeFiresWorldWide(String activeFires) => "$activeFires fuegos activos en el mundo"; String activeFiresWorldWide(String activeFires) =>
"$activeFires fuegos activos en el mundo";
@override @override
String fireAroundThisArea(String kmAround) => "Un fuego a $kmAround км a la redonda"; String fireAroundThisArea(String kmAround) =>
"Un fuego a $kmAround км a la redonda";
@override @override
String inSomething(String something) => "en $something"; String inSomething(String something) => "en $something";
@override @override
String inMinutes(String value) => "$value minutos"; String inMinutes(String value) => "$value minutos";
} }
class GeneratedLocalizationsDelegate
class GeneratedLocalizationsDelegate extends LocalizationsDelegate<WidgetsLocalizations> { extends LocalizationsDelegate<WidgetsLocalizations> {
const GeneratedLocalizationsDelegate(); const GeneratedLocalizationsDelegate();
List<Locale> get supportedLocales { List<Locale> get supportedLocales {
return const <Locale>[ return const <Locale>[
const Locale("gl", ""), const Locale("gl", ""),
const Locale("en", ""), const Locale("en", ""),
const Locale("es", ""), const Locale("es", ""),
]; ];
} }
LocaleResolutionCallback resolution({Locale fallback}) { LocaleResolutionCallback resolution({Locale? fallback}) {
return (Locale locale, Iterable<Locale> supported) { return (Locale? locale, Iterable<Locale> supported) {
if (locale == null) return supported.first;
final Locale languageLocale = new Locale(locale.languageCode, ""); final Locale languageLocale = new Locale(locale.languageCode, "");
if (supported.contains(locale)) if (supported.contains(locale))
return locale; return locale;
@ -352,7 +476,6 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate<WidgetsLocali
Future<WidgetsLocalizations> load(Locale locale) { Future<WidgetsLocalizations> load(Locale locale) {
final String lang = getLang(locale); final String lang = getLang(locale);
switch (lang) { switch (lang) {
case "gl": case "gl":
return new SynchronousFuture<WidgetsLocalizations>(const gl()); return new SynchronousFuture<WidgetsLocalizations>(const gl());
case "en": case "en":
@ -372,6 +495,6 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate<WidgetsLocali
bool shouldReload(GeneratedLocalizationsDelegate old) => false; bool shouldReload(GeneratedLocalizationsDelegate old) => false;
} }
String getLang(Locale l) => l.countryCode != null && l.countryCode.isEmpty String getLang(Locale l) => l.countryCode != null && l.countryCode!.isEmpty
? l.languageCode ? l.languageCode
: l.toString(); : l.toString();

82
lib/genericMap.dart
View file

@ -129,8 +129,8 @@ class _genericMapState extends State<genericMap> {
mapState: store.state.fireMapState); mapState: store.state.fireMapState);
}, },
builder: (context, view) { builder: (context, view) {
YourLocation location = view.mapState.yourLocation; YourLocation? location = view.mapState.yourLocation;
_location = location.copyWith(); _location = location?.copyWith();
print('New map builder with ${_location?.description}'); print('New map builder with ${_location?.description}');
FireMapState mapState = view.mapState; FireMapState mapState = view.mapState;
@ -141,14 +141,15 @@ class _genericMapState extends State<genericMap> {
double maxZoom = 18.0; // works? double maxZoom = 18.0; // works?
MapOptions mapOptions = new MapOptions( MapOptions mapOptions = new MapOptions(
initialCenter: new LatLng(_location!.lat, _location!.lon), initialCenter:
new LatLng(_location?.lat ?? 0.0, _location?.lon ?? 0.0),
initialZoom: 13.0, initialZoom: 13.0,
maxZoom: maxZoom, maxZoom: maxZoom,
onTap: (tapPosition, latLng) { onTap: (tapPosition, latLng) {
if (status == FireMapStatus.edit) { if (status == FireMapStatus.edit && _location != null) {
_location = _location! _location = _location!
.copyWith(lat: latLng.latitude, lon: latLng.longitude); .copyWith(lat: latLng.latitude, lon: latLng.longitude);
view.onEditing(_location); view.onEditing(_location!);
} }
}, },
// onPositionChanged: (positionCallback) { // onPositionChanged: (positionCallback) {
@ -223,10 +224,11 @@ class _genericMapState extends State<genericMap> {
: new DummyMapPluginWidget(), : new DummyMapPluginWidget(),
new MarkerLayer( new MarkerLayer(
markers: buildMarkers( markers: buildMarkers(
mapState.status == FireMapStatus.viewFireNotification mapState.status == FireMapStatus.viewFireNotification &&
? new LatLng(mapState.fireNotification.lat, mapState.fireNotification != null
mapState.fireNotification.lon) ? new LatLng(mapState.fireNotification!.lat,
: new LatLng(_location.lat, _location.lon), mapState.fireNotification!.lon)
: new LatLng(_location!.lat, _location!.lon),
mapState.fires, mapState.fires,
mapState.industries, mapState.industries,
mapState.falsePos, mapState.falsePos,
@ -258,23 +260,23 @@ class _genericMapState extends State<genericMap> {
decoration: new InputDecoration(), decoration: new InputDecoration(),
controller: new TextEditingController.fromValue( controller: new TextEditingController.fromValue(
new TextEditingValue( new TextEditingValue(
text: _location.description, text: _location!.description,
selection: new TextSelection.collapsed( selection: new TextSelection.collapsed(
offset: _location.description.length))), offset: _location!.description.length))),
onChanged: (newDesc) { onChanged: (newDesc) {
debugPrint("OnChanged"); debugPrint("OnChanged");
_location = _location.copyWith(description: newDesc); _location = _location!.copyWith(description: newDesc);
}, },
onSubmitted: (newDesc) { onSubmitted: (newDesc) {
debugPrint("OnSubmitted"); debugPrint("OnSubmitted");
_location = _location.copyWith(description: newDesc); _location = _location!.copyWith(description: newDesc);
view.onEditConfirm(_location); view.onEditConfirm(_location!);
}, },
) )
: status == FireMapStatus.viewFireNotification : status == FireMapStatus.viewFireNotification
? new Text(S.of(context).fireNotificationTitle) ? new Text(S.of(context).fireNotificationTitle)
: new Text(_location.description), : new Text(_location!.description),
actions: buildAppBarActions(status, view, _location), actions: buildAppBarActions(status, view, _location!),
), ),
floatingActionButton: status == FireMapStatus.edit || floatingActionButton: status == FireMapStatus.edit ||
status == FireMapStatus.viewFireNotification status == FireMapStatus.viewFireNotification
@ -283,13 +285,13 @@ class _genericMapState extends State<genericMap> {
onPressed: () { onPressed: () {
switch (status) { switch (status) {
case FireMapStatus.view: case FireMapStatus.view:
view.onSubs(_location); view.onSubs(_location!);
break; break;
case FireMapStatus.subscriptionConfirm: case FireMapStatus.subscriptionConfirm:
view.onSubsConfirmed(_location); view.onSubsConfirmed(_location!);
break; break;
case FireMapStatus.unsubscribe: case FireMapStatus.unsubscribe:
view.onUnSubs(_location); view.onUnSubs(_location!);
break; break;
case FireMapStatus.edit: case FireMapStatus.edit:
case FireMapStatus.viewFireNotification: case FireMapStatus.viewFireNotification:
@ -297,7 +299,7 @@ class _genericMapState extends State<genericMap> {
} }
}, },
// https://github.com/flutter/flutter/issues/17583 // https://github.com/flutter/flutter/issues/17583
heroTag: "firesmap" + _location.id.hexString, heroTag: "firesmap" + _location!.id.hexString,
icon: new Icon(btnIcon, color: fires600), icon: new Icon(btnIcon, color: fires600),
label: new Text( label: new Text(
btnText, btnText,
@ -308,8 +310,9 @@ class _genericMapState extends State<genericMap> {
floatingActionButtonLocation: floatingActionButtonLocation:
FloatingActionButtonLocation.centerFloat, FloatingActionButtonLocation.centerFloat,
bottomNavigationBar: new GenericMapBottom( bottomNavigationBar: new GenericMapBottom(
onSave: () => view.onEditConfirm(_location), onSave: () => view.onEditConfirm(_location!),
onCancel: () => view.onEditCancel(_initialLocation), onCancel: () =>
view.onEditCancel(_initialLocation ?? _location!),
onFalsePositive: (sealed, type) => onFalsePositive: (sealed, type) =>
view.onFalsePositive(sealed, type), view.onFalsePositive(sealed, type),
state: view.mapState, state: view.mapState,
@ -333,19 +336,24 @@ class _genericMapState extends State<genericMap> {
child: new CenteredRow( child: new CenteredRow(
// Fit sample: // Fit sample:
// https://github.com/apptreesoftware/flutter_map/blob/master/flutter_map_example/lib/pages/map_controller.dart // https://github.com/apptreesoftware/flutter_map/blob/master/flutter_map_example/lib/pages/map_controller.dart
children: children: status ==
status == FireMapStatus.subscriptionConfirm || FireMapStatus.subscriptionConfirm ||
(status == FireMapStatus.edit && (status == FireMapStatus.edit &&
_location.subscribed) _location != null &&
? <Widget>[ _location!.subscribed)
new FireDistanceSlider( ? <Widget>[
initialValue: _location.distance, new FireDistanceSlider(
onSlide: (distance) { initialValue:
_location.distance = distance; (_location?.distance ?? 0)
view.onSlide(_location); .round(),
}) onSlide: (distance) {
] if (_location != null) {
: []), _location!.distance = distance;
view.onSlide(_location!);
}
})
]
: []),
) )
]))); ])));
}); });
@ -365,7 +373,7 @@ class _genericMapState extends State<genericMap> {
return <Widget>[ return <Widget>[
new IconButton( new IconButton(
icon: new Icon(Icons.save), icon: new Icon(Icons.save),
onPressed: () => view.onEditConfirm(_location)) onPressed: () => view.onEditConfirm(_location!))
]; ];
case FireMapStatus.viewFireNotification: case FireMapStatus.viewFireNotification:
return <Widget>[ return <Widget>[
@ -373,7 +381,7 @@ class _genericMapState extends State<genericMap> {
icon: new Icon(Icons.share), icon: new Icon(Icons.share),
onPressed: () { onPressed: () {
Share.share( Share.share(
'${view.mapState.fireNotification.description}. ${view.serverUrl}fire/${view.mapState.fireNotification.sealed}'); '${view.mapState.fireNotification?.description ?? 'Fire'}. ${view.serverUrl}fire/${view.mapState.fireNotification?.sealed ?? ''}');
}) })
]; ];
default: default:

35
lib/globalFiresBottomStats.dart
View file

@ -16,18 +16,20 @@ class GlobalFiresBottomStats extends StatefulWidget {
} }
class _GlobalFiresBottomStatsState extends State<GlobalFiresBottomStats> { class _GlobalFiresBottomStatsState extends State<GlobalFiresBottomStats> {
String lastCheck; late String lastCheck;
int activeFires = 0; int activeFires = 0;
final firesApiUrl = GetIt.instance<String>(instanceName: "firesApiUrl"); final firesApiUrl = GetIt.instance<String>(instanceName: "firesApiUrl");
@override @override
void initState() { void initState() {
super.initState(); super.initState();
http.read('${firesApiUrl}status/last-fire-check').then((result) { http.read(Uri.parse('${firesApiUrl}status/last-fire-check')).then((result) {
try { try {
var now = Moment.now(); var now = Moment.now();
var last = DateTime.parse(json.decode(result)['value']); var last = DateTime.parse(json.decode(result)['value']);
http.read('${firesApiUrl}status/active-fires-count').then((result) { http
.read(Uri.parse('${firesApiUrl}status/active-fires-count'))
.then((result) {
try { try {
int count = json.decode(result)['total']; int count = json.decode(result)['total'];
setState(() { setState(() {
@ -48,24 +50,23 @@ class _GlobalFiresBottomStatsState extends State<GlobalFiresBottomStats> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<Widget> actionWidgets = <Widget>[];
if (activeFires > 0) {
actionWidgets.add(new Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
new Text(
S.of(context).activeFiresWorldWide(activeFires.toString())),
new Text(S.of(context).updatedLastCheck(lastCheck))
]));
}
return new CustomBottomAppBar( return new CustomBottomAppBar(
fabLocation: FloatingActionButtonLocation.centerDocked, fabLocation: FloatingActionButtonLocation.centerDocked,
showNotch: true, showNotch: true,
color: fires100, color: fires100,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
actions: listWithoutNulls(<Widget>[ actions: actionWidgets);
activeFires > 0
? new Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
new Text(S
.of(context)
.activeFiresWorldWide(activeFires.toString())),
new Text(S.of(context).updatedLastCheck(lastCheck))
])
: null,
SizedBox(width: 10.0)
]));
} }
} }

2
lib/globals.dart
View file

@ -5,7 +5,7 @@ import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
String appVersion; late String appVersion;
final Widget appMediumIcon = final Widget appMediumIcon =
Image.asset('images/logo-200.png', width: 60.0, height: 60.0); Image.asset('images/logo-200.png', width: 60.0, height: 60.0);

97
lib/homePage.dart
View file

@ -81,33 +81,9 @@ class _HomePageState extends State<HomePage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_firebaseMessaging.configure(onMessage: (Map<String, dynamic> message) { // Firebase Messaging v5+ setup
debugPrint( _setupFirebaseMessaging();
"onMessage in fireApp (isLoaded: ${store.state.isLoaded}): $message"); _getFirebaseToken();
_showItemDialog(message, _notifForMessage(message, store.state.isLoaded));
return;
}, onLaunch: (Map<String, dynamic> message) {
debugPrint("onLaunch (isLoaded: ${store.state.isLoaded}): $message");
_notifForMessage(message, store.state.isLoaded);
_navigateToItemDetail(message);
return;
}, onResume: (Map<String, dynamic> message) {
debugPrint("onResume (isLoaded: ${store.state.isLoaded}): $message");
_notifForMessage(message, store.state.isLoaded);
_navigateToItemDetail(message);
return;
});
_firebaseMessaging.requestNotificationPermissions(
const IosNotificationSettings(sound: true, badge: true, alert: true));
_firebaseMessaging.onIosSettingsRegistered
.listen((IosNotificationSettings settings) {
print("Settings registered: $settings");
});
_firebaseMessaging.getToken().then((String token) {
// print(token);
store.dispatch(new OnUserTokenAction(token));
setState(() {});
});
initConnectivity(); initConnectivity();
// StreamSubscription<ConnectivityResult> _connectivitySubscription = // StreamSubscription<ConnectivityResult> _connectivitySubscription =
_connectivity.onConnectivityChanged.listen((ConnectivityResult result) { _connectivity.onConnectivityChanged.listen((ConnectivityResult result) {
@ -121,6 +97,53 @@ class _HomePageState extends State<HomePage> {
}); });
} }
void _setupFirebaseMessaging() {
// Request permission for notifications
_firebaseMessaging.requestPermission();
// Listen for messages when app is in foreground
FirebaseMessaging.onMessage.listen((RemoteMessage message) {
debugPrint(
"onMessage in fireApp (isLoaded: ${store.state.isLoaded}): $message");
if (message.data.isNotEmpty) {
_showItemDialog(
message.data as Map<String, dynamic>,
_notifForMessage(
message.data as Map<String, dynamic>, store.state.isLoaded));
}
});
// Listen for messages when app is opened from background
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
debugPrint(
"onMessageOpenedApp (isLoaded: ${store.state.isLoaded}): $message");
if (message.data.isNotEmpty) {
_notifForMessage(
message.data as Map<String, dynamic>, store.state.isLoaded);
_navigateToItemDetail(message.data as Map<String, dynamic>);
}
});
// Check if app was terminated and opened by notification tap
_firebaseMessaging.getInitialMessage().then((RemoteMessage? message) {
if (message != null) {
debugPrint("App opened by notification: $message");
if (message.data.isNotEmpty) {
_navigateToItemDetail(message.data as Map<String, dynamic>);
}
}
});
}
void _getFirebaseToken() {
_firebaseMessaging.getToken().then((String? token) {
if (token != null) {
store.dispatch(new OnUserTokenAction(token));
setState(() {});
}
});
}
final _homeFont = const TextStyle( final _homeFont = const TextStyle(
fontSize: 50.0, fontSize: 50.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -281,12 +304,12 @@ class _HomePageState extends State<HomePage> {
_scaffoldKey.currentContext, FireNotificationList.routeName); _scaffoldKey.currentContext, FireNotificationList.routeName);
} }
// https://pub.dartlang.org/packages/firebase_messaging#-example-tab- // Firebase Messaging instance (v5+)
final FirebaseMessaging _firebaseMessaging = new FirebaseMessaging(); final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
FireNotification _notifForMessage( FireNotification? _notifForMessage(
Map<String, dynamic> message, bool isLoaded) { Map<String, dynamic> message, bool isLoaded) {
FireNotification notif; FireNotification? notif;
try { try {
notif = new FireNotification( notif = new FireNotification(
id: objectIdFromJson(message['id']), id: objectIdFromJson(message['id']),
@ -302,11 +325,13 @@ class _HomePageState extends State<HomePage> {
debugPrint(e.toString()); debugPrint(e.toString());
} }
// if our store is loaded, we just dispatch the notification, if not, we wait til is loaded // if our store is loaded, we just dispatch the notification, if not, we wait til is loaded
if (isLoaded) { if (notif != null) {
store.dispatch(new AddFireNotificationAction(notif)); if (isLoaded) {
} else { store.dispatch(new AddFireNotificationAction(notif));
newNotifications.add(notif); } else {
} newNotifications.add(notif);
}
}
return notif; return notif;
} }
} }

35
lib/models/fireMapState.dart
View file

@ -9,6 +9,7 @@ enum FireMapStatus {
edit, edit,
viewFireNotification viewFireNotification
} }
enum FireMapLayer { osmcGrey, esriSatellite, osmc, esri, esriTerrain } enum FireMapLayer { osmcGrey, esriSatellite, osmc, esri, esriTerrain }
@immutable @immutable
@ -16,11 +17,11 @@ class FireMapState {
final FireMapStatus status; final FireMapStatus status;
final FireMapLayer layer; final FireMapLayer layer;
final int numFires; final int numFires;
final FireNotification fireNotification; final FireNotification? fireNotification;
final List<dynamic> fires; final List<dynamic> fires;
final List<dynamic> falsePos; final List<dynamic> falsePos;
final List<dynamic> industries; final List<dynamic> industries;
final YourLocation yourLocation; final YourLocation? yourLocation;
const FireMapState.initial() const FireMapState.initial()
: this.status = FireMapStatus.view, : this.status = FireMapStatus.view,
@ -34,23 +35,23 @@ class FireMapState {
FireMapState( FireMapState(
{this.status = FireMapStatus.view, {this.status = FireMapStatus.view,
this.layer =FireMapLayer.osmcGrey, this.layer = FireMapLayer.osmcGrey,
this.yourLocation, this.yourLocation,
this.numFires, this.numFires = 0,
this.fires, this.fires = const [],
this.fireNotification, this.fireNotification,
this.falsePos, this.falsePos = const [],
this.industries}); this.industries = const []});
FireMapState copyWith({ FireMapState copyWith({
FireMapStatus status, FireMapStatus? status,
FireMapLayer layer, FireMapLayer? layer,
YourLocation yourLocation, YourLocation? yourLocation,
FireNotification fireNotication, FireNotification? fireNotication,
int numFires, int? numFires,
List<dynamic> fires, List<dynamic>? fires,
List<dynamic> falsePos, List<dynamic>? falsePos,
List<dynamic> industries, List<dynamic>? industries,
}) { }) {
return new FireMapState( return new FireMapState(
yourLocation: yourLocation ?? this.yourLocation, yourLocation: yourLocation ?? this.yourLocation,
@ -90,8 +91,6 @@ class FireMapState {
@override @override
String toString() { String toString() {
return 'FireMapState{status: $status, layer: $layer, numFires: $numFires, fires: ${fires return 'FireMapState{status: $status, layer: $layer, numFires: $numFires, fires: ${fires.length}, falsePos: ${falsePos.length}, industries: ${industries.length}, yourLocation: $yourLocation, fireNotification: $fireNotification}';
.length}, falsePos: ${falsePos.length}, industries: ${industries
.length}, yourLocation: $yourLocation, fireNotification: $fireNotification}';
} }
} }

15
lib/theme.dart
View file

@ -5,13 +5,22 @@ import 'colors.dart';
final ThemeData firesTheme = _buildFiresTheme(); final ThemeData firesTheme = _buildFiresTheme();
ThemeData _buildFiresTheme() { ThemeData _buildFiresTheme() {
final ThemeData base = ThemeData.light(); // light or dark final ThemeData base = ThemeData.light();
return base.copyWith( return base.copyWith(
primaryColor: fires600, primaryColor: fires600,
scaffoldBackgroundColor: firesSurfaceWhite, scaffoldBackgroundColor: firesSurfaceWhite,
cardColor: firesBackgroundWhite, cardColor: firesBackgroundWhite,
textSelectionTheme: TextSelectionThemeData(selectionColor: fires300), colorScheme: ColorScheme.fromSwatch().copyWith(secondary: fires900), colorScheme: ColorScheme(error: firesErrorRed), textSelectionTheme: TextSelectionThemeData(selectionColor: fires300),
colorScheme: ColorScheme.light(
primary: fires600,
secondary: fires900,
error: firesErrorRed,
surface: firesSurfaceWhite,
onSurface: fires900,
onPrimary: Colors.white,
onSecondary: Colors.white,
onError: Colors.white,
),
//TODO: Add the text themes (103) //TODO: Add the text themes (103)
//TODO: Add the icon themes (103) //TODO: Add the icon themes (103)
//TODO: Decorate the inputs (103) //TODO: Decorate the inputs (103)

15
lib/themeDev.dart
View file

@ -5,13 +5,22 @@ import 'colors.dart';
final ThemeData devFiresTheme = _buildFiresTheme(); final ThemeData devFiresTheme = _buildFiresTheme();
ThemeData _buildFiresTheme() { ThemeData _buildFiresTheme() {
final ThemeData base = ThemeData.light(); // light or dark final ThemeData base = ThemeData.light();
return base.copyWith( return base.copyWith(
primaryColor: Colors.pink, primaryColor: Colors.pink,
scaffoldBackgroundColor: firesSurfaceWhite, scaffoldBackgroundColor: firesSurfaceWhite,
cardColor: firesBackgroundWhite, cardColor: firesBackgroundWhite,
textSelectionTheme: TextSelectionThemeData(selectionColor: fires300), colorScheme: ColorScheme.fromSwatch().copyWith(secondary: fires900), colorScheme: ColorScheme(error: firesErrorRed), textSelectionTheme: TextSelectionThemeData(selectionColor: fires300),
colorScheme: ColorScheme.light(
primary: Colors.pink,
secondary: fires900,
error: firesErrorRed,
surface: firesSurfaceWhite,
onSurface: fires900,
onPrimary: Colors.white,
onSecondary: Colors.white,
onError: Colors.white,
),
//TODO: Add the text themes (103) //TODO: Add the text themes (103)
//TODO: Add the icon themes (103) //TODO: Add the icon themes (103)
//TODO: Decorate the inputs (103) //TODO: Decorate the inputs (103)