From da018120f1f640db819c4397ac4e60940d40e06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Sat, 5 Jan 2019 00:35:52 +0100 Subject: [PATCH] Update gradle --- app/build.gradle | 2 +- .../wmi/findmytutor/activity/MapActivity.java | 23 +++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 019ca68..46e25a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "com.uam.wmi.findmytutor" minSdkVersion 22 targetSdkVersion 27 - versionCode 33 + versionCode 34 versionName "0.9.6-beta" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index a9f0eb6..3abc1e1 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -150,22 +150,7 @@ public class MapActivity extends BaseActivity mapboxMap.setOnMarkerClickListener(marker -> { String id = markerUserHash.get(marker.getId()); - String locationLevel = PrefUtils.getLocationLevel(getApplicationContext()); - - /* if (id.equals(myId) && (locationLevel.equals(SharingLevel.MANUAL.toString()) || locationLevel.equals(SharingLevel.PREDEFINED.toString()))) { - selectLocationButton.setVisibility(View.GONE); - removeLocationButton.setVisibility(View.VISIBLE); - - removeLocationButton.setOnClickListener(view -> { - stopBackgroundLocalizationTask(); - - removeLocationButton.setVisibility(View.GONE); - Toast.makeText(MapActivity.this, R.string.manual_marker_info, Toast.LENGTH_SHORT).show(); - - }); - } else {*/ - createMarkerModal(id); - /* }*/ + createMarkerModal(id); return true; }); @@ -248,7 +233,11 @@ public class MapActivity extends BaseActivity } private void setOnMapClickListener() { - mapboxMap.addOnMapClickListener(e -> removeLocationButton.setVisibility(View.GONE)); + + mapboxMap.addOnMapClickListener(e -> { + removeLocationButton.setVisibility(View.GONE); + selectLocationButton.setVisibility(View.GONE); + }); } private void setOnMapLongClickListener() {