diff options
author | Brad Leege <bleege@gmail.com> | 2015-08-07 14:31:01 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-08-07 14:31:01 -0500 |
commit | 440ae9df9da2d42c056bb0aa69d80b7ff7a90d9b (patch) | |
tree | 0ba52bc09b99cd1d1694ce93f1c8b4a8a3579506 /android | |
parent | d3ba9e23ea3ac396315540fd0f300ea2c453aae4 (diff) | |
download | qtlocation-mapboxgl-440ae9df9da2d42c056bb0aa69d80b7ff7a90d9b.tar.gz |
#1856 - Setting up Navigation Drawer
Diffstat (limited to 'android')
4 files changed, 38 insertions, 11 deletions
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 2005005ce9..646285ceb1 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 @@ -3,6 +3,8 @@ package com.mapbox.mapboxgl.testapp; import android.graphics.Color; import android.graphics.PointF; import android.os.Bundle; +import android.support.design.widget.NavigationView; +import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -92,6 +94,11 @@ public class MainActivity extends AppCompatActivity { mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); + NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + if (navigationView != null) { + setupDrawerContent(navigationView); + } + mapView = (MapView) findViewById(R.id.mainMapView); // Load the access token try { @@ -241,6 +248,10 @@ public class MainActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case android.R.id.home: + mDrawerLayout.openDrawer(GravityCompat.START); + return true; + case R.id.action_gps: // Toggle GPS position updates toggleGps(!mapView.isMyLocationEnabled()); @@ -275,6 +286,18 @@ public class MainActivity extends AppCompatActivity { } } + private void setupDrawerContent(NavigationView navigationView) { + navigationView.setNavigationItemSelectedListener( + new NavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(MenuItem menuItem) { + menuItem.setChecked(true); + mDrawerLayout.closeDrawers(); + return true; + } + }); + } + /** * Enabled / Disable GPS location updates along with updating the UI * @param enableGps true if GPS is to be enabled, false if GPS is to be disabled diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index 2a8c99f5f7..bd593ad37b 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -4,7 +4,6 @@ android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:mapbox="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> @@ -86,7 +85,6 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - tools:headerLayout="@layout/nav_header" - tools:menu="@menu/drawer_view"/> + mapbox:menu="@menu/menu_drawer"/> </android.support.v4.widget.DrawerLayout> diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml new file mode 100644 index 0000000000..03ab056515 --- /dev/null +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/action_debug" + android:icon="@drawable/ic_action_about" + android:title="@string/action_debug" + /> + <item + android:id="@+id/action_markers" + android:icon="@android:drawable/ic_menu_myplaces" + android:title="@string/action_point_annotations" + /> + +</menu> diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml index b682fe0cb4..8981b7a95a 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <item android:id="@+id/action_debug" - android:icon="@drawable/ic_action_about" - android:title="@string/action_debug" - app:showAsAction="ifRoom" /> - <item android:id="@+id/action_markers" - android:icon="@android:drawable/ic_menu_myplaces" - android:title="@string/action_point_annotations" - app:showAsAction="ifRoom" /> <item android:id="@+id/action_gps" android:icon="@drawable/ic_action_location_searching" android:title="@string/action_gps" |