From a496e2b4a79e477273b206141d963aad2ae380eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Tue, 15 Jan 2019 12:12:31 +0100 Subject: [PATCH] [annotation] show style change button in annotation examples --- .../annotation/BulkSymbolActivity.java | 3 +++ .../DynamicSymbolChangeActivity.java | 11 ++++---- .../annotation/FillChangeActivity.java | 3 +-- .../annotation/LineChangeActivity.java | 3 +++ .../annotation/PressForSymbolActivity.java | 26 +++++++++++-------- .../activity/annotation/SymbolActivity.java | 2 +- .../main/res/layout/activity_annotation.xml | 1 - 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java index 327796320..3093a84df 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java @@ -24,6 +24,8 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; + import timber.log.Timber; import java.io.*; @@ -65,6 +67,7 @@ private void initMap(MapboxMap mapboxMap) { ); mapboxMap.setStyle(new Style.Builder().fromUrl(Style.MAPBOX_STREETS), style -> { + findViewById(R.id.fabStyles).setOnClickListener(v -> mapboxMap.setStyle(Utils.INSTANCE.getNextStyle())); symbolManager = new SymbolManager(mapView, mapboxMap, style); symbolManager.setIconAllowOverlap(true); loadData(0); diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java index e41e6a9a3..64d4c69c1 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java @@ -5,11 +5,10 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.ColorInt; import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; + import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -60,9 +59,9 @@ protected void onCreate(Bundle savedInstanceState) { )); mapboxMap.setStyle(new Style.Builder() - .fromUrl(Style.MAPBOX_STREETS) - .withImage(ID_ICON_1, generateBitmap(R.drawable.mapbox_ic_place),true) - .withImage(ID_ICON_2, generateBitmap(R.drawable.mapbox_ic_offline), true) + .fromUrl(Style.MAPBOX_STREETS) + .withImage(ID_ICON_1, generateBitmap(R.drawable.mapbox_ic_place), true) + .withImage(ID_ICON_2, generateBitmap(R.drawable.mapbox_ic_offline), true) , style -> { symbolManager = new SymbolManager(mapView, mapboxMap, style); symbolManager.setIconAllowOverlap(true); @@ -74,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) { .withIconImage(ID_ICON_1); symbol = symbolManager.create(SymbolOptions); - }); + }); }); diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java index 5fd3199dd..bfe7c276c 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java @@ -7,6 +7,7 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; + import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; @@ -18,9 +19,7 @@ import com.mapbox.mapboxsdk.plugins.annotation.FillManager; import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.utils.ColorUtils; -import timber.log.Timber; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java index 0d007e4ef..1d70cae00 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java @@ -16,6 +16,7 @@ import com.mapbox.mapboxsdk.plugins.annotation.LineManager; import com.mapbox.mapboxsdk.plugins.annotation.LineOptions; import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.util.ArrayList; @@ -66,6 +67,8 @@ protected void onCreate(Bundle savedInstanceState) { ); mapboxMap.setStyle(new Style.Builder().fromUrl(Style.MAPBOX_STREETS), style -> { + findViewById(R.id.fabStyles).setOnClickListener(v -> mapboxMap.setStyle(Utils.INSTANCE.getNextStyle())); + lineManager = new LineManager(mapView, mapboxMap, style); lines = lineManager.create(getAllPolylines()); lineManager.addClickListener(line -> Toast.makeText( diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java index d64518098..6191d1f2f 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java @@ -9,6 +9,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; + import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; @@ -17,6 +18,7 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; /** * Test activity showcasing to add a Symbol on click. @@ -24,7 +26,7 @@ * Shows how to use a OnMapClickListener and a OnMapLongClickListener *

*/ -public class PressForSymbolActivity extends AppCompatActivity implements Style.OnStyleLoaded { +public class PressForSymbolActivity extends AppCompatActivity { public static final String ID_ICON = "id-icon"; private SymbolManager symbolManager; @@ -49,20 +51,17 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { ); mapboxMap.addOnMapLongClickListener(this::addSymbol); mapboxMap.addOnMapClickListener(this::addSymbol); - mapboxMap.setStyle(new Style.Builder().fromUrl(Style.MAPBOX_STREETS) - .withImage(ID_ICON, generateBitmap(R.drawable.mapbox_ic_place)), this); - }); - } + mapboxMap.setStyle(getStyleBuilder(Style.MAPBOX_STREETS), style -> { + findViewById(R.id.fabStyles).setOnClickListener(v -> + mapboxMap.setStyle(getStyleBuilder(Utils.INSTANCE.getNextStyle()))); - @Override - public void onStyleLoaded(@NonNull Style style) { - symbolManager = new SymbolManager(mapView, mapboxMap, style); - symbolManager.setIconAllowOverlap(true); - symbolManager.setTextAllowOverlap(true); + symbolManager = new SymbolManager(mapView, mapboxMap, style); + }); + }); } private boolean addSymbol(LatLng point) { - if(symbolManager==null){ + if (symbolManager == null) { return false; } @@ -73,6 +72,11 @@ private boolean addSymbol(LatLng point) { return true; } + private Style.Builder getStyleBuilder(@NonNull String styleUrl) { + return new Style.Builder().fromUrl(styleUrl) + .withImage(ID_ICON, generateBitmap(R.drawable.mapbox_ic_place)); + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java index 6e39c5a07..5050cfbe5 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java @@ -47,7 +47,7 @@ public class SymbolActivity extends AppCompatActivity { private static final String MAKI_ICON_AIRPORT = "airport-15"; private static final String MAKI_ICON_CAR = "car-15"; private static final String MAKI_ICON_CAFE = "cafe-15"; - private static final String MAKI_ICON_CIRCLE = "circle-15"; + private static final String MAKI_ICON_CIRCLE = "fire-station-15"; private final Random random = new Random(); private final List animators = new ArrayList<>(); diff --git a/app/src/main/res/layout/activity_annotation.xml b/app/src/main/res/layout/activity_annotation.xml index 8e77d180c..dfbf3e818 100644 --- a/app/src/main/res/layout/activity_annotation.xml +++ b/app/src/main/res/layout/activity_annotation.xml @@ -22,7 +22,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" - android:visibility="gone" android:tint="@android:color/white" app:backgroundTint="@color/colorAccent" app:fabSize="normal"