From 17e2c9baf3e4d8f33c33fad07023d8de3a181de9 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 11 Jan 2018 18:41:03 +1000 Subject: [PATCH] Make controller method public and add call to initiateCameraUpload() in NearbyMapFragment --- .../nrw/commons/contributions/ContributionController.java | 2 +- .../java/fr/free/nrw/commons/nearby/NearbyMapFragment.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 5614172a8..b438fc2ce 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -61,7 +61,7 @@ public class ContributionController { } } - void startCameraCapture() { + public void startCameraCapture() { Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); lastGeneratedCaptureUri = reGenerateImageCaptureUriInCache(); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index ff24aa28a..b4e07c488 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -398,7 +398,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { distance.setText(place.distance.toString()); fabCamera.setOnClickListener(view -> { - //TODO: Implement camera button + Timber.d("Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); + controller = new ContributionController(this); + DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller); + directUpload.storeSharedPrefs(); + directUpload.initiateCameraUpload(); }); fabGallery.setOnClickListener(view -> {