diff options
| author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-08-07 10:11:13 +0200 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2017-08-10 13:27:17 +0200 |
| commit | 1300e89c0b431951f27dc14fcdf3c57ea15735bb (patch) | |
| tree | cfa329f4f21c92a15ada7e56a136bc425be8753d /platform/android/MapboxGLAndroidSDKTestApp/src/main/res | |
| parent | 688431c663161b992bbf2af24477dfdfc4b9bb64 (diff) | |
| download | qtlocation-mapboxgl-1300e89c0b431951f27dc14fcdf3c57ea15735bb.tar.gz | |
[android] - expose setStyleJson and getStyleJson
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res')
3 files changed, 45 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml index b133f3d9a5..83150be4bf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml @@ -15,7 +15,18 @@ app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> <android.support.design.widget.FloatingActionButton - android:id="@id/fab" + android:id="@+id/fab_style_json" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_above="@+id/fab_file" + android:layout_margin="@dimen/fab_margin" + android:src="@drawable/ic_add" + app:backgroundTint="@android:color/white"/> + + <android.support.design.widget.FloatingActionButton + android:id="@id/fab_file" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json new file mode 100644 index 0000000000..f2cd969be4 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/sat_style.json @@ -0,0 +1,31 @@ +{ + "version": 8, + "name": "Satellite", + "metadata": { + "mapbox:autocomposite": true + }, + "sources": { + "mapbox": { + "type": "raster", + "url": "mapbox://mapbox.satellite", + "tileSize": 256 + } + }, + "sprite": "mapbox://sprites/mapbox/satellite-v8", + "glyphs": "mapbox://fonts/mapbox/{fontstack}/{range}.pbf", + "layers": [ + { + "id": "background", + "type": "background", + "paint": { + "background-color": "rgb(4,7,14)" + } + }, + { + "id": "satellite", + "type": "raster", + "source": "mapbox", + "source-layer": "mapbox_satellite_full" + } + ] +}
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 2e5d2ef0b6..4774fa8d8f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -187,8 +187,8 @@ <string name="dynamic_marker_chelsea_snippet">Stamford Bridge</string> <string name="dynamic_marker_arsenal_title">Arsenal</string> <string name="dynamic_marker_arsenal_snippet">Emirates Stadium</string> - <string name="debug_zoom">Zoom: %f</string> - <string name="viewcache_size">"ViewCache size %d"</string> + <string name="debug_zoom">Zoom: %.2f</string> + <string name="viewcache_size">ViewCache size %.2f</string> <string name="latitude">Latitude</string> <string name="min_value">-180</string> <string name="longitude">Longitude</string> |