tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #2588 - Moving InfoWindow classes to annotations package

Browse Source
This commit is contained in:
Brad Leege
2015-10-10 18:18:17 -05:00
parent 223d272643
commit dc98966e6d
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindow.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxsdk.views;
package com.mapbox.mapboxsdk.annotations;
import android.content.Context;
import android.graphics.PointF;
@@ -7,9 +7,8 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.views.MapView;
/**
* A tooltip view

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/InfoWindowTipView.java → android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
View File

@@ -1,4 +1,4 @@
package com.mapbox.mapboxsdk.views;
package com.mapbox.mapboxsdk.annotations;
import android.content.Context;
import android.graphics.Canvas;

2
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
View File

@@ -6,8 +6,6 @@ import android.text.TextUtils;
import android.view.View;
import com.mapbox.mapboxsdk.R;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.views.InfoWindow;
import com.mapbox.mapboxsdk.views.MapView;
public class Marker extends Annotation {

17
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
View File

@@ -54,6 +54,7 @@ import com.almeros.android.multitouch.gesturedetectors.RotateGestureDetector;
import com.almeros.android.multitouch.gesturedetectors.TwoFingerGestureDetector;
import com.mapbox.mapboxsdk.R;
import com.mapbox.mapboxsdk.annotations.Annotation;
import com.mapbox.mapboxsdk.annotations.InfoWindow;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.Polygon;
@@ -1882,8 +1883,13 @@ public final class MapView extends FrameLayout {
return new ArrayList<>(annotations);
}
// Used by InfoWindow
double getTopOffsetPixelsForAnnotationSymbol(@NonNull String symbolName) {
/**
* Get Top Offset for the annotation symbol.
* Used by InfoWindow
* @param symbolName Annotation Symbol
* @return Top Offset in pixels
*/
public double getTopOffsetPixelsForAnnotationSymbol(@NonNull String symbolName) {
return mNativeMapView.getTopOffsetPixelsForAnnotationSymbol(symbolName);
}
@@ -1901,8 +1907,11 @@ public final class MapView extends FrameLayout {
return mNativeMapView.getMetersPerPixelAtLatitude(latitude, getZoomLevel());
}
// Used by InfoWindow
float getScreenDensity() {
/**
* Get ScreenDensity of device
* @return Screen Density ratio
*/
public float getScreenDensity() {
return mScreenDensity;
}

2
android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
View File

@@ -44,7 +44,7 @@
android:visibility="gone"/>
</LinearLayout>
<com.mapbox.mapboxsdk.views.InfoWindowTipView
<com.mapbox.mapboxsdk.annotations.InfoWindowTipView
android:layout_width="fill_parent"
android:layout_height="10dp"/>