diff options
author | Brad Leege <bleege@gmail.com> | 2015-08-11 16:16:13 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-08-11 16:16:13 -0500 |
commit | c1d796bbc173ee64aecd4816a1099fe449ec8ad9 (patch) | |
tree | dab56b80993847ce8c2dbe347fbee61b8a6b8c41 /android | |
parent | 7563e11eee56cd68afcb0aef41c9be28068d805c (diff) | |
download | qtlocation-mapboxgl-c1d796bbc173ee64aecd4816a1099fe449ec8ad9.tar.gz |
#1856 - Added CoordinatorLayout back in to support Snackbar widget
Diffstat (limited to 'android')
-rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java | 2 | ||||
-rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml | 55 |
2 files changed, 32 insertions, 25 deletions
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java index 3d058b2d3a..79b366d420 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.NavigationView; +import android.support.design.widget.Snackbar; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; @@ -150,6 +151,7 @@ public class MainActivity extends AppCompatActivity { // Toggle GPS position updates toggleGps(!mapView.isMyLocationEnabled()); updateMap(); +// Snackbar.make(v, "Snack time!", Snackbar.LENGTH_LONG).show(); } }); diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml index efd063be2f..305f15afee 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml @@ -20,37 +20,42 @@ android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> - <FrameLayout - android:id="@+id/content_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_below="@+id/toolbar"> - - <com.mapbox.mapboxgl.views.MapView - android:id="@+id/mainMapView" + <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:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.mapbox.mapboxgl.views.MapView + android:id="@+id/mainMapView" + android:layout_width="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_white_24dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/fab_margin" - /> + <android.support.design.widget.FloatingActionButton + android:id="@+id/locationFAB" + android:src="@drawable/ic_my_location_white_24dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_margin="@dimen/fab_margin" + /> + </android.support.design.widget.CoordinatorLayout> - </FrameLayout> + </FrameLayout> </RelativeLayout> |