Merge branch 'master' into release_0_0_2

trufi-association · Sep 18, 2018 · 614466a · 614466a
2 parents 1475c2e + 2a8470c
commit 614466a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/lib/location/location_search_delegate.dart b/lib/location/location_search_delegate.dart
@@ -59,10 +59,12 @@ class LocationSearchDelegate extends SearchDelegate<TrufiLocation> {
   @override
   Widget buildResults(BuildContext context) {
     TrufiLocalizations localizations = TrufiLocalizations.of(context);
-    print("${localizations.searchNavigate} ${_result.description}");
-    Future.delayed(Duration.zero, () {
-      close(context, _result);
-    });
+    if (_result != null) {
+      print("${localizations.searchNavigate} ${_result.description}");
+      Future.delayed(Duration.zero, () {
+        close(context, _result);
+      });
+    }
     return Container();
   }
 

diff --git a/lib/trufi_localizations.dart b/lib/trufi_localizations.dart
@@ -267,12 +267,12 @@ class TrufiLocalizations {
       ChooseLocationPageSubtitle: "Ñit'iy mapapy",
       InstructionWalkStart: 'Juk chiqamanta',
       InstructionWalk: 'puriy',
-      InstructionRide: 'Jap’iy',
-      InstructionRideBus: "Bus ñisqata jap’iy",
+      InstructionRide: 'ñisqata jap’iy',
+      InstructionRideBus: "Bus",
       InstructionMinutes: "ch’inini-phani",
-      InstructionRideMicro: 'Micro ñisqata jap’iy',
-      InstructionRideMinibus: 'Minibus ñisqata jap’iy',
-      InstructionRideTrufi: 'Trufi ñisqata jap’iy',
+      InstructionRideMicro: 'Micro',
+      InstructionRideMinibus: 'Minibus',
+      InstructionRideTrufi: 'Trufi',
       InstructionTo: 'waq chiqaman',
       InstructionFor: 'kama',
       InstructionUnitKilometer: 'km',

diff --git a/lib/trufi_models.dart b/lib/trufi_models.dart
@@ -259,10 +259,11 @@ class PlanItineraryLeg {
     TrufiLocalizations localizations = TrufiLocalizations.of(context);
     StringBuffer sb = StringBuffer();
     if (mode == 'WALK') {
-      sb.write("${localizations.instructionWalkStart} ${_durationString(localizations)} (${_distanceString(localizations)}) ${localizations.instructionTo} ${_toString(localizations)} ${localizations.instructionWalk}" );
+      sb.write(
+          "${localizations.instructionWalkStart} ${_durationString(localizations)} (${_distanceString(localizations)}) ${localizations.instructionTo} ${_toString(localizations)} ${localizations.instructionWalk}");
     } else if (mode == 'BUS') {
       sb.write(
-          "${_carTypeString(localizations)} #$route ${_distanceString(localizations)} -  ${_toString(localizations)} ${localizations.instructionFor} (${_durationString(localizations)}) ${localizations.instructionRide} ");
+          "${_carTypeString(localizations)} #$route ${localizations.instructionRide} ${_distanceString(localizations)} - ${_toString(localizations)} ${localizations.instructionFor} (${_durationString(localizations)})");
     }
     return sb.toString();
   }
@@ -306,7 +307,8 @@ class PlanItineraryLeg {
 
   String _distanceString(TrufiLocalizations localizations) {
     return distance >= 1000
-        ? (distance.ceil() ~/ 1000).toString() + " ${localizations.instructionUnitKm}"
+        ? (distance.ceil() ~/ 1000).toString() +
+            " ${localizations.instructionUnitKm}"
         : distance.ceil().toString() + " ${localizations.instructionUnitMeter}";
   }