Feat/Trufi-Core 3.2.0 stable

example/android/app/src/main/AndroidManifest.xml

@@ -45,6 +45,13 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- App Links -->
+            <intent-filter android:autoVerify="true">
+              <action android:name="android.intent.action.VIEW" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+              <data android:scheme="https" android:host="trufi.example" android:pathPrefix="/app" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

example/ios/Runner/Info.plist

@@ -22,6 +22,13 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+      <string>https</string>
+      <string>http</string>
+	  <string>sms</string>
+	  <string>tel</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysUsageDescription</key>

example/lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:trufi_core/base/blocs/map_configuration/map_configuration_cubit.dart';
 import 'package:trufi_core/base/models/trufi_latlng.dart';
+import 'package:trufi_core/base/utils/certificates_letsencrypt_android.dart';
 import 'package:trufi_core/base/utils/graphql_client/hive_init.dart';
 import 'package:trufi_core/base/widgets/drawer/menu/social_media_item.dart';
 import 'package:trufi_core/default_values.dart';
@@ -9,6 +10,7 @@ import 'package:trufi_core/trufi_router.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  await CertificatedLetsencryptAndroid.workAroundCertificated();
   await initHiveForFlutter();
   runApp(
     TrufiApp(
@@ -41,6 +43,10 @@ void main() async {
           urlSocialMedia: const UrlSocialMedia(
             urlFacebook: 'https://www.facebook.com/Example',
           ),
+          shareBaseUri: Uri(
+            scheme: "https",
+            host: "trufi.example",
+          ),
         ),
       ),
     ),

example/pubspec.lock

@@ -760,7 +760,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.1.0"
+    version: "3.2.0"
   tuple:
     dependency: transitive
     description:

lib/base/models/journey_plan/leg.dart

@@ -7,6 +7,7 @@ class Leg extends Equatable {
   static const _points = "points";
   static const _mode = "mode";
   static const _route = "route";
+  static const _routeColor = "routeColor";
   static const _routeLongName = "routeLongName";
   static const _toPlace = "to";
   static const _fromPlace = "from";
@@ -18,6 +19,7 @@ class Leg extends Equatable {
   final String points;
   final TransportMode transportMode;
   final TransportRoute? route;
+  final String? routeColor;
   final String? shortName;
   final String? routeLongName;
   final double distance;
@@ -34,6 +36,7 @@ class Leg extends Equatable {
     required this.points,
     required this.transportMode,
     required this.route,
+    required this.routeColor,
     required this.shortName,
     required this.routeLongName,
     required this.distance,
@@ -58,6 +61,7 @@ class Leg extends Equatable {
               ? TransportRoute.fromJson(json[_route] as Map<String, dynamic>)
               : null)
           : null,
+      routeColor: json[_routeColor] as String?,
       shortName: json[_route] != null
           ? ((json[_route] is String) && json[_route] != ''
               ? json[_route] as String
@@ -90,6 +94,7 @@ class Leg extends Equatable {
       _legGeometry: {_points: points},
       _mode: transportMode.name,
       _route: route?.toJson() ?? shortName,
+      _routeColor: routeColor,
       _routeLongName: routeLongName,
       _distance: distance,
       _duration: duration.inSeconds,
@@ -107,6 +112,7 @@ class Leg extends Equatable {
     String? points,
     TransportMode? transportMode,
     TransportRoute? route,
+    String? routeColor,
     String? shortName,
     String? routeLongName,
     double? distance,
@@ -126,6 +132,7 @@ class Leg extends Equatable {
       points: points ?? this.points,
       transportMode: transportMode ?? this.transportMode,
       route: route ?? this.route,
+      routeColor: routeColor ?? this.routeColor,
       shortName: shortName ?? this.shortName,
       routeLongName: routeLongName ?? this.routeLongName,
       distance: distance ?? this.distance,
@@ -159,15 +166,17 @@ class Leg extends Equatable {
     return route?.shortName ?? (route?.longName ?? (shortName ?? ''));
   }
 
+  int? get codeColor => int.tryParse('0xFF${route?.color ?? routeColor}');
+
   Color get primaryColor {
-    return route?.color != null
-        ? Color(int.tryParse('0xFF${route?.color}')!)
+    return codeColor != null
+        ? Color(codeColor!)
         : transportMode.color;
   }
 
   Color get backgroundColor {
-    return route?.color != null
-        ? Color(int.tryParse('0xFF${route?.color}')!)
+    return codeColor!= null
+        ? Color(codeColor!)
         : transportMode.backgroundColor;
   }
 
@@ -176,6 +185,7 @@ class Leg extends Equatable {
         points,
         transportMode,
         route,
+        routeColor,
         shortName,
         routeLongName,
         distance,

lib/base/models/map_provider/leaflet_map_collection.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:trufi_core/base/models/map_provider/trufi_map_definition.dart';
 import 'package:trufi_core/base/pages/transport_list/transport_list_detail/maps/map_transport_provider.dart';
 import 'package:trufi_core/base/pages/home/widgets/trufi_map_route/maps/map_route_provider.dart';
@@ -10,12 +11,22 @@ class LeafletMapCollection implements ITrufiMapProvider {
   }
 
   @override
-  MapRouteProvider mapRouteProvider() {
-    return LeafletMapRouteProvider.create();
+  MapRouteProvider mapRouteProvider({
+    Uri? shareBaseItineraryUri,
+    WidgetBuilder? overlapWidget,
+  }) {
+    return LeafletMapRouteProvider.create(
+      shareBaseItineraryUri: shareBaseItineraryUri,
+      overlapWidget: overlapWidget,
+    );
   }
 
   @override
-  MapTransportProvider mapTransportProvider() {
-    return LeafletMapTransportProvider.create();
+  MapTransportProvider mapTransportProvider({
+    Uri? shareBaseRouteUri,
+  }) {
+    return LeafletMapTransportProvider.create(
+      shareBaseRouteUri: shareBaseRouteUri,
+    );
   }
 }

lib/base/models/map_provider/trufi_map_definition.dart

@@ -7,8 +7,13 @@ import 'package:trufi_core/base/pages/transport_list/services/models.dart';
 
 abstract class ITrufiMapProvider {
   MapChooseLocationProvider mapChooseLocationProvider();
-  MapRouteProvider mapRouteProvider();
-  MapTransportProvider mapTransportProvider();
+  MapRouteProvider mapRouteProvider({
+    Uri? shareBaseItineraryUri,
+    WidgetBuilder? overlapWidget,
+  });
+  MapTransportProvider mapTransportProvider({
+    Uri? shareBaseRouteUri,
+  });
 }
 
 ////////////////////////////////////////////////
@@ -17,6 +22,7 @@ abstract class ITrufiMapProvider {
 abstract class MapChooseLocationProvider {
   ITrufiMapController get trufiMapController;
   MapChooseLocationBuilder get mapChooseLocationBuilder;
+  MapChooseLocationProvider rebuild();
 }
 
 abstract class IMapChooseLocation extends Widget {
@@ -49,6 +55,8 @@ typedef MapRouteBuilder = Widget Function(
 abstract class MapTransportProvider {
   ITrufiMapController get trufiMapController;
   MapTransportBuilder get mapTransportBuilder;
+  Uri? get shareBaseRouteUri;
+  MapTransportProvider rebuild();
 }
 
 typedef MapTransportBuilder = Widget Function(

lib/base/pages/feedback/translations/feedback_localizations_de.dart

@@ -11,7 +11,7 @@ class FeedbackLocalizationDe extends FeedbackLocalization {
   String get menuFeedback => 'Feedback';
 
   @override
-  String get feedbackTitle => 'E-Mail senden';
+  String get feedbackTitle => 'Send us a comment';
 
   @override
   String get feedbackContent => 'Haben Sie Vorschläge für unsere App oder haben Sie Fehler in den Daten gefunden? Wir würden gerne von Ihnen hören! Bitte geben Sie Ihre E-Mail-Adresse oder Ihre Telefonnummer an, damit wir Ihnen antworten können.';

lib/base/pages/feedback/translations/feedback_localizations_en.dart

@@ -11,7 +11,7 @@ class FeedbackLocalizationEn extends FeedbackLocalization {
   String get menuFeedback => 'Send Feedback';
 
   @override
-  String get feedbackTitle => 'Please e-mail us';
+  String get feedbackTitle => 'Send us a comment';
 
   @override
   String get feedbackContent => 'Do you have suggestions for our app or found some errors in the data? We would love to hear from you! Please make sure to add your email address or telephone, so we can respond to you.';

lib/base/pages/feedback/translations/feedback_localizations_es.dart

@@ -11,7 +11,7 @@ class FeedbackLocalizationEs extends FeedbackLocalization {
   String get menuFeedback => 'Enviar comentarios';
 
   @override
-  String get feedbackTitle => 'Envíanos un correo electrónico';
+  String get feedbackTitle => 'Envíanos un comentario';
 
   @override
   String get feedbackContent => '¿Tienes sugerencias para nuestra aplicación o has encontrado algunos errores en los datos? ¡Nos encantaría saberlo! Asegúrate de agregar tu dirección de correo electrónico o teléfono para que podamos responderte.';

lib/base/pages/home/home.dart

@@ -121,10 +121,10 @@ class _HomePageState extends State<HomePage>
               children: [
                 BlocListener<MapRouteCubit, MapRouteState>(
                   listener: (buildContext, state) {
-                    repaintMap(mapRouteCubit, state);
-                    // TODO fix trufiMapController.onReady
-                    // widget.mapRouteProvider.trufiMapController.onReady
-                    //     .then((_) {});
+                    widget.mapRouteProvider.trufiMapController.onReady
+                        .then((_) {
+                      repaintMap(mapRouteCubit, state);
+                    });
                   },
                   child: CustomScrollableContainer(
                     openedPosition: 200,

lib/base/pages/home/map_route_cubit/map_route_cubit.dart

@@ -22,8 +22,10 @@ class MapRouteCubit extends Cubit<MapRouteState> {
 
   CancelableOperation<Plan?>? currentFetchPlanOperation;
 
-  MapRouteCubit(String otpEndpoint)
-      : _requestManager = RestRequestPlanService(otpEndpoint: otpEndpoint),
+  MapRouteCubit(String otpEndpoint,
+      {RequestPlanService? customRequestPlanService})
+      : _requestManager = customRequestPlanService ??
+            RestRequestPlanService(otpEndpoint: otpEndpoint),
         super(const MapRouteState()) {
     _load();
   }

lib/base/pages/home/services/online_request_plan/rest_request_plan.dart

@@ -10,6 +10,7 @@ import 'package:trufi_core/base/models/trufi_place.dart';
 import 'package:trufi_core/base/pages/home/services/exception/fetch_online_exception.dart';
 import 'package:trufi_core/base/pages/home/services/request_plan_service.dart';
 import 'package:trufi_core/base/utils/packge_info_platform.dart';
+import 'package:trufi_core/base/utils/trufi_app_id.dart';
 
 class RestRequestPlanService implements RequestPlanService {
   static const String searchPath = '/geocode';
@@ -56,8 +57,9 @@ class RestRequestPlanService implements RequestPlanService {
   Future<http.Response> _fetchRequest(Uri request) async {
     try {
       final packageInfoVersion = await PackageInfoPlatform.version();
+      final uniqueId = TrufiAppId.getUniqueId;
       return await http.get(request, headers: {
-        "User-Agent": "Trufi/$packageInfoVersion",
+        "User-Agent": "Trufi/$packageInfoVersion/$uniqueId",
       });
     } on Exception catch (e) {
       throw FetchOnlineRequestException(e);

lib/base/pages/home/widgets/plan_itinerary_tabs/itinarary_card/mode_leg.dart

@@ -20,7 +20,11 @@ class ModeLeg extends StatelessWidget {
   Widget build(BuildContext context) {
     final perc = legLength.abs() / 10;
     return SizedBox(
-      width: (maxWidth * perc) >= 24 ? (maxWidth * perc) : 24,
+      width: perc > 1
+          ? maxWidth
+          : (maxWidth * perc) >= 24
+              ? (maxWidth * perc)
+              : 24,
       height: 30,
       child: IconTransport(
         bacgroundColor: leg.backgroundColor,
@@ -53,7 +57,11 @@ class WaitLeg extends StatelessWidget {
   Widget build(BuildContext context) {
     final perc = legLength.abs() / 10;
     return SizedBox(
-      width: (maxWidth * perc) >= 24 ? (maxWidth * perc) : 24,
+      width: perc > 1
+          ? maxWidth
+          : (maxWidth * perc) >= 24
+              ? (maxWidth * perc)
+              : 24,
       height: 30,
       child: IconTransport(
         bacgroundColor: TransportMode.walk.backgroundColor,
@@ -88,7 +96,11 @@ class RouteLeg extends StatelessWidget {
   Widget build(BuildContext context) {
     final perc = legLength.abs() / 10;
     return SizedBox(
-      width: (maxWidth * perc) >= 24 ? (maxWidth * perc) : 24,
+      width: perc > 1
+          ? maxWidth
+          : (maxWidth * perc) >= 24
+              ? (maxWidth * perc)
+              : 24,
       height: 30,
       child: ClipRRect(
         child: IconTransport(

lib/base/pages/home/widgets/trufi_map_route/maps/leaflet_map_route.dart

@@ -10,7 +10,7 @@ import 'package:trufi_core/base/models/journey_plan/plan.dart';
 import 'package:trufi_core/base/models/trufi_latlng.dart';
 import 'package:trufi_core/base/pages/home/map_route_cubit/map_route_cubit.dart';
 import 'package:trufi_core/base/pages/home/widgets/trufi_map_route/load_location.dart';
-// import 'package:trufi_core/base/pages/home/widgets/trufi_map_route/maps/share_itinerary_button.dart';
+import 'package:trufi_core/base/pages/home/widgets/trufi_map_route/maps/share_itinerary_button.dart';
 import 'package:trufi_core/base/widgets/base_maps/leaflet_maps/leaflet_map.dart';
 import 'package:trufi_core/base/widgets/base_maps/leaflet_maps/leaflet_map_controller.dart';
 import 'package:trufi_core/base/widgets/base_maps/leaflet_maps/utils/leaflet_map_utils.dart';
@@ -21,11 +21,13 @@ import 'package:trufi_core/base/widgets/screen/screen_helpers.dart';
 class LeafletMapRoute extends StatefulWidget {
   final LeafletMapController trufiMapController;
   final AsyncExecutor asyncExecutor;
+  final Uri? shareBaseItineraryUri;
   final WidgetBuilder? overlapWidget;
   const LeafletMapRoute({
     Key? key,
     required this.trufiMapController,
     required this.asyncExecutor,
+    this.shareBaseItineraryUri,
     this.overlapWidget,
   }) : super(key: key);
 
@@ -91,8 +93,12 @@ class _LeafletMapRouteState extends State<LeafletMapRoute>
                     key: _cropButtonKey,
                     onPressed: _handleOnCropPressed,
                   ),
-                  // const Padding(padding: EdgeInsets.all(4.0)),
-                  // if (mapRouteState.isPlanCorrect) const ShareItineraryButton(),
+                  const Padding(padding: EdgeInsets.all(4.0)),
+                  if (mapRouteState.isPlanCorrect &&
+                      widget.shareBaseItineraryUri != null)
+                    ShareItineraryButton(
+                      shareBaseItineraryUri: widget.shareBaseItineraryUri!,
+                    ),
                 ],
               ),
             );

lib/base/pages/home/widgets/trufi_map_route/maps/map_route_provider.dart

@@ -16,14 +16,18 @@ class LeafletMapRouteProvider implements MapRouteProvider {
     required this.mapRouteBuilder,
   });
 
-  factory LeafletMapRouteProvider.create({WidgetBuilder? overlapWidget}) {
+  factory LeafletMapRouteProvider.create({
+    Uri? shareBaseItineraryUri,
+    WidgetBuilder? overlapWidget,
+  }) {
     final trufiMapController = LeafletMapController();
     return LeafletMapRouteProvider(
       trufiMapController: trufiMapController,
       mapRouteBuilder: (mapContext, asyncExecutor) {
         return LeafletMapRoute(
           trufiMapController: trufiMapController,
           asyncExecutor: asyncExecutor,
+          shareBaseItineraryUri: shareBaseItineraryUri,
           overlapWidget: overlapWidget,
         );
       },