diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-03-09 17:46:00 -0500 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-03-09 17:46:00 -0500 |
commit | 808bf7004a4360a4cc7095f97c235c92d3679f8b (patch) | |
tree | f5225f5785f057923cfa5bd5c4806f5958b56e88 /platform/android/MapboxGLAndroidSDKTestApp/src/main | |
parent | 7cceca4b4576c21c315b445889bad770e7dc4e53 (diff) | |
download | qtlocation-mapboxgl-808bf7004a4360a4cc7095f97c235c92d3679f8b.tar.gz |
[android] #4076 - MapboxMapOptions fix
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')
11 files changed, 231 insertions, 49 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index 8fdd590abe..0d2b78acf8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -24,6 +24,9 @@ </intent-filter> </activity> <activity + android:name=".MapboxMapActivity" + android:label="@string/action_mapboxmap" /> + <activity android:name=".LatLngBoundsActivity" android:label="@string/activity_visible_coordinate_bounds" /> <activity diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index edc52dca1b..45d6d33774 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -358,6 +358,10 @@ public class MainActivity extends AppCompatActivity { uiSettings.setCompassEnabled(!uiSettings.isCompassEnabled()); return true; + case R.id.action_mapboxmap: + startActivity(new Intent(getApplicationContext(), MapboxMapActivity.class)); + return true; + case R.id.action_info_window_adapter: startActivity(new Intent(getApplicationContext(), InfoWindowAdapterActivity.class)); return true; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java index d3555a539e..d2fc7b6713 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java @@ -40,9 +40,28 @@ public class MapFragmentActivity extends AppCompatActivity { MapboxMapOptions options = new MapboxMapOptions(); options.accessToken(ApiAccess.getToken(this)); - options.styleUrl(Style.SATELLITE); + options.styleUrl(Style.SATELLITE_STREETS); - transaction.add(R.id.fragment_container, mapFragment = MapFragment.newInstance(options), "com.mapbox.map"); + options.scrollGesturesEnabled(false); + options.zoomGesturesEnabled(false); + options.tiltGesturesEnabled(false); + options.rotateGesturesEnabled(false); + + options.debugActive(false); + options.compassEnabled(false); + options.attributionEnabled(false); + options.logoEnabled(false); + + options.minZoom(9); + options.maxZoom(11); + options.camera(new CameraPosition.Builder() + .target(new LatLng(48.861431, 2.334166)) + .zoom(9) + .build()); + + mapFragment = MapFragment.newInstance(options); + + transaction.add(R.id.fragment_container, mapFragment, "com.mapbox.map"); transaction.commit(); } else { mapFragment = (MapFragment) getFragmentManager().findFragmentByTag("com.mapbox.map"); @@ -51,11 +70,7 @@ public class MapFragmentActivity extends AppCompatActivity { mapFragment.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition( - new CameraPosition.Builder() - .target(new LatLng(48.861431, 2.334166)) - .zoom(10) - .build())); + mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2), 3500); } }); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivity.java new file mode 100644 index 0000000000..ddab530106 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapboxMapActivity.java @@ -0,0 +1,112 @@ +package com.mapbox.mapboxsdk.testapp; + +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.design.widget.Snackbar; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.MenuItem; + +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.constants.Style; +import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; +import com.mapbox.mapboxsdk.maps.MapView; + +public class MapboxMapActivity extends AppCompatActivity { + + private MapView mMapView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_mapboxmap); + + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); + } + + mMapView = (MapView) findViewById(R.id.mapView); + mMapView.setAccessToken(ApiAccess.getToken(this)); + mMapView.setStyle(Style.SATELLITE_STREETS); + mMapView.onCreate(savedInstanceState); + + mMapView.getMapAsync(new OnMapReadyCallback() { + @Override + public void onMapReady(@NonNull MapboxMap mapboxMap) { + mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition( + new CameraPosition.Builder() + .target(new LatLng(43.876550, -103.454791)) + .zoom(14) + .build())); + } + }); + + Snackbar.make(findViewById(android.R.id.content), + "Demo MapboxMap API", + Snackbar.LENGTH_INDEFINITE).show(); + } + + @Override + protected void onStart() { + super.onStart(); + mMapView.onStart(); + } + + @Override + public void onResume() { + super.onResume(); + mMapView.onResume(); + } + + @Override + public void onPause() { + super.onPause(); + mMapView.onPause(); + } + + @Override + protected void onStop() { + super.onStop(); + mMapView.onStop(); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + mMapView.onSaveInstanceState(outState); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mMapView.onDestroy(); + } + + @Override + public void onLowMemory() { + super.onLowMemory(); + mMapView.onLowMemory(); + } + + @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/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivity.java index 572c2260c5..956a4c1fca 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/SupportMapFragmentActivity.java @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.testapp; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; @@ -12,9 +11,11 @@ import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.maps.MapFragment; import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.maps.SupportMapFragment; +import com.mapbox.mapboxsdk.testapp.utils.ApiAccess; public class SupportMapFragmentActivity extends AppCompatActivity { @@ -32,28 +33,45 @@ public class SupportMapFragmentActivity extends AppCompatActivity { actionBar.setDisplayShowHomeEnabled(true); } - SupportMapFragment mapFragment; + MapFragment mapFragment; if (savedInstanceState == null) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); -// transaction.add(R.id.fragment_container, mapFragment = SupportMapFragment.newInstance(), "com.mapbox.map"); + android.app.FragmentTransaction transaction = getFragmentManager().beginTransaction(); + + MapboxMapOptions options = new MapboxMapOptions(); + options.accessToken(ApiAccess.getToken(this)); + options.styleUrl(Style.SATELLITE_STREETS); + + options.scrollGesturesEnabled(false); + options.zoomGesturesEnabled(false); + options.tiltGesturesEnabled(false); + options.rotateGesturesEnabled(false); + + options.debugActive(false); + options.compassEnabled(false); + options.attributionEnabled(false); + options.logoEnabled(false); + + options.minZoom(9); + options.maxZoom(11); + options.camera(new CameraPosition.Builder() + .target(new LatLng(48.861431, 2.334166)) + .zoom(9) + .build()); + + mapFragment = MapFragment.newInstance(options); + + transaction.add(R.id.fragment_container, mapFragment, "com.mapbox.map"); transaction.commit(); } else { - mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentByTag("com.mapbox.map"); + mapFragment = (MapFragment) getFragmentManager().findFragmentByTag("com.mapbox.map"); } -// mapFragment.getMapAsync(new OnMapReadyCallback() { -// @Override -// public void onMapReady(@NonNull MapboxMap mapboxMap) { -// mapboxMap.setStyleUrl(Style.SATELLITE_STREETS); -// mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition( -// new CameraPosition.Builder() -// .target(new LatLng(48.861431, 2.334166)) -// .zoom(10) -// .bearing(0) -// .tilt(0) -// .build())); -// } -// }); + mapFragment.getMapAsync(new OnMapReadyCallback() { + @Override + public void onMapReady(@NonNull MapboxMap mapboxMap) { + mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2), 3500); + } + }); } @Override diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java index bfce95b393..b178b24c25 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java @@ -9,16 +9,13 @@ import android.view.MenuItem; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; -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.utils.ApiAccess; -import com.mapbox.mapboxsdk.maps.MapView; public class TiltActivity extends AppCompatActivity { - private final static LatLng WASHINGTON_DC = new LatLng(38.90252, -77.02291); - private MapView mMapView; @Override @@ -35,27 +32,14 @@ public class TiltActivity extends AppCompatActivity { actionBar.setDisplayShowHomeEnabled(true); } - // Set up the map mMapView = (MapView) findViewById(R.id.tiltMapView); mMapView.setAccessToken(ApiAccess.getToken(this)); mMapView.onCreate(savedInstanceState); mMapView.getMapAsync(new OnMapReadyCallback() { @Override public void onMapReady(@NonNull MapboxMap mapboxMap) { - - // Move camera to Washington DC - CameraPosition normalCameraPosition = new CameraPosition.Builder() - .target(WASHINGTON_DC) - .zoom(11) - .build(); - mapboxMap.moveCamera(CameraUpdateFactory.newCameraPosition(normalCameraPosition)); - - // Animate camera tilting - CameraPosition tiltedCameraPosition = new CameraPosition.Builder() - .target(WASHINGTON_DC) - .zoom(11) - .tilt(45.0f) - .build(); + // initial position has been set in R.layout.activity_tilt + CameraPosition tiltedCameraPosition = new CameraPosition.Builder().tilt(45.0f).build(); mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(tiltedCameraPosition), 10000); } }); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_mapboxmap.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_mapboxmap.xml new file mode 100644 index 0000000000..3482fa9dbc --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_mapboxmap.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFF" + android:pathData="M12,11.55C9.64,9.35 6.48,8 3,8v11c3.48,0 6.64,1.35 9,3.55 2.36,-2.19 5.52,-3.55 9,-3.55V8c-3.48,0 -6.64,1.35 -9,3.55zM12,8c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3 1.34,3 3,3z"/> +</vector> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml new file mode 100644 index 0000000000..eccd3ea8eb --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_mapboxmap.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="@color/primary" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> + + <com.mapbox.mapboxsdk.maps.MapView + android:id="@+id/mapView" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:style_url="@string/style_mapbox_streets" + app:center_latitude="38.897705003219784" + app:center_longitude="-77.03655168667463" + app:zoom="15" /> + +</LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml index a82e80353d..eae320c750 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" @@ -14,6 +15,10 @@ <com.mapbox.mapboxsdk.maps.MapView android:id="@+id/tiltMapView" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + app:center_latitude="38.90252" + app:center_longitude="-77.02291" + app:style_url="@string/style_mapbox_streets" + app:zoom="11" /> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml index 6c72333b10..d04996dc95 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -79,6 +79,12 @@ android:title="@string/action_offline" /> <item + android:id="@+id/action_mapboxmap" + android:checkable="false" + android:icon="@drawable/ic_mapboxmap" + android:title="@string/action_mapboxmap" /> + + <item android:id="@+id/action_tilt" android:checkable="false" android:icon="@drawable/ic_tilt" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 0746fb15ff..bd3d6390ee 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ <string name="app_name">Mapbox GL</string> <!-- Test Activities --> + <string name="activity_mapboxmap">MapboxMap</string> <string name="activity_tilt">Map Tilt</string> <string name="activity_infowindow_adapter">InfoWindow Adapter</string> <string name="activity_map_fragment_suport">Support Map Fragment Activity</string> @@ -37,6 +38,7 @@ <string name="action_custom_layer">Custom Layer</string> <string name="action_debug">Cycle map debug options</string> <string name="action_point_annotations">Toggle point annotations</string> + <string name="action_mapboxmap">MapboxMap</string> <string name="action_info_window_adapter">InfoWindow Adapter</string> <string name="action_tilt">Tilt</string> <string name="action_map_fragment">MapFragment</string> |