From c6d9fda61f4a75d4febca79ce155b446d84cb369 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 1 Oct 2015 14:23:36 -0500 Subject: [PATCH] #2486 - Renaming root Java package from com.mapbox.mapboxgl to com.mapbox.mapboxsdk --- .../annotations/Annotation.java | 4 +-- .../annotations/AnnotationOptions.java | 2 +- .../annotations/Circle.java | 4 +-- .../annotations/CircleOptions.java | 4 +-- .../annotations/Marker.java | 6 ++--- .../annotations/MarkerOptions.java | 4 +-- .../annotations/MultiPoint.java | 4 +-- .../annotations/MultiPointOptions.java | 4 +-- .../annotations/Polygon.java | 4 +-- .../annotations/PolygonOptions.java | 4 +-- .../annotations/Polyline.java | 6 +---- .../annotations/PolylineOptions.java | 6 ++--- .../constants/GeoConstants.java | 2 +- .../constants/MapboxConstants.java | 2 +- .../constants/MathConstants.java | 2 +- .../geometry/BoundingBox.java | 2 +- .../geometry/CoordinateRegion.java | 2 +- .../geometry/CoordinateSpan.java | 2 +- .../geometry/ILatLng.java | 2 +- .../geometry/IProjectedMeters.java | 2 +- .../geometry/LatLng.java | 6 ++--- .../geometry/LatLngZoom.java | 2 +- .../geometry/ProjectedMeters.java | 2 +- .../http/HTTPContext.java | 4 +-- .../views/InfoWindow.java | 6 ++--- .../views/InfoWindowTipView.java | 2 +- .../views/MapView.java | 26 +++++++++---------- .../views/NativeMapView.java | 16 ++++++------ .../views/package-info.java | 2 +- .../src/main/res/layout/infowindow.xml | 2 +- .../testapp/BaseTest.java | 8 ++---- .../testapp/MainActivityScreenTest.java | 2 +- .../testapp/MainActivityTest.java | 2 +- .../testapp/SecondMapActivityTest.java | 2 +- .../testapp/utils/ScreenshotUtil.java | 2 +- .../src/main/AndroidManifest.xml | 6 ++--- .../testapp/MainActivity.java | 14 +++++----- .../testapp/MapFragment.java | 4 +-- .../testapp/SecondMapActivity.java | 4 +-- .../{mapboxgl => mapboxsdk}/testapp/Util.java | 4 +-- .../src/main/res/layout/activity_main.xml | 2 +- .../src/main/res/layout/activity_second.xml | 2 +- .../src/main/res/layout/fragment_main.xml | 2 +- .../src/test/java/BoundingBoxTest.java | 6 ++--- .../src/test/java/CoordinateRegionTest.java | 6 ++--- .../src/test/java/CoordinateSpanTest.java | 2 +- .../src/test/java/LatLngTest.java | 2 +- .../src/test/java/LatLngZoomTest.java | 2 +- .../src/test/java/ProjectedMetersTest.java | 2 +- 49 files changed, 100 insertions(+), 110 deletions(-) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/Annotation.java (95%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/AnnotationOptions.java (89%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/Circle.java (93%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/CircleOptions.java (93%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/Marker.java (97%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/MarkerOptions.java (97%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/MultiPoint.java (92%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/MultiPointOptions.java (77%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/Polygon.java (96%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/PolygonOptions.java (97%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/Polyline.java (88%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/annotations/PolylineOptions.java (93%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/constants/GeoConstants.java (90%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/constants/MapboxConstants.java (83%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/constants/MathConstants.java (83%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/BoundingBox.java (99%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/CoordinateRegion.java (93%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/CoordinateSpan.java (96%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/ILatLng.java (79%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/IProjectedMeters.java (70%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/LatLng.java (96%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/LatLngZoom.java (98%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/geometry/ProjectedMeters.java (98%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/http/HTTPContext.java (97%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/views/InfoWindow.java (98%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/views/InfoWindowTipView.java (96%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/views/MapView.java (99%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/views/NativeMapView.java (97%) rename android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/views/package-info.java (60%) rename android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/BaseTest.java (81%) rename android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/MainActivityScreenTest.java (98%) rename android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/MainActivityTest.java (99%) rename android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/SecondMapActivityTest.java (96%) rename android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/utils/ScreenshotUtil.java (99%) rename android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/MainActivity.java (97%) rename android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/MapFragment.java (96%) rename android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/SecondMapActivity.java (96%) rename android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/{mapboxgl => mapboxsdk}/testapp/Util.java (96%) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Annotation.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java similarity index 95% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Annotation.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java index 9cddf9984..684ee6c88 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Annotation.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.views.MapView; +import com.mapbox.mapboxsdk.views.MapView; public abstract class Annotation implements Comparable { diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/AnnotationOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java similarity index 89% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/AnnotationOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java index f03ff45f7..5962e25c7 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/AnnotationOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/AnnotationOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; public abstract class AnnotationOptions { diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Circle.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Circle.java similarity index 93% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Circle.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Circle.java index f8908465b..4201fadfb 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Circle.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Circle.java @@ -1,9 +1,9 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; /** * UNIMPLEMENTED: Needs implementation in Native. diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/CircleOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java similarity index 93% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/CircleOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java index 5e97d5b5e..9eb6e7ca3 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/CircleOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/CircleOptions.java @@ -1,7 +1,7 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; /** * UNIMPLEMENTED: Needs implementation in Native. diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java similarity index 97% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 111eda083..4335389e8 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -1,10 +1,10 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; import android.graphics.Point; import android.view.View; -import com.mapbox.mapboxgl.geometry.LatLng; -import com.mapbox.mapboxgl.views.InfoWindow; import com.mapbox.mapboxgl.views.R; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.views.InfoWindow; public class Marker extends Annotation { diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java similarity index 97% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java index 2e577067d..8e8b196d1 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MarkerOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; public class MarkerOptions extends AnnotationOptions { diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPoint.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java similarity index 92% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPoint.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java index 4ebdd5071..910ea2eba 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPoint.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; import java.util.List; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPointOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java similarity index 77% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPointOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java index 581c42bfd..b201cb2aa 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/MultiPointOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPointOptions.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.List; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polygon.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java similarity index 96% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polygon.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java index 41edb2a5d..01899a426 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polygon.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java @@ -1,9 +1,9 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; import java.util.List; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolygonOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java similarity index 97% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolygonOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java index 25ee75019..12f482776 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolygonOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java @@ -1,7 +1,7 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; import java.util.List; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polyline.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java similarity index 88% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polyline.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java index 764723833..decbba2f7 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Polyline.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java @@ -1,11 +1,7 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; -import com.mapbox.mapboxgl.geometry.LatLng; - -import java.util.List; - public class Polyline extends MultiPoint { int color = Color.BLACK; // default color is black diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolylineOptions.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java similarity index 93% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolylineOptions.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java index d825399f7..fde8b03b5 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/PolylineOptions.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java @@ -1,8 +1,6 @@ -package com.mapbox.mapboxgl.annotations; +package com.mapbox.mapboxsdk.annotations; -import com.mapbox.mapboxgl.geometry.LatLng; - -import java.util.List; +import com.mapbox.mapboxsdk.geometry.LatLng; public class PolylineOptions extends MultiPointOptions { diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java similarity index 90% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java index 4c899d2d8..9e6812eb6 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/GeoConstants.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.constants; +package com.mapbox.mapboxsdk.constants; public class GeoConstants { // http://en.wikipedia.org/wiki/Earth_radius#Equatorial_radius diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MapboxConstants.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java similarity index 83% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MapboxConstants.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java index 7c59a756d..30bc470f0 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MapboxConstants.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.constants; +package com.mapbox.mapboxsdk.constants; import java.util.Locale; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java similarity index 83% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java index 71e235c91..a875fada2 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/constants/MathConstants.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.constants; +package com.mapbox.mapboxsdk.constants; public class MathConstants { public static final double DEG2RAD = (Math.PI / 180.0); diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java similarity index 99% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java index d03f24a6f..e778e30aa 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/BoundingBox.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java similarity index 93% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java index c7f63e790..a70bb05a4 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateRegion.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; /** * Implementation of iOS MKCoordinateRegion diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java similarity index 96% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java index 994c72a05..79361f725 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/CoordinateSpan.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; /** * Implementation of iOS MKCoordinateSpan diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java similarity index 79% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java index 620676d83..892d0ad4a 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ILatLng.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; /** * A Latitude, Longitude point. diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java similarity index 70% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java index 99f4fdec3..5aa5f607e 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/IProjectedMeters.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; public interface IProjectedMeters { double getNorthing(); diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java similarity index 96% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java index 141f0dc96..71480e958 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLng.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java @@ -1,11 +1,11 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; import android.location.Location; import android.os.Parcel; import android.os.Parcelable; -import com.mapbox.mapboxgl.constants.GeoConstants; -import com.mapbox.mapboxgl.constants.MathConstants; +import com.mapbox.mapboxsdk.constants.GeoConstants; +import com.mapbox.mapboxsdk.constants.MathConstants; import java.io.Serializable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java similarity index 98% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java index 5d841477a..8822d7c03 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/LatLngZoom.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java similarity index 98% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java index 156d4355b..be4819a74 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/geometry/ProjectedMeters.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.geometry; +package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/http/HTTPContext.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java similarity index 97% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/http/HTTPContext.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java index 775daaafd..358af8997 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/http/HTTPContext.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxgl.http; +package com.mapbox.mapboxsdk.http; -import com.mapbox.mapboxgl.constants.MapboxConstants; +import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.squareup.okhttp.Call; import com.squareup.okhttp.Callback; import com.squareup.okhttp.OkHttpClient; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindow.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java similarity index 98% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindow.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java index dc4c2a2d1..3d612b6bd 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindow.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.views; +package com.mapbox.mapboxsdk.views; import android.content.Context; import android.graphics.PointF; @@ -8,8 +8,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.mapbox.mapboxgl.annotations.Marker; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.geometry.LatLng; /** * A tooltip view diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindowTipView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java similarity index 96% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindowTipView.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java index b6c849f5c..7c06643b6 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/InfoWindowTipView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.views; +package com.mapbox.mapboxsdk.views; import android.content.Context; import android.graphics.Canvas; diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java similarity index 99% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 1c100c6e9..c4173e5bd 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.views; +package com.mapbox.mapboxsdk.views; import android.app.Activity; import android.app.ActivityManager; @@ -54,16 +54,17 @@ import android.widget.ZoomButtonsController; import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector; import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector; -import com.mapbox.mapboxgl.annotations.Annotation; -import com.mapbox.mapboxgl.annotations.Marker; -import com.mapbox.mapboxgl.annotations.MarkerOptions; -import com.mapbox.mapboxgl.annotations.Polygon; -import com.mapbox.mapboxgl.annotations.PolygonOptions; -import com.mapbox.mapboxgl.annotations.Polyline; -import com.mapbox.mapboxgl.annotations.PolylineOptions; -import com.mapbox.mapboxgl.geometry.BoundingBox; -import com.mapbox.mapboxgl.geometry.LatLng; -import com.mapbox.mapboxgl.geometry.LatLngZoom; +import com.mapbox.mapboxgl.views.R; +import com.mapbox.mapboxsdk.annotations.Annotation; +import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.annotations.MarkerOptions; +import com.mapbox.mapboxsdk.annotations.Polygon; +import com.mapbox.mapboxsdk.annotations.PolygonOptions; +import com.mapbox.mapboxsdk.annotations.Polyline; +import com.mapbox.mapboxsdk.annotations.PolylineOptions; +import com.mapbox.mapboxsdk.geometry.BoundingBox; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLngZoom; import com.mapzen.android.lost.api.LocationListener; import com.mapzen.android.lost.api.LocationRequest; import com.mapzen.android.lost.api.LocationServices; @@ -73,7 +74,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Date; import java.util.Iterator; import java.util.List; @@ -231,7 +231,7 @@ public class MapView extends FrameLayout implements LocationListener { /** * Map change event types received by - * {@link com.mapbox.mapboxgl.views.MapView.OnMapChangedListener#onMapChanged(MapChange)} + * {@link com.mapbox.mapboxsdk.views.MapView.OnMapChangedListener#onMapChanged(MapChange)} */ public enum MapChange { /** diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java similarity index 97% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java index 1023fa1ff..88bac8b7f 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/NativeMapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java @@ -1,15 +1,15 @@ -package com.mapbox.mapboxgl.views; +package com.mapbox.mapboxsdk.views; import android.graphics.PointF; import android.view.Surface; -import com.mapbox.mapboxgl.annotations.Marker; -import com.mapbox.mapboxgl.annotations.Polygon; -import com.mapbox.mapboxgl.annotations.Polyline; -import com.mapbox.mapboxgl.geometry.BoundingBox; -import com.mapbox.mapboxgl.geometry.LatLng; -import com.mapbox.mapboxgl.geometry.LatLngZoom; -import com.mapbox.mapboxgl.geometry.ProjectedMeters; +import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.annotations.Polygon; +import com.mapbox.mapboxsdk.annotations.Polyline; +import com.mapbox.mapboxsdk.geometry.BoundingBox; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLngZoom; +import com.mapbox.mapboxsdk.geometry.ProjectedMeters; import java.util.List; // Class that wraps the native methods for convenience diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/package-info.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java similarity index 60% rename from android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/package-info.java rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java index 33710dca7..14ef480b3 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/package-info.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java @@ -1,4 +1,4 @@ /** * Classes that render a map and the map's UI. */ -package com.mapbox.mapboxgl.views; +package com.mapbox.mapboxsdk.views; diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml index 7f042363c..aa54ddd8e 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml +++ b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml @@ -44,7 +44,7 @@ android:visibility="gone"/> - diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java similarity index 81% rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java index f3ae2018c..35d512e54 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/BaseTest.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java @@ -1,12 +1,8 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.app.Activity; -import android.support.test.InstrumentationRegistry; -import android.test.ActivityInstrumentationTestCase2; -import com.mapbox.mapboxgl.testapp.utils.ScreenshotUtil; - -import org.junit.Before; +import com.mapbox.mapboxsdk.testapp.utils.ScreenshotUtil; import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.assertion.ViewAssertions.matches; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityScreenTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java similarity index 98% rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityScreenTest.java rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java index 80dc0aa77..bbfa4ec73 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityScreenTest.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java similarity index 99% rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityTest.java rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java index b880176fe..9a4b01334 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/MainActivityTest.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/SecondMapActivityTest.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java similarity index 96% rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/SecondMapActivityTest.java rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java index 593b0b2ee..e80098e1c 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/SecondMapActivityTest.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/SecondMapActivityTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java similarity index 99% rename from android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java rename to android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java index 258a38923..d25afec81 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxgl/testapp/utils/ScreenshotUtil.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp.utils; +package com.mapbox.mapboxsdk.testapp.utils; import android.app.Activity; import android.graphics.Bitmap; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index f91c57e7e..872934245 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mapbox.mapboxsdk.testapp"> - + diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java similarity index 97% rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index 2f9b374e2..43dd01e80 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.Manifest; import android.content.Intent; @@ -25,12 +25,12 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; import com.crashlytics.android.Crashlytics; -import com.mapbox.mapboxgl.annotations.Marker; -import com.mapbox.mapboxgl.annotations.MarkerOptions; -import com.mapbox.mapboxgl.annotations.PolygonOptions; -import com.mapbox.mapboxgl.annotations.PolylineOptions; -import com.mapbox.mapboxgl.geometry.LatLng; -import com.mapbox.mapboxgl.views.MapView; +import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.annotations.MarkerOptions; +import com.mapbox.mapboxsdk.annotations.PolygonOptions; +import com.mapbox.mapboxsdk.annotations.PolylineOptions; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.views.MapView; import io.fabric.sdk.android.Fabric; import java.io.BufferedReader; import java.io.IOException; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java similarity index 96% rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java index 7883dbae4..766e0a309 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MapFragment.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragment.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -7,7 +7,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.mapbox.mapboxgl.views.MapView; +import com.mapbox.mapboxsdk.views.MapView; public class MapFragment extends Fragment { diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java similarity index 96% rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java index 976140ffc..4102242ff 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SecondMapActivity.java @@ -1,11 +1,11 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; -import com.mapbox.mapboxgl.views.MapView; +import com.mapbox.mapboxsdk.views.MapView; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java similarity index 96% rename from android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java rename to android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java index 74b909cec..fe6c5d9ee 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/Util.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/Util.java @@ -1,9 +1,9 @@ -package com.mapbox.mapboxgl.testapp; +package com.mapbox.mapboxsdk.testapp; import android.content.Context; import android.text.TextUtils; -import com.mapbox.mapboxgl.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLng; import org.json.JSONArray; import org.json.JSONException; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index 0e569b770..d62d6423e 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - -