1.1.0

Author: Arthur Abrantes

.env

@@ -10,7 +10,7 @@ DEV_URLS_API_KEY = AIzaSyCh6OCFrssXSWPKXICqWp_eWdkOHcv1e8M
 
 # cloud functions config
 EMULATE_CLOUD_FUNCTIONS = false
-HOST_IP_ADDRESS = 192.168.0.104
+HOST_IP_ADDRESS = 192.168.0.103
 CLOUD_FUNCTIONS_PORT = 5001
 
 ################################################################################

Makefile

@@ -65,7 +65,7 @@ rundev: check-dev-env
 run: check-env
 	$(FLUTTERRUN) \
 	-v \
-	--release \
+	--debug \
 	--flavor prod \
 	--dart-define=IOS_GOOGLE_MAPS_API_KEY=$(IOS_GOOGLE_MAPS_API_KEY) \
 	--dart-define=ANDROID_GOOGLE_MAPS_API_KEY=$(ANDROID_GOOGLE_MAPS_API_KEY) \

android/app/src/main/AndroidManifest.xml

@@ -55,6 +55,6 @@
         <!--@arthur added googleMapsApiKey so google maps sdk works-->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyDSncKvHZCRNVlb24bCQGJn2Ra9HrFjk7g" />
+            android:value="AIzaSyDtewMXcgzwFyulh6SkPH7_aMRXRVQDLiA" />
     </application>
 </manifest>

ios/Runner/AppDelegate.swift

@@ -31,7 +31,7 @@ import GoogleMaps
     }
     // provide API key so google Maps SDK works for iOS
     // TODO: get from --dart-define
-    GMSServices.provideAPIKey("AIzaSyALo1HaLc0mN0cwfChySKdz04zY9k-pGVk")
+    GMSServices.provideAPIKey("AIzaSyCK58KogR8m_I_unlhint9mwQkAy-_Ft3g")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

lib/app.dart

@@ -101,6 +101,13 @@ class _AppState extends State<App> {
       );
     }
     initializeModels();
+
+    // throw error if there is no connection, so Start screen can be pushed
+    bool hasConnection = await connectivity.checkConnection();
+    if (!hasConnection) {
+      throw FirebaseAuthException(code: "network-error");
+    }
+
     // download user data so we can know whether client has an account and
     // decide to push Start or Home screens
     try {
@@ -177,8 +184,8 @@ class _AppState extends State<App> {
     // download client and trip data
     await user.downloadData(firebaseModel, notify: false);
     await tripModel.downloadData(
-      firebase: firebaseModel,
-      partner: partner,
+      firebaseModel,
+      partner,
       notify: false,
     );
   }
@@ -261,7 +268,8 @@ class _AppState extends State<App> {
                 initialRoute: !firebase.isRegistered ||
                         user.id == null ||
                         (snapshot.hasError &&
-                            error.code == "user-initialization-error")
+                            (error.code == "user-initialization-error" ||
+                                error.code == "network-error"))
                     ? Start.routeName
                     : Home.routeName,
                 // pass appropriate arguments to routes

lib/models/connectivity.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:connectivity/connectivity.dart';
 import 'package:flutter/material.dart';
-import 'package:rider_frontend/styles.dart';
 import 'package:rider_frontend/utils/utils.dart';
 
 class ConnectivityModel extends ChangeNotifier {
@@ -17,8 +16,8 @@ class ConnectivityModel extends ChangeNotifier {
     // start listening for connectivity changes
     _connectivity = Connectivity();
     _connectivitySubscription = _connectivity.onConnectivityChanged
-        .listen((e) async => await _checkConnection());
-    _checkConnection();
+        .listen((e) async => await checkConnection());
+    checkConnection();
   }
 
   @override
@@ -30,7 +29,7 @@ class ConnectivityModel extends ChangeNotifier {
   }
 
   // checkConnection tests whether there is a connection
-  Future<void> _checkConnection() async {
+  Future<bool> checkConnection() async {
     bool previousHasConnection = _hasConnection;
 
     try {
@@ -48,6 +47,8 @@ class ConnectivityModel extends ChangeNotifier {
     if (previousHasConnection != _hasConnection) {
       notifyListeners();
     }
+
+    return _hasConnection;
   }
 
   Future<void> alertWhenOffline(BuildContext context, {String message}) async {

lib/models/trip.dart

@@ -144,9 +144,9 @@ class TripModel extends ChangeNotifier {
   }
 
   // downloadData sends requests to download data about current trips and partner
-  Future<void> downloadData({
+  Future<void> downloadData(
     FirebaseModel firebase,
-    PartnerModel partner,
+    PartnerModel partner, {
     bool notify = true,
   }) async {
     Trip trip;
@@ -164,7 +164,7 @@ class TripModel extends ChangeNotifier {
     // wait a little bit and try again
     if (trip.tripStatus == TripStatus.waitingPayment) {
       await Future.delayed(Duration(milliseconds: 500));
-      return downloadData(firebase: firebase, partner: partner, notify: notify);
+      return downloadData(firebase, partner, notify: notify);
     }
 
     // if trip has already been completed, clear the model

lib/models/user.dart

@@ -166,16 +166,16 @@ class UserModel extends ChangeNotifier {
     }
   }
 
-  // updates user geocoding whenever they move at least 50 meters
-  void updateGeocodingOnPositionChange() {
+  // updates user geocoding whenever they move at least 5 meters
+  void handlePositionUpdates() {
     try {
       Stream<Position> userPositionStream = Geolocator.getPositionStream(
         desiredAccuracy: LocationAccuracy.best,
-        distanceFilter: 50,
+        distanceFilter: 10,
       );
       // cancel previous subscription if it exists
       cancelPositionChangeSubscription();
-      // subscribe to changes in position, updating position and gocoding on changes
+      // subscribe to changes in position, updating position and geocoding on changes
       _positionSubscription = userPositionStream.listen((position) async {
         _position = position;
         await getGeocoding(position, notify: false);
@@ -200,7 +200,7 @@ class UserModel extends ChangeNotifier {
         geocoding.results.length > 0) {
       geocodingResult = geocoding.results[0];
     }
-    // set user position
+    // set user geocoding
     _geocoding = geocodingResult;
     if (notify) {
       notifyListeners();

lib/screens/defineRoute.dart

@@ -138,7 +138,19 @@ class DefineRouteState extends State<DefineRoute> {
     return GoBackScaffold(
       resizeToAvoidBottomInset: false,
       lockScreen: lockScreen,
-      onPressed: () => Navigator.pop(context, true),
+      onPressed: () {
+        // if user is not accessing this screen in 'edit' mode, clear pickUp and
+        // dropOff points if they pop back to the previous screen. This way, when
+        // they reopen this screen the next time around, "Localização atual selecionada"
+        // will show up and correclty display their current location, as opposed ot
+        // it not showing up and a previous current location being preselected as
+        // their pickUP point
+        if (widget.mode == DefineRouteMode.request) {
+          widget.trip.updatePickUpAddres(null);
+          widget.trip.updateDropOffAddres(null);
+        }
+        Navigator.pop(context, true);
+      },
       children: [
         Text(
           "Escolha o ponto de partida e o destino.",

lib/screens/home.dart

@@ -23,7 +23,6 @@ import 'package:rider_frontend/screens/start.dart';
 import 'package:rider_frontend/styles.dart';
 import 'package:rider_frontend/utils/utils.dart';
 import 'package:rider_frontend/vendors/firebaseFunctions/interfaces.dart';
-import 'package:rider_frontend/vendors/firebaseFunctions/methods.dart';
 import 'package:rider_frontend/vendors/firebaseDatabase/methods.dart';
 import 'package:rider_frontend/vendors/geolocator.dart';
 import 'package:rider_frontend/widgets/confirmTripWidget.dart';
@@ -87,7 +86,8 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
     // asks them to reshare. The function is only defined once the tree has been
     // built though, to avoid exceptions of trying to ask for location permission
     // simultaneously. After all, we already ask for them in initState.
-    if (didChangeAppLifecycleCallback != null) {
+    if (didChangeAppLifecycleCallback != null &&
+        state == AppLifecycleState.resumed) {
       didChangeAppLifecycleCallback();
     }
   }
@@ -109,7 +109,6 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
 
     // add listeners after tree is built and we have context
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      // after finishing _getUserPosition,
       userPositionFuture.then((position) async {
         if (position != null) {
           // user retrieved lat and lng to set maps camera view. notifying is
@@ -177,7 +176,7 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
     final screenWidth = MediaQuery.of(context).size.width;
     TripModel trip = Provider.of<TripModel>(context, listen: false);
     UserModel user = Provider.of<UserModel>(context, listen: false);
-    GoogleMapsModel googleMaps = Provider.of<GoogleMapsModel>(context);
+    PartnerModel partner = Provider.of<PartnerModel>(context, listen: false);
     FirebaseModel firebase = Provider.of<FirebaseModel>(context);
     ConnectivityModel connectivity = Provider.of<ConnectivityModel>(context);
 
@@ -190,12 +189,14 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
         // download user data
         try {
           user.downloadData(firebase);
-          trip.downloadData();
+          trip.downloadData(firebase, partner);
         } catch (e) {}
         // save fcm token to database
         firebase.messaging.getToken().then(
               (token) => saveTokenToDatabase(token),
             );
+        // update user position
+        _getUserPosition();
       }
     }
 
@@ -232,12 +233,21 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
         // so if user stops sharing location or disable notificatoin, we will know.
         if (didChangeAppLifecycleCallback == null) {
           didChangeAppLifecycleCallback = () async {
+            Position userPos;
             try {
-              await determineUserPosition();
-            } catch (e) {
+              userPos = await determineUserPosition();
+              if (userPos != null) {
+                // if user has not stopped sharing location, call handlePositionUpdates so
+                // we are sure we're listening to location updates, just in case the OS
+                // decided to kill the process while the app was in the background.
+                widget.user.handlePositionUpdates();
+              }
+            } catch (_) {
+              // if user stopped sharing location, trigger getUserPosition
               _getUserPosition();
             }
 
+            // ask user to reactivate notificaitons if they stopped them
             await firebase.requestNotifications(context);
 
             // on android, workaround the google maps issue of not displaying the
@@ -254,32 +264,33 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
           drawer: Menu(),
           body: Stack(
             children: [
-              GoogleMap(
-                myLocationButtonEnabled: googleMaps.myLocationButtonEnabled,
-                myLocationEnabled: googleMaps.myLocationEnabled,
-                trafficEnabled: false,
-                zoomControlsEnabled: false,
-                mapType: MapType.normal,
-                initialCameraPosition: CameraPosition(
-                  target: googleMaps.initialCameraLatLng ??
-                      LatLng(-17.217600, -46.874621), // defaults to paracatu
-                  zoom: googleMaps.initialZoom ?? 16.5,
-                ),
-                padding: EdgeInsets.only(
-                  top: googleMaps.googleMapsTopPadding ?? screenHeight / 12,
-                  bottom:
-                      googleMaps.googleMapsBottomPadding ?? screenHeight / 8.5,
-                  left: screenWidth / 20,
-                  right: screenWidth / 20,
-                ),
-                onMapCreated: (c) async {
-                  await googleMaps.onMapCreatedCallback(c, notify: false);
-                  // call _redrawUIOnTripUpdate so UI is updated only when maps is ready
-                  await _redrawUIOnTripUpdate(context);
-                },
-                polylines: Set<Polyline>.of(googleMaps.polylines.values),
-                markers: googleMaps.markers,
-              ),
+              Consumer<GoogleMapsModel>(builder: (context, g, _) {
+                return GoogleMap(
+                  myLocationButtonEnabled: g.myLocationButtonEnabled,
+                  myLocationEnabled: g.myLocationEnabled,
+                  trafficEnabled: false,
+                  zoomControlsEnabled: false,
+                  mapType: MapType.normal,
+                  initialCameraPosition: CameraPosition(
+                    target: g.initialCameraLatLng ??
+                        LatLng(-17.217600, -46.874621), // defaults to paracatu
+                    zoom: g.initialZoom ?? 16.5,
+                  ),
+                  padding: EdgeInsets.only(
+                    top: g.googleMapsTopPadding ?? screenHeight / 12,
+                    bottom: g.googleMapsBottomPadding ?? screenHeight / 8.5,
+                    left: screenWidth / 20,
+                    right: screenWidth / 20,
+                  ),
+                  onMapCreated: (c) async {
+                    await g.onMapCreatedCallback(c, notify: false);
+                    // call _redrawUIOnTripUpdate so UI is updated only when maps is ready
+                    await _redrawUIOnTripUpdate(context);
+                  },
+                  polylines: Set<Polyline>.of(g.polylines.values),
+                  markers: g.markers,
+                );
+              }),
               Consumer<UserModel>(builder: (context, u, _) {
                 return Stack(
                   children: [
@@ -362,7 +373,7 @@ class HomeState extends State<Home> with WidgetsBindingObserver {
     // if we could get position, make sure to resubscribe to position changes
     // again, as the subscription may have been cancelled if user stopped
     // sharing location.
-    widget.user.updateGeocodingOnPositionChange();
+    widget.user.handlePositionUpdates();
     return pos;
   }