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

AndwareSsj · Oct 10, 2015 · 048894e · 048894e
1 parent 79c7bdb
commit 048894e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/...om/mapbox/mapboxsdk/views/InfoWindow.java → ...box/mapboxsdk/annotations/InfoWindow.java b/...om/mapbox/mapboxsdk/views/InfoWindow.java → ...box/mapboxsdk/annotations/InfoWindow.java
@@ -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.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

diff --git a/...ox/mapboxsdk/views/InfoWindowTipView.java → ...boxsdk/annotations/InfoWindowTipView.java b/...ox/mapboxsdk/views/InfoWindowTipView.java → ...boxsdk/annotations/InfoWindowTipView.java
@@ -1,4 +1,4 @@
-package com.mapbox.mapboxsdk.views;
+package com.mapbox.mapboxsdk.annotations;
 
 import android.content.Context;
 import android.graphics.Canvas;

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -6,8 +6,6 @@
 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 {
 

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
@@ -54,6 +54,7 @@
 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 @@ private List<Marker> getMarkersInBounds(@NonNull BoundingBox bbox) {
         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 double getMetersPerPixelAtLatitude(@FloatRange(from = -180, to = 180) dou
         return mNativeMapView.getMetersPerPixelAtLatitude(latitude, getZoomLevel());
     }
 
-    // Used by InfoWindow
-    float getScreenDensity() {
+    /**
+     * Get ScreenDensity of device
+     * @return Screen Density ratio
+     */
+    public float getScreenDensity() {
         return mScreenDensity;
     }
 

diff --git a/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml b/android/java/MapboxGLAndroidSDK/src/main/res/layout/infowindow.xml
@@ -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"/>