Merge branch 'fix-background-task-timer' of s416084/find-my-tutor-android into develop

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".activity.StartupActivity"
-            android:label="@string/title_activity_startup"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java

@@ -3,34 +3,30 @@ package com.uam.wmi.findmytutor.activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
-
 import android.support.design.widget.BottomNavigationView;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
-
 import android.view.MenuItem;
-import android.content.pm.PackageManager;
-import android.os.Build;
-
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import android.support.v7.widget.Toolbar;
-
 import com.mapbox.mapboxsdk.Mapbox;
-
+import com.mapbox.mapboxsdk.maps.MapFragment;
 import com.uam.wmi.findmytutor.ListViewAdapter;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;

app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java

@@ -1,17 +1,28 @@
 package com.uam.wmi.findmytutor.activity;
 
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
+import com.uam.wmi.findmytutor.utils.PrefUtils;
 
 
 public class MapActivity extends BaseActivity {
     private MapView mapView;
     String tag = "LifeCycleEvents";
+    private static final int REQUEST_PERMISSIONS = 100;
+    private boolean isTutor;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -20,14 +31,19 @@ public class MapActivity extends BaseActivity {
         mapView = findViewById(R.id.mapView);
         mapView.onCreate(savedInstanceState);
 
-        mapView.getMapAsync(new OnMapReadyCallback() {
+        isTutor = PrefUtils.getIsTutor(getApplicationContext());
-            @Override
-            public void onMapReady(MapboxMap mapboxMap) {
 
-                // Customize map with markers, polylines, etc.
+        if (isTutor) {
+            fn_permission();
+        }
+
+        mapView.getMapAsync(mapboxMap -> {
+
+            // Customize map with markers, polylines, etc.
 
-            }
         });
+        // TODO remove logout button
+        configureLogoutButton();
     }
 
 
@@ -75,6 +91,51 @@ public class MapActivity extends BaseActivity {
         mapView.onSaveInstanceState(outState);
     }
 
+    private void configureLogoutButton(){
+        // Logout button
+        final FloatingActionButton button = findViewById(R.id.logoutButton);
+
+        button.setOnClickListener(view -> {
+            PrefUtils.cleanUserLocalStorage(getApplicationContext());
+
+            Intent i = getBaseContext().getPackageManager()
+                    .getLaunchIntentForPackage(getBaseContext().getPackageName());
+            if (i != null) {
+                i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            }
+            startActivity(i);
+            finish();
+        });
+    }
+
+    private void fn_permission() {
+        if ((ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
+
+            if ((ActivityCompat.shouldShowRequestPermissionRationale(MapActivity.this, android.Manifest.permission.ACCESS_FINE_LOCATION))) {
+
+            } else {
+                ActivityCompat.requestPermissions(MapActivity.this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION
+
+                        },
+                        REQUEST_PERMISSIONS);
+            }
+        } else {
+
+            if (isTutor) {
+                Intent intent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    startForegroundService(intent);
+                } else {
+                    startService(intent);
+                }
+
+            } else {
+                Toast.makeText(getApplicationContext(), "Please enable the gps", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
     @Override
     protected int getContentViewId() {
         return R.layout.activity_map;

app/src/main/java/com/uam/wmi/findmytutor/activity/NotificationsActivity.java

@@ -6,11 +6,12 @@ import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import android.os.Handler;
 import android.util.Log;
 
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Marker;
+import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
@@ -21,39 +22,94 @@ import com.uam.wmi.findmytutor.model.Coordinate;
 import com.uam.wmi.findmytutor.network.RetrofitClientInstance;
 import com.uam.wmi.findmytutor.service.CoordinateService;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 
 
-public class NotificationsActivity extends BaseActivity {
+public class NotificationsActivity extends BaseActivity implements
+        OnMapReadyCallback {
+
+    private int mInterval = 10000;
+    private Handler mHandler;
 
     private MapView mapView;
+    private MapboxMap mapboxMap;
+    private Map<String,Coordinate> coordsMap = new HashMap<>();
+
     private CoordinateService coordinateService;
     private CompositeDisposable disposable = new CompositeDisposable();
-    private List<Coordinate> coordinatesList = new ArrayList<>();
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // This contains the MapView in XML and needs to be called after the access token is configured.
+        setContentView(R.layout.activity_notifications);
+
+
+        // mapInit(savedInstanceState);
+
+        // Mapbox access token is configured here. This needs to be called either in your application
+        // object or in the same activity which contains the mapview.
+        Mapbox.getInstance(this, getString(R.string.access_token));
+
+
+
+        mapView = findViewById(R.id.mapView2);
+        mapView.onCreate(savedInstanceState);
+        mapView.getMapAsync(this);
 
-        mapInit(savedInstanceState);
 
-//        coordinateService = ApiClient.getClient(getApplicationContext())
-//                .create(CoordinateService.class);
         final SharedPreferences sharedPref = getSharedPreferences("fmtPrefs", Context.MODE_PRIVATE);
         final String authToken = sharedPref.getString("authToken",null);
 
         coordinateService = RetrofitClientInstance.createService(CoordinateService.class,"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1laWQiOiI2YjhmNzFiMS00NDM2LTQxZGQtYjg3MC1mNzZlNjdkNDM4NDMiLCJzdWIiOiJzdHJpbmciLCJqdGkiOiJiZGRjZTAwMC0xN2U4LTQwNDUtYWZiNS1kY2RkOWNhNDFiNmQiLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJUdXRvciIsImV4cCI6MTU0MTcxNzk2MywiaXNzIjoiaHR0cDovL2ZpbmRteXR1dG9yLmNvbSIsImF1ZCI6Imh0dHA6Ly9maW5kbXl0dXRvci5jb20ifQ.JJVNeMAwwla6DJk6X8qZUgPFKJp-Epx55W9V_fIwpgg");
 
-        fetchTopCoords();
+        mHandler = new Handler();
+
+//        fetchTopCoords();
     }
 
+    @Override
+    public void onMapReady(MapboxMap map) {
+        mapboxMap = map;
+        final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
+                .position(new LatLng(52.466782,16.927549)));
+        mStatusChecker.run();
+
+        mapboxMap.addOnMapClickListener(new MapboxMap.OnMapClickListener() {
+            @Override
+            public void onMapClick(@NonNull LatLng point) {
+
+                // When the user clicks on the map, we want to animate the marker to that
+                // location.
+                ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
+                        new LatLngEvaluator(), marker.getPosition(), point);
+                markerAnimator.setDuration(2000);
+                markerAnimator.start();
+            }
+        });
+    }
+
+
+    Runnable mStatusChecker = new Runnable() {
+        @Override
+        public void run() {
+            try{
+                fetchTopCoords();
+            } finally {
+                mHandler.postDelayed(mStatusChecker, mInterval);
+            }
+        }
+    };
+/*
     private void mapInit(Bundle savedInstanceState) {
         // Mapbox access token is configured here. This needs to be called either in your application
         // object or in the same activity which contains the mapview.
@@ -68,9 +124,9 @@ public class NotificationsActivity extends BaseActivity {
             public void onMapReady(MapboxMap mapboxMap) {
 
                 final Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
-                        .position(new LatLng(64.900932, -18.167040)));
+                        .position(new LatLng(52.466782,16.927549)));
 
-                mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
+                mapboxMap.addOnMapClickListener(new MapboxMap.OnMapClickListener() {
                     @Override
                     public void onMapClick(@NonNull LatLng point) {
 
@@ -86,21 +142,50 @@ public class NotificationsActivity extends BaseActivity {
             }
         });
 
-    }
+    }*/
 
     private void fetchTopCoords() {
         disposable.add(
-                coordinateService.getTopCoordinates()
+//                coordinateService.getTopCoordinates()
+                coordinateService.getOnlineCoordinates()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribeWith(new DisposableSingleObserver<List<Coordinate>>() {
                     @Override
                     public void onSuccess(List<Coordinate> coordsList) {
 
-                        Log.d("mapTag", "co?");
+
-                        for (Coordinate element:
+                        for (Coordinate element : coordsList) {
-                             coordsList) {
+                            String id = element.getUserId();
-                            Log.d("mapTag", element.getUserId());
+                            Coordinate cord = coordsMap.get(id);
+
+
+                            Log.d("mapper", "a " + mapboxMap.getMarkerViewManager());
+                            Log.d("mapper", "b " + coordsMap.size());
+                            if (cord != null) {
+                                if (!cord.getLongitude().equals(element.getLongitude())
+                                        ) {
+                                    Log.d("mapper", " cos sie zienilo ");
+                                    Marker marker = mapboxMap.addMarker(new MarkerViewOptions()
+                                            .title(cord.getUserId())
+                                            .position(new LatLng(cord.getLatitude(),cord.getLongitude())));
+
+                                    ValueAnimator markerAnimator = ObjectAnimator.ofObject(marker, "position",
+                                            new LatLngEvaluator(), marker.getPosition(), new LatLng(element.getLatitude(),element.getLongitude()));
+                                    markerAnimator.setDuration(2000);
+                                    markerAnimator.start();
+
+                                    coordsMap.replace(id,element);
+                                } else if (!cord.getTimeStamp().equals(element.getTimeStamp())){
+                                    Log.d("mapper", "update");
+                                    Log.d("mapper", " "+cord.getTimeStamp());
+                                    Log.d("mapper", " "+element.getTimeStamp());
+                                    coordsMap.replace(id,element);
+                                }
+                            } else {
+                                coordsMap.put(id,element);
+                                mapboxMap.addMarker(new MarkerOptions().position(new LatLng(element.getLatitude(), element.getLongitude())));
+                            }
                         }
                     }
 
@@ -113,6 +198,7 @@ public class NotificationsActivity extends BaseActivity {
 
     }
 
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -147,6 +233,7 @@ public class NotificationsActivity extends BaseActivity {
     protected void onDestroy() {
         super.onDestroy();
         mapView.onDestroy();
+        mHandler.removeCallbacks(mStatusChecker);
         disposable.dispose();
     }
 

app/src/main/res/layout/activity_map.xml

@@ -19,6 +19,17 @@
 
     </com.mapbox.mapboxsdk.maps.MapView>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/logoutButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="@dimen/fab_margin"
+        android:layout_marginTop="77dp"
+        app:backgroundTint="@android:color/holo_red_dark"
+        app:srcCompat="@android:drawable/ic_lock_power_off" />
+
     <include
         android:id="@+id/navigation"
         layout="@layout/element_bottom_navigation"

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong