move things around

josxha · Nov 6, 2024 · 10700dc · 10700dc
1 parent d44a4b4
commit 10700dc
Show file tree

Hide file tree

Showing 212 changed files with 58 additions and 133 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.24.3', '' ]
+        sdk: [ '3.24.0', '' ]
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
@@ -174,7 +174,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.24.3', '' ]
+        sdk: [ '3.24.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
@@ -206,7 +206,7 @@ jobs:
 #    strategy:
 #      fail-fast: false
 #      matrix:
-#        sdk: [ '3.24.3', '' ]
+#        sdk: [ '3.24.0', '' ]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: subosito/flutter-action@v2
@@ -235,7 +235,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.24.3', '' ]
+        sdk: [ '3.24.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
@@ -255,7 +255,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ '3.24.3', '' ]
+        sdk: [ '3.24.0', '' ]
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2

diff --git a/lib/src/native/permission_manager_pigeon.g.dart b/lib/src/native/permission_manager_pigeon.g.dart
diff --git a/lib/src/native/platform_impl.dart b/lib/src/native/platform_impl.dart
diff --git a/lib/src/native/extensions.dart → lib/src/platform/android/extensions.dart b/lib/src/native/extensions.dart → lib/src/platform/android/extensions.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/rendering.dart';
 import 'package:maplibre/maplibre.dart';
-import 'package:maplibre/src/native/jni/jni.dart' as jni;
-import 'package:maplibre/src/native/pigeon.g.dart' as pigeon;
+import 'package:maplibre/src/platform/android/jni/jni.dart' as jni;
+import 'package:maplibre/src/platform/pigeon.g.dart' as pigeon;
 
 /// Extension methods for the [Position] class. Not exported publicly.
 extension PositionExt on Position {

diff --git a/...c/native/jni/android/graphics/PointF.dart → .../android/jni/android/graphics/PointF.dart b/...c/native/jni/android/graphics/PointF.dart → .../android/jni/android/graphics/PointF.dart
diff --git a/...native/jni/android/graphics/_package.dart → ...ndroid/jni/android/graphics/_package.dart b/...native/jni/android/graphics/_package.dart → ...ndroid/jni/android/graphics/_package.dart
diff --git a/...native/jni/android/location/Location.dart → ...ndroid/jni/android/location/Location.dart b/...native/jni/android/location/Location.dart → ...ndroid/jni/android/location/Location.dart
diff --git a/...native/jni/android/location/_package.dart → ...ndroid/jni/android/location/_package.dart b/...native/jni/android/location/_package.dart → ...ndroid/jni/android/location/_package.dart
diff --git a/...hub/josxha/maplibre/MapLibreRegistry.dart → ...hub/josxha/maplibre/MapLibreRegistry.dart b/...hub/josxha/maplibre/MapLibreRegistry.dart → ...hub/josxha/maplibre/MapLibreRegistry.dart
diff --git a/.../com/github/josxha/maplibre/_package.dart → .../com/github/josxha/maplibre/_package.dart b/.../com/github/josxha/maplibre/_package.dart → .../com/github/josxha/maplibre/_package.dart
diff --git a/lib/src/native/jni/java/net/URI.dart → ...rc/platform/android/jni/java/net/URI.dart b/lib/src/native/jni/java/net/URI.dart → ...rc/platform/android/jni/java/net/URI.dart
diff --git a/lib/src/native/jni/java/net/URL.dart → ...rc/platform/android/jni/java/net/URL.dart b/lib/src/native/jni/java/net/URL.dart → ...rc/platform/android/jni/java/net/URL.dart
diff --git a/lib/src/native/jni/java/net/_package.dart → ...atform/android/jni/java/net/_package.dart b/lib/src/native/jni/java/net/_package.dart → ...atform/android/jni/java/net/_package.dart
diff --git a/lib/src/native/jni/jni.dart → lib/src/platform/android/jni/jni.dart b/lib/src/native/jni/jni.dart → lib/src/platform/android/jni/jni.dart
diff --git a/...ve/jni/org/maplibre/android/MapLibre.dart → ...id/jni/org/maplibre/android/MapLibre.dart b/...ve/jni/org/maplibre/android/MapLibre.dart → ...id/jni/org/maplibre/android/MapLibre.dart
diff --git a/...ve/jni/org/maplibre/android/_package.dart → ...id/jni/org/maplibre/android/_package.dart b/...ve/jni/org/maplibre/android/_package.dart → ...id/jni/org/maplibre/android/_package.dart
diff --git a/...ibre/android/attribution/Attribution.dart → ...ibre/android/attribution/Attribution.dart b/...ibre/android/attribution/Attribution.dart → ...ibre/android/attribution/Attribution.dart
diff --git a/...ndroid/attribution/AttributionLayout.dart → ...ndroid/attribution/AttributionLayout.dart b/...ndroid/attribution/AttributionLayout.dart → ...ndroid/attribution/AttributionLayout.dart
diff --git a/...droid/attribution/AttributionMeasure.dart → ...droid/attribution/AttributionMeasure.dart b/...droid/attribution/AttributionMeasure.dart → ...droid/attribution/AttributionMeasure.dart
diff --git a/...ndroid/attribution/AttributionParser.dart → ...ndroid/attribution/AttributionParser.dart b/...ndroid/attribution/AttributionParser.dart → ...ndroid/attribution/AttributionParser.dart
diff --git a/...aplibre/android/attribution/_package.dart → ...aplibre/android/attribution/_package.dart b/...aplibre/android/attribution/_package.dart → ...aplibre/android/attribution/_package.dart
diff --git a/...plibre/android/camera/CameraPosition.dart → ...plibre/android/camera/CameraPosition.dart b/...plibre/android/camera/CameraPosition.dart → ...plibre/android/camera/CameraPosition.dart
diff --git a/...maplibre/android/camera/CameraUpdate.dart → ...maplibre/android/camera/CameraUpdate.dart b/...maplibre/android/camera/CameraUpdate.dart → ...maplibre/android/camera/CameraUpdate.dart
diff --git a/...e/android/camera/CameraUpdateFactory.dart → ...e/android/camera/CameraUpdateFactory.dart b/...e/android/camera/CameraUpdateFactory.dart → ...e/android/camera/CameraUpdateFactory.dart
diff --git a/...org/maplibre/android/camera/_package.dart → ...org/maplibre/android/camera/_package.dart b/...org/maplibre/android/camera/_package.dart → ...org/maplibre/android/camera/_package.dart
diff --git a/.../android/constants/GeometryConstants.dart → .../android/constants/GeometryConstants.dart b/.../android/constants/GeometryConstants.dart → .../android/constants/GeometryConstants.dart
diff --git a/.../android/constants/MapLibreConstants.dart → .../android/constants/MapLibreConstants.dart b/.../android/constants/MapLibreConstants.dart → .../android/constants/MapLibreConstants.dart
diff --git a/.../maplibre/android/constants/_package.dart → .../maplibre/android/constants/_package.dart b/.../maplibre/android/constants/_package.dart → .../maplibre/android/constants/_package.dart
diff --git a/...ions/CalledFromWorkerThreadException.dart → ...ions/CalledFromWorkerThreadException.dart b/...ions/CalledFromWorkerThreadException.dart → ...ions/CalledFromWorkerThreadException.dart
diff --git a/...droid/exceptions/ConversionException.dart → ...droid/exceptions/ConversionException.dart b/...droid/exceptions/ConversionException.dart → ...droid/exceptions/ConversionException.dart
diff --git a/...xceptions/IconBitmapChangedException.dart → ...xceptions/IconBitmapChangedException.dart b/...xceptions/IconBitmapChangedException.dart → ...xceptions/IconBitmapChangedException.dart
diff --git a/...eptions/InvalidLatLngBoundsException.dart → ...eptions/InvalidLatLngBoundsException.dart b/...eptions/InvalidLatLngBoundsException.dart → ...eptions/InvalidLatLngBoundsException.dart
diff --git a/...tions/InvalidMarkerPositionException.dart → ...tions/InvalidMarkerPositionException.dart b/...tions/InvalidMarkerPositionException.dart → ...tions/InvalidMarkerPositionException.dart
diff --git a/...tions/MapLibreConfigurationException.dart → ...tions/MapLibreConfigurationException.dart b/...tions/MapLibreConfigurationException.dart → ...tions/MapLibreConfigurationException.dart
diff --git a/...oid/exceptions/TooManyIconsException.dart → ...oid/exceptions/TooManyIconsException.dart b/...oid/exceptions/TooManyIconsException.dart → ...oid/exceptions/TooManyIconsException.dart
diff --git a/...maplibre/android/exceptions/_package.dart → ...maplibre/android/exceptions/_package.dart b/...maplibre/android/exceptions/_package.dart → ...maplibre/android/exceptions/_package.dart
diff --git a/...org/maplibre/android/geometry/LatLng.dart → ...org/maplibre/android/geometry/LatLng.dart b/...org/maplibre/android/geometry/LatLng.dart → ...org/maplibre/android/geometry/LatLng.dart
diff --git a/...plibre/android/geometry/LatLngBounds.dart → ...plibre/android/geometry/LatLngBounds.dart b/...plibre/android/geometry/LatLngBounds.dart → ...plibre/android/geometry/LatLngBounds.dart
diff --git a/...maplibre/android/geometry/LatLngQuad.dart → ...maplibre/android/geometry/LatLngQuad.dart b/...maplibre/android/geometry/LatLngQuad.dart → ...maplibre/android/geometry/LatLngQuad.dart
diff --git a/...maplibre/android/geometry/LatLngSpan.dart → ...maplibre/android/geometry/LatLngSpan.dart b/...maplibre/android/geometry/LatLngSpan.dart → ...maplibre/android/geometry/LatLngSpan.dart
diff --git a/...bre/android/geometry/ProjectedMeters.dart → ...bre/android/geometry/ProjectedMeters.dart b/...bre/android/geometry/ProjectedMeters.dart → ...bre/android/geometry/ProjectedMeters.dart
diff --git a/...libre/android/geometry/VisibleRegion.dart → ...libre/android/geometry/VisibleRegion.dart b/...libre/android/geometry/VisibleRegion.dart → ...libre/android/geometry/VisibleRegion.dart
diff --git a/...g/maplibre/android/geometry/_package.dart → ...g/maplibre/android/geometry/_package.dart b/...g/maplibre/android/geometry/_package.dart → ...g/maplibre/android/geometry/_package.dart
diff --git a/...maplibre/android/http/HttpIdentifier.dart → ...maplibre/android/http/HttpIdentifier.dart b/...maplibre/android/http/HttpIdentifier.dart → ...maplibre/android/http/HttpIdentifier.dart
diff --git a/...org/maplibre/android/http/HttpLogger.dart → ...org/maplibre/android/http/HttpLogger.dart b/...org/maplibre/android/http/HttpLogger.dart → ...org/maplibre/android/http/HttpLogger.dart
diff --git a/...rg/maplibre/android/http/HttpRequest.dart → ...rg/maplibre/android/http/HttpRequest.dart b/...rg/maplibre/android/http/HttpRequest.dart → ...rg/maplibre/android/http/HttpRequest.dart
diff --git a/...maplibre/android/http/HttpRequestUrl.dart → ...maplibre/android/http/HttpRequestUrl.dart b/...maplibre/android/http/HttpRequestUrl.dart → ...maplibre/android/http/HttpRequestUrl.dart
diff --git a/.../maplibre/android/http/HttpResponder.dart → .../maplibre/android/http/HttpResponder.dart b/.../maplibre/android/http/HttpResponder.dart → .../maplibre/android/http/HttpResponder.dart
diff --git a/...plibre/android/http/LocalRequestTask.dart → ...plibre/android/http/LocalRequestTask.dart b/...plibre/android/http/LocalRequestTask.dart → ...plibre/android/http/LocalRequestTask.dart
diff --git a/...libre/android/http/NativeHttpRequest.dart → ...libre/android/http/NativeHttpRequest.dart b/...libre/android/http/NativeHttpRequest.dart → ...libre/android/http/NativeHttpRequest.dart
diff --git a/...i/org/maplibre/android/http/_package.dart → ...i/org/maplibre/android/http/_package.dart b/...i/org/maplibre/android/http/_package.dart → ...i/org/maplibre/android/http/_package.dart
diff --git a/...libre/android/location/CompassEngine.dart → ...libre/android/location/CompassEngine.dart b/...libre/android/location/CompassEngine.dart → ...libre/android/location/CompassEngine.dart
diff --git a/...bre/android/location/CompassListener.dart → ...bre/android/location/CompassListener.dart b/...bre/android/location/CompassListener.dart → ...bre/android/location/CompassListener.dart
diff --git a/...e/android/location/LocationComponent.dart → ...e/android/location/LocationComponent.dart b/...e/android/location/LocationComponent.dart → ...e/android/location/LocationComponent.dart
diff --git a/...n/LocationComponentActivationOptions.dart → ...n/LocationComponentActivationOptions.dart b/...n/LocationComponentActivationOptions.dart → ...n/LocationComponentActivationOptions.dart
diff --git a/.../location/LocationComponentConstants.dart → .../location/LocationComponentConstants.dart b/.../location/LocationComponentConstants.dart → .../location/LocationComponentConstants.dart
diff --git a/...id/location/LocationComponentOptions.dart → ...id/location/LocationComponentOptions.dart b/...id/location/LocationComponentOptions.dart → ...id/location/LocationComponentOptions.dart
diff --git a/...re/android/location/MapLibreAnimator.dart → ...re/android/location/MapLibreAnimator.dart b/...re/android/location/MapLibreAnimator.dart → ...re/android/location/MapLibreAnimator.dart
diff --git a/...id/location/MapLibreAnimatorListener.dart → ...id/location/MapLibreAnimatorListener.dart b/...id/location/MapLibreAnimatorListener.dart → ...id/location/MapLibreAnimatorListener.dart
diff --git a/...oid/location/MapLibrePaddingAnimator.dart → ...oid/location/MapLibrePaddingAnimator.dart b/...oid/location/MapLibrePaddingAnimator.dart → ...oid/location/MapLibrePaddingAnimator.dart
diff --git a/...tion/OnCameraTrackingChangedListener.dart → ...tion/OnCameraTrackingChangedListener.dart b/...tion/OnCameraTrackingChangedListener.dart → ...tion/OnCameraTrackingChangedListener.dart
diff --git a/...n/OnLocationCameraTransitionListener.dart → ...n/OnLocationCameraTransitionListener.dart b/...n/OnLocationCameraTransitionListener.dart → ...n/OnLocationCameraTransitionListener.dart
diff --git a/...oid/location/OnLocationClickListener.dart → ...oid/location/OnLocationClickListener.dart b/...oid/location/OnLocationClickListener.dart → ...oid/location/OnLocationClickListener.dart
diff --git a/...location/OnLocationLongClickListener.dart → ...location/OnLocationLongClickListener.dart b/...location/OnLocationLongClickListener.dart → ...location/OnLocationLongClickListener.dart
diff --git a/...oid/location/OnLocationStaleListener.dart → ...oid/location/OnLocationStaleListener.dart b/...oid/location/OnLocationStaleListener.dart → ...oid/location/OnLocationStaleListener.dart
diff --git a/...location/OnRenderModeChangedListener.dart → ...location/OnRenderModeChangedListener.dart b/...location/OnRenderModeChangedListener.dart → ...location/OnRenderModeChangedListener.dart
diff --git a/...re/android/location/PaddingEvaluator.dart → ...re/android/location/PaddingEvaluator.dart b/...re/android/location/PaddingEvaluator.dart → ...re/android/location/PaddingEvaluator.dart
diff --git a/...cation/PulsingLocationCircleAnimator.dart → ...cation/PulsingLocationCircleAnimator.dart b/...cation/PulsingLocationCircleAnimator.dart → ...cation/PulsingLocationCircleAnimator.dart
diff --git a/.../org/maplibre/android/location/Utils.dart → .../org/maplibre/android/location/Utils.dart b/.../org/maplibre/android/location/Utils.dart → .../org/maplibre/android/location/Utils.dart
diff --git a/...g/maplibre/android/location/_package.dart → ...g/maplibre/android/location/_package.dart b/...g/maplibre/android/location/_package.dart → ...g/maplibre/android/location/_package.dart
diff --git a/...ion/engine/AndroidLocationEngineImpl.dart → ...ion/engine/AndroidLocationEngineImpl.dart b/...ion/engine/AndroidLocationEngineImpl.dart → ...ion/engine/AndroidLocationEngineImpl.dart
diff --git a/...droid/location/engine/LocationEngine.dart → ...droid/location/engine/LocationEngine.dart b/...droid/location/engine/LocationEngine.dart → ...droid/location/engine/LocationEngine.dart
diff --git a/...cation/engine/LocationEngineCallback.dart → ...cation/engine/LocationEngineCallback.dart b/...cation/engine/LocationEngineCallback.dart → ...cation/engine/LocationEngineCallback.dart
diff --git a/...ocation/engine/LocationEngineDefault.dart → ...ocation/engine/LocationEngineDefault.dart b/...ocation/engine/LocationEngineDefault.dart → ...ocation/engine/LocationEngineDefault.dart
diff --git a/...d/location/engine/LocationEngineImpl.dart → ...d/location/engine/LocationEngineImpl.dart b/...d/location/engine/LocationEngineImpl.dart → ...d/location/engine/LocationEngineImpl.dart
diff --git a/.../location/engine/LocationEngineProxy.dart → .../location/engine/LocationEngineProxy.dart b/.../location/engine/LocationEngineProxy.dart → .../location/engine/LocationEngineProxy.dart
diff --git a/...ocation/engine/LocationEngineRequest.dart → ...ocation/engine/LocationEngineRequest.dart b/...ocation/engine/LocationEngineRequest.dart → ...ocation/engine/LocationEngineRequest.dart
diff --git a/...location/engine/LocationEngineResult.dart → ...location/engine/LocationEngineResult.dart b/...location/engine/LocationEngineResult.dart → ...location/engine/LocationEngineResult.dart
diff --git a/...gine/MapLibreFusedLocationEngineImpl.dart → ...gine/MapLibreFusedLocationEngineImpl.dart b/...gine/MapLibreFusedLocationEngineImpl.dart → ...gine/MapLibreFusedLocationEngineImpl.dart
diff --git a/...bre/android/location/engine/_package.dart → ...bre/android/location/engine/_package.dart b/...bre/android/location/engine/_package.dart → ...bre/android/location/engine/_package.dart
diff --git a/...re/android/location/modes/CameraMode.dart → ...re/android/location/modes/CameraMode.dart b/...re/android/location/modes/CameraMode.dart → ...re/android/location/modes/CameraMode.dart
diff --git a/...re/android/location/modes/RenderMode.dart → ...re/android/location/modes/RenderMode.dart b/...re/android/location/modes/RenderMode.dart → ...re/android/location/modes/RenderMode.dart
diff --git a/...ibre/android/location/modes/_package.dart → ...ibre/android/location/modes/_package.dart b/...ibre/android/location/modes/_package.dart → ...ibre/android/location/modes/_package.dart
diff --git a/...tion/permissions/PermissionsListener.dart → ...tion/permissions/PermissionsListener.dart b/...tion/permissions/PermissionsListener.dart → ...tion/permissions/PermissionsListener.dart
diff --git a/...ation/permissions/PermissionsManager.dart → ...ation/permissions/PermissionsManager.dart b/...ation/permissions/PermissionsManager.dart → ...ation/permissions/PermissionsManager.dart
diff --git a/...ndroid/location/permissions/_package.dart → ...ndroid/location/permissions/_package.dart b/...ndroid/location/permissions/_package.dart → ...ndroid/location/permissions/_package.dart
diff --git a/.../jni/org/maplibre/android/log/Logger.dart → .../jni/org/maplibre/android/log/Logger.dart b/.../jni/org/maplibre/android/log/Logger.dart → .../jni/org/maplibre/android/log/Logger.dart
diff --git a/...aplibre/android/log/LoggerDefinition.dart → ...aplibre/android/log/LoggerDefinition.dart b/...aplibre/android/log/LoggerDefinition.dart → ...aplibre/android/log/LoggerDefinition.dart
diff --git a/...ni/org/maplibre/android/log/_package.dart → ...ni/org/maplibre/android/log/_package.dart b/...ni/org/maplibre/android/log/_package.dart → ...ni/org/maplibre/android/log/_package.dart
diff --git a/...ndroid/maps/AttributionDialogManager.dart → ...ndroid/maps/AttributionDialogManager.dart b/...ndroid/maps/AttributionDialogManager.dart → ...ndroid/maps/AttributionDialogManager.dart
diff --git a/...ndroid/maps/FocalPointChangeListener.dart → ...ndroid/maps/FocalPointChangeListener.dart b/...ndroid/maps/FocalPointChangeListener.dart → ...ndroid/maps/FocalPointChangeListener.dart
diff --git a/.../jni/org/maplibre/android/maps/Image.dart → .../jni/org/maplibre/android/maps/Image.dart b/.../jni/org/maplibre/android/maps/Image.dart → .../jni/org/maplibre/android/maps/Image.dart
diff --git a/...g/maplibre/android/maps/ImageContent.dart → ...g/maplibre/android/maps/ImageContent.dart b/...g/maplibre/android/maps/ImageContent.dart → ...g/maplibre/android/maps/ImageContent.dart
diff --git a/...maplibre/android/maps/ImageStretches.dart → ...maplibre/android/maps/ImageStretches.dart b/...maplibre/android/maps/ImageStretches.dart → ...maplibre/android/maps/ImageStretches.dart
diff --git a/...rg/maplibre/android/maps/MapFragment.dart → ...rg/maplibre/android/maps/MapFragment.dart b/...rg/maplibre/android/maps/MapFragment.dart → ...rg/maplibre/android/maps/MapFragment.dart
diff --git a/...rg/maplibre/android/maps/MapLibreMap.dart → ...rg/maplibre/android/maps/MapLibreMap.dart b/...rg/maplibre/android/maps/MapLibreMap.dart → ...rg/maplibre/android/maps/MapLibreMap.dart
diff --git a/...ibre/android/maps/MapLibreMapOptions.dart → ...ibre/android/maps/MapLibreMapOptions.dart b/...ibre/android/maps/MapLibreMapOptions.dart → ...ibre/android/maps/MapLibreMapOptions.dart
diff --git a/...ni/org/maplibre/android/maps/MapView.dart → ...ni/org/maplibre/android/maps/MapView.dart b/...ni/org/maplibre/android/maps/MapView.dart → ...ni/org/maplibre/android/maps/MapView.dart
diff --git a/.../maplibre/android/maps/NativeMapView.dart → .../maplibre/android/maps/NativeMapView.dart b/.../maplibre/android/maps/NativeMapView.dart → .../maplibre/android/maps/NativeMapView.dart
diff --git a/...ibre/android/maps/OnMapReadyCallback.dart → ...ibre/android/maps/OnMapReadyCallback.dart b/...ibre/android/maps/OnMapReadyCallback.dart → ...ibre/android/maps/OnMapReadyCallback.dart
diff --git a/...org/maplibre/android/maps/Projection.dart → ...org/maplibre/android/maps/Projection.dart b/...org/maplibre/android/maps/Projection.dart → ...org/maplibre/android/maps/Projection.dart
diff --git a/.../jni/org/maplibre/android/maps/Style.dart → .../jni/org/maplibre/android/maps/Style.dart b/.../jni/org/maplibre/android/maps/Style.dart → .../jni/org/maplibre/android/maps/Style.dart
diff --git a/...ibre/android/maps/SupportMapFragment.dart → ...ibre/android/maps/SupportMapFragment.dart b/...ibre/android/maps/SupportMapFragment.dart → ...ibre/android/maps/SupportMapFragment.dart
diff --git a/.../org/maplibre/android/maps/Transform.dart → .../org/maplibre/android/maps/Transform.dart b/.../org/maplibre/android/maps/Transform.dart → .../org/maplibre/android/maps/Transform.dart
diff --git a/...org/maplibre/android/maps/UiSettings.dart → ...org/maplibre/android/maps/UiSettings.dart b/...org/maplibre/android/maps/UiSettings.dart → ...org/maplibre/android/maps/UiSettings.dart
diff --git a/...i/org/maplibre/android/maps/_package.dart → ...i/org/maplibre/android/maps/_package.dart b/...i/org/maplibre/android/maps/_package.dart → ...i/org/maplibre/android/maps/_package.dart
diff --git a/...re/android/maps/renderer/MapRenderer.dart → ...re/android/maps/renderer/MapRenderer.dart b/...re/android/maps/renderer/MapRenderer.dart → ...re/android/maps/renderer/MapRenderer.dart
diff --git a/...oid/maps/renderer/MapRendererFactory.dart → ...oid/maps/renderer/MapRendererFactory.dart b/...oid/maps/renderer/MapRendererFactory.dart → ...oid/maps/renderer/MapRendererFactory.dart
diff --git a/...d/maps/renderer/MapRendererScheduler.dart → ...d/maps/renderer/MapRendererScheduler.dart b/...d/maps/renderer/MapRendererScheduler.dart → ...d/maps/renderer/MapRendererScheduler.dart
diff --git a/...libre/android/maps/renderer/_package.dart → ...libre/android/maps/renderer/_package.dart b/...libre/android/maps/renderer/_package.dart → ...libre/android/maps/renderer/_package.dart
diff --git a/...d/maps/renderer/egl/EGLConfigChooser.dart → ...d/maps/renderer/egl/EGLConfigChooser.dart b/...d/maps/renderer/egl/EGLConfigChooser.dart → ...d/maps/renderer/egl/EGLConfigChooser.dart
diff --git a/.../maps/renderer/egl/EGLContextFactory.dart → .../maps/renderer/egl/EGLContextFactory.dart b/.../maps/renderer/egl/EGLContextFactory.dart → .../maps/renderer/egl/EGLContextFactory.dart
diff --git a/...roid/maps/renderer/egl/EGLLogWrapper.dart → ...roid/maps/renderer/egl/EGLLogWrapper.dart b/...roid/maps/renderer/egl/EGLLogWrapper.dart → ...roid/maps/renderer/egl/EGLLogWrapper.dart
diff --git a/...renderer/egl/EGLWindowSurfaceFactory.dart → ...renderer/egl/EGLWindowSurfaceFactory.dart b/...renderer/egl/EGLWindowSurfaceFactory.dart → ...renderer/egl/EGLWindowSurfaceFactory.dart
diff --git a/...e/android/maps/renderer/egl/_package.dart → ...e/android/maps/renderer/egl/_package.dart b/...e/android/maps/renderer/egl/_package.dart → ...e/android/maps/renderer/egl/_package.dart
diff --git a/...surfaceview/GLSurfaceViewMapRenderer.dart → ...surfaceview/GLSurfaceViewMapRenderer.dart b/...surfaceview/GLSurfaceViewMapRenderer.dart → ...surfaceview/GLSurfaceViewMapRenderer.dart
diff --git a/...er/surfaceview/MapLibreGLSurfaceView.dart → ...er/surfaceview/MapLibreGLSurfaceView.dart b/...er/surfaceview/MapLibreGLSurfaceView.dart → ...er/surfaceview/MapLibreGLSurfaceView.dart
diff --git a/...erer/surfaceview/MapLibreSurfaceView.dart → ...erer/surfaceview/MapLibreSurfaceView.dart b/...erer/surfaceview/MapLibreSurfaceView.dart → ...erer/surfaceview/MapLibreSurfaceView.dart
diff --git a/...r/surfaceview/SurfaceViewMapRenderer.dart → ...r/surfaceview/SurfaceViewMapRenderer.dart b/...r/surfaceview/SurfaceViewMapRenderer.dart → ...r/surfaceview/SurfaceViewMapRenderer.dart
diff --git a/...d/maps/renderer/surfaceview/_package.dart → ...d/maps/renderer/surfaceview/_package.dart b/...d/maps/renderer/surfaceview/_package.dart → ...d/maps/renderer/surfaceview/_package.dart
diff --git a/...extureview/GLTextureViewRenderThread.dart → ...extureview/GLTextureViewRenderThread.dart b/...extureview/GLTextureViewRenderThread.dart → ...extureview/GLTextureViewRenderThread.dart
diff --git a/...r/textureview/TextureViewMapRenderer.dart → ...r/textureview/TextureViewMapRenderer.dart b/...r/textureview/TextureViewMapRenderer.dart → ...r/textureview/TextureViewMapRenderer.dart
diff --git a/...d/maps/renderer/textureview/_package.dart → ...d/maps/renderer/textureview/_package.dart b/...d/maps/renderer/textureview/_package.dart → ...d/maps/renderer/textureview/_package.dart
diff --git a/...bre/android/maps/widgets/CompassView.dart → ...bre/android/maps/widgets/CompassView.dart b/...bre/android/maps/widgets/CompassView.dart → ...bre/android/maps/widgets/CompassView.dart
diff --git a/...plibre/android/maps/widgets/_package.dart → ...plibre/android/maps/widgets/_package.dart b/...plibre/android/maps/widgets/_package.dart → ...plibre/android/maps/widgets/_package.dart
diff --git a/...line/OfflineGeometryRegionDefinition.dart → ...line/OfflineGeometryRegionDefinition.dart b/...line/OfflineGeometryRegionDefinition.dart → ...line/OfflineGeometryRegionDefinition.dart
diff --git a/...libre/android/offline/OfflineManager.dart → ...libre/android/offline/OfflineManager.dart b/...libre/android/offline/OfflineManager.dart → ...libre/android/offline/OfflineManager.dart
diff --git a/...plibre/android/offline/OfflineRegion.dart → ...plibre/android/offline/OfflineRegion.dart b/...plibre/android/offline/OfflineRegion.dart → ...plibre/android/offline/OfflineRegion.dart
diff --git a/...roid/offline/OfflineRegionDefinition.dart → ...roid/offline/OfflineRegionDefinition.dart b/...roid/offline/OfflineRegionDefinition.dart → ...roid/offline/OfflineRegionDefinition.dart
diff --git a/...e/android/offline/OfflineRegionError.dart → ...e/android/offline/OfflineRegionError.dart b/...e/android/offline/OfflineRegionError.dart → ...e/android/offline/OfflineRegionError.dart
diff --git a/.../android/offline/OfflineRegionStatus.dart → .../android/offline/OfflineRegionStatus.dart b/.../android/offline/OfflineRegionStatus.dart → .../android/offline/OfflineRegionStatus.dart
diff --git a/...e/OfflineTilePyramidRegionDefinition.dart → ...e/OfflineTilePyramidRegionDefinition.dart b/...e/OfflineTilePyramidRegionDefinition.dart → ...e/OfflineTilePyramidRegionDefinition.dart
diff --git a/...rg/maplibre/android/offline/_package.dart → ...rg/maplibre/android/offline/_package.dart b/...rg/maplibre/android/offline/_package.dart → ...rg/maplibre/android/offline/_package.dart
diff --git a/.../maplibre/android/storage/FileSource.dart → .../maplibre/android/storage/FileSource.dart b/.../maplibre/android/storage/FileSource.dart → .../maplibre/android/storage/FileSource.dart
diff --git a/...rg/maplibre/android/storage/Resource.dart → ...rg/maplibre/android/storage/Resource.dart b/...rg/maplibre/android/storage/Resource.dart → ...rg/maplibre/android/storage/Resource.dart
diff --git a/...rg/maplibre/android/storage/_package.dart → ...rg/maplibre/android/storage/_package.dart b/...rg/maplibre/android/storage/_package.dart → ...rg/maplibre/android/storage/_package.dart
diff --git a/...android/style/layers/BackgroundLayer.dart → ...android/style/layers/BackgroundLayer.dart b/...android/style/layers/BackgroundLayer.dart → ...android/style/layers/BackgroundLayer.dart
diff --git a/...style/layers/CannotAddLayerException.dart → ...style/layers/CannotAddLayerException.dart b/...style/layers/CannotAddLayerException.dart → ...style/layers/CannotAddLayerException.dart
diff --git a/...bre/android/style/layers/CircleLayer.dart → ...bre/android/style/layers/CircleLayer.dart b/...bre/android/style/layers/CircleLayer.dart → ...bre/android/style/layers/CircleLayer.dart
diff --git a/...bre/android/style/layers/CustomLayer.dart → ...bre/android/style/layers/CustomLayer.dart b/...bre/android/style/layers/CustomLayer.dart → ...bre/android/style/layers/CustomLayer.dart
diff --git a/...roid/style/layers/FillExtrusionLayer.dart → ...roid/style/layers/FillExtrusionLayer.dart b/...roid/style/layers/FillExtrusionLayer.dart → ...roid/style/layers/FillExtrusionLayer.dart
diff --git a/...libre/android/style/layers/FillLayer.dart → ...libre/android/style/layers/FillLayer.dart b/...libre/android/style/layers/FillLayer.dart → ...libre/android/style/layers/FillLayer.dart
diff --git a/...re/android/style/layers/HeatmapLayer.dart → ...re/android/style/layers/HeatmapLayer.dart b/...re/android/style/layers/HeatmapLayer.dart → ...re/android/style/layers/HeatmapLayer.dart
diff --git a/.../android/style/layers/HillshadeLayer.dart → .../android/style/layers/HillshadeLayer.dart b/.../android/style/layers/HillshadeLayer.dart → .../android/style/layers/HillshadeLayer.dart
diff --git a/.../maplibre/android/style/layers/Layer.dart → .../maplibre/android/style/layers/Layer.dart b/.../maplibre/android/style/layers/Layer.dart → .../maplibre/android/style/layers/Layer.dart
diff --git a/...oid/style/layers/LayoutPropertyValue.dart → ...oid/style/layers/LayoutPropertyValue.dart b/...oid/style/layers/LayoutPropertyValue.dart → ...oid/style/layers/LayoutPropertyValue.dart
diff --git a/...libre/android/style/layers/LineLayer.dart → ...libre/android/style/layers/LineLayer.dart b/...libre/android/style/layers/LineLayer.dart → ...libre/android/style/layers/LineLayer.dart
diff --git a/...roid/style/layers/PaintPropertyValue.dart → ...roid/style/layers/PaintPropertyValue.dart b/...roid/style/layers/PaintPropertyValue.dart → ...roid/style/layers/PaintPropertyValue.dart
diff --git a/...plibre/android/style/layers/Property.dart → ...plibre/android/style/layers/Property.dart b/...plibre/android/style/layers/Property.dart → ...plibre/android/style/layers/Property.dart
diff --git a/...android/style/layers/PropertyFactory.dart → ...android/style/layers/PropertyFactory.dart b/...android/style/layers/PropertyFactory.dart → ...android/style/layers/PropertyFactory.dart
diff --git a/...e/android/style/layers/PropertyValue.dart → ...e/android/style/layers/PropertyValue.dart b/...e/android/style/layers/PropertyValue.dart → ...e/android/style/layers/PropertyValue.dart
diff --git a/...bre/android/style/layers/RasterLayer.dart → ...bre/android/style/layers/RasterLayer.dart b/...bre/android/style/layers/RasterLayer.dart → ...bre/android/style/layers/RasterLayer.dart
diff --git a/...bre/android/style/layers/SymbolLayer.dart → ...bre/android/style/layers/SymbolLayer.dart b/...bre/android/style/layers/SymbolLayer.dart → ...bre/android/style/layers/SymbolLayer.dart
diff --git a/...droid/style/layers/TransitionOptions.dart → ...droid/style/layers/TransitionOptions.dart b/...droid/style/layers/TransitionOptions.dart → ...droid/style/layers/TransitionOptions.dart
diff --git a/...plibre/android/style/layers/_package.dart → ...plibre/android/style/layers/_package.dart b/...plibre/android/style/layers/_package.dart → ...plibre/android/style/layers/_package.dart
diff --git a/...g/maplibre/android/style/light/Light.dart → ...g/maplibre/android/style/light/Light.dart b/...g/maplibre/android/style/light/Light.dart → ...g/maplibre/android/style/light/Light.dart
diff --git a/...aplibre/android/style/light/Position.dart → ...aplibre/android/style/light/Position.dart b/...aplibre/android/style/light/Position.dart → ...aplibre/android/style/light/Position.dart
diff --git a/...aplibre/android/style/light/_package.dart → ...aplibre/android/style/light/_package.dart b/...aplibre/android/style/light/_package.dart → ...aplibre/android/style/light/_package.dart
diff --git a/...yle/sources/CannotAddSourceException.dart → ...yle/sources/CannotAddSourceException.dart b/...yle/sources/CannotAddSourceException.dart → ...yle/sources/CannotAddSourceException.dart
diff --git a/...d/style/sources/CustomGeometrySource.dart → ...d/style/sources/CustomGeometrySource.dart b/...d/style/sources/CustomGeometrySource.dart → ...d/style/sources/CustomGeometrySource.dart
diff --git a/.../sources/CustomGeometrySourceOptions.dart → .../sources/CustomGeometrySourceOptions.dart b/.../sources/CustomGeometrySourceOptions.dart → .../sources/CustomGeometrySourceOptions.dart
diff --git a/...android/style/sources/GeoJsonOptions.dart → ...android/style/sources/GeoJsonOptions.dart b/...android/style/sources/GeoJsonOptions.dart → ...android/style/sources/GeoJsonOptions.dart
diff --git a/.../android/style/sources/GeoJsonSource.dart → .../android/style/sources/GeoJsonSource.dart b/.../android/style/sources/GeoJsonSource.dart → .../android/style/sources/GeoJsonSource.dart
diff --git a/...d/style/sources/GeometryTileProvider.dart → ...d/style/sources/GeometryTileProvider.dart b/...d/style/sources/GeometryTileProvider.dart → ...d/style/sources/GeometryTileProvider.dart
diff --git a/...re/android/style/sources/ImageSource.dart → ...re/android/style/sources/ImageSource.dart b/...re/android/style/sources/ImageSource.dart → ...re/android/style/sources/ImageSource.dart
diff --git a/...ndroid/style/sources/RasterDemSource.dart → ...ndroid/style/sources/RasterDemSource.dart b/...ndroid/style/sources/RasterDemSource.dart → ...ndroid/style/sources/RasterDemSource.dart
diff --git a/...e/android/style/sources/RasterSource.dart → ...e/android/style/sources/RasterSource.dart b/...e/android/style/sources/RasterSource.dart → ...e/android/style/sources/RasterSource.dart
diff --git a/...aplibre/android/style/sources/Source.dart → ...aplibre/android/style/sources/Source.dart b/...aplibre/android/style/sources/Source.dart → ...aplibre/android/style/sources/Source.dart
diff --git a/...plibre/android/style/sources/TileSet.dart → ...plibre/android/style/sources/TileSet.dart b/...plibre/android/style/sources/TileSet.dart → ...plibre/android/style/sources/TileSet.dart
diff --git a/.../android/style/sources/UnknownSource.dart → .../android/style/sources/UnknownSource.dart b/.../android/style/sources/UnknownSource.dart → .../android/style/sources/UnknownSource.dart
diff --git a/...e/android/style/sources/VectorSource.dart → ...e/android/style/sources/VectorSource.dart b/...e/android/style/sources/VectorSource.dart → ...e/android/style/sources/VectorSource.dart
diff --git a/...libre/android/style/sources/_package.dart → ...libre/android/style/sources/_package.dart b/...libre/android/style/sources/_package.dart → ...libre/android/style/sources/_package.dart
diff --git a/...plibre/android/style/types/Formatted.dart → ...plibre/android/style/types/Formatted.dart b/...plibre/android/style/types/Formatted.dart → ...plibre/android/style/types/Formatted.dart
diff --git a/...android/style/types/FormattedSection.dart → ...android/style/types/FormattedSection.dart b/...android/style/types/FormattedSection.dart → ...android/style/types/FormattedSection.dart
diff --git a/...aplibre/android/style/types/_package.dart → ...aplibre/android/style/types/_package.dart b/...aplibre/android/style/types/_package.dart → ...aplibre/android/style/types/_package.dart
diff --git a/...re/android/text/LocalGlyphRasterizer.dart → ...re/android/text/LocalGlyphRasterizer.dart b/...re/android/text/LocalGlyphRasterizer.dart → ...re/android/text/LocalGlyphRasterizer.dart
diff --git a/...i/org/maplibre/android/text/_package.dart → ...i/org/maplibre/android/text/_package.dart b/...i/org/maplibre/android/text/_package.dart → ...i/org/maplibre/android/text/_package.dart
diff --git a/...g/maplibre/android/util/DefaultStyle.dart → ...g/maplibre/android/util/DefaultStyle.dart b/...g/maplibre/android/util/DefaultStyle.dart → ...g/maplibre/android/util/DefaultStyle.dart
diff --git a/...libre/android/util/TileServerOptions.dart → ...libre/android/util/TileServerOptions.dart b/...libre/android/util/TileServerOptions.dart → ...libre/android/util/TileServerOptions.dart
diff --git a/...i/org/maplibre/android/util/_package.dart → ...i/org/maplibre/android/util/_package.dart b/...i/org/maplibre/android/util/_package.dart → ...i/org/maplibre/android/util/_package.dart
diff --git a/...maplibre/android/utils/AnimatorUtils.dart → ...maplibre/android/utils/AnimatorUtils.dart b/...maplibre/android/utils/AnimatorUtils.dart → ...maplibre/android/utils/AnimatorUtils.dart
diff --git a/...g/maplibre/android/utils/BitmapUtils.dart → ...g/maplibre/android/utils/BitmapUtils.dart b/...g/maplibre/android/utils/BitmapUtils.dart → ...g/maplibre/android/utils/BitmapUtils.dart
diff --git a/...rg/maplibre/android/utils/ColorUtils.dart → ...rg/maplibre/android/utils/ColorUtils.dart b/...rg/maplibre/android/utils/ColorUtils.dart → ...rg/maplibre/android/utils/ColorUtils.dart
diff --git a/...i/org/maplibre/android/utils/Compare.dart → ...i/org/maplibre/android/utils/Compare.dart b/...i/org/maplibre/android/utils/Compare.dart → ...i/org/maplibre/android/utils/Compare.dart
diff --git a/.../maplibre/android/utils/ExtensionsKt.dart → .../maplibre/android/utils/ExtensionsKt.dart b/.../maplibre/android/utils/ExtensionsKt.dart → .../maplibre/android/utils/ExtensionsKt.dart
diff --git a/...org/maplibre/android/utils/FileUtils.dart → ...org/maplibre/android/utils/FileUtils.dart b/...org/maplibre/android/utils/FileUtils.dart → ...org/maplibre/android/utils/FileUtils.dart
diff --git a/...org/maplibre/android/utils/FontUtils.dart → ...org/maplibre/android/utils/FontUtils.dart b/...org/maplibre/android/utils/FontUtils.dart → ...org/maplibre/android/utils/FontUtils.dart
diff --git a/...libre/android/utils/MapFragmentUtils.dart → ...libre/android/utils/MapFragmentUtils.dart b/...libre/android/utils/MapFragmentUtils.dart → ...libre/android/utils/MapFragmentUtils.dart
diff --git a/...org/maplibre/android/utils/MathUtils.dart → ...org/maplibre/android/utils/MathUtils.dart b/...org/maplibre/android/utils/MathUtils.dart → ...org/maplibre/android/utils/MathUtils.dart
diff --git a/...g/maplibre/android/utils/ThreadUtils.dart → ...g/maplibre/android/utils/ThreadUtils.dart b/...g/maplibre/android/utils/ThreadUtils.dart → ...g/maplibre/android/utils/ThreadUtils.dart
diff --git a/.../org/maplibre/android/utils/_package.dart → .../org/maplibre/android/utils/_package.dart b/.../org/maplibre/android/utils/_package.dart → .../org/maplibre/android/utils/_package.dart
diff --git a/...ive/jni/org/maplibre/geojson/Feature.dart → ...oid/jni/org/maplibre/geojson/Feature.dart b/...ive/jni/org/maplibre/geojson/Feature.dart → ...oid/jni/org/maplibre/geojson/Feature.dart
diff --git a/...ve/jni/org/maplibre/geojson/_package.dart → ...id/jni/org/maplibre/geojson/_package.dart b/...ve/jni/org/maplibre/geojson/_package.dart → ...id/jni/org/maplibre/geojson/_package.dart
diff --git a/lib/src/native/offline_manager.dart → ...src/platform/android/offline_manager.dart b/lib/src/native/offline_manager.dart → ...src/platform/android/offline_manager.dart
@@ -4,12 +4,12 @@ import 'dart:ui';
 
 import 'package:jni/jni.dart';
 import 'package:maplibre/maplibre.dart';
-import 'package:maplibre/src/native/extensions.dart';
-import 'package:maplibre/src/native/jni/jni.dart' as jni;
+import 'package:maplibre/src/platform/android/extensions.dart';
+import 'package:maplibre/src/platform/android/jni/jni.dart' as jni;
 
 /// MapLibre Android specific implementation of the [OfflineManager].
-class OfflineManagerNative implements OfflineManager {
-  const OfflineManagerNative._(this._jManager);
+class OfflineManagerAndroid implements OfflineManager {
+  const OfflineManagerAndroid._(this._jManager);
 
   final jni.OfflineManager _jManager;
 
@@ -20,7 +20,7 @@ class OfflineManagerNative implements OfflineManager {
       jni.MapLibre.getInstance(jContext);
     });
     final jManager = jni.OfflineManager.getInstance(jContext);
-    return OfflineManagerNative._(jManager);
+    return OfflineManagerAndroid._(jManager);
   }
 
   @override

diff --git a/lib/src/native/permission_manager.dart → .../platform/android/permission_manager.dart b/lib/src/native/permission_manager.dart → .../platform/android/permission_manager.dart
@@ -1,14 +1,14 @@
 import 'package:jni/jni.dart';
 import 'package:maplibre/maplibre.dart';
-import 'package:maplibre/src/native/jni/jni.dart' as jni;
-import 'package:maplibre/src/native/permission_manager_pigeon.g.dart';
+import 'package:maplibre/src/platform/android/jni/jni.dart' as jni;
+import 'package:maplibre/src/platform/pigeon.g.dart';
 
 /// MapLibre Android specific implementation of the [PermissionManager].
 ///
 /// https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20-android/org.maplibre.android.location.permissions/-permissions-manager/index.html
-class PermissionManagerNative implements PermissionManager {
-  /// Create a new [PermissionManagerNative] instance.
-  PermissionManagerNative();
+class PermissionManagerAndroid implements PermissionManager {
+  /// Create a new [PermissionManagerAndroid] instance.
+  PermissionManagerAndroid();
 
   final _api = PermissionManagerHostApi();
 

diff --git a/lib/src/native/widget_state_jni.dart → lib/src/platform/android/widget_state.dart b/lib/src/native/widget_state_jni.dart → lib/src/platform/android/widget_state.dart
@@ -10,13 +10,13 @@ import 'package:jni/jni.dart';
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/annotation/annotation_manager.dart';
 import 'package:maplibre/src/map_state.dart';
-import 'package:maplibre/src/native/extensions.dart';
-import 'package:maplibre/src/native/jni/jni.dart' as jni;
-import 'package:maplibre/src/native/pigeon.g.dart' as pigeon;
+import 'package:maplibre/src/platform/android/extensions.dart';
+import 'package:maplibre/src/platform/android/jni/jni.dart' as jni;
+import 'package:maplibre/src/platform/pigeon.g.dart' as pigeon;
 
 /// The implementation that gets used for state of the [MapLibreMap] widget on
 /// android using JNI and Pigeon as a fallback.
-final class MapLibreMapStateJni extends MapLibreMapState
+final class MapLibreMapStateAndroid extends MapLibreMapState
     implements pigeon.MapLibreFlutterApi {
   late final pigeon.MapLibreHostApi _hostApi;
   late final int _viewId;

diff --git a/lib/src/native/pigeon.g.dart → lib/src/platform/pigeon.g.dart b/lib/src/native/pigeon.g.dart → lib/src/platform/pigeon.g.dart
diff --git a/lib/src/platform/platform_native.dart b/lib/src/platform/platform_native.dart
@@ -0,0 +1,30 @@
+import 'dart:io';
+
+import 'package:maplibre/src/map_state.dart';
+import 'package:maplibre/src/offline/offline_manager.dart';
+import 'package:maplibre/src/permission_manager.dart';
+import 'package:maplibre/src/platform/android/offline_manager.dart';
+import 'package:maplibre/src/platform/android/permission_manager.dart';
+import 'package:maplibre/src/platform/android/widget_state.dart';
+import 'package:maplibre/src/platform_interface.dart';
+
+/// An implementation of [PlatformInterface] that uses method channels and ffi.
+final class PlatformImpl extends PlatformInterface {
+  @override
+  MapLibreMapState createWidgetState() {
+    if (Platform.isAndroid) return MapLibreMapStateAndroid();
+    throw UnimplementedError('Unsupported platform');
+  }
+
+  @override
+  Future<OfflineManager> createOfflineManager() async {
+    if (Platform.isAndroid) return OfflineManagerAndroid.createInstance();
+    throw UnimplementedError('Unsupported platform');
+  }
+
+  @override
+  PermissionManager createPermissionManager() {
+    if (Platform.isAndroid) return PermissionManagerAndroid();
+    throw UnimplementedError('Unsupported platform');
+  }
+}
diff --git a/lib/src/web/platform_impl.dart → lib/src/platform/platform_web.dart b/lib/src/web/platform_impl.dart → lib/src/platform/platform_web.dart
@@ -2,8 +2,8 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:maplibre/src/map_state.dart';
 import 'package:maplibre/src/offline/offline_manager.dart';
 import 'package:maplibre/src/permission_manager.dart';
+import 'package:maplibre/src/platform/web/widget_state.dart';
 import 'package:maplibre/src/platform_interface.dart';
-import 'package:maplibre/src/web/widget_state.dart';
 
 /// A web implementation of the MapLibrePlatform of the MapLibre plugin.
 final class PlatformImpl extends PlatformInterface {

diff --git a/lib/src/web/extensions.dart → lib/src/platform/web/extensions.dart b/lib/src/web/extensions.dart → lib/src/platform/web/extensions.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:maplibre/maplibre.dart';
-import 'package:maplibre/src/web/interop/interop.dart' as interop;
+import 'package:maplibre/src/platform/web/interop/interop.dart' as interop;
 
 /// Extension methods for the [Position] class. Not exported publicly.
 extension PositionExt on Position {

diff --git a/lib/src/web/interop/camera.dart → lib/src/platform/web/interop/camera.dart b/lib/src/web/interop/camera.dart → lib/src/platform/web/interop/camera.dart
diff --git a/lib/src/web/interop/controls.dart → lib/src/platform/web/interop/controls.dart b/lib/src/web/interop/controls.dart → lib/src/platform/web/interop/controls.dart
diff --git a/lib/src/web/interop/events.dart → lib/src/platform/web/interop/events.dart b/lib/src/web/interop/events.dart → lib/src/platform/web/interop/events.dart
diff --git a/lib/src/web/interop/gesture_handlers.dart → ...latform/web/interop/gesture_handlers.dart b/lib/src/web/interop/gesture_handlers.dart → ...latform/web/interop/gesture_handlers.dart
diff --git a/lib/src/web/interop/interop.dart → lib/src/platform/web/interop/interop.dart b/lib/src/web/interop/interop.dart → lib/src/platform/web/interop/interop.dart
diff --git a/lib/src/web/interop/json.dart → lib/src/platform/web/interop/json.dart b/lib/src/web/interop/json.dart → lib/src/platform/web/interop/json.dart
diff --git a/lib/src/web/interop/map.dart → lib/src/platform/web/interop/map.dart b/lib/src/web/interop/map.dart → lib/src/platform/web/interop/map.dart
diff --git a/lib/src/web/interop/map_geojson_feature.dart → ...form/web/interop/map_geojson_feature.dart b/lib/src/web/interop/map_geojson_feature.dart → ...form/web/interop/map_geojson_feature.dart
diff --git a/lib/src/web/interop/marker.dart → lib/src/platform/web/interop/marker.dart b/lib/src/web/interop/marker.dart → lib/src/platform/web/interop/marker.dart
diff --git a/lib/src/web/interop/style_specification.dart → ...form/web/interop/style_specification.dart b/lib/src/web/interop/style_specification.dart → ...form/web/interop/style_specification.dart
diff --git a/lib/src/web/widget_state.dart → lib/src/platform/web/widget_state.dart b/lib/src/web/widget_state.dart → lib/src/platform/web/widget_state.dart
@@ -8,9 +8,9 @@ import 'package:flutter/widgets.dart';
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/annotation/annotation_manager.dart';
 import 'package:maplibre/src/map_state.dart';
-import 'package:maplibre/src/web/extensions.dart';
-import 'package:maplibre/src/web/interop/interop.dart' as interop;
-import 'package:maplibre/src/web/interop/json.dart';
+import 'package:maplibre/src/platform/web/extensions.dart';
+import 'package:maplibre/src/platform/web/interop/interop.dart' as interop;
+import 'package:maplibre/src/platform/web/interop/json.dart';
 import 'package:web/web.dart';
 
 /// The web specific implementation of the [MapLibreMap] widget.

diff --git a/lib/src/platform_interface.dart b/lib/src/platform_interface.dart
@@ -1,7 +1,7 @@
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/map_state.dart';
-import 'package:maplibre/src/web/platform_impl.dart'
-    if (dart.library.io) 'package:maplibre/src/native/platform_impl.dart';
+import 'package:maplibre/src/platform/platform_web.dart'
+    if (dart.library.io) 'package:maplibre/src/platform/platform_native.dart';
 
 /// https://pub.dev/packages/plugin_platform_interface#a-note-about-base
 abstract base class PlatformInterface {