summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2016-04-26 16:24:38 -0500
committerBrad Leege <bleege@gmail.com>2016-04-26 17:07:23 -0500
commitd5970f2ef31f35cab3b2e078ab8962b5d356471e (patch)
tree6f9a860aa3f21d44452455031fdbf0a573b3e1d8
parentfcadb064eba64b581dae2daf660c17edd13efe61 (diff)
downloadqtlocation-mapboxgl-d5970f2ef31f35cab3b2e078ab8962b5d356471e.tar.gz
[android] #4835 - Adding disable location icon switch to FAB
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java7
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_24dp.xml9
2 files changed, 15 insertions, 1 deletions
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 fa483b41dc..3d15020c84 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 0000000000..4fedff778b
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_disabled_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.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06c-1.13,0.12 -2.19,0.46 -3.16,0.97l1.5,1.5C10.16,5.19 11.06,5 12,5c3.87,0 7,3.13 7,7 0,0.94 -0.19,1.84 -0.52,2.65l1.5,1.5c0.5,-0.96 0.84,-2.02 0.97,-3.15L23,13v-2h-2.06zM3,4.27l2.04,2.04C3.97,7.62 3.25,9.23 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c1.77,-0.2 3.38,-0.91 4.69,-1.98L19.73,21 21,19.73 4.27,3 3,4.27zM16.27,17.54C15.09,18.45 13.61,19 12,19c-3.87,0 -7,-3.13 -7,-7 0,-1.61 0.55,-3.09 1.46,-4.27l9.81,9.81z"/>
+</vector>