From b02ec917ed74a4b7220820472f16a129637e98e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Tue, 20 Nov 2018 22:29:07 +0100 Subject: [PATCH] Add markers filter --- .../findmytutor/activity/BaseActivity.java | 51 +++---- .../wmi/findmytutor/activity/MapActivity.java | 134 +++++++++--------- .../com/uam/wmi/findmytutor/model/User.java | 9 ++ .../com/uam/wmi/findmytutor/utils/Consts.java | 4 +- .../wmi/findmytutor/utils/MapboxMarker.java | 23 +++ .../findmytutor/utils/RxSearchObservable.java | 3 + app/src/main/res/drawable/custom_marker.png | Bin 923 -> 444 bytes app/src/main/res/drawable/red_marker.png | Bin 3163 -> 1361 bytes 8 files changed, 127 insertions(+), 97 deletions(-) create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/utils/MapboxMarker.java diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java index 5e2dd6d..238526f 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java @@ -20,7 +20,6 @@ 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.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -38,9 +37,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; import static com.uam.wmi.findmytutor.utils.PrefUtils.storeBackgroundLocationStatus; @@ -50,21 +47,17 @@ public abstract class BaseActivity extends AppCompatActivity implements BottomNavigationView.OnNavigationItemSelectedListener { - String tag = getClass().getName(); - protected static final int REQUEST_PERMISSIONS = 100; private final static int REQUEST_CODE_ASK_PERMISSIONS = 1; - - private static final String[] REQUIRED_SDK_PERMISSIONS = new String[] { - Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS }; - + private static final String[] REQUIRED_SDK_PERMISSIONS = new String[]{ + Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS}; public DrawerLayout drawerLayout; protected BottomNavigationView navigationView; protected NavigationView drawerNavigationView; protected DrawerLayout sideDrawer; protected Toolbar toolbar; protected boolean isTutor; - + String tag = getClass().getName(); private ActionBarDrawerToggle actionBarDrawerToggle; private SharingFragment sharingFragment; @@ -84,13 +77,13 @@ public abstract class BaseActivity item -> { String itemName = (String) item.getTitle(); Intent launchIntent; - if (itemName.equals(getResources().getString(R.string.navigation_item_whitelist))) { + if (itemName.equals(getResources().getString(R.string.navigation_item_whitelist))) { /* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class); startActivity(launchIntent);*/ } else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) { /* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class); startActivity(launchIntent);*/ - } else if (itemName.equals(getResources().getString(R.string.navigation_item_profile))) { + } else if (itemName.equals(getResources().getString(R.string.navigation_item_profile))) { /* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class); startActivity(launchIntent);*/ } else if (itemName.equals(getResources().getString(R.string.navigation_item_settings))) { @@ -98,12 +91,12 @@ public abstract class BaseActivity startActivity(launchIntent); } else if (itemName.equals(getResources().getString(R.string.navigation_item_logout))) { - if(PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext())) { + if (PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext())) { stopBackgroundLocalizationTask(); } - storeBackgroundLocationStatus(getApplication(),false); - PrefUtils.storeIsLoggedIn(getApplicationContext(),false); + storeBackgroundLocationStatus(getApplication(), false); + PrefUtils.storeIsLoggedIn(getApplicationContext(), false); Intent i = getBaseContext().getPackageManager() .getLaunchIntentForPackage(getBaseContext().getPackageName()); @@ -130,14 +123,8 @@ public abstract class BaseActivity if (!isTutor) { navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE); } - - - - - } - protected void checkPermissions() { final List missingPermissions = new ArrayList(); @@ -201,9 +188,9 @@ public abstract class BaseActivity Boolean shouldServiceRun = PrefUtils.isEnableSharingLocalization(getApplicationContext()) && !PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext()); - if (shouldServiceRun){ + if (shouldServiceRun) { startBackgroundLocalizationTask(); - } else if(PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext()) && + } else if (PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext()) && !PrefUtils.isEnableSharingLocalization(getApplicationContext())) { stopBackgroundLocalizationTask(); } @@ -263,8 +250,16 @@ public abstract class BaseActivity MenuItem myActionMenuItem = menu.findItem(R.id.action_search); searchView = (SearchView) myActionMenuItem.getActionView(); + searchView.setOnQueryTextFocusChangeListener((v, hasFocus) -> { + if (!hasFocus && activeFragment.equals(ActiveFragment.NONE)) { + restoreMapMarkers(); + } + }); + + RxSearchObservable.fromView(searchView) .map(String::toLowerCase) + .filter(t -> !t.trim().isEmpty()) .debounce(300, TimeUnit.MILLISECONDS) .distinctUntilChanged() .subscribeOn(Schedulers.io()) @@ -277,9 +272,16 @@ public abstract class BaseActivity private void executeSearch(String input) { if (activeFragment.equals(ActiveFragment.USER_LIST)) { ((UsersListFragment) userListFragment).searchUser(input); + } else if (activeFragment.equals(ActiveFragment.NONE)) { + searchUser(input); } } + public void searchUser(String textToSearch) { + } + + public void restoreMapMarkers() { + } @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -289,7 +291,6 @@ public abstract class BaseActivity return super.onOptionsItemSelected(item); } - @Override protected void onStart() { super.onStart(); @@ -311,13 +312,13 @@ public abstract class BaseActivity @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { - navigationView.postDelayed(() -> { int itemId = item.getItemId(); if (itemId == R.id.nav_map) { removeFragment(sharingFragment); removeFragment(userListFragment); + activeFragment = ActiveFragment.NONE; } else if (itemId == R.id.nav_profile) { loadUserSettingsFragment(); } else if (itemId == R.id.nav_user_list) { 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 d9b67a6..a2a4a08 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 @@ -6,7 +6,6 @@ import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.graphics.Color; import android.location.Location; import android.os.Bundle; import android.os.Handler; @@ -40,9 +39,6 @@ import com.mapbox.mapboxsdk.location.modes.RenderMode; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.style.layers.CircleLayer; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.sources.VectorSource; import com.uam.wmi.findmytutor.R; import com.uam.wmi.findmytutor.model.Coordinate; import com.uam.wmi.findmytutor.model.User; @@ -51,32 +47,20 @@ import com.uam.wmi.findmytutor.service.CoordinateService; import com.uam.wmi.findmytutor.service.UserService; import com.uam.wmi.findmytutor.utils.PrefUtils; import com.uam.wmi.findmytutor.utils.RestApiHelper; -import com.uam.wmi.findmytutor.utils.SharingLevel; import com.uam.wmi.findmytutor.utils.mapUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Set; -import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.annotations.NonNull; import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Predicate; import io.reactivex.observers.DisposableSingleObserver; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; import timber.log.Timber; -import java.util.Set; - -import static com.mapbox.mapboxsdk.style.layers.Property.NONE; -import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleColor; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.circleRadius; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; -import static java.util.stream.Collectors.toList; public class MapActivity extends BaseActivity @@ -105,6 +89,7 @@ public class MapActivity extends BaseActivity private int bearingParam = 180; private int tiltParam = 30; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -137,7 +122,6 @@ public class MapActivity extends BaseActivity handleBackgroundTaskLifeCycle(); } - @Override public void onMapReady(MapboxMap mapboxMap) { MapActivity.this.mapboxMap = mapboxMap; @@ -185,19 +169,17 @@ public class MapActivity extends BaseActivity alertDialog.show(); } - private void handleError(Throwable error) { showError(error); } - private void showError(Throwable e) { String message; if (e instanceof HttpException) { ResponseBody responseBody = ((HttpException) e).response().errorBody(); message = RestApiHelper.getErrorMessage(responseBody); - }else { + } else { message = "Network Error!"; } @@ -312,37 +294,6 @@ public class MapActivity extends BaseActivity } - private void addStaticLayer() { - // Toggle layer button - final FloatingActionButton button = findViewById(R.id.toggleMarkerLayerButton); - button.setVisibility(View.VISIBLE); - - button.setOnClickListener(view -> { - - Layer layer = mapboxMap.getLayer("museums"); - if (layer != null) { - if (VISIBLE.equals(layer.getVisibility().getValue())) { - layer.setProperties(visibility(NONE)); - } else { - layer.setProperties(visibility(VISIBLE)); - } - } - }); - - // TODO here we create static layer, we are able to hide/show (but we cannot put markers inthere) - VectorSource museums = new VectorSource("museums_source", "mapbox://mapbox.2opop9hr"); - mapboxMap.addSource(museums); - - CircleLayer museumsLayer = new CircleLayer("museums", "museums_source"); - museumsLayer.setSourceLayer("museum-cusco"); - museumsLayer.setProperties( - visibility(VISIBLE), - circleRadius(8f), - circleColor(Color.argb(255, 55, 148, 179)) - ); - mapboxMap.addLayer(museumsLayer); - } - private void fetchTopCoords() { disposable.add( @@ -354,44 +305,37 @@ public class MapActivity extends BaseActivity @Override public void onSuccess(List coordsList) { - if(coordsList.isEmpty()) { - Log.e(tag, "200 empty []"); + if (coordsList.isEmpty() && droppedMarker == null) { + Timber.e("200 empty []"); mapboxMap.clear(); return; } - ArrayList tmp = new ArrayList<>(); + ArrayList tmp = new ArrayList<>(); for (Coordinate coordinate : coordsList) { - Log.e(tag, coordinate.toString()); - if (coordinate.getDisplayMode().equals(SharingLevel.PRESENCE.toString())) { - Log.e(tag, "presence user omitted"); - } else { - tmp.add(coordinate.getUserId()); - } + tmp.add(coordinate.getUserId()); } - Set currentCoordsIds = new HashSet<>(tmp); - if (previousCoordsIds.isEmpty()){ + if (previousCoordsIds.isEmpty()) { previousCoordsIds.addAll(currentCoordsIds); } else { // here we clear + it returns bool if sth was removed if (previousCoordsIds.removeAll(currentCoordsIds)) { - for (String toRemoveId: previousCoordsIds) { - Log.e(tag+ "delete: " , "removing: " + toRemoveId + ": " + markerHash.get(toRemoveId)); + for (String toRemoveId : previousCoordsIds) { + Log.e(tag + "delete: ", "removing: " + toRemoveId + ": " + markerHash.get(toRemoveId)); mapboxMap.removeMarker(markerHash.get(toRemoveId)); markerHash.remove(toRemoveId); coordsMap.remove(toRemoveId); } } else { // TODO double check when some markers api will change - Log.e(tag+ "delete: ","nothing to remove"); + Log.e(tag + "delete: ", "nothing to remove"); } } - for (Coordinate element : coordsList) { String id = element.getUserId(); String newLabel = element.getLabel(); @@ -430,13 +374,16 @@ public class MapActivity extends BaseActivity } } else { - Log.e(tag, "Marker Added: " + id); coordsMap.put(id, element); - Marker marker = mapboxMap.addMarker(new MarkerOptions() + + MarkerOptions markerOptions = new MarkerOptions() .title(id) - .position(new LatLng(element.getLatitude(), element.getLongitude()))); + .position(new LatLng(element.getLatitude(), element.getLongitude())); + + Marker marker = mapboxMap.addMarker(markerOptions); + markerHash.put(id, marker); } @@ -603,4 +550,51 @@ public class MapActivity extends BaseActivity // finish(); // } } + + @Override + public void searchUser(String textToSearch) { + getUserFromApi(textToSearch); + } + + private void getUserFromApi(String userNameToSearch) { + disposable.add( + userService.apiUsersGet() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .map(tutors -> Stream.of(tutors).filter(t -> + t.toSearchAbleUserName().toLowerCase().contains(userNameToSearch.toLowerCase())).toList()) + .subscribeWith(new DisposableSingleObserver>() { + @Override + public void onSuccess(List users) { + filterMarkers(users); + } + + @Override + public void onError(Throwable e) { + showError(e); + } + })); + } + + private void filterMarkers(List users) { + restoreMapMarkers(); + + Icon icon1 = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.custom_marker); + + List markersToSet = Stream.of(mapboxMap.getMarkers()) + .filter(m -> Stream.of(users).anyMatch(u -> u.getId().equals(m.getTitle()))) + .toList(); + + for (Marker marker : markersToSet) { + marker.setIcon(icon1); + } + } + + public void restoreMapMarkers() { + Icon icon = IconFactory.getInstance(MapActivity.this).fromResource(R.drawable.red_marker); + + for (Marker marker : mapboxMap.getMarkers()) { + marker.setIcon(icon); + } + } } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/User.java b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java index 0e5c0d5..7788f61 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/model/User.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java @@ -712,6 +712,15 @@ public class User extends BaseResponse { return sb.toString(); } + public String toSearchAbleUserName(){ + StringBuilder sb = new StringBuilder(); + sb.append(getFirstName()); + sb.append(getLastName()); + + return sb.toString(); + } + + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/Consts.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/Consts.java index eef58b5..bedd885 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/Consts.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/Consts.java @@ -1,7 +1,7 @@ package com.uam.wmi.findmytutor.utils; public class Consts { - public final static Double presenceLatitude = 52.467491; - public final static Double presencelongitude = 16.926782; + public final static Double presenceLatitude = 65.600244; + public final static Double presencelongitude = 480.032153; public final static String presenceApproximatedName = "unknown"; } diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapboxMarker.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapboxMarker.java new file mode 100644 index 0000000..371b819 --- /dev/null +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapboxMarker.java @@ -0,0 +1,23 @@ +package com.uam.wmi.findmytutor.utils; + +import android.support.annotation.NonNull; + +import com.mapbox.mapboxsdk.annotations.InfoWindow; +import com.mapbox.mapboxsdk.annotations.Marker; +import com.mapbox.mapboxsdk.annotations.MarkerOptions; +import com.mapbox.mapboxsdk.maps.MapView; + +public class MapboxMarker extends Marker { + public MapboxMarker( MarkerOptions markerOptions ){ + super(markerOptions); + } +/* + @NonNull + + private InfoWindow showInfoWindow(InfoWindow iw, MapView mapView) { + iw.open(mapView, this, this.getPosition(), 0, 0); + this.infoWindowShown = true; + return iw; + }*/ + +} diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java index a499c8d..33d4aee 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java @@ -29,8 +29,11 @@ public class RxSearchObservable { subject.onNext(text); return false; } + + }); + return subject; } } diff --git a/app/src/main/res/drawable/custom_marker.png b/app/src/main/res/drawable/custom_marker.png index 1df09fdf3fe1229c3801c3b14fe6446cadced80c..8b1f284cbc938ccdaee7a32ab68b2aa891a3bc79 100644 GIT binary patch delta 432 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 mA}|2R0$2r*XBfuP`2K(N@0CRsu