From d4aebbf879082ff8d5fd38c286a9ec460cfb1a04 Mon Sep 17 00:00:00 2001 From: Manabu Shimobe Date: Fri, 16 Oct 2015 20:20:00 +0900 Subject: [PATCH] add missing DPI bitmaps and update based on code review comments --- android/cpp/jni.cpp | 3 +- .../mapboxsdk/geometry/CoordinateBounds.java | 2 +- .../com/mapbox/mapboxsdk/views/MapView.java | 32 ++++++++++++++++++ .../mapbox/mapboxsdk/views/NativeMapView.java | 3 +- .../res/drawable-hdpi/ic_crop_white_24dp.png | Bin 0 -> 188 bytes .../res/drawable-mdpi/ic_crop_white_24dp.png | Bin 0 -> 119 bytes .../res/drawable-xhdpi/ic_crop_white_24dp.png | Bin 0 -> 155 bytes .../res/drawable-xxhdpi/ic_action_crop.png | Bin 602 -> 0 bytes .../drawable-xxhdpi/ic_crop_white_24dp.png | Bin 0 -> 198 bytes .../drawable-xxxhdpi/ic_crop_white_24dp.png | Bin 0 -> 252 bytes .../src/main/res/menu/menu_drawer.xml | 2 +- 11 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png delete mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_crop.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index 36c4fe1dd..a170508ea 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -2194,4 +2194,5 @@ extern "C" JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) { theJVM = nullptr; } -} \ No newline at end of file +} + diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java index 0cf098e35..f4d9caedc 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java @@ -28,4 +28,4 @@ public class CoordinateBounds { public void setNe(LatLng ne) { this.ne = ne; } -} \ No newline at end of file +} diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 15cebd52c..2c12f378b 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -1986,14 +1986,37 @@ public final class MapView extends FrameLayout { // // Camera // + + /** + * Changes the map's viewport to fit the given coordinate bounds. + * + * @param bounds The bounds that the viewport will show in its entirety. + */ + @UiThread public void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds) { setVisibleCoordinateBounds(bounds, false); } + /** + * Changes the map's viewing area to fit the given coordinate bounds, optionally animating the change. + * + * @param bounds The bounds that the viewport will show in its entirety. + * @param animated If true, animates the change. If false, immediately changes the map. + */ + @UiThread public void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds, boolean animated) { setVisibleCoordinateBounds(bounds, new RectF(), animated); } + /** + * Changes the map’s viewport to fit the given coordinate bounds, optionally some additional padding on each side + * and animating the change. + * + * @param bounds The bounds that the viewport will show in its entirety. + * @param padding The minimum padding (in pixels) that will be visible around the given coordinate bounds. + * @param animated If true, animates the change. If false, immediately changes the map. + */ + @UiThread public void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds, @NonNull RectF padding, boolean animated) { LatLng[] coordinates = { new LatLng(bounds.getNe().getLatitude(), bounds.getSw().getLongitude()), @@ -2005,6 +2028,15 @@ public final class MapView extends FrameLayout { setVisibleCoordinateBounds(coordinates, padding, animated); } + /** + * Changes the map’s viewport to fit the given coordinates, optionally some additional padding on each side + * and animating the change. + * + * @param coordinates The coordinates that the viewport will show. + * @param padding The minimum padding (in pixels) that will be visible around the given coordinate bounds. + * @param animated If true, animates the change. If false, immediately changes the map. + */ + @UiThread public void setVisibleCoordinateBounds(@NonNull LatLng[] coordinates, @NonNull RectF padding, boolean animated) { setVisibleCoordinateBounds(coordinates, padding, getDirection(), animated); } diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java index a4b991700..da13efcf8 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java @@ -597,7 +597,8 @@ final class NativeMapView { private native void nativeSetSprite(long nativeMapViewPtr, String symbol, int width, int height, float scale, byte[] pixels); - private native void nativeSetVisibleCoordinateBounds(long mNativeMapViewPtr, LatLng[] coordinates, RectF padding, double direction, long duration); + private native void nativeSetVisibleCoordinateBounds(long mNativeMapViewPtr, LatLng[] coordinates, + RectF padding, double direction, long duration); private native void nativeOnLowMemory(long nativeMapViewPtr); diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9bfca358159a2701e6265d20018a00fe6211cedb GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8v!{z=NCo5DsRua^8wjwhJ-3c= zxAN?_Cv;bAKB>==%kg4^T;uJZvd0fdMcxu?b?8W#ohrk@Fg0VU#)aAc6uG`k?QU-C z7D#S6+kR(Dy2}Rj)i=-0{C8ttu+nlD)lKY=;@92cZs=RaAugMuByRd{%ZU(c^i_?iWd8X7U)9s^(90`O literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..859cdf78bb0ea34b372348903637a5a737eedfbd GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DBu^K|kch)?FDddJP!MprXv=rK zee%SH|E9jOswzDibMwP(HVPM}+>tc+px)rP`FHU02~!vxY8AIJOt|VW*|xG$gpEhS zAmM>Wf+chDg3U_}1FkqM@@nJ|nyJQOlg-R#ca>H7$mS`HVF7MH+Za4u{an^LB{Ts5 Dp(rsn literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_crop.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_action_crop.png deleted file mode 100644 index e01ede5ddb6276f0b6d335c7d0149ee2df25c1d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 602 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+82@;>IEGZ*dUL1V_ppP=fsbW3_lq_(DlxDqFt8*fa5yk< zBrv5hFeWfCo?&1UXlN)D*JIh`^sPCz|LterS!TCqP5Zug@Ad18S8D-n1cMFluUPVJ ziqKhic-7ys2fOwO{aYoKZso`Gud_hkScr*?%+Yn^jEHENsUvL%lN-YnnpH}pxRS7>-??Ear@ zZ~7LiY#6_ecdchpIkfd> za)hmyqk;qP374w01u3^o&lT=^DLmErTEivz;M{8#$9t=}z(L_0*OaccBRBNK-s$l# z#O_3dEZ2Vbd(%rB=V?lF9-E8*OPEj+-?d+KP^`)SneAKya0~&7 d1K0L&8!)_{yZBOrlAke1)YH|^Wt~$(69CyC_r(AJ diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c0246cf2a6d74fb93951a90f8a5ef94bf4763431 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOcknLo)8Yy`sq15+J~GG4MD4 zLB)sj5*`?^gmds%m?`d-4O;4MV;r0MzALzig;PkyBfzLby0*GLGdXF&(}q5=T{;41 zYBo7sSl)Qds$vlvuK&9VOtVKQtbs4_fwF&4j22WQ%mvv4FO#q3-N67#H literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3c027ef29c7996f245b51eed304797afe91a1840 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg4tu&dhEy=Vy}9vhvjIcP#VI+5 zw+Qx3)?Jh{$>dJ_j>Qfxnst6v_qXQ7rAF?1858vF?z)Ye*%^U4`PhI25ELwOKCr&_ z)2T^2#SLz4N_)lHBR6vwN@}W4YqH S--R=|ASq8*KbLh*2~7Z7I#%5P literal 0 HcmV?d00001 diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml index 1ec2cd2f5..020c9e3ea 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -99,7 +99,7 @@