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

[android] #4365 - final testapp refactor cleanup, removed ApiAccess class, introduced category packages, Renamed some classes

Browse Source
This commit is contained in:
Tobrun
2016-04-01 16:41:32 +02:00
committed by Brad Leege
parent 86003d1fb4
commit 77b7251d71
52 changed files with 143 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/BulkMarkerActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DirectionsActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/DynamicMarkerChangeActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/GeocoderActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/InfoWindowAdapterActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/LatLngBoundsActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ManualZoomActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapFragmentActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MapPaddingActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MaxMinZoomActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/MyLocationTrackingModeActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/PolylineActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/ScrollByActivityTest.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/espresso/SupportMapFragmentActivityTest.java
View File

@@ -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;

3
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/robotium/BaseMainActivityTest.java
View File

@@ -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;

44
platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
View File

@@ -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

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/FeatureOverviewActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/FeatureOverviewActivity.java
View File

@@ -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;

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/AnimatedMarkerActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
View File

@@ -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);
}

7
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/BulkMarkerActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
View File

@@ -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

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DynamicMarkerChangeActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/DynamicMarkerChangeActivity.java
View File

@@ -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

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolygonActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolygonActivity.java
View File

@@ -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;

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/PolylineActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/PolylineActivity.java
View File

@@ -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

7
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/DirectionsActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/DirectionsActivity.java
View File

@@ -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)

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/GeocoderActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/api/GeocoderActivity.java
View File

@@ -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();

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraAnimationTypeActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java
View File

@@ -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

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/CameraPositionActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
View File

@@ -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);
}

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/LatLngBoundsActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
View File

@@ -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() {

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ManualZoomActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
View File

@@ -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;
}

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MaxMinZoomActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
View File

@@ -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;

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/ScrollByActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java
View File

@@ -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 {

15
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapFragmentActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
View File

@@ -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);
}
});
}

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SupportMapFragmentActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
View File

@@ -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);

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowActivity.java
View File

@@ -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);
}

9
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/InfoWindowAdapterActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
View File

@@ -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

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MapPaddingActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MapPaddingActivity.java
View File

@@ -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() {

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/MyLocationTrackingModeActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/MyLocationTrackingModeActivity.java
View File

@@ -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

25
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/OfflineActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/OfflineActivity.java
View File

@@ -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

5
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/SnapshotActivity.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/other/SnapshotActivity.java
View File

@@ -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

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/adapter/FeatureAdapter.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/Feature.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/activity/Feature.java
View File

@@ -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;

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarker.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarker.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxsdk.testapp.annotations;
package com.mapbox.mapboxsdk.testapp.model.annotations;
import com.mapbox.mapboxsdk.annotations.Marker;

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/annotations/CityStateMarkerOptions.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/annotations/CityStateMarkerOptions.java
View File

@@ -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;

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/layers/ExampleCustomLayer.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/CustomLayer.java
View File

@@ -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");
}

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/DownloadRegionDialog.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineDownloadRegionDialog.java
View File

@@ -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);

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/offline/ListRegionsDialog.java → platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/model/other/OfflineListRegionsDialog.java
View File

@@ -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";

43
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/ApiAccess.java
View File

@@ -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;
}
}
}

51
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
View File

@@ -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"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/cameraMoveButton"
android:layout_centerHorizontal="true"
android:text="@string/button_camera_ease" />
android:orientation="horizontal"
android:weightSum="3">
<Button
android:id="@+id/cameraAnimateButton"
android:layout_width="wrap_content"
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" />
<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>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
View File

@@ -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"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
View File

@@ -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"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
View File

@@ -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>

2
platform/android/scripts/debug.sh
View File

@@ -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