From d5970f2ef31f35cab3b2e078ab8962b5d356471e Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Tue, 26 Apr 2016 16:24:38 -0500 Subject: [PATCH] [android] #4835 - Adding disable location icon switch to FAB --- .../activity/userlocation/MyLocationToggleActivity.java | 7 ++++++- .../src/main/res/drawable/ic_location_disabled_24dp.xml | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_24dp.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java index fa483b41d..3d15020c8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java @@ -27,6 +27,7 @@ public class MyLocationToggleActivity extends AppCompatActivity { private MapView mapView; private MapboxMap mapboxMap; + private FloatingActionButton locationToggleFAB; private static final int PERMISSIONS_LOCATION = 0; @@ -55,7 +56,7 @@ public class MyLocationToggleActivity extends AppCompatActivity { } }); - FloatingActionButton locationToggleFAB = (FloatingActionButton) findViewById(R.id.fabLocationToggle); + locationToggleFAB = (FloatingActionButton) findViewById(R.id.fabLocationToggle); locationToggleFAB.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -138,7 +139,11 @@ public class MyLocationToggleActivity extends AppCompatActivity { } } }); + locationToggleFAB.setImageResource(R.drawable.ic_location_disabled_24dp); + } else { + locationToggleFAB.setImageResource(R.drawable.ic_my_location_24dp); } + mapboxMap.setMyLocationEnabled(enabled); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_24dp.xml new file mode 100644 index 000000000..4fedff778 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_24dp.xml @@ -0,0 +1,9 @@ + + +