Finish tidying up setOnClickListeners

This commit is contained in:
misaochan 2018-02-06 19:58:35 +10:00 committed by maskara
parent 8b533ef98d
commit 65b0b52b01
2 changed files with 7 additions and 2 deletions

View file

@ -29,6 +29,11 @@ public class DirectUpload {
this.prefs = prefs; this.prefs = prefs;
} }
DirectUpload(Fragment fragment, ContributionController controller) {
this.fragment = fragment;
this.controller = controller;
}
void initiateCameraUpload() { void initiateCameraUpload() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(fragment.getActivity(), WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) { if (ContextCompat.checkSelfPermission(fragment.getActivity(), WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {

View file

@ -102,7 +102,7 @@ class PlaceRenderer extends Renderer<Place> {
cameraButton.setOnClickListener(view2 -> { cameraButton.setOnClickListener(view2 -> {
Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(fragment); controller = new ContributionController(fragment);
DirectUpload directUpload = new DirectUpload(this, controller, prefs); DirectUpload directUpload = new DirectUpload(fragment, controller);
storeSharedPrefs(); storeSharedPrefs();
directUpload.initiateCameraUpload(); directUpload.initiateCameraUpload();
}); });
@ -110,7 +110,7 @@ class PlaceRenderer extends Renderer<Place> {
galleryButton.setOnClickListener(view3 -> { galleryButton.setOnClickListener(view3 -> {
Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription()); Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
controller = new ContributionController(fragment); controller = new ContributionController(fragment);
DirectUpload directUpload = new DirectUpload(this, controller, prefs); DirectUpload directUpload = new DirectUpload(fragment, controller);
storeSharedPrefs(); storeSharedPrefs();
directUpload.initiateGalleryUpload(); directUpload.initiateGalleryUpload();
}); });