diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values')
6 files changed, 80 insertions, 121 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml new file mode 100644 index 0000000000..94763342d2 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/arrays.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string-array name="bulk_marker_list"> + <item>10</item> + <item>100</item> + <item>500</item> + <item>1000</item> + <item>10000</item> + </string-array> + + <string-array name="user_tracking_mode"> + <item>Disabled</item> + <item>Follow tracking</item> + </string-array> + + <string-array name="user_bearing_mode"> + <item>Disabled</item> + <item>GPS bearing</item> + <item>Compass bearing</item> + <!--<item>Combined mode</item>--> + </string-array> +</resources>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml index 78fc76af1c..88524d44ea 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="primary">#1E8CAB</color> - <color name="primary_dark">#166B83</color> + <color name="primary">#52A1D8</color> + <color name="primaryDark">#3887BE</color> <color name="accent">#E55E5E</color> <color name="white">#F9F9F9</color> - <color name="mapbox_green">#56B881</color> + <color name="mapboxGreen">#56B881</color> + + <color name="redAccent">#D50000</color> + <color name="blueAccent">#2962FF</color> + <color name="greenAccent">#1B5E20</color> - <color name="red_accent">#D50000</color> - <color name="blue_accent">#2962FF</color> - <color name="green_accent">#1B5E20</color> </resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml index b77a25b681..402d42d485 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml @@ -2,18 +2,12 @@ <resources> <dimen name="circle_size">24dp</dimen> <dimen name="fab_margin">16dp</dimen> - <dimen name="full_button_margin">8dp</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> - <dimen name="toolbar_shadow">4dp</dimen> + <dimen name="map_padding_top">0dp</dimen> <dimen name="locationview_background_drawable_padding">2dp</dimen> - <dimen name="locationview_padding_top">350dp</dimen> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> <dimen name="navigation_drawer_width">240dp</dimen> - <dimen name="toolbar_padding_top">0dp</dimen> </resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml index 120bf49fca..6701032d97 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/ids.xml @@ -8,4 +8,4 @@ <item name="toolbar" type="id" /> <item name="container" type="id" /> <item name="item_click_support" type="id" /> -</resources>
\ No newline at end of file +</resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 53688cdf35..61d251f861 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml @@ -1,50 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Mapbox Android SDK TestApp</string> - <!-- Test Activities --> - <string name="activity_mapboxmap">MapboxMap Activity</string> - - <!-- Fragment --> + <!--Activity--> <string name="activity_map_fragment_suport">Support Map Fragment</string> <string name="activity_map_fragment">Map Fragment</string> <string name="activity_multimap">Multiple Maps on Screen</string> - - <!-- Annotations --> <string name="activity_add_bulk_markers">Add Markers In Bulk</string> - <string name="activity_animated_marker">Animated Marker (experimental)</string> + <string name="activity_animated_marker">Animated Markers</string> <string name="activity_dynamic_marker">Dynamic Marker</string> <string name="activity_polyline">Polyline</string> <string name="activity_polygon">Polygon</string> <string name="activity_press_for_marker">Press Map For Marker</string> <string name="activity_view_marker">View Marker API</string> - <string name="activity_view_marker_scale">Scaling in the View Marker API</string> <string name="activity_add_remove_markers">Add/Remove marker</string> - - <!-- InfoWindow--> <string name="activity_info_window">Standard InfoWindow</string> <string name="activity_infowindow_adapter">Custom InfoWindow</string> <string name="activity_dynamic_infowindow_adapter">Custom Dynamic InfoWindow</string> - - <!-- Camera --> <string name="activity_camera_animation_types">Animation Types</string> <string name="activity_camera_zoom">Zoom Methods</string> <string name="activity_visible_coordinate_bounds">LatLngBounds Method</string> <string name="activity_camera_position">CameraPosition Method</string> <string name="activity_scroll_by">Scroll By Method</string> - - <!-- API --> - <string name="activity_directions">Directions</string> - <string name="activity_geocoder">Geocoder</string> - - <!-- Navigation --> - <string name="activity_location_picker">Location Picker</string> - <string name="activity_car_driving">Driving animation</string> - - <!-- Other --> <string name="activity_double_map">Double Map Activity</string> - <string name="activity_back_to_map">Back to map activity</string> <string name="activity_snapshot">Snapshot Activity</string> <string name="activity_user_tracking_mode">User tracking mode</string> <string name="activity_user_tracking_customization">User location drawable</string> @@ -55,9 +33,11 @@ <string name="activity_debug_mode">Debug Mode</string> <string name="activity_offline">Offline Map</string> <string name="activity_update_metadata">Update metadata Map</string> + <string name="activity_offline_region_delete">Delete region</string> <string name="activity_minmax_zoom">Min/Max Zoom</string> <string name="activity_viewpager">ViewPager</string> <string name="activity_runtime_style">Runtime Style</string> + <string name="activity_data_driven_style">Data Driven Style</string> <string name="activity_circle_layer">Circle layer</string> <string name="activity_style_file">Local Style file</string> <string name="activity_geojson_clustering">GeoJson Clustering</string> @@ -74,7 +54,7 @@ <string name="activity_map_in_dialog">Dialog with map</string> <string name="activity_marker_view_rectangle">Marker views in rectangle</string> - <!-- Description --> + <!--Description--> <string name="description_user_location_tracking">Tracks the location of the user</string> <string name="description_user_location_customization">Customize the location of the user</string> <string name="description_user_location_dot_color">Customize the user location color</string> @@ -89,7 +69,6 @@ <string name="description_camera_zoom">Different types of zoom methods</string> <string name="description_minmax_zoom">Configure a max and min zoomlevel</string> <string name="description_info_window">Learn how to handle the InfoWindow</string> - <string name="description_info_window_concurrent">InfoWindow example with multiple open</string> <string name="description_add_bulk_markers">Add Markers In Bulk to a Map</string> <string name="description_camera_animation_types">Showcase the different animation types</string> <string name="description_visible_bounds">Center the camera around a bounds</string> @@ -98,21 +77,18 @@ <string name="description_debug_mode">Debug Mode</string> <string name="description_offline">Offline Map example</string> <string name="description_update_metadata">Update metadata example</string> - <string name="description_animated_marker">Animate the position change of a Marker</string> + <string name="description_offline_region_delete">Delete region example</string> + <string name="description_animated_marker">Animate the position change of a marker</string> <string name="description_polyline">Add a polyline to a map</string> <string name="description_polygon">Add a polygon to a map</string> - <string name="description_directions">Example with Directions API</string> - <string name="description_geocoder">Example with Geocoder API</string> <string name="description_scroll_by">Scroll with pixels in x,y direction</string> <string name="description_snapshot">Example to make a snapshot of the map</string> <string name="description_doublemap">2 maps in a view hierarchy</string> - <string name="description_back_to_map">Restart map view after temporarily leaving to another activity</string> <string name="description_view_marker">Use an Android SDK View as marker</string> - <string name="description_view_marker_scale">Scale a View Marker</string> <string name="description_dynamic_info_window_adapter">Learn how to create a dynamic custom InfoWindow</string> - <string name="description_location_picker">Use a fixed Marker to select your location</string> <string name="description_viewpager">Use SupportMapFragments in a ViewPager</string> <string name="description_runtime_style">Adopt the map style on the fly</string> + <string name="description_data_driven_style">Use functions to change the map appearance</string> <string name="description_symbol_layer">Manipulate symbols at runtime</string> <string name="description_custom_sprite">Use a custom sprite in a Symbol Layer</string> <string name="description_geojson_clustering">Use GeoJson sources and dynamic layers to cluster information</string> @@ -123,7 +99,6 @@ <string name="description_query_rendered_features_box_count">Count all rendered features in box</string> <string name="description_query_rendered_features_box_symbol_count">Count all rendered symbols in box</string> <string name="description_query_rendered_features_box_highlight">Hightligh buildings in box</string> - <string name="description_car_driving">MyLocationView follow map update example</string> <string name="description_simple_map">Shows a simple map</string> <string name="description_add_remove_markers">Based on zoom level</string> <string name="description_style_file">Use a local file as the style</string> @@ -131,109 +106,58 @@ <string name="description_marker_view_rectangle">Marker Views within a rectangle</string> <string name="description_circle_layer">Show bus stops and route in Singapore</string> - <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string> - <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string> - <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string> - <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string> - <string name="menuitem_title_reset">Reset</string> - + <!--Categories--> <string name="category">category</string> + <string name="category_basic">_Basic</string> <string name="category_annotation">Annotation</string> <string name="category_camera">Camera</string> <string name="category_custom_layer">Custom Layer</string> - <string name="category_directions">Directions</string> <string name="category_fragment">Fragment</string> - <string name="category_geocoding">Geocoding</string> <string name="category_imagegenerator">Image Generator</string> - <string name="category_infowindow">InfoWindow</string> + <string name="category_infowindow">Info Window</string> <string name="category_maplayout">Map Layout</string> <string name="category_offline">Offline</string> <string name="category_userlocation">User Location</string> - <string name="category_navigation">Navigation</string> <string name="category_style">Styling</string> <string name="category_features">Features</string> - <string name="action_visible_bounds_explanation">Center map around 2 markers</string> + <!--Actions--> <string name="action_remove_polylines">Remove polylines</string> - <string name="action_visibility_polygon">Change visibility</string> <string name="action_alpha_polygon">Change alpha</string> <string name="action_points_polygon">Change points</string> <string name="action_color_polygon">Change color</string> <string name="action_width_polyline">Change width</string> + <!--Menu--> + <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string> + <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string> + <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string> + <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string> + <string name="menuitem_title_reset">Reset</string> + <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string> + <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string> + + <!--Button--> <string name="button_camera_move">Move</string> <string name="button_camera_ease">Ease</string> <string name="button_camera_animate">Animate</string> - <string name="button_make_snapshot">Snapshot</string> <string name="button_user_dot_default">Default</string> <string name="button_user_dot_tint">Tint dot</string> <string name="button_user_accuracy_ring_tint">Tint ring</string> <string name="button_user_transparent_tint">tran</string> <string name="button_open_dialog">Open dialog</string> - - <string name="label_fps">FPS:</string> - - <string name="styleMapboxStreets">Mapbox Streets</string> - <string name="styleEmerald">Emerald</string> - <string name="styleLight">Light</string> - <string name="styleDark">Dark</string> - <string name="styleSatellite">Satellite</string> - <string name="styleSatelliteStreets">Satellite Streets</string> - - <string-array name="outdoors_class_list"> - <item>Day</item> - <item>Night</item> - </string-array> - - <string-array name="bulk_marker_list"> - <item>10</item> - <item>100</item> - <item>500</item> - <item>1000</item> - <item>10000</item> - </string-array> - - <string-array name="user_tracking_mode"> - <item>Disabled</item> - <item>Follow tracking</item> - </string-array> - - <string-array name="user_bearing_mode"> - <item>Disabled</item> - <item>GPS bearing</item> - <item>Compass bearing</item> - <!--<item>Combined mode</item>--> - </string-array> - - <string name="zoom_botton">Zoom</string> - - <string name="scrollby_x_value">X: %1$d</string> - <string name="scrollby_y_value">Y: %1$d</string> <string name="button_download_region">Download region</string> <string name="button_list_regions">List regions</string> + <!--Other--> + <string name="navigation_drawer_open">Open navigation drawer</string> + <string name="navigation_drawer_close">Close navigation drawer</string> + <string name="scrollby_x_value">X: %1$d</string> + <string name="scrollby_y_value">Y: %1$d</string> <string name="dialog_camera_position">Animate to new position</string> - - <string name="geocoder_instructions">Tap Map To Geocode Where Black Marker Is Currently Located</string> - <string name="dynamic_marker_chelsea_title">Chelsea</string> <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="navigation_select_location_button_text">Select Location!</string> - - <string name="title_section1">Different style</string> - <string name="title_section2">Show Snackbar</string> - - <string name="navigation_drawer_open">Open navigation drawer</string> - <string name="navigation_drawer_close">Close navigation drawer</string> - - <string name="action_example">Example action</string> - - <string name="action_settings">Settings</string> - <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string> - <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string> - -</resources>
\ No newline at end of file +</resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml index e358fcd5a0..777d8a5f56 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar"> + <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="colorPrimary">@color/primary</item> - <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorPrimaryDark">@color/primaryDark</item> <item name="colorAccent">@color/accent</item> <item name="android:windowBackground">@color/white</item> + <item name="android:spinnerItemStyle">@style/MySpinnerStyle</item> + <item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item> </style> - <style name="AppTheme.ActionBar.Transparent" parent="AppTheme"> + <style name="NoActionBar" parent="Theme.AppCompat.NoActionBar"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primaryDark</item> + <item name="colorAccent">@color/accent</item> + <item name="android:windowBackground">@color/white</item> + </style> + + <style name="AppTheme.ActionBar.Transparent" parent="NoActionBar"> <item name="android:windowContentOverlay">@null</item> <item name="windowActionBarOverlay">true</item> <item name="colorPrimary">@android:color/transparent</item> @@ -18,6 +27,15 @@ <item name="windowActionBarOverlay">false</item> </style> + <style name="MySpinnerStyle"> + <item name="android:popupBackground">@android:color/background_light</item> + <item name="android:textColor">@android:color/background_light</item> + </style> + + <style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.DropDownItem.Spinner"> + <item name="android:textColor">@android:color/background_light</item> + </style> + <style name="AppTheme" parent="AppBaseTheme" /> </resources> |