diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res')
36 files changed, 197 insertions, 157 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml deleted file mode 100644 index cf8bfa24b5..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_check_box.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/> -</vector> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/marker.xml deleted file mode 100644 index 71992ebd7f..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/marker.xml +++ /dev/null @@ -1,4 +0,0 @@ -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <size android:width="10px" android:height="10px"/> - <solid android:color="@color/redAccent"/> -</shape>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml index ac1f08e821..cfc923902c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml @@ -14,16 +14,4 @@ app:mapbox_cameraZoom="3" app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> -<android.support.design.widget.FloatingActionButton - android:id="@+id/fabStartStop" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_marginBottom="@dimen/fab_margin" - android:layout_marginRight="@dimen/fab_margin" - android:src="@android:drawable/ic_media_play" - app:backgroundTint="@color/primary"/> - </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml index fa37c485d7..c8752df1bf 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout 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"> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <com.mapbox.mapboxsdk.maps.MapView android:id="@id/mapView" @@ -20,8 +18,8 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_marginBottom="82dp" - android:layout_marginRight="@dimen/fab_margin" android:layout_marginEnd="@dimen/fab_margin" + android:layout_marginRight="@dimen/fab_margin" android:src="@drawable/ic_my_location" app:backgroundTint="@color/accent" app:layout_anchorGravity="top"/> @@ -35,4 +33,4 @@ android:src="@drawable/ic_paint" app:backgroundTint="@color/primary"/> -</FrameLayout> +</merge> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml index b70bb6d7b2..0cb065a676 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml @@ -15,7 +15,9 @@ app:mapbox_cameraZoom="15"/> <LinearLayout + style="?android:attr/buttonBarStyle" android:layout_width="match_parent" + android:background="@color/primary" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:orientation="horizontal" @@ -23,6 +25,7 @@ <Button android:id="@+id/cameraMoveButton" + style="?android:attr/buttonBarButtonStyle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -30,6 +33,7 @@ <Button android:id="@+id/cameraEaseButton" + style="?android:attr/buttonBarButtonStyle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -37,6 +41,7 @@ <Button android:id="@+id/cameraAnimateButton" + style="?android:attr/buttonBarButtonStyle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml index 6e8a4e5eb2..5ac55e75e2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml @@ -23,6 +23,7 @@ android:layout_alignParentRight="true" android:layout_marginBottom="@dimen/fab_margin" android:layout_marginRight="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" android:src="@drawable/ic_directions_bus_black" app:backgroundTint="@android:color/white"/> @@ -36,6 +37,7 @@ android:layout_marginBottom="@dimen/fab_margin" android:layout_marginRight="@dimen/fab_margin" android:src="@drawable/ic_layers" + android:layout_marginEnd="@dimen/fab_margin" app:backgroundTint="@color/primary"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml index 6db8b073d9..56fe909c45 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_debug_mode.xml @@ -21,6 +21,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|start" android:layout_margin="8dp" + android:textIsSelectable="true" android:textSize="14sp"/> <android.support.design.widget.FloatingActionButton @@ -29,6 +30,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_marginBottom="82dp" + android:layout_marginEnd="@dimen/fab_margin" android:layout_marginRight="@dimen/fab_margin" android:src="@drawable/ic_refresh" app:backgroundTint="@color/accent" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml index 3fd66977e2..0a12fd9e50 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_in_dialog.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> <Button android:id="@+id/button_open_dialog" @@ -11,4 +8,4 @@ android:layout_gravity="center" android:text="@string/button_open_dialog"/> -</FrameLayout> +</merge> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml index a0de31ee48..cd4aa4bdef 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> <com.mapbox.mapboxsdk.maps.MapView android:id="@id/mapView" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent"/> <View android:layout_width="@dimen/map_padding_left" android:layout_height="match_parent" android:alpha="0.5" - android:background="@color/mapbox_blue" /> + android:background="@color/mapbox_blue"/> <View android:layout_width="match_parent" @@ -24,13 +21,13 @@ android:layout_marginRight="@dimen/map_padding_right" android:layout_marginStart="@dimen/map_padding_left" android:alpha="0.5" - android:background="@color/mapbox_blue" /> + android:background="@color/mapbox_blue"/> <View android:layout_width="@dimen/map_padding_right" android:layout_height="match_parent" android:layout_gravity="end" android:alpha="0.5" - android:background="@color/mapbox_blue" /> + android:background="@color/mapbox_blue"/> -</FrameLayout> +</merge> 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 ff28d2edf0..357d50132b 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 @@ -17,6 +17,7 @@ <TextView android:id="@+id/countView" + android:textIsSelectable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/toolbar" 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 cf4b51bbe0..abc51698aa 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 @@ -10,16 +10,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" + android:textIsSelectable="true" app:mapbox_cameraTargetLat="38.907192" app:mapbox_cameraTargetLng="-77.036871" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" - app:mapbox_cameraZoom="12" /> + app:mapbox_cameraZoom="12" + app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> <TextView android:id="@+id/countView" + android:textIsSelectable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="16dp" - android:textSize="20sp" /> + android:textSize="20sp"/> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml index 084675fb2c..1eb999caf5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_metadata_update.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:text="No Results" + android:text="@string/no_results" android:textSize="24sp"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml index 599ae3fa1c..193ae55e59 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml @@ -2,13 +2,13 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:mapbox="http://schemas.android.com/tools" - android:id="@+id/map_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + mapbox:ignore="NestedWeights"> <LinearLayout - android:id="@+id/map_container1" + android:baselineAligned="false" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" @@ -40,7 +40,7 @@ </LinearLayout> <LinearLayout - android:id="@+id/map_container2" + android:baselineAligned="false" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml index d65d5796f1..addfe8427b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_customization.xml @@ -1,22 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <FrameLayout + <android.support.v4.widget.ContentLoadingProgressBar android:id="@id/progress" - android:layout_width="match_parent" - android:layout_height="match_parent"> + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> - <android.support.v4.widget.ContentLoadingProgressBar - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"/> - - </FrameLayout> - -</LinearLayout> +</merge> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml index d4b64b1ea2..3e21015e96 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline.xml @@ -18,27 +18,30 @@ android:layout_height="match_parent" android:layout_below="@+id/progress_bar"/> - <Button - android:id="@+id/button_download_region" - android:layout_width="wrap_content" + <LinearLayout + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_margin="@dimen/fab_margin" - android:background="@color/white" - android:padding="10dp" - android:text="@string/button_download_region"/> + android:background="@color/primary" + android:orientation="horizontal" + android:weightSum="2"> - <Button - android:id="@+id/button_list_regions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/button_download_region" - android:layout_alignParentRight="true" - android:layout_marginRight="@dimen/fab_margin" - android:background="@color/white" - android:padding="10dp" - android:text="@string/button_list_regions"/> + <Button + android:id="@+id/button_download_region" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/button_download_region"/> + + <Button + android:id="@+id/button_list_regions" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/button_list_regions"/> + </LinearLayout> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml index 084675fb2c..1eb999caf5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_offline_region_delete.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:text="No Results" + android:text="@string/no_results" android:textSize="24sp"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index bc24533960..cfbd07ce39 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.v7.widget.Toolbar @@ -22,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:paddingBottom="8dp" - android:text="Move the map by x/y pixels" + android:text="@string/action_scroll_by" android:textColor="#FFFFFF" android:textSize="20sp" /> @@ -32,7 +33,8 @@ android:layout_height="wrap_content" android:layout_alignBottom="@+id/seekbar_move_x" android:layout_below="@id/title" - android:text="X: 0000" /> + android:text="X: 0000" + tools:ignore="HardcodedText"/> <SeekBar android:id="@id/seekbar_move_x" @@ -40,6 +42,7 @@ android:layout_height="wrap_content" android:layout_below="@id/title" android:layout_marginLeft="56dp" + android:layout_marginStart="56dp" android:max="50" android:progress="0" /> @@ -48,7 +51,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignBottom="@+id/seekbar_move_y" - android:text="Y: 0000" /> + android:text="Y: 0000" + tools:ignore="HardcodedText"/> <SeekBar android:id="@id/seekbar_move_y" @@ -58,6 +62,7 @@ android:layout_marginBottom="8dp" android:layout_marginLeft="56dp" android:layout_marginTop="16dp" + android:layout_marginStart="56dp" android:max="50" android:progress="0" /> @@ -66,7 +71,6 @@ </android.support.v7.widget.Toolbar> <FrameLayout - android:id="@+id/content_frame" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/toolbar"> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml index 6b99711e84..53345571b4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_snapshot.xml @@ -16,6 +16,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" + android:contentDescription="@null" android:background="@color/primary"/> <com.mapbox.mapboxsdk.maps.MapView diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml index 3b96277d23..3edaff6985 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_viewpager.xml @@ -10,7 +10,6 @@ android:layout_height="match_parent"> <android.support.v4.view.PagerTabStrip - android:id="@+id/viewpager_header" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml index 1c9fbbd482..a7f422f9ce 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/dialog_camera_position.xml @@ -16,7 +16,7 @@ android:layout_marginEnd="4dp" android:layout_marginRight="4dp" android:gravity="center" - android:text="Latitude" + android:text="@string/latitude" android:textColor="@android:color/white" /> <SeekBar @@ -25,7 +25,9 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toStartOf="@+id/value_lat" android:layout_toLeftOf="@+id/value_lat" + android:layout_toEndOf="@+id/text_lat" android:layout_toRightOf="@id/text_lat" android:max="360" /> @@ -38,7 +40,7 @@ android:layout_marginLeft="4dp" android:layout_marginStart="4dp" android:gravity="center" - android:text="-180" + android:text="@string/min_value" android:textColor="@android:color/white" /> </RelativeLayout> @@ -56,7 +58,7 @@ android:textColor="@android:color/white" android:layout_marginRight="4dp" android:gravity="center" - android:text="Longitude" /> + android:text="@string/longitude" /> <SeekBar android:id="@+id/seekbar_lon" @@ -64,8 +66,10 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toStartOf="@+id/value_lon" android:layout_toLeftOf="@+id/value_lon" android:layout_toRightOf="@id/text_lon" + android:layout_toEndOf="@id/text_lon" android:max="360" /> <TextView @@ -78,7 +82,7 @@ android:layout_marginLeft="4dp" android:layout_marginStart="4dp" android:gravity="center" - android:text="-180" /> + android:text="@string/min_value" /> </RelativeLayout> @@ -95,7 +99,7 @@ android:textColor="@android:color/white" android:layout_marginRight="4dp" android:gravity="center" - android:text="Zoom" /> + android:text="@string/zoom" /> <SeekBar android:id="@+id/seekbar_zoom" @@ -103,8 +107,10 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toStartOf="@+id/value_zoom" android:layout_toLeftOf="@+id/value_zoom" android:layout_toRightOf="@id/text_zoom" + android:layout_toEndOf="@+id/text_zoom" android:max="18" /> <TextView @@ -117,7 +123,7 @@ android:textColor="@android:color/white" android:layout_marginStart="4dp" android:gravity="center" - android:text="18" /> + android:text="@string/default_zoom_value" /> </RelativeLayout> @@ -134,7 +140,7 @@ android:layout_marginEnd="4dp" android:layout_marginRight="4dp" android:gravity="center" - android:text="Bearing" /> + android:text="@string/bearing" /> <SeekBar android:id="@+id/seekbar_bearing" @@ -142,8 +148,10 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toStartOf="@+id/value_bearing" android:layout_toLeftOf="@+id/value_bearing" android:layout_toRightOf="@id/text_bearing" + android:layout_toEndOf="@id/text_bearing" android:max="360" /> <TextView @@ -156,7 +164,7 @@ android:layout_marginLeft="4dp" android:layout_marginStart="4dp" android:gravity="center" - android:text="0" /> + android:text="@string/default_tilt_value" /> </RelativeLayout> @@ -173,7 +181,7 @@ android:textColor="@android:color/white" android:layout_marginRight="4dp" android:gravity="center" - android:text="Tilt" /> + android:text="@string/tilt" /> <SeekBar android:id="@+id/seekbar_tilt" @@ -181,8 +189,10 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toStartOf="@+id/value_tilt" android:layout_toLeftOf="@+id/value_tilt" android:layout_toRightOf="@id/text_tilt" + android:layout_toEndOf="@id/text_tilt" android:max="60" /> <TextView @@ -195,7 +205,7 @@ android:layout_marginLeft="4dp" android:layout_marginStart="4dp" android:gravity="center" - android:text="0" /> + android:text="@string/default_tilt_value" /> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml index b976013ead..ecfa1372f6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml @@ -9,7 +9,6 @@ android:layout_height="match_parent" /> <FrameLayout - android:id="@+id/map_card" android:layout_width="100dp" android:layout_height="100dp" android:layout_marginLeft="5dp" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml index b290d013f0..49b38f081a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_main_feature.xml @@ -20,6 +20,7 @@ android:gravity="center_vertical" android:maxLines="1" android:textColor="@android:color/black" + android:textIsSelectable="false" android:textSize="16sp"/> <TextView @@ -31,6 +32,7 @@ android:alpha="0.56" android:maxLines="1" android:textColor="@android:color/black" + android:textIsSelectable="false" android:textSize="14sp"/> </LinearLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml index 75f6ac9588..54ae113840 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/section_main_layout.xml @@ -18,6 +18,7 @@ android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:layout_marginStart="16dp" + android:textIsSelectable="true" android:layout_marginTop="16dp" android:alpha="0.54" android:background="@android:color/transparent" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml index 324a4861c3..3b941d5603 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_custom_marker.xml @@ -6,6 +6,7 @@ <ImageView android:id="@id/imageView" android:layout_width="64dp" + android:contentDescription="@null" android:layout_height="64dp"/> <TextView @@ -14,6 +15,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:padding="2dp" + android:textIsSelectable="true" android:textColor="@android:color/white" android:textStyle="bold"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml index 299865be9e..a8d93f51be 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/view_text_marker.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:textStyle="bold" android:padding="4dp" + android:textIsSelectable="true" android:layout_centerInParent="true" /> </RelativeLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml index 92d1dd5380..ff65f319f9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_building.xml @@ -3,10 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_action_intensity" - android:title="Change intensity" + android:title="@string/change_intensity" app:showAsAction="never"/> <item android:id="@+id/menu_action_anchor" - android:title="Change Anchor" + android:title="@string/change_anchor" app:showAsAction="never"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml index 8b7245c5ca..43a191f7b1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_bulk_marker.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/spinner" - android:title="Amount of markers" + android:title="@string/amount_of_markers" app:actionViewClass="android.widget.Spinner" app:showAsAction="always"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml index 4639dd65ba..915afd77fa 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_custom_layer.xml @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:mapbox="http://schemas.android.com/apk/res-auto"> - +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/action_update_layer" - android:title="Update layer (invalidate)" /> + android:title="@string/update_layer_invalidate"/> <item android:id="@+id/action_set_color_red" - android:title="Red" /> + android:title="@string/red"/> <item android:id="@+id/action_set_color_green" - android:title="Green" /> + android:title="@string/green"/> <item android:id="@+id/action_set_color_blue" - android:title="Blue" /> + android:title="@string/blue"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml index 3eae56a273..a596ff5708 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_data_driven_style.xml @@ -4,47 +4,47 @@ <item android:id="@+id/action_add_exponential_zoom_function" - android:title="Add an exponential zoom function" + android:title="@string/add_an_exponential_zoom_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_interval_zoom_function" - android:title="Add an interval zoom function" + android:title="@string/add_an_interval_zoom_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_categorical_source_function" - android:title="Add a categorical source function" + android:title="@string/add_a_categorical_source_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_exponential_source_function" - android:title="Add an exponential source function" + android:title="@string/add_an_exponential_source_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_identity_source_function" - android:title="Add an identity source function" + android:title="@string/add_an_identity_source_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_interval_source_function" - android:title="Add an interval source function" + android:title="@string/add_an_interval_source_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_composite_exponential_function" - android:title="Add a composite, exponential function" + android:title="@string/add_a_composite_exponential_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_composite_categorical_function" - android:title="Add a composite, categorical function" + android:title="@string/add_a_composite_categorical_function" mapbox:showAsAction="never"/> <item android:id="@+id/action_add_composite_interval_function" - android:title="Add a composite, interval function" + android:title="@string/add_a_composite_interval_function" mapbox:showAsAction="never"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml index e0052d4a8c..7132c0c2a9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_padding.xml @@ -3,10 +3,10 @@ xmlns:mapbox="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_user_tracking" - android:title="My Location Tracking" + android:title="@string/my_location_tracking" mapbox:showAsAction="never" /> <item android:id="@+id/action_bangalore" - android:title="Bangalore" + android:title="@string/bangalore" mapbox:showAsAction="never" /> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml index 0b3a8e797e..7d20442c8c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_press_for_marker.xml @@ -4,6 +4,5 @@ <item android:id="@+id/menuItemReset" android:title="@string/menuitem_title_reset" - app:showAsAction="always" - /> + app:showAsAction="always"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml index 86f0b4faee..5c77179272 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_runtime_style.xml @@ -4,66 +4,66 @@ <item android:id="@+id/action_list_layers" - android:title="List all layers in the style" + android:title="@string/list_all_layers_in_the_style" mapbox:showAsAction="never" /> <item android:id="@+id/action_list_sources" - android:title="List all sources in the style" + android:title="@string/list_all_sources_in_the_style" mapbox:showAsAction="never" /> <item android:id="@+id/action_water_color" - android:title="Color the water" + android:title="@string/color_the_water" mapbox:showAsAction="never" /> <item android:id="@+id/action_background_opacity" - android:title="Set background opacity" + android:title="@string/set_background_opacity" mapbox:showAsAction="never" /> <item android:id="@+id/action_road_avoid_edges" - android:title="Set road symbol placement to Point" + android:title="@string/set_road_symbol_placement_to_point" mapbox:showAsAction="never" /> <item android:id="@+id/action_layer_visibility" - android:title="Set layer visibility to false" + android:title="@string/set_layer_visibility_to_false" mapbox:showAsAction="never" /> <item android:id="@+id/action_add_parks_layer" - android:title="Add a parks layer" + android:title="@string/add_a_parks_layer" mapbox:showAsAction="never" /> <item android:id="@+id/action_add_dynamic_parks_layer" - android:title="Add a dynamic GeoJSON source" + android:title="@string/add_a_dynamic_geojson_source" mapbox:showAsAction="never" /> <item android:id="@+id/action_remove_layer" - android:title="Remove buildings layer" + android:title="@string/remove_buildings_layer" mapbox:showAsAction="never" /> <item android:id="@+id/action_add_terrain_layer" - android:title="Add a terrain layer" + android:title="@string/add_a_terrain_layer" mapbox:showAsAction="never" /> <item android:id="@+id/action_add_satellite_layer" - android:title="Add a satellite layer" + android:title="@string/add_a_satellite_layer" mapbox:showAsAction="never" /> <item android:id="@+id/action_update_water_color_on_zoom" - android:title="Change the water color on zoom" + android:title="@string/change_the_water_color_on_zoom" mapbox:showAsAction="never" /> <item android:id="@+id/action_add_custom_tiles" - android:title="Custom tiles" + android:title="@string/custom_tiles" mapbox:showAsAction="never" /> <item android:id="@+id/action_fill_filter" - android:title="Apply filtered fill" + android:title="@string/apply_filtered_fill" mapbox:showAsAction="never" /> <item android:id="@+id/action_line_filter" - android:title="Apply filtered line" + android:title="@string/apply_filtered_line" mapbox:showAsAction="never" /> <item android:id="@+id/action_numeric_filter" - android:title="Apply numeric fill filter" + android:title="@string/apply_numeric_fill_filter" mapbox:showAsAction="never" /> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml index 77468b4861..8f396b07b0 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_symbol_layer.xml @@ -3,14 +3,14 @@ <item android:id="@+id/action_toggle_text_size" - android:title="Toggle text size"/> + android:title="@string/toggle_text_size"/> <item android:id="@+id/action_toggle_text_field" - android:title="Toggle text field contents"/> + android:title="@string/toggle_text_field_contents"/> <item android:id="@+id/action_toggle_text_font" - android:title="Toggle text font"/> + android:title="@string/toggle_text_font"/> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml index 0cea519a24..67c0b2df55 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_zoom.xml @@ -3,23 +3,23 @@ xmlns:mapbox="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_zoom_in" - android:title="Zoom in" + android:title="@string/zoom_in" mapbox:showAsAction="never" /> <item android:id="@+id/action_zoom_out" - android:title="Zoom out" + android:title="@string/zoom_out" mapbox:showAsAction="never" /> <item android:id="@+id/action_zoom_by" - android:title="Zoom by 2" + android:title="@string/zoom_by_2" mapbox:showAsAction="never" /> <item android:id="@+id/action_zoom_to_point" - android:title="Zoom to point" + android:title="@string/zoom_to_point" mapbox:showAsAction="never" /> <item android:id="@+id/action_zoom_to" - android:title="Zoom to 4" + android:title="@string/zoom_to_4" mapbox:showAsAction="never" /> </menu> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml index 402d42d485..caf7f72b8b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml @@ -3,7 +3,6 @@ <dimen name="circle_size">24dp</dimen> <dimen name="fab_margin">16dp</dimen> <dimen name="attr_margin">10dp</dimen> - <dimen name="coordinatebounds_margin">32dp</dimen> <dimen name="map_padding_left">96dp</dimen> <dimen name="map_padding_bottom">256dp</dimen> <dimen name="map_padding_right">32dp</dimen> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 671dccbd2b..6e9f28e598 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -150,6 +150,8 @@ <string name="action_color_polygon">Change color</string> <string name="action_holes_polygon">Change holes</string> <string name="action_width_polyline">Change width</string> + <string name="action_calculate_distance">"Click the map to calculate the distance"</string> + <string name="action_scroll_by">Move the map by x/y pixels</string> <!--Menu--> <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string> @@ -185,5 +187,57 @@ <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: %s</string> + <string name="debug_zoom">Zoom: %d</string> + <string name="viewcache_size">"ViewCache size %d"</string> + <string name="latitude">Latitude</string> + <string name="min_value">-180</string> + <string name="longitude">Longitude</string> + <string name="zoom">Zoom</string> + <string name="default_zoom_value">18</string> + <string name="bearing">Bearing</string> + <string name="default_tilt_value">0</string> + <string name="tilt">Tilt</string> + <string name="no_results">No Results</string> + <string name="change_intensity">Change intensity</string> + <string name="change_anchor">Change Anchor</string> + <string name="amount_of_markers">Amount of markers</string> + <string name="update_layer_invalidate">Update layer (invalidate)</string> + <string name="red">Red</string> + <string name="green">Green</string> + <string name="blue">Blue</string> + <string name="add_an_exponential_zoom_function">Add an exponential zoom function</string> + <string name="add_an_interval_zoom_function">Add an interval zoom function</string> + <string name="add_a_categorical_source_function">Add a categorical source function</string> + <string name="add_an_exponential_source_function">Add an exponential source function</string> + <string name="add_an_identity_source_function">Add an identity source function</string> + <string name="add_an_interval_source_function">Add an interval source function</string> + <string name="add_a_composite_categorical_function">Add a composite, categorical function</string> + <string name="add_a_composite_exponential_function">Add a composite, exponential function</string> + <string name="add_a_composite_interval_function">Add a composite, interval function</string> + <string name="my_location_tracking">My Location Tracking</string> + <string name="bangalore">Bangalore</string> + <string name="list_all_layers_in_the_style">List all layers in the style</string> + <string name="list_all_sources_in_the_style">List all sources in the style</string> + <string name="color_the_water">Color the water</string> + <string name="set_background_opacity">Set background opacity</string> + <string name="set_road_symbol_placement_to_point">Set road symbol placement to Point</string> + <string name="set_layer_visibility_to_false">Set layer visibility to false</string> + <string name="add_a_parks_layer">Add a parks layer</string> + <string name="add_a_dynamic_geojson_source">Add a dynamic GeoJSON source</string> + <string name="remove_buildings_layer">Remove buildings layer</string> + <string name="add_a_terrain_layer">Add a terrain layer</string> + <string name="add_a_satellite_layer">Add a satellite layer</string> + <string name="change_the_water_color_on_zoom">Change the water color on zoom</string> + <string name="custom_tiles">Custom tiles</string> + <string name="apply_filtered_fill">Apply filtered fill</string> + <string name="apply_filtered_line">Apply filtered line</string> + <string name="apply_numeric_fill_filter">Apply numeric fill filter</string> + <string name="toggle_text_size">Toggle text size</string> + <string name="toggle_text_field_contents">Toggle text field contents</string> + <string name="toggle_text_font">Toggle text font</string> + <string name="zoom_in">Zoom in</string> + <string name="zoom_out">Zoom out</string> + <string name="zoom_by_2">Zoom by 2</string> + <string name="zoom_to_point">Zoom to point</string> + <string name="zoom_to_4">Zoom to 4</string> </resources> |