[android] #3593 - added double map view example

7 files changed, 214 insertions, 6 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index af74d52c2c..3d5862b511 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -66,6 +66,9 @@
         <activity
             android:name=".DirectionsActivity"
             android:label="@string/activity_directions" />
+        <activity
+            android:name=".DoubleMapActivity"
+            android:label="@string/activity_double_map" />
 
         <meta-data
             android:name="com.mapbox.AccessToken"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java
new file mode 100644
index 0000000000..ae22622a19
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/DoubleMapActivity.java
@@ -0,0 +1,147 @@
+package com.mapbox.mapboxsdk.testapp;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.mapbox.mapboxsdk.constants.MyLocationTracking;
+import com.mapbox.mapboxsdk.constants.Style;
+import com.mapbox.mapboxsdk.views.MapView;
+
+public class DoubleMapActivity extends AppCompatActivity {
+
+    private static final String TAG_FRAGMENT = "map";
+    private DoubleMapFragment mMapFragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_map_fragment);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.add(R.id.fragment_container, mMapFragment = new DoubleMapFragment(), TAG_FRAGMENT);
+            transaction.commit();
+        } else {
+            mMapFragment = (DoubleMapFragment) getSupportFragmentManager().findFragmentByTag(TAG_FRAGMENT);
+        }
+    }
+
+    public static class DoubleMapFragment extends Fragment {
+
+        private MapView mMapView;
+        private MapView mMapViewMini;
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.fragment_double_map, container, false);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+
+            // MapView large
+            mMapView = (MapView) view.findViewById(R.id.mapview);
+            mMapView.onCreate(savedInstanceState);
+            mMapView.setStyle(Style.DARK);
+            mMapView.setZoom(18);
+
+            // MapView mini
+            mMapViewMini = (MapView) view.findViewById(R.id.mini_map);
+            mMapViewMini.onCreate(savedInstanceState);
+            mMapViewMini.setStyle(Style.LIGHT);
+            mMapViewMini.setAttributionVisibility(View.GONE);
+            mMapViewMini.setLogoVisibility(View.GONE);
+            mMapViewMini.setCompassEnabled(false);
+            mMapViewMini.setZoom(4);
+            mMapViewMini.setAllGesturesEnabled(false);
+
+            try {
+                mMapView.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
+                mMapViewMini.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
+            }catch (SecurityException e){
+                // permission is handled in MainActivity
+                getActivity().finish();
+            }
+        }
+
+        @Override
+        public void onStart() {
+            super.onStart();
+            mMapView.onStart();
+            mMapViewMini.onStart();
+        }
+
+        @Override
+        public void onResume() {
+            super.onResume();
+            mMapView.onResume();
+            mMapViewMini.onResume();
+        }
+
+        @Override
+        public void onPause() {
+            super.onPause();
+            mMapView.onPause();
+            mMapViewMini.onPause();
+        }
+
+        @Override
+        public void onStop() {
+            super.onStop();
+            mMapView.onStop();
+            mMapViewMini.onStop();
+        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+            mMapView.onDestroy();
+            mMapViewMini.onDestroy();
+        }
+
+        @Override
+        public void onLowMemory() {
+            super.onLowMemory();
+            mMapView.onLowMemory();
+            mMapViewMini.onLowMemory();
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            mMapView.onSaveInstanceState(outState);
+            mMapViewMini.onSaveInstanceState(outState);
+        }
+    }
+
+    @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/MainActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index 63fa396af0..a6920567fe 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
@@ -182,6 +182,8 @@ public class MainActivity extends AppCompatActivity {
         mFpsTextView = (TextView) findViewById(R.id.view_fps);
         mFpsTextView.setText("");
 
+        mMapView.setRotateEnabled(false);
+
         mLocationFAB = (FloatingActionButton) findViewById(R.id.locationFAB);
         mLocationFAB.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -389,8 +391,6 @@ public class MainActivity extends AppCompatActivity {
                                 } else {
                                     startActivity(new Intent(getApplicationContext(), MyLocationTrackingModeActivity.class));
                                 }
-
-
                                 return true;
 
                             case R.id.action_polyline:
@@ -409,6 +409,19 @@ public class MainActivity extends AppCompatActivity {
                                 startActivity(new Intent(getApplicationContext(), DirectionsActivity.class));
                                 return true;
 
+                            case R.id.action_double_mapview:
+                                if ((ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.ACCESS_COARSE_LOCATION)
+                                        != PackageManager.PERMISSION_GRANTED) ||
+                                        (ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.ACCESS_FINE_LOCATION)
+                                                != PackageManager.PERMISSION_GRANTED)) {
+                                    ActivityCompat.requestPermissions(MainActivity.this,
+                                            new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION},
+                                            PERMISSIONS_TRACKING_MODE_ACTIVITY);
+                                } else {
+                                    startActivity(new Intent(getApplicationContext(), DoubleMapActivity.class));
+                                }
+                                return true;
+
                             default:
                                 return changeMapStyle(menuItem.getItemId());
                         }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_dns_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_dns_24dp.xml
new file mode 100644
index 0000000000..5b7b1bce6a
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_dns_24dp.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="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
new file mode 100644
index 0000000000..0695fafd12
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <com.mapbox.mapboxsdk.views.MapView
+        android:id="@+id/mapview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        mapbox:access_token="@string/access_token" />
+
+    <FrameLayout
+        android:id="@+id/map_card"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_marginTop="5dp">
+
+        <com.mapbox.mapboxsdk.views.MapView
+            android:id="@+id/mini_map"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            mapbox:access_token="@string/access_token" />
+    </FrameLayout>
+</RelativeLayout>
\ No newline at end of file
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 ad9deba187..54be851629 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -78,10 +78,11 @@
                 android:icon="@drawable/ic_tilt"
                 android:title="@string/action_tilt" />
 
-            <item android:id="@+id/action_camera"
-                  android:checkable="false"
-                  android:icon="@drawable/ic_transform_24dp"
-                  android:title="@string/action_camera"/>
+            <item
+                android:id="@+id/action_camera"
+                android:checkable="false"
+                android:icon="@drawable/ic_transform_24dp"
+                android:title="@string/action_camera" />
 
             <item
                 android:id="@+id/action_map_fragment"
@@ -155,6 +156,12 @@
                 android:icon="@drawable/ic_directions"
                 android:title="@string/activity_directions" />
 
+            <item
+                android:id="@+id/action_double_mapview"
+                android:checkable="false"
+                android:icon="@drawable/ic_dns_24dp"
+                android:title="@string/action_double_mapview" />
+
         </menu>
     </item>
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index c096284fd8..6b30fa7ac3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="activity_animate_coordinate_change">Animate Coordinate Change</string>
     <string name="activity_custom_layer">Custom Layer</string>
     <string name="activity_directions">Directions Activity</string>
+    <string name="activity_double_map">Double Map Activity</string>
 
     <string name="navdrawer_menu_title_mainactivity_controls">Main Activity Controls</string>
     <string name="navdrawer_menu_title_mainactivity_styles">Main Activity Styles</string>
@@ -43,6 +44,7 @@
     <string name="action_visible_bounds">Set Visible Bounds</string>
     <string name="action_visible_bounds_explanation">Center map around 2 markers</string>
     <string name="action_remove_polylines">Remove polylines</string>
+    <string name="action_double_mapview">Double MapView</string>
 
     <string name="button_camera_move">Move</string>
     <string name="button_camera_ease">Ease</string>