diff options
author | Tobrun <tobrun@mapbox.com> | 2016-05-19 14:40:23 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2016-05-20 12:03:27 +0200 |
commit | e69aef83430c42e3f5be0f01aea1433627b8cc7c (patch) | |
tree | 1dee6860efb5e619eecc68c871a423e1d12cf560 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout | |
parent | c3aeb9facc0a0fd193d118fe25bf300c7d7931b7 (diff) | |
download | qtlocation-mapboxgl-e69aef83430c42e3f5be0f01aea1433627b8cc7c.tar.gz |
[android] #3276 - add tilt support for view markers
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml | 3 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml | 58 |
2 files changed, 22 insertions, 39 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index 42179aa03d..90cb1a90b3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -45,7 +45,6 @@ android:layout_alignParentRight="true" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" - android:src="@drawable/ic_animate_coordinates" - app:backgroundTint="@android:color/white" /> + android:src="@drawable/ic_animate_coordinates" /> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml index b15b5becd2..5d285958f1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml @@ -1,48 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="@color/primary" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> - </android.support.v7.widget.Toolbar> - - <FrameLayout - android:id="@id/container" + <com.mapbox.mapboxsdk.maps.MapView + android:id="@id/mapView" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.design.widget.CoordinatorLayout - android:id="@+id/coordinator_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.mapbox.mapboxsdk.maps.MapView - android:id="@id/mapView" - android:layout_width="match_parent" - app:access_token="@string/mapbox_access_token" - app:style_url="@string/style_light" - app:zoom="1" - android:layout_height="match_parent" /> - - <android.support.design.widget.FloatingActionButton - android:id="@id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/fab_margin" - android:src="@drawable/ic_layers_24dp" - app:backgroundTint="@color/primary" /> - - </android.support.design.widget.CoordinatorLayout> - - </FrameLayout> - -</LinearLayout> + android:layout_height="match_parent" + android:layout_below="@id/toolbar" + app:center_latitude="38.907192" + app:center_longitude="-77.036871" + app:style_url="@string/style_mapbox_streets" + app:zoom="12" /> + + <TextView + android:id="@+id/countView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/toolbar" + android:padding="16dp" + android:textSize="20sp" /> + +</RelativeLayout> |