diff options
author | Pablo Guardiola <guardiola31337@gmail.com> | 2017-02-28 11:48:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 11:48:40 -0500 |
commit | 283aee0754837a05386bdb6bfacbd5d88156792e (patch) | |
tree | 247ac4efc8b776b32a016acee4942bd288f23a5d /platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml | |
parent | 8e9d6a5b2cb316c90f88d9985afe48ca316a01d3 (diff) | |
download | qtlocation-mapboxgl-283aee0754837a05386bdb6bfacbd5d88156792e.tar.gz |
[WIP] InfoWindow refactor (#8080)
* [android] remove unnecessary info window class and add bubble layout
* fix some PR comments (remove hungarian notation, make bubble popup helper package protected and fix some code style issues)
* refactor replace enum in favor of intdef
* make bubble layout package protected and remove useless info window tip view class
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml | 95 |
1 files changed, 47 insertions, 48 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml index e1673902ef..e4f01cb40f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml @@ -1,56 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> +<com.mapbox.mapboxsdk.annotations.BubbleLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="16dp" + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:paddingTop="14dp" + app:mapbox_bl_arrowDirection="bottom" + app:mapbox_bl_arrowHeight="8dp" + app:mapbox_bl_arrowPosition="16dp" + app:mapbox_bl_arrowWidth="8dp" + app:mapbox_bl_bubbleColor="@android:color/white" + app:mapbox_bl_cornersRadius="6dp" + app:mapbox_bl_strokeColor="@android:color/darker_gray" + app:mapbox_bl_strokeWidth="1dp"> - <LinearLayout - android:id="@+id/infowindow_content" + <TextView + android:id="@+id/infowindow_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/mapbox_infowindow_icon_bg" - android:orientation="vertical" - android:paddingBottom="16dp" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="14dp"> + android:layout_marginBottom="2dp" + android:maxEms="17" + android:text="@string/mapbox_infoWindowTitle" + android:textColor="@android:color/black" + android:textSize="18sp" + android:textStyle="bold"/> - <TextView - android:id="@+id/infowindow_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:maxEms="17" - android:text="@string/mapbox_infoWindowTitle" - android:textColor="@android:color/black" - android:textSize="18sp" - android:textStyle="bold" /> - - <TextView - android:id="@+id/infowindow_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="2dp" - android:layout_marginTop="2dp" - android:lineSpacingExtra="1dp" - android:maxEms="17" - android:text="@string/mapbox_infoWindowDescription" - android:textColor="@color/mapbox_gray" - android:textSize="14sp" /> - - <TextView - android:id="@+id/infowindow_subdescription" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:maxEms="17" - android:text="@string/mapbox_infoWindowAddress" - android:textColor="@android:color/black" - android:textSize="12sp" - android:visibility="gone" /> - </LinearLayout> + <TextView + android:id="@+id/infowindow_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:layout_marginTop="2dp" + android:lineSpacingExtra="1dp" + android:maxEms="17" + android:text="@string/mapbox_infoWindowDescription" + android:textColor="@color/mapbox_gray" + android:textSize="14sp"/> - <com.mapbox.mapboxsdk.annotations.InfoWindowTipView - android:id="@+id/infowindow_tipview" - android:layout_width="@dimen/mapbox_infowindow_tipview_width" - android:layout_height="14dp" - android:layout_below="@+id/infowindow_content" /> + <TextView + android:id="@+id/infowindow_subdescription" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:maxEms="17" + android:text="@string/mapbox_infoWindowAddress" + android:textColor="@android:color/black" + android:textSize="12sp" + android:visibility="gone"/> -</merge> +</com.mapbox.mapboxsdk.annotations.BubbleLayout> |