Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Adding ClickToAddImageActivity example to MainActivity #923

Merged
merged 2 commits into from
Mar 29, 2019
Merged

Adding ClickToAddImageActivity example to MainActivity #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5a71f1
additions
Nov 27, 2018
6c1688c
added null check
langsmith Jan 30, 2019
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
8 changes: 8 additions & 0 deletions MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,14 @@ private void initializeModels() {
null,
R.string.activity_style_image_source_url, false, BuildConfig.MIN_SDK_VERSION
));
exampleItemModels.add(new ExampleItemModel(
R.id.nav_styles,
R.string.activity_styles_click_to_add_image_title,
R.string.activity_styles_click_to_add_image_description,
new Intent(MainActivity.this, ClickToAddImageActivity.class),
null,
R.string.activity_styles_click_to_add_image_url, false, BuildConfig.MIN_SDK_VERSION
));
exampleItemModels.add(new ExampleItemModel(
R.id.nav_styles,
R.string.activity_style_image_source_time_lapse_title,
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public void run() {
markerIconCurrentLocation = (LatLng) markerIconAnimator.getAnimatedValue();
markerIconAnimator.cancel();
}

if (latLngEvaluator != null) {
markerIconAnimator = ObjectAnimator
.ofObject(latLngEvaluator, count == 0 ? new LatLng(37.61501, -122.385374)
Expand Down
7 changes: 3 additions & 4 deletions ...o/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public class ClickToAddImageActivity extends AppCompatActivity implements
private static final String ID_IMAGE_SOURCE = "source-id";
private static final String CIRCLE_SOURCE_ID = "circle-source-id";
private static final String ID_IMAGE_LAYER = "layer-id";
private static int PHOTO_PICK_CODE = 4;
private MapView mapView;
private MapboxMap mapboxMap;
private LatLngQuad quad;
private List<Feature> boundsFeatureList;
private List<Point> boundsCirclePointList;
private static int PHOTO_PICK_CODE = 4;
private int imageCountIndex;

@Override
Expand Down Expand Up @@ -99,7 +99,7 @@ public boolean onMapClick(@NonNull LatLng point) {

boundsFeatureList.add(Feature.fromGeometry(Point.fromLngLat(point.getLongitude(), point.getLatitude())));

// Add the click point to the circle layer and update the display of the circle layer data
// Add the click point to the CircleLayer and update the display of the CircleLayer data
boundsCirclePointList.add(Point.fromLngLat(point.getLongitude(), point.getLatitude()));

Style style = mapboxMap.getStyle();
Expand Down Expand Up @@ -130,7 +130,6 @@ public boolean onMapClick(@NonNull LatLng point) {
pickPhotoIntent.setType("image/*");
startActivityForResult(pickPhotoIntent, PHOTO_PICK_CODE);
}

return true;
}

Expand Down Expand Up @@ -172,7 +171,7 @@ public void onActivityResult(int requestCode, int resultCode, final Intent data)
@Override
public void onStyleLoaded(@NonNull Style style) {
Uri selectedImage = data.getData();
InputStream imageStream = null;
InputStream imageStream;
try {
imageStream = getContentResolver().openInputStream(selectedImage);

Expand Down