multi: maplibre android 11.6.+, more tests, fix MapOptions.of(context) / MapOptions.maybeOf(context) (#129)

josxha · web-flow · commit 1ecea891ebab · 2024-11-08T12:08:54.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,7 +147,7 @@ jobs:
 #        run: |
 #          flutter drive \
 #            --driver=test_driver/integration_test.dart \
-#            --target=integration_test/smoke_test.dart \
+#            --target=integration_test/main.dart \
 #            -d web-server \
 #            --release \
 #            --browser-name=chrome
diff --git a/android/build.gradle b/android/build.gradle
@@ -65,9 +65,10 @@ android {
     }
 
     dependencies {
+        // noinspection GradleDynamicVersion
+        implementation 'org.maplibre.gl:android-sdk:11.6.+' // JNIGEN
 // JNIGEN       implementation project(":MapLibreAndroid")
 // JNIGEN        implementation 'com.google.code.gson:gson:2.11.0'
-        implementation 'org.maplibre.gl:android-sdk:11.6.0' // JNIGEN
 // JNIGEN        implementation 'org.maplibre.gl:maplibre-android-gestures:0.0.3'
 // JNIGEN        implementation 'org.maplibre.gl:android-sdk-geojson:6.0.1'
 // JNIGEN        implementation 'org.maplibre.gl:android-sdk-turf:6.0.1'
diff --git a/codecov.yml b/codecov.yml
@@ -9,5 +9,5 @@ comment:
 
 ignore:
   - "**/*.g.dart"
-  - "lib/src/platform/android/jni"
-  - "example"
+  - "lib/src/platform/android/jni/**"
+  - "example/**"
diff --git a/jnigen.yml b/jnigen.yml
@@ -5,7 +5,6 @@ maven_downloads:
 preamble: |
   // Autogenerated by jnigen. DO NOT EDIT!
   
-  // coverage:ignore-file
   // ignore_for_file: public_member_api_docs
   // ignore_for_file: require_trailing_commas
   // ignore_for_file: unnecessary_raw_strings
@@ -24,7 +23,7 @@ android_sdk_config:
 suspend_fun_to_async: true
 output:
   dart:
-    path: 'lib/src/native/jni/'
+    path: 'lib/src/platform/android/jni/'
 source_path:
   - 'android/src/main'
 classes:
diff --git a/lib/src/annotation/circle_annotation_layer.dart b/lib/src/annotation/circle_annotation_layer.dart
@@ -48,10 +48,10 @@ class CircleAnnotationLayer extends AnnotationLayer<Point> {
         'circle-radius': radius,
         'circle-color': color.toHexStringNoOpacity(),
         'circle-blur': blur,
-        'circle-opacity': color.opacity,
+        'circle-opacity': opacity,
         'circle-stroke-width': strokeWidth,
         'circle-stroke-color': strokeColor.toHexStringNoOpacity(),
-        'circle-stroke-opacity': strokeColor.opacity,
+        'circle-stroke-opacity': strokeOpacity,
       };
 
   @override
diff --git a/lib/src/annotation/polygon_annotation_layer.dart b/lib/src/annotation/polygon_annotation_layer.dart
@@ -22,7 +22,7 @@ class PolygonAnnotationLayer extends AnnotationLayer<Polygon> {
   @override
   Map<String, Object> getPaint() => {
         'fill-color': color.toHexStringNoOpacity(),
-        'fill-opacity': color.opacity,
+        'fill-opacity': opacity,
         'fill-outline-color': outlineColor.toHexStringNoOpacity(),
       };
 
diff --git a/lib/src/annotation/polyline_annotation_layer.dart b/lib/src/annotation/polyline_annotation_layer.dart
@@ -35,7 +35,7 @@ class PolylineAnnotationLayer extends AnnotationLayer<LineString> {
   @override
   Map<String, Object> getPaint() => {
         'line-color': color.toHexStringNoOpacity(),
-        'line-opacity': color.opacity,
+        'line-opacity': opacity,
         'line-width': width,
         'line-gap-width': gapWidth,
         if (dashArray case final List<int> dashArray)
diff --git a/lib/src/map_options.dart b/lib/src/map_options.dart
@@ -30,14 +30,14 @@ class MapOptions {
 
   /// Find the [MapOptions] of the closest [MapLibreMap] in the widget tree.
   /// Returns null if called outside of the [MapLibreMap.children].
-  static MapController? maybeOf(BuildContext context) =>
-      MapLibreInheritedModel.maybeMapControllerOf(context);
+  static MapOptions? maybeOf(BuildContext context) =>
+      MapLibreInheritedModel.maybeMapControllerOf(context)?.options;
 
   /// Find the [MapOptions] of the closest [MapLibreMap] in the widget tree.
   /// Throws an [StateError] if called outside of the [MapLibreMap.children].
-  static MapController of(BuildContext context) =>
+  static MapOptions of(BuildContext context) =>
       maybeOf(context) ??
-      (throw StateError('Unable to find an instance of MapController'));
+      (throw StateError('Unable to find an instance of MapOptions'));
 
   /// The style URL that should get used. If not set, the default MapLibre style
   /// is used (https://demotiles.maplibre.org/style.json).
diff --git a/test/annotation/annotation_manager_test.dart b/test/annotation/annotation_manager_test.dart
@@ -3,7 +3,7 @@ import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/annotation/annotation_manager.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../shared/ui_app.dart';
+import '../shared/mocks.dart';
 
 class MockSource extends Mock implements Source {}
 
diff --git a/test/annotation/models_test.dart b/test/annotation/models_test.dart
@@ -24,6 +24,11 @@ void main() {
       expect(o, isNot(equals(o2)));
       expect(o.hashCode, equals(o.hashCode));
       expect(o.hashCode, isNot(equals(o2.hashCode)));
+
+      expect(o.getSourceId(5123), contains(5123.toString()));
+      expect(o.getLayerId(1532), contains(1532.toString()));
+      expect(o.getLayout(), isA<Map<String, Object>>());
+      expect(o.getPaint(), isA<Map<String, Object>>());
     });
     test('MarkerAnnotationLayer', () {
       final o = MarkerAnnotationLayer(
@@ -48,6 +53,11 @@ void main() {
       expect(o, isNot(equals(o2)));
       expect(o.hashCode, equals(o.hashCode));
       expect(o.hashCode, isNot(equals(o2.hashCode)));
+
+      expect(o.getSourceId(5123), contains(5123.toString()));
+      expect(o.getLayerId(1532), contains(1532.toString()));
+      expect(o.getLayout(), isA<Map<String, Object>>());
+      expect(o.getPaint(), isA<Map<String, Object>>());
     });
     test('PolygonAnnotationLayer', () {
       final o = PolygonAnnotationLayer(
@@ -74,6 +84,11 @@ void main() {
       expect(o, isNot(equals(o2)));
       expect(o.hashCode, equals(o.hashCode));
       expect(o.hashCode, isNot(equals(o2.hashCode)));
+
+      expect(o.getSourceId(5123), contains(5123.toString()));
+      expect(o.getLayerId(1532), contains(1532.toString()));
+      expect(o.getLayout(), isA<Map<String, Object>>());
+      expect(o.getPaint(), isA<Map<String, Object>>());
     });
     test('PolylineAnnotationLayer', () {
       final o = PolylineAnnotationLayer(
@@ -103,6 +118,11 @@ void main() {
       expect(o, isNot(equals(o2)));
       expect(o.hashCode, equals(o.hashCode));
       expect(o.hashCode, isNot(equals(o2.hashCode)));
+
+      expect(o.getSourceId(5123), contains(5123.toString()));
+      expect(o.getLayerId(1532), contains(1532.toString()));
+      expect(o.getLayout(), isA<Map<String, Object>>());
+      expect(o.getPaint(), isA<Map<String, Object>>());
     });
   });
 }
diff --git a/test/dependency_injection.dart b/test/dependency_injection.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:maplibre/maplibre.dart';
+import 'package:mocktail/mocktail.dart';
+
+import 'shared/mocks.dart';
+import 'shared/ui_app.dart';
+
+void main() {
+  group('Dependency Injection', () {
+    testWidgets('MapController', (tester) async {
+      final mockCamera = MockMapCamera();
+      final mockController = MockMapController();
+
+      final app = App(
+        camera: mockCamera,
+        controller: mockController,
+        children: [
+          Builder(
+            builder: (context) {
+              expect(MapController.maybeOf(context), equals(mockController));
+              expect(MapController.of(context), equals(mockController));
+              return const SizedBox.shrink();
+            },
+          ),
+        ],
+      );
+      await tester.pumpWidget(app);
+      await tester.pumpAndSettle();
+    });
+    testWidgets('MapCamera', (tester) async {
+      final mockCamera = MockMapCamera();
+      final mockController = MockMapController();
+
+      final app = App(
+        camera: mockCamera,
+        controller: mockController,
+        children: [
+          Builder(
+            builder: (context) {
+              expect(MapCamera.maybeOf(context), equals(mockCamera));
+              expect(MapCamera.of(context), equals(mockCamera));
+              return const SizedBox.shrink();
+            },
+          ),
+        ],
+      );
+      await tester.pumpWidget(app);
+      await tester.pumpAndSettle();
+    });
+    testWidgets('MapOptions', (tester) async {
+      final mockCamera = MockMapCamera();
+      final mockController = MockMapController();
+      final mockOptions = MockMapOptions();
+      when(() => mockController.options).thenReturn(mockOptions);
+
+      final app = App(
+        camera: mockCamera,
+        controller: mockController,
+        children: [
+          Builder(
+            builder: (context) {
+              expect(MapOptions.maybeOf(context), equals(mockOptions));
+              expect(MapOptions.of(context), equals(mockOptions));
+              return const SizedBox.shrink();
+            },
+          ),
+        ],
+      );
+      await tester.pumpWidget(app);
+      await tester.pumpAndSettle();
+    });
+  });
+}
diff --git a/test/models_test.dart b/test/models_test.dart
@@ -1,6 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:maplibre/maplibre.dart';
 
+import 'shared/mocks.dart';
+
 void main() {
   group('Model Classes', () {
     test('QueriedLayer', () {
@@ -165,5 +167,50 @@ void main() {
       expect(oString, contains(o.totalTiles.toString()));
       expect(oString, contains(o.totalTilesEstimated.toString()));
     });
+    test('MapEvents', () {
+      final controller = MockMapController();
+      final camera = MockMapCamera();
+      final position = MockPosition();
+
+      final mapCreated = MapEventMapCreated(mapController: controller);
+      expect(mapCreated, isA<MapEvent>());
+      expect(mapCreated.mapController, equals(controller));
+
+      final moveCamera = MapEventMoveCamera(camera: camera);
+      expect(moveCamera, isA<MapEvent>());
+      expect(moveCamera.camera, equals(camera));
+
+      const startMoveCamera = MapEventStartMoveCamera(
+        reason: CameraChangeReason.apiGesture,
+      );
+      expect(startMoveCamera, isA<MapEvent>());
+      expect(startMoveCamera.reason, equals(CameraChangeReason.apiGesture));
+
+      final click = MapEventClick(point: position);
+      expect(click, isA<MapEvent>());
+      expect(click.point, equals(position));
+      expect(click.toString(), contains('MapEventClick'));
+
+      final doubleClick = MapEventDoubleClick(point: position);
+      expect(doubleClick, isA<MapEvent>());
+      expect(doubleClick.point, equals(position));
+      expect(doubleClick.toString(), contains('MapEventDoubleClick'));
+
+      final secondaryClick = MapEventSecondaryClick(point: position);
+      expect(secondaryClick, isA<MapEvent>());
+      expect(secondaryClick.point, equals(position));
+      expect(secondaryClick.toString(), contains('MapEventSecondaryClick'));
+
+      final longClick = MapEventLongClick(point: position);
+      expect(longClick, isA<MapEvent>());
+      expect(longClick.point, equals(position));
+      expect(longClick.toString(), contains('MapEventLongClick'));
+
+      const idle = MapEventIdle();
+      expect(idle, isA<MapEvent>());
+
+      const cameraIdle = MapEventCameraIdle();
+      expect(cameraIdle, isA<MapEvent>());
+    });
   });
 }
diff --git a/test/shared/annotation_app.dart b/test/shared/annotation_app.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/inherited_model.dart';
-import 'package:mocktail/mocktail.dart';
 
 class App extends StatelessWidget {
   const App({
@@ -29,7 +28,3 @@ class App extends StatelessWidget {
     );
   }
 }
-
-class MockMapController extends Mock implements MapController {}
-
-class MockDuration extends Mock implements Duration {}
diff --git a/test/shared/mocks.dart b/test/shared/mocks.dart
@@ -0,0 +1,12 @@
+import 'package:maplibre/maplibre.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockMapController extends Mock implements MapController {}
+
+class MockMapCamera extends Mock implements MapCamera {}
+
+class MockMapOptions extends Mock implements MapOptions {}
+
+class MockDuration extends Mock implements Duration {}
+
+class MockPosition extends Mock implements Position {}
diff --git a/test/shared/ui_app.dart b/test/shared/ui_app.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/inherited_model.dart';
-import 'package:mocktail/mocktail.dart';
 
 class App extends StatelessWidget {
   const App({
@@ -29,7 +28,3 @@ class App extends StatelessWidget {
     );
   }
 }
-
-class MockMapController extends Mock implements MapController {}
-
-class MockDuration extends Mock implements Duration {}
diff --git a/test/style/layer/models_test.dart b/test/style/layer/models_test.dart
diff --git a/test/style/source/models_test.dart b/test/style/source/models_test.dart
diff --git a/test/ui/map_compass_test.dart b/test/ui/map_compass_test.dart
diff --git a/test/ui/map_scalebar_test.dart b/test/ui/map_scalebar_test.dart
diff --git a/test/ui/map_zoom_buttons_test.dart b/test/ui/map_zoom_buttons_test.dart
diff --git a/test/ui/source_attribution_test.dart b/test/ui/source_attribution_test.dart
