tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - rename attributes (#6894)

Browse Source
This commit is contained in:
Tobrun
2016-11-07 09:37:43 +01:00
committed by GitHub
parent c5992d71f5
commit ee073f6b96
31 changed files with 259 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
View File

@@ -16,10 +16,10 @@
android:id="@id/mapView"
android:layout_below="@id/toolbar"
android:layout_width="match_parent"
app:mapbox_center_latitude="52.519003"
app:mapbox_center_longitude="13.400972"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="16"
app:mapbox_cameraTargetLat="52.519003"
app:mapbox_cameraTargetLng="13.400972"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="16"
android:layout_height="match_parent"/>
<android.support.design.widget.FloatingActionButton

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
View File

@@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_center_latitude="51.502615"
app:mapbox_center_longitude="4.972326"
app:mapbox_style_url="@string/mapbox_style_light"
app:mapbox_zoom="6" />
app:mapbox_cameraTargetLat="51.502615"
app:mapbox_cameraTargetLng="4.972326"
app:mapbox_styleUrl="@string/mapbox_style_light"
app:mapbox_cameraZoom="6" />
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
View File

@@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
app:mapbox_center_latitude="51.50325"
app:mapbox_center_longitude="-0.11968"
app:mapbox_zoom="15" />
app:mapbox_cameraTargetLat="51.50325"
app:mapbox_cameraTargetLng="-0.11968"
app:mapbox_cameraZoom="15" />
<LinearLayout
android:layout_width="match_parent"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
View File

@@ -21,7 +21,7 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
View File

@@ -16,9 +16,9 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_my_location_foreground_tint="@color/primary"
app:mapbox_my_location_accuracy_tint="@color/primary"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="15" />
app:mapbox_myLocationTintColor="@color/primary"
app:mapbox_myLocationAccuracyTintColor="@color/primary"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="15" />
</LinearLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
View File

@@ -16,10 +16,10 @@
android:id="@id/mapView"
android:layout_below="@id/toolbar"
android:layout_width="match_parent"
app:mapbox_center_latitude="52.519003"
app:mapbox_center_longitude="13.400972"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="16"
app:mapbox_cameraTargetLat="52.519003"
app:mapbox_cameraTargetLng="13.400972"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="16"
android:layout_height="match_parent"/>
<android.support.design.widget.FloatingActionButton

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
View File

@@ -16,6 +16,6 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" />
</LinearLayout>

12
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
View File

@@ -26,12 +26,12 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="51.506675"
app:mapbox_center_longitude="-0.128699"
app:mapbox_compass_fade_facing_north="false"
app:mapbox_direction="90"
app:mapbox_tilt="40"
app:mapbox_zoom="10" />
app:mapbox_cameraTargetLat="51.506675"
app:mapbox_cameraTargetLng="-0.128699"
app:mapbox_uiCompassFadeFacingNorth="false"
app:mapbox_cameraBearing="90"
app:mapbox_cameraTilt="40"
app:mapbox_cameraZoom="10" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
View File

@@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="5"
app:mapbox_center_latitude="38.90962"
app:mapbox_center_longitude="-77.04341"
app:mapbox_zoom="15" />
app:mapbox_cameraTargetLat="38.90962"
app:mapbox_cameraTargetLng="-77.04341"
app:mapbox_cameraZoom="15" />
<TextView
android:id="@+id/message"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
View File

@@ -16,9 +16,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="38.897705003219784"
app:mapbox_center_longitude="-77.03655168667463"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="15" />
app:mapbox_cameraTargetLat="38.897705003219784"
app:mapbox_cameraTargetLng="-77.03655168667463"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="15" />
</LinearLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
View File

@@ -16,9 +16,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="47.798202"
app:mapbox_center_longitude="7.573781"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="4" />
app:mapbox_cameraTargetLat="47.798202"
app:mapbox_cameraTargetLng="7.573781"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="4" />
</LinearLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
View File

@@ -16,9 +16,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="47.798202"
app:mapbox_center_longitude="7.573781"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="4" />
app:mapbox_cameraTargetLat="47.798202"
app:mapbox_cameraTargetLng="7.573781"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="4" />
</LinearLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
View File

@@ -14,10 +14,10 @@
<com.mapbox.mapboxsdk.maps.MapView
android:id="@id/mapView"
app:mapbox_center_latitude="50.871062"
app:mapbox_center_longitude="1.583210"
app:mapbox_direction="220"
app:mapbox_zoom="10"
app:mapbox_cameraTargetLat="50.871062"
app:mapbox_cameraTargetLng="1.583210"
app:mapbox_cameraBearing="220"
app:mapbox_cameraZoom="10"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar" />

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
View File

@@ -22,11 +22,11 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="38.87031"
app:mapbox_cameraTargetLat="38.87031"
android:layout_below="@id/toolbar"
app:mapbox_center_longitude="-77.00897"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="10" />
app:mapbox_cameraTargetLng="-77.00897"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="10" />
<TextView
android:id="@+id/countView"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
View File

@@ -16,10 +16,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
app:mapbox_center_latitude="38.907192"
app:mapbox_center_longitude="-77.036871"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="12" />
app:mapbox_cameraTargetLat="38.907192"
app:mapbox_cameraTargetLng="-77.036871"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="12" />
<TextView
android:id="@+id/countView"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
View File

@@ -52,9 +52,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
app:mapbox_center_latitude="38.907192"
app:mapbox_center_longitude="-77.036871"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="12" />
app:mapbox_cameraTargetLat="38.907192"
app:mapbox_cameraTargetLng="-77.036871"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="12" />
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
View File

@@ -17,9 +17,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_center_latitude="-1.063510"
app:mapbox_center_longitude=" 32.895425"
app:mapbox_style_url="@string/mapbox_style_satellite_streets"
app:mapbox_zoom="4" />
app:mapbox_cameraTargetLat="-1.063510"
app:mapbox_cameraTargetLng=" 32.895425"
app:mapbox_styleUrl="@string/mapbox_style_satellite_streets"
app:mapbox_cameraZoom="4" />
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
View File

@@ -42,9 +42,9 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_my_location_foreground_tint="@color/primary"
app:mapbox_my_location_accuracy_tint="@color/primary"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="15" />
app:mapbox_myLocationTintColor="@color/primary"
app:mapbox_myLocationAccuracyTintColor="@color/primary"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="15" />
</LinearLayout>

10
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
View File

@@ -17,11 +17,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
app:mapbox_attribution_tint="@android:color/holo_green_dark"
app:mapbox_center_latitude="47.798202"
app:mapbox_center_longitude="7.573781"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="4" />
app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark"
app:mapbox_cameraTargetLat="47.798202"
app:mapbox_cameraTargetLng="7.573781"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="4" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"

14
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
View File

@@ -17,12 +17,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_attribution_gravity="top|end"
app:mapbox_center_latitude="45.1855569"
app:mapbox_center_longitude="5.7215506"
app:mapbox_logo_gravity="top|end"
app:mapbox_logo_margin_right="10dp"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="11" />
app:mapbox_uiAttributionGravity="top|end"
app:mapbox_cameraTargetLat="45.1855569"
app:mapbox_cameraTargetLng="5.7215506"
app:mapbox_uiLogoGravity="top|end"
app:mapbox_uiLogoMarginRight="10dp"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="11" />
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
View File

@@ -80,10 +80,10 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_center_latitude="37.176546"
app:mapbox_center_longitude="-3.599007"
app:mapbox_style_url="@string/mapbox_style_emerald"
app:mapbox_zoom="15" />
app:mapbox_cameraTargetLat="37.176546"
app:mapbox_cameraTargetLng="-3.599007"
app:mapbox_styleUrl="@string/mapbox_style_emerald"
app:mapbox_cameraZoom="15" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
View File

@@ -16,10 +16,10 @@
android:id="@id/mapView"
android:layout_below="@id/toolbar"
android:layout_width="match_parent"
app:mapbox_center_latitude="52.519003"
app:mapbox_center_longitude="13.400972"
app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
app:mapbox_zoom="16"
app:mapbox_cameraTargetLat="52.519003"
app:mapbox_cameraTargetLng="13.400972"
app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
app:mapbox_cameraZoom="16"
android:layout_height="match_parent"/>
<android.support.design.widget.FloatingActionButton

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
View File

@@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_style_url="@string/mapbox_style_light" />
app:mapbox_styleUrl="@string/mapbox_style_light" />
<FrameLayout
android:id="@+id/container"

12
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
View File

@@ -27,11 +27,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
mapbox:mapbox_attribution_gravity="top"
mapbox:mapbox_center_latitude="34.4021"
mapbox:mapbox_center_longitude="-119.7081"
mapbox:mapbox_logo_gravity="top"
mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
mapbox:mapbox_zoom="13" />
mapbox:mapbox_uiAttributionGravity="top"
mapbox:mapbox_cameraTargetLat="34.4021"
mapbox:mapbox_cameraTargetLng="-119.7081"
mapbox:mapbox_uiLogoGravity="top"
mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9"
mapbox:mapbox_cameraZoom="13" />
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
View File

@@ -10,9 +10,9 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
mapbox:mapbox_center_latitude="47.6077"
mapbox:mapbox_center_longitude="-122.3421"
mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
mapbox:mapbox_zoom="11"/>
mapbox:mapbox_cameraTargetLat="47.6077"
mapbox:mapbox_cameraTargetLng="-122.3421"
mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9"
mapbox:mapbox_cameraZoom="11"/>
</LinearLayout>

10
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
View File

@@ -46,11 +46,11 @@ public class CameraPositionTest {
float tilt = 44;
TypedArray typedArray = mock(TypedArray.class);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_direction, 0.0f)).thenReturn(bearing);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_latitude, 0.0f)).thenReturn(latitude);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_longitude, 0.0f)).thenReturn(longitude);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom, 0.0f)).thenReturn(zoom);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_tilt, 0.0f)).thenReturn(tilt);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraBearing, 0.0f)).thenReturn(bearing);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLat, 0.0f)).thenReturn(latitude);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLng, 0.0f)).thenReturn(longitude);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoom, 0.0f)).thenReturn(zoom);
when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTilt, 0.0f)).thenReturn(tilt);
doNothing().when(typedArray).recycle();
CameraPosition cameraPosition = new CameraPosition.Builder(typedArray).build();