diff options
Diffstat (limited to 'android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml')
| -rw-r--r-- | android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index d788a2fc63..24f83d36e2 100644 --- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout - android:id="@+id/drawer_layout" - xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> @@ -17,47 +16,45 @@ 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" /> - <FrameLayout - android:id="@+id/content_frame" + <FrameLayout + android:id="@+id/content_frame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@+id/toolbar"> + + <android.support.design.widget.CoordinatorLayout + android:id="@+id/coordinator_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/toolbar"> + android:layout_height="match_parent"> - <android.support.design.widget.CoordinatorLayout - android:id="@+id/coordinator_layout" + <com.mapbox.mapboxsdk.views.MapView + android:id="@+id/mainMapView" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.mapbox.mapboxsdk.views.MapView - android:id="@+id/mainMapView" - android:layout_width="match_parent" - android:layout_height="match_parent" - /> + android:layout_height="match_parent" /> - <TextView - android:id="@+id/view_fps" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="10dp" - android:text="@string/label_fps" - android:textAppearance="?android:attr/textAppearanceLarge"/> + <TextView + android:id="@+id/view_fps" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:text="@string/label_fps" + android:textAppearance="?android:attr/textAppearanceLarge" /> - <android.support.design.widget.FloatingActionButton - android:id="@+id/locationFAB" - android:src="@drawable/ic_my_location_black_24dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/fab_margin" - app:backgroundTint="@color/white" - /> + <android.support.design.widget.FloatingActionButton + android:id="@+id/locationFAB" + 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_gps_fixed_24dp" + app:backgroundTint="@color/white" /> - </android.support.design.widget.CoordinatorLayout> + </android.support.design.widget.CoordinatorLayout> - </FrameLayout> + </FrameLayout> </RelativeLayout> @@ -67,6 +64,6 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - app:menu="@menu/menu_drawer"/> + app:menu="@menu/menu_drawer" /> </android.support.v4.widget.DrawerLayout> |