From ad2cd98854d56113b60cc9ae89814bf9df532049 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 3 Jan 2023 18:11:14 +0100 Subject: [PATCH 1/7] Replace mapbox watermark on the maps with maplibre #643 --- .../java/com/mapbox/mapboxsdk/maps/MapView.java | 2 +- .../mapboxsdk/snapshotter/MapSnapshotter.java | 2 +- .../main/res/drawable-hdpi/mapbox_logo_icon.png | Bin 4778 -> 0 bytes .../res/drawable-hdpi/maplibre_logo_icon.png | Bin 0 -> 5677 bytes .../main/res/drawable-mdpi/mapbox_logo_icon.png | Bin 2622 -> 0 bytes .../res/drawable-mdpi/maplibre_logo_icon.png | Bin 0 -> 3475 bytes .../res/drawable-xhdpi/mapbox_logo_icon.png | Bin 6579 -> 0 bytes .../res/drawable-xhdpi/maplibre_logo_icon.png | Bin 0 -> 7757 bytes .../res/drawable-xxhdpi/mapbox_logo_icon.png | Bin 10802 -> 0 bytes .../res/drawable-xxhdpi/maplibre_logo_icon.png | Bin 0 -> 11509 bytes .../res/drawable-xxxhdpi/mapbox_logo_icon.png | Bin 14441 -> 0 bytes .../res/drawable-xxxhdpi/maplibre_logo_icon.png | Bin 0 -> 15419 bytes .../mapboxsdk/testapp/annotations/IconTest.java | 6 +++--- 13 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index fe8804b629e..72533e62b3d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -237,7 +237,7 @@ protected ImageView initialiseLogoView() { logoView.setTag("logoView"); logoView.getLayoutParams().width = LayoutParams.WRAP_CONTENT; logoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT; - logoView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.mapbox_logo_icon)); + logoView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.maplibre_logo_icon)); return logoView; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java index 360b4eb77a5..168546621c1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java @@ -660,7 +660,7 @@ private String createAttributionString(MapSnapshot mapSnapshot, boolean shortTex * @return the scaled large logo */ private Logo createScaledLogo(@NonNull Bitmap snapshot) { - Bitmap logo = BitmapFactory.decodeResource(context.getResources(), R.drawable.mapbox_logo_icon, null); + Bitmap logo = BitmapFactory.decodeResource(context.getResources(), R.drawable.maplibre_logo_icon, null); float scale = calculateLogoScale(snapshot, logo); Matrix matrix = new Matrix(); matrix.postScale(scale, scale); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png deleted file mode 100644 index 7568387a8da1c702981dd72c9a154e278a7436ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4778 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 Ef@lR+_y7O^ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8090918fe2b7aa9cf7fcd84a02be12d11e51c2 GIT binary patch literal 5677 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 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..edcde33bb1174204eaaf8382849c65d5fe45e6b8 GIT binary patch literal 3475 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 BtFHh6 literal 0 HcmV?d00001 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png deleted file mode 100644 index 7eec45f4b199ffffb46c4274a7c5973127d084ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6579 zcmV;k8BFGhP)k{d7jDkIlHs7v$L~%lOy!U zAc5xPz#?FN2Z@IEI+#j)1Go*$hHMUGnFBep+#(c`a8?B+partneh>8}u&cmqq0J)m z{>|01BB%vnR9&!AB*R*^Y#D#@$tM@6T)A?5g$fl4t9;$Mbvu)jlXov&x^&NX-+i|` zvJL4q-~w=0Kv{NHHV48ukQqVEMT>f14KSx#=g*%%$DMcHc~XZC9qQDtU%zpI0tHGc zKN{@WvuE?XdGlrt88T$?z<~od@7=ris8{z0;R;X!d)Uj%4zf9rjsqD9s_f3DU~${> z<(FTsbnm_QUR}6w;j%U_E8(tPyMBG=op*-z=+Q$O)xs7cQ^9>UBRkA82ddLT$|T-t zshw;knCRsFEu*mnRko;v)Yzdn-E>pJE3drLu2iW~wNJ!IH*em&yldC4Uw`t+CtE#w zvR|iw+fM}je;JJ`jQ6YK<1flcD;@rJC?ik)?070%{FY<@a9ubJ++o}R=qQp#Q#i~GomNbpiMwCu!$2V z{%Jz$ez$4Urfu;INI(VpwoDGA&6SZ2*&K)zRJor@h%Ilu^;QkET$VNIfddD29-5+ZyjinmZTt4^tHXdmeK^g;vj1dr01miYzfOxa#g!XwxFO;G z`|rO)@yx=iRjcN{{`%|RzW@IFoA&M7cf@Vis8OT*k3RZn&9*>XT%2yP0s%ANju|s% z^#1I#&vd}51Q)O8hJpu?ri@K6W<1kw#rI_YHLB?-vH{2AiCuMBKwZ*C!@m0Jt5;?A;DlXy00DikTeogWA{Yd- zXV2b?&vkyea^)6(^UXJ{PdVk37D4s&O}>34g8Cli>Wj4MjG(&YX;C!RS?$df<9+ z4wzYil>pe?il`AXEi!?4B7Q6YqtVmCsSk=bL7?)=U_(%2n-6Mitw1AFgf3{|O$H_0 z;?+4|&^$`d>J>x3Q?iGzqxS0Jmv*ue$20;w4L#%=hDuKW?2gX;PYZA)!gR5S#)^LkjdgP3$R3 z2%w+y>Z`9VTCG~Of;)HaJowX3Kkb+@WlBaGO5=(Nx>RY?rcIF=HEI;ty?ghepMU;2 zZQ8VHmTq|(mjbnjCA1kre0+S)Yp%H_p=#Bt@m#*v-;w-)hdkyG1Yt*dw3FdagvZL+tC#(R_r))=FCqJ%JnY&)YR13FTM2AW44{> zb6D(m=+L2Lw;pE8vNzs%;|W`juq`OY3eEz}cM;5+5$pkcH_>gc_|~mkr#$=Yvt3n} zaehu;mJ8{F1i`dd*r`*eE_^S^;zJKT^f3LunZ?p~|Ni~U0_aY2#{i9M!Ls0GqQ`FZ zgxlunr=RYjejs+ z&6LMstt;Osqd2!-Dd0|a1Yct+--VGQM}FR}UAwuwLFjRk<IKUl^r~IFfDK1yiePD2wi1v=pMA` z@#Du2MO!s3Sg@e9c~n@oY}vGP&N*ikV?RtKp|n>X1hv{Dk34dpZ8%}Vgs-62f-7#j z&D)}|@RwhHnRNEqXOBmik5X^|90#fojlmGtSJ@@p&f3CSTfT>rPb5Tc|-n41c66E83gjQL-H8jCA2oyw_0SL{AKmuf9)7JLN)VG)dVQFZBt&p

L7~>ITNnP|gAcj{2`S$Uqr(JW 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 literal 0 HcmV?d00001 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png deleted file mode 100644 index 5876056f1c4f403de7d44332d68b23814cc76fa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10802 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 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..743bce99ce059f4e4cb884d83daac784bc89baa7 GIT binary patch literal 11509 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 Date: Tue, 3 Jan 2023 20:15:51 +0100 Subject: [PATCH 2/7] Change resourcePrefix to maplibre_ #647 --- .../android/MapboxGLAndroidSDK/build.gradle | 2 +- .../annotations/BubblePopupHelper.java | 4 +-- .../mapboxsdk/annotations/IconFactory.java | 2 +- .../mapboxsdk/annotations/InfoWindow.java | 4 +-- .../mapbox/mapboxsdk/annotations/Marker.java | 2 +- .../location/LayerBitmapProvider.java | 2 +- .../location/LocationComponentOptions.java | 4 +-- .../mapboxsdk/maps/AnnotationManager.java | 2 +- .../maps/AttributionDialogManager.java | 6 ++-- .../mapboxsdk/maps/MapGestureDetector.java | 16 +++++----- .../com/mapbox/mapboxsdk/maps/MapView.java | 8 ++--- .../mapboxsdk/maps/MapboxMapOptions.java | 2 +- .../com/mapbox/mapboxsdk/maps/UiSettings.java | 12 +++---- .../mapboxsdk/offline/OfflineManager.java | 2 +- .../mapboxsdk/snapshotter/MapSnapshotter.java | 6 ++-- .../mapbox/mapboxsdk/utils/ColorUtils.java | 6 ++-- .../src/main/res-public/values/public.xml | 14 ++++---- ...ass_icon.png => maplibre_compass_icon.png} | Bin ...go_helmet.png => maplibre_logo_helmet.png} | Bin ...t.png => maplibre_marker_icon_default.png} | Bin ...g => maplibre_markerview_icon_default.png} | Bin ...g => maplibre_mylocation_icon_bearing.png} | Bin ...g => maplibre_mylocation_icon_default.png} | Bin ...ass_icon.png => maplibre_compass_icon.png} | Bin ...go_helmet.png => maplibre_logo_helmet.png} | Bin ...t.png => maplibre_marker_icon_default.png} | Bin ...g => maplibre_markerview_icon_default.png} | Bin ...g => maplibre_mylocation_icon_bearing.png} | Bin ...g => maplibre_mylocation_icon_default.png} | Bin ...ass_icon.png => maplibre_compass_icon.png} | Bin ...go_helmet.png => maplibre_logo_helmet.png} | Bin ...t.png => maplibre_marker_icon_default.png} | Bin ...g => maplibre_markerview_icon_default.png} | Bin ...g => maplibre_mylocation_icon_bearing.png} | Bin ...g => maplibre_mylocation_icon_default.png} | Bin ...ass_icon.png => maplibre_compass_icon.png} | Bin ...go_helmet.png => maplibre_logo_helmet.png} | Bin ...t.png => maplibre_marker_icon_default.png} | Bin ...g => maplibre_markerview_icon_default.png} | Bin ...g => maplibre_mylocation_icon_bearing.png} | Bin ...g => maplibre_mylocation_icon_default.png} | Bin ...ass_icon.png => maplibre_compass_icon.png} | Bin ...go_helmet.png => maplibre_logo_helmet.png} | Bin ...t.png => maplibre_marker_icon_default.png} | Bin ...g => maplibre_markerview_icon_default.png} | Bin ...g => maplibre_mylocation_icon_bearing.png} | Bin ...g => maplibre_mylocation_icon_default.png} | Bin .../res/drawable/mapbox_info_bg_selector.xml | 5 --- .../drawable/maplibre_info_bg_selector.xml | 5 +++ ...ult.xml => maplibre_info_icon_default.xml} | 0 ...ed.xml => maplibre_info_icon_selected.xml} | 0 ...e.xml => maplibre_mylocation_bg_shape.xml} | 4 +-- ... => maplibre_popup_window_transparent.xml} | 0 ...corner.xml => maplibre_rounded_corner.xml} | 0 ...con.xml => maplibre_user_bearing_icon.xml} | 0 ...x_user_icon.xml => maplibre_user_icon.xml} | 0 ...adow.xml => maplibre_user_icon_shadow.xml} | 0 ...stale.xml => maplibre_user_icon_stale.xml} | 0 ...k_icon.xml => maplibre_user_puck_icon.xml} | 0 ...icon.xml => maplibre_user_stroke_icon.xml} | 0 ...xml => maplibre_attribution_list_item.xml} | 2 +- ...nt.xml => maplibre_infowindow_content.xml} | 2 +- ...ker.xml => maplibre_view_image_marker.xml} | 0 .../src/main/res/values-bg/strings.xml | 12 +++---- .../src/main/res/values-ca/strings.xml | 12 +++---- .../src/main/res/values-cs/strings.xml | 14 ++++---- .../src/main/res/values-es/strings.xml | 14 ++++---- .../src/main/res/values-fr/strings.xml | 14 ++++---- .../src/main/res/values-gl/strings.xml | 14 ++++---- .../src/main/res/values-he/strings.xml | 14 ++++---- .../src/main/res/values-hu/strings.xml | 10 +++--- .../src/main/res/values-iw/strings.xml | 14 ++++---- .../src/main/res/values-ko/strings.xml | 14 ++++---- .../src/main/res/values-lt/strings.xml | 12 +++---- .../src/main/res/values-nl/strings.xml | 12 +++---- .../src/main/res/values-pl/strings.xml | 14 ++++---- .../src/main/res/values-pt-rPT/strings.xml | 14 ++++---- .../src/main/res/values-ru/strings.xml | 14 ++++---- .../src/main/res/values-sv/strings.xml | 14 ++++---- .../src/main/res/values-uk/strings.xml | 14 ++++---- .../src/main/res/values-vi/strings.xml | 14 ++++---- .../src/main/res/values-zh-rCN/strings.xml | 14 ++++---- .../src/main/res/values-zh-rHK/strings.xml | 14 ++++---- .../src/main/res/values-zh-rTW/strings.xml | 14 ++++---- .../src/main/res/values/attrs.xml | 4 +-- .../src/main/res/values/colors.xml | 10 +++--- .../src/main/res/values/dimens.xml | 30 +++++++++--------- .../src/main/res/values/strings.xml | 14 ++++---- .../src/main/res/values/styles.xml | 20 ++++++------ ...ocationComponentActivationOptionsTest.java | 2 +- .../LocationComponentOptionsTest.java | 2 +- .../location/LocationComponentTest.kt | 4 +-- .../testapp/annotations/IconTest.java | 2 +- .../testapp/maps/widgets/AttributionTest.java | 6 ++-- ...yRenderedFeaturesBoxSymbolCountActivity.kt | 2 +- .../DynamicInfoWindowAdapterActivity.kt | 2 +- .../LocationComponentActivationActivity.kt | 2 +- .../MapSnapshotterBitMapOverlayActivity.kt | 2 +- .../main/res/layout/activity_map_padding.xml | 6 ++-- .../layout/activity_textureview_animate.xml | 2 +- 100 files changed, 252 insertions(+), 252 deletions(-) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_compass_icon.png => maplibre_compass_icon.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_logo_helmet.png => maplibre_logo_helmet.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_marker_icon_default.png => maplibre_marker_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_markerview_icon_default.png => maplibre_markerview_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_mylocation_icon_bearing.png => maplibre_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_mylocation_icon_default.png => maplibre_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_compass_icon.png => maplibre_compass_icon.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_logo_helmet.png => maplibre_logo_helmet.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_marker_icon_default.png => maplibre_marker_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_markerview_icon_default.png => maplibre_markerview_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_mylocation_icon_bearing.png => maplibre_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_mylocation_icon_default.png => maplibre_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_compass_icon.png => maplibre_compass_icon.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_logo_helmet.png => maplibre_logo_helmet.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_marker_icon_default.png => maplibre_marker_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_markerview_icon_default.png => maplibre_markerview_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_mylocation_icon_bearing.png => maplibre_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_mylocation_icon_default.png => maplibre_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_compass_icon.png => maplibre_compass_icon.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_logo_helmet.png => maplibre_logo_helmet.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_marker_icon_default.png => maplibre_marker_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_markerview_icon_default.png => maplibre_markerview_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_mylocation_icon_bearing.png => maplibre_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_mylocation_icon_default.png => maplibre_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_compass_icon.png => maplibre_compass_icon.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_logo_helmet.png => maplibre_logo_helmet.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_marker_icon_default.png => maplibre_marker_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_markerview_icon_default.png => maplibre_markerview_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_mylocation_icon_bearing.png => maplibre_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_mylocation_icon_default.png => maplibre_mylocation_icon_default.png} (100%) delete mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml create mode 100644 platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_info_icon_default.xml => maplibre_info_icon_default.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_info_icon_selected.xml => maplibre_info_icon_selected.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_mylocation_bg_shape.xml => maplibre_mylocation_bg_shape.xml} (58%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_popup_window_transparent.xml => maplibre_popup_window_transparent.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_rounded_corner.xml => maplibre_rounded_corner.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_bearing_icon.xml => maplibre_user_bearing_icon.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_icon.xml => maplibre_user_icon.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_icon_shadow.xml => maplibre_user_icon_shadow.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_icon_stale.xml => maplibre_user_icon_stale.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_puck_icon.xml => maplibre_user_puck_icon.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_user_stroke_icon.xml => maplibre_user_stroke_icon.xml} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/layout/{mapbox_attribution_list_item.xml => maplibre_attribution_list_item.xml} (91%) rename platform/android/MapboxGLAndroidSDK/src/main/res/layout/{mapbox_infowindow_content.xml => maplibre_infowindow_content.xml} (97%) rename platform/android/MapboxGLAndroidSDK/src/main/res/layout/{mapbox_view_image_marker.xml => maplibre_view_image_marker.xml} (100%) diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index c0c5cd66fe4..bea1f00a880 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -53,7 +53,7 @@ android { nativeBuild(nativeTargets) // avoid naming conflicts, force usage of prefix - resourcePrefix 'mapbox_' + resourcePrefix 'maplibre_' sourceSets { // limit amount of exposed library resources diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java index f1090101759..b174cbc74fc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java @@ -25,9 +25,9 @@ static PopupWindow create(@NonNull Context context, @NonNull BubbleLayout bubble // change background color to transparent Drawable drawable; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - drawable = context.getDrawable(R.drawable.mapbox_popup_window_transparent); + drawable = context.getDrawable(R.drawable.maplibre_popup_window_transparent); } else { - drawable = context.getResources().getDrawable(R.drawable.mapbox_popup_window_transparent); + drawable = context.getResources().getDrawable(R.drawable.maplibre_popup_window_transparent); } popupWindow.setBackgroundDrawable(drawable); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java index 0b9050e3a4e..09f7365f351 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java @@ -117,7 +117,7 @@ public Icon fromResource(@DrawableRes int resourceId) { */ public Icon defaultMarker() { if (defaultMarker == null) { - defaultMarker = fromResource(R.drawable.mapbox_marker_icon_default); + defaultMarker = fromResource(R.drawable.maplibre_marker_icon_default); } return defaultMarker; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java index 19e4ccbd56a..13f1c29cf9e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java @@ -154,8 +154,8 @@ InfoWindow open(@NonNull MapView mapView, Marker boundMarker, @NonNull LatLng po final float mapRight = mapView.getRight(); final float mapLeft = mapView.getLeft(); - float marginHorizontal = resources.getDimension(R.dimen.mapbox_infowindow_margin); - float tipViewOffset = resources.getDimension(R.dimen.mapbox_infowindow_tipview_width) / 2; + float marginHorizontal = resources.getDimension(R.dimen.maplibre_infowindow_margin); + float tipViewOffset = resources.getDimension(R.dimen.maplibre_infowindow_tipview_width) / 2; float tipViewMarginLeft = view.getMeasuredWidth() / 2 - tipViewOffset; boolean outOfBoundsLeft = false; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 5d208afce4d..e5129093456 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -244,7 +244,7 @@ private InfoWindow showInfoWindow(InfoWindow iw, MapView mapView) { @Nullable private InfoWindow getInfoWindow(@NonNull MapView mapView) { if (infoWindow == null && mapView.getContext() != null) { - infoWindow = new InfoWindow(mapView, R.layout.mapbox_infowindow_content, getMapboxMap()); + infoWindow = new InfoWindow(mapView, R.layout.maplibre_infowindow_content, getMapboxMap()); } return infoWindow; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java index 0e76b1a8c08..da36a039f06 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java @@ -27,7 +27,7 @@ Bitmap generateBitmap(@DrawableRes int drawableRes, @ColorInt Integer tintColor) } Bitmap generateShadowBitmap(@NonNull LocationComponentOptions options) { - Drawable shadowDrawable = BitmapUtils.getDrawableFromRes(context, R.drawable.mapbox_user_icon_shadow); + Drawable shadowDrawable = BitmapUtils.getDrawableFromRes(context, R.drawable.maplibre_user_icon_shadow); return generateShadow(shadowDrawable, options.elevation()); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java index 7e0d65963c9..03b6a6c73e0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java @@ -307,10 +307,10 @@ public static LocationComponentOptions createFromAttributes(@NonNull Context con R.styleable.mapbox_LocationComponent_mapbox_trackingGesturesManagement, false)); builder.trackingInitialMoveThreshold(typedArray.getDimension( R.styleable.mapbox_LocationComponent_mapbox_trackingInitialMoveThreshold, - context.getResources().getDimension(R.dimen.mapbox_locationComponentTrackingInitialMoveThreshold))); + context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingInitialMoveThreshold))); builder.trackingMultiFingerMoveThreshold(typedArray.getDimension( R.styleable.mapbox_LocationComponent_mapbox_trackingMultiFingerMoveThreshold, - context.getResources().getDimension(R.dimen.mapbox_locationComponentTrackingMultiFingerMoveThreshold))); + context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingMultiFingerMoveThreshold))); builder.padding(new int[] { typedArray.getInt(R.styleable.mapbox_LocationComponent_mapbox_iconPaddingLeft, 0), diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java index a33c409760d..c1983f310f6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java @@ -345,7 +345,7 @@ boolean onTap(@NonNull PointF tapPoint) { } private ShapeAnnotationHit getShapeAnnotationHitFromTap(PointF tapPoint) { - float touchTargetSide = Mapbox.getApplicationContext().getResources().getDimension(R.dimen.mapbox_eight_dp); + float touchTargetSide = Mapbox.getApplicationContext().getResources().getDimension(R.dimen.maplibre_eight_dp); RectF tapRect = new RectF( tapPoint.x - touchTargetSide, tapPoint.y - touchTargetSide, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java index 87037ee3b45..df683b1b4d2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java @@ -75,8 +75,8 @@ public void onClick(@NonNull View view) { protected void showAttributionDialog(@NonNull String[] attributionTitles) { AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.mapbox_attributionsDialogTitle); - builder.setAdapter(new ArrayAdapter<>(context, R.layout.mapbox_attribution_list_item, attributionTitles), this); + builder.setTitle(R.string.maplibre_attributionsDialogTitle); + builder.setAdapter(new ArrayAdapter<>(context, R.layout.maplibre_attribution_list_item, attributionTitles), this); dialog = builder.show(); } @@ -162,7 +162,7 @@ private void showWebPage(@NonNull String url) { context.startActivity(intent); } catch (ActivityNotFoundException exception) { // explicitly handling if the device hasn't have a web browser installed. #8899 - Toast.makeText(context, R.string.mapbox_attributionErrorNoBrowser, Toast.LENGTH_LONG).show(); + Toast.makeText(context, R.string.maplibre_attributionErrorNoBrowser, Toast.LENGTH_LONG).show(); MapStrictMode.strictModeViolation(exception); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java index 94e29f31187..0e41e631168 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java @@ -126,16 +126,16 @@ private void initializeGestureListeners(@NonNull Context context, boolean attach com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold)); MoveGestureListener moveGestureListener = new MoveGestureListener(); ScaleGestureListener scaleGestureListener = new ScaleGestureListener( - context.getResources().getDimension(R.dimen.mapbox_density_constant), - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_speed), - context.getResources().getDimension(R.dimen.mapbox_minimum_angled_scale_speed), - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_velocity) + context.getResources().getDimension(R.dimen.maplibre_density_constant), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_speed), + context.getResources().getDimension(R.dimen.maplibre_minimum_angled_scale_speed), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_velocity) ); RotateGestureListener rotateGestureListener = new RotateGestureListener( - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_span_when_rotating), - context.getResources().getDimension(R.dimen.mapbox_density_constant), - context.getResources().getDimension(R.dimen.mapbox_angular_velocity_multiplier), - context.getResources().getDimension(R.dimen.mapbox_minimum_angular_velocity), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_span_when_rotating), + context.getResources().getDimension(R.dimen.maplibre_density_constant), + context.getResources().getDimension(R.dimen.maplibre_angular_velocity_multiplier), + context.getResources().getDimension(R.dimen.maplibre_minimum_angular_velocity), context.getResources().getDimension( com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold)); ShoveGestureListener shoveGestureListener = new ShoveGestureListener(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 72533e62b3d..b609c7d17a4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -144,7 +144,7 @@ protected void initialize(@NonNull final Context context, @NonNull final MapboxM mapboxMapOptions = options; // add accessibility support - setContentDescription(context.getString(R.string.mapbox_mapActionDescription)); + setContentDescription(context.getString(R.string.maplibre_mapActionDescription)); setWillNotDraw(false); initialiseDrawingSurface(options); } @@ -209,7 +209,7 @@ protected CompassView initialiseCompassView() { compassView.setTag("compassView"); compassView.getLayoutParams().width = LayoutParams.WRAP_CONTENT; compassView.getLayoutParams().height = LayoutParams.WRAP_CONTENT; - compassView.setContentDescription(getResources().getString(R.string.mapbox_compassContentDescription)); + compassView.setContentDescription(getResources().getString(R.string.maplibre_compassContentDescription)); compassView.injectCompassAnimationListener(createCompassAnimationListener(cameraDispatcher)); compassView.setOnClickListener(createCompassClickListener(cameraDispatcher)); return compassView; @@ -224,8 +224,8 @@ protected ImageView initialiseAttributionView() { attrView.setAdjustViewBounds(true); attrView.setClickable(true); attrView.setFocusable(true); - attrView.setContentDescription(getResources().getString(R.string.mapbox_attributionsIconContentDescription)); - attrView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.mapbox_info_bg_selector)); + attrView.setContentDescription(getResources().getString(R.string.maplibre_attributionsIconContentDescription)); + attrView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.maplibre_info_bg_selector)); // inject widgets with MapboxMap attrView.setOnClickListener(attributionClickListener = new AttributionClickListener(getContext(), mapboxMap)); return attrView; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index dd699c4cf0b..29b6e65789f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -235,7 +235,7 @@ static MapboxMapOptions createFromAttributes(@NonNull MapboxMapOptions mapboxMap Drawable compassDrawable = typedArray.getDrawable( R.styleable.mapbox_MapView_mapbox_uiCompassDrawable); if (compassDrawable == null) { - compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.mapbox_compass_icon, null); + compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.maplibre_compass_icon, null); } mapboxMapOptions.compassImage(compassDrawable); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index b59e944d5f5..6c4c11958b7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -189,12 +189,12 @@ private void initialiseCompass(MapboxMapOptions options, @NonNull Resources reso if (compassMargins != null) { setCompassMargins(compassMargins[0], compassMargins[1], compassMargins[2], compassMargins[3]); } else { - int tenDp = (int) resources.getDimension(R.dimen.mapbox_four_dp); + int tenDp = (int) resources.getDimension(R.dimen.maplibre_four_dp); setCompassMargins(tenDp, tenDp, tenDp, tenDp); } setCompassFadeFacingNorth(options.getCompassFadeFacingNorth()); if (options.getCompassImage() == null) { - options.compassImage(ResourcesCompat.getDrawable(resources, R.drawable.mapbox_compass_icon, null)); + options.compassImage(ResourcesCompat.getDrawable(resources, R.drawable.maplibre_compass_icon, null)); } setCompassImage(options.getCompassImage()); } @@ -241,7 +241,7 @@ private void setLogoMargins(@NonNull Resources resources, @Nullable int[] logoMa setLogoMargins(logoMargins[0], logoMargins[1], logoMargins[2], logoMargins[3]); } else { // user did not specify margins when programmatically creating a map - int fourDp = (int) resources.getDimension(R.dimen.mapbox_four_dp); + int fourDp = (int) resources.getDimension(R.dimen.maplibre_four_dp); setLogoMargins(fourDp, fourDp, fourDp, fourDp); } } @@ -287,8 +287,8 @@ private void setAttributionMargins(@NonNull Context context, @Nullable int[] att } else { // user did not specify margins when programmatically creating a map Resources resources = context.getResources(); - int margin = (int) resources.getDimension(R.dimen.mapbox_four_dp); - int leftMargin = (int) resources.getDimension(R.dimen.mapbox_ninety_two_dp); + int margin = (int) resources.getDimension(R.dimen.maplibre_four_dp); + int leftMargin = (int) resources.getDimension(R.dimen.maplibre_ninety_two_dp); setAttributionMargins(leftMargin, margin, margin, margin); } } @@ -718,7 +718,7 @@ public void setAttributionTintColor(@ColorInt int tintColor) { } if (Color.alpha(tintColor) == 0) { ColorUtils.setTintList(attributionsView, - ContextCompat.getColor(attributionsView.getContext(), R.color.mapbox_blue)); + ContextCompat.getColor(attributionsView.getContext(), R.color.maplibre_blue)); } else { ColorUtils.setTintList(attributionsView, tintColor); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index da199f9313b..1ffd942ab3d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -607,7 +607,7 @@ public void createOfflineRegion(@NonNull OfflineRegionDefinition definition, @No @NonNull final CreateOfflineRegionCallback callback) { if (!isValidOfflineRegionDefinition(definition)) { callback.onError( - String.format(context.getString(R.string.mapbox_offline_error_region_definition_invalid), + String.format(context.getString(R.string.maplibre_offline_error_region_definition_invalid), definition.getBounds()) ); return; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java index 168546621c1..ce51a4ad9a2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java @@ -617,7 +617,7 @@ private void drawAttribution(Canvas canvas, AttributionMeasure measure, PointF a @NonNull private TextView createTextView(@NonNull MapSnapshot mapSnapshot, boolean shortText, float scale) { - int textColor = ResourcesCompat.getColor(context.getResources(), R.color.mapbox_gray_dark, context.getTheme()); + int textColor = ResourcesCompat.getColor(context.getResources(), R.color.maplibre_gray_dark, context.getTheme()); int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); TextView textView = new TextView(context); @@ -628,7 +628,7 @@ private TextView createTextView(@NonNull MapSnapshot mapSnapshot, boolean shortT textView.setSingleLine(true); textView.setTextSize(10 * scale); textView.setTextColor(textColor); - textView.setBackgroundResource(R.drawable.mapbox_rounded_corner); + textView.setBackgroundResource(R.drawable.maplibre_rounded_corner); textView.setText(Html.fromHtml(createAttributionString(mapSnapshot, shortText))); textView.measure(widthMeasureSpec, heightMeasureSpec); textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight()); @@ -664,7 +664,7 @@ private Logo createScaledLogo(@NonNull Bitmap snapshot) { float scale = calculateLogoScale(snapshot, logo); Matrix matrix = new Matrix(); matrix.postScale(scale, scale); - Bitmap helmet = BitmapFactory.decodeResource(context.getResources(), R.drawable.mapbox_logo_helmet, null); + Bitmap helmet = BitmapFactory.decodeResource(context.getResources(), R.drawable.maplibre_logo_helmet, null); Bitmap large = Bitmap.createBitmap(logo, 0, 0, logo.getWidth(), logo.getHeight(), matrix, true); Bitmap small = Bitmap.createBitmap(helmet, 0, 0, helmet.getWidth(), helmet.getHeight(), matrix, true); return new Logo(large, small, scale); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index bb75efb0388..e771dec261b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -41,7 +41,7 @@ public static int getPrimaryColor(@NonNull Context context) { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_blue); + return getColorCompat(context, R.color.maplibre_blue); } } @@ -60,7 +60,7 @@ public static int getPrimaryDarkColor(@NonNull Context context) { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_blue); + return getColorCompat(context, R.color.maplibre_blue); } } @@ -79,7 +79,7 @@ public static int getAccentColor(@NonNull Context context) { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_gray); + return getColorCompat(context, R.color.maplibre_gray); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index 95dbebdd8a8..a0680df4a23 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -1,5 +1,5 @@ - + @@ -91,11 +91,11 @@ - - - - - + + + + + @@ -106,7 +106,7 @@ - + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png 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 deleted file mode 100644 index 01fc7cc2e89..00000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml new file mode 100644 index 00000000000..d22f210ec2c --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_selected.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_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/maplibre_mylocation_bg_shape.xml similarity index 58% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml index 21054aabcb3..91d2681e1fe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml @@ -5,6 +5,6 @@ + android:width="@dimen/maplibre_my_locationview_outer_circle" + android:height="@dimen/maplibre_my_locationview_outer_circle" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml similarity index 91% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml index f275860d59e..dd3bcab89eb 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml @@ -11,4 +11,4 @@ android:textAllCaps="true" android:textIsSelectable="false" android:textAppearance="?android:attr/textAppearanceButton" - android:textColor="@color/mapbox_blue"/> + android:textColor="@color/maplibre_blue"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml similarity index 97% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml index 3a353962576..0aad88213a0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml @@ -38,7 +38,7 @@ android:textIsSelectable="false" android:lineSpacingExtra="1dp" android:maxEms="17" - android:textColor="@color/mapbox_gray" + android:textColor="@color/maplibre_gray" android:textSize="14sp"/> - Компас на картата. Активирай, за да насочиш картата на север. - Иконка функции. Активирай, за да покажеш диалог функции. - Изглед локация. Това показва местоположението ти на картата. - Показва карта създадена с MapLibre. Скролни с два пръста. Мащабирай с два пръста. - MapLibre Android SDK - Предоставените OfflineRegionDefinition не пасват в границите на света: %s + Компас на картата. Активирай, за да насочиш картата на север. + Иконка функции. Активирай, за да покажеш диалог функции. + Изглед локация. Това показва местоположението ти на картата. + Показва карта създадена с MapLibre. Скролни с два пръста. Мащабирай с два пръста. + MapLibre Android SDK + Предоставените OfflineRegionDefinition не пасват в границите на света: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml index 43fe9666076..e0e4e250a21 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml @@ -1,10 +1,10 @@ - Brúixola del mapa. Activa per restablir la rotació del mapa al Nord. - Icona d’atribució. Activa per mostrar el diàleg de l’atribució. - Vista de posició. Mostra la teva posició al mapa. - Mostrant un mapa creat amb MapLibre. Desplaça’t arrossegant amb dos dits. Fes zoom pessigant amb dos dits. - MapLibre Android SDK - La OfflineRegionDefinition proporcionada no encaixa amb els límits del món: %s + Brúixola del mapa. Activa per restablir la rotació del mapa al Nord. + Icona d’atribució. Activa per mostrar el diàleg de l’atribució. + Vista de posició. Mostra la teva posició al mapa. + Mostrant un mapa creat amb MapLibre. Desplaça’t arrossegant amb dos dits. Fes zoom pessigant amb dos dits. + MapLibre Android SDK + La OfflineRegionDefinition proporcionada no encaixa amb els límits del món: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml index bf7f13a3976..e9b2978f775 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml @@ -1,10 +1,10 @@ - Kompas. Nastavit natočení mapy k severu. - Atributy. Zobrazit nastavení atributů. - Zobrazení polohy. Zobrazit umístění na mapě. - Zobrazení mapy vytvořené s MapLibre. Posunout tažením dvěma prsty. Změnit velikost roztažením dvou prstů. - MapLibre Maps SDK pro Android - Na zařízení není nainstalován webový prohlížeč, webovou stránku nelze zobrazit. - Pokud OfflineRegionDefinition neodpovídá hranicím: %s + Kompas. Nastavit natočení mapy k severu. + Atributy. Zobrazit nastavení atributů. + Zobrazení polohy. Zobrazit umístění na mapě. + Zobrazení mapy vytvořené s MapLibre. Posunout tažením dvěma prsty. Změnit velikost roztažením dvou prstů. + MapLibre Maps SDK pro Android + Na zařízení není nainstalován webový prohlížeč, webovou stránku nelze zobrazit. + Pokud OfflineRegionDefinition neodpovídá hranicím: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml index 5a247ad9ceb..a5f148553a8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml @@ -1,10 +1,10 @@ - Brújula del mapa. Actívala para restablecer la rotación del mapa al norte. - Ícono de atribución. Actívalo para mostrar el diálogo de atribución. - Vista de ubicación. Muestra tu ubicación en el mapa. - Se está mostrando un mapa creado con MapLibre. Arrastra dos dedos para desplazarte o pellizca para acercar. - MapLibre Maps SDK para Android - No puede abrir la página Web porque no hay un navegador Web en el dispositivo. - El parámetro OfflineRegionDefinition que se ingresó no coincide con los límites mundiales: %s + Brújula del mapa. Actívala para restablecer la rotación del mapa al norte. + Ícono de atribución. Actívalo para mostrar el diálogo de atribución. + Vista de ubicación. Muestra tu ubicación en el mapa. + Se está mostrando un mapa creado con MapLibre. Arrastra dos dedos para desplazarte o pellizca para acercar. + MapLibre Maps SDK para Android + No puede abrir la página Web porque no hay un navegador Web en el dispositivo. + El parámetro OfflineRegionDefinition que se ingresó no coincide con los límites mundiales: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml index f77f2b16f1f..18d0933a381 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml @@ -1,10 +1,10 @@ - Boussole. Activer pour rétablir l’orientation de la carte vers le nord. - Icône d’attribution. Activer pour afficher le dialogue d’attribution. - Vue de géolocalisation. Ceci affiche votre localisation sur la carte. - Affichage d’une carte créée avec MapLibre. Faites la glisser en traînant deux doigts. Zoomez ou dézoomez en écartant ou rapprochant deux doigts. - SDK MapLibre Maps pour Android - Aucun navigateur web installé sur l’appareil, impossible d’ouvrir une page web. - Le cadre OfflineRegionDefinition pour définir la région de navigation ne tient pas dans les limites du monde : %s + Boussole. Activer pour rétablir l’orientation de la carte vers le nord. + Icône d’attribution. Activer pour afficher le dialogue d’attribution. + Vue de géolocalisation. Ceci affiche votre localisation sur la carte. + Affichage d’une carte créée avec MapLibre. Faites la glisser en traînant deux doigts. Zoomez ou dézoomez en écartant ou rapprochant deux doigts. + SDK MapLibre Maps pour Android + Aucun navigateur web installé sur l’appareil, impossible d’ouvrir une page web. + Le cadre OfflineRegionDefinition pour définir la région de navigation ne tient pas dans les limites du monde : %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml index fd472829b52..94e9c0e22b9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml @@ -1,10 +1,10 @@ - Compás do mapa. Actívao para restabelecer a rotación do mapa cara o norte. - Icona de atribución. Actívaa para amosar o diálogo de atribución. - Vista de ubicación. Amosa a túa ubicación no mapa. - Estase a amosar un mapa feito co MapLibre. Belisca dous dedos para desprazarte ou belisca para achegar. - MapLibre Maps SDK para o Android - Non podes abrir a páxina web porque non hai un navegador web no dispositivo. - O parámetro OfflineRegionDefinition que se ingresou non coincide cos límites mundiais: %s + Compás do mapa. Actívao para restabelecer a rotación do mapa cara o norte. + Icona de atribución. Actívaa para amosar o diálogo de atribución. + Vista de ubicación. Amosa a túa ubicación no mapa. + Estase a amosar un mapa feito co MapLibre. Belisca dous dedos para desprazarte ou belisca para achegar. + MapLibre Maps SDK para o Android + Non podes abrir a páxina web porque non hai un navegador web no dispositivo. + O parámetro OfflineRegionDefinition que se ingresou non coincide cos límites mundiais: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml index a75733758e1..1a1017456e3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml @@ -1,10 +1,10 @@ - מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. - סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. - סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. - מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. - MapLibre Maps SDK for Android - לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. - בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s + מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. + סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. + סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. + מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. + MapLibre Maps SDK for Android + לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. + בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml index 72c201872e3..6bfa6eb0de7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml @@ -1,8 +1,8 @@ - Hely nézet. Megmutatja, hol vagy a térképen. - Egy MapLibre-szal készült térkép megjelenítése. Húzd két ujjadat a görgetéshez. Csippentsd össze a nagyításhoz. - MapLibre Maps SDK Androidhoz - Nincs webböngésző telepítve a készüléken, nem lehet megnyitni weboldalt. - A megadott OfflineRegionDefinition nem fér bele a világ kereteibe: %s + Hely nézet. Megmutatja, hol vagy a térképen. + Egy MapLibre-szal készült térkép megjelenítése. Húzd két ujjadat a görgetéshez. Csippentsd össze a nagyításhoz. + MapLibre Maps SDK Androidhoz + Nincs webböngésző telepítve a készüléken, nem lehet megnyitni weboldalt. + A megadott OfflineRegionDefinition nem fér bele a világ kereteibe: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml index a75733758e1..1a1017456e3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml @@ -1,10 +1,10 @@ - מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. - סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. - סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. - מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. - MapLibre Maps SDK for Android - לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. - בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s + מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. + סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. + סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. + מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. + MapLibre Maps SDK for Android + לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. + בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml index 1f503d5b50c..3e86536813a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml @@ -1,10 +1,10 @@ - 지도 나침반. 지도회전를 북쪽으로 재설정합니다. - 속성 정보. 속성 대화를 표시합니다. - 로케이션 뷰. 지도에서 현재 위치를 보여줍니다. - 맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요. - 안드로이드를 위한 맵박스 맵 SDK - 웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다. - 제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s + 지도 나침반. 지도회전를 북쪽으로 재설정합니다. + 속성 정보. 속성 대화를 표시합니다. + 로케이션 뷰. 지도에서 현재 위치를 보여줍니다. + 맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요. + 안드로이드를 위한 맵박스 맵 SDK + 웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다. + 제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml index 052951eff43..042fa1e4794 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml @@ -1,10 +1,10 @@ - Žemėlapio kompasas. Spustelk, kad atstatytum žemėlapio pasukimą į šiaurę. - Įnašo ikona. Paspausk norėdamas pamatyti dialogą su detalėmis - Vartotojo vietos vaizdas. Nurodo tavo poziciją žemėlapyje - Rodomas MapLibre kurtas žemėlapis. Naviguok tempdamas du pirštus. Valdyk žemėlapio pritraukimą suimdamas/atitolindamas du pirštus. - MapLibre Android SDK - Pasirinktas OfflineRegionDefinition netalpa į rėžius: %s + Žemėlapio kompasas. Spustelk, kad atstatytum žemėlapio pasukimą į šiaurę. + Įnašo ikona. Paspausk norėdamas pamatyti dialogą su detalėmis + Vartotojo vietos vaizdas. Nurodo tavo poziciją žemėlapyje + Rodomas MapLibre kurtas žemėlapis. Naviguok tempdamas du pirštus. Valdyk žemėlapio pritraukimą suimdamas/atitolindamas du pirštus. + MapLibre Android SDK + Pasirinktas OfflineRegionDefinition netalpa į rėžius: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml index 2bae63f96dc..4bda0d7fc4c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml @@ -1,10 +1,10 @@ - Kompas van de map. Activeer om de map rotatie te herzetten naar het noorden. - Attributie icoon. Activeer voor het tonen van het attributie dialoog. - Locatie Element. Dit toont jouw locatie op de map. - Toont een map gemaakt met MapLibre. Scroll door het slepen met twee vingers. Zoom door vingers te nijpen. - MapLibre Android SDK - Aangeleverde OfflineRegionDefinition past niet in de wereld omtrek: %s + Kompas van de map. Activeer om de map rotatie te herzetten naar het noorden. + Attributie icoon. Activeer voor het tonen van het attributie dialoog. + Locatie Element. Dit toont jouw locatie op de map. + Toont een map gemaakt met MapLibre. Scroll door het slepen met twee vingers. Zoom door vingers te nijpen. + MapLibre Android SDK + Aangeleverde OfflineRegionDefinition past niet in de wereld omtrek: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml index f3bf3f6c5d6..8596defccbf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml @@ -1,10 +1,10 @@ - Kompas. Naciśnij, żeby skierować mapę na północ. - Atrybucja. Aktywuj, żeby pokazać więcej informacji. - Widok lokalizacji. Pokazuje twoją pozycję na mapie. - Pokazuje mapę stworzoną za pomocą biblioteki MapLibre. Przesuń mapę za pomocą przeciągnięcia dwoma palcami. Przybliż za pomocą uszczypnięcia dwoma palcami. - MapLibre Maps SDK dla Androida - Nie potrafię otworzyć strony, brak przeglądarki internetowej zainstalowanej na urządzeniu. - Wymagany region nie mieści się w granicach świata: %s + Kompas. Naciśnij, żeby skierować mapę na północ. + Atrybucja. Aktywuj, żeby pokazać więcej informacji. + Widok lokalizacji. Pokazuje twoją pozycję na mapie. + Pokazuje mapę stworzoną za pomocą biblioteki MapLibre. Przesuń mapę za pomocą przeciągnięcia dwoma palcami. Przybliż za pomocą uszczypnięcia dwoma palcami. + MapLibre Maps SDK dla Androida + Nie potrafię otworzyć strony, brak przeglądarki internetowej zainstalowanej na urządzeniu. + Wymagany region nie mieści się w granicach świata: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml index fd3ba98cc6b..1e4a9144524 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml @@ -1,10 +1,10 @@ - Compasso do mapa. Ativar para virar o mapa para Norte. - Ícone de atribuição. Ativar para mostrar a janela de atribuição. - Vista de localização. Isto mostra a sua localização no mapa. - A mostrar um Mapa criado com MapLibre. Desloque arrastanto com 2 dedos. Zoom afastando ou aproximando os 2 dedos. - Mapas MapLibre SDK para Android - Não está nenhum navegador de Internet instalado no dispositivo. Não é possível abrir a página web. - O OfflineRegionDefinition não cabe nos limites do mundo: %s + Compasso do mapa. Ativar para virar o mapa para Norte. + Ícone de atribuição. Ativar para mostrar a janela de atribuição. + Vista de localização. Isto mostra a sua localização no mapa. + A mostrar um Mapa criado com MapLibre. Desloque arrastanto com 2 dedos. Zoom afastando ou aproximando os 2 dedos. + Mapas MapLibre SDK para Android + Não está nenhum navegador de Internet instalado no dispositivo. Não é possível abrir a página web. + O OfflineRegionDefinition não cabe nos limites do mundo: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml index 6741b76fe14..d60dbb14ee7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml @@ -1,10 +1,10 @@ - Компас. Активируйте, чтобы развернуть карту на север. - Значок атрибутов. Активируйте, чтобы показать диалог. - Местоположение. Отображает вашу позицию на карте. - Отображает карту, созданную при помощи MapLibre. Пролистывайте двумя пальцами. Меняйте масштаб сведением пальцев. - MapLibre Maps SDK для Android - На устройстве нет веб-браузера, нельзя показать веб-страницу. - Запрошенный OfflineRegionDefinition не входит в допустимые границы: %s + Компас. Активируйте, чтобы развернуть карту на север. + Значок атрибутов. Активируйте, чтобы показать диалог. + Местоположение. Отображает вашу позицию на карте. + Отображает карту, созданную при помощи MapLibre. Пролистывайте двумя пальцами. Меняйте масштаб сведением пальцев. + MapLibre Maps SDK для Android + На устройстве нет веб-браузера, нельзя показать веб-страницу. + Запрошенный OfflineRegionDefinition не входит в допустимые границы: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml index 09b44a6c82b..7f25c919b90 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml @@ -1,10 +1,10 @@ - Kompass. Aktivera för att nollställa kartans rotation mot norr. - Tillskrivningsikon. Aktivera för att visa tillskrivningsdialog. - Positionsvy. Denna visar din position på kartan. - Visar en karta skapad med MapLibre. Scrolla genom att dra med två fingrar. Zooma genom att nypa med två fingrar. - MapLibre Maps SDK for Android - Ingen webbläsare installerad på enheten. Kan inte visa sidan. - Försedd OfflineRegionDefinition passar inte världens gränser: %s + Kompass. Aktivera för att nollställa kartans rotation mot norr. + Tillskrivningsikon. Aktivera för att visa tillskrivningsdialog. + Positionsvy. Denna visar din position på kartan. + Visar en karta skapad med MapLibre. Scrolla genom att dra med två fingrar. Zooma genom att nypa med två fingrar. + MapLibre Maps SDK for Android + Ingen webbläsare installerad på enheten. Kan inte visa sidan. + Försedd OfflineRegionDefinition passar inte världens gränser: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml index ee323fdabe4..e49faa84487 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml @@ -1,10 +1,10 @@ - Компас. Натисніть щоб зорієнтувати мапу на північ. - Значок атрибуції. Натисніть, щоб показати діалог атрибуції. - Визначення положення. Показує ваше місцеположення на мапі. - Показує мапи створені за допомоги MapLibre. Пересувайте мапу двома пальцями. Змінюйте масштаб стуляючи/розводячи два пальці. - MapLibre Maps SDK для Android - Веб-оглядач відсутній на цьому пристрої, неможливо відкрити веб-сторінку - Межі ділянки для оффлайнового користування даними за межами світу: %s + Компас. Натисніть щоб зорієнтувати мапу на північ. + Значок атрибуції. Натисніть, щоб показати діалог атрибуції. + Визначення положення. Показує ваше місцеположення на мапі. + Показує мапи створені за допомоги MapLibre. Пересувайте мапу двома пальцями. Змінюйте масштаб стуляючи/розводячи два пальці. + MapLibre Maps SDK для Android + Веб-оглядач відсутній на цьому пристрої, неможливо відкрити веб-сторінку + Межі ділянки для оффлайнового користування даними за межами світу: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml index 214ab24dbfc..17c29537c7b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml @@ -1,10 +1,10 @@ - La bàn bản đồ. Kích hoạt để quay bản đồ lại hướng bắc. - Biểu tượng ghi công. Kích hoạt để xem hộp thoại ghi công. - Cái chỉ vị trí. Cái này chỉ vị trí của bạn trên bản đồ. - Đang xem bản đồ được xây dựng dùng MapLibre. Kéo hai ngón tay để cuộn. Chụm các ngón tay lại để phóng to. Tách các ngón tay ra để thu nhỏ. - MapLibre Maps SDK cho Android - Không thể mở trang Web vì thiết bị thiếu trình duyệt. - OfflineRegionDefinition được cung cấp không vừa thế giới: %s + La bàn bản đồ. Kích hoạt để quay bản đồ lại hướng bắc. + Biểu tượng ghi công. Kích hoạt để xem hộp thoại ghi công. + Cái chỉ vị trí. Cái này chỉ vị trí của bạn trên bản đồ. + Đang xem bản đồ được xây dựng dùng MapLibre. Kéo hai ngón tay để cuộn. Chụm các ngón tay lại để phóng to. Tách các ngón tay ra để thu nhỏ. + MapLibre Maps SDK cho Android + Không thể mở trang Web vì thiết bị thiếu trình duyệt. + OfflineRegionDefinition được cung cấp không vừa thế giới: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml index 4e9bf4e067b..5a5a53ca3b1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml @@ -1,10 +1,10 @@ - 指南针，点击使地图旋转重置到正北方向。 - Attribution图标，点击以显示attribution对话框。 - 定位视图，在地图上显示当前位置。 - 显示由MapLibre创建的地图，通过拖动两个手指来滚动，捏两个手指来放大。 - MapLibre Maps SDK for Android - 设备中未安装任何浏览器，不能打开该网页 - 提供的OfflineRegionDefinition不符合标准地理范围：%s + 指南针，点击使地图旋转重置到正北方向。 + Attribution图标，点击以显示attribution对话框。 + 定位视图，在地图上显示当前位置。 + 显示由MapLibre创建的地图，通过拖动两个手指来滚动，捏两个手指来放大。 + MapLibre Maps SDK for Android + 设备中未安装任何浏览器，不能打开该网页 + 提供的OfflineRegionDefinition不符合标准地理范围：%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml index ad4a56400fc..d3b9659f7d0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml @@ -1,10 +1,10 @@ - 指南針，点击使地图旋转重置到正北方向。 - Attribution圖標，點擊以顯示attribution對話框。 - 定位視圖，在地圖上顯示當前位置。 - 顯示由MapLibre創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 - MapLibre Maps SDK for Android - 設備中未安裝任何瀏覽器，不能打開該網頁 - 提供的OfflineRegionDefinition不符合標準地理範圍：%s + 指南針，点击使地图旋转重置到正北方向。 + Attribution圖標，點擊以顯示attribution對話框。 + 定位視圖，在地圖上顯示當前位置。 + 顯示由MapLibre創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 + MapLibre Maps SDK for Android + 設備中未安裝任何瀏覽器，不能打開該網頁 + 提供的OfflineRegionDefinition不符合標準地理範圍：%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml index ad4a56400fc..d3b9659f7d0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml @@ -1,10 +1,10 @@ - 指南針，点击使地图旋转重置到正北方向。 - Attribution圖標，點擊以顯示attribution對話框。 - 定位視圖，在地圖上顯示當前位置。 - 顯示由MapLibre創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 - MapLibre Maps SDK for Android - 設備中未安裝任何瀏覽器，不能打開該網頁 - 提供的OfflineRegionDefinition不符合標準地理範圍：%s + 指南針，点击使地图旋转重置到正北方向。 + Attribution圖標，點擊以顯示attribution對話框。 + 定位視圖，在地圖上顯示當前位置。 + 顯示由MapLibre創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 + MapLibre Maps SDK for Android + 設備中未安裝任何瀏覽器，不能打開該網頁 + 提供的OfflineRegionDefinition不符合標準地理範圍：%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index 4acf3301c7d..179f6990851 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -1,6 +1,6 @@ - + - + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index 565d1c99ca2..50df758fb30 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ - #5F5F5F - #7D7F80 - #1E8CAB + #5F5F5F + #7D7F80 + #1E8CAB - #4A90E2 - #A1B0C0 + #4A90E2 + #A1B0C0 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index 012e46cc073..6252cbf68ce 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -1,29 +1,29 @@ - 8dp - 8dp - 4dp - 0.6dp - 0.9dp - 8dp - 92dp - 18dp + 8dp + 8dp + 4dp + 0.6dp + 0.9dp + 8dp + 92dp + 18dp - 225dp + 225dp - 75dp + 75dp - 0.10dp + 0.10dp - 1.3dp + 1.3dp - 0.29dp + 0.29dp - 25dp - 400dp + 25dp + 400dp diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index ecb6381ecfa..c46c01795a2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ - Map compass. Activate to reset the map rotation to North. - Attribution icon. Activate to show attribution dialog. - Location View. This shows your location on the map. - Showing a Map created with MapLibre. Scroll by dragging two fingers. Zoom by pinching two fingers. - MapLibre Maps SDK for Android - No web browser installed on device, can\'t open web page. - Provided OfflineRegionDefinition doesn\'t fit the world bounds: %s + Map compass. Activate to reset the map rotation to North. + Attribution icon. Activate to show attribution dialog. + Location View. This shows your location on the map. + Showing a Map created with MapLibre. Scroll by dragging two fingers. Zoom by pinching two fingers. + MapLibre Maps SDK for Android + No web browser installed on device, can\'t open web page. + Provided OfflineRegionDefinition doesn\'t fit the world bounds: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml index b38b3758c80..a6ab84618fe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml @@ -2,16 +2,16 @@ \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java index a720963e789..821b1f6c958 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java @@ -50,11 +50,11 @@ public void testTypedArrayBuilder() { float tilt = 44; TypedArray typedArray = mock(TypedArray.class); - 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); + when(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraBearing, 0.0f)).thenReturn(bearing); + when(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTargetLat, 0.0f)).thenReturn(latitude); + when(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTargetLng, 0.0f)).thenReturn(longitude); + when(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraZoom, 0.0f)).thenReturn(zoom); + when(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTilt, 0.0f)).thenReturn(tilt); doNothing().when(typedArray).recycle(); CameraPosition cameraPosition = new CameraPosition.Builder(typedArray).build(); diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java index 34004979999..5c066956188 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java @@ -47,7 +47,7 @@ public class LocationComponentActivationOptionsTest { public void setUp() throws Exception { when(context.obtainStyledAttributes(R.style.mapbox_LocationComponent, R.styleable.mapbox_LocationComponent)) .thenReturn(array); - when(array.getResourceId(R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawable, -1)) + when(array.getResourceId(R.styleable.mapbox_LocationComponent_maplibre_foregroundDrawable, -1)) .thenReturn(R.drawable.maplibre_user_icon); when(context.getResources()).thenReturn(resources); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java index d2558d40d47..4b4e19f979d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java @@ -37,7 +37,7 @@ public class LocationComponentOptionsTest { public void setUp() throws Exception { when(context.obtainStyledAttributes(R.style.mapbox_LocationComponent, R.styleable.mapbox_LocationComponent)) .thenReturn(array); - when(array.getResourceId(R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawable, -1)) + when(array.getResourceId(R.styleable.mapbox_LocationComponent_maplibre_foregroundDrawable, -1)) .thenReturn(R.drawable.maplibre_user_icon); when(context.getResources()).thenReturn(resources); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt index 1d478b0c56b..a74ed96c9ea 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt @@ -83,7 +83,7 @@ class MapboxMapOptionsAttrsTest { private fun mockLocalIdeographString(font: String) { every { - typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily) + typedArray.getString(R.styleable.mapbox_MapView_maplibre_localIdeographFontFamily) }.returns(font) } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt index 382c5fc874b..d322fe05ec4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt @@ -20,7 +20,7 @@ import com.mapbox.mapboxsdk.utils.MapFragmentUtils * Test activity showcasing having 2 maps on top of each other. * * - * The small map is using the `mapbox_enableZMediaOverlay="true"` configuration + * The small map is using the `maplibre_enableZMediaOverlay="true"` configuration * */ class DoubleMapActivity : AppCompatActivity() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml index 6c550f7ba82..0bb8106d0ca 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml @@ -10,9 +10,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.519003" - app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.519003" + app:maplibre_cameraTargetLng="13.400972" + app:maplibre_cameraZoom="16"/> + app:maplibre_cameraTargetLat="41.9567" + app:maplibre_cameraTargetLng="-78.6430" + app:maplibre_cameraZoom="5"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml index a8dbefc1b2c..43bce296d57 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - app:mapbox_cameraTargetLat="38.90962" - app:mapbox_cameraTargetLng="-77.04341" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="38.90962" + app:maplibre_cameraTargetLng="-77.04341" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml index bb34d83d78b..263540acc8f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml @@ -6,10 +6,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="40.7135" - app:mapbox_cameraTargetLng="-74.0066" - app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="40.7135" + app:maplibre_cameraTargetLng="-74.0066" + app:maplibre_cameraTilt="45" + app:maplibre_cameraZoom="15"/> + app:maplibre_cameraTargetLat="51.50325" + app:maplibre_cameraTargetLng="-0.11968" + app:maplibre_cameraZoom="15"/> + app:maplibre_cameraTargetLat="37.787947" + app:maplibre_cameraTargetLng="-122.407432" + app:maplibre_cameraZoom="11"/> + app:maplibre_uiAttributionTintColor="@color/redAccent"/> + app:maplibre_pixelRatio="1" + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml index f5bd0c00129..7c4711fd7b5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="1.350057" - app:mapbox_cameraTargetLng="103.849218" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="1.350057" + app:maplibre_cameraTargetLng="103.849218" + app:maplibre_cameraZoom="10"/> + app:maplibre_cameraBearing="90" + app:maplibre_cameraTargetLat="51.506675" + app:maplibre_cameraTargetLng="-0.128699" + app:maplibre_cameraTilt="40" + app:maplibre_cameraZoom="10" + app:maplibre_uiCompassFadeFacingNorth="false"/> + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml index 2f14d5b94e6..4119c331660 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="40.7135" - app:mapbox_cameraTargetLng="-74.0066" - app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="40.7135" + app:maplibre_cameraTargetLng="-74.0066" + app:maplibre_cameraTilt="45" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml index cfe68ad62da..e0c48ff8668 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml @@ -9,10 +9,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="46.343350" - app:mapbox_cameraTargetLng="7.497989" - app:mapbox_cameraZoom="9" - app:mapbox_cameraBearing="140" - app:mapbox_cameraTilt="60"/> + app:maplibre_cameraTargetLat="46.343350" + app:maplibre_cameraTargetLng="7.497989" + app:maplibre_cameraZoom="9" + app:maplibre_cameraBearing="140" + app:maplibre_cameraTilt="60"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml index d692e55e4ea..106452a30a6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml @@ -11,9 +11,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:mapbox_localIdeographEnabled="false" - app:mapbox_cameraTargetLat="51.50325" - app:mapbox_cameraTargetLng="-0.11968" - app:mapbox_cameraZoom="15" /> + app:maplibre_cameraTargetLat="51.50325" + app:maplibre_cameraTargetLng="-0.11968" + app:maplibre_cameraZoom="15" /> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml index 3ced7c8e2fc..b43cdf1b62f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="41.9567" - app:mapbox_cameraTargetLng="-78.6430" - app:mapbox_cameraZoom="5"/> + app:maplibre_cameraTargetLat="41.9567" + app:maplibre_cameraTargetLng="-78.6430" + app:maplibre_cameraZoom="5"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml index 9f48c08097a..ef6e1030ffa 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.090710" - app:mapbox_cameraTargetLng="5.121125" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="52.090710" + app:maplibre_cameraTargetLng="5.121125" + app:maplibre_cameraZoom="10"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml index ad8be717938..cc7cd054465 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="38.897705003219784" - app:mapbox_cameraTargetLng="-77.03655168667463" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="38.897705003219784" + app:maplibre_cameraTargetLng="-77.03655168667463" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml index 970e77114b9..41482259ae3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="47.798202" - app:mapbox_cameraTargetLng="7.573781" - app:mapbox_cameraZoom="4"/> + app:maplibre_cameraTargetLat="47.798202" + app:maplibre_cameraTargetLng="7.573781" + app:maplibre_cameraZoom="4"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml index 856dd247527..f84764c264e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml @@ -12,6 +12,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_localIdeographFontFamily="Droid Sans" /> + app:maplibre_localIdeographFontFamily="Droid Sans" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml index 935f35b833d..e5f1cbaddbc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml @@ -12,6 +12,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="0dp" - app:mapbox_uiAttribution="false"/> + app:maplibre_uiAttribution="false"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml index 9b4c82b37ba..fd00745add9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml @@ -8,6 +8,6 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_uiAttribution="false"/> + app:maplibre_uiAttribution="false"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml index d277e448572..d25d7d47990 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml @@ -14,7 +14,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:mapbox_uiAttribution="false" /> + app:maplibre_uiAttribution="false" /> + app:maplibre_uiAttribution="false"/> + app:maplibre_uiAttribution="false" /> + app:maplibre_uiAttribution="false" /> + app:maplibre_cameraBearing="220" + app:maplibre_cameraTargetLat="50.871062" + app:maplibre_cameraTargetLng="1.583210" + app:maplibre_cameraZoom="10"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index e2c07c6fd87..1c534a6b150 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -10,8 +10,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - app:mapbox_cameraTargetLat="38.87031" - app:mapbox_cameraTargetLng="-77.00897" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="38.87031" + app:maplibre_cameraTargetLng="-77.00897" + app:maplibre_cameraZoom="10"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml index c9df5a8574b..99a0b4417f4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - app:mapbox_cameraTargetLat="-1.063510" - app:mapbox_cameraTargetLng=" 32.895425" - app:mapbox_cameraZoom="4"/> + app:maplibre_cameraTargetLat="-1.063510" + app:maplibre_cameraTargetLng=" 32.895425" + app:maplibre_cameraZoom="4"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml index 1f856bcd947..716e7397175 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml @@ -21,9 +21,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" - mapbox:mapbox_cameraTargetLat="38.913187" - mapbox:mapbox_cameraTargetLng="-77.032546" - mapbox:mapbox_cameraZoom="12" /> + mapbox:maplibre_cameraTargetLat="38.913187" + mapbox:maplibre_cameraTargetLng="-77.032546" + mapbox:maplibre_cameraZoom="12" /> + mapbox:maplibre_cameraTargetLat="37.775732" + mapbox:maplibre_cameraTargetLng="-122.413985" + mapbox:maplibre_cameraZoom="13"/> + mapbox:maplibre_cameraTargetLat="12.97913" + mapbox:maplibre_cameraTargetLng="77.59188" + mapbox:maplibre_cameraZoom="14" /> + mapbox:maplibre_cameraTargetLat="-13.155980" + mapbox:maplibre_cameraTargetLng="-74.217134" + mapbox:maplibre_cameraZoom="15" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml index 4c88a877032..fdf04153986 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml @@ -8,9 +8,9 @@ + app:maplibre_pixelRatio="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml index 97ea61c0d3e..cefeb5ee3fb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml @@ -9,10 +9,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark" - app:mapbox_cameraTargetLat="47.798202" - app:mapbox_cameraTargetLng="7.573781" - app:mapbox_cameraZoom="4" /> + app:maplibre_uiAttributionTintColor="@android:color/holo_green_dark" + app:maplibre_cameraTargetLat="47.798202" + app:maplibre_cameraTargetLng="7.573781" + app:maplibre_cameraZoom="4" /> + app:maplibre_cameraTargetLat="45.1855569" + app:maplibre_cameraTargetLng="5.7215506" + app:maplibre_cameraZoom="11" + app:maplibre_uiAttributionGravity="top|end" + app:maplibre_uiLogoGravity="top|end" + app:maplibre_uiLogoMarginRight="28dp"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml index 3ddd7d64b4c..a5e4b01dc7b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml @@ -10,9 +10,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - app:mapbox_cameraTargetLat="52.0907" - app:mapbox_cameraTargetLng="5.1214" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.0907" + app:maplibre_cameraTargetLng="5.1214" + app:maplibre_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.0907" + app:maplibre_cameraTargetLng="5.1214" + app:maplibre_cameraZoom="16"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml index 148bab50c51..aca44920608 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml @@ -10,9 +10,9 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="51" - app:mapbox_cameraTargetLng="17.25" - app:mapbox_cameraZoom="8" /> + app:maplibre_cameraTargetLat="51" + app:maplibre_cameraTargetLng="17.25" + app:maplibre_cameraZoom="8" /> + app:maplibre_cameraTargetLat="64.840048" + app:maplibre_cameraTargetLng="-18.910457" + app:maplibre_cameraZoom="4"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index 0740ff404ac..7e364a90f0a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -84,9 +84,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="37.176546" - app:mapbox_cameraTargetLng="-3.599007" - app:mapbox_cameraZoom="15" /> + app:maplibre_cameraTargetLat="37.176546" + app:maplibre_cameraTargetLng="-3.599007" + app:maplibre_cameraZoom="15" /> + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml index 19f68f13648..5233e9ef35a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.519003" - app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.519003" + app:maplibre_cameraTargetLng="13.400972" + app:maplibre_cameraZoom="16"/> + app:maplibre_renderTextureMode="true"/> + app:maplibre_renderTextureMode="true" + app:maplibre_uiAttribution="false" + app:maplibre_uiCompass="false" + app:maplibre_uiLogo="false"/> + app:maplibre_renderTextureMode="true"/> + app:maplibre_cameraTargetLat="40.730648" + app:maplibre_cameraTargetLng="-73.993619" + app:maplibre_cameraZoom="11"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml index c2e3270eb36..297d0e9b793 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml @@ -9,8 +9,8 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - mapbox:mapbox_cameraTargetLat="47.6077" - mapbox:mapbox_cameraTargetLng="-122.3421" - mapbox:mapbox_cameraZoom="11"/> + mapbox:maplibre_cameraTargetLat="47.6077" + mapbox:maplibre_cameraTargetLng="-122.3421" + mapbox:maplibre_cameraZoom="11"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml index c7bb1673243..28ddaba4705 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml @@ -16,7 +16,7 @@ diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml index 850399e3551..10484c4f25a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml @@ -5,6 +5,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="256dp" - app:mapbox_cameraTargetLat="45.38301927899065" - app:mapbox_cameraTargetLng="8.63525390625" - app:mapbox_cameraZoom="7"/> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml index 3224b73477e..789e46b0974 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml @@ -5,7 +5,7 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="256dp" - app:mapbox_cameraTargetLat="45.38301927899065" - app:mapbox_cameraTargetLng="8.63525390625" - app:mapbox_renderTextureMode="true" - app:mapbox_cameraZoom="7"/> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_renderTextureMode="true" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml index 8d7da603f7f..da688154746 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml @@ -39,19 +39,19 @@ From 07ced0965385f9be867933958fb536c7c79b9a25 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 3 Jan 2023 23:41:09 +0100 Subject: [PATCH 4/7] rename last resources from mapbox_ to maplibre_ --- .../mapboxsdk/annotations/BubbleLayout.java | 18 ++-- .../mapbox/mapboxsdk/camera/CameraPosition.kt | 10 +- .../mapboxsdk/location/LocationComponent.java | 16 ++-- .../location/LocationComponentOptions.java | 96 +++++++++---------- .../mapboxsdk/maps/MapboxMapOptions.java | 92 +++++++++--------- .../src/main/res-public/values/public.xml | 2 +- .../layout/maplibre_infowindow_content.xml | 16 ++-- .../src/main/res/values/attrs.xml | 30 +++--- .../src/main/res/values/styles.xml | 4 +- .../mapboxsdk/camera/CameraPositionTest.java | 10 +- ...ocationComponentActivationOptionsTest.java | 6 +- .../LocationComponentOptionsTest.java | 4 +- .../location/LocationComponentTest.kt | 2 +- .../maps/MapboxMapOptionsAttrsTest.kt | 6 +- .../location/LocationModesActivity.kt | 2 +- .../res/layout/activity_camera_position.xml | 2 +- .../res/layout/activity_gesture_detector.xml | 2 +- .../src/main/res/values/styles.xml | 4 +- 18 files changed, 161 insertions(+), 161 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java index 2fecc155231..b41fe2fc467 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java @@ -67,22 +67,22 @@ public BubbleLayout(@NonNull Context context, AttributeSet attrs) { public BubbleLayout(@NonNull Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.mapbox_BubbleLayout); + TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.maplibre_BubbleLayout); @ArrowDirection.Value - int location = a.getInt(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowDirection, + int location = a.getInt(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowDirection, ArrowDirection.LEFT); arrowDirection = new ArrowDirection(location); - arrowWidth = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowWidth, + arrowWidth = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowWidth, convertDpToPixel(8, context)); - arrowHeight = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowHeight, + arrowHeight = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowHeight, convertDpToPixel(8, context)); - arrowPosition = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowPosition, + arrowPosition = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowPosition, convertDpToPixel(12, context)); - cornersRadius = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_cornersRadius, 0); - bubbleColor = a.getColor(R.styleable.mapbox_BubbleLayout_mapbox_bl_bubbleColor, Color.WHITE); + cornersRadius = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_cornersRadius, 0); + bubbleColor = a.getColor(R.styleable.maplibre_BubbleLayout_maplibre_bl_bubbleColor, Color.WHITE); strokeWidth = - a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_strokeWidth, DEFAULT_STROKE_WIDTH); - strokeColor = a.getColor(R.styleable.mapbox_BubbleLayout_mapbox_bl_strokeColor, Color.GRAY); + a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_strokeWidth, DEFAULT_STROKE_WIDTH); + strokeColor = a.getColor(R.styleable.maplibre_BubbleLayout_maplibre_bl_strokeColor, Color.GRAY); a.recycle(); initPadding(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt index 7afa8600eca..8fc339af0ae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt @@ -222,12 +222,12 @@ class CameraPosition */ constructor(typedArray: TypedArray?) : super() { if (typedArray != null) { - bearing = typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraBearing, 0.0f).toDouble() - val lat = typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTargetLat, 0.0f).toDouble() - val lng = typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTargetLng, 0.0f).toDouble() + bearing = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraBearing, 0.0f).toDouble() + val lat = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLat, 0.0f).toDouble() + val lng = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLng, 0.0f).toDouble() target = LatLng(lat, lng) - tilt = typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraTilt, 0.0f).toDouble() - zoom = typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraZoom, 0.0f).toDouble() + tilt = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTilt, 0.0f).toDouble() + zoom = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoom, 0.0f).toDouble() } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index d786ee00906..27d0bd49f8a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -248,7 +248,7 @@ public LocationComponent(@NonNull MapboxMap mapboxMap, @Deprecated public void activateLocationComponent(@NonNull Context context, @NonNull Style style) { activateLocationComponent(context, style, - LocationComponentOptions.createFromAttributes(context, R.style.mapbox_LocationComponent)); + LocationComponentOptions.createFromAttributes(context, R.style.maplibre_LocationComponent)); } /** @@ -265,9 +265,9 @@ public void activateLocationComponent(@NonNull Context context, @NonNull Style s public void activateLocationComponent(@NonNull Context context, @NonNull Style style, boolean useDefaultLocationEngine) { if (useDefaultLocationEngine) { - activateLocationComponent(context, style, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, R.style.maplibre_LocationComponent); } else { - activateLocationComponent(context, style, null, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, null, R.style.maplibre_LocationComponent); } } @@ -288,9 +288,9 @@ public void activateLocationComponent(@NonNull Context context, @NonNull Style s @NonNull LocationEngineRequest locationEngineRequest) { setLocationEngineRequest(locationEngineRequest); if (useDefaultLocationEngine) { - activateLocationComponent(context, style, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, R.style.maplibre_LocationComponent); } else { - activateLocationComponent(context, style, null, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, null, R.style.maplibre_LocationComponent); } } @@ -402,7 +402,7 @@ public void activateLocationComponent(@NonNull Context context, @NonNull Style s @Deprecated public void activateLocationComponent(@NonNull Context context, @NonNull Style style, @Nullable LocationEngine locationEngine) { - activateLocationComponent(context, style, locationEngine, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, locationEngine, R.style.maplibre_LocationComponent); } /** @@ -418,7 +418,7 @@ public void activateLocationComponent(@NonNull Context context, @NonNull Style s public void activateLocationComponent(@NonNull Context context, @NonNull Style style, @Nullable LocationEngine locationEngine, @NonNull LocationEngineRequest locationEngineRequest) { - activateLocationComponent(context, style, locationEngine, locationEngineRequest, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, locationEngine, locationEngineRequest, R.style.maplibre_LocationComponent); } /** @@ -472,7 +472,7 @@ public void activateLocationComponent(@NonNull LocationComponentActivationOption if (options == null) { int styleRes = activationOptions.styleRes(); if (styleRes == 0) { - styleRes = R.style.mapbox_LocationComponent; + styleRes = R.style.maplibre_LocationComponent; } options = LocationComponentOptions.createFromAttributes(activationOptions.context(), styleRes); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java index 8394bc0f5e8..9e0a3d76131 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java @@ -246,7 +246,7 @@ public static LocationComponentOptions createFromAttributes(@NonNull Context con @StyleRes int styleRes) { TypedArray typedArray = context.obtainStyledAttributes( - styleRes, R.styleable.mapbox_LocationComponent); + styleRes, R.styleable.maplibre_LocationComponent); LocationComponentOptions.Builder builder = new LocationComponentOptions.Builder() .enableStaleState(true) @@ -256,120 +256,120 @@ public static LocationComponentOptions createFromAttributes(@NonNull Context con .padding(PADDING_DEFAULT); builder.foregroundDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_maplibre_foregroundDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_foregroundTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_foregroundTintColor)) { builder.foregroundTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_foregroundTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_foregroundTintColor, -1)); } builder.backgroundDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_maplibre_backgroundDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_backgroundTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_backgroundDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_backgroundTintColor)) { builder.backgroundTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_backgroundTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_backgroundTintColor, -1)); } builder.foregroundDrawableStale(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_maplibre_foregroundDrawableStale, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_foregroundStaleTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawableStale, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_foregroundStaleTintColor)) { builder.foregroundStaleTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_foregroundStaleTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_foregroundStaleTintColor, -1)); } builder.backgroundDrawableStale(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_maplibre_backgroundDrawableStale, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_backgroundStaleTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_backgroundDrawableStale, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_backgroundStaleTintColor)) { builder.backgroundStaleTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_backgroundStaleTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_backgroundStaleTintColor, -1)); } builder.bearingDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_maplibre_bearingDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_bearingTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_bearingDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_bearingTintColor)) { builder.bearingTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_bearingTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_bearingTintColor, -1)); } - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_enableStaleState)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_enableStaleState)) { builder.enableStaleState(typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_enableStaleState, true)); + R.styleable.maplibre_LocationComponent_maplibre_enableStaleState, true)); } - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_staleStateTimeout)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_staleStateTimeout)) { builder.staleStateTimeout(typedArray.getInteger( - R.styleable.mapbox_LocationComponent_maplibre_staleStateTimeout, (int) STALE_STATE_DELAY_MS)); + R.styleable.maplibre_LocationComponent_maplibre_staleStateTimeout, (int) STALE_STATE_DELAY_MS)); } builder.gpsDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_gpsDrawable, -1)); + R.styleable.maplibre_LocationComponent_maplibre_gpsDrawable, -1)); float elevation = typedArray.getDimension( - R.styleable.mapbox_LocationComponent_maplibre_elevation, 0); + R.styleable.maplibre_LocationComponent_maplibre_elevation, 0); builder.accuracyColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_accuracyColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_accuracyColor, -1)); builder.accuracyAlpha(typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_accuracyAlpha, ACCURACY_ALPHA_DEFAULT)); + R.styleable.maplibre_LocationComponent_maplibre_accuracyAlpha, ACCURACY_ALPHA_DEFAULT)); builder.elevation(elevation); builder.trackingGesturesManagement(typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_trackingGesturesManagement, false)); + R.styleable.maplibre_LocationComponent_maplibre_trackingGesturesManagement, false)); builder.trackingInitialMoveThreshold(typedArray.getDimension( - R.styleable.mapbox_LocationComponent_maplibre_trackingInitialMoveThreshold, + R.styleable.maplibre_LocationComponent_maplibre_trackingInitialMoveThreshold, context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingInitialMoveThreshold))); builder.trackingMultiFingerMoveThreshold(typedArray.getDimension( - R.styleable.mapbox_LocationComponent_maplibre_trackingMultiFingerMoveThreshold, + R.styleable.maplibre_LocationComponent_maplibre_trackingMultiFingerMoveThreshold, context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingMultiFingerMoveThreshold))); builder.padding(new int[] { - typedArray.getInt(R.styleable.mapbox_LocationComponent_maplibre_iconPaddingLeft, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_maplibre_iconPaddingTop, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_maplibre_iconPaddingRight, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_maplibre_iconPaddingBottom, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingLeft, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingTop, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingRight, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingBottom, 0), }); builder.layerAbove( - typedArray.getString(R.styleable.mapbox_LocationComponent_maplibre_layer_above)); + typedArray.getString(R.styleable.maplibre_LocationComponent_maplibre_layer_above)); builder.layerBelow( - typedArray.getString(R.styleable.mapbox_LocationComponent_maplibre_layer_below)); + typedArray.getString(R.styleable.maplibre_LocationComponent_maplibre_layer_below)); float minScale = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_minZoomIconScale, MIN_ZOOM_ICON_SCALE_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_minZoomIconScale, MIN_ZOOM_ICON_SCALE_DEFAULT); float maxScale = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_maxZoomIconScale, MAX_ZOOM_ICON_SCALE_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_maxZoomIconScale, MAX_ZOOM_ICON_SCALE_DEFAULT); builder.minZoomIconScale(minScale); builder.maxZoomIconScale(maxScale); float trackingAnimationDurationMultiplier = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_trackingAnimationDurationMultiplier, + R.styleable.maplibre_LocationComponent_maplibre_trackingAnimationDurationMultiplier, TRACKING_ANIMATION_DURATION_MULTIPLIER_DEFAULT ); builder.trackingAnimationDurationMultiplier(trackingAnimationDurationMultiplier); builder.compassAnimationEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_compassAnimationEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_compassAnimationEnabled, true ); builder.accuracyAnimationEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_accuracyAnimationEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_accuracyAnimationEnabled, true ); builder.pulseEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleEnabled, false + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleEnabled, false ); builder.pulseFadeEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleFadeEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleFadeEnabled, true ); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleColor)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleColor)) { builder.pulseColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleColor, + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleColor, -1)); } builder.pulseSingleDuration = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleDuration, CIRCLE_PULSING_DURATION_DEFAULT_MS + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleDuration, CIRCLE_PULSING_DURATION_DEFAULT_MS ); builder.pulseMaxRadius = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleRadius, CIRCLE_PULSING_MAX_RADIUS_DEFAULT + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleRadius, CIRCLE_PULSING_MAX_RADIUS_DEFAULT ); builder.pulseAlpha = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_maplibre_pulsingLocationCircleAlpha, CIRCLE_PULSING_ALPHA_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleAlpha, CIRCLE_PULSING_ALPHA_DEFAULT); typedArray.recycle(); @@ -399,7 +399,7 @@ public Builder toBuilder() { @NonNull public static Builder builder(@NonNull Context context) { return LocationComponentOptions.createFromAttributes(context, - R.style.mapbox_LocationComponent).toBuilder(); + R.style.maplibre_LocationComponent).toBuilder(); } /** @@ -492,7 +492,7 @@ public int gpsDrawable() { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_gpsDrawable. + * component, will used this image in place of the provided or default maplibre_gpsDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1500,7 +1500,7 @@ public LocationComponentOptions.Builder gpsDrawable(int gpsDrawable) { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_gpsDrawable. + * component, will used this image in place of the provided or default maplibre_gpsDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index 3900d0f8c37..6b58c2d138b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -173,7 +173,7 @@ public static MapboxMapOptions createFromAttributes(@NonNull Context context) { */ @NonNull public static MapboxMapOptions createFromAttributes(@NonNull Context context, @Nullable AttributeSet attrs) { - TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.mapbox_MapView, 0, 0); + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.maplibre_MapView, 0, 0); return createFromAttributes(new MapboxMapOptions(), context, typedArray); } @@ -186,103 +186,103 @@ static MapboxMapOptions createFromAttributes(@NonNull MapboxMapOptions mapboxMap mapboxMapOptions.camera(new CameraPosition.Builder(typedArray).build()); // deprecated - mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.mapbox_MapView_maplibre_apiBaseUrl)); + mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.maplibre_MapView_maplibre_apiBaseUrl)); - String baseUri = typedArray.getString(R.styleable.mapbox_MapView_maplibre_apiBaseUri); + String baseUri = typedArray.getString(R.styleable.maplibre_MapView_maplibre_apiBaseUri); if (!TextUtils.isEmpty(baseUri)) { // override deprecated property if a value of the new type was provided mapboxMapOptions.apiBaseUri(baseUri); } mapboxMapOptions.zoomGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiZoomGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiZoomGestures, true)); mapboxMapOptions.scrollGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiScrollGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiScrollGestures, true)); mapboxMapOptions.horizontalScrollGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiHorizontalScrollGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiHorizontalScrollGestures, true)); mapboxMapOptions.rotateGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiRotateGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiRotateGestures, true)); mapboxMapOptions.tiltGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiTiltGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiTiltGestures, true)); mapboxMapOptions.doubleTapGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiDoubleTapGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiDoubleTapGestures, true)); mapboxMapOptions.quickZoomGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiQuickZoomGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiQuickZoomGestures, true)); - mapboxMapOptions.maxZoomPreference(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraZoomMax, + mapboxMapOptions.maxZoomPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoomMax, MapboxConstants.MAXIMUM_ZOOM)); - mapboxMapOptions.minZoomPreference(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraZoomMin, + mapboxMapOptions.minZoomPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoomMin, MapboxConstants.MINIMUM_ZOOM)); - mapboxMapOptions.maxPitchPreference(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraPitchMax, + mapboxMapOptions.maxPitchPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraPitchMax, MapboxConstants.MAXIMUM_PITCH)); - mapboxMapOptions.minPitchPreference(typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_cameraPitchMin, + mapboxMapOptions.minPitchPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraPitchMin, MapboxConstants.MINIMUM_PITCH)); - mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiCompass, true)); - mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.mapbox_MapView_maplibre_uiCompassGravity, + mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiCompass, true)); + mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.maplibre_MapView_maplibre_uiCompassGravity, Gravity.TOP | Gravity.END)); mapboxMapOptions.compassMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiCompassMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginLeft, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiCompassMarginTop, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginTop, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiCompassMarginRight, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginRight, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiCompassMarginBottom, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean( - R.styleable.mapbox_MapView_maplibre_uiCompassFadeFacingNorth, true)); + R.styleable.maplibre_MapView_maplibre_uiCompassFadeFacingNorth, true)); Drawable compassDrawable = typedArray.getDrawable( - R.styleable.mapbox_MapView_maplibre_uiCompassDrawable); + R.styleable.maplibre_MapView_maplibre_uiCompassDrawable); if (compassDrawable == null) { compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.maplibre_compass_icon, null); } mapboxMapOptions.compassImage(compassDrawable); - mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_uiLogo, true)); - mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.mapbox_MapView_maplibre_uiLogoGravity, + mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiLogo, true)); + mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.maplibre_MapView_maplibre_uiLogoGravity, Gravity.BOTTOM | Gravity.START)); mapboxMapOptions.logoMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiLogoMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginLeft, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiLogoMarginTop, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginTop, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiLogoMarginRight, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginRight, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiLogoMarginBottom, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.attributionTintColor(typedArray.getColor( - R.styleable.mapbox_MapView_maplibre_uiAttributionTintColor, UNDEFINED_COLOR)); + R.styleable.maplibre_MapView_maplibre_uiAttributionTintColor, UNDEFINED_COLOR)); mapboxMapOptions.attributionEnabled(typedArray.getBoolean( - R.styleable.mapbox_MapView_maplibre_uiAttribution, true)); + R.styleable.maplibre_MapView_maplibre_uiAttribution, true)); mapboxMapOptions.attributionGravity(typedArray.getInt( - R.styleable.mapbox_MapView_maplibre_uiAttributionGravity, Gravity.BOTTOM | Gravity.START)); + R.styleable.maplibre_MapView_maplibre_uiAttributionGravity, Gravity.BOTTOM | Gravity.START)); mapboxMapOptions.attributionMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiAttributionMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginLeft, NINETY_TWO_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiAttributionMarginTop, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginTop, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiAttributionMarginRight, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginRight, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_maplibre_uiAttributionMarginBottom, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.textureMode( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_renderTextureMode, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_renderTextureMode, false)); mapboxMapOptions.translucentTextureSurface( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_renderTextureTranslucentSurface, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_renderTextureTranslucentSurface, false)); mapboxMapOptions.setPrefetchesTiles( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_enableTilePrefetch, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_enableTilePrefetch, true)); mapboxMapOptions.setPrefetchZoomDelta( - typedArray.getInt(R.styleable.mapbox_MapView_maplibre_prefetchZoomDelta, 4)); + typedArray.getInt(R.styleable.maplibre_MapView_maplibre_prefetchZoomDelta, 4)); mapboxMapOptions.renderSurfaceOnTop( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_enableZMediaOverlay, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_enableZMediaOverlay, false)); mapboxMapOptions.localIdeographFontFamilyEnabled = - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_localIdeographEnabled, true); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_localIdeographEnabled, true); int localIdeographFontFamiliesResId = - typedArray.getResourceId(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamilies, 0); + typedArray.getResourceId(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamilies, 0); if (localIdeographFontFamiliesResId != 0) { String[] localIdeographFontFamilies = context.getResources().getStringArray(localIdeographFontFamiliesResId); @@ -290,7 +290,7 @@ static MapboxMapOptions createFromAttributes(@NonNull MapboxMapOptions mapboxMap } else { // did user provide xml font string? String localIdeographFontFamily = - typedArray.getString(R.styleable.mapbox_MapView_maplibre_localIdeographFontFamily); + typedArray.getString(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamily); if (localIdeographFontFamily == null) { localIdeographFontFamily = MapboxConstants.DEFAULT_FONT; } @@ -298,12 +298,12 @@ static MapboxMapOptions createFromAttributes(@NonNull MapboxMapOptions mapboxMap } mapboxMapOptions.pixelRatio( - typedArray.getFloat(R.styleable.mapbox_MapView_maplibre_pixelRatio, 0)); + typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_pixelRatio, 0)); mapboxMapOptions.foregroundLoadColor( - typedArray.getInt(R.styleable.mapbox_MapView_maplibre_foregroundLoadColor, LIGHT_GRAY) + typedArray.getInt(R.styleable.maplibre_MapView_maplibre_foregroundLoadColor, LIGHT_GRAY) ); mapboxMapOptions.crossSourceCollisions( - typedArray.getBoolean(R.styleable.mapbox_MapView_maplibre_cross_source_collisions, true) + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_cross_source_collisions, true) ); } finally { typedArray.recycle(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index 4fbf5a17e8f..84939ddea8b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -108,7 +108,7 @@ - + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml index 0aad88213a0..1428949b3ce 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml @@ -9,14 +9,14 @@ 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"> + app:maplibre_bl_arrowDirection="bottom" + app:maplibre_bl_arrowHeight="8dp" + app:maplibre_bl_arrowPosition="16dp" + app:maplibre_bl_arrowWidth="8dp" + app:maplibre_bl_bubbleColor="@android:color/white" + app:maplibre_bl_cornersRadius="6dp" + app:maplibre_bl_strokeColor="@android:color/darker_gray" + app:maplibre_bl_strokeWidth="1dp"> + - + - + - + @@ -120,16 +120,16 @@ - - - - - - - - + + + + + + + + - + @@ -137,14 +137,14 @@ - + - + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml index 02573381866..539ffc24676 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml @@ -1,11 +1,11 @@ -