Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit c1509af

Browse files
author
Langston Smith
authored
Refactoring RelativeLayout to FrameLayout (#1181)
1 parent c3332c5 commit c1509af

File tree

69 files changed

+214
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+214
-282
lines changed

MapboxAndroidDemo/src/china/res/layout/activity_annotation_animated_marker.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
1515
mapbox:mapbox_cameraTargetLng="-18.167040"
1616
mapbox:mapbox_cameraZoom="4.5" />
1717

18-
</RelativeLayout>
18+
</FrameLayout>

MapboxAndroidDemo/src/china/res/layout/activity_annotation_custom_marker.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
1515
mapbox:mapbox_cameraTargetLng="18.52982"
1616
mapbox:mapbox_cameraZoom="8"/>
1717

18-
</RelativeLayout>
18+
</FrameLayout>

MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
1515
mapbox:mapbox_cameraTargetLng="-0.11968"
1616
mapbox:mapbox_cameraZoom="15"/>
1717

18-
</RelativeLayout>
18+
</FrameLayout>

MapboxAndroidDemo/src/china/res/layout/activity_camera_bounding_box.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
1515
mapbox:mapbox_cameraTargetLng="-120.981"
1616
mapbox:mapbox_cameraZoom="4"/>
1717

18-
</RelativeLayout>
18+
</FrameLayout>
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
tools:context=".examples.camera.BoundingBoxCameraActivity">
8+
tools:context=".examples.camera.RestrictCameraActivity">
99

1010
<com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
1111
android:id="@id/mapView"
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent"
1414
mapbox:mapbox_cameraTargetLat="-26.145"
1515
mapbox:mapbox_cameraTargetLng="134.312"
16-
mapbox:mapbox_cameraZoom="2"
17-
/>
16+
mapbox:mapbox_cameraZoom="2" />
1817

19-
</RelativeLayout>
18+
</FrameLayout>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
tools:context=".examples.basics.SimpleMapViewActivity">
8+
tools:context=".examples.labs.MarkerFollowingRouteActivity">
99

1010
<com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
1111
android:id="@+id/mapView"
@@ -15,4 +15,4 @@
1515
mapbox:mapbox_cameraTargetLng="-122.3915"
1616
mapbox:mapbox_cameraZoom="12"/>
1717

18-
</RelativeLayout>
18+
</FrameLayout>
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent">
55

66
<com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
77
android:id="@+id/mapView"
88
android:layout_width="match_parent"
9-
android:layout_height="match_parent"
10-
/>
9+
android:layout_height="match_parent" />
1110

12-
</RelativeLayout>
11+
</FrameLayout>

MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout
2+
<FrameLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -21,8 +21,7 @@
2121
style="?android:attr/progressBarStyleHorizontal"
2222
android:layout_width="match_parent"
2323
android:layout_height="25dp"
24-
android:layout_centerHorizontal="true"
25-
android:layout_centerInParent="true"
24+
android:layout_gravity="center"
2625
android:paddingLeft="25dp"
2726
android:paddingRight="25dp"
2827
android:visibility="gone"/>
@@ -32,7 +31,7 @@
3231
style="?android:attr/buttonBarStyle"
3332
android:layout_width="match_parent"
3433
android:layout_height="56dp"
35-
android:layout_alignParentBottom="true"
34+
android:layout_gravity="bottom"
3635
android:background="@color/colorAccent"
3736
android:elevation="8dp"
3837
android:orientation="horizontal"
@@ -66,4 +65,4 @@
6665
android:textSize="12sp"/>
6766

6867
</LinearLayout>
69-
</RelativeLayout>
68+
</FrameLayout>

0 commit comments

Comments
 (0)