#1856 - Enabling and setting clickable state for features in Navigation Drawer menu

3 files changed, 12 insertions, 6 deletions

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index 33a0682b68..60c57593c1 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -7,10 +7,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.hardware.GeomagneticField;
@@ -24,7 +22,6 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.ScaleGestureDetectorCompat;
 import android.text.TextUtils;
@@ -40,7 +37,6 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ZoomButtonsController;
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 5ef019110f..dbdf83ae94 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
@@ -7,7 +7,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
@@ -163,6 +162,11 @@ public class MainActivity extends AppCompatActivity {
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
 */
 
+        // Set default UI state
+        navigationView.getMenu().findItem(R.id.action_compass).setChecked(mapView.isCompassEnabled());
+        navigationView.getMenu().findItem(R.id.action_debug).setChecked(mapView.isDebugActive());
+        navigationView.getMenu().findItem(R.id.action_markers).setChecked(mIsAnnotationsOn);
+
         if (savedInstanceState != null) {
             mapView.setMyLocationEnabled(savedInstanceState.getBoolean(STATE_IS_GPS_ON, false));
         }
@@ -250,7 +254,6 @@ public class MainActivity extends AppCompatActivity {
                 new NavigationView.OnNavigationItemSelectedListener() {
                     @Override
                     public boolean onNavigationItemSelected(MenuItem menuItem) {
-                        menuItem.setChecked(true);
                         mDrawerLayout.closeDrawers();
 
                         // Respond To Selection
@@ -260,6 +263,8 @@ public class MainActivity extends AppCompatActivity {
                                 // Toggle debug mode
                                 mapView.toggleDebug();
 
+                                menuItem.setChecked(mapView.isDebugActive());
+
                                 // Show the FPS counter
                                 if (mapView.isDebugActive()) {
                                     mFpsTextView.setVisibility(View.VISIBLE);
@@ -272,11 +277,13 @@ public class MainActivity extends AppCompatActivity {
                             case R.id.action_markers:
                                 // Toggle markers
                                 toggleAnnotations(!mIsAnnotationsOn);
+                                menuItem.setChecked(mIsAnnotationsOn);
                                 break;
 
                             case R.id.action_compass:
                                 // Toggle compass
                                 mapView.setCompassEnabled(!mapView.isCompassEnabled());
+                                menuItem.setChecked(mapView.isCompassEnabled());
                                 break;
 
 /*
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 7cfc47f901..7244fa09bb 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -5,15 +5,18 @@
         android:id="@+id/action_debug"
         android:icon="@drawable/ic_action_about"
         android:title="@string/action_debug"
+        android:checkable="true"
         />
     <item
         android:id="@+id/action_markers"
         android:icon="@android:drawable/ic_menu_myplaces"
         android:title="@string/action_point_annotations"
+        android:checkable="true"
         />
     <item android:id="@+id/action_compass"
           android:icon="@drawable/ic_explore_white_24dp"
           android:title="@string/action_compass"
+          android:checkable="true"
           />
 
 <!--