Merge user list to develop #24

Merged
s416204 merged 25 commits from tutors-list-activity into develop 2018-11-02 18:00:23 +01:00
Showing only changes of commit 95978dad72 - Show all commits

View File

@ -32,17 +32,15 @@ public class MapActivity extends BaseActivity {
mapView.onCreate(savedInstanceState); mapView.onCreate(savedInstanceState);
isTutor = PrefUtils.getIsTutor(getApplicationContext()); isTutor = PrefUtils.getIsTutor(getApplicationContext());
if (isTutor) { if (isTutor) {
fn_permission(); fn_permission();
} }
mapView.getMapAsync(new OnMapReadyCallback() { mapView.getMapAsync(mapboxMap -> {
@Override
public void onMapReady(MapboxMap mapboxMap) {
// Customize map with markers, polylines, etc. // Customize map with markers, polylines, etc.
}
}); });
// TODO remove logout button // TODO remove logout button
configureLogoutButton(); configureLogoutButton();