refactor to use dio. better error handling. translations

FogosPT · Jun 11, 2019 · e30af0f · e30af0f
1 parent 4e3f209
commit e30af0f
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 49 deletions.
diff --git a/lib/localization/fogos_localizations.dart b/lib/localization/fogos_localizations.dart
@@ -493,8 +493,19 @@ class FogosLocalizations {
       name: 'textFiresList',
       desc: 'Fires List',
   );
-
 
+  String get textProblemLoadingData => Intl.message(
+      "Houve um problema a carregar a informação.",
+      name: 'textProblemLoadingData',
+      desc: 'There was a problem loading data.',
+  );
+
+   String get textInternetConnection => Intl.message(
+      "Certifique-se que está ligado à Internet.",
+      name: 'textInternetConnection',
+      desc: 'Make sure you are connected to the Internet',
+  );
+
   String textFireStatus(FireStatus status) {
     switch (status) {
       case FireStatus.arrival:

diff --git a/lib/localization/generated/l10n/intl_messages_en.arb b/lib/localization/generated/l10n/intl_messages_en.arb
@@ -1,6 +1,6 @@
 {
   "@@locale": "en",
-  "@@last_modified": "2019-05-30T09:56:25.562305",
+  "@@last_modified": "2019-06-11T11:18:27.773623",
   "appTitle": "Fogos.pt",
   "@appTitle": {
     "description": "App title",
@@ -421,5 +421,17 @@
     "description": "Fires List",
     "type": "text",
     "placeholders": {}
+  },
+  "textProblemLoadingData": "There was a problem loading data.",
+  "@textProblemLoadingData": {
+    "description": "There was a problem loading data.",
+    "type": "text",
+    "placeholders": {}
+  },
+  "textInternetConnection": "Make sure you are connected to the Internet.",
+  "@textInternetConnection": {
+    "description": "Make sure you are connected to the Internet",
+    "type": "text",
+    "placeholders": {}
   }
 }
diff --git a/lib/localization/generated/l10n/intl_messages_pt.arb b/lib/localization/generated/l10n/intl_messages_pt.arb
@@ -1,6 +1,6 @@
 {
   "@@locale": "pt",
-  "@@last_modified": "2019-05-30T09:56:25.562305",
+  "@@last_modified": "2019-06-11T11:18:27.773623",
   "appTitle": "Fogos.pt",
   "@appTitle": {
     "description": "App title",
@@ -421,5 +421,17 @@
     "description": "Fires List",
     "type": "text",
     "placeholders": {}
+  },
+  "textProblemLoadingData": "Houve um problema a carregar a informação.",
+  "@textProblemLoadingData": {
+    "description": "There was a problem loading data.",
+    "type": "text",
+    "placeholders": {}
+  },
+  "textInternetConnection": "Certifique-se que está ligado à Internet.",
+  "@textInternetConnection": {
+    "description": "Make sure you are connected to the Internet",
+    "type": "text",
+    "placeholders": {}
   }
-}
+}
diff --git a/lib/middleware/fires_middleware.dart b/lib/middleware/fires_middleware.dart
@@ -1,9 +1,7 @@
-import 'dart:io';
-
 import 'package:fogosmobile/models/fire_details.dart';
 import 'package:fogosmobile/utils/model_utils.dart';
 import 'package:redux/redux.dart';
-import 'package:http/http.dart' as http;
+import 'package:dio/dio.dart';
 import 'dart:convert';
 
 import 'package:fogosmobile/models/app_state.dart';
@@ -23,8 +21,7 @@ List<Middleware<AppState>> firesMiddleware() {
     TypedMiddleware<AppState, LoadFiresAction>(loadFires),
     TypedMiddleware<AppState, LoadFireAction>(loadFire),
     TypedMiddleware<AppState, LoadFireMeansHistoryAction>(loadFireMeansHistory),
-    TypedMiddleware<AppState, LoadFireDetailsHistoryAction>(
-        loadFireDetailsHistory),
+    TypedMiddleware<AppState, LoadFireDetailsHistoryAction>(loadFireDetailsHistory),
     TypedMiddleware<AppState, LoadFireRiskAction>(loadFireRisk),
   ];
 }
@@ -36,16 +33,16 @@ Middleware<AppState> _createLoadFires() {
 
     try {
       String url = Endpoints.getFires;
-      final response = await http.get(url);
-      final responseData = json.decode(response.body)['data'];
-      List<Fire> fires =
-          responseData.map<Fire>((model) => Fire.fromJson(model)).toList();
-      print("load fires");
+      Response response = await Dio().get(url);
+      final responseData = json.decode(response.data)["data"];
+      List<Fire> fires = responseData.map<Fire>((model) => Fire.fromJson(model)).toList();
       fires = calculateFireImportance(fires);
       store.dispatch(new FiresLoadedAction(fires));
     } catch (e) {
       store.dispatch(new FiresLoadedAction([]));
-      if (!(e is SocketException)) {
+      store.dispatch(new AddErrorAction('fires'));
+      if (!(e is DioError)) {
+        print('throwing error');
         throw e;
       }
     }
@@ -57,16 +54,28 @@ Middleware<AppState> _createLoadFire() {
   return (Store store, action, NextDispatcher next) async {
     next(action);
 
+    String url = '${Endpoints.getFire}${action.fireId}';
+
     try {
-      String url = '${Endpoints.getFire}${action.fireId}';
-      final response = await http.get(url);
-      final responseData = json.decode(response.body)['data'];
+      Response response = await Dio().get(url);
+      final responseData = json.decode(response.data)["data"];
+      if (responseData == null) {
+        throw new StateError('No fire data could be loaded: $url');
+      }
+
       Fire fire = Fire.fromJson(responseData);
       store.dispatch(new FireLoadedAction(fire));
     } catch (e) {
       store.dispatch(new FireLoadedAction(null));
       store.dispatch(new AddErrorAction('fire'));
-      if (!(e is SocketException)) {
+      if (e is DioError) {
+        if (e.response != null) {
+          if (e.response.statusCode >= 400) {
+            throw new StateError('Server responded with ${e.response.statusCode}: $url');
+          }
+        }
+      } else {
+        print('throwing error');
         throw e;
       }
     }
@@ -76,18 +85,28 @@ Middleware<AppState> _createLoadFire() {
 Middleware<AppState> _createLoadFireMeansHistory() {
   return (Store store, action, NextDispatcher next) async {
     next(action);
-    print('create means history');
+    String url = '${Endpoints.getFireMeansHistory}${action.fireId}';
+
     try {
-      String url = '${Endpoints.getFireMeansHistory}${action.fireId}';
-      final response = await http.get(url);
-      final responseData = json.decode(response.body)['data'];
+      Response response = await Dio().get(url);
+      final responseData = json.decode(response.data)["data"];
+      if (responseData == null) {
+        throw new StateError('No getFireMeansHistory could be loaded: $url');
+      }
       MeansHistory data = MeansHistory.fromJson(responseData);
       store.dispatch(new RemoveErrorAction('fireMeansHistory'));
       store.dispatch(new FireMeansHistoryLoadedAction(data));
     } catch (e) {
       store.dispatch(new FireMeansHistoryLoadedAction(null));
       store.dispatch(new AddErrorAction('fireMeansHistory'));
-      if (!(e is SocketException)) {
+      if (e is DioError) {
+        if (e.response != null) {
+          if (e.response.statusCode >= 400) {
+            throw new StateError('Server responded with ${e.response.statusCode}: $url');
+          }
+        }
+      } else {
+        print('throwing error');
         throw e;
       }
     }
@@ -97,18 +116,28 @@ Middleware<AppState> _createLoadFireMeansHistory() {
 Middleware<AppState> _createLoadFireDetailsHistory() {
   return (Store store, action, NextDispatcher next) async {
     next(action);
-    print('create details history');
+    String url = '${Endpoints.getFireDetailsHistory}${action.fireId}';
+
     try {
-      String url = '${Endpoints.getFireDetailsHistory}${action.fireId}';
-      final response = await http.get(url);
-      final responseData = json.decode(response.body)['data'];
+      Response response = await Dio().get(url);
+      final responseData = json.decode(response.data)["data"];
+      if (responseData == null) {
+        throw new StateError('No getFireDetailsHistory could be loaded: $url');
+      }
       DetailsHistory data = DetailsHistory.fromJson(responseData);
       store.dispatch(new RemoveErrorAction('fireDetailsHistory'));
       store.dispatch(new FireDetailsHistoryLoadedAction(data));
     } catch (e) {
       store.dispatch(new FireDetailsHistoryLoadedAction(null));
       store.dispatch(new AddErrorAction('fireDetailsHistory'));
-      if (!(e is SocketException)) {
+      if (e is DioError) {
+        if (e.response != null) {
+          if (e.response.statusCode >= 400) {
+            throw new StateError('Server responded with ${e.response.statusCode}: $url');
+          }
+        }
+      } else {
+        print('throwing error');
         throw e;
       }
     }
@@ -118,17 +147,30 @@ Middleware<AppState> _createLoadFireDetailsHistory() {
 Middleware<AppState> _createLoadFireRisk() {
   return (Store store, action, NextDispatcher next) async {
     next(action);
-    print('create risk');
+
+    String url = '${Endpoints.getFireRisk}${action.fireId}';
+
     try {
-      String url = '${Endpoints.getFireRisk}${action.fireId}';
-      final response = await http.get(url);
-      String responseData = json.decode(response.body)['data'][0]['hoje'];
+      Response response = await Dio().get(url);
+      final responseData = json.decode(response.data)["data"][0]['hoje'];
+
+      if (responseData == null) {
+        throw new StateError('No getFireRisk could be loaded: $url');
+      }
+
       store.dispatch(new RemoveErrorAction('fireRisk'));
       store.dispatch(new FireRiskLoadedAction(responseData));
     } catch (e) {
       store.dispatch(new FireRiskLoadedAction(null));
       store.dispatch(new AddErrorAction('fireRisk'));
-      if (!(e is SocketException)) {
+      if (e is DioError) {
+        if (e.response != null) {
+          if (e.response.statusCode >= 400) {
+            throw new StateError('Server responded with ${e.response.statusCode}: $url');
+          }
+        }
+      } else {
+        print('throwing error');
         throw e;
       }
     }

diff --git a/lib/screens/components/details_history.dart b/lib/screens/components/details_history.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:fogosmobile/actions/fires_actions.dart';
+import 'package:fogosmobile/localization/fogos_localizations.dart';
 import 'package:fogosmobile/models/app_state.dart';
 import 'package:fogosmobile/models/fire_details.dart';
 import 'package:fogosmobile/screens/utils/widget_utils.dart';
@@ -21,7 +22,7 @@ class DetailsHistoryStats extends StatelessWidget {
 
         if (stats == null) {
           if (state.errors != null && state.errors.contains('fireDetailsHistory')) {
-            return Center(child: Text('There was an error loading this chart.'));
+            return Center(child: Text(FogosLocalizations.of(context).textProblemLoadingData));
           }
           return Center(child: CircularProgressIndicator());
         }

diff --git a/lib/screens/components/fireRisk.dart b/lib/screens/components/fireRisk.dart
@@ -28,7 +28,7 @@ class FireRisk extends StatelessWidget {
 
         if (stats == null) {
           if (state.errors != null && state.errors.contains('fireRisk')) {
-            return Center(child: Text('There was an error loading this chart.'));
+            return Center(child: Text(FogosLocalizations.of(context).textProblemLoadingData));
           }
           return Center(child: CircularProgressIndicator());
         }

diff --git a/lib/screens/components/fire_details.dart b/lib/screens/components/fire_details.dart
@@ -32,7 +32,7 @@ class FireDetails extends StatelessWidget {
             Fire fire = state.fire;
             if (fire == null) {
               if (state.errors != null && state.errors.contains('fire')) {
-                return Center(child: Text('There was an error loading this info.'));
+                return Center(child: Text(FogosLocalizations.of(context).textProblemLoadingData));
               }
 
               return ModalProgressHUD(

diff --git a/lib/screens/components/meansStatistics.dart b/lib/screens/components/meansStatistics.dart
@@ -24,7 +24,7 @@ class MeansStatistics extends StatelessWidget {
 
         if (stats == null) {
           if (state.errors != null && state.errors.contains('fireMeansHistory')) {
-            return Center(child: Text('There was an error loading this chart.'));
+            return Center(child: Text(FogosLocalizations.of(context).textProblemLoadingData));
           }
           return Center(child: CircularProgressIndicator());
         }

diff --git a/lib/screens/home_page.dart b/lib/screens/home_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:fogosmobile/actions/fires_actions.dart';
+import 'package:fogosmobile/localization/fogos_localizations.dart';
 import 'package:fogosmobile/models/app_state.dart';
 import 'package:fogosmobile/models/fire.dart';
 import 'package:fogosmobile/screens/components/fire_details.dart';
@@ -51,6 +52,62 @@ class HomePage extends StatelessWidget {
       builder: (BuildContext context, AppState state) {
         final store = StoreProvider.of<AppState>(context);
 
+        if (state.fires.length < 1) {
+          if (state.errors != null && state.errors.contains('fires')) {
+            return Stack(
+              children: <Widget>[
+                new FlutterMap(
+                  mapController: mapController,
+                  options: new MapOptions(
+                    center: _center,
+                    zoom: 7.0,
+                    minZoom: 1.0,
+                    maxZoom: 20.0,
+                  ),
+                  layers: [
+                    new TileLayerOptions(
+                      urlTemplate: MAPBOX_URL_TEMPLATE,
+                      additionalOptions: {
+                        'accessToken': MAPBOX_ACCESS_TOKEN,
+                        'id': MAPBOX_ID,
+                      },
+                    ),
+                  ],
+                ),
+                MapboxCopyright(),
+                Center(
+                  child: Container(
+                    height: 150,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(4.0),
+                      color: Colors.black54,
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: <Widget>[
+                          Text(
+                            FogosLocalizations.of(context).textProblemLoadingData,
+                            style: TextStyle(color: Colors.white),
+                            textAlign: TextAlign.center,
+                          ),
+                          Text(
+                            FogosLocalizations.of(context).textInternetConnection,
+                            style: TextStyle(color: Colors.white),
+                            textAlign: TextAlign.center,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                )
+              ],
+            );
+          }
+        }
+
         if (state.fires != null) {
           for (final Fire fire in state.fires) {
             if (state.activeFilters.contains(fire.status)) {
@@ -61,13 +118,9 @@ class HomePage extends StatelessWidget {
                   point: new LatLng(fire.lat, fire.lng),
                   builder: (BuildContext context) {
                     return new Container(
-                      decoration: BoxDecoration(
-                          color: getFireColor(fire),
-                          shape: BoxShape.circle),
+                      decoration: BoxDecoration(color: getFireColor(fire), shape: BoxShape.circle),
                       child: IconButton(
-                        icon: new SvgPicture.asset(
-                            getCorrectStatusImage(
-                                fire.statusCode, fire.important),
+                        icon: new SvgPicture.asset(getCorrectStatusImage(fire.statusCode, fire.important),
                             semanticsLabel: 'Acme Logo'),
                         onPressed: () async {
                           store.dispatch(ClearFireAction());

diff --git a/lib/screens/warnings.dart b/lib/screens/warnings.dart
@@ -28,7 +28,7 @@ class Warnings extends StatelessWidget {
             List warnings = state.warnings;
             if (warnings == null) {
               if (state.errors != null && state.errors.contains('warnings')) {
-                return Center(child: Text('There was an error loading this info.'));
+                return Center(child: Text(FogosLocalizations.of(context).textProblemLoadingData));
               }
 
               return Center(child: CircularProgressIndicator());