From 3ef740c7531db5ef40b9c7f7c263a082a2405f94 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Mon, 23 May 2016 13:07:04 +0200
Subject: [PATCH] [android] #5083 - add InfoWindow offset based on height of
 associated MarkerView, removed unused icons, renamed feature activity

---
 .../annotations/MarkerViewManager.java          |  12 ++++++------
 .../src/main/AndroidManifest.xml                |   2 +-
 ...terActivity.java => MarkerViewActivity.java} |  13 ++++++-------
 .../src/main/res/drawable-xxhdpi/ic_brazil.png  | Bin 2178 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_china.png   | Bin 745 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_germany.png | Bin 168 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_us.png      | Bin 323 -> 418 bytes
 7 files changed, 13 insertions(+), 14 deletions(-)
 rename platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/{ViewMarkerAdapterActivity.java => MarkerViewActivity.java} (95%)
 delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_brazil.png
 delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_china.png
 delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_germany.png

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index aaf6a733f..982d279ca 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -170,12 +170,6 @@ public class MarkerViewManager {
                     if (adapter.getMarkerClass() == marker.getClass()) {
                         convertView = (View) adapter.getViewReusePool().acquire();
                         View adaptedView = adapter.getView(marker, convertView, mapView);
-
-                        // InfoWindow offset
-                        Point infoWindowOffset = marker.getInfoWindowOffset();
-                        marker.setTopOffsetPixels(-infoWindowOffset.y);
-                        marker.setRightOffsetPixels(infoWindowOffset.x);
-
                         if (adaptedView != null) {
 
                             // tilt
@@ -206,6 +200,12 @@ public class MarkerViewManager {
                                     }
 
                                     if (!clickHandled) {
+
+                                        // InfoWindow offset
+                                        Point infoWindowOffset = marker.getInfoWindowOffset();
+                                        marker.setTopOffsetPixels(-(v.getHeight() / 2) - infoWindowOffset.y);
+                                        marker.setRightOffsetPixels(infoWindowOffset.x);
+
                                         if (animSelectRes != 0) {
                                             AnimatorUtils.animate(v, animSelectRes, new AnimatorUtils.OnAnimationEndListener() {
                                                 @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 699f4be89..7268b7d55 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -254,7 +254,7 @@
         </activity>
 
         <activity
-            android:name=".activity.annotation.ViewMarkerAdapterActivity"
+            android:name=".activity.annotation.MarkerViewActivity"
             android:description="@string/description_view_marker"
             android:label="@string/activity_view_marker">
             <meta-data
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
similarity index 95%
rename from platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java
rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
index 2fd21a04a..e9a340154 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerAdapterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java
@@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.testapp.activity.annotation;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
@@ -29,7 +30,7 @@ import com.mapbox.mapboxsdk.testapp.model.annotations.CountryMarkerOptions;
 import com.mapbox.mapboxsdk.testapp.model.annotations.CountryMarkerView;
 import com.mapbox.mapboxsdk.testapp.model.annotations.CountryMarkerViewOptions;
 
-public class ViewMarkerAdapterActivity extends AppCompatActivity {
+public class MarkerViewActivity extends AppCompatActivity {
 
     private MapboxMap mMapboxMap;
     private MapView mMapView;
@@ -72,7 +73,7 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
                     mMapboxMap.addMarker(new MarkerViewOptions()
                             .position(LAT_LNGS[i])
                             .title(String.valueOf(i))
-                            .infoWindowOffset(new Point(0, 86))
+                            .infoWindowOffset(new Point(0, (int) getResources().getDimension(R.dimen.fab_margin)))
                             .selectAnimatorResource(R.animator.scale_up)
                             .deselectAnimatorResource(R.animator.scale_down)
                     );
@@ -86,9 +87,7 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
                 options.position(new LatLng(38.899774, -77.023237));
                 options.selectAnimatorResource(R.animator.rotate_360);
                 options.deselectAnimatorResource(R.animator.rotate_360);
-                options.infoWindowOffset(new Point(0, 64));
                 options.flat(true);
-
                 mapboxMap.addMarker(options);
 
                 // default GL marker
@@ -99,8 +98,8 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
 
                 // set adapters
                 final MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
-                markerViewManager.addMarkerViewAdapter(new TextAdapter(ViewMarkerAdapterActivity.this));
-                markerViewManager.addMarkerViewAdapter(new CountryAdapter(ViewMarkerAdapterActivity.this));
+                markerViewManager.addMarkerViewAdapter(new TextAdapter(MarkerViewActivity.this));
+                markerViewManager.addMarkerViewAdapter(new CountryAdapter(MarkerViewActivity.this));
 
                 mMapView.addOnMapChangedListener(new MapView.OnMapChangedListener() {
                     @Override
@@ -116,7 +115,7 @@ public class ViewMarkerAdapterActivity extends AppCompatActivity {
                 mMapboxMap.getMarkerViewManager().setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() {
                     @Override
                     public boolean onMarkerClick(@NonNull Marker marker, @NonNull View view, @NonNull MapboxMap.MarkerViewAdapter adapter) {
-                        Toast.makeText(ViewMarkerAdapterActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(MarkerViewActivity.this, "Hello " + marker.getId(), Toast.LENGTH_SHORT).show();
                         return false;
                     }
                 });
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_brazil.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_brazil.png
deleted file mode 100644
index 13bce838ffc4c0ad1d96a2a200f44050a4b7c76b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2178
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
Ef<3|z(f|Me

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_china.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_china.png
deleted file mode 100644
index d75026aac00d6bf384e053d080af826b4d3a32f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVA|m6;uunK>+LM>Y~etW<Hvn+
zq-Un2efuhT)<rzDX8l&XF73d;{Y~Di`<wEP?7gsFLCI;QzKcuY`*S`*b4#?sau!@z
z!ujj_9b;pmrIkAbjEvI@Pdt6bQdDR8|Nq|f4mJnx;tVDS1`Y;B1qPM|1_1^p2Zkjw
z4yF5BO^*I&eh@H4XUFeL91C(5)*W&AyP<QbH`|>>a}5~$Bx>)Ke~<cbPGrMJFZb%e
z<IjUz8-H$OI&gIE*~7C>U%vHjzO!rjy)=oY@_9v*nHFq1eC*X+O_TTjpLVTh>6`hZ
z<kFE(rIQZGow64A(HOny*edBZW{vM#YBI8<^^ITbIagq~pS$SL9l4o1CUUNNbdvp#
zHe2&bdGr5gWTP3rsAjkOT;XeT4ahcMG52BCkI1VRc1(C~`!z0C?Zn&XlJ{OR{dRor
z+opPCzH~Xm#CzA}^IV_HzWh0}PjBy{b%iDOFW(EEyLI0`jqYQ2p0#TJ)t1k&=P%k@
zY{)3!7@&8rY7*<d;4b$-Ugx!$>$gr&y}o==7xSKEbI%7_o)1_&A7sR+2skSIT@|s{
zn$@I=;li%U{7L@IX1fyAJ#>5xez7jkt=YSg_lHxa-O)|QUQeBESu<zb|CePF`;#}w
zlsLXNJh@<HVs0H%How}Azqh%o3gjg&UGie`QoHviVP(%s7AE6A9}~Iv-95K((`mQV
z<-Jp*E$=0N*5=Er{lBU4T9VjXajQSs$8MbAP_Az9FRv1v`u5>^--Xw_#d*!P*KI$v
z;_KC)>-!Gq&1E{paX08rUQ^%JmjQ>X&rQe-xXW|$XXx^Z&8-iVo-E0g(qVVkn*aZ4
zOaI}{d2H@%6Ru<yq;USR<z4o1;*8n1+><^9grFu1lr(aLz2Q$Vx`Kv~qxxF!JKN-?
R3+)+zz|+;wWt~$(69A);O(*~W

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_germany.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_germany.png
deleted file mode 100644
index 07707aa0ff7eb7a345461b7fb9f04c952c8e4a50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`JOJ0Ar-gY-ZEr7;J|Za!{h$7
zbN)Cdx-@fUd|MTp2UGzAGVC|5EroHw^n?7@At(X?YxC!VY(oMPs*DKUj%&;-83ou6
SeN}h^67+QSb6Mw<&;$U^3M7O8

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_us.png
index 57f3cbe65451f9d3e4f5d7bc8dc01f8ead84f447..d09e068fe951ce984d90801416f637b89f4027e2 100644
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq002Ay001Zm1^@s6qPv;@00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|^7HVGo>{c`{S0WV2J
zK~!ko?U=D{!Y~+wKSx<y8__6)1n9`b%b-3-`#8K7yZ}NlR0RnT8Dd2$gS%82+D;Xz
zCGwx-<vduY`|oU7!NL;&p4Sk^5&>ANnNFWDMmHPAw8L4e35f_G&lA?`IeDHo8-u}P
zE8KXT1r@Ad;f>K`S;FabA&w)`G@&djdcB96bI0Qa=W4uv3FokLHM`wA*XswfS;}fP
zr{A}&aL(1@@V`4;6bakyGs9s@SvoeGH>}mIaFfYbhLsAk!Z{rBTKb;h<??3^Z^cQ5
zJCk8?_}()tEiD<A49h(%4$E8m_m;L+Qxqxt{ka)AV>F}D?YYC@OjU(zY1OqqE#<xU
zbO;e0L+1o54>Hms_>K_Mt&*0JmX;QWMX<EAI4pvtrNv<pEQ0@tPr8Tqxx${DMgRZ+
M07*qoM6N<$f_3Syz5oCK

literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3?2aSW-r_4bA>SF?ja+rzgy
zW!wjuT|#VHp7Sh;y0oOXL;bRF&B~+`@yp*F+H=Sx_~qkw=BxcCZH`$cF9$RR4pg4s
ziPZEuw{&GZgQ836U6uEb%bM@WU*=YP#(rVjVwIJd%igy6FaNE$ci;Ta%pdGlt#fY`
z2%Q$b_3e^XyJRm_uj^{L{+~yqtGg}n+OB=~?%ms~%Ur}{u%GEfgNU|*dc%31h-vR@
z_k`=8E@qINpu{|bNpe2(35M+81`uBX$gko4;I6SdpK<bkmelu53=QTDA=QSnc^D2@
zF(`5{1UCq<G-x_-FdYz4U}0o9@It~Q67F^&BVmhNM(u(H?FSW=K*FA`elF{r5}E-2
Cvvx`V