From 0ad05e38943f455a4b635430ef0269a1f3ac7c35 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 15 Sep 2015 14:07:24 -0400 Subject: [PATCH] #2018 - Adding basic second activity that displays a map --- .../src/main/AndroidManifest.xml | 1 + .../mapbox/mapboxgl/testapp/MainActivity.java | 5 ++ .../mapboxgl/testapp/SecondMapActivity.java | 83 ++++++++++++++++++ .../drawable-hdpi/ic_looks_two_white_24dp.png | Bin 0 -> 237 bytes .../drawable-mdpi/ic_looks_two_white_24dp.png | Bin 0 -> 155 bytes .../ic_looks_two_white_24dp.png | Bin 0 -> 228 bytes .../ic_looks_two_white_24dp.png | Bin 0 -> 315 bytes .../ic_looks_two_white_24dp.png | Bin 0 -> 408 bytes .../src/main/res/layout/activity_second.xml | 13 +++ .../src/main/res/menu/menu_drawer.xml | 28 +++--- .../src/main/res/values/strings.xml | 1 + 11 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_looks_two_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_looks_two_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_looks_two_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_looks_two_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_looks_two_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_second.xml diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index 85be72bb70e..8e2041a129c 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -17,6 +17,7 @@ + diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index ed9b7ef066e..eb5d891cd5a 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxgl.testapp; import android.Manifest; +import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.PointF; @@ -281,6 +282,10 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { menuItem.setChecked(mMapView.isCompassEnabled()); return true; + case R.id.action_second_map_activity: + startActivity(new Intent(getApplicationContext(), SecondMapActivity.class)); + return true; + /* case R.id.followNone: mMapView.setUserLocationTrackingMode(MapView.UserLocationTrackingMode.NONE); diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java new file mode 100644 index 00000000000..71e2b8a8842 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/SecondMapActivity.java @@ -0,0 +1,83 @@ +package com.mapbox.mapboxgl.testapp; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import com.mapbox.mapboxgl.views.MapView; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +public class SecondMapActivity extends AppCompatActivity { + + private static final String TAG = "SecondMapActivity"; + + private MapView mMapView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_second); + + mMapView = (MapView) findViewById(R.id.secondMapView); + // Load the access token + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.token))); + String line = reader.readLine(); + mMapView.setAccessToken(line); + } catch (IOException e) { + Log.e(TAG, "Error loading access token from token.txt: " + e.toString()); + } + + mMapView.onCreate(savedInstanceState); + + mMapView.setStyleUrl(getString(R.string.styleURLMapboxStreets)); + } + + /** + * Dispatch onStart() to all fragments. Ensure any created loaders are + * now started. + */ + @Override + protected void onStart() { + super.onStart(); + mMapView.onStart(); + } + + @Override + protected void onStop() { + super.onStop(); + mMapView.onStop(); + } + + // Called when our app goes into the background + @Override + public void onPause() { + super.onPause(); + + mMapView.onPause(); + } + + // Called when our app comes into the foreground + @Override + public void onResume() { + super.onResume(); + + mMapView.onResume(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + mMapView.onDestroy(); + } + + // Called when the system is running low on memory + @Override + public void onLowMemory() { + super.onLowMemory(); + + mMapView.onLowMemory(); + } +} diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_looks_two_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_looks_two_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9cf5b3a919b777acd93dc92e623879da06652e GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8Lp7Ec$)5Rc<;r(WbetiaD zkrY>j*-a5FkDMJ7A5T2ov|dC+^x-r|PY0KZt=pG%bQo;6H=BO%*ZBpaa_jbP6}4Jb zdD`Lpibr}|?+Xe#HXfYuF;nJ*kT4(H%Ciw|aq%twY^^B|xudPCo&EMs+pp7CGQXkb lP3qeS!JA@M-8;9emM=YH=g1{rxfn zpsFp`@y+CtIe37>Ij1@W$<+Mb6Mw<&;$VF CE;d;J literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_looks_two_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_looks_two_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c9fc6633e8a2fc4d1dd5401b88fbc93416accfdb GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D)t)YnAr*{oulsT}8;H0*?74mE zlJAr^u2FYZ+E)t}3cFtU`O@UeM9;m2m&)JS$h!#e&a>+GIDKe+?iUxQT@JfWoVk~l zB$p9*O+GMYgFDK^F*;jh}smaTaVi(Rg b)-%|hEYkd4_C)*|(Af;0u6{1-oD!MTBj literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_looks_two_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_looks_two_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f8ab38aa6a228f51fc5c08c8066eb0064643ed04 GIT binary patch literal 315 zcmV-B0mS}^P)Onpm>AAn64g|-30S)^6xC(=iLv#MG^v& zoRo9Uk?B}-Vv2fpEGeX+C5AR*&(s~6si4fBhz?{8)DhJ}1FeZ_tAS2LRW(px1{q|K zc+h2qC*JvO19aIv-)(^s5AJEGcX zpe0dt8mMq2qEE7Z#d!$e+>%sKqOf2~Wr`{rIxl8;uuoF`1Y247L%hy+sE_A z?AZ;EDCx*4w9Gl`)OpYCsIHCo1Q~}TP8XYB+Gh16nvcvM*52d((VRG?)c5b4 zATQ0OBF=zi1wwab>w=6dn5wcV`bGDG&BEnbW~AA@}b`87UX zF_J4d7JR(o0Iz@OM}~Aub`FIG1}2V#{cFw&3zz+5nzdD;_^kMaH@(^S7?LMhFF2}~ z-|%sw^#jXthvV`JpP2sygOmgHL?8Q-`TVDASz-%o?gPPshoanf&L}5{d@Qbd&%fbl zlR0aBgQ3`ta;^S`x(5$u1~oc695`y3aLjK0ajlC_`2`#p7+C}qlE6kW?O=T|zY53) z3Vy2p__bv@-^T{gd9#i)b7k!b`7Fe5;I(JVfgpxhvx*m!{kRq=PPt;UX%?%j4)29E v2`4AMVibSgSXun-GUGpWsN;Z)=e5iS^S8+R@*dw03~>feS3j3^P6 + + + + + diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml index a374ab18d4c..44117426a72 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -19,18 +19,24 @@ android:checkable="true" /> - + diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 403da277c04..765f4d1962f 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -10,6 +10,7 @@ Toggle compass Toggle debug mode Toggle point annotations + Launch 2nd Map FPS: