From a70d9ee654ebc4e9bd9a5907b34c3b2fd6935fc9 Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Fri, 23 Aug 2019 10:34:53 -0700 Subject: [PATCH] Refactoring RelativeLayout to FrameLayout --- .../activity_annotation_animated_marker.xml | 4 +- .../activity_annotation_custom_marker.xml | 4 +- .../res/layout/activity_annotation_marker.xml | 18 -------- .../layout/activity_annotation_polygon.xml | 18 -------- .../res/layout/activity_camera_animate.xml | 4 +- .../layout/activity_camera_bounding_box.xml | 4 +- .../res/layout/activity_camera_restrict.xml | 9 ++-- .../activity_lab_marker_following_route.xml | 6 +-- .../activity_lab_space_station_location.xml | 7 ++- .../res/layout/activity_offline_manager.xml | 9 ++-- .../res/layout/activity_offline_simple.xml | 7 ++- .../res/layout/activity_query_feature.xml | 4 +- .../activity_query_highlighted_line.xml | 9 ++-- .../layout/activity_query_select_building.xml | 6 +-- .../layout/activity_style_color_switcher.xml | 46 ++++++++++--------- .../activity_style_geojson_layer_in_stack.xml | 4 +- .../layout/activity_style_language_switch.xml | 4 +- .../china/res/layout/activity_style_line.xml | 4 +- .../res/layout/activity_style_line_layer.xml | 4 +- ...tivity_style_zoom_dependent_fill_color.xml | 4 +- .../examples/dds/DrawGeojsonLineActivity.java | 2 +- .../examples/dds/DrawPolygonActivity.java | 2 +- .../examples/labs/AnimatedMarkerActivity.java | 2 +- .../plugins/MarkerViewPluginActivity.java | 2 +- .../plugins/SymbolListenerActivity.java | 2 +- .../activity_annotation_custom_marker.xml | 18 -------- ...ity_annotation_plugin_symbol_listener.xml} | 1 - .../res/layout/activity_camera_animate.xml | 4 +- .../layout/activity_camera_bounding_box.xml | 4 +- .../res/layout/activity_camera_restrict.xml | 4 +- .../res/layout/activity_camera_slow_spin.xml | 4 +- .../activity_choropleth_json_vector_mix.xml | 4 +- .../activity_circle_layer_clustering.xml | 17 +++---- .../activity_dds_choropleth_zoom_change.xml | 6 +-- ...xml => activity_dds_draw_geojson_line.xml} | 4 +- ...ygon.xml => activity_dds_draw_polygon.xml} | 4 +- .../layout/activity_dds_image_clustering.xml | 4 +- ...dds_kotlin_style_circles_categorically.xml | 4 +- ...tivity_dds_style_circles_categorically.xml | 4 +- .../src/main/res/layout/activity_heatmap.xml | 17 ++++--- .../activity_javaservices_directions.xml | 4 +- .../activity_javaservices_optimization.xml | 4 +- ...r.xml => activity_lab_animated_marker.xml} | 4 +- .../res/layout/activity_lab_hollow_circle.xml | 10 ++-- .../layout/activity_lab_location_picker.xml | 8 ++-- .../activity_lab_marker_following_route.xml | 6 +-- .../activity_lab_space_station_location.xml | 5 +- ...ker.xml => activity_markerview_plugin.xml} | 6 +-- .../res/layout/activity_offline_manager.xml | 2 +- .../res/layout/activity_offline_simple.xml | 7 ++- ...y_place_picker_dashed_directions_route.xml | 13 +++--- .../res/layout/activity_query_feature.xml | 4 +- .../activity_query_highlighted_line.xml | 9 ++-- .../layout/activity_query_select_building.xml | 6 +-- .../layout/activity_snapshot_notification.xml | 19 ++++---- .../activity_style_adjust_layer_opacity.xml | 18 ++++---- .../layout/activity_style_color_switcher.xml | 23 +++++----- .../activity_style_create_hotspots_points.xml | 4 +- .../res/layout/activity_style_default.xml | 4 +- .../activity_style_geojson_layer_in_stack.xml | 4 +- .../res/layout/activity_style_hillshade.xml | 12 ++--- .../layout/activity_style_language_switch.xml | 6 +-- .../main/res/layout/activity_style_line.xml | 7 ++- .../res/layout/activity_style_line_layer.xml | 4 +- .../layout/activity_style_mapbox_studio.xml | 8 +--- ...vity_style_text_field_multiple_formats.xml | 4 +- .../layout/activity_style_vector_style.xml | 4 +- ...tivity_style_zoom_dependent_fill_color.xml | 4 +- .../main/res/layout/simple_offline_map.xml | 3 +- 69 files changed, 214 insertions(+), 282 deletions(-) delete mode 100644 MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml delete mode 100644 MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml delete mode 100644 MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_marker.xml rename MapboxAndroidDemo/src/main/res/layout/{activity_annotation_plugin_symbol_activity.xml => activity_annotation_plugin_symbol_listener.xml} (92%) rename MapboxAndroidDemo/src/main/res/layout/{activity_annotation_geojson_line.xml => activity_dds_draw_geojson_line.xml} (95%) rename MapboxAndroidDemo/src/main/res/layout/{activity_annotation_polygon.xml => activity_dds_draw_polygon.xml} (95%) rename MapboxAndroidDemo/src/main/res/layout/{activity_annotation_animated_marker.xml => activity_lab_animated_marker.xml} (95%) rename MapboxAndroidDemo/src/main/res/layout/{activity_annotation_marker.xml => activity_markerview_plugin.xml} (86%) diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_animated_marker.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_animated_marker.xml index e3ca02558..4dfa37a6c 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_animated_marker.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_animated_marker.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_custom_marker.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_custom_marker.xml index ceb5037ab..47cd1176a 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_custom_marker.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_custom_marker.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml deleted file mode 100644 index a8d1c4912..000000000 --- a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml deleted file mode 100644 index 8690f9404..000000000 --- a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml b/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml index ca7c103f7..6ddfdef3b 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_camera_bounding_box.xml b/MapboxAndroidDemo/src/china/res/layout/activity_camera_bounding_box.xml index 3bd43e74e..f50b8c410 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_camera_bounding_box.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_camera_bounding_box.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml b/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml index de9711405..1e52de3f5 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml @@ -1,11 +1,11 @@ - + tools:context=".examples.camera.RestrictCameraActivity"> + mapbox:mapbox_cameraZoom="2" /> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_lab_marker_following_route.xml b/MapboxAndroidDemo/src/china/res/layout/activity_lab_marker_following_route.xml index 1f4b5a9d3..5f227c0c2 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_lab_marker_following_route.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_lab_marker_following_route.xml @@ -1,11 +1,11 @@ - + tools:context=".examples.labs.MarkerFollowingRouteActivity"> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_lab_space_station_location.xml b/MapboxAndroidDemo/src/china/res/layout/activity_lab_space_station_location.xml index e8b0964f0..d81e008bb 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_lab_space_station_location.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_lab_space_station_location.xml @@ -1,12 +1,11 @@ - + android:layout_height="match_parent" /> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml b/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml index 37c8ee6f6..daaafce6e 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml @@ -1,5 +1,5 @@ - @@ -32,7 +31,7 @@ style="?android:attr/buttonBarStyle" android:layout_width="match_parent" android:layout_height="56dp" - android:layout_alignParentBottom="true" + android:layout_gravity="bottom" android:background="@color/colorAccent" android:elevation="8dp" android:orientation="horizontal" @@ -66,4 +65,4 @@ android:textSize="12sp"/> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml b/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml index 3f33cd12e..8427f36db 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml index d1a250941..a1b5c57cc 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml index 440726852..d11962d55 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml @@ -1,11 +1,11 @@ - + tools:context=".examples.query.HighlightedLineActivity"> + mapbox:mapbox_cameraZoom="15" /> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_select_building.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_select_building.xml index fccc0d26b..e8597be5a 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_query_select_building.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_query_select_building.xml @@ -1,10 +1,10 @@ - + tools:context=".examples.query.SelectBuildingActivity"> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml index 9e8342cd9..da40ef181 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml @@ -1,5 +1,6 @@ - + + + + android:paddingStart="24dp" + android:paddingTop="24dp"> + android:entries="@array/layer_spinner_array"/> + android:text="Red"/> + android:progress="202"/> @@ -54,14 +64,14 @@ + android:text="Green"/> + android:progress="210"/> @@ -73,25 +83,17 @@ + android:text="Blue"/> + android:progress="211"/> - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_geojson_layer_in_stack.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_geojson_layer_in_stack.xml index 80f1f5667..8e244b7d3 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_geojson_layer_in_stack.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_geojson_layer_in_stack.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_language_switch.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_language_switch.xml index c1046669c..7175fa5b2 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_language_switch.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_language_switch.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_line.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_line.xml index dce386ca8..b45162052 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_line.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_line.xml @@ -1,5 +1,5 @@ - - + diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_line_layer.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_line_layer.xml index 72545536f..acb31a6d4 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_line_layer.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_line_layer.xml @@ -1,5 +1,5 @@ - - + diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_zoom_dependent_fill_color.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_zoom_dependent_fill_color.xml index 6d50efff5..3bda1413a 100644 --- a/MapboxAndroidDemo/src/china/res/layout/activity_style_zoom_dependent_fill_color.xml +++ b/MapboxAndroidDemo/src/china/res/layout/activity_style_zoom_dependent_fill_color.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java index 96cc7666d..28b590bdb 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java @@ -42,7 +42,7 @@ public void onCreate(Bundle savedInstanceState) { Mapbox.getInstance(this, getString(R.string.access_token)); // This contains the MapView in XML and needs to be called after the access token is configured. - setContentView(R.layout.activity_annotation_geojson_line); + setContentView(R.layout.activity_dds_draw_geojson_line); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java index d5d531745..3b6316d0c 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java @@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) { Mapbox.getInstance(this, getString(R.string.access_token)); // This contains the MapView in XML and needs to be called after the access token is configured. - setContentView(R.layout.activity_annotation_polygon); + setContentView(R.layout.activity_dds_draw_polygon); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java index 56c638146..9c0dfb0f5 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java @@ -43,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) { Mapbox.getInstance(this, getString(R.string.access_token)); // This contains the MapView in XML and needs to be called after the access token is configured. - setContentView(R.layout.activity_annotation_animated_marker); + setContentView(R.layout.activity_lab_animated_marker); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java index 15c702145..329f4bb8a 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java @@ -38,7 +38,7 @@ public void onCreate(Bundle savedInstanceState) { Mapbox.getInstance(this, getString(R.string.access_token)); // This contains the MapView in XML and needs to be called after the access token is configured. - setContentView(R.layout.activity_annotation_marker); + setContentView(R.layout.activity_markerview_plugin); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java index cb35408f7..c83d65f8c 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { Mapbox.getInstance(this, getString(R.string.access_token)); // This contains the MapView in XML and needs to be called after the access token is configured. - setContentView(R.layout.activity_annotation_plugin_symbol_activity); + setContentView(R.layout.activity_annotation_plugin_symbol_listener); mapView = findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_marker.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_marker.xml deleted file mode 100644 index ec8a1531a..000000000 --- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_marker.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_listener.xml similarity index 92% rename from MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml rename to MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_listener.xml index 42a0d7fab..d2cff623a 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_listener.xml @@ -1,6 +1,5 @@ diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml index a1b0af7b5..e7d3bc475 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml index b06448974..6d79f1c4d 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_restrict.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_restrict.xml index fe7203112..7dab86e26 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_camera_restrict.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_camera_restrict.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_slow_spin.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_slow_spin.xml index 2ab0d6ab7..ec9e97f34 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_camera_slow_spin.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_camera_slow_spin.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_choropleth_json_vector_mix.xml b/MapboxAndroidDemo/src/main/res/layout/activity_choropleth_json_vector_mix.xml index 0afaaf673..816f46e65 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_choropleth_json_vector_mix.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_choropleth_json_vector_mix.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_circle_layer_clustering.xml b/MapboxAndroidDemo/src/main/res/layout/activity_circle_layer_clustering.xml index 99f3f1f05..2f57341d2 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_circle_layer_clustering.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_circle_layer_clustering.xml @@ -1,16 +1,13 @@ - - + - + android:layout_height="match_parent"/> - + diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_choropleth_zoom_change.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_choropleth_zoom_change.xml index af1437e90..c8e12ff2e 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_choropleth_zoom_change.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_choropleth_zoom_change.xml @@ -1,10 +1,10 @@ - + tools:context=".examples.dds.ChoroplethZoomChangeActivity"> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_geojson_line.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_geojson_line.xml similarity index 95% rename from MapboxAndroidDemo/src/main/res/layout/activity_annotation_geojson_line.xml rename to MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_geojson_line.xml index ac913729c..1eaa3da93 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_geojson_line.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_geojson_line.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_polygon.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_polygon.xml similarity index 95% rename from MapboxAndroidDemo/src/main/res/layout/activity_annotation_polygon.xml rename to MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_polygon.xml index a59065c0e..4ffd036ac 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_polygon.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_draw_polygon.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_image_clustering.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_image_clustering.xml index 90279cdac..8f1f23838 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_image_clustering.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_image_clustering.xml @@ -1,5 +1,5 @@ - - + diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_kotlin_style_circles_categorically.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_kotlin_style_circles_categorically.xml index 9204b80b8..322a034a1 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_kotlin_style_circles_categorically.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_kotlin_style_circles_categorically.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_circles_categorically.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_circles_categorically.xml index d0bff098f..65ce27e51 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_circles_categorically.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_circles_categorically.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_heatmap.xml b/MapboxAndroidDemo/src/main/res/layout/activity_heatmap.xml index d51bfbe59..114071ecd 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_heatmap.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_heatmap.xml @@ -1,16 +1,15 @@ - + + mapbox:mapbox_cameraZoom="2.040885"/> - + diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_directions.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_directions.xml index 2d166c020..1ac0a082d 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_directions.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_directions.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_optimization.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_optimization.xml index 6b46e26dd..55c78c515 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_optimization.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_optimization.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_animated_marker.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_animated_marker.xml similarity index 95% rename from MapboxAndroidDemo/src/main/res/layout/activity_annotation_animated_marker.xml rename to MapboxAndroidDemo/src/main/res/layout/activity_lab_animated_marker.xml index 747db5101..7bf9e2bf6 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_animated_marker.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_animated_marker.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_hollow_circle.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_hollow_circle.xml index 7698cfefc..378546799 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_hollow_circle.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_hollow_circle.xml @@ -1,18 +1,18 @@ - + tools:context=".examples.javaservices.TurfRingActivity"> + mapbox:mapbox_cameraZoom="11"/> - \ No newline at end of file + \ No newline at end of file diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_location_picker.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_location_picker.xml index 377164300..6bd27d3f0 100644 --- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_location_picker.xml +++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_location_picker.xml @@ -1,5 +1,5 @@ - + mapbox:mapbox_cameraZoom="15"/>