implement for android

josxha · Oct 19, 2024 · d0afadb · d0afadb
1 parent b0c5382
commit d0afadb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/lib/src/native/widget_state_jni.dart b/lib/src/native/widget_state_jni.dart
@@ -66,14 +66,14 @@ final class MapLibreMapStateJni extends MapLibreMapState
     _hostApi = pigeon.MapLibreHostApi(messageChannelSuffix: channelSuffix);
     pigeon.MapLibreFlutterApi.setUp(this, messageChannelSuffix: channelSuffix);
     _viewId = viewId;
-    setState(() => isInitialized = true);
     jni.Logger.setVerbosity(jni.Logger.WARN);
   }
 
   @override
   void onMapReady() {
     widget.onEvent?.call(MapEventMapCreated(mapController: this));
     widget.onMapCreated?.call(this);
+    setState(() => isInitialized = true);
   }
 
   @override

diff --git a/lib/src/ui/attribution.dart b/lib/src/ui/attribution.dart
@@ -87,14 +87,18 @@ class _AttributionState extends State<Attribution> {
                         ],
                         ...attributions.map(_HtmlWidget.new),
                       ],
-                      IconButton(
-                        onPressed: () => setState(() {
-                          _initMapCamera = null;
-                          _expanded = !_expanded;
-                        }),
-                        icon: const Icon(Icons.info, size: 18),
-                        padding: const EdgeInsets.all(4),
-                        constraints: const BoxConstraints(),
+                      // The SizedBox enforces the height on android (web works without it).
+                      SizedBox.square(
+                        dimension: 30,
+                        child: IconButton(
+                          onPressed: () => setState(() {
+                            _initMapCamera = null;
+                            _expanded = !_expanded;
+                          }),
+                          icon: const Icon(Icons.info, size: 18),
+                          padding: const EdgeInsets.all(4),
+                          constraints: const BoxConstraints(),
+                        ),
                       ),
                     ],
                   ),

diff --git a/lib/src/ui/scalebar.dart b/lib/src/ui/scalebar.dart
@@ -19,14 +19,15 @@ class Scalebar extends StatelessWidget {
     final futureMetersPerPixel = controller.getMetersPerPixelAtLatitude(
       camera.center.lat.toDouble(),
     );
+    final theme = Theme.of(context);
     return Container(
       alignment: Alignment.bottomLeft,
       padding: const EdgeInsets.all(12),
       child: FutureBuilder<double>(
         future: futureMetersPerPixel,
         builder: (context, snapshot) {
           if (snapshot.data case final double data) {
-            return CustomPaint(painter: _ScaleBarPainter(data));
+            return CustomPaint(painter: _ScaleBarPainter(data, theme));
           }
           return const SizedBox.shrink();
         },
@@ -36,15 +37,17 @@ class Scalebar extends StatelessWidget {
 }
 
 class _ScaleBarPainter extends CustomPainter {
-  _ScaleBarPainter(this.metersPerPixel);
+  _ScaleBarPainter(this.metersPerPixel, this.theme);
 
   final double metersPerPixel;
+  final ThemeData theme;
 
-  final _linePaint = Paint()
-    ..color = Colors.black
+  late final _linePaint = Paint()
+    ..color = theme.textTheme.bodySmall?.color ?? Colors.black
     ..strokeWidth = 1.5;
 
-  final _backgroundPaint = Paint()..color = Colors.white60;
+  late final _backgroundPaint = Paint()
+    ..color = theme.scaffoldBackgroundColor.withOpacity(0.62);
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -105,7 +108,7 @@ class _ScaleBarPainter extends CustomPainter {
 
     final textPainter = TextPainter(
       text: TextSpan(
-        style: const TextStyle(fontSize: 12),
+        style: theme.textTheme.bodySmall,
         text: '${meters / unit.meters} ${unit.abbreviation}',
       ),
       textAlign: TextAlign.left,

diff --git a/lib/src/ui/zoom_buttons.dart b/lib/src/ui/zoom_buttons.dart
@@ -35,13 +35,15 @@ class ZoomButtons extends StatelessWidget {
               heroTag: 'MapLibreZoomInButton',
               onPressed: () => controller.animateCamera(
                 zoom: controller.getCamera().zoom + 1,
+                nativeDuration: Duration(milliseconds: 200),
               ),
               child: const Icon(Icons.add),
             ),
             FloatingActionButton(
               heroTag: 'MapLibreZoomOutButton',
               onPressed: () => controller.animateCamera(
                 zoom: controller.getCamera().zoom - 1,
+                nativeDuration: Duration(milliseconds: 200),
               ),
               child: const Icon(Icons.remove),
             ),