flet-map 1.0.4__tar.gz → 1.1.0.dev1__tar.gz

{flet_map-1.0.4/src/flet_map.egg-info → flet_map-1.1.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-map
-Version: 1.0.4
+Version: 1.1.0.dev1
 Summary: Interactive map controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev1
 Dynamic: license-file
 
 # flet-map

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-map"
-version = "1.0.4"
+version = "1.1.0.dev1"
 description = "Interactive map controls for Flet apps."
 readme = "README.md"
 authors = [{ name = "Flet contributors", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==1.0.4",
+    "flet==1.1.0.dev1",
 ]
 
 [project.urls]

{flet_map-1.0.4 → flet_map-1.1.0.dev1/src/flet_map.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-map
-Version: 1.0.4
+Version: 1.1.0.dev1
 Summary: Interactive map controls for Flet apps.
 Author-email: Flet contributors <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -11,7 +11,7 @@ Project-URL: Issues, https://github.com/flet-dev/flet/issues
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev1
 Dynamic: license-file
 
 # flet-map

flet_map-1.1.0.dev1/src/flet_map.egg-info/requires.txt

@@ -0,0 +1 @@
+flet==1.1.0.dev1

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/circle_layer.dart

@@ -1,5 +1,4 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/extension.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/widgets.dart';
 
 import 'circle_layer.dart';
 import 'map.dart';

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/map.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map_animations/flutter_map_animations.dart';
 

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/marker_layer.dart

@@ -1,5 +1,4 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map_animations/flutter_map_animations.dart';
 

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/overlay_image_layer.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 import 'utils/map.dart';

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/polygon_layer.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 import 'utils/map.dart';

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/polyline_layer.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 import 'utils/map.dart';

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/rich_attribution.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 import 'utils/attribution_alignment.dart';
@@ -44,11 +44,16 @@ class _RichAttributionControlState extends State<RichAttributionControl>
         .nonNulls
         .toList();
 
+    var permanentHeight = widget.control.getDouble("permanent_height", 24.0)!;
+
     return BaseControl(
       control: widget.control,
       child: RichAttributionWidget(
           attributions: attributions,
-          permanentHeight: widget.control.getDouble("permanent_height", 24.0)!,
+          permanentHeight: permanentHeight,
+          openButton: (context, open) => _openButton(open, permanentHeight),
+          closeButton: (context, close) =>
+              _closeButton(context, close, permanentHeight),
           popupBackgroundColor: widget.control.getColor(
               "popup_bgcolor", context, Theme.of(context).colorScheme.surface),
           showFlutterMapAttribution:
@@ -61,4 +66,31 @@ class _RichAttributionControlState extends State<RichAttributionControl>
               .getDuration("popup_initial_display_duration", Duration.zero)!),
     );
   }
+
+  /// The button that opens the attributions popup.
+  ///
+  /// Same as `RichAttributionWidget`'s default, which flutter_map builds from
+  /// the Flutter SDK's Material library rather than `material_ui`.
+  Widget _openButton(VoidCallback open, double size) {
+    return IconButton(
+      onPressed: open,
+      tooltip: 'Attributions',
+      icon: Icon(Icons.info_outlined, color: Colors.black, size: size),
+    );
+  }
+
+  /// The button that closes the attributions popup.
+  ///
+  /// Same as `RichAttributionWidget`'s default, but colored from the app's
+  /// theme: the default reads the SDK's Material theme, which apps rendered
+  /// with `material_ui` don't provide, so it fell back to a dark icon on dark
+  /// popups.
+  Widget _closeButton(BuildContext context, VoidCallback close, double size) {
+    return IconButton(
+      onPressed: close,
+      icon: Icon(Icons.cancel_outlined,
+          color: Theme.of(context).textTheme.titleSmall?.color ?? Colors.black,
+          size: size),
+    );
+  }
 }

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/simple_attribution.dart

@@ -1,5 +1,5 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 class SimpleAttributionControl extends StatelessWidget {

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/tile_layer.dart

@@ -1,5 +1,4 @@
 import 'package:flet/flet.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
 

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/lib/src/utils/map.dart

@@ -1,6 +1,6 @@
 import 'package:flet/flet.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';

{flet_map-1.0.4 → flet_map-1.1.0.dev1}/src/flutter/flet_map/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: none
 
 environment:
   sdk: '>=3.2.3 <4.0.0'
-  flutter: ">=1.17.0"
+  flutter: ">=3.47.0"
 
 dependencies:
   flutter:
@@ -16,6 +16,7 @@ dependencies:
   flutter_map_animations: 0.10.0
   latlong2: 0.9.1
 
+  material_ui: ^1.6.0
   flet:
     path: ../../../../../../../packages/flet
 

flet_map-1.0.4/src/flet_map.egg-info/requires.txt

@@ -1 +0,0 @@
-flet==1.0.4