This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[android] - optimise icon management
- Loading branch information
Showing
7 changed files
with
248 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
...AndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/IconManagerResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package com.mapbox.mapboxsdk.maps; | ||
|
|
||
| import com.mapbox.mapboxsdk.annotations.Icon; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import timber.log.Timber; | ||
|
|
||
| public class IconManagerResolver { | ||
|
|
||
| private IconManager iconManager; | ||
|
|
||
| public IconManagerResolver(MapboxMap mapboxMap) { | ||
| try { | ||
| Field annotationManagerField = MapboxMap.class.getDeclaredField("annotationManager"); | ||
| annotationManagerField.setAccessible(true); | ||
| AnnotationManager annotationManager = (AnnotationManager) annotationManagerField.get(mapboxMap); | ||
|
|
||
| Field iconManagerField = AnnotationManager.class.getDeclaredField("iconManager"); | ||
| iconManagerField.setAccessible(true); | ||
| iconManager = (IconManager) iconManagerField.get(annotationManager); | ||
| } catch (Exception exception) { | ||
| Timber.e(exception, "Could not create IconManagerResolver, unable to reflect."); | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public Map<Icon, Integer> getIconMap() { | ||
| try { | ||
| Field field = IconManager.class.getDeclaredField("iconMap"); | ||
| field.setAccessible(true); | ||
| return (Map<Icon, Integer>) field.get(iconManager); | ||
| } catch (NoSuchFieldException exception) { | ||
| Timber.e(exception, "Could not getIconMap, unable to reflect."); | ||
| } catch (IllegalAccessException exception) { | ||
| Timber.e(exception, "Could not getIconMap, unable to reflect."); | ||
| } | ||
| return new HashMap<>(); | ||
| } | ||
| } |
146 changes: 146 additions & 0 deletions
146
...oidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| package com.mapbox.mapboxsdk.testapp.annotations; | ||
|
|
||
| import android.app.Activity; | ||
| import android.support.v4.content.res.ResourcesCompat; | ||
|
|
||
| import com.mapbox.mapboxsdk.annotations.Icon; | ||
| import com.mapbox.mapboxsdk.annotations.IconFactory; | ||
| import com.mapbox.mapboxsdk.annotations.Marker; | ||
| import com.mapbox.mapboxsdk.annotations.MarkerOptions; | ||
| import com.mapbox.mapboxsdk.geometry.LatLng; | ||
| import com.mapbox.mapboxsdk.maps.IconManagerResolver; | ||
| import com.mapbox.mapboxsdk.maps.MapboxMap; | ||
| import com.mapbox.mapboxsdk.testapp.R; | ||
| import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; | ||
| import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; | ||
| import com.mapbox.mapboxsdk.testapp.utils.IconUtils; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import static junit.framework.Assert.assertEquals; | ||
| import static junit.framework.Assert.assertFalse; | ||
| import static junit.framework.Assert.assertNull; | ||
| import static junit.framework.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Tests integration between Icons and Markers | ||
| */ | ||
| public class IconTest extends BaseActivityTest { | ||
|
|
||
| private Map<Icon, Integer> iconMap; | ||
|
|
||
| @Before | ||
| public void beforeTest() { | ||
| super.beforeTest(); | ||
| iconMap = new IconManagerResolver(getMapboxMap()).getIconMap(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEmpty() throws Exception { | ||
| assertTrue(iconMap.isEmpty()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddSameIconMarker() throws Exception { | ||
| Icon defaultMarker = IconFactory.getInstance(rule.getActivity()).defaultMarker(); | ||
| getMapboxMap().addMarker(new MarkerOptions().position(new LatLng())); | ||
| getMapboxMap().addMarker(new MarkerOptions().position(new LatLng(1, 1))); | ||
| assertEquals(1, iconMap.size()); | ||
| assertEquals(2, iconMap.get(defaultMarker), 0); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddDifferentIconMarker() throws Exception { | ||
| Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon); | ||
| getMapboxMap().addMarker(new MarkerOptions().icon(icon).position(new LatLng())); | ||
| getMapboxMap().addMarker(new MarkerOptions().position(new LatLng(1, 1))); | ||
| assertEquals(iconMap.size(), 2); | ||
| assertTrue(iconMap.containsKey(icon)); | ||
| assertTrue(iconMap.get(icon) == 1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddRemoveIconMarker() throws Exception { | ||
| MapboxMap mapboxMap = getMapboxMap(); | ||
|
|
||
| Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon); | ||
| Marker marker = mapboxMap.addMarker(new MarkerOptions().icon(icon).position(new LatLng())); | ||
| mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1))); | ||
| assertEquals(iconMap.size(), 2); | ||
| assertTrue(iconMap.containsKey(icon)); | ||
| assertTrue(iconMap.get(icon) == 1); | ||
|
|
||
| mapboxMap.removeMarker(marker); | ||
| assertEquals(iconMap.size(), 1); | ||
| assertFalse(iconMap.containsKey(icon)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddRemoveDefaultMarker() throws Exception { | ||
| MapboxMap mapboxMap = getMapboxMap(); | ||
|
|
||
| Marker marker = mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1))); | ||
| assertEquals(iconMap.size(), 1); | ||
|
|
||
| mapboxMap.removeMarker(marker); | ||
| assertEquals(iconMap.size(), 0); | ||
|
|
||
| mapboxMap.addMarker(new MarkerOptions().position(new LatLng())); | ||
| assertEquals(iconMap.size(), 1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testAddRemoveMany() throws Exception { | ||
| Activity activity = rule.getActivity(); | ||
| MapboxMap mapboxMap = getMapboxMap(); | ||
| IconFactory iconFactory = IconFactory.getInstance(activity); | ||
|
|
||
| // add 2 default icon markers | ||
| Marker defaultMarkerOne = mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1))); | ||
| Marker defaultMarkerTwo = mapboxMap.addMarker(new MarkerOptions().position(new LatLng(2, 1))); | ||
|
|
||
| // add 4 unique icon markers | ||
| mapboxMap.addMarker(new MarkerOptions() | ||
| .icon(iconFactory.fromResource(R.drawable.mapbox_logo_icon)) | ||
| .position(new LatLng(3, 1)) | ||
| ); | ||
| mapboxMap.addMarker(new MarkerOptions() | ||
| .icon(iconFactory.fromResource(R.drawable.mapbox_compass_icon)) | ||
| .position(new LatLng(4, 1)) | ||
| ); | ||
| mapboxMap.addMarker(new MarkerOptions() | ||
| .icon(IconUtils.drawableToIcon(activity, R.drawable.ic_stars, | ||
| ResourcesCompat.getColor(activity.getResources(), | ||
| R.color.blueAccent, activity.getTheme()))) | ||
| .position(new LatLng(5, 1)) | ||
| ); | ||
| mapboxMap.addMarker(new MarkerOptions() | ||
| .icon(iconFactory.fromResource(R.drawable.ic_android)) | ||
| .position(new LatLng(6, 1)) | ||
| ); | ||
|
|
||
| assertEquals("Amount of icons should match 5", 5, iconMap.size()); | ||
| assertEquals("Refcounter of default marker should match 2", 2, iconMap.get(iconFactory.defaultMarker()), 0); | ||
|
|
||
| mapboxMap.removeMarker(defaultMarkerOne); | ||
|
|
||
| assertEquals("Amount of icons should match 5", 5, iconMap.size()); | ||
| assertEquals("Refcounter of default marker should match 1", 1, iconMap.get(iconFactory.defaultMarker()), 0); | ||
|
|
||
| mapboxMap.removeMarker(defaultMarkerTwo); | ||
|
|
||
| assertEquals("Amount of icons should match 4", 4, iconMap.size()); | ||
| assertNull("DefaultMarker shouldn't exist anymore", iconMap.get(iconFactory.defaultMarker())); | ||
|
|
||
| mapboxMap.clear(); | ||
| assertEquals("Amount of icons should match 0", 0, iconMap.size()); | ||
| } | ||
|
|
||
| @Override | ||
| protected Class getActivityClass() { | ||
| return EspressoTestActivity.class; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters