Merge pull request #520 from EnsembleUI/newMaps

New maps

Author: vusters

.ios/Podfile

@@ -31,7 +31,7 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 
   pod 'FlutterPluginRegistrant', :path => File.join('Flutter', 'FlutterPluginRegistrant'), :inhibit_warnings => true
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.7.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.9.0'
 end
 
 post_install do |installer|

assets/schema/ensemble_schema.json

@@ -3061,7 +3061,15 @@
                     }
                   }
                 },
-                "scrollableOverlay": {
+                "markerOverlayMaxWidth": {
+                  "type": "integer",
+                  "description": "Marker overlay stretches to fill available horizontal space. Use this to cap its width on larger screens. (default 500)"
+                },
+                "markerOverlayMaxHeight": {
+                  "type": "integer",
+                  "description": "Set the max height of the marker overlay. (default: 50% of the screen height)"
+                },
+                "scrollableMarkerOverlay": {
                   "type": "boolean",
                   "description": "If using overlay and there are more than one marker, swiping left/right within the overlay will navigate to next/previous marker"
                 },

lib/framework/data_context.dart

@@ -445,14 +445,23 @@ class Formatter with Invokable {
       'prettyDateTime': (input) => InvokablePrimitive.prettyDateTime(input),
       'prettyCurrency': (input) => InvokablePrimitive.prettyCurrency(input),
       'prettyDuration': (input) =>
-          InvokablePrimitive.prettyDuration(input, locale: locale)
+          InvokablePrimitive.prettyDuration(input, locale: locale),
+      'pluralize': pluralize
     };
   }
 
   @override
   Map<String, Function> setters() {
     return {};
   }
+
+  String pluralize(String singularText, int? count, [pluralText]) {
+    count ??= 1;
+    if (count <= 1) {
+      return singularText;
+    }
+    return pluralText ?? '${singularText}s';
+  }
 }
 
 class UserInfo with Invokable {

lib/framework/widget/widget.dart

@@ -27,13 +27,22 @@ abstract class WidgetState<W extends HasController> extends BaseWidgetState<W> {
         return const SizedBox.shrink();
       }
       Widget rtn = buildWidget(context);
+
+      // wrap inside Align if specified
+      if ((widget.controller as WidgetController).alignToParent != null) {
+        rtn = Align(
+            alignment: (widget.controller as WidgetController).alignToParent!,
+            child: rtn);
+      }
+
       if ((widget.controller as WidgetController).expanded == true) {
         /// Important notes:
         /// 1. If the Column/Row is scrollable, putting Expanded on the child will cause layout exception
         /// 2. If Column/Row is inside a parent without height/width constraint, it will collapse its size.
         ///    So if we put Expanded on the Column's child, layout exception will occur
         rtn = Expanded(child: rtn);
       }
+
       return rtn;
     }
     throw LanguageError("Wrong usage of widget controller!");

lib/widget/helpers/controllers.dart

@@ -12,6 +12,9 @@ abstract class WidgetController extends Controller {
   bool visible = true;
   String? id; // do we need this?
 
+  // wrap widget inside an Align widget
+  Alignment? alignToParent;
+
   // optional label/labelHint for use in Forms
   String? label;
   String? description;
@@ -30,6 +33,7 @@ abstract class WidgetController extends Controller {
     return {
       'expanded': (value) => expanded = Utils.getBool(value, fallback: false),
       'visible': (value) => visible = Utils.getBool(value, fallback: true),
+      'alignToParent': (value) => alignToParent = Utils.getAlignment(value),
       'label': (value) => label = Utils.optionalString(value),
       'description': (value) => description = Utils.optionalString(value),
       'labelHint': (value) => labelHint = Utils.optionalString(value),

lib/widget/maps/maps.dart

@@ -33,6 +33,10 @@ class Maps extends StatefulWidget
     return {
       'width': (value) => _controller.width = Utils.optionalInt(value),
       'height': (value) => _controller.height = Utils.optionalInt(value),
+      'markerOverlayMaxWidth': (value) => _controller.markerOverlayMaxWidth =
+          Utils.getInt(value, fallback: _controller.markerOverlayMaxWidth),
+      'markerOverlayMaxHeight': (value) => _controller.markerOverlayMaxHeight =
+          Utils.getInt(value, fallback: _controller.markerOverlayMaxHeight),
       'initialCameraPosition': (cameraPosition) =>
           _controller.initialCameraPosition = cameraPosition,
       'autoZoom': (value) => _controller.autoZoom =
@@ -46,8 +50,9 @@ class Maps extends StatefulWidget
               fallback: _controller.includeCurrentLocationInAutoZoom),
       'mapType': (value) => _controller.mapType = value,
       'markers': (markerData) => setMarkers(markerData),
-      'scrollableOverlay': (value) => _controller.scrollableOverlay =
-          Utils.getBool(value, fallback: _controller.scrollableOverlay),
+      'scrollableMarkerOverlay': (value) => _controller
+              .scrollableMarkerOverlay =
+          Utils.getBool(value, fallback: _controller.scrollableMarkerOverlay),
       'autoSelect': (value) => _controller.autoSelect =
           Utils.getBool(value, fallback: _controller.autoSelect),
       'onMapCreated': (action) => _controller.onMapCreated =
@@ -108,11 +113,15 @@ class MyController extends WidgetController with LocationCapability {
   int? height;
   int? width;
 
+  // overlay fill available horizontal space, so cap max width/height
+  int markerOverlayMaxWidth = 500;
+  int markerOverlayMaxHeight = 500;
+  bool scrollableMarkerOverlay = false;
+
   final defaultCameraLatLng = const LatLng(37.773972, -122.431297);
   final double defaultCameraZoom = 10;
   dynamic initialCameraPosition;
 
-  bool scrollableOverlay = false;
   bool autoSelect = true;
 
   bool autoZoom = false;

lib/widget/maps/maps_overlay.dart

@@ -5,8 +5,14 @@ import 'package:pointer_interceptor/pointer_interceptor.dart';
 
 class MapsOverlay extends StatelessWidget {
   const MapsOverlay(this.overlayWidget,
-      {super.key, this.scrollable = true, this.onScrolled});
+      {super.key,
+      this.scrollable = true,
+      this.onScrolled,
+      this.maxWidth,
+      this.maxHeight});
   final Widget overlayWidget;
+  final int? maxWidth;
+  final int? maxHeight;
   final bool scrollable;
   final OverlayScrollCallback? onScrolled;
 
@@ -17,23 +23,31 @@ class MapsOverlay extends StatelessWidget {
     var content =
         kIsWeb ? PointerInterceptor(child: overlayWidget) : overlayWidget;
 
-    return Positioned(
-        right: 0,
-        left: 0,
-        bottom: 0,
-        child: scrollable && onScrolled != null
-            ? GestureDetector(
-                onHorizontalDragEnd: (details) {
-                  if (details.primaryVelocity != null) {
-                    if (details.primaryVelocity! < 0) {
-                      onScrolled!(true); // next marker
-                    } else if (details.primaryVelocity! > 0) {
-                      onScrolled!(false); // previous marker
-                    }
-                  }
-                },
-                child: content)
-            : content);
+    var gestureWrapper = scrollable && onScrolled != null
+        ? GestureDetector(
+            onHorizontalDragEnd: (details) {
+              if (details.primaryVelocity != null) {
+                if (details.primaryVelocity! < 0) {
+                  onScrolled!(true); // next marker
+                } else if (details.primaryVelocity! > 0) {
+                  onScrolled!(false); // previous marker
+                }
+              }
+            },
+            child: content)
+        : content;
+
+    return Align(
+        alignment: Alignment.bottomCenter,
+        child: ConstrainedBox(
+            constraints: BoxConstraints(
+                maxWidth: maxWidth?.toDouble() ?? 500,
+                maxHeight: maxHeight?.toDouble() ?? Device().screenHeight / 2),
+            // always stretch the content, up to the constraints
+            child: SizedBox(
+              width: double.infinity,
+              child: gestureWrapper,
+            )));
   }
 }
 

lib/widget/maps/maps_state.dart

@@ -451,9 +451,11 @@ class MapsState extends MapsActionableState
       _overlayWidget != null && _selectedMarkerId != null
           ? MapsOverlay(
               _overlayWidget!,
-              scrollable: widget.controller.scrollableOverlay,
+              scrollable: widget.controller.scrollableMarkerOverlay,
               onScrolled: (isNext) =>
                   isNext ? _selectNextMarker() : _selectPreviousMarker(),
+              maxWidth: widget.controller.markerOverlayMaxWidth,
+              maxHeight: widget.controller.markerOverlayMaxHeight,
             )
           : const SizedBox.shrink()
     ]);