summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout
diff options
context:
space:
mode:
authorCameron Mace <cameron@mapbox.com>2016-12-14 12:51:04 -0500
committerGitHub <noreply@github.com>2016-12-14 12:51:04 -0500
commit3d5983f6f666bb75574a1b9040323fa401e01388 (patch)
tree5811a6260e3c4b155dc25a301bfbbb752b56db21 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout
parent8f24119bd0eb8e5e03f9d8c4422c5bcb3baeafce (diff)
downloadqtlocation-mapboxgl-3d5983f6f666bb75574a1b9040323fa401e01388.tar.gz
Allows for setting the user location icon to transparent (#7393)
* allows for setting the user location icon to transparent * removed color check
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml43
1 files changed, 32 insertions, 11 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml
index af755c72a1..d41cc79326 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_dot_color.xml
@@ -1,50 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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"
+ xmlns:mapbox="http://schemas.android.com/tools"
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"/>
<com.mapbox.mapboxsdk.maps.MapView
android:id="@id/mapView"
- android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent"
+ android:layout_below="@+id/toolbar"
+ mapbox:mapbox_uiAttribution="false"
+ mapbox:mapbox_uiLogo="false"/>
<LinearLayout
+ style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:background="@color/accent"
android:orientation="horizontal"
- android:weightSum="3">
+ android:weightSum="4">
<Button
android:id="@+id/default_user_dot_coloring_button"
+ style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/button_user_dot_default" />
+ android:text="@string/button_user_dot_default"
+ android:textColor="@color/white"/>
<Button
android:id="@+id/tint_user_dot_button"
+ style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/button_user_dot_tint" />
+ android:text="@string/button_user_dot_tint"
+ android:textColor="@color/white"/>
<Button
android:id="@+id/user_accuracy_ring_tint_button"
+ style="?android:attr/buttonBarButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/button_user_accuracy_ring_tint"
+ android:textColor="@color/white"/>
+
+ <Button
+ android:id="@+id/user_dot_transparent_button"
+ style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="@string/button_user_accuracy_ring_tint" />
+ android:text="@string/button_user_transparent_tint"
+ android:textColor="@color/white"/>
- </LinearLayout>
+ </LinearLayout>
</RelativeLayout> \ No newline at end of file