[android] #3276 - added item animation for select/deselect state of a View Marker. Removed asynctask due to unneeded overhead. Improved integration with selectMarker. Added item animators for the test app.

4 files changed, 37 insertions, 3 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
index 34b34f62ce..559df05b30 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/BulkMarkerActivity.java
@@ -1,5 +1,9 @@
 package com.mapbox.mapboxsdk.testapp.activity.annotation;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
@@ -8,16 +12,20 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.view.ViewPropertyAnimatorCompatSet;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
+import android.view.animation.BounceInterpolator;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Marker;
@@ -92,10 +100,13 @@ public class BulkMarkerActivity extends AppCompatActivity implements AdapterView
                                 }
                             }
                         });
+
+                        mMapboxMap.setMarkerViewItemAnimation(R.animator.scale_up, R.animator.scale_down);
                         mMapboxMap.setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() {
                             @Override
-                            public void onMarkerClick(@NonNull Marker marker, @NonNull View view) {
-                                mMapboxMap.selectMarker(marker);
+                            public boolean onMarkerClick(@NonNull final Marker marker, @NonNull View view) {
+                                Toast.makeText(BulkMarkerActivity.this, "Hello "+marker.getId(), Toast.LENGTH_SHORT).show();
+                                return false;
                             }
                         });
                     }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerActivity.java
index 735ab8088f..651cfcebf1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/ViewMarkerActivity.java
@@ -68,8 +68,9 @@ public class ViewMarkerActivity extends AppCompatActivity implements OnMapReadyC
         mapboxMap.setMarkerViewAdapter(new CountryAdapter(this));
         mapboxMap.setOnMarkerViewClickListener(new MapboxMap.OnMarkerViewClickListener() {
             @Override
-            public void onMarkerClick(@NonNull Marker marker, @NonNull View view) {
+            public boolean onMarkerClick(@NonNull Marker marker, @NonNull View view) {
                 Log.d(MapboxConstants.TAG, "Country clicked " + ((CountryMarker) marker).getAbbrevName());
+                return true;
             }
         });
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
new file mode 100644
index 0000000000..d1067b09c2
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_down.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:propertyName="scaleX"
+        android:duration="300"
+        android:valueTo="1"/>
+    <objectAnimator
+        android:propertyName="scaleY"
+        android:duration="300"
+        android:valueTo="1"/>
+</set>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
new file mode 100644
index 0000000000..b43ed05513
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/animator/scale_up.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:propertyName="scaleX"
+        android:duration="300"
+        android:valueTo="2"/>
+    <objectAnimator
+        android:propertyName="scaleY"
+        android:duration="300"
+        android:valueTo="2"/>
+</set>
\ No newline at end of file