tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Android Dependencies, use maplibre-gestures-android (#2714)

Browse Source
This commit is contained in:
Bart Louwers
2024-08-19 21:08:18 +02:00
committed by GitHub
parent ac606a1af2
commit c3a2fa247c
25 changed files with 97 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/android/MapLibreAndroid/build.gradle
View File

@@ -13,7 +13,7 @@ apply from: "${rootDir}/gradle/native-build.gradle"
dependencies {
lintChecks project(":MapLibreAndroidLint")
api libs.maplibreJavaGeoJSON
api libs.mapboxAndroidGestures
api libs.maplibreGestures
implementation libs.maplibreJavaTurf
implementation libs.supportAnnotations
@@ -123,19 +123,15 @@ android {
warningsAsErrors false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
buildConfig true
}
}
kotlin {
jvmToolchain(17)
}
licenseReport {
generateHtmlReport = false
generateJsonReport = true
@@ -157,7 +153,6 @@ configurations {
apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
apply from: "${rootDir}/gradle/android-nitpick.gradle"
apply from: "${rootDir}/gradle/gradle-publish.gradle"
// intentionally disabled

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationCameraController.java
View File

@@ -10,9 +10,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.MoveGestureDetector;
import org.maplibre.android.gestures.RotateGestureDetector;
import org.maplibre.android.location.modes.CameraMode;
import org.maplibre.android.maps.MapLibreMap;
import org.maplibre.android.maps.Transform;

6
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/location/LocationComponentOptions.java
View File

@@ -15,7 +15,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import com.mapbox.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.R;
import org.maplibre.android.maps.MapLibreMap;
@@ -730,7 +730,7 @@ public class LocationComponentOptions implements Parcelable {
* like zooming in and out, without breaking tracking.
* <p>
* <strong>Note</strong>: If set to true, this can overwrite some of the gesture thresholds
* and the custom {@link com.mapbox.android.gestures.AndroidGesturesManager} that was set with
* and the custom {@link org.maplibre.android.gestures.AndroidGesturesManager} that was set with
* {@link MapLibreMap#setGesturesManager(AndroidGesturesManager, boolean, boolean)}.
*
* @return true if gestures are adjusted when in one of the camera tracking modes, false otherwise
@@ -1784,7 +1784,7 @@ public class LocationComponentOptions implements Parcelable {
* like zooming in and out, without breaking tracking.
* <p>
* <strong>Note</strong>: This can overwrite some of the gesture thresholds
* and the custom {@link com.mapbox.android.gestures.AndroidGesturesManager} that was set with
* and the custom {@link org.maplibre.android.gestures.AndroidGesturesManager} that was set with
* {@link MapLibreMap#setGesturesManager(AndroidGesturesManager, boolean, boolean)}.
*
* @param trackingGesturesManagement true if gestures should be adjusted when in one of the camera tracking modes,

18
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapGestureDetector.java
View File

@@ -15,13 +15,13 @@ import android.view.animation.DecelerateInterpolator;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.MultiFingerTapGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
import com.mapbox.android.gestures.ShoveGestureDetector;
import com.mapbox.android.gestures.StandardGestureDetector;
import com.mapbox.android.gestures.StandardScaleGestureDetector;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.MoveGestureDetector;
import org.maplibre.android.gestures.MultiFingerTapGestureDetector;
import org.maplibre.android.gestures.RotateGestureDetector;
import org.maplibre.android.gestures.ShoveGestureDetector;
import org.maplibre.android.gestures.StandardGestureDetector;
import org.maplibre.android.gestures.StandardScaleGestureDetector;
import org.maplibre.android.R;
import org.maplibre.android.constants.MapLibreConstants;
import org.maplibre.android.log.Logger;
@@ -124,7 +124,7 @@ final class MapGestureDetector {
if (attachDefaultListeners) {
StandardGestureListener standardGestureListener = new StandardGestureListener(
context.getResources().getDimension(
com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
org.maplibre.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
MoveGestureListener moveGestureListener = new MoveGestureListener();
ScaleGestureListener scaleGestureListener = new ScaleGestureListener(
context.getResources().getDimension(R.dimen.maplibre_density_constant),
@@ -138,7 +138,7 @@ final class MapGestureDetector {
context.getResources().getDimension(R.dimen.maplibre_angular_velocity_multiplier),
context.getResources().getDimension(R.dimen.maplibre_minimum_angular_velocity),
context.getResources().getDimension(
com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
org.maplibre.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold));
ShoveGestureListener shoveGestureListener = new ShoveGestureListener();
TapGestureListener tapGestureListener = new TapGestureListener();

10
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java
View File

@@ -15,11 +15,11 @@ import androidx.annotation.Nullable;
import androidx.annotation.Size;
import androidx.annotation.UiThread;
import com.mapbox.android.gestures.AndroidGesturesManager;
import com.mapbox.android.gestures.MoveGestureDetector;
import com.mapbox.android.gestures.RotateGestureDetector;
import com.mapbox.android.gestures.ShoveGestureDetector;
import com.mapbox.android.gestures.StandardScaleGestureDetector;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.MoveGestureDetector;
import org.maplibre.android.gestures.RotateGestureDetector;
import org.maplibre.android.gestures.ShoveGestureDetector;
import org.maplibre.android.gestures.StandardScaleGestureDetector;
import org.maplibre.geojson.Feature;
import org.maplibre.geojson.Geometry;
import org.maplibre.android.MapStrictMode;

2
platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapView.java
View File

@@ -20,7 +20,7 @@ import androidx.annotation.UiThread;
import androidx.collection.LongSparseArray;
import timber.log.Timber;
import com.mapbox.android.gestures.AndroidGesturesManager;
import org.maplibre.android.gestures.AndroidGesturesManager;
import org.maplibre.android.MapStrictMode;
import org.maplibre.android.MapLibre;
import org.maplibre.android.R;

4
platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/location/LocationCameraControllerTest.kt
View File

@@ -3,8 +3,8 @@ package org.maplibre.android.location
import android.graphics.PointF
import android.graphics.RectF
import android.location.Location
import com.mapbox.android.gestures.AndroidGesturesManager
import com.mapbox.android.gestures.MoveGestureDetector
import org.maplibre.android.gestures.AndroidGesturesManager
import org.maplibre.android.gestures.MoveGestureDetector
import org.maplibre.android.camera.CameraPosition
import org.maplibre.android.camera.CameraUpdate
import org.maplibre.android.camera.CameraUpdateFactory.newCameraPosition

8
platform/android/MapLibreAndroid/src/test/java/org/maplibre/android/maps/MapTouchListenersTest.kt
View File

@@ -1,10 +1,10 @@
package org.maplibre.android.maps
import android.graphics.PointF
import com.mapbox.android.gestures.MoveGestureDetector
import com.mapbox.android.gestures.RotateGestureDetector
import com.mapbox.android.gestures.ShoveGestureDetector
import com.mapbox.android.gestures.StandardScaleGestureDetector
import org.maplibre.android.gestures.MoveGestureDetector
import org.maplibre.android.gestures.RotateGestureDetector
import org.maplibre.android.gestures.ShoveGestureDetector
import org.maplibre.android.gestures.StandardScaleGestureDetector
import org.maplibre.android.geometry.LatLng
import org.maplibre.android.maps.MapLibreMap.*
import org.junit.Before