From 8ca2f7dc319e2f24f75306f3f0f14d2bb02e0ebd Mon Sep 17 00:00:00 2001
From: Adam Domagalski <domagalsky@Adams-MacBook-Pro.local>
Date: Mon, 5 Nov 2018 01:22:09 +0100
Subject: [PATCH] button view gone

---
 .../wmi/findmytutor/activity/MapActivity.java | 26 +++++++++++++------
 app/src/main/res/layout/activity_map.xml      |  1 +
 2 files changed, 19 insertions(+), 8 deletions(-)

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 a0502c0..336ace5 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
@@ -1,5 +1,6 @@
 package com.uam.wmi.findmytutor.activity;
 
+import android.Manifest;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
@@ -134,9 +135,8 @@ public class MapActivity extends BaseActivity
     @Override
     public void onMapReady(MapboxMap mapboxMap) {
         MapActivity.this.mapboxMap = mapboxMap;
-        enableLocationPlugin();
         mStatusChecker.run();
-
+        enableLocationPlugin();
 
 //        // TODO what should happend on click?
 //        mapboxMap.setOnMarkerClickListener(marker1 -> {
@@ -438,8 +438,14 @@ public class MapActivity extends BaseActivity
 
     @SuppressWarnings({"MissingPermission"})
     private void enableLocationPlugin() {
+        Log.e(tag, "enableLocationPlugin");
+
         // Check if permissions are enabled and if not request
         if (PermissionsManager.areLocationPermissionsGranted(this)) {
+            Log.e(tag, "enableLocationPlugin true");
+
+            FloatingActionButton myLocationButton = findViewById(R.id.myLocationButton);
+            myLocationButton.setVisibility(View.VISIBLE);
 
             LocationComponentOptions options = LocationComponentOptions.builder(this)
                     .trackingGesturesManagement(true)
@@ -485,8 +491,12 @@ public class MapActivity extends BaseActivity
                 tiltParam = (tiltParam == 30) ? 0 : 30;
             });
         } else {
+            Log.e(tag, "enableLocationPlugin false");
+
             permissionsManager = new PermissionsManager(this);
             permissionsManager.requestLocationPermissions(this);
+            permissionsManager.onRequestPermissionsResult(0, new String[] {Manifest.permission.ACCESS_FINE_LOCATION}, new int[] {0});
+
         }
     }
 
@@ -503,11 +513,11 @@ public class MapActivity extends BaseActivity
 
     @Override
     public void onPermissionResult(boolean granted) {
-        if (granted) {
-            enableLocationPlugin();
-        } else {
-            Toast.makeText(this, R.string.user_location_permission_not_granted, Toast.LENGTH_LONG).show();
-            finish();
-        }
+//        if (granted) {
+//            enableLocationPlugin();
+//        } else {
+//            Toast.makeText(this, R.string.user_location_permission_not_granted, Toast.LENGTH_LONG).show();
+//            finish();
+//        }
     }
 }
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 89926e3..f1f614e 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -52,6 +52,7 @@
             android:background="@color/half_black"
             android:backgroundTint="@color/materialDarkGrey"
             android:src="@android:drawable/ic_menu_mylocation"
+            android:visibility="invisible"
             app:borderWidth="0dp"
             app:elevation="6dp"
             app:fabSize="normal"