diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index d1f01e165..b173edf60 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -114,7 +114,7 @@ jobs: run: | MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}' if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then - echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml + echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml else echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, not copying..." fi @@ -122,8 +122,8 @@ jobs: - name: Build Benchmark, copy to platform/android run: | ./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest -PtestBuildType=release - cp MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk . - cp MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk . + cp MapLibreAndroidTestApp/build/outputs/apk/drawable/release/MapLibreAndroidTestApp-drawable-release.apk . + cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/drawable/release/MapLibreAndroidTestApp-drawable-release-androidTest.apk . - name: Create artifact for benchmark APKs uses: actions/upload-artifact@v4 @@ -131,8 +131,8 @@ jobs: if-no-files-found: error name: benchmarkAPKs path: | - platform/android/MapboxGLAndroidSDKTestApp-drawable-release.apk - platform/android/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk + platform/android/MapLibreAndroidTestApp-drawable-release.apk + platform/android/MapLibreAndroidTestApp-drawable-release-androidTest.apk - if: github.event_name == 'pull_request' uses: ./.github/actions/save-pr-number @@ -159,7 +159,7 @@ jobs: id: upload-android-app with: project_arn: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }} - name: MapboxGLAndroidSDKTestApp-debug.apk + name: MapLibreAndroidTestApp-debug.apk type: ANDROID_APP - name: Create upload @@ -168,14 +168,14 @@ jobs: id: upload-android-test with: project_arn: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }} - name: MapboxGLAndroidSDKTestApp-debug-androidTest.apk + name: MapLibreAndroidTestApp-debug-androidTest.apk type: INSTRUMENTATION_TEST_PACKAGE - name: Upload Android UI test if: github.ref == 'refs/heads/main' run: | - curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}' - curl -T MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/legacy/debug/MapboxGLAndroidSDKTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}' + curl -T MapLibreAndroidTestApp/build/outputs/apk/legacy/debug/MapLibreAndroidTestApp-legacy-debug.apk '${{ steps.upload-android-app.outputs.url }}' + curl -T MapLibreAndroidTestApp/build/outputs/apk/androidTest/legacy/debug/MapLibreAndroidTestApp-legacy-debug-androidTest.apk '${{ steps.upload-android-test.outputs.url }}' - name: Write uploads.env if: github.ref == 'refs/heads/main' @@ -196,13 +196,13 @@ jobs: with: name: debug-artifacts path: | - MapboxGLAndroidSDKTestApp/build/outputs/apk/debug - MapboxGLAndroidSDK/build/reports/lint-results.html - MapboxGLAndroidSDK/lint-baseline.xml - MapboxGLAndroidSDKTestApp/build/reports/lint-results.html - MapboxGLAndroidSDKTestApp/build/reports/lint-results.xml - MapboxGLAndroidSDKTestApp/lint-baseline.xml - MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj + MapLibreAndroidTestApp/build/outputs/apk/debug + MapLibreAndroid/build/reports/lint-results.html + MapLibreAndroid/lint-baseline.xml + MapLibreAndroidTestApp/build/reports/lint-results.html + MapLibreAndroidTestApp/build/reports/lint-results.xml + MapLibreAndroidTestApp/lint-baseline.xml + MapLibreAndroid/build/intermediates/cmake/debug/obj android-build-render-test: runs-on: ubuntu-latest diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml index 156285de4..930cadbf9 100644 --- a/.github/workflows/android-device-test.yml +++ b/.github/workflows/android-device-test.yml @@ -22,8 +22,8 @@ jobs: }, { artifactName: benchmarkAPKs, - testFile: "MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk", - appFile: "MapboxGLAndroidSDKTestApp-drawable-release.apk", + testFile: "MapLibreAndroidTestApp-drawable-release-androidTest.apk", + appFile: "MapLibreAndroidTestApp-drawable-release.apk", name: "Android Benchmark", testFilter: "org.maplibre.android.benchmark.Benchmark", # top devices, query with `aws list-device-pools --arn ` diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index fce79a42f..059a897cc 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -89,9 +89,9 @@ jobs: RELEASE_VERSION="$( git describe --tags --match=android-v*.*.* --abbrev=0 | sed 's/^android-v//' )" echo "Latest version from tag: $RELEASE_VERSION" if [ -n "$RELEASE_VERSION" ]; then - sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapboxGLAndroidSDK/gradle.properties - echo "MapboxGLAndroidSDK/gradle.properties:" - cat MapboxGLAndroidSDK/gradle.properties + sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${RELEASE_VERSION}/" MapLibreAndroid/gradle.properties + echo "MapLibreAndroid/gradle.properties:" + cat MapLibreAndroid/gradle.properties fi shell: bash @@ -102,7 +102,7 @@ jobs: run: | MAPLIBRE_DEVELOPER_CONFIG_XML='${{ secrets.MAPLIBRE_DEVELOPER_CONFIG_XML }}' if [ -n "${MAPLIBRE_DEVELOPER_CONFIG_XML}" ]; then - echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml + echo "${MAPLIBRE_DEVELOPER_CONFIG_XML}" > MapLibreAndroidTestApp/src/main/res/values/developer-config.xml make android else echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, skipping apk build..." @@ -138,8 +138,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-drawable-release.aar - asset_name: MapboxGLAndroidSDK-release.aar + asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-drawable-release.aar + asset_name: MapLibreAndroid-release.aar asset_content_type: application/zip - name: Clean release diff --git a/.github/workflows/gh-pages-android-api.yml b/.github/workflows/gh-pages-android-api.yml index 8e22b88bf..92cd17f0d 100644 --- a/.github/workflows/gh-pages-android-api.yml +++ b/.github/workflows/gh-pages-android-api.yml @@ -20,5 +20,5 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4.5.0 with: branch: gh-pages - folder: platform/android/MapboxGLAndroidSDK/build/dokka/html + folder: platform/android/MapLibreAndroid/build/dokka/html target-folder: android/api/ diff --git a/.gitignore b/.gitignore index 2b50826bc..df4ef0fdc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,20 @@ -/mapbox-gl-native-android/MapboxGLAndroidSDK/mapbox-gl-native -/mapbox-gl-native-android/MapboxGLAndroidSDKTestApp/mapbox-gl-native -/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml +/mapbox-gl-native-android/MapLibreAndroid/mapbox-gl-native +/mapbox-gl-native-android/MapLibreAndroidTestApp/mapbox-gl-native +/platform/android/MapLibreAndroidTestApp/src/main/res/values/developer-config.xml /platform/android/local.properties /platform/android/gradle/configuration.gradle /platform/android/arm64-v8a /platform/android/armeabi-v7a -/platform/android/MapboxGLAndroidSDK/.cxx -/platform/android/MapboxGLAndroidSDK/build -/platform/android/MapboxGLAndroidSDKTestApp/.cxx -/platform/android/MapboxGLAndroidSDKTestApp/build +/platform/android/MapLibreAndroid/.cxx +/platform/android/MapLibreAndroid/build +/platform/android/MapLibreAndroidTestApp/.cxx +/platform/android/MapLibreAndroidTestApp/build /platform/android/.gradle /platform/android/x86 /platform/android/x86_64 /cmake-build-debug /platform/android/build -/platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk +/platform/android/MapLibreAndroid/src/main/assets/sdk_versions/com.mapbox.mapboxsdk /platform/ios/platform/ios/Mapbox.playground/build/ /platform/windows/vendor/mesa3d/ *.code-workspace @@ -24,7 +24,7 @@ compile_commands.json /build **/.idea -/platform/android/MapboxGLAndroidSDKTestApp/local.properties +/platform/android/MapLibreAndroidTestApp/local.properties /new_offline.db *.gpg /.vscode diff --git a/docs/mdbook/src/android/annotation-guide.md b/docs/mdbook/src/android/annotation-guide.md index ef61f2c20..6491c76d3 100644 --- a/docs/mdbook/src/android/annotation-guide.md +++ b/docs/mdbook/src/android/annotation-guide.md @@ -41,7 +41,7 @@ Then add markers to the map with GeoJSON: It is used to add annotations to the map instance. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:top}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:top}} ``` 4. Call `mapview.getMapSync()` in order to get a `MapboxMap` object. @@ -49,14 +49,14 @@ Then add markers to the map with GeoJSON: to make a HTTP request and transform data into the map annotations. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:mapAsync}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:mapAsync}} ``` 5. Define a function `getEarthQuakeDataFromUSGS()` to fetch GeoJSON data from a public API. If we successfully get the response, call `addMarkersToMap()` on the UI thread. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:getEarthquakes}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:getEarthquakes}} ``` 6. Now it is time to add markers into the map. @@ -66,7 +66,7 @@ Then add markers to the map with GeoJSON: - Finally, move the camera to the bounds of the newly added markers ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:addMarkers}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt:addMarkers}} ``` 7. Here is the final result. For the full contents of `JsonApiActivity`, please visit source code of [Test APP] @@ -76,7 +76,7 @@ Then add markers to the map with GeoJSON: [Marker]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.annotations/-marker/index.html -[provided image]: https://github.com/maplibre/maplibre-native/blob/main/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png +[provided image]: https://github.com/maplibre/maplibre-native/blob/main/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png [Polyline]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.annotations/-polyline/index.html [Polygon]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.annotations/-polygon/index.html [marker image]: https://raw.githubusercontent.com/maplibre/maplibre-native/main/test/fixtures/sprites/default_marker.png @@ -86,4 +86,4 @@ Then add markers to the map with GeoJSON: [mvn]: https://mvnrepository.com/artifact/org.maplibre.gl/android-plugin-annotation-v9 [Android Developer Documentation]: https://developer.android.com/topic/libraries/architecture/coroutines [MarkerOptions]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.annotations/-marker-options/index.html -[Test App]: https://github.com/maplibre/maplibre-native/tree/main/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt +[Test App]: https://github.com/maplibre/maplibre-native/tree/main/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt diff --git a/docs/mdbook/src/android/location-component-guide.md b/docs/mdbook/src/android/location-component-guide.md index aab99b6a9..513ebb3be 100644 --- a/docs/mdbook/src/android/location-component-guide.md +++ b/docs/mdbook/src/android/location-component-guide.md @@ -26,7 +26,7 @@ This guide will demonstrate how to utilize the [LocationComponent] to represent - At the end of the `onCreate()` method, call `checkPermissions(`) to ensure that the application can access the user's location. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:top}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:top}} ``` 3. In the `checkPermissions()` method, the [PermissionManager] is used to request location permissions at runtime and handle the callbacks for permission granting or rejection. @@ -36,7 +36,7 @@ This guide will demonstrate how to utilize the [LocationComponent] to represent If the permissions are granted, call `mapView.getMapAsync(this)` to register the activity as a listener for onMapReady event. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:permission}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:permission}} ``` 4. In the `onMapReady()` method, first set the style and then handle the user's location using the [LocationComponent]. @@ -55,7 +55,7 @@ This guide will demonstrate how to utilize the [LocationComponent] to represent - `locationComponent!!.forceLocationUpdate(lastLocation)` updates the the user's last known location. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:onMapReady}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:onMapReady}} ``` 5. [LocationComponentActivationOptions] is used to hold the style, [LocationComponentOptions] and other locating behaviors. @@ -64,7 +64,7 @@ This guide will demonstrate how to utilize the [LocationComponent] to represent - For more information, please visit the [documentation page][LocationComponentActivationOptions]. ```kotlin -{{#include ../../../../platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:LocationComponentActivationOptions}} +{{#include ../../../../platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt:LocationComponentActivationOptions}} ``` 6. For further customization, you can also utilize the `foregroundTintColor()` and `pulseColor()` methods on the [LocationComponentOptions] builder: @@ -96,5 +96,5 @@ val locationComponentOptions = [predefined styles]: https://github.com/maplibre/maplibre-native/tree/main/src/mbgl/util/tile_server_options.cpp [LocationComponentActivationOptions]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.location/-location-component-activation-options/index.html [LocationEngine]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.location.engine/-location-engine/index.html -[Test APP]: https://github.com/maplibre/maplibre-native/tree/main/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt +[Test APP]: https://github.com/maplibre/maplibre-native/tree/main/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt [camera modes]: https://maplibre.org/maplibre-native/android/api/-map-libre%20-native%20for%20-android/com.mapbox.mapboxsdk.location.modes/-camera-mode/index.html diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 913ea2b3e..92c277418 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -96,9 +96,9 @@ This version is identical to 10.0.2. - 💥 Breaking: the `LocationEngine` implemented with Google Location Services has been removed to make MapLibre Native for Android fully FLOSS ([#379](https://github.com/maplibre/maplibre-native/issues/379)). > To migrate: - > Include the source code of the removed [`GoogleLocationEngineImpl`](https://github.com/maplibre/maplibre-native/blob/4a34caab7593f4f1b6d8c09c06a5e25d7c6cfc43/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java) in your source tree. + > Include the source code of the removed [`GoogleLocationEngineImpl`](https://github.com/maplibre/maplibre-native/blob/4a34caab7593f4f1b6d8c09c06a5e25d7c6cfc43/platform/android/MapLibreAndroid/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java) in your source tree. > - > Pass an instance of `LocationEngine` based on `GoogleLocationEngineImpl` to `LocationComponentActivationOptions.Builder.locationEngine` (this was done in a now removed [`LocationEngineProvider`](https://github.com/maplibre/maplibre-native/blob/68d58d6f6f453d5c6cc0fa92fcc6c6cfe0cf967f/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java#L59) class): + > Pass an instance of `LocationEngine` based on `GoogleLocationEngineImpl` to `LocationComponentActivationOptions.Builder.locationEngine` (this was done in a now removed [`LocationEngineProvider`](https://github.com/maplibre/maplibre-native/blob/68d58d6f6f453d5c6cc0fa92fcc6c6cfe0cf967f/platform/android/MapLibreAndroid/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java#L59) class): > > ```kotlin > val locationEngine = LocationEngineProxy(GoogleLocationEngineImpl(context)) @@ -108,7 +108,7 @@ This version is identical to 10.0.2. - 💥 Breaking: The static `LocationEngineResult.extractResult` can no longer extract a `LocationEngineResult` from a Google Play intent. - > To migrate, include and use the [previous implementation](https://github.com/maplibre/maplibre-native/blob/ea234edf67bb3aec75f077e15c1c30c99756b926/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java#L97) in your source tree. + > To migrate, include and use the [previous implementation](https://github.com/maplibre/maplibre-native/blob/ea234edf67bb3aec75f077e15c1c30c99756b926/platform/android/MapLibreAndroid/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java#L97) in your source tree. - Improve Kotlinification of LatLng ([#742](https://github.com/maplibre/maplibre-native/issues)) - Increment minSdkVersion from 14 to 21, as it covers 99.2%% of the newer devices since 2014 and lessens the backward compatibility burden ([#630](https://github.com/maplibre/maplibre-native/pull/630)) diff --git a/platform/android/DEVELOPING.md b/platform/android/DEVELOPING.md index d4255015c..d45a2e9d6 100644 --- a/platform/android/DEVELOPING.md +++ b/platform/android/DEVELOPING.md @@ -23,11 +23,11 @@ Open the `platform/android` directory to get started. _The test application (used for development purposes) uses MapTiler vector tiles, which require a MapTiler account and API key._ -With the first Gradle invocation, Gradle will take the value of the `MLN_API_KEY` environment variable and save it to `MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml`. If the environment variable wasn't set, you can edit `developer-config.xml` manually and add your API key to the `api_key` resource. +With the first Gradle invocation, Gradle will take the value of the `MLN_API_KEY` environment variable and save it to `MapLibreAndroidTestApp/src/main/res/values/developer-config.xml`. If the environment variable wasn't set, you can edit `developer-config.xml` manually and add your API key to the `api_key` resource. ## Running the TestApp -Run the configuration for the `MapboxGLAndroidSDKTestApp` module and select a device or emulator to deploy on. +Run the configuration for the `MapLibreAndroidTestApp` module and select a device or emulator to deploy on.

Android TestApp menu Android TestApp showing Demotiles @@ -41,7 +41,7 @@ More information on working on the render tests can be found [in the wiki](https ## Instrumentation Tests -To run the instrumentatin tests, find the `MapboxGLAndroidSDKTestApp` project in the sidebar, go to `src > androidTest`, right click and select "Run 'All Tests'". +To run the instrumentatin tests, find the `MapLibreAndroidTestApp` project in the sidebar, go to `src > androidTest`, right click and select "Run 'All Tests'". image diff --git a/platform/android/Makefile b/platform/android/Makefile index 03a3acbe9..b7386d757 100644 --- a/platform/android/Makefile +++ b/platform/android/Makefile @@ -41,8 +41,8 @@ MLN_ANDROID_LOCAL_BENCHMARK_DIR = /data/local/tmp/benchmark MLN_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) MLN_ANDROID_DALVIKVM = dalvikvm$(if $(filter arm-v8 x86-64,$1),64,32) MLN_ANDROID_APK_SUFFIX = $(if $(filter Release,$(BUILDTYPE)),release,debug) -MLN_ANDROID_CORE_TEST_DIR = MapboxGLAndroidSDK/.externalNativeBuild/cmake/$(buildtype)/$2/core-tests -MLN_ANDROID_BENCHMARK_DIR = MapboxGLAndroidSDK/.externalNativeBuild/cmake/$(buildtype)/$2/benchmark +MLN_ANDROID_CORE_TEST_DIR = MapLibreAndroid/.externalNativeBuild/cmake/$(buildtype)/$2/core-tests +MLN_ANDROID_BENCHMARK_DIR = MapLibreAndroid/.externalNativeBuild/cmake/$(buildtype)/$2/benchmark MLN_ANDROID_STL ?= c++_static SOCKET_TIMEOUT = 360000 CONNECTION_TIMEOUT = 360000 @@ -61,28 +61,28 @@ define ANDROID_RULES .PHONY: android-test-lib-$1 android-test-lib-$1: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_test=true :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_test=true :MapLibreAndroidTestApp:assemble$(BUILDTYPE) .PHONY: android-benchmark-$1 android-benchmark-$1: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_benchmark=true :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 -Pmapbox.with_benchmark=true :MapLibreAndroidTestApp:assemble$(BUILDTYPE) # Build SDK for for specified abi .PHONY: android-lib-$1 android-lib-$1: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDK:assemble$(BUILDTYPE) + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroid:assemble$(BUILDTYPE) # Build test app and SDK for for specified abi .PHONY: android-$1 android-$1: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:assemble$(BUILDTYPE) # Build the core test for specified abi .PHONY: android-core-test-$1 android-core-test-$1: android-test-lib-$1 # Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place) mkdir -p $(MLN_ANDROID_CORE_TEST_DIR) - unzip -o MapboxGLAndroidSDKTestApp/build/outputs/apk/$(buildtype)/MapboxGLAndroidSDKTestApp-$(MLN_ANDROID_APK_SUFFIX).apk classes.dex -d $(MLN_ANDROID_CORE_TEST_DIR) + unzip -o MapLibreAndroidTestApp/build/outputs/apk/$(buildtype)/MapLibreAndroidTestApp-$(MLN_ANDROID_APK_SUFFIX).apk classes.dex -d $(MLN_ANDROID_CORE_TEST_DIR) run-android-core-test-$1-%: android-core-test-$1 # Ensure clean state on the device @@ -90,10 +90,10 @@ run-android-core-test-$1-%: android-core-test-$1 # Push all needed files to the device adb push $(MLN_ANDROID_CORE_TEST_DIR)/classes.dex $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 + adb push MapLibreAndroid/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 adb push test/fixtures $(MLN_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 adb push scripts/style-spec-reference/v8.json $(MLN_ANDROID_LOCAL_WORK_DIR)/scripts/style-spec-reference > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 + adb push MapLibreAndroid/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-test $(MLN_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 # Create gtest filter for skipped tests. $(eval SKIPPED_TESTS := -$(shell sed -n '/#\|^$$/!p' tests/skipped.txt | sed ':a;$!N;s/\n/:/g;ta')) @@ -117,17 +117,17 @@ run-android-benchmark-$1: run-android-benchmark-$1-* run-android-benchmark-$1-%: android-benchmark-$1 mkdir -p $(MLN_ANDROID_BENCHMARK_DIR) - unzip -o MapboxGLAndroidSDKTestApp/build/outputs/apk/$(buildtype)/MapboxGLAndroidSDKTestApp-$(MLN_ANDROID_APK_SUFFIX).apk classes.dex -d $(MLN_ANDROID_BENCHMARK_DIR) + unzip -o MapLibreAndroidTestApp/build/outputs/apk/$(buildtype)/MapLibreAndroidTestApp-$(MLN_ANDROID_APK_SUFFIX).apk classes.dex -d $(MLN_ANDROID_BENCHMARK_DIR) # Delete old test folder and create new one adb shell "rm -Rf $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) && mkdir -p $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/benchmark && mkdir -p $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/test" # Push compiled java sources, test data and executable to device adb push $(MLN_ANDROID_BENCHMARK_DIR)/classes.dex $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 + adb push MapLibreAndroid/build/intermediates/intermediate-jars/$(buildtype)/jni/$2/libmaplibre.so $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 adb push benchmark/fixtures $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/benchmark > /dev/null 2>&1 adb push test/fixtures $(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/test > /dev/null 2>&1 - adb push MapboxGLAndroidSDK/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-benchmark $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 + adb push MapLibreAndroid/build/intermediates/cmake/$(buildtype)/obj/$2/mbgl-benchmark $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) > /dev/null 2>&1 # Run benchmark. Number of benchmark iterations can be set by run-android-benchmark-N parameter. adb shell "export LD_LIBRARY_PATH=$(MLN_ANDROID_LOCAL_BENCHMARK_DIR) && cd $(MLN_ANDROID_LOCAL_BENCHMARK_DIR) && chmod +x mbgl-benchmark && ./mbgl-benchmark --class_path=$(MLN_ANDROID_LOCAL_BENCHMARK_DIR)/classes.dex --benchmark_repetitions=$$* --benchmark_format=json --benchmark_out=results.json" @@ -140,28 +140,28 @@ run-android-benchmark-$1-%: android-benchmark-$1 .PHONY: run-android-$1 run-android-$1: -adb uninstall org.maplibre.testapp 2> /dev/null - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n org.maplibre.testapp/.activity.FeatureOverviewActivity + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:install$(BUILDTYPE) && adb shell am start -n org.maplibre.testapp/.activity.FeatureOverviewActivity # Build test app instrumentation tests apk and test app apk for specified abi .PHONY: android-ui-test-$1 android-ui-test-$1: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:assembleDebug :MapboxGLAndroidSDKTestApp:assembleAndroidTest + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:assembleDebug :MapLibreAndroidTestApp:assembleAndroidTest # Run test app instrumentation tests on a connected android device or emulator with specified abi .PHONY: run-android-ui-test-$1 run-android-ui-test-$1: -adb uninstall org.maplibre.testapp 2> /dev/null - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:connectedAndroidTest # Run Java Instrumentation tests on a connected android device or emulator with specified abi and test filter run-android-ui-test-$1-%: -adb uninstall org.maplibre.testapp 2> /dev/null - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$$*" + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$$*" # Symbolicate native stack trace with the specified abi .PHONY: android-ndk-stack-$1 android-ndk-stack-$1: - adb logcat | ndk-stack -sym MapboxGLAndroidSDK/build/intermediates/cmake/debug/obj/$2/ + adb logcat | ndk-stack -sym MapLibreAndroid/build/intermediates/cmake/debug/obj/$2/ # Run render tests with pixelmatch .PHONY: run-android-render-test-$1 @@ -170,17 +170,17 @@ run-android-render-test-$1: $(BUILD_DEPS) # delete old test results rm -rf build/render-test/maplibre/ # copy test definitions & ignore file to test app assets folder, clear old ones first - rm -rf MapboxGLAndroidSDKTestApp/src/main/assets/integration - cp -r metrics/integration MapboxGLAndroidSDKTestApp/src/main/assets - cp platform/node/test/ignores.json MapboxGLAndroidSDKTestApp/src/main/assets/integration/ignores.json + rm -rf MapLibreAndroidTestApp/src/main/assets/integration + cp -r metrics/integration MapLibreAndroidTestApp/src/main/assets + cp platform/node/test/ignores.json MapLibreAndroidTestApp/src/main/assets/integration/ignores.json # run RenderTest.java to generate static map images - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="org.maplibre.testapp.render.RenderTest" + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=$2 :MapLibreAndroidTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="org.maplibre.testapp.render.RenderTest" # pull generated images from the device adb pull "`adb shell 'printenv EXTERNAL_STORAGE' | tr -d '\r'`/maplibre/render" build/render-test # copy expected result and run pixelmatch python scripts/run-render-test.py # remove test definitions from assets - rm -rf MapboxGLAndroidSDKTestApp/src/main/assets/integration + rm -rf MapLibreAndroidTestApp/src/main/assets/integration endef @@ -211,9 +211,9 @@ run-android-ui-test-%: run-android-ui-test-arm-v7-% # Run Java Unit tests on the JVM of the development machine executing this .PHONY: run-android-unit-test run-android-unit-test: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testLegacyDebugUnitTest --info + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:testLegacyDebugUnitTest --info run-android-unit-test-%: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:testLegacyDebugUnitTest --info --tests "$*" + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:testLegacyDebugUnitTest --info --tests "$*" # Builds a release package of the Android SDK .PHONY: apackage @@ -224,17 +224,17 @@ apackage: # Build test app instrumentation tests apk and test app apk for all abi's .PHONY: android-ui-test android-ui-test: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=all :MapboxGLAndroidSDKTestApp:assembleDebug :MapboxGLAndroidSDKTestApp:assembleAndroidTest + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=all :MapLibreAndroidTestApp:assembleDebug :MapLibreAndroidTestApp:assembleAndroidTest #Run instrumentations tests on MicroSoft App Center, ${devices} can be "xiaomi","huawei","OnePlus","htc" .PHONY: run-android-test-app-center run-android-test-app-center: - appcenter test run espresso --app "MapLibre-mobile/Maps-sdk" --devices "MapLibre-mobile/${devices}" --app-path MapboxGLAndroidSDKTestApp/build/outputs/apk/debug/MapboxGLAndroidSDKTestApp-debug.apk --test-series "master" --locale "en_US" --build-dir MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/debug --token ${APPCENTER_ACCESS_TOKEN} + appcenter test run espresso --app "MapLibre-mobile/Maps-sdk" --devices "MapLibre-mobile/${devices}" --app-path MapLibreAndroidTestApp/build/outputs/apk/debug/MapLibreAndroidTestApp-debug.apk --test-series "master" --locale "en_US" --build-dir MapLibreAndroidTestApp/build/outputs/apk/androidTest/debug --token ${APPCENTER_ACCESS_TOKEN} # Uploads the compiled Android SDK to Maven Central Staging .PHONY: run-android-publish run-android-publish: - $(MLN_ANDROID_GRADLE_SINGLE_JOB)-Pmapbox.abis=all :MapboxGLAndroidSDK:publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository + $(MLN_ANDROID_GRADLE_SINGLE_JOB)-Pmapbox.abis=all :MapLibreAndroid:publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository # Dump system graphics information for the test app .PHONY: android-gfxinfo @@ -248,7 +248,7 @@ android-check : android-ktlint android-checkstyle android-lint-sdk android-lint- # Runs checkstyle on the java code .PHONY: android-checkstyle android-checkstyle: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:checkstyle :MapboxGLAndroidSDKTestApp:checkstyle + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:checkstyle :MapLibreAndroidTestApp:checkstyle # Runs checkstyle on the kotlin code .PHONY: android-ktlint @@ -258,22 +258,22 @@ android-ktlint: # Runs lint on the Android SDK java code .PHONY: android-lint-sdk android-lint-sdk: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:lint + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:lint # Runs lint on the Android test app java code .PHONY: android-lint-test-app android-lint-test-app: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:lint + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroidTestApp:lint # Generates javadoc from the Android SDK .PHONY: android-javadoc android-javadoc: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:javadocrelease + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:javadocrelease # Generates LICENSE.md file based on all Android project dependencies .PHONY: android-license android-license: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:licenseReleaseReport + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:licenseReleaseReport python scripts/generate-license.py # Symbolicate ndk stack traces for the arm-v7 abi @@ -293,7 +293,7 @@ run-android-nitpick: android-update-vendor # Creates a dependency graph using Graphviz .PHONY: android-graph android-graph: - $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:generateDependencyGraphMapboxLibraries + $(MLN_ANDROID_GRADLE) -Pmapbox.abis=none :MapLibreAndroid:generateDependencyGraphMapboxLibraries # Lists tasks .PHONY: list-tasks @@ -304,9 +304,9 @@ list-tasks: .PHONY: clean clean: - -rm -rf ./MapboxGLAndroidSDK/build \ - ./MapboxGLAndroidSDK/.externalNativeBuild \ - ./MapboxGLAndroidSDKTestApp/build \ - ./MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/gen \ - ./MapboxGLAndroidSDK/src/main/assets \ - ./MapboxGLAndroidSDKTestApp/src/main/assets/integration + -rm -rf ./MapLibreAndroid/build \ + ./MapLibreAndroid/.externalNativeBuild \ + ./MapLibreAndroidTestApp/build \ + ./MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/gen \ + ./MapLibreAndroid/src/main/assets \ + ./MapLibreAndroidTestApp/src/main/assets/integration diff --git a/platform/android/MapboxGLAndroidSDK/.gitignore b/platform/android/MapLibreAndroid/.gitignore similarity index 100% rename from platform/android/MapboxGLAndroidSDK/.gitignore rename to platform/android/MapLibreAndroid/.gitignore diff --git a/platform/android/MapboxGLAndroidSDK/README.md b/platform/android/MapLibreAndroid/README.md similarity index 100% rename from platform/android/MapboxGLAndroidSDK/README.md rename to platform/android/MapLibreAndroid/README.md diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapLibreAndroid/build.gradle similarity index 99% rename from platform/android/MapboxGLAndroidSDK/build.gradle rename to platform/android/MapLibreAndroid/build.gradle index b3d1c052d..968dcecf7 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapLibreAndroid/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'kotlin-android' apply from: "${rootDir}/gradle/native-build.gradle" dependencies { - lintChecks project(":MapboxGLAndroidSDKLint") + lintChecks project(":MapLibreAndroidLint") api dependenciesList.mapboxJavaGeoJSON api dependenciesList.mapboxAndroidGestures diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapLibreAndroid/gradle.properties similarity index 100% rename from platform/android/MapboxGLAndroidSDK/gradle.properties rename to platform/android/MapLibreAndroid/gradle.properties diff --git a/platform/android/MapboxGLAndroidSDK/lint.xml b/platform/android/MapLibreAndroid/lint.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/lint.xml rename to platform/android/MapLibreAndroid/lint.xml diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapLibreAndroid/proguard-rules.pro similarity index 100% rename from platform/android/MapboxGLAndroidSDK/proguard-rules.pro rename to platform/android/MapLibreAndroid/proguard-rules.pro diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt b/platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt rename to platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.cpp rename to platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_backend.hpp rename to platform/android/MapLibreAndroid/src/cpp/android_renderer_backend.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.cpp rename to platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp b/platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/android_renderer_frontend.hpp rename to platform/android/MapLibreAndroid/src/cpp/android_renderer_frontend.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.cpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/marker.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/marker.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/multi_point.hpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/multi_point.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.cpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/polygon.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/polygon.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.cpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/polyline.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp b/platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp rename to platform/android/MapLibreAndroid/src/cpp/annotation/polyline.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager.hpp rename to platform/android/MapLibreAndroid/src/cpp/asset_manager.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/asset_manager_file_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.cpp rename to platform/android/MapLibreAndroid/src/cpp/connectivity_listener.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp b/platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp rename to platform/android/MapLibreAndroid/src/cpp/connectivity_listener.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp b/platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.cpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/collection.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/collection.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/collection.hpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/collection.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp b/platform/android/MapLibreAndroid/src/cpp/conversion/color.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.cpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/color.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/color.hpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/color.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.cpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/constant.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/constant.hpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/constant.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp b/platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/conversion/conversion.hpp rename to platform/android/MapLibreAndroid/src/cpp/conversion/conversion.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/file_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/file_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/file_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/file_source.hpp b/platform/android/MapLibreAndroid/src/cpp/file_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/file_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/file_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/feature.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/feature.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/feature_collection.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/feature_collection.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/geometry.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/geometry.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/geometry_collection.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/geometry_collection.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/line_string.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/line_string.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/line_string.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_line_string.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_line_string.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_point.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_point.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/multi_polygon.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/multi_polygon.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/point.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/point.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/point.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.cpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/polygon.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/polygon.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/polygon.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp b/platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geojson/util.hpp rename to platform/android/MapLibreAndroid/src/cpp/geojson/util.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.cpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.cpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_bounds.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.cpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/lat_lng_quad.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.cpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp b/platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp rename to platform/android/MapLibreAndroid/src/cpp/geometry/projected_meters.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.cpp rename to platform/android/MapLibreAndroid/src/cpp/graphics/pointf.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp b/platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/graphics/pointf.hpp rename to platform/android/MapLibreAndroid/src/cpp/graphics/pointf.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.cpp rename to platform/android/MapLibreAndroid/src/cpp/graphics/rectf.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp b/platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/graphics/rectf.hpp rename to platform/android/MapLibreAndroid/src/cpp/graphics/rectf.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.cpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_array.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_array.hpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_array.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.cpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_element.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_element.hpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_element.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.cpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_object.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_object.hpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_object.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.cpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp b/platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/gson/json_primitive.hpp rename to platform/android/MapLibreAndroid/src/cpp/gson/json_primitive.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp b/platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator.cpp rename to platform/android/MapLibreAndroid/src/cpp/i18n/collator.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp rename to platform/android/MapLibreAndroid/src/cpp/i18n/collator_jni.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format.cpp rename to platform/android/MapLibreAndroid/src/cpp/i18n/number_format.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/i18n/number_format_jni.hpp rename to platform/android/MapLibreAndroid/src/cpp/i18n/number_format_jni.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/java/util.cpp b/platform/android/MapLibreAndroid/src/cpp/java/util.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/java/util.cpp rename to platform/android/MapLibreAndroid/src/cpp/java/util.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/java/util.hpp b/platform/android/MapLibreAndroid/src/cpp/java/util.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/java/util.hpp rename to platform/android/MapLibreAndroid/src/cpp/java/util.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/java_types.cpp b/platform/android/MapLibreAndroid/src/cpp/java_types.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/java_types.cpp rename to platform/android/MapLibreAndroid/src/cpp/java_types.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/java_types.hpp b/platform/android/MapLibreAndroid/src/cpp/java_types.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/java_types.hpp rename to platform/android/MapLibreAndroid/src/cpp/java_types.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp b/platform/android/MapLibreAndroid/src/cpp/jni_native.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp rename to platform/android/MapLibreAndroid/src/cpp/jni_native.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp b/platform/android/MapLibreAndroid/src/cpp/jni_native.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.hpp rename to platform/android/MapLibreAndroid/src/cpp/jni_native.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/logger.cpp b/platform/android/MapLibreAndroid/src/cpp/logger.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/logger.cpp rename to platform/android/MapLibreAndroid/src/cpp/logger.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/logger.hpp b/platform/android/MapLibreAndroid/src/cpp/logger.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/logger.hpp rename to platform/android/MapLibreAndroid/src/cpp/logger.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp b/platform/android/MapLibreAndroid/src/cpp/logging_android.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/logging_android.cpp rename to platform/android/MapLibreAndroid/src/cpp/logging_android.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/main.cpp b/platform/android/MapLibreAndroid/src/cpp/main.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/main.cpp rename to platform/android/MapLibreAndroid/src/cpp/main.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.cpp rename to platform/android/MapLibreAndroid/src/cpp/map/camera_position.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp b/platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp rename to platform/android/MapLibreAndroid/src/cpp/map/camera_position.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map/image.cpp b/platform/android/MapLibreAndroid/src/cpp/map/image.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map/image.cpp rename to platform/android/MapLibreAndroid/src/cpp/map/image.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map/image.hpp b/platform/android/MapLibreAndroid/src/cpp/map/image.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map/image.hpp rename to platform/android/MapLibreAndroid/src/cpp/map/image.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.cpp rename to platform/android/MapLibreAndroid/src/cpp/map_renderer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp rename to platform/android/MapLibreAndroid/src/cpp/map_renderer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.cpp rename to platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp b/platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp rename to platform/android/MapLibreAndroid/src/cpp/map_renderer_runnable.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.cpp b/platform/android/MapLibreAndroid/src/cpp/maplibre.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.cpp rename to platform/android/MapLibreAndroid/src/cpp/maplibre.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.hpp b/platform/android/MapLibreAndroid/src/cpp/maplibre.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.hpp rename to platform/android/MapLibreAndroid/src/cpp/maplibre.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp b/platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp rename to platform/android/MapLibreAndroid/src/cpp/native_map_view.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp b/platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp rename to platform/android/MapLibreAndroid/src/cpp/native_map_view.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.cpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_manager.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.cpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.cpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_definition.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.cpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_error.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.cpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp b/platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp rename to platform/android/MapLibreAndroid/src/cpp/offline/offline_region_status.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.cpp rename to platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp rename to platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshot.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp rename to platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp b/platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp rename to platform/android/MapLibreAndroid/src/cpp/snapshotter/map_snapshotter.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp b/platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/android_conversion.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/filter.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/position.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_expression.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/property_value.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/transition_options.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp b/platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/conversion/url_or_tileset.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp b/platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer_manager.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp b/platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/light.cpp b/platform/android/MapLibreAndroid/src/cpp/style/light.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/light.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/light.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/light.hpp b/platform/android/MapLibreAndroid/src/cpp/style/light.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/light.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/light.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/position.cpp b/platform/android/MapLibreAndroid/src/cpp/style/position.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/position.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/position.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/position.hpp b/platform/android/MapLibreAndroid/src/cpp/style/position.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/position.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/position.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp b/platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp b/platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/value.cpp b/platform/android/MapLibreAndroid/src/cpp/style/value.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/value.cpp rename to platform/android/MapLibreAndroid/src/cpp/style/value.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/style/value.hpp b/platform/android/MapLibreAndroid/src/cpp/style/value.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/style/value.hpp rename to platform/android/MapLibreAndroid/src/cpp/style/value.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer.cpp rename to platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp rename to platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/util/default_style.cpp b/platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/util/default_style.cpp rename to platform/android/MapLibreAndroid/src/cpp/util/default_style.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/util/default_style.hpp b/platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/util/default_style.hpp rename to platform/android/MapLibreAndroid/src/cpp/util/default_style.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/util/tile_server_options.cpp b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/util/tile_server_options.cpp rename to platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.cpp diff --git a/platform/android/MapboxGLAndroidSDK/src/cpp/util/tile_server_options.hpp b/platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/cpp/util/tile_server_options.hpp rename to platform/android/MapLibreAndroid/src/cpp/util/tile_server_options.hpp diff --git a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapLibreAndroid/src/main/AndroidManifest.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml rename to platform/android/MapLibreAndroid/src/main/AndroidManifest.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoader.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoader.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoaderProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoaderProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/LibraryLoaderProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/LibraryLoaderProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapLibre.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapLibre.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapLibre.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapLibre.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapStrictMode.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapStrictMode.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapStrictMode.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapStrictMode.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapStrictModeException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapStrictModeException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/MapStrictModeException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/MapStrictModeException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/ModuleProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/ModuleProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/ModuleProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/ModuleProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/ModuleProviderImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/ModuleProviderImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/ModuleProviderImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/ModuleProviderImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/WellKnownTileServer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/WellKnownTileServer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/WellKnownTileServer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/WellKnownTileServer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Annotation.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Annotation.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Annotation.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Annotation.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/ArrowDirection.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/ArrowDirection.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/ArrowDirection.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/ArrowDirection.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BaseMarkerOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BaseMarkerOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BaseMarkerOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BaseMarkerOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BasePointCollection.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BasePointCollection.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BasePointCollection.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BasePointCollection.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Bubble.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Bubble.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Bubble.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Bubble.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BubbleLayout.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BubbleLayout.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BubbleLayout.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BubbleLayout.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BubblePopupHelper.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BubblePopupHelper.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/BubblePopupHelper.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/BubblePopupHelper.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Icon.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Icon.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Icon.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Icon.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/IconFactory.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/IconFactory.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/IconFactory.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/IconFactory.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/InfoWindow.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/InfoWindow.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/InfoWindow.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/InfoWindow.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Marker.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Marker.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Marker.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Marker.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/MarkerOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/MarkerOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/MarkerOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/MarkerOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Polygon.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Polygon.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Polygon.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Polygon.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/PolygonOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/PolygonOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/PolygonOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/PolygonOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Polyline.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Polyline.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/Polyline.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/Polyline.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/PolylineOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/PolylineOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/PolylineOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/PolylineOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/annotations/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/annotations/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/Attribution.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/Attribution.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/Attribution.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/Attribution.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionLayout.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionLayout.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionLayout.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionLayout.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionMeasure.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionMeasure.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionMeasure.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionMeasure.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionParser.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionParser.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/AttributionParser.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/AttributionParser.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/attribution/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/attribution/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraPosition.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraPosition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraPosition.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraPosition.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraUpdate.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraUpdate.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraUpdate.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraUpdate.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraUpdateFactory.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraUpdateFactory.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/CameraUpdateFactory.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/CameraUpdateFactory.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/camera/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/camera/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/GeometryConstants.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/GeometryConstants.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/GeometryConstants.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/GeometryConstants.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/MapLibreConstants.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/MapLibreConstants.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/MapLibreConstants.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/constants/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/constants/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/CalledFromWorkerThreadException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/CalledFromWorkerThreadException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/CalledFromWorkerThreadException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/CalledFromWorkerThreadException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/ConversionException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/ConversionException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/ConversionException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/ConversionException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/IconBitmapChangedException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/IconBitmapChangedException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/IconBitmapChangedException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/IconBitmapChangedException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/InvalidLatLngBoundsException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/InvalidLatLngBoundsException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/InvalidLatLngBoundsException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/InvalidLatLngBoundsException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/InvalidMarkerPositionException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/InvalidMarkerPositionException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/InvalidMarkerPositionException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/InvalidMarkerPositionException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/MapLibreConfigurationException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/MapLibreConfigurationException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/MapLibreConfigurationException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/MapLibreConfigurationException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/TooManyIconsException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/TooManyIconsException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/TooManyIconsException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/TooManyIconsException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/exceptions/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/exceptions/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLng.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLng.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLng.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngBounds.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngBounds.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngBounds.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngBounds.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngQuad.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngQuad.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngQuad.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngQuad.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngSpan.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngSpan.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/LatLngSpan.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/LatLngSpan.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/ProjectedMeters.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/ProjectedMeters.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/ProjectedMeters.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/ProjectedMeters.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/VisibleRegion.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/VisibleRegion.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/geometry/VisibleRegion.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/geometry/VisibleRegion.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpIdentifier.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpIdentifier.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpIdentifier.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpIdentifier.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpLogger.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpLogger.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpLogger.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpLogger.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpRequest.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpRequest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpRequest.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpRequest.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpRequestUrl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpRequestUrl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpRequestUrl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpRequestUrl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpResponder.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpResponder.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/HttpResponder.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/HttpResponder.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/LocalRequestTask.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/LocalRequestTask.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/LocalRequestTask.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/LocalRequestTask.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/NativeHttpRequest.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/NativeHttpRequest.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/NativeHttpRequest.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/http/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/http/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/AnimatorListenerHolder.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/AnimatorListenerHolder.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/AnimatorListenerHolder.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/AnimatorListenerHolder.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/CompassEngine.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/CompassEngine.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/CompassEngine.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/CompassEngine.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/CompassListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/CompassListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/CompassListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/CompassListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/IndicatorLocationLayerRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/IndicatorLocationLayerRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/IndicatorLocationLayerRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/IndicatorLocationLayerRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LatLngEvaluator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LatLngEvaluator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LatLngEvaluator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LatLngEvaluator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerBitmapProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerBitmapProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerBitmapProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerBitmapProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerFeatureProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerSourceProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LayerSourceProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LayerSourceProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationAnimatorCoordinator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationCameraController.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationCameraController.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationCameraController.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationCameraController.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponent.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponent.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponent.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponent.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentActivationOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentActivationOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentActivationOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentActivationOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentCompassEngine.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentCompassEngine.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentCompassEngine.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentCompassEngine.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentConstants.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentConstants.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentConstants.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentConstants.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentNotInitializedException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentNotInitializedException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentNotInitializedException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentNotInitializedException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentPositionManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentPositionManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationComponentPositionManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentPositionManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationIndicatorLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationIndicatorLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationIndicatorLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationIndicatorLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationLayerController.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationLayerController.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerController.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationLayerRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationLayerRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationLayerRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorListener.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorListener.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorListener.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorListener.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorSetProvider.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorSetProvider.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreAnimatorSetProvider.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreAnimatorSetProvider.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreCameraAnimatorAdapter.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreCameraAnimatorAdapter.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreCameraAnimatorAdapter.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreCameraAnimatorAdapter.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreFloatAnimator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreFloatAnimator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreFloatAnimator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreFloatAnimator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreLatLngAnimator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreLatLngAnimator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibreLatLngAnimator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibreLatLngAnimator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibrePaddingAnimator.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibrePaddingAnimator.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/MapLibrePaddingAnimator.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/MapLibrePaddingAnimator.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnCameraMoveInvalidateListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnCameraMoveInvalidateListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnCameraMoveInvalidateListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnCameraMoveInvalidateListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnCameraTrackingChangedListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnCameraTrackingChangedListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnCameraTrackingChangedListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnCameraTrackingChangedListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationCameraTransitionListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationCameraTransitionListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationCameraTransitionListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationCameraTransitionListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationClickListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationClickListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationClickListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationClickListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationLongClickListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationLongClickListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationLongClickListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationLongClickListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationStaleListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationStaleListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnLocationStaleListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnLocationStaleListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnRenderModeChangedListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnRenderModeChangedListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/OnRenderModeChangedListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/OnRenderModeChangedListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/PaddingEvaluator.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/PaddingEvaluator.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/PaddingEvaluator.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/PaddingEvaluator.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/PulsingLocationCircleAnimator.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/PulsingLocationCircleAnimator.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/PulsingLocationCircleAnimator.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/PulsingLocationCircleAnimator.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/StaleStateManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/StaleStateManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/StaleStateManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/StaleStateManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/SymbolLocationLayerRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/Utils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/Utils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/Utils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/Utils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/AndroidLocationEngineImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/AndroidLocationEngineImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/AndroidLocationEngineImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/AndroidLocationEngineImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngine.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngine.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngine.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngine.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineCallback.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineCallback.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineCallback.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineCallback.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineDefault.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineDefault.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineDefault.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineDefault.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineProxy.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineProxy.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineProxy.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineProxy.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineRequest.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineRequest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineRequest.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineRequest.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineResult.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineResult.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/LocationEngineResult.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/LocationEngineResult.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/Utils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/Utils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/engine/Utils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/engine/Utils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/CameraMode.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/CameraMode.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/CameraMode.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/CameraMode.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/RenderMode.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/RenderMode.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/RenderMode.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/RenderMode.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/modes/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/modes/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/permissions/PermissionsListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/permissions/PermissionsListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/permissions/PermissionsListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/permissions/PermissionsListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/permissions/PermissionsManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/permissions/PermissionsManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/permissions/PermissionsManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/permissions/PermissionsManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/Logger.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/Logger.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/Logger.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/Logger.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/LoggerDefinition.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/LoggerDefinition.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/LoggerDefinition.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/LoggerDefinition.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/log/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/log/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AnnotationContainer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AnnotationContainer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AnnotationContainer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AnnotationContainer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AnnotationManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AnnotationManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AnnotationManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AnnotationManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Annotations.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Annotations.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Annotations.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Annotations.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AttributionDialogManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AttributionDialogManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/AttributionDialogManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/AttributionDialogManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/CameraChangeDispatcher.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/CameraChangeDispatcher.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/CameraChangeDispatcher.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/CameraChangeDispatcher.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/FocalPointChangeListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/FocalPointChangeListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/FocalPointChangeListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/FocalPointChangeListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/IconManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/IconManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/IconManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/IconManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Image.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Image.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Image.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Image.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ImageContent.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ImageContent.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ImageContent.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ImageContent.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ImageStretches.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ImageStretches.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ImageStretches.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ImageStretches.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/InfoWindowManager.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/InfoWindowManager.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/InfoWindowManager.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/InfoWindowManager.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapChangeReceiver.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapChangeReceiver.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapChangeReceiver.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapChangeReceiver.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapFragment.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapFragment.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapFragment.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapFragment.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapGestureDetector.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapGestureDetector.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapGestureDetector.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapGestureDetector.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapKeyListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapKeyListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapKeyListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapKeyListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapLibreMap.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapLibreMap.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapLibreMapOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMapOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapLibreMapOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMapOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MapView.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MarkerContainer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MarkerContainer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/MarkerContainer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MarkerContainer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Markers.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Markers.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Markers.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Markers.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/NativeMap.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/NativeMap.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMap.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/NativeMapView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/NativeMapView.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/NativeMapView.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/OnMapReadyCallback.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/OnMapReadyCallback.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/OnMapReadyCallback.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/OnMapReadyCallback.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/PolygonContainer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/PolygonContainer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/PolygonContainer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/PolygonContainer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Polygons.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Polygons.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Polygons.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Polygons.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/PolylineContainer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/PolylineContainer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/PolylineContainer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/PolylineContainer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Polylines.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Polylines.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Polylines.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Polylines.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Projection.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Projection.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Projection.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ShapeAnnotationContainer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ShapeAnnotationContainer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ShapeAnnotationContainer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ShapeAnnotationContainer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ShapeAnnotations.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ShapeAnnotations.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/ShapeAnnotations.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/ShapeAnnotations.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Style.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Style.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Style.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Style.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/SupportMapFragment.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/SupportMapFragment.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/SupportMapFragment.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/SupportMapFragment.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Transform.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Transform.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/Transform.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/Transform.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/UiSettings.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/UiSettings.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/UiSettings.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/UiSettings.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRendererRunnable.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRendererRunnable.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRendererRunnable.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRendererRunnable.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRendererScheduler.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRendererScheduler.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/MapRendererScheduler.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/MapRendererScheduler.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLConfigChooser.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLContextFactory.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLContextFactory.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLContextFactory.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLContextFactory.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLLogWrapper.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/EGLWindowSurfaceFactory.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/egl/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/egl/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/GLSurfaceViewMapRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/MapLibreGLSurfaceView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/MapLibreGLSurfaceView.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/MapLibreGLSurfaceView.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/MapLibreGLSurfaceView.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/glsurfaceview/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewMapRenderer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewRenderThread.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewRenderThread.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewRenderThread.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/TextureViewRenderThread.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/renderer/textureview/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/renderer/textureview/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/widgets/CompassView.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/widgets/CompassView.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/widgets/CompassView.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/widgets/CompassView.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/widgets/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/widgets/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/maps/widgets/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/widgets/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/HttpRequestImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/HttpRequestImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/HttpRequestImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/HttpRequestImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/HttpRequestUtil.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/HttpRequestUtil.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/HttpRequestUtil.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/HttpRequestUtil.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/http/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/http/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/loader/LibraryLoaderProviderImpl.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/loader/LibraryLoaderProviderImpl.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/loader/LibraryLoaderProviderImpl.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/loader/LibraryLoaderProviderImpl.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/loader/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/loader/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/module/loader/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/module/loader/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/ConnectivityListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/ConnectivityListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/ConnectivityListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/ConnectivityListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/ConnectivityReceiver.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/ConnectivityReceiver.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/ConnectivityReceiver.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/ConnectivityReceiver.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/NativeConnectivityListener.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/NativeConnectivityListener.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/NativeConnectivityListener.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/NativeConnectivityListener.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/net/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/net/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineGeometryRegionDefinition.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineManager.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineManager.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineManager.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineManager.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegion.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegion.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegion.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegion.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionDefinition.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionDefinition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionDefinition.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionDefinition.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionError.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionError.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionError.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionError.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionStatus.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionStatus.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineRegionStatus.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineRegionStatus.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/OfflineTilePyramidRegionDefinition.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/offline/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/offline/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnaphotUtil.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnaphotUtil.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnaphotUtil.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnaphotUtil.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnapshot.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnapshot.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnapshot.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnapshot.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnapshotter.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnapshotter.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/MapSnapshotter.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/MapSnapshotter.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/snapshotter/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/snapshotter/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/FileSource.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/FileSource.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/FileSource.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/FileSource.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/Resource.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/Resource.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/Resource.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/Resource.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/storage/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/storage/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/expressions/Expression.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/expressions/Expression.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/Expression.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/expressions/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/expressions/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/expressions/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/BackgroundLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/BackgroundLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/BackgroundLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/BackgroundLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CannotAddLayerException.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CannotAddLayerException.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CannotAddLayerException.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CannotAddLayerException.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CircleLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CircleLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CircleLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CircleLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CustomLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CustomLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/CustomLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/CustomLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/FillExtrusionLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/FillExtrusionLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/FillExtrusionLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/FillExtrusionLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/FillLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/FillLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/FillLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/FillLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/HeatmapLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/HeatmapLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/HeatmapLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/HeatmapLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/HillshadeLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/HillshadeLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/HillshadeLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/HillshadeLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/Layer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/Layer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/Layer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/Layer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/LayoutPropertyValue.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/LayoutPropertyValue.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/LayoutPropertyValue.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/LayoutPropertyValue.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/LineLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/LineLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/LineLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/LineLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PaintPropertyValue.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PaintPropertyValue.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PaintPropertyValue.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PaintPropertyValue.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/Property.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/Property.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/Property.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/Property.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PropertyValue.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PropertyValue.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PropertyValue.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PropertyValue.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/RasterLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/RasterLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/RasterLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/RasterLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/SymbolLayer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/SymbolLayer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/SymbolLayer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/SymbolLayer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/TransitionOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/TransitionOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/TransitionOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/TransitionOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/layer.java.ejs b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/layer.java.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/layer.java.ejs rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/layer.java.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property.java.ejs b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property.java.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property.java.ejs rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property.java.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/Light.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/Light.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/Light.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/Light.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/Position.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/Position.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/Position.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/Position.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/light.java.ejs b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/light.java.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/light.java.ejs rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/light.java.ejs diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/light/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CannotAddSourceException.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CannotAddSourceException.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CannotAddSourceException.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CannotAddSourceException.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CustomGeometrySourceOptions.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySourceOptions.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/CustomGeometrySourceOptions.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/CustomGeometrySourceOptions.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeoJsonOptions.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonOptions.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeoJsonOptions.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonOptions.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeoJsonSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/GeometryTileProvider.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/ImageSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/ImageSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/ImageSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/ImageSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/RasterDemSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/RasterDemSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/RasterDemSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/RasterDemSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/RasterSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/RasterSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/RasterSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/RasterSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/Source.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/Source.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/Source.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/Source.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/TileSet.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/TileSet.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/TileSet.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/TileSet.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/UnknownSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/UnknownSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/UnknownSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/UnknownSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/VectorSource.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/sources/VectorSource.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/sources/VectorSource.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/Formatted.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/Formatted.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/Formatted.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/Formatted.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/FormattedSection.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/FormattedSection.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/FormattedSection.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/FormattedSection.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/PackageInfo.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/PackageInfo.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/types/PackageInfo.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/style/types/PackageInfo.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/text/LocalGlyphRasterizer.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/text/LocalGlyphRasterizer.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/text/LocalGlyphRasterizer.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/text/LocalGlyphRasterizer.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/text/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/text/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/text/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/text/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/util/DefaultStyle.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/util/DefaultStyle.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/util/DefaultStyle.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/util/DefaultStyle.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/util/TileServerOptions.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/util/TileServerOptions.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/util/TileServerOptions.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/util/TileServerOptions.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/AnimatorUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/AnimatorUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/AnimatorUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/AnimatorUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/BitmapUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/BitmapUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/BitmapUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/ColorUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/ColorUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/ColorUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/ColorUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/Compare.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/Compare.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/Compare.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/Compare.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/Extensions.kt b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/Extensions.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/Extensions.kt rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/Extensions.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FileUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/FileUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FileUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/FileUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/FontUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/FontUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/FontUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/MapFragmentUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/MapFragmentUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/MapFragmentUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/MapFragmentUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/MathUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/MathUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/MathUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/MathUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/StringUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/StringUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/StringUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/StringUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/ThreadUtils.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/ThreadUtils.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/ThreadUtils.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/ThreadUtils.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/package-info.java b/platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/package-info.java similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/org/maplibre/android/utils/package-info.java rename to platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/utils/package-info.java diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html b/platform/android/MapLibreAndroid/src/main/java/overview.html similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/java/overview.html rename to platform/android/MapLibreAndroid/src/main/java/overview.html diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapLibreAndroid/src/main/res-public/values/public.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml rename to platform/android/MapLibreAndroid/src/main/res-public/values/public.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_logo_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_logo_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_logo_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png b/platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png rename to platform/android/MapLibreAndroid/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_bg_selector.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_bg_selector.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_icon_default.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_icon_default.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_selected.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_icon_selected.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_selected.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_icon_selected.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_mylocation_bg_shape.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_mylocation_bg_shape.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_popup_window_transparent.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_popup_window_transparent.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_rounded_corner.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_rounded_corner.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_bearing_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_bearing_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon_shadow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon_shadow.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon_stale.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_icon_stale.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_puck_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_puck_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml b/platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_stroke_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml rename to platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_user_stroke_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml b/platform/android/MapLibreAndroid/src/main/res/layout/maplibre_attribution_list_item.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml rename to platform/android/MapLibreAndroid/src/main/res/layout/maplibre_attribution_list_item.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml b/platform/android/MapLibreAndroid/src/main/res/layout/maplibre_infowindow_content.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml rename to platform/android/MapLibreAndroid/src/main/res/layout/maplibre_infowindow_content.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_view_image_marker.xml b/platform/android/MapLibreAndroid/src/main/res/layout/maplibre_view_image_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_view_image_marker.xml rename to platform/android/MapLibreAndroid/src/main/res/layout/maplibre_view_image_marker.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-bg/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-bg/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-ca/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-ca/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-cs/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-cs/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-es/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-es/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-fr/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-fr/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-gl/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-gl/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-he/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-he/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-hu/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-hu/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-iw/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-iw/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-ko/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-ko/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-lt/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-lt/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-nl/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-nl/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-pl/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-pl/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-pt-rPT/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-ru/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-ru/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-sv/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-sv/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-uk/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-uk/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-vi/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-vi/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-zh-rCN/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-zh-rHK/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values-zh-rTW/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapLibreAndroid/src/main/res/values/attrs.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml rename to platform/android/MapLibreAndroid/src/main/res/values/attrs.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapLibreAndroid/src/main/res/values/colors.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml rename to platform/android/MapLibreAndroid/src/main/res/values/colors.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapLibreAndroid/src/main/res/values/dimens.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml rename to platform/android/MapLibreAndroid/src/main/res/values/dimens.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapLibreAndroid/src/main/res/values/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml rename to platform/android/MapLibreAndroid/src/main/res/values/strings.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapLibreAndroid/src/main/res/values/styles.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml rename to platform/android/MapLibreAndroid/src/main/res/values/styles.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/MapLibreInjector.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreInjector.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/MapLibreInjector.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreInjector.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/MapLibreTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/MapLibreTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/MapLibreTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/AnnotationTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/IconTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/IconTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/IconTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/InfoWindowTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/MarkerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/MarkerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/MarkerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/PolygonTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/PolygonTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolygonTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/PolylineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/annotations/PolylineTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/annotations/PolylineTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/attribution/AttributionParseTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/camera/CameraPositionTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/constants/AppConstant.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/constants/AppConstant.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/constants/AppConstant.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/constants/AppConstant.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngBoundsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngSpanTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/LatLngTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/LatLngTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/ProjectedMetersTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/geometry/VisibleRegionTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/CompassEngineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/CompassEngineTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/CompassEngineTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/IndicatorLocationLayerRendererTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationAnimatorCoordinatorTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentActivationOptionsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentOptionsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentPositionManagerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationComponentTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationComponentTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationLayerControllerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/MapLibreAnimatorTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/UtilsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/UtilsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/UtilsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/UtilsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/AndroidLocationEngineImplTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineProxyTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineRequestTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineResultTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/LocationEngineTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplAdditionalTest2.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/engine/MapLibreFusedLocationEngineImplTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/log/LoggerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/log/LoggerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/log/LoggerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AnnotationManagerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/AttributionDialogManagerTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapChangeReceiverTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsAttrsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapOptionsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapLibreMapTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleBuilderTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/StyleTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/StyleTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/StyleTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/TransformTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/TransformTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/TransformTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/UiSettingsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUrlTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/module/http/HttpRequestUtilTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/style/expressions/ExpressionTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ColorUtilsTest.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/ConfigUtils.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ConfigUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/ConfigUtils.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/ConfigUtils.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/MockParcel.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/MockParcel.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/android/utils/MockParcel.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/utils/MockParcel.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/testUtils/Assert.kt b/platform/android/MapLibreAndroid/src/test/java/org/maplibre/testUtils/Assert.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/java/org/maplibre/testUtils/Assert.kt rename to platform/android/MapLibreAndroid/src/test/java/org/maplibre/testUtils/Assert.kt diff --git a/platform/android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/platform/android/MapLibreAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to platform/android/MapLibreAndroid/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/platform/android/MapboxGLAndroidSDKLint/.gitignore b/platform/android/MapLibreAndroidLint/.gitignore similarity index 100% rename from platform/android/MapboxGLAndroidSDKLint/.gitignore rename to platform/android/MapLibreAndroidLint/.gitignore diff --git a/platform/android/MapboxGLAndroidSDKLint/build.gradle b/platform/android/MapLibreAndroidLint/build.gradle similarity index 100% rename from platform/android/MapboxGLAndroidSDKLint/build.gradle rename to platform/android/MapLibreAndroidLint/build.gradle diff --git a/platform/android/MapboxGLAndroidSDKLint/src/main/java/org/maplibre/android/lint/KeepDetector.kt b/platform/android/MapLibreAndroidLint/src/main/java/org/maplibre/android/lint/KeepDetector.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKLint/src/main/java/org/maplibre/android/lint/KeepDetector.kt rename to platform/android/MapLibreAndroidLint/src/main/java/org/maplibre/android/lint/KeepDetector.kt diff --git a/platform/android/MapboxGLAndroidSDKLint/src/main/java/org/maplibre/android/lint/MapLibreIssueRegistry.kt b/platform/android/MapLibreAndroidLint/src/main/java/org/maplibre/android/lint/MapLibreIssueRegistry.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKLint/src/main/java/org/maplibre/android/lint/MapLibreIssueRegistry.kt rename to platform/android/MapLibreAndroidLint/src/main/java/org/maplibre/android/lint/MapLibreIssueRegistry.kt diff --git a/platform/android/MapboxGLAndroidSDKLint/src/test/java/org/maplibre/android/lint/KeepDetectorTest.kt b/platform/android/MapLibreAndroidLint/src/test/java/org/maplibre/android/lint/KeepDetectorTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKLint/src/test/java/org/maplibre/android/lint/KeepDetectorTest.kt rename to platform/android/MapLibreAndroidLint/src/test/java/org/maplibre/android/lint/KeepDetectorTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/.gitignore b/platform/android/MapLibreAndroidTestApp/.gitignore similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/.gitignore rename to platform/android/MapLibreAndroidTestApp/.gitignore diff --git a/platform/android/MapboxGLAndroidSDKTestApp/README.md b/platform/android/MapLibreAndroidTestApp/README.md similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/README.md rename to platform/android/MapLibreAndroidTestApp/README.md diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapLibreAndroidTestApp/build.gradle similarity index 98% rename from platform/android/MapboxGLAndroidSDKTestApp/build.gradle rename to platform/android/MapLibreAndroidTestApp/build.gradle index ef87a583e..d34154d91 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapLibreAndroidTestApp/build.gradle @@ -93,7 +93,7 @@ android { } dependencies { - implementation project(':MapboxGLAndroidSDK') + implementation project(':MapLibreAndroid') implementation dependenciesList.mapboxJavaTurf implementation dependenciesList.supportAppcompatV7 diff --git a/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml b/platform/android/MapLibreAndroidTestApp/lint-baseline-local.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml rename to platform/android/MapLibreAndroidTestApp/lint-baseline-local.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml b/platform/android/MapLibreAndroidTestApp/lint/lint-baseline-ci.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml rename to platform/android/MapLibreAndroidTestApp/lint/lint-baseline-ci.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapLibreAndroidTestApp/proguard-rules.pro similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro rename to platform/android/MapLibreAndroidTestApp/proguard-rules.pro diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml b/platform/android/MapLibreAndroidTestApp/src/androidTest/AndroidManifest.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/AndroidManifest.xml rename to platform/android/MapLibreAndroidTestApp/src/androidTest/AndroidManifest.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json b/platform/android/MapLibreAndroidTestApp/src/androidTest/assets/streets.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/assets/streets.json rename to platform/android/MapLibreAndroidTestApp/src/androidTest/assets/streets.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/AppCenter.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/AppCenter.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/AppCenter.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/AppCenter.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/InstrumentationApplication.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/InstrumentationApplication.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/InstrumentationApplication.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/InstrumentationApplication.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/InstrumentationRunner.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/InstrumentationRunner.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/InstrumentationRunner.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/InstrumentationRunner.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/benchmark/Benchmark.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/benchmark/Benchmark.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/benchmark/Benchmark.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/benchmark/Benchmark.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/camera/CameraUpdateFactoryTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/camera/CameraUpdateFactoryTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/camera/CameraUpdateFactoryTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/camera/CameraUpdateFactoryTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/BaseIntegrationTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/BaseIntegrationTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/BaseIntegrationTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/BaseIntegrationTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/FragmentBackStackTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReopenTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReopenTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReopenTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReopenTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReuseTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReuseTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReuseTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/GLSurfaceViewReuseTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/OrientationChangeTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/OrientationChangeTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/OrientationChangeTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/OrientationChangeTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/QueryRenderedFeaturesBoxCountTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/QueryRenderedFeaturesBoxCountTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/QueryRenderedFeaturesBoxCountTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/QueryRenderedFeaturesBoxCountTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReopenTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReopenTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReopenTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReopenTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReuseTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReuseTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReuseTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/TextureViewReuseTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/integration/ViewPagerScrollTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationComponentTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationIndicatorLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationLayerControllerTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationLayerControllerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/LocationLayerControllerTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/LocationLayerControllerTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/LocationComponentAction.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/LocationComponentAction.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/LocationComponentAction.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/LocationComponentAction.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/MapLibreLocationTestingUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/StyleChangeIdlingResource.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/StyleChangeIdlingResource.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/utils/StyleChangeIdlingResource.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/utils/StyleChangeIdlingResource.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/BaseLayerTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/BaseLayerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/BaseLayerTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/BaseLayerTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/BootstrapTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/BootstrapTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/BootstrapTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/BootstrapTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/GesturesUiTestUtils.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/GesturesUiTestUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/GesturesUiTestUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/GesturesUiTestUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/IconManagerResolver.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/IconManagerResolver.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/IconManagerResolver.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/IconManagerResolver.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapGestureDetectorTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapGestureDetectorTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapGestureDetectorTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapGestureDetectorTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreMapTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreMapTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreMapTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreMapTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/MapLibreTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/NativeMapViewTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/NativeMapViewTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/NativeMapViewTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/NativeMapViewTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/TransformTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/TransformTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/TransformTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/TransformTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/maps/VisibleRegionTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/offline/OfflineDownloadTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/snapshotter/MapSnapshotterTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/style/sources/RasterSourceTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/style/sources/RasterSourceTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/style/sources/RasterSourceTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/style/sources/RasterSourceTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/MapLibreMapAction.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/MapLibreMapAction.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/MapLibreMapAction.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/MapLibreMapAction.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/OrientationAction.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/OrientationAction.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/OrientationAction.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/OrientationAction.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/WaitAction.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/WaitAction.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/action/WaitAction.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/action/WaitAction.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/BaseTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/BaseTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/BaseTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/BaseTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/EspressoTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/EspressoTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/EspressoTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/activity/EspressoTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/IconTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/IconTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/IconTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/IconTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/MarkerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/MarkerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/MarkerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/MarkerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolygonTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolygonTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolygonTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolygonTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolylineTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolylineTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolylineTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/annotations/PolylineTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraAnimateTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraAnimateTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraAnimateTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraAnimateTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraEaseTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraEaseTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraEaseTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraEaseTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraForTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraMoveTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraMoveTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraMoveTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraMoveTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/camera/CameraTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/fragment/MapDialogFragmentTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/fragment/MapDialogFragmentTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/fragment/MapDialogFragmentTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/fragment/MapDialogFragmentTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/GeoJsonConversionTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/geometry/LatLngBoundsTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ImageMissingTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ImageMissingTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ImageMissingTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ImageMissingTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RemoveUnusedImagesTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RemoveUnusedImagesTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RemoveUnusedImagesTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RemoveUnusedImagesTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RenderViewGetterTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RenderViewGetterTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RenderViewGetterTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/RenderViewGetterTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ScreenCoordinateConversion.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ScreenCoordinateConversion.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ScreenCoordinateConversion.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/ScreenCoordinateConversion.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/StyleLoadTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/StyleLoadTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/StyleLoadTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/StyleLoadTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/AttributionTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/AttributionTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/AttributionTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/AttributionTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/CompassViewTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/CompassViewTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/CompassViewTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/CompassViewTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/LogoTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/LogoTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/LogoTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/maps/widgets/LogoTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/CacheTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/CacheTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/CacheTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/CacheTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineManagerTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineUtilsTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineUtilsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineUtilsTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/offline/OfflineUtilsTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/render/RenderTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/render/RenderTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/render/RenderTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/render/RenderTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceMapTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceMapTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceMapTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceMapTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceStandaloneTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceStandaloneTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceStandaloneTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceStandaloneTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceTestUtils.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceTestUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceTestUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/storage/FileSourceTestUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/string/UppperLowerCaseTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/string/UppperLowerCaseTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/string/UppperLowerCaseTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/string/UppperLowerCaseTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/BackgroundLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CircleLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CustomGeometrySourceTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CustomGeometrySourceTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CustomGeometrySourceTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/CustomGeometrySourceTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillExtrusionLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/FillLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/GeoJsonSourceTests.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HeatmapLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/HillshadeLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ImageTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ImageTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ImageTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ImageTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LineLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RasterLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTests.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTimingTests.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTimingTests.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTimingTests.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/RuntimeStyleTimingTests.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/StyleLoaderTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/StyleLoaderTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/StyleLoaderTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/StyleLoaderTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/SnapshotterIdlingResource.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/SnapshotterIdlingResource.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/SnapshotterIdlingResource.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/SnapshotterIdlingResource.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestConstants.java b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestConstants.java similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestConstants.java rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestConstants.java diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestingAsyncUtils.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestingAsyncUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestingAsyncUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/utils/TestingAsyncUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt b/platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt rename to platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/utils/FontUtilsTest.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapLibreAndroidTestApp/src/main/AndroidManifest.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml rename to platform/android/MapLibreAndroidTestApp/src/main/AndroidManifest.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf b/platform/android/MapLibreAndroidTestApp/src/main/assets/Roboto-Medium.ttf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Medium.ttf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/Roboto-Medium.ttf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf b/platform/android/MapLibreAndroidTestApp/src/main/assets/Roboto-Regular.ttf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/Roboto-Regular.ttf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/Roboto-Regular.ttf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png b/platform/android/MapLibreAndroidTestApp/src/main/assets/commercial-24.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/commercial-24.png rename to platform/android/MapLibreAndroidTestApp/src/main/assets/commercial-24.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png b/platform/android/MapLibreAndroidTestApp/src/main/assets/dog-park-24.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png rename to platform/android/MapLibreAndroidTestApp/src/main/assets/dog-park-24.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/earthquakes.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/earthquakes.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/earthquakes.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/fill_color_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_color_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fill_color_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/fill_filter_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fill_filter_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fill_filter_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf b/platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Bold,Arial Unicode MS Bold/0-255.pbf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Italic,Arial Unicode MS Regular/0-255.pbf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Medium,Arial Unicode MS Regular/0-255.pbf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf b/platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/0-255.pbf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf b/platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf rename to platform/android/MapLibreAndroidTestApp/src/main/assets/fonts/DIN Offc Pro Regular,Arial Unicode MS Regular/8192-8447.pbf diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/heavy_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/heavy_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/heavy_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/line_filter_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/line_filter_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/line_filter_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png b/platform/android/MapLibreAndroidTestApp/src/main/assets/london-underground-24.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/london-underground-24.png rename to platform/android/MapLibreAndroidTestApp/src/main/assets/london-underground-24.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/numeric_filter_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/numeric_filter_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/numeric_filter_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db b/platform/android/MapLibreAndroidTestApp/src/main/assets/offline_test.db similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/offline_test.db rename to platform/android/MapLibreAndroidTestApp/src/main/assets/offline_test.db diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/outdoor.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/outdoor.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/outdoor.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/outdoor.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/pastel.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/pastel.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/pastel.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/pastel.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/points-sf.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points-sf.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/points-sf.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/points.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/points.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/satellite-hybrid.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/satellite-hybrid.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/satellite-hybrid.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/satellite-hybrid.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/small_line.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/small_line.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/small_poly.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/small_poly.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json b/platform/android/MapLibreAndroidTestApp/src/main/assets/streets.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/streets.json rename to platform/android/MapLibreAndroidTestApp/src/main/assets/streets.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson b/platform/android/MapLibreAndroidTestApp/src/main/assets/stretchable_image.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/stretchable_image.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/assets/stretchable_image.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png b/platform/android/MapLibreAndroidTestApp/src/main/assets/town-hall-24.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/town-hall-24.png rename to platform/android/MapLibreAndroidTestApp/src/main/assets/town-hall-24.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt similarity index 98% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt index 5aa20b21e..14858e6bb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt +++ b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/MapLibreApplication.kt @@ -73,7 +73,7 @@ open class MapLibreApplication : MultiDexApplication() { "In order to run the Test App you need to set a valid " + "API key. During development, you can set the MLN_API_KEY environment variable for the SDK to " + "automatically include it in the Test App. Otherwise, you can manually include it in the " + - "res/values/developer-config.xml file in the MapboxGLAndroidSDKTestApp folder." + "res/values/developer-config.xml file in the MapLibreAndroidTestApp folder." ) private fun validateApiKey(apiKey: String) { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/FeatureOverviewActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/FeatureOverviewActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/FeatureOverviewActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/FeatureOverviewActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/BulkMarkerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/BulkMarkerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/BulkMarkerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/BulkMarkerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/DynamicMarkerChangeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/DynamicMarkerChangeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/DynamicMarkerChangeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/DynamicMarkerChangeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolygonActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolygonActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolygonActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolygonActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolylineActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolylineActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolylineActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PolylineActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PressForMarkerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PressForMarkerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PressForMarkerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/PressForMarkerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/benchmark/BenchmarkActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimationTypeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimationTypeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimationTypeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimationTypeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimatorActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimatorActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimatorActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimatorActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraPositionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraPositionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraPositionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraPositionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/LatLngBoundsActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ManualZoomActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ManualZoomActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ManualZoomActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ManualZoomActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/MaxMinZoomActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/MaxMinZoomActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/MaxMinZoomActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/MaxMinZoomActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ScrollByActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ScrollByActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ScrollByActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/ScrollByActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/customlayer/CustomLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/customlayer/CustomLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/customlayer/CustomLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/customlayer/CustomLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/DeviceIndependentTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/DeviceIndependentTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/DeviceIndependentTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/DeviceIndependentTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/EspressoTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/EspressoTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/EspressoTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/EspressoTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/PixelTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/PixelTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/PixelTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/espresso/PixelTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxCountActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxHighlightActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QueryRenderedFeaturesPropertiesActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/feature/QuerySourceFeaturesActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/FragmentBackStackActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/FragmentBackStackActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/FragmentBackStackActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/FragmentBackStackActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MapFragmentActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MapFragmentActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MapFragmentActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MapFragmentActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MultiMapActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MultiMapActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MultiMapActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/MultiMapActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/NestedViewPagerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/NestedViewPagerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/NestedViewPagerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/NestedViewPagerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/SupportMapFragmentActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/SupportMapFragmentActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/SupportMapFragmentActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/SupportMapFragmentActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/ViewPagerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/ViewPagerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/ViewPagerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/fragment/ViewPagerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/PrintActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/PrintActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/PrintActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/PrintActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/SnapshotActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/SnapshotActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/SnapshotActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/imagegenerator/SnapshotActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowAdapterActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowAdapterActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowAdapterActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/infowindow/InfoWindowAdapterActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/BasicLocationPulsingCircleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/CustomizedLocationPulsingCircleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/CustomizedLocationPulsingCircleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/CustomizedLocationPulsingCircleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/CustomizedLocationPulsingCircleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationComponentActivationActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationComponentActivationActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationComponentActivationActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationComponentActivationActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationFragmentActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationFragmentActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationFragmentActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationFragmentActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationMapChangeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationMapChangeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationMapChangeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationMapChangeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationModesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationModesActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationModesActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/LocationModesActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/ManualLocationUpdatesActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/ManualLocationUpdatesActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/ManualLocationUpdatesActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/ManualLocationUpdatesActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/Utils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/Utils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/location/Utils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/location/Utils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/BottomSheetActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/BottomSheetActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/BottomSheetActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/BottomSheetActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DebugModeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DebugModeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DebugModeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DebugModeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DoubleMapActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DoubleMapActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DoubleMapActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/DoubleMapActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/GLSurfaceRecyclerViewActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LatLngBoundsForCameraActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LatLngBoundsForCameraActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LatLngBoundsForCameraActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LatLngBoundsForCameraActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LocalGlyphActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LocalGlyphActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LocalGlyphActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/LocalGlyphActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapChangeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapChangeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapChangeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapChangeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapInDialogActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapInDialogActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapInDialogActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapInDialogActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapPaddingActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapPaddingActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapPaddingActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/MapPaddingActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/OverlayMapActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/OverlayMapActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/OverlayMapActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/OverlayMapActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/SimpleMapActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/SimpleMapActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/SimpleMapActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/SimpleMapActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/TextureRecyclerViewActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/TextureRecyclerViewActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/TextureRecyclerViewActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/TextureRecyclerViewActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/VisibilityChangeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/VisibilityChangeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/VisibilityChangeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/maplayout/VisibilityChangeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/ChangeResourcesCachePathActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/ChangeResourcesCachePathActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/ChangeResourcesCachePathActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/ChangeResourcesCachePathActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DeleteRegionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DeleteRegionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DeleteRegionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DeleteRegionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DownloadRegionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DownloadRegionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DownloadRegionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/DownloadRegionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/MergeOfflineRegionsActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/MergeOfflineRegionsActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/MergeOfflineRegionsActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/MergeOfflineRegionsActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/OfflineActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/OfflineActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/OfflineActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/OfflineActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/UpdateMetadataActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/UpdateMetadataActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/UpdateMetadataActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/offline/UpdateMetadataActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestDefinition.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestDefinition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestDefinition.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestDefinition.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestSnapshotter.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestSnapshotter.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestSnapshotter.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestSnapshotter.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestStyleDefinition.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestStyleDefinition.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestStyleDefinition.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/render/RenderTestStyleDefinition.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterHeatMapActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterLocalStyleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterReuseActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterReuseActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterReuseActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/snapshot/MapSnapshotterReuseActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/CacheManagementActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/CacheManagementActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/CacheManagementActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/CacheManagementActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/UrlTransformActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/UrlTransformActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/UrlTransformActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/storage/UrlTransformActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedImageSourceActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedImageSourceActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedImageSourceActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedImageSourceActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/AnimatedSymbolLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/BuildingFillExtrusionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/BuildingFillExtrusionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/BuildingFillExtrusionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/BuildingFillExtrusionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CircleLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CircleLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CircleLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CircleLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CollectionUpdateOnStyleChange.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/CustomSpriteActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DataDrivenStyleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DataDrivenStyleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DataDrivenStyleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DataDrivenStyleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DistanceExpressionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/DraggableMarkerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionStyleTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionStyleTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionStyleTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/FillExtrusionStyleTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GeoJsonClusteringActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GradientLineActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GradientLineActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GradientLineActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GradientLineActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/GridSourceActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HeatmapLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HeatmapLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HeatmapLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HeatmapLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HillshadeLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HillshadeLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HillshadeLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/HillshadeLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ImageInLabelActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/NoStyleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/NoStyleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/NoStyleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/NoStyleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RealTimeGeoJsonActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RealTimeGeoJsonActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RealTimeGeoJsonActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RealTimeGeoJsonActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleTimingTestActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleTimingTestActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleTimingTestActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/RuntimeStyleTimingTestActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StretchableImageActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleFileActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleFileActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleFileActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/StyleFileActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolGeneratorActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/SymbolLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/style/ZoomFunctionSymbolLayerActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/telemetry/PerformanceMeasurementActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/telemetry/PerformanceMeasurementActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/telemetry/PerformanceMeasurementActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/telemetry/PerformanceMeasurementActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewAnimationActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewAnimationActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewAnimationActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewAnimationActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewDebugModeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewDebugModeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewDebugModeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewDebugModeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewResizeActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewResizeActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewResizeActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewResizeActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/textureview/TextureViewTransparentBackgroundActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/MapSnapshotterWithinExpression.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/PhysicalUnitCircleActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/turf/WithinExpressionActivity.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureAdapter.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureAdapter.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureAdapter.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureAdapter.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureSectionAdapter.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureSectionAdapter.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureSectionAdapter.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/adapter/FeatureSectionAdapter.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/activity/Feature.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/activity/Feature.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/activity/Feature.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/activity/Feature.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarker.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarker.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarker.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarker.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarkerOptions.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarkerOptions.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarkerOptions.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CityStateMarkerOptions.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarker.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarker.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarker.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarker.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarkerOptions.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarkerOptions.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarkerOptions.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/annotations/CountryMarkerOptions.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/customlayer/ExampleCustomLayer.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/customlayer/ExampleCustomLayer.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/customlayer/ExampleCustomLayer.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/customlayer/ExampleCustomLayer.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineDownloadRegionDialog.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineDownloadRegionDialog.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineDownloadRegionDialog.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineDownloadRegionDialog.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineListRegionsDialog.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineListRegionsDialog.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineListRegionsDialog.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/model/other/OfflineListRegionsDialog.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ApiKeyUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ApiKeyUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ApiKeyUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ApiKeyUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/BenchmarkUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/BenchmarkUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/BenchmarkUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/BenchmarkUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/FileUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/FileUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/FileUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/FileUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/FontCache.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/FontCache.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/FontCache.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/FontCache.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/GeoParseUtil.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/IconUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/IconUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/IconUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/IconUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/IdleZoomListener.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/IdleZoomListener.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/IdleZoomListener.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/IdleZoomListener.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ItemClickSupport.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ItemClickSupport.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ItemClickSupport.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ItemClickSupport.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/NavUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/NavUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/NavUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/NavUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/OfflineUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/OfflineUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/OfflineUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/OfflineUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ResourceUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ResourceUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ResourceUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ResourceUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TileLoadingMeasurementUtils.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TileLoadingMeasurementUtils.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TileLoadingMeasurementUtils.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TileLoadingMeasurementUtils.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TimberLogger.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TimberLogger.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TimberLogger.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TimberLogger.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TimingLogger.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TimingLogger.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/TimingLogger.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/TimingLogger.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ViewToBitmapUtil.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ViewToBitmapUtil.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/utils/ViewToBitmapUtil.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/utils/ViewToBitmapUtil.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/view/LockableBottomSheetBehavior.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/view/LockableBottomSheetBehavior.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/view/LockableBottomSheetBehavior.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/view/LockableBottomSheetBehavior.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/view/MapViewPager.kt b/platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/view/MapViewPager.kt similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/org/maplibre/android/testapp/view/MapViewPager.kt rename to platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/view/MapViewPager.kt diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/animator/scale_down.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/animator/scale_down.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/animator/scale_up.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/animator/scale_up.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_android.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_android.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_android_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_android_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_android_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/ic_launcher_round.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/icon.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/icon_burned.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/icon_burned.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/popup.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/popup.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/popup_debug.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/popup_debug.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-hdpi/popup_debug.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_android.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_android.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_android_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_android_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_android_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/ic_launcher_round.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/icon.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/icon_burned.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/icon_burned.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_0.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_1.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-mdpi/southeast_radar_3.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_android.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_android.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_android_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_android_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_android_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/ic_launcher_round.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/icon.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/icon_burned.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xhdpi/icon_burned.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_android.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_android.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_android_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_launcher_round.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_us.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/ic_us.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/icon.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/icon_burned.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxhdpi/icon_burned.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_android.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_android.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_android_2.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_car_top.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_launcher_round.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/ic_taxi_top.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/icon.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/water.jpg similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/water.jpg rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable-xxxhdpi/water.jpg diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_arrow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_arrow.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_arrow.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_icon.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_icon.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_puck_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/custom_user_puck_icon.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/custom_user_puck_icon.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_ab_back.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_ab_back.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add_a_photo_black.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_a_photo_black.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add_a_photo_black.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add_white.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_white.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_add_white.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_airplanemode_active_black.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_animate_coordinates.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_animate_coordinates.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_arrow_downward.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_downward.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_arrow_downward.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_arrow_upward.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_arrow_upward.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_arrow_upward.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_check_box.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_check_box.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_delete.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_delete.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_bus_black.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_bus_black.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_bus_black.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_car_black.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_car_black.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_car_black.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_run_black.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_directions_run_black.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_directions_run_black.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_droppin.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_droppin.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_droppin.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_hearing_black_24dp.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_input.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_input.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_input.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_layers.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_layers.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_layers_clear.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_layers_clear.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_layers_clear.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_location_city.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_location_city.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_location_disabled.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_location_disabled.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_my_location.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_my_location.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_my_location.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_paint.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_paint.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_paint.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_pause_black_24dp.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pause_black_24dp.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_pause_black_24dp.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_play_arrow_black_24dp.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_print.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_print.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_print.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_refresh.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_refresh.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_refresh.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_stars.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_stars.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/ic_stars.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/line_divider.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/line_divider.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/line_divider.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/drawable/mapbox_user_icon_shadow_0px_test.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_add_sprite.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_add_sprite.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_animated_image_source.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_animated_image_source.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_animated_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_animated_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_backstack_fragment.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_backstack_fragment.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_benchmark.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_benchmark.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_benchmark.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_benchmark.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_bottom_sheet.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_bottom_sheet.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_bottom_sheet.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_building_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_building_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_cache_management.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_cache_management.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_cache_management.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_animation_types.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_animation_types.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_animator.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_animator.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_position.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_position.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_test.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_camera_test.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_change_resources_cache_path.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_change_resources_cache_path.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_change_resources_cache_path.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_circle_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_circle_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_collection_update_on_style_change.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_custom_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_custom_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_custom_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_data_driven_style.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_data_driven_style.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_data_driven_style.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_debug_mode.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_debug_mode.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_default.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_default.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_default.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_draggable_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_draggable_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_draggable_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_dynamic_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_dynamic_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_espresso_test.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_extrusion_test.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_extrusion_test.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_feature_overview.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_feature_overview.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_feature_overview.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_geojson_clustering.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geojson_clustering.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_geojson_clustering.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_gesture_detector.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_gesture_detector.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_gradient_line.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_gradient_line.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_grid_source.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_grid_source.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_heatmaplayer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_heatmaplayer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_heatmaplayer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_hillshade_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_hillshade_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_infowindow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_infowindow.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_infowindow_adapter.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_infowindow_adapter.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_json_api.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_json_api.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_json_api.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_json_api.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_latlngbounds.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_latlngbounds.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_latlngbounds.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_local_glyph.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_local_glyph.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_fragment.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_fragment.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_fragment.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_map_change.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_map_change.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_mode.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_layer_mode.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_manual_update.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_location_manual_update.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_manual_zoom.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_fragment.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_fragment.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_in_dialog.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_in_dialog.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_padding.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_padding.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_simple.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_simple.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_simple.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_snapshotter_reuse.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_visibility.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_visibility.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_map_visibility.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_mapsnapshotter_within_expression.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_marker_bulk.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_maxmin_zoom.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_maxmin_zoom.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_merge_offline_regions.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_merge_offline_regions.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_merge_offline_regions.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_metadata_update.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_metadata_update.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_multi_map.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_multi_map.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_offline.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_offline.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_offline_region_delete.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_offline_region_delete.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_overlay.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_overlay.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_overlay.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_physical_circle.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_physical_circle.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_physical_circle.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_pixel_test.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_pixel_test.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_polyline.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_polyline.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_press_for_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_print.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_print.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_print.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_box.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_point.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_features_point.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_source_features.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_query_source_features.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_recyclerview.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_recyclerview.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_recyclerview.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_region_download.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_region_download.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_region_download.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_restricted_bounds.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_restricted_bounds.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_runtime_style.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_runtime_style.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_runtime_style.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_scroll_by.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_scroll_by.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_snapshot.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_snapshot.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_stretchable_image.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_stretchable_image.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_style_file.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_style_file.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_symbol_generator.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbol_generator.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_symbol_generator.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_symbollayer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_symbollayer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_symbollayer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_animate.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_animate.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_debug_mode.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_debug_mode.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_resize.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_resize.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_transparent.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_transparent.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_textureview_transparent.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_viewpager.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_viewpager.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_within_expression.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_within_expression.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_within_expression.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/dialog_camera_position.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/dialog_camera_position.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/drawer_navigation_drawer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/drawer_navigation_drawer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/drawer_navigation_drawer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/fragment_dialog_map.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/fragment_dialog_map.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/fragment_double_map.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/fragment_double_map.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_gesture_alert.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_gesture_alert.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_gesture_alert.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_main_feature.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_main_feature.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_map_gl.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_map_gl.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_map_texture.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_map_texture.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_viewpager.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_viewpager.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/item_viewpager.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/section_main_layout.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/section_main_layout.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/view_custom_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/view_custom_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/layout/view_text_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/layout/view_text_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_animator.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_animator.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_animator.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_bounds.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bounds.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_bounds.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_building.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_building.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_bulk_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_bulk_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_custom_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_custom_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_data_driven_style.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_data_driven_style.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_debug.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_debug.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_debug.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_generator_symbol.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_generator_symbol.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_generator_symbol.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_gestures.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_gestures.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_gestures.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_infowindow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_infowindow.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_infowindow.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_location_mode.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_location_mode.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_location_mode.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_padding.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_padding.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_polygon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polygon.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_polygon.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_polyline.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_polyline.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_press_for_marker.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_press_for_marker.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_pulsing_location_mode.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_pulsing_location_mode.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_pulsing_location_mode.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_runtime_style.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_runtime_style.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_symbol_layer.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_symbol_layer.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_symbols.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbols.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_symbols.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_zoom.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/menu/menu_zoom.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/amsterdam.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/amsterdam.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/amsterdam.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/local_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/local_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/local_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/no_bg_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/no_bg_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/no_bg_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/sat_style.json similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/sat_style.json diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_feature_collection.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_collection.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_feature_collection.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_feature_properties.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_feature_properties.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_feature_properties.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_line_gradient_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_gradient_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_line_gradient_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_line_string_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_line_string_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_line_string_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_line_string_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_line_string_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_line_string_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_point_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_point_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_point_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_polygon_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_multi_polygon_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_multi_polygon_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_point_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_point_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_point_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_points_utrecht.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_points_utrecht.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_points_utrecht.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_polygon_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_polygon_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/test_polygon_with_hole_feature.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson b/platform/android/MapLibreAndroidTestApp/src/main/res/raw/tiny_countries.geojson similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/tiny_countries.geojson rename to platform/android/MapLibreAndroidTestApp/src/main/res/raw/tiny_countries.geojson diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values-v21/attrs.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/attrs.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values-v21/attrs.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values-v21/styles.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values-v21/styles.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values-v21/styles.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/actions.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/actions.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/arrays.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/arrays.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/categories.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/categories.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/colors.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/colors.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/descriptions.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/descriptions.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/dimens.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/dimens.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/ids.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/ids.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/strings.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/strings.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/styles.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/styles.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapLibreAndroidTestApp/src/main/res/values/titles.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml rename to platform/android/MapLibreAndroidTestApp/src/main/res/values/titles.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/test-proguard-rules.pro b/platform/android/MapLibreAndroidTestApp/test-proguard-rules.pro similarity index 100% rename from platform/android/MapboxGLAndroidSDKTestApp/test-proguard-rules.pro rename to platform/android/MapLibreAndroidTestApp/test-proguard-rules.pro diff --git a/platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk b/platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk deleted file mode 100644 index 92d07abdb..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/assets/sdk_versions/com.mapbox.mapboxsdk +++ /dev/null @@ -1,2 +0,0 @@ -MapboxGLAndroidSDK/9.1.0-SNAPSHOT -v-1 diff --git a/platform/android/RELEASE.md b/platform/android/RELEASE.md index 46fa193d0..2116f5ad0 100644 --- a/platform/android/RELEASE.md +++ b/platform/android/RELEASE.md @@ -7,7 +7,7 @@ To make an Android release, do the following: * Remove the `* Add your pull request...` entries * Add a new `main` section at the top of the changelog -* Update `android/MapboxGLAndroidSDK/gradle.properties` with the new version. +* Update `android/MapLibreAndroid/gradle.properties` with the new version. * Once the changelog update pull request was merged, tag the commit: * Create a tag locally, e.g. `git tag -a android-v9.6.0 -m "Release android-v9.6.0"` diff --git a/platform/android/TESTS.md b/platform/android/TESTS.md index 1f485be02..a2b95ed5c 100644 --- a/platform/android/TESTS.md +++ b/platform/android/TESTS.md @@ -16,7 +16,7 @@ To create a new run configuration: * Click on Run -> Edit Configurations... * Click on the plus sign and then on "Android Tests" * Give a name to the configuration, e.g. `TestAppTests` -* Choose the `MapboxGLAndroidSDKTestApp` module +* Choose the `MapLibreAndroidTestApp` module * Choose `android.support.test.runner.AndroidJUnitRunner` as the instrumentation runner * Click OK to save the new configuration @@ -57,14 +57,14 @@ On a terminal, within `mapbox-gl-native/android/java`, run the tests (`cC` stands for `connectedCheck`): ``` -$ ./gradlew -Pmapbox.abis=all cC -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=all cC -p MapLibreAndroidTestApp ``` Then: * Go to your AWS Console and choose Device Farm. -* Create a new project, e.g. `MapboxGLAndroidSDKTestApp` -* On step 1, upload the APK in `mapbox-gl-native/android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug-unaligned.apk` -* On step 2, choose Instrumentation, test filter is `org.maplibre.android.testapp.MainActivityTest` and upload the APK in `mapbox-gl-native/android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug-androidTest-unaligned.apk` +* Create a new project, e.g. `MapLibreAndroidTestApp` +* On step 1, upload the APK in `mapbox-gl-native/android/java/MapLibreAndroidTestApp/build/outputs/apk/MapLibreAndroidTestApp-debug-unaligned.apk` +* On step 2, choose Instrumentation, test filter is `org.maplibre.android.testapp.MainActivityTest` and upload the APK in `mapbox-gl-native/android/java/MapLibreAndroidTestApp/build/outputs/apk/MapLibreAndroidTestApp-debug-androidTest-unaligned.apk` * On step 3, choose a device pool. E.g. Top Devices * On step 4, customize your device state (if needed) * Finally, confirm the configuration and run the tests. @@ -86,13 +86,13 @@ You can also have a run configuration: * Click on "Junit Tests" * Give a name to the configuration, e.g. `JUnit tests` * As "Test Kind", choose "All in directory" -* As folder, choose the following folder: `mapbox-gl-native/android/java/MapboxGLAndroidSDKTestApp/src/test/java` +* As folder, choose the following folder: `mapbox-gl-native/android/java/MapLibreAndroidTestApp/src/test/java` * Click OK to save the new configuration You can also run the tests from the command line with: ``` -$ ./gradlew -Pmapbox.abis=none test -p MapboxGLAndroidSDKTestApp +$ ./gradlew -Pmapbox.abis=none test -p MapLibreAndroidTestApp ``` ### Running the UI/Application Exerciser Monkey diff --git a/platform/android/android.cmake b/platform/android/android.cmake index 4e61beb38..5b46a4878 100644 --- a/platform/android/android.cmake +++ b/platform/android/android.cmake @@ -143,7 +143,7 @@ target_link_libraries( target_sources( mbgl-test-runner - PRIVATE ${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp + PRIVATE ${PROJECT_SOURCE_DIR}/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp ) add_custom_command( @@ -177,7 +177,7 @@ add_library( ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp ${PROJECT_SOURCE_DIR}/platform/android/src/test/collator_test_stub.cpp ${PROJECT_SOURCE_DIR}/platform/android/src/test/number_format_test_stub.cpp - ${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp + ${PROJECT_SOURCE_DIR}/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp ) target_include_directories( @@ -226,7 +226,7 @@ add_library( ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp ${PROJECT_SOURCE_DIR}/platform/android/src/test/collator_test_stub.cpp ${PROJECT_SOURCE_DIR}/platform/android/src/test/number_format_test_stub.cpp - ${PROJECT_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp + ${PROJECT_SOURCE_DIR}/platform/android/MapLibreAndroid/src/cpp/http_file_source.cpp ) target_include_directories( diff --git a/platform/android/gradle/native-build.gradle b/platform/android/gradle/native-build.gradle index cf27a1cc4..9d3f88828 100644 --- a/platform/android/gradle/native-build.gradle +++ b/platform/android/gradle/native-build.gradle @@ -22,7 +22,7 @@ ext.nativeBuild = { nativeTargets -> if (abi != 'none') { externalNativeBuild { cmake { - path "../MapboxGLAndroidSDK/src/cpp/CMakeLists.txt" + path "../MapLibreAndroid/src/cpp/CMakeLists.txt" version androidSdkVersions.cmakeVersion } } diff --git a/platform/android/scripts/generate-license.py b/platform/android/scripts/generate-license.py index 316687273..405ed4730 100644 --- a/platform/android/scripts/generate-license.py +++ b/platform/android/scripts/generate-license.py @@ -21,7 +21,7 @@ with open(path + "/LICENSE.md", 'w') as licenseFile: "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY " "OF SUCH DAMAGE.") licenseFile.write("\n\n===========================================================================\n\n") - with open(path + "/MapboxGLAndroidSDK/build/reports/licenses/licenseReleaseReport.json", 'r') as dataFile: + with open(path + "/MapLibreAndroid/build/reports/licenses/licenseReleaseReport.json", 'r') as dataFile: data = json.load(dataFile) gradleLicensePlugin =""" diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 37c0f2160..1101bbc56 100755 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -403,21 +403,21 @@ global.supportsPropertyFunction = function (property) { // Template processing // // Java + JNI Light (Peer model) -const lightJava = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/light.java.ejs', 'utf8'), {strict: true}); -const lightJavaUnitTests = ejs.compile(fs.readFileSync('MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs', 'utf8'), {strict: true}); -writeIfModified(`MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/light/Light.java`, lightJava({properties: lightProperties})); -writeIfModified(`MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java`, lightJavaUnitTests({properties: lightProperties})); +const lightJava = ejs.compile(fs.readFileSync('MapLibreAndroid/src/main/java/org/maplibre/android/style/light/light.java.ejs', 'utf8'), {strict: true}); +const lightJavaUnitTests = ejs.compile(fs.readFileSync('MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/light.junit.ejs', 'utf8'), {strict: true}); +writeIfModified(`MapLibreAndroid/src/main/java/org/maplibre/android/style/light/Light.java`, lightJava({properties: lightProperties})); +writeIfModified(`MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/LightTest.java`, lightJavaUnitTests({properties: lightProperties})); // Java -const layerJava = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/layer.java.ejs', 'utf8'), {strict: true}); -const layerJavaUnitTests = ejs.compile(fs.readFileSync('MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs', 'utf8'), {strict: true}); +const layerJava = ejs.compile(fs.readFileSync('MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/layer.java.ejs', 'utf8'), {strict: true}); +const layerJavaUnitTests = ejs.compile(fs.readFileSync('MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/layer.junit.ejs', 'utf8'), {strict: true}); for (const layer of layers) { - var srcDir = 'MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/' - var testDir = 'MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/testapp/style/' + var srcDir = 'MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/' + var testDir = 'MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/' if (layer.type === 'location-indicator') { - srcDir = 'MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/' - testDir = 'MapboxGLAndroidSDKTestApp/src/androidTest/java/org/maplibre/android/location/' + srcDir = 'MapLibreAndroid/src/main/java/org/maplibre/android/location/' + testDir = 'MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/location/' } writeIfModified(srcDir + `${camelize(layer.type)}Layer.java`, layerJava(layer)); @@ -425,34 +425,34 @@ for (const layer of layers) { } // Jni -const layerHpp = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs', 'utf8'), {strict: true}); -const layerCpp = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/cpp/style/layers/layer.cpp.ejs', 'utf8'), {strict: true}); +const layerHpp = ejs.compile(fs.readFileSync('MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs', 'utf8'), {strict: true}); +const layerCpp = ejs.compile(fs.readFileSync('MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs', 'utf8'), {strict: true}); for (const layer of layers) { const layerFileName = layer.type.replace('-', '_'); - writeIfModified(`MapboxGLAndroidSDK/src/cpp/style/layers/${layerFileName}_layer.hpp`, layerHpp(layer)); - writeIfModified(`MapboxGLAndroidSDK/src/cpp/style/layers/${layerFileName}_layer.cpp`, layerCpp(layer)); + writeIfModified(`MapLibreAndroid/src/cpp/style/layers/${layerFileName}_layer.hpp`, layerHpp(layer)); + writeIfModified(`MapLibreAndroid/src/cpp/style/layers/${layerFileName}_layer.cpp`, layerCpp(layer)); } // Java PropertyFactory -const propertyFactoryTemplate = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs', 'utf8'), {strict: true}); +const propertyFactoryTemplate = ejs.compile(fs.readFileSync('MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property_factory.java.ejs', 'utf8'), {strict: true}); -var propertyFactorySrcDir = 'MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java' +var propertyFactorySrcDir = 'MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/PropertyFactory.java' writeIfModified( propertyFactorySrcDir, propertyFactoryTemplate({layoutProperties: layoutProperties, paintProperties: paintProperties, locationIndicator: false}) ); -var locationPropertyFactorySrcDir = 'MapboxGLAndroidSDK/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java' +var locationPropertyFactorySrcDir = 'MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationPropertyFactory.java' writeIfModified( locationPropertyFactorySrcDir, propertyFactoryTemplate({layoutProperties: locationLayoutProperties, paintProperties: locationPaintProperties, locationIndicator: true}) ); // Java Property -const enumPropertyJavaTemplate = ejs.compile(fs.readFileSync('MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/property.java.ejs', 'utf8'), {strict: true}); +const enumPropertyJavaTemplate = ejs.compile(fs.readFileSync('MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/property.java.ejs', 'utf8'), {strict: true}); writeIfModified( - `MapboxGLAndroidSDK/src/main/java/org/maplibre/android/style/layers/Property.java`, + `MapLibreAndroid/src/main/java/org/maplibre/android/style/layers/Property.java`, enumPropertyJavaTemplate({properties: enumProperties}) ); diff --git a/platform/android/scripts/metrics.sh b/platform/android/scripts/metrics.sh index 01efaf4eb..ee41b9932 100755 --- a/platform/android/scripts/metrics.sh +++ b/platform/android/scripts/metrics.sh @@ -4,13 +4,13 @@ set -e set -o pipefail # Track individual architectures -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libmaplibre.so" "Android arm-v7" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libmaplibre.so" "Android arm-v8" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86/libmaplibre.so" "Android x86" -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/intermediates/intermediate-jars/release/jni/x86_64/libmaplibre.so" "Android x86_64" +scripts/check_binary_size.js "MapLibreAndroid/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libmaplibre.so" "Android arm-v7" +scripts/check_binary_size.js "MapLibreAndroid/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libmaplibre.so" "Android arm-v8" +scripts/check_binary_size.js "MapLibreAndroid/build/intermediates/intermediate-jars/release/jni/x86/libmaplibre.so" "Android x86" +scripts/check_binary_size.js "MapLibreAndroid/build/intermediates/intermediate-jars/release/jni/x86_64/libmaplibre.so" "Android x86_64" # Track overall library size -scripts/check_binary_size.js "MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar" "Android AAR" +scripts/check_binary_size.js "MapLibreAndroid/build/outputs/aar/MapLibreAndroid-release.aar" "Android AAR" if [[ $CIRCLE_BRANCH == main ]]; then # Build source data for http://mapbox.github.io/mapbox-gl-native/metrics/binary-size/ diff --git a/platform/android/scripts/parse-jacoco-report.py b/platform/android/scripts/parse-jacoco-report.py index 3577947de..9c153a880 100755 --- a/platform/android/scripts/parse-jacoco-report.py +++ b/platform/android/scripts/parse-jacoco-report.py @@ -4,7 +4,7 @@ import os import re from io import open -reportPath = os.getcwd() + "/MapboxGLAndroidSDK/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" +reportPath = os.getcwd() + "/MapLibreAndroid/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" with open(reportPath, 'r', encoding='utf-8') as jacocoReport: line = jacocoReport.readline().strip() diff --git a/platform/android/scripts/release.py b/platform/android/scripts/release.py deleted file mode 100644 index 6d066837e..000000000 --- a/platform/android/scripts/release.py +++ /dev/null @@ -1,236 +0,0 @@ -''' -Utility to schedule SDK builds on CircleCI. - -Examples: - -- Publish a snapshot from main (release.py uses the current branch) - - $ git branch - * main - 1234-fix-crash - $ python release.py --stage snapshot - -- Publish a snapshot from a feature branch (same as before, just switch branchs with git): - - $ git branch - main - * 1234-fix-crash - $ python release.py --stage snapshot - -- Publish a beta from a pre-release branch: - - $ git branch - main - * release-android-420-beta1 - $ python release.py --stage beta --version 4.2.0-beta.1 - -- Publish a beta from a release branch: - - $ git branch - main - * release-android-420 - $ python release.py --stage final --version 4.2.0 - -TODO: - -- Add a flag to wait until the release has been built (CircleCI) and published (Maven). - -''' - -import click -import json -import os -import requests -import subprocess - -# Three stages, from less stable to more stable -ALLOWED_STAGES = ['snapshot', 'beta', 'final'] - -# Get the version from GRADLE_PROPERTIES_PATH below -CURRENT_VERSION_TAG = 'current' - -# You can add your API token on https://circleci.com/account/api -CIRCLECI_API_TOKEN_ENV_VAR = 'CIRCLECI_API_TOKEN' - -# In the future we might want to consider alpha, or rc. -ALLOWED_PRE_RELEASE = ['beta'] - -# We get the default version from here -MAPBOX_GL_ANDROID_SDK_PATH = '../MapboxGLAndroidSDK' -GRADLE_PROPERTIES_PATH = '%s/gradle.properties' % MAPBOX_GL_ANDROID_SDK_PATH -GRADLE_TOKEN = 'VERSION_NAME=' - -# Triggers a new build, returns a summary of the build -URL_CIRCLECI = 'https://circleci.com/api/v1.1/project/github/mapbox/mapbox-gl-native/tree/' # + :branch - -# We support three parameters: stage, branch, and version -@click.command() -@click.option('--stage', default=ALLOWED_STAGES[0], type=click.Choice(ALLOWED_STAGES), prompt='Set stage', help='The release stage.') -@click.option('--version', default=CURRENT_VERSION_TAG, prompt='Set version', help='The version you want to publish. E.g: 4.2.0-SNAPSHOT, 4.2.0-beta.1, or 4.2.0. If you set the version to "%s", the script will default to the current SNAPSHOT version.' % CURRENT_VERSION_TAG) -def release(stage, version): - # Validate params - final_stage = validate_stage(stage=stage) - final_branch = validate_branch(stage=final_stage) - final_version = validate_version(stage=final_stage, branch=final_branch, version=version) - - # Get user confirmation - click.echo('\n===== Build information =====') - click.echo('- Stage: %s' % final_stage) - click.echo('- Branch: %s' % final_branch) - click.echo('- Version: %s' % final_version) - click.confirm('\nDoes it look right?', abort=True) - - # Proceed - if (final_stage == 'snapshot'): - publish_snapshot(branch=final_branch, version=final_version) - elif (final_stage == 'beta'): - publish_beta(branch=final_branch, version=final_version) - elif (final_stage == 'final'): - publish_final(branch=final_branch, version=final_version) - -def validate_stage(stage): - if stage not in ALLOWED_STAGES: - abort_with_message('Invalid stage: %s' % stage) - return stage - -def validate_branch(stage): - branch = git_get_current_branch() - if not branch: - abort_with_message('The current folder is not a git repository.') - if branch == 'main' and stage != 'snapshot': - abort_with_message('You need to swtich to a release branch for a beta or a final release.') - return branch - -def validate_version(stage, branch, version): - if stage == 'snapshot' and branch == 'main' and version != CURRENT_VERSION_TAG: - abort_with_message('You cannot specify a custom version if you are building a snapshot from main.') - - if not version or version == CURRENT_VERSION_TAG: - version = get_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN) - - if stage == 'snapshot': - if not 'SNAPSHOT' in version: - abort_with_message('Version should contain the word SNAPSHOT: %s' % version) - elif stage == 'beta': - if not ALLOWED_PRE_RELEASE[0] in version: - abort_with_message('Version should contain the word %s: %s' % (ALLOWED_PRE_RELEASE[0], version)) - elif stage == 'final': - if not version or 'SNAPSHOT' in version or ALLOWED_PRE_RELEASE[0] in version: - abort_with_message('Version cannot be empty, or contain the words SNAPSHOT or %s: %s' % (ALLOWED_PRE_RELEASE[0], version)) - - return version - -def publish_snapshot(branch, version): - click.echo('Publishing snapshot for branch: %s (version: %s).' % (branch, version)) - if branch != 'main': - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -def publish_beta(branch, version): - click.echo('Publishing beta from branch: %s (version: %s).' % (branch, version)) - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -def publish_final(branch, version): - click.echo('Publishing final release from branch: %s (version: %s).' % (branch, version)) - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - if dirty_gradle: - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -# -# Utils -# - -def abort_with_message(message): - click.echo(message) - click.get_current_context().abort() - -def execute_call(command): - click.echo('Executing: %s' % command) - result = subprocess.call(command, shell=True) - if result != 0: - abort_with_message('Command failed: %s' % command) - -# -# CircleCI -# - -def get_circleci_api_token(): - circleci_api_token = os.environ.get(CIRCLECI_API_TOKEN_ENV_VAR) - if not circleci_api_token: - abort_with_message('You need to set the CIRCLECI_API_TOKEN environment variable.') - click.echo('Found CircleCI API token.') - return circleci_api_token - -def do_circleci_request(branch): - url = URL_CIRCLECI + branch - params = {'circle-token': get_circleci_api_token()} - click.echo('CircleCI request to %s (params: %s)' % (url, json.dumps(params))) - click.confirm('\nDo you want to start a build?', abort=True) - - r = requests.post(url, params=params) - click.echo('- CircleCI response code: %s' % r.status_code) - -# -# Git -# - -def git_get_current_branch(): - return subprocess.check_output('git symbolic-ref --short HEAD'.split(' ')).strip() - -def git_add(path): - execute_call(command='git add %s' % path) - -def git_commit_and_push(branch, version): - message = '[android] [auto] Update properties to version %s in preparation for build.' % version - commands = [ - 'git commit -m "%s"' % message, - 'git push -u origin %s' % branch] - for command in commands: - execute_call(command=command) - -# -# Read and update properties files -# - -def get_current_version(file_path, file_var): - click.echo('Getting current version from %s.' % file_path) - with open(file_path, 'r') as f: - for line in f: - if line.startswith(file_var): - version_name = line[len(file_var):].strip() - click.echo('Current version is %s.' % version_name) - return version_name - return None - -def update_current_version(file_path, file_var, version): - dirty = False - click.echo('Updating file to version %s: %s.' % (version, file_path)) - with open(file_path, 'r') as f: - file_lines = f.readlines() - for line_number in range(len(file_lines)): - if file_lines[line_number].startswith(file_var): - content_old = file_lines[line_number] - content_new = '%s%s\n' % (file_var, version) - if (content_old != content_new): - click.echo('%s -> %s' % (content_old.strip(), content_new.strip())) - file_lines[line_number] = content_new - dirty = True - if dirty: - with open(file_path, 'w') as f: - f.writelines(file_lines) - else: - click.echo('File already has the right version.') - return dirty - -if __name__ == '__main__': - release() diff --git a/platform/android/settings.gradle b/platform/android/settings.gradle index e4eae6064..72362915f 100644 --- a/platform/android/settings.gradle +++ b/platform/android/settings.gradle @@ -1,4 +1,4 @@ -include ':MapboxGLAndroidSDK', ':MapboxGLAndroidSDKTestApp', ':MapboxGLAndroidSDKLint' +include ':MapLibreAndroid', ':MapLibreAndroidTestApp', ':MapLibreAndroidLint' def renderTestProjectDir = new File(rootDir, '../../render-test/android') includeBuild(renderTestProjectDir) \ No newline at end of file