diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png) | bin | 3787 -> 3787 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png) | bin | 3408 -> 3408 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png) | bin | 1520 -> 1520 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png) | bin | 1669 -> 1669 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_bearing.png) | bin | 1046 -> 1046 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_normal.png) | bin | 885 -> 885 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png) | bin | 2488 -> 2488 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png) | bin | 1958 -> 1958 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png) | bin | 1010 -> 1010 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png) | bin | 1115 -> 1115 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_bearing.png) | bin | 649 -> 649 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_normal.png) | bin | 555 -> 555 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png) | bin | 4775 -> 4775 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png) | bin | 4492 -> 4492 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png) | bin | 1995 -> 1995 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png) | bin | 2163 -> 2163 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_bearing.png) | bin | 1345 -> 1345 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_normal.png) | bin | 1096 -> 1096 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png) | bin | 7527 -> 7527 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png) | bin | 7059 -> 7059 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mapview_preview.jpg (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapview_preview.jpg) | bin | 166053 -> 166053 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png) | bin | 2998 -> 2998 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png) | bin | 3163 -> 3163 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_bearing.png) | bin | 1902 -> 1902 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_normal.png) | bin | 1586 -> 1586 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png) | bin | 18537 -> 18537 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png) | bin | 928 -> 928 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png) | bin | 9402 -> 9402 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png) | bin | 4006 -> 4006 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png) | bin | 4071 -> 4071 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_bearing.png) | bin | 3022 -> 3022 bytes | |||
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_normal.png) | bin | 2456 -> 2456 bytes | |||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml | 6 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml | 5 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml | 10 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml | 6 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml | 5 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml | 10 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml) | 16 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_view.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml) | 10 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_preview.xml) | 22 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml (renamed from platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml) | 0 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml | 4 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml | 99 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml | 8 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml | 20 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/integers.xml | 4 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml | 38 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml | 7 |
55 files changed, 129 insertions, 141 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml index 64d7f46c2d..64d7f46c2d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/color/mapbox_material_bg_selector.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png Binary files differindex 6bb20027f4..6bb20027f4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png Binary files differindex c0f4ed2c4c..c0f4ed2c4c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png Binary files differindex 8b0af4c6ab..8b0af4c6ab 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png Binary files differindex 651482f3ee..651482f3ee 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_markerview.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png Binary files differindex c93fa4781a..c93fa4781a 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_bearing.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png Binary files differindex 120b7dd612..120b7dd612 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_mylocationview_normal.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png Binary files differindex cf15ed1876..cf15ed1876 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png Binary files differindex 5a9da3fe39..5a9da3fe39 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png Binary files differindex b112096c18..b112096c18 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png Binary files differindex 63cb7b5f4b..63cb7b5f4b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_markerview.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png Binary files differindex 0d7d89a8b4..0d7d89a8b4 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_bearing.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png Binary files differindex 831ef1acf4..831ef1acf4 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_mylocationview_normal.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml index ef82c18f5d..ef82c18f5d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png Binary files differindex 6257209368..6257209368 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png Binary files differindex 194aa64da2..194aa64da2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png Binary files differindex d05c82bfe2..d05c82bfe2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png Binary files differindex 175f88ff88..175f88ff88 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_markerview.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png Binary files differindex 1056d617e9..1056d617e9 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_bearing.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png Binary files differindex 37b1f7adbf..37b1f7adbf 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_mylocationview_normal.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png Binary files differindex c59b4c7528..c59b4c7528 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png Binary files differindex d1260a16f3..d1260a16f3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapview_preview.jpg b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mapview_preview.jpg Binary files differindex 3a21fc08bc..3a21fc08bc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapview_preview.jpg +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mapview_preview.jpg diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png Binary files differindex 703b172c15..703b172c15 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png Binary files differindex be782e1d4b..be782e1d4b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_markerview.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png Binary files differindex 1ff2590606..1ff2590606 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_bearing.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png Binary files differindex 520b85eff7..520b85eff7 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_mylocationview_normal.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png Binary files differindex da04f5b94c..da04f5b94c 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png Binary files differindex 584b320299..584b320299 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_infowindow_icon_bg.9.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png Binary files differindex 5f9647610a..5f9647610a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png Binary files differindex 8331ffef71..8331ffef71 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png Binary files differindex fe1c486518..fe1c486518 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_markerview.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png Binary files differindex 671c33a08e..671c33a08e 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_bearing.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_normal.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png Binary files differindex f9f4265d2a..f9f4265d2a 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_mylocationview_normal.png +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml deleted file mode 100644 index 48e53e7ee8..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/gray_light" android:state_pressed="true" /> - <item android:drawable="@color/gray_light" android:state_focused="true" /> - <item android:drawable="@android:color/transparent" /> -</selector>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml deleted file mode 100644 index 7f6245b30a..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_info_outline_24dp_selected" android:state_pressed="true" /> - <item android:drawable="@drawable/ic_info_outline_24dp" /> -</selector>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml deleted file mode 100644 index e1df60788e..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_mylocationview_background.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval"> - - <solid android:color="@color/white" /> - - <size - android:width="@dimen/my_locationview_outer_circle" - android:height="@dimen/my_locationview_outer_circle" /> -</shape>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml new file mode 100644 index 0000000000..45073bb1f3 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/mapbox_gray_light" android:state_pressed="true" /> + <item android:drawable="@color/mapbox_gray_light" android:state_focused="true" /> + <item android:drawable="@android:color/transparent" /> +</selector>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml new file mode 100644 index 0000000000..3ead19b781 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/mapbox_info_icon_selected" android:state_pressed="true" /> + <item android:drawable="@drawable/mapbox_info_icon_default" /> +</selector>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml index fa82bb8d9b..fa82bb8d9b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml index 074928d05a..074928d05a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml new file mode 100644 index 0000000000..df0687bbd3 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + + <solid android:color="@android:color/white" /> + + <size + android:width="@dimen/mapbox_my_locationview_outer_circle" + android:height="@dimen/mapbox_my_locationview_outer_circle" /> +</shape>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml index 763bb118e0..763bb118e0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml index 3e36cbf91a..e1673902ef 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml @@ -5,7 +5,7 @@ android:id="@+id/infowindow_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_infowindow_content" + android:background="@drawable/mapbox_infowindow_icon_bg" android:orientation="vertical" android:paddingBottom="16dp" android:paddingLeft="20dp" @@ -18,8 +18,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="2dp" android:maxEms="17" - android:text="@string/infoWindowTitle" - android:textColor="@color/black" + android:text="@string/mapbox_infoWindowTitle" + android:textColor="@android:color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -31,8 +31,8 @@ android:layout_marginTop="2dp" android:lineSpacingExtra="1dp" android:maxEms="17" - android:text="@string/infoWindowDescription" - android:textColor="@color/gray" + android:text="@string/mapbox_infoWindowDescription" + android:textColor="@color/mapbox_gray" android:textSize="14sp" /> <TextView @@ -40,15 +40,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="17" - android:text="@string/infoWindowAddress" - android:textColor="@color/black" + android:text="@string/mapbox_infoWindowAddress" + android:textColor="@android:color/black" android:textSize="12sp" android:visibility="gone" /> </LinearLayout> <com.mapbox.mapboxsdk.annotations.InfoWindowTipView android:id="@+id/infowindow_tipview" - android:layout_width="@dimen/infowindow_tipview_width" + android:layout_width="@dimen/mapbox_infowindow_tipview_width" android:layout_height="14dp" android:layout_below="@+id/infowindow_content" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_view.xml index ff47642426..ff47642426 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_view.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml index 4f032c1008..c6dcd35a2f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml @@ -27,18 +27,18 @@ android:id="@+id/logoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:contentDescription="@string/mapboxIconContentDescription" - android:src="@drawable/attribution_logo" /> + android:contentDescription="@string/mapbox_iconContentDescription" + android:src="@drawable/mapbox_logo_icon" /> <ImageView android:id="@+id/attributionView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:background="@drawable/bg_default_selector" + android:background="@drawable/mapbox_default_bg_selector" android:clickable="true" - android:contentDescription="@string/attributionsIconContentDescription" + android:contentDescription="@string/mapbox_attributionsIconContentDescription" android:padding="7dp" - android:src="@drawable/ic_info_outline_24dp_selector" /> + android:src="@drawable/mapbox_info_bg_selector" /> </merge>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_preview.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml index d8f2193fd5..5517c0cfe6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_preview.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml @@ -8,34 +8,34 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" - android:src="@drawable/mapview_preview" /> + android:src="@drawable/mapbox_mapview_preview" /> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_marginBottom="@dimen/eight_dp" - android:layout_marginLeft="@dimen/eight_dp" - android:contentDescription="@string/mapboxIconContentDescription" - android:src="@drawable/attribution_logo" /> + android:layout_marginBottom="@dimen/mapbox_eight_dp" + android:layout_marginLeft="@dimen/mapbox_eight_dp" + android:contentDescription="@string/mapbox_iconContentDescription" + android:src="@drawable/mapbox_logo_icon" /> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="@dimen/seven_dp" - android:layout_marginLeft="@dimen/seventy_six_dp" - android:background="@drawable/bg_default_selector" + android:layout_marginBottom="@dimen/mapbox_seven_dp" + android:layout_marginLeft="@dimen/mapbox_seventy_six_dp" + android:background="@drawable/mapbox_default_bg_selector" android:clickable="true" - android:contentDescription="@string/attributionsIconContentDescription" - android:src="@drawable/ic_info_outline_24dp_selector" /> + android:contentDescription="@string/mapbox_attributionsIconContentDescription" + android:src="@drawable/mapbox_info_bg_selector" /> <ImageView android:layout_width="48dp" android:layout_height="48dp" android:layout_alignParentRight="true" android:layout_margin="10dp" - android:src="@drawable/compass" /> + android:src="@drawable/mapbox_compass_icon" /> </RelativeLayout>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml index 7e4a079063..7e4a079063 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/view_image_marker.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_view_image_marker.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml index bb466880aa..5a5fd6cb4c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <array name="attribution_names"> + <array name="mapbox_attribution_names"> <item>© Mapbox</item> <item>© OpenStreetMap</item> <item>Improve this map</item> <item>Telemetry Settings</item> </array> <!-- If editing this array update MapView.ATTRIBUTION_INDEX_IMPROVE_THIS_MAP --> - <array name="attribution_links" formatted="false" translatable="false"> + <array name="mapbox_attribution_links" formatted="false" translatable="false"> <item>https://www.mapbox.com/about/maps/</item> <item>http://www.openstreetmap.org/about/</item> <item>https://www.mapbox.com/map-feedback/#/%1$f/%2$f/%3$d</item> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index 458056c14e..12c395d46f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -1,50 +1,48 @@ <resources> <!-- these are public --> - <declare-styleable name="MapView"> + <declare-styleable name="mapbox_MapView"> <!--Configuration--> - <attr name="access_token" format="string" /> - <attr name="style_url" format="string" /> - <attr name="api_base_url" format="string" /> + <attr name="mapbox_styleUrl" format="string" /> + <attr name="mapbox_apiBaseUrl" format="string" /> <!--Camera--> - <attr name="center_longitude" format="float" /> - <attr name="center_latitude" format="float" /> - <attr name="zoom" format="float" /> - <attr name="direction" format="float" /> - <attr name="tilt" format="float" /> + <attr name="mapbox_cameraTargetLat" format="float" /> + <attr name="mapbox_cameraTargetLng" format="float" /> + <attr name="mapbox_cameraZoom" format="float" /> + <attr name="mapbox_cameraBearing" format="float" /> + <attr name="mapbox_cameraTilt" format="float" /> <!--Zoom--> - <attr name="zoom_max" format="float" /> - <attr name="zoom_min" format="float" /> + <attr name="mapbox_cameraZoomMax" format="float" /> + <attr name="mapbox_cameraZoomMin" format="float" /> <!--Gestures--> - <attr name="zoom_enabled" format="boolean" /> - <attr name="scroll_enabled" format="boolean" /> - <attr name="rotate_enabled" format="boolean" /> - <attr name="tilt_enabled" format="boolean" /> - <attr name="debug_active" format="boolean" /> + <attr name="mapbox_uiZoomGestures" format="boolean" /> + <attr name="mapbox_uiScrollGestures" format="boolean" /> + <attr name="mapbox_uiRotateGestures" format="boolean" /> + <attr name="mapbox_uiTiltGestures" format="boolean" /> <!--UI-Controls--> - <attr name="zoom_controls_enabled" format="boolean" /> + <attr name="mapbox_uiZoomControls" format="boolean" /> <!--MyLocation--> - <attr name="my_location_enabled" format="boolean" /> - <attr name="my_location_foreground" format="reference" /> - <attr name="my_location_foreground_bearing" format="reference" /> - <attr name="my_location_foreground_tint" format="color" /> - <attr name="my_location_background" format="reference" /> - <attr name="my_location_background_tint" format="color" /> - <attr name="my_location_background_left" format="dimension" /> - <attr name="my_location_background_top" format="dimension" /> - <attr name="my_location_background_right" format="dimension" /> - <attr name="my_location_background_bottom" format="dimension" /> - <attr name="my_location_accuracy_tint" format="color" /> - <attr name="my_location_accuracy_alpha" format="integer" /> + <attr name="mapbox_myLocation" format="boolean" /> + <attr name="mapbox_myLocationTintColor" format="color" /> + <attr name="mapbox_myLocationDrawable" format="reference" /> + <attr name="mapbox_myLocationBearingDrawable" format="reference" /> + <attr name="mapbox_myLocationBackgroundDrawable" format="reference" /> + <attr name="mapbox_myLocationBackgroundTintColor" format="color" /> + <attr name="mapbox_myLocationBackgroundMarginLeft" format="dimension" /> + <attr name="mapbox_myLocationBackgroundMarginTop" format="dimension" /> + <attr name="mapbox_myLocationBackgroundMarginRight" format="dimension" /> + <attr name="mapbox_myLocationBackgroundMarginBottom" format="dimension" /> + <attr name="mapbox_myLocationAccuracyTintColor" format="color" /> + <attr name="mapbox_myLocationAccuracyAlpha" format="integer" /> <!--Compass--> - <attr name="compass_enabled" format="boolean" /> - <attr name="compass_gravity"> + <attr name="mapbox_uiCompass" format="boolean" /> + <attr name="mapbox_uiCompassGravity"> <flag name="top" value="0x30" /> <flag name="bottom" value="0x50" /> <flag name="left" value="0x03" /> @@ -60,14 +58,15 @@ <flag name="start" value="0x00800003" /> <flag name="end" value="0x00800005" /> </attr> - <attr name="compass_margin_left" format="dimension" /> - <attr name="compass_margin_top" format="dimension" /> - <attr name="compass_margin_right" format="dimension" /> - <attr name="compass_margin_bottom" format="dimension" /> - <attr name="compass_fade_facing_north" format="boolean" /> + <attr name="mapbox_uiCompassMarginLeft" format="dimension" /> + <attr name="mapbox_uiCompassMarginTop" format="dimension" /> + <attr name="mapbox_uiCompassMarginRight" format="dimension" /> + <attr name="mapbox_uiCompassMarginBottom" format="dimension" /> + <attr name="mapbox_uiCompassFadeFacingNorth" format="boolean" /> <!--Logo--> - <attr name="logo_gravity"> + <attr name="mapbox_uiLogo" format="boolean" /> + <attr name="mapbox_uiLogoGravity"> <flag name="top" value="0x30" /> <flag name="bottom" value="0x50" /> <flag name="left" value="0x03" /> @@ -83,14 +82,14 @@ <flag name="start" value="0x00800003" /> <flag name="end" value="0x00800005" /> </attr> - <attr name="logo_margin_left" format="dimension" /> - <attr name="logo_margin_top" format="dimension" /> - <attr name="logo_margin_right" format="dimension" /> - <attr name="logo_margin_bottom" format="dimension" /> - <attr name="logo_enabled" format="boolean" /> + <attr name="mapbox_uiLogoMarginLeft" format="dimension" /> + <attr name="mapbox_uiLogoMarginTop" format="dimension" /> + <attr name="mapbox_uiLogoMarginRight" format="dimension" /> + <attr name="mapbox_uiLogoMarginBottom" format="dimension" /> <!--Attribution--> - <attr name="attribution_gravity"> + <attr name="mapbox_uiAttribution" format="boolean" /> + <attr name="mapbox_uiAttributionGravity"> <flag name="top" value="0x30" /> <flag name="bottom" value="0x50" /> <flag name="left" value="0x03" /> @@ -106,14 +105,14 @@ <flag name="start" value="0x00800003" /> <flag name="end" value="0x00800005" /> </attr> - <attr name="attribution_margin_left" format="dimension" /> - <attr name="attribution_margin_top" format="dimension" /> - <attr name="attribution_margin_right" format="dimension" /> - <attr name="attribution_margin_bottom" format="dimension" /> - <attr name="attribution_enabled" format="boolean" /> - <attr name="attribution_tint" format="color" /> + <attr name="mapbox_uiAttributionMarginLeft" format="dimension" /> + <attr name="mapbox_uiAttributionMarginTop" format="dimension" /> + <attr name="mapbox_uiAttributionMarginRight" format="dimension" /> + <attr name="mapbox_uiAttributionMarginBottom" format="dimension" /> + <attr name="mapbox_uiAttributionTintColor" format="color" /> <!-- Deprecated to use TextureView--> - <attr name="texture_mode" format="boolean" /> + <attr name="mapbox_renderTextureMode" format="boolean" /> + </declare-styleable> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index 63f739c30c..63ef42c2c3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="white">#F9F9F9</color> - <color name="black">#000000</color> - <color name="gray">#7D7F80</color> - <color name="gray_light">#EEEEEE</color> + <color name="mapbox_gray">#7D7F80</color> + <color name="mapbox_gray_light">#EEEEEE</color> <color name="mapbox_blue">#1E8CAB</color> - <color name="my_location_ring">@color/mapbox_blue</color> + <color name="mapbox_my_location_ring">@color/mapbox_blue</color> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index fd0f4b98e7..31b9dd2bcd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="infowindow_tipview_width">20dp</dimen> - <dimen name="infowindow_margin">8dp</dimen> - <dimen name="infowindow_offset">-2dp</dimen> - <dimen name="infowindow_line_width">1.5dp</dimen> - <dimen name="seven_dp">7dp</dimen> - <dimen name="eight_dp">8dp</dimen> - <dimen name="ten_dp">10dp</dimen> - <dimen name="sixteen_dp">16dp</dimen> - <dimen name="seventy_six_dp">76dp</dimen> - <dimen name="my_locationview_outer_circle">18dp</dimen> + <dimen name="mapbox_infowindow_tipview_width">20dp</dimen> + <dimen name="mapbox_infowindow_margin">8dp</dimen> + <dimen name="mapbox_infowindow_offset">-2dp</dimen> + <dimen name="mapbox_infowindow_line_width">1.5dp</dimen> + <dimen name="mapbox_seven_dp">7dp</dimen> + <dimen name="mapbox_eight_dp">8dp</dimen> + <dimen name="mapbox_ten_dp">10dp</dimen> + <dimen name="mapbox_sixteen_dp">16dp</dimen> + <dimen name="mapbox_seventy_six_dp">76dp</dimen> + <dimen name="mapbox_my_locationview_outer_circle">18dp</dimen> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/integers.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/integers.xml deleted file mode 100644 index 3727365659..0000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/integers.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <integer name="style_version">9</integer> -</resources>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index c8bb9d65ba..f15979efc1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="compassContentDescription">Map compass. Click to reset the map rotation to North.</string> - <string name="attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> - <string name="attributionsDialogTitle">Mapbox Android SDK</string> - <string name="attributionTelemetryTitle">Make Mapbox Maps Better</string> - <string name="attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> - <string name="attributionTelemetryPositive">Agree</string> - <string name="attributionTelemetryNegative">Disagree</string> - <string name="attributionTelemetryNeutral">More info</string> - <string name="mapboxIconContentDescription">The Mapbox logo.</string> - <string name="infoWindowTitle">Title</string> - <string name="infoWindowDescription">Description</string> - <string name="infoWindowAddress">Address</string> + <string name="mapbox_compassContentDescription">Map compass. Click to reset the map rotation to North.</string> + <string name="mapbox_attributionsIconContentDescription">Attribution icon. Click to show attribution dialog.</string> + <string name="mapbox_attributionsDialogTitle">Mapbox Android SDK</string> + <string name="mapbox_attributionTelemetryTitle">Make Mapbox Maps Better</string> + <string name="mapbox_attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> + <string name="mapbox_attributionTelemetryPositive">Agree</string> + <string name="mapbox_attributionTelemetryNegative">Disagree</string> + <string name="mapbox_attributionTelemetryNeutral">More info</string> + <string name="mapbox_iconContentDescription">The Mapbox logo.</string> + <string name="mapbox_infoWindowTitle">Title</string> + <string name="mapbox_infoWindowDescription">Description</string> + <string name="mapbox_infoWindowAddress">Address</string> <!-- these are public --> <!-- Using one of these constants means your map style will always use the latest version and may change as we improve the style. --> - <string name="style_mapbox_streets">mapbox://styles/mapbox/streets-v9</string> - <string name="style_outdoors">mapbox://styles/mapbox/outdoors-v9</string> + <string name="mapbox_style_mapbox_streets">mapbox://styles/mapbox/streets-v9</string> + <string name="mapbox_style_outdoors">mapbox://styles/mapbox/outdoors-v9</string> <!-- Note: Emerald style has been deprecated and will be removed in a future release--> - <string name="style_emerald">mapbox://styles/mapbox/emerald-v8</string> - <string name="style_light">mapbox://styles/mapbox/light-v9</string> - <string name="style_dark">mapbox://styles/mapbox/dark-v9</string> - <string name="style_satellite">mapbox://styles/mapbox/satellite-v9</string> - <string name="style_satellite_streets">mapbox://styles/mapbox/satellite-streets-v9</string> + <string name="mapbox_style_emerald">mapbox://styles/mapbox/emerald-v8</string> + <string name="mapbox_style_light">mapbox://styles/mapbox/light-v9</string> + <string name="mapbox_style_dark">mapbox://styles/mapbox/dark-v9</string> + <string name="mapbox_style_satellite">mapbox://styles/mapbox/satellite-v9</string> + <string name="mapbox_style_satellite_streets">mapbox://styles/mapbox/satellite-streets-v9</string> </resources> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml index 708cfc72e9..82d9d1e076 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- these are public --> - <style name="AttributionAlertDialogStyle" parent="Theme.AppCompat.Dialog.Alert"> - <item name="android:textColorPrimary">@android:color/white</item> - </style> - - <style name="TelemAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert"/> + <style name="mapbox_AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert"/> </resources>
\ No newline at end of file |