Map Control

client/ios/Podfile.lock

@@ -52,6 +52,8 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
+  - rive_common (0.0.1):
+    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - SDWebImage (5.13.2):
@@ -83,6 +85,7 @@ DEPENDENCIES:
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - record_darwin (from `.symlinks/plugins/record_darwin/ios`)
+  - rive_common (from `.symlinks/plugins/rive_common/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - sensors_plus (from `.symlinks/plugins/sensors_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -119,6 +122,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   record_darwin:
     :path: ".symlinks/plugins/record_darwin/ios"
+  rive_common:
+    :path: ".symlinks/plugins/rive_common/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   sensors_plus:
@@ -147,6 +152,7 @@ SPEC CHECKSUMS:
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
+  rive_common: c537b4eed761e903a9403d93c347b69bd7a4762f
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   sensors_plus: 42b9de1b8237675fa8d8121e4bb93be0f79fa61d

client/lib/main.dart

@@ -5,6 +5,7 @@ import 'package:flet_audio/flet_audio.dart' as flet_audio;
 import 'package:flet_audio_recorder/flet_audio_recorder.dart'
     as flet_audio_recorder;
 import 'package:flet_lottie/flet_lottie.dart' as flet_lottie;
+import 'package:flet_map/flet_map.dart' as flet_map;
 import 'package:flet_rive/flet_rive.dart' as flet_rive;
 import 'package:flet_video/flet_video.dart' as flet_video;
 import 'package:flet_webview/flet_webview.dart' as flet_webview;
@@ -26,6 +27,7 @@ void main([List<String>? args]) async {
   flet_audio.ensureInitialized();
   flet_audio_recorder.ensureInitialized();
   flet_lottie.ensureInitialized();
+  flet_map.ensureInitialized();
   flet_rive.ensureInitialized();
   flet_video.ensureInitialized();
   flet_webview.ensureInitialized();
@@ -89,6 +91,7 @@ void main([List<String>? args]) async {
       flet_audio.createControl,
       flet_audio_recorder.createControl,
       flet_lottie.createControl,
+      flet_map.createControl,
       flet_rive.createControl,
       flet_video.createControl,
       flet_webview.createControl

client/pubspec.lock

@@ -253,6 +253,13 @@ packages:
       relative: true
     source: path
     version: "0.22.1"
+  flet_map:
+    dependency: "direct main"
+    description:
+      path: "../packages/flet_map"
+      relative: true
+    source: path
+    version: "0.23.0"
   flet_rive:
     dependency: "direct main"
     description:
@@ -313,6 +320,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_map:
+    dependency: transitive
+    description:
+      name: flutter_map
+      sha256: cda8d72135b697f519287258b5294a57ce2f2a5ebf234f0e406aad4dc14c9399
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.0"
   flutter_markdown:
     dependency: transitive
     description:
@@ -409,10 +424,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: transitive
     description:
@@ -429,30 +444,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+  latlong2:
+    dependency: transitive
+    description:
+      name: latlong2
+      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.1"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -461,6 +484,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  lists:
+    dependency: transitive
+    description:
+      name: lists
+      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  logger:
+    dependency: transitive
+    description:
+      name: logger
+      sha256: "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
   logging:
     dependency: transitive
     description:
@@ -577,10 +616,18 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.0"
+  mgrs_dart:
+    dependency: transitive
+    description:
+      name: mgrs_dart
+      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "2.0.0"
   package_info_plus:
     dependency: transitive
     description:
@@ -693,6 +740,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.7.4"
+  polylabel:
+    dependency: transitive
+    description:
+      name: polylabel
+      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   process:
     dependency: transitive
     description:
@@ -701,6 +756,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.2"
+  proj4dart:
+    dependency: transitive
+    description:
+      name: proj4dart
+      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   record:
     dependency: transitive
     description:
@@ -990,10 +1053,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -1002,6 +1065,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
+  unicode:
+    dependency: transitive
+    description:
+      name: unicode
+      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   universal_platform:
     dependency: transitive
     description:
@@ -1134,10 +1205,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   volume_controller:
     dependency: transitive
     description:
@@ -1242,6 +1313,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.3"
+  wkt_parser:
+    dependency: transitive
+    description:
+      name: wkt_parser
+      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -1268,4 +1347,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.16.6"
+  flutter: ">=3.18.0-18.0.pre.54"

client/pubspec.yaml

@@ -37,6 +37,8 @@ dependencies:
     path: ../packages/flet_audio
   flet_lottie:
     path: ../packages/flet_lottie
+  flet_map:
+    path: ../packages/flet_map
   flet_rive:
     path: ../packages/flet_rive
   flet_audio_recorder:

packages/flet/lib/src/controls/safe_area.dart

@@ -38,7 +38,9 @@ class SafeAreaControl extends StatelessWidget {
             bottom: control.attrBool("bottom", true)!,
             maintainBottomViewPadding:
                 control.attrBool("maintainBottomViewPadding", false)!,
-            minimum: parseEdgeInsets(control, "minimum") ?? EdgeInsets.zero,
+            minimum: parseEdgeInsets(control, "minimumPadding") ??
+                parseEdgeInsets(control, "minimum") ??
+                EdgeInsets.zero,
             child: contentCtrls.isNotEmpty
                 ? createControl(control, contentCtrls.first.id, disabled,
                     parentAdaptive: adaptive)

packages/flet/lib/src/utils/alignment.dart

@@ -50,10 +50,11 @@ WrapCrossAlignment parseWrapCrossAlignment(
       orElse: () => defValue);
 }
 
-Alignment? parseAlignment(Control control, String propName) {
+Alignment? parseAlignment(Control control, String propName,
+    [Alignment? defValue]) {
   var v = control.attrString(propName, null);
   if (v == null) {
-    return null;
+    return defValue;
   }
 
   final j1 = json.decode(v);

packages/flet/lib/src/utils/colors.dart

@@ -250,3 +250,6 @@ MaterialStateProperty<Color?>? parseMaterialStateColor(
   return getMaterialStateProperty<Color?>(
       j1, (jv) => HexColor.fromString(theme, jv as String), null);
 }
+
+Color? parseColorFromJson(ThemeData? theme, [String? colorString = ""]) =>
+    colorString != null ? HexColor.fromString(theme, colorString ?? "") : null;

packages/flet/lib/src/utils/text.dart

@@ -177,39 +177,34 @@ TextStyle textStyleFromJson(ThemeData theme, Map<String, dynamic> json) {
   }
 
   return TextStyle(
-      fontSize: json["size"] != null ? parseDouble(json["size"]) : null,
-      fontWeight: fontWeight != null ? getFontWeight(fontWeight) : null,
-      fontStyle: (json["italic"] != null)
-          ? (parseBool(json["italic"]) ? FontStyle.italic : null)
-          : null,
-      fontFamily: json["font_family"],
-      fontVariations: variations,
-      height: json["height"] != null ? parseDouble(json["height"]) : null,
-      decoration:
-          decorations.isNotEmpty ? TextDecoration.combine(decorations) : null,
-      decorationStyle: json["decoration_style"] != null
-          ? TextDecorationStyle.values.firstWhereOrNull((v) =>
-              v.name.toLowerCase() == json["decoration_style"].toLowerCase())
-          : null,
-      decorationColor: json["decoration_color"] != null
-          ? HexColor.fromString(theme, json["decoration_color"] ?? "")
-          : null,
-      decorationThickness: json["decoration_thickness"] != null
-          ? parseDouble(json["decoration_thickness"])
-          : null,
-      color: json["color"] != null
-          ? HexColor.fromString(theme, json["color"] ?? "")
-          : null,
-      backgroundColor: json["bgcolor"] != null
-          ? HexColor.fromString(theme, json["bgcolor"] ?? "")
-          : null,
-      shadows: json["shadow"] != null
-          ? boxShadowsFromJSON(theme, json["shadow"])
-          : null,
-      foreground: json["foreground"] != null
-          ? paintFromJSON(theme, json["foreground"])
-          : null,
-      letterSpacing: json['letter_spacing'] != null
-          ? parseDouble(json['letter_spacing'])
-          : null);
+    fontSize: json["size"] != null ? parseDouble(json["size"]) : null,
+    fontWeight: fontWeight != null ? getFontWeight(fontWeight) : null,
+    fontStyle: (json["italic"] != null)
+        ? (parseBool(json["italic"]) ? FontStyle.italic : null)
+        : null,
+    fontFamily: json["font_family"],
+    fontVariations: variations,
+    height: json["height"] != null ? parseDouble(json["height"]) : null,
+    decoration:
+        decorations.isNotEmpty ? TextDecoration.combine(decorations) : null,
+    decorationStyle: json["decoration_style"] != null
+        ? TextDecorationStyle.values.firstWhereOrNull((v) =>
+            v.name.toLowerCase() == json["decoration_style"].toLowerCase())
+        : null,
+    decorationColor: parseColorFromJson(theme, json["decoration_color"] ?? ""),
+    decorationThickness: json["decoration_thickness"] != null
+        ? parseDouble(json["decoration_thickness"])
+        : null,
+    color: parseColorFromJson(theme, json["color"]),
+    backgroundColor: parseColorFromJson(theme, json["bgcolor"] ?? ""),
+    shadows: json["shadow"] != null
+        ? boxShadowsFromJSON(theme, json["shadow"])
+        : null,
+    foreground: json["foreground"] != null
+        ? paintFromJSON(theme, json["foreground"])
+        : null,
+    letterSpacing: json['letter_spacing'] != null
+        ? parseDouble(json['letter_spacing'])
+        : null,
+  );
 }