Refactoring RelativeLayout to FrameLayout

mapbox · Sep 2, 2019 · 0c2f16a · 0c2f16a
1 parent c3332c5
commit 0c2f16a
Show file tree

Hide file tree

Showing 69 changed files with 214 additions and 282 deletions.
diff --git 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="-18.167040"
         mapbox:mapbox_cameraZoom="4.5" />
 
-</RelativeLayout>
+</FrameLayout>
diff --git 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="18.52982"
         mapbox:mapbox_cameraZoom="8"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_marker.xml
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml b/MapboxAndroidDemo/src/china/res/layout/activity_annotation_polygon.xml
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml b/MapboxAndroidDemo/src/china/res/layout/activity_camera_animate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="-0.11968"
         mapbox:mapbox_cameraZoom="15"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="-120.981"
         mapbox:mapbox_cameraZoom="4"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml b/MapboxAndroidDemo/src/china/res/layout/activity_camera_restrict.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".examples.camera.BoundingBoxCameraActivity">
+    tools:context=".examples.camera.RestrictCameraActivity">
 
     <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         mapbox:mapbox_cameraTargetLat="-26.145"
         mapbox:mapbox_cameraTargetLng="134.312"
-        mapbox:mapbox_cameraZoom="2"
-        />
+        mapbox:mapbox_cameraZoom="2" />
 
-</RelativeLayout>
+</FrameLayout>
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
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".examples.basics.SimpleMapViewActivity">
+    tools:context=".examples.labs.MarkerFollowingRouteActivity">
 
     <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
         android:id="@+id/mapView"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="-122.3915"
         mapbox:mapbox_cameraZoom="12"/>
 
-</RelativeLayout>
+</FrameLayout>
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
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
         android:id="@+id/mapView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent" />
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml b/MapboxAndroidDemo/src/china/res/layout/activity_offline_manager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,8 +21,7 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="25dp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:paddingLeft="25dp"
         android:paddingRight="25dp"
         android:visibility="gone"/>
@@ -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"/>
 
     </LinearLayout>
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml b/MapboxAndroidDemo/src/china/res/layout/activity_offline_simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,10 +21,9 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="25dp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:paddingLeft="25dp"
         android:paddingRight="25dp"
         android:visibility="gone"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         mapbox:mapbox_cameraTargetLng="-95.3625"
         mapbox:mapbox_cameraZoom="16"/>
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_highlighted_line.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".examples.basics.SimpleMapViewActivity">
+    tools:context=".examples.query.HighlightedLineActivity">
 
     <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         mapbox:mapbox_cameraTargetLat="50.844999"
         mapbox:mapbox_cameraTargetLng="4.356449"
-        mapbox:mapbox_cameraZoom="15"
-        />
+        mapbox:mapbox_cameraZoom="15" />
 
-</RelativeLayout>
+</FrameLayout>
diff --git 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".examples.query.QueryFeatureActivity">
+    tools:context=".examples.query.SelectBuildingActivity">
 
     <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
         android:id="@+id/mapView"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraTargetLng="-95.3625"
         mapbox:mapbox_cameraZoom="16" />
 
-</RelativeLayout>
+</FrameLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml b/MapboxAndroidDemo/src/china/res/layout/activity_style_color_switcher.xml
@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".examples.styles.ColorSwitcherActivity">
 
+
+    <com.mapbox.mapboxsdk.maps.MapView
+        android:id="@+id/mapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        mapbox:mapbox_cameraTargetLat="45.4385"
+        mapbox:mapbox_cameraTargetLng="12.338"
+        mapbox:mapbox_cameraZoom="17.4"/>
+
     <LinearLayout
         android:id="@+id/color_picker_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
         android:background="#ffffff"
         android:orientation="vertical"
-        android:paddingStart="24dp"
-        android:paddingLeft="24dp"
-        android:paddingTop="24dp"
+        android:paddingBottom="10dp"
         android:paddingEnd="24dp"
+        android:paddingLeft="24dp"
         android:paddingRight="24dp"
-        android:paddingBottom="10dp">
+        android:paddingStart="24dp"
+        android:paddingTop="24dp">
 
         <Spinner
             android:id="@+id/spinner_layer_picker"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:entries="@array/layer_spinner_array" />
+            android:entries="@array/layer_spinner_array"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,14 +45,14 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Red" />
+                android:text="Red"/>
 
             <SeekBar
                 android:id="@+id/red_seek_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:max="255"
-                android:progress="202" />
+                android:progress="202"/>
 
         </LinearLayout>
 
@@ -54,14 +64,14 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Green" />
+                android:text="Green"/>
 
             <SeekBar
                 android:id="@+id/green_seek_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:max="255"
-                android:progress="210" />
+                android:progress="210"/>
 
         </LinearLayout>
 
@@ -73,25 +83,17 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Blue" />
+                android:text="Blue"/>
 
             <SeekBar
                 android:id="@+id/blue_seek_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:max="255"
-                android:progress="211" />
+                android:progress="211"/>
 
         </LinearLayout>
     </LinearLayout>
 
-    <com.mapbox.mapboxsdk.plugins.china.maps.ChinaMapView
-        android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/color_picker_content"
-        mapbox:mapbox_cameraTargetLat="45.4385"
-        mapbox:mapbox_cameraTargetLng="12.338"
-        mapbox:mapbox_cameraZoom="17.4" />
 
-</RelativeLayout>
+</FrameLayout>