Skip to content

Commit f94617a

Browse files
adapt code so that it uses mapbox-android-core dependency (#622)
1 parent 6f10894 commit f94617a

9 files changed

Lines changed: 21 additions & 19 deletions

File tree

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import android.widget.TextView;
1414
import android.widget.Toast;
1515

16+
import com.mapbox.services.android.core.location.LocationEngine;
17+
import com.mapbox.services.android.core.location.LocationEngineListener;
18+
import com.mapbox.services.android.core.location.LocationEngineProvider;
1619
import com.mapbox.services.android.geocoder.AndroidGeocoder;
17-
import com.mapbox.services.android.telemetry.location.LocationEngine;
18-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
19-
import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
2020
import com.mapbox.services.android.testapp.R;
2121
import com.mapbox.services.android.testapp.geocoding.service.Constants;
2222
import com.mapbox.services.android.testapp.geocoding.service.FetchAddressIntentService;

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import com.mapbox.mapboxsdk.maps.MapView;
1414
import com.mapbox.mapboxsdk.maps.MapboxMap;
1515
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
16-
import com.mapbox.services.android.telemetry.location.LocationEngine;
17-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
18-
import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
16+
import com.mapbox.services.android.core.location.LocationEngine;
17+
import com.mapbox.services.android.core.location.LocationEngineListener;
18+
import com.mapbox.services.android.core.location.LocationEngineProvider;
1919
import com.mapbox.services.android.testapp.R;
2020
import com.mapbox.services.android.testapp.Utils;
2121
import com.mapbox.services.android.ui.geocoder.GeocoderAutoCompleteView;

mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import android.widget.Spinner;
1111
import android.widget.TextView;
1212

13+
import com.mapbox.services.android.core.location.LocationEngine;
14+
import com.mapbox.services.android.core.location.LocationEngineListener;
15+
import com.mapbox.services.android.core.location.LocationEnginePriority;
16+
import com.mapbox.services.android.core.location.LocationEngineProvider;
1317
import com.mapbox.services.android.location.MockLocationEngine;
14-
import com.mapbox.services.android.telemetry.location.LocationEngine;
15-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
16-
import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
17-
import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
1818
import com.mapbox.services.android.testapp.R;
1919
import com.mapbox.services.commons.models.Position;
2020

mapbox/dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ext {
1818

1919
// mapbox
2020
mapbox : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.4@aar',
21+
mapboxAndroidCore : 'com.mapbox.mapboxsdk:mapbox-android-core:0.1.1@aar',
2122

2223
// gson
2324
gson : 'com.google.code.gson:gson:2.8.0',

mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.location.Location;
55
import android.support.annotation.Nullable;
66

7-
import com.mapbox.services.android.telemetry.location.LocationEngine;
8-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
9-
import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
7+
import com.mapbox.services.android.core.location.LocationEngine;
8+
import com.mapbox.services.android.core.location.LocationEngineListener;
9+
import com.mapbox.services.android.core.location.LocationEnginePriority;
1010
import com.mapzen.android.lost.api.LocationListener;
1111
import com.mapzen.android.lost.api.LocationRequest;
1212
import com.mapzen.android.lost.api.LocationServices;

mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import android.support.annotation.Nullable;
77

88
import com.mapbox.services.Constants;
9-
import com.mapbox.services.android.telemetry.location.LocationEngine;
10-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
9+
import com.mapbox.services.android.core.location.LocationEngine;
10+
import com.mapbox.services.android.core.location.LocationEngineListener;
1111
import com.mapbox.services.api.directions.v5.models.DirectionsRoute;
1212
import com.mapbox.services.api.utils.turf.TurfConstants;
1313
import com.mapbox.services.api.utils.turf.TurfMeasurement;

mapbox/libandroid-services/src/test/java/com/mapbox/services/android/MockLocationEngineTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.location.Location;
44

5+
import com.mapbox.services.android.core.location.LocationEngineListener;
56
import com.mapbox.services.android.location.MockLocationEngine;
6-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
77

88
import org.junit.Assert;
99
import org.junit.Test;

mapbox/libandroid-telemetry/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
}
2727

2828
dependencies {
29+
compile rootProject.ext.dep.mapboxAndroidCore
2930
// Android Support libraries
3031
compile rootProject.ext.dep.supportAppcompat
3132

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import android.util.Log;
2222
import android.view.WindowManager;
2323

24+
import com.mapbox.services.android.core.location.LocationEngine;
25+
import com.mapbox.services.android.core.location.LocationEngineListener;
26+
import com.mapbox.services.android.core.location.LocationEngineProvider;
2427
import com.mapbox.services.android.telemetry.backoff.ExponentialBackoff;
2528
import com.mapbox.services.android.telemetry.connectivity.ConnectivityReceiver;
2629
import com.mapbox.services.android.telemetry.constants.TelemetryConstants;
2730
import com.mapbox.services.android.telemetry.http.TelemetryClient;
28-
import com.mapbox.services.android.telemetry.location.LocationEngine;
29-
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
30-
import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
3131
import com.mapbox.services.android.telemetry.navigation.MapboxNavigationEvent;
3232
import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
3333
import com.mapbox.services.android.telemetry.service.TelemetryService;

0 commit comments

Comments
 (0)