diff options
52 files changed, 144 insertions, 211 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java index 8527c2446d..b85fe41243 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.BulkMarkerActivity; +import com.mapbox.mapboxsdk.testapp.activity.annotation.BulkMarkerActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java index 5205570f28..e77a08fbf2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.DirectionsActivity; +import com.mapbox.mapboxsdk.testapp.activity.api.DirectionsActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java index 24f69ccb82..700da5e3bc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.DynamicMarkerChangeActivity; +import com.mapbox.mapboxsdk.testapp.activity.annotation.DynamicMarkerChangeActivity; import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.espresso.utils.ViewUtils; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java index 0f7c4d829c..ea3a5ef491 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.GeocoderActivity; +import com.mapbox.mapboxsdk.testapp.activity.api.GeocoderActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java index 07555110a5..feb0bb1a02 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.InfoWindowActivity; +import com.mapbox.mapboxsdk.testapp.activity.infowindow.InfoWindowActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java index 46ba894180..0c62387e36 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.InfoWindowAdapterActivity; +import com.mapbox.mapboxsdk.testapp.activity.infowindow.InfoWindowAdapterActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java index ebefea3654..39e7e4766e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.LatLngBoundsActivity; +import com.mapbox.mapboxsdk.testapp.activity.camera.LatLngBoundsActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java index 9c06e63917..5c88bd371a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.ManualZoomActivity; +import com.mapbox.mapboxsdk.testapp.activity.camera.ManualZoomActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java index 86355fa365..d7522b2d7f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.MapFragmentActivity; +import com.mapbox.mapboxsdk.testapp.activity.fragment.MapFragmentActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java index a80d77c462..ac17ecc120 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.MapPaddingActivity; +import com.mapbox.mapboxsdk.testapp.activity.other.MapPaddingActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java index cdd13789c3..48152286e9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.MaxMinZoomActivity; +import com.mapbox.mapboxsdk.testapp.activity.camera.MaxMinZoomActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java index 8dde6c1b17..46165a631f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.MyLocationTrackingModeActivity; +import com.mapbox.mapboxsdk.testapp.activity.other.MyLocationTrackingModeActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java index 5f4258ac3e..425d803952 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java @@ -4,7 +4,7 @@ import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; -import com.mapbox.mapboxsdk.testapp.activity.PolylineActivity; +import com.mapbox.mapboxsdk.testapp.activity.annotation.PolylineActivity; import com.mapbox.mapboxsdk.testapp.R; import org.junit.Before; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java index 43bf815fb9..c545bc6e04 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java @@ -5,7 +5,7 @@ import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.activity.ScrollByActivity; +import com.mapbox.mapboxsdk.testapp.activity.camera.ScrollByActivity; import org.junit.Rule; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java index dc52ebd4eb..e6c1cadf1e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java @@ -6,7 +6,7 @@ import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.LargeTest; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.activity.SupportMapFragmentActivity; +import com.mapbox.mapboxsdk.testapp.activity.fragment.SupportMapFragmentActivity; import org.junit.Before; import org.junit.Rule; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java index 85a27756b7..0c1470ac28 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java @@ -5,9 +5,8 @@ import android.test.ActivityInstrumentationTestCase2; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.MapboxMapUtils; -import com.mapbox.mapboxsdk.testapp.FeatureOverviewActivity; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.activity.PolylineActivity; +import com.mapbox.mapboxsdk.testapp.activity.annotation.PolylineActivity; import com.robotium.solo.Solo; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index b183f62ac0..0d4ffcea11 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> <activity - android:name=".FeatureOverviewActivity" + android:name=".activity.FeatureOverviewActivity" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -25,7 +25,7 @@ </activity> <activity - android:name=".activity.InfoWindowActivity" + android:name=".activity.infowindow.InfoWindowActivity" android:description="@string/description_info_window" android:label="@string/activity_info_window"> <meta-data @@ -33,7 +33,7 @@ android:value="@string/category_infowindow" /> </activity> <activity - android:name=".activity.InfoWindowAdapterActivity" + android:name=".activity.infowindow.InfoWindowAdapterActivity" android:description="@string/description_info_window_adapter" android:label="@string/activity_infowindow_adapter"> <meta-data @@ -41,7 +41,7 @@ android:value="@string/category_infowindow" /> </activity> <activity - android:name=".activity.BulkMarkerActivity" + android:name=".activity.annotation.BulkMarkerActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:description="@string/description_add_bulk_markers" android:label="@string/activity_add_bulk_markers"> @@ -50,7 +50,7 @@ android:value="@string/category_annotation" /> </activity> <activity - android:name=".activity.AnimatedMarkerActivity" + android:name=".activity.annotation.AnimatedMarkerActivity" android:description="@string/description_animated_marker" android:label="@string/activity_animated_marker"> <meta-data @@ -58,7 +58,7 @@ android:value="@string/category_annotation" /> </activity> <activity - android:name=".activity.CameraAnimationTypeActivity" + android:name=".activity.camera.CameraAnimationTypeActivity" android:description="@string/description_camera_animation_types" android:label="@string/activity_camera_animation_types"> <meta-data @@ -66,7 +66,7 @@ android:value="@string/category_camera" /> </activity> <activity - android:name=".activity.CameraPositionActivity" + android:name=".activity.camera.CameraPositionActivity" android:description="@string/description_cameraposition" android:label="@string/activity_camera_position"> <meta-data @@ -74,7 +74,7 @@ android:value="@string/category_camera" /> </activity> <activity - android:name=".activity.LatLngBoundsActivity" + android:name=".activity.camera.LatLngBoundsActivity" android:description="@string/description_visible_bounds" android:label="@string/activity_visible_coordinate_bounds"> <meta-data @@ -82,7 +82,7 @@ android:value="@string/category_camera" /> </activity> <activity - android:name=".activity.MapFragmentActivity" + android:name=".activity.fragment.MapFragmentActivity" android:description="@string/description_map_fragment" android:label="@string/activity_map_fragment"> <meta-data @@ -90,7 +90,7 @@ android:value="@string/category_fragment" /> </activity> <activity - android:name=".activity.SupportMapFragmentActivity" + android:name=".activity.fragment.SupportMapFragmentActivity" android:description="@string/description_map_fragment_support" android:label="@string/activity_map_fragment_suport"> <meta-data @@ -98,7 +98,7 @@ android:value="@string/category_fragment" /> </activity> <activity - android:name=".activity.ManualZoomActivity" + android:name=".activity.camera.ManualZoomActivity" android:description="@string/description_camera_zoom" android:label="@string/activity_camera_zoom"> <meta-data @@ -106,7 +106,7 @@ android:value="@string/category_camera" /> </activity> <activity - android:name=".activity.MaxMinZoomActivity" + android:name=".activity.camera.MaxMinZoomActivity" android:description="@string/description_minmax_zoom" android:label="@string/activity_minmax_zoom"> <meta-data @@ -114,7 +114,7 @@ android:value="@string/category_other" /> </activity> <activity - android:name=".activity.MyLocationTrackingModeActivity" + android:name=".activity.other.MyLocationTrackingModeActivity" android:description="@string/description_user_location_tracking" android:label="@string/activity_user_tracking_mode"> <meta-data @@ -122,7 +122,7 @@ android:value="@string/category_other" /> </activity> <activity - android:name=".activity.PolygonActivity" + android:name=".activity.annotation.PolygonActivity" android:description="@string/description_polygone" android:label="@string/activity_polygone"> <meta-data @@ -131,7 +131,7 @@ </activity> <activity - android:name=".activity.PolylineActivity" + android:name=".activity.annotation.PolylineActivity" android:description="@string/description_polyline" android:label="@string/activity_polyline"> <meta-data @@ -139,7 +139,7 @@ android:value="@string/category_annotation" /> </activity> <activity - android:name=".activity.DirectionsActivity" + android:name=".activity.api.DirectionsActivity" android:description="@string/description_directions" android:label="@string/activity_directions"> <meta-data @@ -147,7 +147,7 @@ android:value="@string/category_api" /> </activity> <activity - android:name=".activity.GeocoderActivity" + android:name=".activity.api.GeocoderActivity" android:description="@string/description_geocoder" android:label="@string/activity_geocoder"> <meta-data @@ -155,7 +155,7 @@ android:value="@string/category_api" /> </activity> <activity - android:name=".activity.ScrollByActivity" + android:name=".activity.camera.ScrollByActivity" android:description="@string/description_scroll_by" android:label="@string/activity_scroll_by"> <meta-data @@ -163,7 +163,7 @@ android:value="@string/category_camera" /> </activity> <activity - android:name=".activity.DynamicMarkerChangeActivity" + android:name=".activity.annotation.DynamicMarkerChangeActivity" android:description="@string/description_dynamic_marker" android:label="@string/activity_dynamic_marker"> <meta-data @@ -171,7 +171,7 @@ android:value="@string/category_annotation" /> </activity> <activity - android:name=".activity.MapPaddingActivity" + android:name=".activity.other.MapPaddingActivity" android:description="@string/description_map_padding" android:label="@string/activity_map_padding" android:screenOrientation="portrait"> @@ -180,7 +180,7 @@ android:value="@string/category_other" /> </activity> <activity - android:name=".activity.OfflineActivity" + android:name=".activity.other.OfflineActivity" android:description="@string/description_offline" android:label="@string/activity_offline"> <meta-data @@ -188,7 +188,7 @@ android:value="@string/category_other" /> </activity> <activity - android:name=".activity.SnapshotActivity" + android:name=".activity.other.SnapshotActivity" android:description="@string/description_snapshot" android:label="@string/activity_snapshot"> <meta-data diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/FeatureOverviewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java index 4508097d69..fbe7aacc5e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/FeatureOverviewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp; +package com.mapbox.mapboxsdk.testapp.activity; import android.content.ComponentName; import android.content.Intent; @@ -17,9 +17,10 @@ import android.util.Log; import android.view.View; import com.mapbox.mapboxsdk.constants.MapboxConstants; +import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.adapter.FeatureAdapter; import com.mapbox.mapboxsdk.testapp.adapter.FeatureSectionAdapter; -import com.mapbox.mapboxsdk.testapp.model.Feature; +import com.mapbox.mapboxsdk.testapp.model.activity.Feature; import com.mapbox.mapboxsdk.testapp.utils.ItemClickSupport; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java index cf61a220b1..473bd67b99 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/AnimatedMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.animation.TypeEvaluator; import android.animation.ValueAnimator; @@ -13,13 +13,11 @@ import android.view.animation.AccelerateDecelerateInterpolator; import com.mapbox.mapboxsdk.annotations.Marker; import com.mapbox.mapboxsdk.annotations.MarkerOptions; -import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class AnimatedMarkerActivity extends AppCompatActivity { @@ -75,11 +73,9 @@ public class AnimatedMarkerActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case android.R.id.home: onBackPressed(); return true; - default: return super.onOptionsItemSelected(item); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java index 1330f48469..7288d63719 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/BulkMarkerActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.app.ProgressDialog; import android.content.Context; @@ -16,14 +16,11 @@ import android.widget.ArrayAdapter; import android.widget.Spinner; import com.mapbox.mapboxsdk.annotations.MarkerOptions; -import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; import org.json.JSONException; @@ -54,7 +51,7 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView } mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DynamicMarkerChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java index 2d485fc966..c3380a7f59 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DynamicMarkerChangeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.os.Bundle; import android.support.annotation.NonNull; @@ -19,7 +19,6 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class DynamicMarkerChangeActivity extends AppCompatActivity { @@ -49,7 +48,7 @@ public class DynamicMarkerChangeActivity extends AppCompatActivity { mMapView = (MapView) findViewById(R.id.mapView); mMapView.setTag(false); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolygonActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java index 4de79f0ab0..f8837d722d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolygonActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java index 2212299a61..b0271221ec 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolylineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import java.util.ArrayList; import java.util.Collections; @@ -59,7 +58,7 @@ public class PolylineActivity extends AppCompatActivity { } mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DirectionsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/DirectionsActivity.java index 4895b8fcef..c9bad6906a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DirectionsActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/DirectionsActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.api; import android.graphics.Color; import android.os.Bundle; @@ -22,7 +22,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; import java.util.List; @@ -53,7 +52,7 @@ public class DirectionsActivity extends AppCompatActivity { } mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override @@ -97,7 +96,7 @@ public class DirectionsActivity extends AppCompatActivity { private void getRoute(Waypoint origin, Waypoint destination) { MapboxDirections md = new MapboxDirections.Builder() - .setAccessToken(ApiAccess.getToken(this)) + .setAccessToken(getString(R.string.mapbox_access_token)) .setOrigin(origin) .setDestination(destination) .setProfile(DirectionsCriteria.PROFILE_WALKING) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/GeocoderActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/GeocoderActivity.java index 29fbc53380..3dc154a880 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/GeocoderActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/GeocoderActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.api; import android.graphics.PointF; import android.os.AsyncTask; @@ -19,7 +19,6 @@ import com.mapbox.geocoder.GeocoderCriteria; import com.mapbox.geocoder.MapboxGeocoder; import com.mapbox.geocoder.service.models.GeocoderFeature; import com.mapbox.geocoder.service.models.GeocoderResponse; -import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.constants.Style; @@ -27,7 +26,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.Projection; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; import java.util.List; @@ -61,7 +59,7 @@ public class GeocoderActivity extends AppCompatActivity { setMessage("Tap the map to trigger the geocoder."); mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.setStyle(Style.MAPBOX_STREETS); mapView.onCreate(savedInstanceState); @@ -131,7 +129,7 @@ public class GeocoderActivity extends AppCompatActivity { @Override protected Void doInBackground(Void... params) { MapboxGeocoder client = new MapboxGeocoder.Builder() - .setAccessToken(ApiAccess.getToken(GeocoderActivity.this)) + .setAccessToken(getString(R.string.mapbox_access_token)) .setCoordinates(point.getLongitude(), point.getLatitude()) .setType(GeocoderCriteria.TYPE_POI) .build(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java index 3b220a046f..b7dd0c28d5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraAnimationTypeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.os.Bundle; import android.support.annotation.NonNull; @@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; public class CameraAnimationTypeActivity extends AppCompatActivity { @@ -45,7 +44,7 @@ public class CameraAnimationTypeActivity extends AppCompatActivity { } mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java index dea87079e2..237ad992e7 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraPositionActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.content.Context; import android.content.DialogInterface; @@ -17,7 +17,6 @@ import android.view.MenuItem; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; -import android.widget.Toast; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; @@ -27,9 +26,6 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; - -import org.w3c.dom.Text; public class CameraPositionActivity extends AppCompatActivity implements OnMapReadyCallback { @@ -50,7 +46,7 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe } mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.onCreate(savedInstanceState); mapView.getMapAsync(this); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/LatLngBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java index 2888f2170a..35bd3cee0e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/LatLngBoundsActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.os.Bundle; import android.support.annotation.NonNull; @@ -18,7 +18,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.UiSettings; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; public class LatLngBoundsActivity extends AppCompatActivity { @@ -43,7 +42,7 @@ public class LatLngBoundsActivity extends AppCompatActivity { } mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.setStyle(Style.DARK); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ManualZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java index cce6d0585e..0516ceaf31 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ManualZoomActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.graphics.Point; import android.os.Bundle; @@ -16,7 +16,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.UiSettings; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; public class ManualZoomActivity extends AppCompatActivity { @@ -39,7 +38,7 @@ public class ManualZoomActivity extends AppCompatActivity { } mMapView = (MapView) findViewById(R.id.manualZoomMapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.setStyleUrl(Style.SATELLITE_STREETS); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @@ -55,6 +54,7 @@ public class ManualZoomActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { +// findViewById(R.id.) getMenuInflater().inflate(R.menu.menu_zoom, menu); return true; } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MaxMinZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java index 28fad94ef5..e9a9647d45 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MaxMinZoomActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.os.Bundle; import android.support.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java index 8eba00bb79..729a08758e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ScrollByActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.camera; import android.os.Bundle; import android.support.annotation.NonNull; @@ -13,15 +13,12 @@ import android.view.View; import android.widget.SeekBar; import android.widget.TextView; -import com.mapbox.mapboxsdk.constants.Style; -import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.UiSettings; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class ScrollByActivity extends AppCompatActivity { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java index fbc69bfd5d..29df4fd2bb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.fragment; import android.app.FragmentTransaction; import android.os.Bundle; @@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class MapFragmentActivity extends AppCompatActivity { @@ -40,8 +39,8 @@ public class MapFragmentActivity extends AppCompatActivity { FragmentTransaction transaction = getFragmentManager().beginTransaction(); MapboxMapOptions options = new MapboxMapOptions(); - options.accessToken(ApiAccess.getToken(this)); - options.styleUrl(Style.SATELLITE_STREETS); + options.accessToken(getString(R.string.mapbox_access_token)); + options.styleUrl(Style.EMERALD); options.scrollGesturesEnabled(false); options.zoomGesturesEnabled(false); @@ -53,11 +52,13 @@ public class MapFragmentActivity extends AppCompatActivity { // options.attributionEnabled(false); // options.logoEnabled(false); + LatLng dc = new LatLng(38.90252, -77.02291); + options.minZoom(9); options.maxZoom(11); options.camera(new CameraPosition.Builder() - .target(new LatLng(48.861431, 2.334166)) - .zoom(9) + .target(dc) + .zoom(11) .build()); mapFragment = MapFragment.newInstance(options); @@ -71,7 +72,7 @@ public class MapFragmentActivity extends AppCompatActivity { mapFragment.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2), 3500); + mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder().tilt(45.0).build()), 10000); } }); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java index 336ff9f850..4cfe00e0f4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SupportMapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.fragment; import android.os.Bundle; import android.support.annotation.NonNull; @@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.SupportMapFragment; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class SupportMapFragmentActivity extends AppCompatActivity { @@ -40,7 +39,7 @@ public class SupportMapFragmentActivity extends AppCompatActivity { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); MapboxMapOptions options = new MapboxMapOptions(); - options.accessToken(ApiAccess.getToken(this)); + options.accessToken(getString(R.string.mapbox_access_token)); options.styleUrl(Style.SATELLITE_STREETS); options.scrollGesturesEnabled(false); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java index 5e1b368266..0f8617a2a5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.infowindow; import android.os.Bundle; import android.support.annotation.NonNull; @@ -15,7 +15,6 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; import java.text.DecimalFormat; @@ -41,7 +40,7 @@ public class InfoWindowActivity extends AppCompatActivity implements OnMapReadyC } mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.onCreate(savedInstanceState); mapView.getMapAsync(this); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java index 54deb1a073..d0647009a9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowAdapterActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.infowindow; import android.graphics.Color; import android.graphics.PorterDuff; @@ -20,9 +20,8 @@ import com.mapbox.mapboxsdk.annotations.IconFactory; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.annotations.CityStateMarker; -import com.mapbox.mapboxsdk.testapp.annotations.CityStateMarkerOptions; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; +import com.mapbox.mapboxsdk.testapp.model.annotations.CityStateMarker; +import com.mapbox.mapboxsdk.testapp.model.annotations.CityStateMarkerOptions; import com.mapbox.mapboxsdk.maps.MapView; public class InfoWindowAdapterActivity extends AppCompatActivity { @@ -49,7 +48,7 @@ public class InfoWindowAdapterActivity extends AppCompatActivity { iconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_24dp); mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapPaddingActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MapPaddingActivity.java index 91b2793bd4..ad0fff2a3b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapPaddingActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MapPaddingActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.other; import android.os.Bundle; import android.support.annotation.NonNull; @@ -18,7 +18,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.TrackingSettings; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class MapPaddingActivity extends AppCompatActivity { @@ -41,7 +40,7 @@ public class MapPaddingActivity extends AppCompatActivity { mMapView = (MapView) findViewById(R.id.mapView); mMapView.setTag(true); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MyLocationTrackingModeActivity.java index 3b848d3483..5309fe1baf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MyLocationTrackingModeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MyLocationTrackingModeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.other; import android.location.Location; import android.os.Bundle; @@ -23,7 +23,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.TrackingSettings; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; import com.mapbox.mapboxsdk.maps.MapView; public class MyLocationTrackingModeActivity extends AppCompatActivity implements MapboxMap.OnMyLocationChangeListener, AdapterView.OnItemSelectedListener { @@ -49,7 +48,7 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements } mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/OfflineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/OfflineActivity.java index 3d16902532..09eab2edf1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/OfflineActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/OfflineActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.other; import android.os.Bundle; import android.support.annotation.NonNull; @@ -27,16 +27,15 @@ import com.mapbox.mapboxsdk.offline.OfflineRegionError; import com.mapbox.mapboxsdk.offline.OfflineRegionStatus; import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.offline.DownloadRegionDialog; -import com.mapbox.mapboxsdk.testapp.offline.ListRegionsDialog; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; +import com.mapbox.mapboxsdk.testapp.model.other.OfflineDownloadRegionDialog; +import com.mapbox.mapboxsdk.testapp.model.other.OfflineListRegionsDialog; import org.json.JSONObject; import java.util.ArrayList; public class OfflineActivity extends AppCompatActivity - implements DownloadRegionDialog.DownloadRegionDialogListener { + implements OfflineDownloadRegionDialog.DownloadRegionDialogListener { private final static String LOG_TAG = "OfflineActivity"; @@ -77,7 +76,7 @@ public class OfflineActivity extends AppCompatActivity // Set up map mMapView = (MapView) findViewById(R.id.mapView); - mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setAccessToken(getString(R.string.mapbox_access_token)); mMapView.setStyle(Style.MAPBOX_STREETS); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @@ -119,7 +118,7 @@ public class OfflineActivity extends AppCompatActivity // Set up the OfflineManager mOfflineManager = OfflineManager.getInstance(this); - mOfflineManager.setAccessToken(ApiAccess.getToken(this)); + mOfflineManager.setAccessToken(getString(R.string.mapbox_access_token)); } @Override @@ -171,8 +170,8 @@ public class OfflineActivity extends AppCompatActivity Log.d(LOG_TAG, "handleDownloadRegion"); // Show dialog - DownloadRegionDialog downloadRegionDialog = new DownloadRegionDialog(); - downloadRegionDialog.show(getSupportFragmentManager(), "download"); + OfflineDownloadRegionDialog offlineDownloadRegionDialog = new OfflineDownloadRegionDialog(); + offlineDownloadRegionDialog.show(getSupportFragmentManager(), "download"); } private void handleListRegions() { @@ -196,12 +195,12 @@ public class OfflineActivity extends AppCompatActivity // Create args Bundle args = new Bundle(); - args.putStringArrayList(ListRegionsDialog.ITEMS, offlineRegionsNames); + args.putStringArrayList(OfflineListRegionsDialog.ITEMS, offlineRegionsNames); // Show dialog - ListRegionsDialog listRegionsDialog = new ListRegionsDialog(); - listRegionsDialog.setArguments(args); - listRegionsDialog.show(getSupportFragmentManager(), "list"); + OfflineListRegionsDialog offlineListRegionsDialog = new OfflineListRegionsDialog(); + offlineListRegionsDialog.setArguments(args); + offlineListRegionsDialog.show(getSupportFragmentManager(), "list"); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SnapshotActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/SnapshotActivity.java index 74e556da54..62d77bf965 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SnapshotActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/SnapshotActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.activity; +package com.mapbox.mapboxsdk.testapp.activity.other; import android.graphics.Bitmap; import android.os.Bundle; @@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class SnapshotActivity extends AppCompatActivity { @@ -38,7 +37,7 @@ public class SnapshotActivity extends AppCompatActivity { } mapView = (MapView) findViewById(R.id.mapView); - mapView.setAccessToken(ApiAccess.getToken(this)); + mapView.setAccessToken(getString(R.string.mapbox_access_token)); mapView.onCreate(savedInstanceState); mapView.getMapAsync(new OnMapReadyCallback() { @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java index 16f93e7ae5..fac7e34ce1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.model.Feature; +import com.mapbox.mapboxsdk.testapp.model.activity.Feature; import com.mapbox.mapboxsdk.testapp.utils.FontCache; import java.util.List; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/Feature.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java index 32599288db..66c51a1a13 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/Feature.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.model; +package com.mapbox.mapboxsdk.testapp.model.activity; import android.os.Parcel; import android.os.Parcelable; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarker.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java index 1ec5aa9c76..e0141586e4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarker.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.annotations; +package com.mapbox.mapboxsdk.testapp.model.annotations; import com.mapbox.mapboxsdk.annotations.Marker; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarkerOptions.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java index 379a9210e5..a716518c22 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.annotations; +package com.mapbox.mapboxsdk.testapp.model.annotations; import android.graphics.Bitmap; import android.os.Parcel; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/layers/ExampleCustomLayer.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/CustomLayer.java index 3a97c26595..cecaac05b3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/layers/ExampleCustomLayer.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/CustomLayer.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxsdk.testapp.layers; +package com.mapbox.mapboxsdk.testapp.model.other; -public class ExampleCustomLayer { +public class CustomLayer { static { System.loadLibrary("example-custom-layer"); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/DownloadRegionDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java index 81b681cc50..3c2d1cab5e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/DownloadRegionDialog.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.offline; +package com.mapbox.mapboxsdk.testapp.model.other; import android.app.Activity; import android.app.Dialog; @@ -15,9 +15,9 @@ import com.mapbox.mapboxsdk.testapp.R; /** * Created by antonio on 2/17/16. */ -public class DownloadRegionDialog extends DialogFragment { +public class OfflineDownloadRegionDialog extends DialogFragment { - private final static String LOG_TAG = "DownloadRegionDialog"; + private final static String LOG_TAG = "OfflineDownloadRegionDialog"; public interface DownloadRegionDialogListener { void onDownloadRegionDialogPositiveClick(String regionName); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/ListRegionsDialog.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java index 50df71ad00..e00465a9b1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/ListRegionsDialog.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.testapp.offline; +package com.mapbox.mapboxsdk.testapp.model.other; import android.app.Dialog; import android.content.DialogInterface; @@ -15,9 +15,9 @@ import java.util.ArrayList; /** * Created by antonio on 2/17/16. */ -public class ListRegionsDialog extends DialogFragment { +public class OfflineListRegionsDialog extends DialogFragment { - private final static String LOG_TAG = "ListRegionsDialog"; + private final static String LOG_TAG = "OfflineListRegionsDialog"; public final static String ITEMS = "ITEMS"; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java deleted file mode 100644 index 0221ee37f9..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.mapbox.mapboxsdk.testapp.utils; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.support.annotation.NonNull; - -import com.mapbox.mapboxsdk.constants.MapboxConstants; - -/** - * {@code ApiAccess} provides a method to load the Mapbox access token. - */ -public final class ApiAccess { - - /** - * <p> - * Returns the Mapbox access token set in the app resources. - * </p> - * It will first search the application manifest for a {@link MapboxConstants#KEY_META_DATA_MANIFEST} - * meta-data value. If not found it will then attempt to load the access token from the - * {@code res/raw/token.txt} development file. - * - * @param context The {@link Context} of the {@link android.app.Activity} or {@link android.app.Fragment}. - * @return The Mapbox access token or null if not found. - * @see MapboxConstants#KEY_META_DATA_MANIFEST - */ - public static String getToken(@NonNull Context context) { - try { - // read out AndroidManifest - PackageManager packageManager = context.getPackageManager(); - ApplicationInfo appInfo = packageManager.getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA); - String token = appInfo.metaData.getString(MapboxConstants.KEY_META_DATA_MANIFEST); - if (token == null || token.isEmpty()) { - throw new IllegalArgumentException(); - } - return token; - } catch (Exception e) { - // use fallback on string resource, used for development - int tokenResId = context.getResources().getIdentifier("mapbox_access_token", "string", context.getPackageName()); - return tokenResId != 0 ? context.getString(tokenResId) : null; - } - } -} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml index db5169f860..c60e738eaa 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml @@ -21,33 +21,34 @@ app:center_longitude="-0.11968" app:zoom="15" /> - <Button - android:id="@+id/cameraMoveButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_margin="@dimen/fab_margin" - android:text="@string/button_camera_move" /> - - <Button - android:id="@+id/cameraEaseButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignTop="@+id/cameraMoveButton" - android:layout_centerHorizontal="true" - android:text="@string/button_camera_ease" /> - <Button - android:id="@+id/cameraAnimateButton" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@+id/cameraEaseButton" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:layout_marginRight="@dimen/fab_margin" - android:layout_marginEnd="@dimen/fab_margin" - android:text="@string/button_camera_animate" /> + android:orientation="horizontal" + android:weightSum="3"> + + <Button + android:id="@+id/cameraMoveButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/button_camera_move" /> + + <Button + android:id="@+id/cameraEaseButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/button_camera_ease" /> + + <Button + android:id="@+id/cameraAnimateButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/button_camera_animate" /> + + </LinearLayout> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml index 873e5d18a1..6a90a8eafb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml @@ -11,6 +11,8 @@ android:background="@color/primary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> + + <com.mapbox.mapboxsdk.maps.MapView android:layout_below="@id/toolbar" android:id="@+id/manualZoomMapView" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml index 11b755ea28..a421f21ede 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".activity.MapFragmentActivity"> + tools:context=".activity.fragment.MapFragmentActivity"> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 31301d2b15..89b9483ebf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -73,7 +73,7 @@ <string name="category_infowindow">InfoWindow</string> <string name="category_camera">Camera</string> <string name="category_fragment">Fragment</string> - <string name="category_api">API</string> + <string name="category_api">Mapbox Android Services</string> <string name="category_other">Other</string> <string name="action_visible_bounds_explanation">Center map around 2 markers</string> diff --git a/platform/android/scripts/debug.sh b/platform/android/scripts/debug.sh index 881fa3b187..ade9ab2d6f 100755 --- a/platform/android/scripts/debug.sh +++ b/platform/android/scripts/debug.sh @@ -31,7 +31,7 @@ if [[ $1 == '--prepare' ]]; then fi adb install -rtdg platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk -adb shell am start -n "com.mapbox.mapboxsdk.testapp/com.mapbox.mapboxsdk.testapp.FeatureOverviewActivity" \ +adb shell am start -n "com.mapbox.mapboxsdk.testapp/com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity" \ -a android.intent.action.MAIN -c android.intent.category.LAUNCHER adb forward tcp:5039 tcp:5039 |