Skip to content

Show style change button in annotation examples #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasPaczos merged 1 commit into from
Jan 16, 2019
Merged

Show style change button in annotation examples #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ain/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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);
Expand Down
11 changes: 5 additions & 6 deletions ...com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -74,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
.withIconImage(ID_ICON_1);

symbol = symbolManager.create(SymbolOptions);
});
});


});
Expand Down
3 changes: 1 addition & 2 deletions ...ain/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions ...ain/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
26 changes: 15 additions & 11 deletions ...java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,14 +18,15 @@
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.
* <p>
* Shows how to use a OnMapClickListener and a OnMapLongClickListener
* </p>
*/
public class PressForSymbolActivity extends AppCompatActivity implements Style.OnStyleLoaded {
public class PressForSymbolActivity extends AppCompatActivity {

public static final String ID_ICON = "id-icon";
private SymbolManager symbolManager;
Expand All @@ -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;
}

Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ValueAnimator> animators = new ArrayList<>();
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/activity_annotation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down