Merge branch 'develop' of s416084/find-my-tutor-android into master

Merge branch 'fix-battery-prompt-5.1' of s416084/find-my-tutor-android into develop
Fix 5.1
2019-01-13 15:09:06 +00:00 · 2019-01-13 15:08:19 +00:00 · 2019-01-13 16:06:58 +01:00 · 2019-01-13 13:39:56 +00:00 · 2019-01-13 13:38:16 +00:00 · 2019-01-13 14:37:15 +01:00
48 changed files with 1804 additions and 746 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -29,7 +29,7 @@
      </value>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,10 +10,11 @@ android {
        applicationId "com.uam.wmi.findmytutor"
        minSdkVersion 22
        targetSdkVersion 27
-        versionCode 37
-        versionName "0.9.6-beta"
+        versionCode 66
+        versionName "1.0.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
+        resConfigs "en", "pl"
    }
    buildTypes {
        release {
@ -37,10 +38,8 @@ dependencies {
    implementation "ch.acra:acra-limiter:$acraVersion"


-
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation 'com.android.support:preference-v7:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support:cardview-v7:27.1.1'
    implementation 'com.android.support:design:27.1.1'
    implementation 'com.android.support:support-v4:27.1.1'
@ -72,6 +71,10 @@ dependencies {
    // FloatingBarMenu
    implementation 'com.getbase:floatingactionbutton:1.10.1'
    implementation 'org.apache.commons:commons-collections4:4.0'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support:design:27.1.1'
+
+    // spinner loaders library
+    implementation 'com.github.ybq:Android-SpinKit:1.2.0'
+    // rx binding
+    implementation 'com.jakewharton.rxbinding:rxbinding:0.3.0'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -4,10 +4,10 @@
    package="com.uam.wmi.findmytutor">

    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@ -24,6 +24,7 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
+        android:configChanges="locale"
        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
        <activity
            android:name=".activity.StartupActivity"
@ -38,11 +39,11 @@
            </intent-filter>
        </activity>
        <activity
-            android:windowSoftInputMode="adjustPan"
            android:name=".activity.MapActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name=".activity.LoginActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
@ -60,9 +61,11 @@
            android:enabled="true"
            android:exported="false"
            android:launchMode="singleTop" />
+
        <activity
            android:name=".activity.TutorTab"
            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:windowSoftInputMode="stateHidden|adjustPan"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme" />
        <activity
@ -75,6 +78,7 @@
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme" />
+
    </application>

 </manifest>
--- a/app/src/main/java/com/uam/wmi/findmytutor/FindMyTutor.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/FindMyTutor.java
@ -6,8 +6,9 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;

 import com.uam.wmi.findmytutor.utils.Const;
+import com.uam.wmi.findmytutor.utils.MapUtils;
+import com.uam.wmi.findmytutor.utils.PrefUtils;

-import static org.acra.ReportField.*;
 import org.acra.ACRA;
 import org.acra.annotation.AcraLimiter;
 import org.acra.annotation.AcraNotification;
@ -16,18 +17,32 @@ import org.acra.config.HttpSenderConfigurationBuilder;
 import org.acra.config.ToastConfigurationBuilder;
 import org.acra.data.StringFormat;
 import org.acra.sender.HttpSender;
+
 import java.util.HashMap;
 import java.util.Map;

+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.BUILD_CONFIG;
+import static org.acra.ReportField.CUSTOM_DATA;
+import static org.acra.ReportField.LOGCAT;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.REPORT_ID;
+import static org.acra.ReportField.SHARED_PREFERENCES;
+import static org.acra.ReportField.STACK_TRACE;
+import static org.acra.ReportField.USER_APP_START_DATE;
+import static org.acra.ReportField.USER_CRASH_DATE;
+

@AcraNotification(resText = R.string.notification_text,
        resTitle = R.string.notification_title,
        resChannelName = R.string.notification_channel)
@AcraLimiter(failedReportLimit = 2)
 public class FindMyTutor extends Application {
+
    @Override
    protected void attachBaseContext(Context base) {
        super.attachBaseContext(base);
+        //super.attachBaseContext(LocaleHelper.onAttach(base));

        // ACRA core
        CoreConfigurationBuilder builder = new CoreConfigurationBuilder(this)
@ -43,16 +58,17 @@ public class FindMyTutor extends Application {
                ToastConfigurationBuilder.class
        ).setResText(R.string.acra_toast_text);

+
        SharedPreferences sharedPreferences = base.getSharedPreferences("com.uam.wmi.findmytutor_preferences", Context.MODE_PRIVATE);
        Map header = new HashMap();
        String token = sharedPreferences.getString("API_KEY", "KEY_EMPTY");
-        header.put("Authorization","Bearer " + token);
+        header.put("Authorization", "Bearer " + token);

        // Api POST
        builder.getPluginConfigurationBuilder(
                HttpSenderConfigurationBuilder.class
 //        ).setUri("http://192.168.0.15:3000/api/acra")
-        ).setUri(Const.BASE_URL +"api/Feedback/autoFeedback")
+        ).setUri(Const.BASE_URL + "api/Feedback/autoFeedback")
                .setHttpMethod(HttpSender.Method.POST)
                .setHttpHeaders(header)
                .setEnabled(true);
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/AppCompatPreferenceActivity.java
@ -1,5 +1,6 @@
 package com.uam.wmi.findmytutor.activity;

+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@ -13,6 +14,8 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;

+import com.uam.wmi.findmytutor.utils.LocaleHelper;
+
 /**
 * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
 * to be used with AppCompat.
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@ -4,6 +4,7 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@ -35,6 +36,9 @@ import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.service.BackgroundLocalizationService;
 import com.uam.wmi.findmytutor.utils.ActiveFragment;
 import com.uam.wmi.findmytutor.utils.FeedbackUtils;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
+import com.uam.wmi.findmytutor.utils.LocaleUtils;
+import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RxSearchObservable;

@ -80,11 +84,16 @@ public abstract class BaseActivity
    private SharingFragment sharingFragment;

    private Fragment userListFragment;
-    private ActiveFragment activeFragment = ActiveFragment.NONE;
+    public ActiveFragment activeFragment = ActiveFragment.NONE;
    private Fragment activeBottomMenu  = null;
-    private SearchView searchView;
+    public SearchView searchView;
    public MenuItem infoMenuItem;

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    @SuppressLint("CheckResult")
    @Override
    protected void onCreate(Bundle savedInstanceState) {
@ -118,17 +127,9 @@ public abstract class BaseActivity
                        if(PrefUtils.isBackgroundLocationServiceRunning(getApplicationContext()))                        {
                            stopBackgroundLocalizationTask();
                        }
+                        logout();

-                        storeBackgroundLocationStatus(getApplication(), false);
-                        PrefUtils.storeIsLoggedIn(getApplicationContext(), false);

-                        Intent i = getBaseContext().getPackageManager()
-                                .getLaunchIntentForPackage(getBaseContext().getPackageName());
-                        if (i != null) {
-                            i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                        }
-                        startActivity(i);
-                        finish();
                     } else if (itemName.equals(getResources().getString(R.string.navigation_item_feedback))) {
                         feedbackUtils.showNoteDialog("FEEDBACK");

@ -157,6 +158,21 @@ public abstract class BaseActivity
        }
    }

+
+    protected void logout(){
+        storeBackgroundLocationStatus(getApplication(), false);
+        PrefUtils.storeIsLoggedIn(getApplicationContext(), false);
+        PrefUtils.setBatteryExlusionInfoStatus(getApplicationContext(), true);
+
+        Intent i = getBaseContext().getPackageManager()
+                .getLaunchIntentForPackage(getBaseContext().getPackageName());
+        if (i != null) {
+            i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        }
+        startActivity(i);
+        finish();
+    }
+
    protected void checkPermissions() {
        final List<String> missingPermissions = new ArrayList<String>();

@ -199,6 +215,8 @@ public abstract class BaseActivity
    }

    public void stopBackgroundLocalizationTask() {
+        PrefUtils.storeEnableSharingLocalization(getApplicationContext(), false);
+
        Intent stopIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
        stopIntent.putExtra("request_stop", true);

@ -208,11 +226,12 @@ public abstract class BaseActivity

    public void startBackgroundLocalizationTask() {
        checkPermissions();
+        PrefUtils.storeEnableSharingLocalization(getApplicationContext(), true);

        Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
        startIntent.putExtra("notify_interval", onlineBackgroundLocationInterval);

-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            startForegroundService(startIntent);
        } else {
            startService(startIntent);
@ -408,8 +427,8 @@ public abstract class BaseActivity
        sharingFragment = SharingFragment.newInstance();
        FragmentTransaction ft = getFragmentManager().beginTransaction();
        ft.replace(R.id.activity_content, sharingFragment);
+        //ft.addToBackStack(null);
        ft.commit();
-
    }

    private void loadUserListFragment() {
@ -418,6 +437,7 @@ public abstract class BaseActivity
        userListFragment = UsersListFragment.newInstance();
        FragmentTransaction ft = getFragmentManager().beginTransaction();
        ft.replace(R.id.activity_content, userListFragment);
+        //ft.addToBackStack(null);
        ft.commit();

    }
@ -434,4 +454,8 @@ public abstract class BaseActivity

    abstract int getNavigationMenuItemId();
    abstract int getContentViewId();
+
+
+
+
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
@ -1,6 +1,7 @@
 package com.uam.wmi.findmytutor.activity;

 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.design.widget.CoordinatorLayout;
@ -31,6 +32,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;

+import com.github.ybq.android.spinkit.SpinKitView;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.geometry.LatLng;
@ -44,6 +46,7 @@ import com.uam.wmi.findmytutor.model.UserResponseModel;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
 import com.uam.wmi.findmytutor.service.UserService;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
@ -65,6 +68,7 @@ import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Function;
 import io.reactivex.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
@ -86,12 +90,20 @@ public class BlackList extends AppCompatActivity {
    Switch aSwitch;
    @BindView(R.id.add_to_black_list_fab)
    FloatingActionButton addToBlackListFab;
+    @BindView(R.id.loader)
+    SpinKitView loader;
+

    private Integer prevSize;
    private BlackListAdapter mAdapter;
    private List<User> blacklistedUsers = new ArrayList<>();
    private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@ -104,11 +116,11 @@ public class BlackList extends AppCompatActivity {
                .create(UserService.class);

        if (PrefUtils.isBlackListing(this)){
-            aSwitch.setText(getString(R.string.action_black_list) +" ON");
+            aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.on));
            aSwitch.setChecked(true);
            handleChangeRequest(true);
        }else{
-            aSwitch.setText(getString(R.string.action_black_list) +" OFF");
+            aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.off) );
            aSwitch.setChecked(false);
            handleChangeRequest(false);
        }
@ -122,6 +134,7 @@ public class BlackList extends AppCompatActivity {
        recyclerView.setItemAnimator(new DefaultItemAnimator());
        recyclerView.addItemDecoration(new MyDividerItemDecoration(this, LinearLayoutManager.VERTICAL, 16));
        recyclerView.setAdapter(mAdapter);
+        noNotesView.setVisibility(View.GONE);

        fetchBlackListedUsers();
        /**
@ -141,7 +154,6 @@ public class BlackList extends AppCompatActivity {
        }));

        addToBlackListFab.setOnClickListener(this::showFabDialog);
-
        handleSwitch();
    }

@ -161,32 +173,29 @@ public class BlackList extends AppCompatActivity {
    }

    private void fetchBlackListedUsers() {
-        prevSize = blacklistedUsers.size();
-
-        blacklistedUsers.clear();
-
        disposable.add(getListOfBlacklistedUsers(tutorId)
+                .doOnSubscribe(this::handleDoOnSubscribe)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
-                .flatMap((Function<List<String>, Observable<String>>) Observable::fromIterable)
-                .flatMap((Function<String, ObservableSource<User>>) this::getUserObservable)
-                .subscribeWith(new DisposableObserver<User>() {
-                    @Override
-                    public void onNext(User user) {
-                        blacklistedUsers.add(user);
-                    }
+                .flatMap(Observable::fromIterable)
+                .flatMap(this::getUserObservable)
+                .subscribe(user ->  blacklistedUsers.add(user), this::handleError,this::handleComplete));
+    }

-                    @Override
-                    public void onError(Throwable e) {
-                        showError(e);
-                    }
+    private void handleDoOnSubscribe(Disposable disposable) {
+        prevSize = blacklistedUsers.size();
+        blacklistedUsers.clear();
+        didFetched = false;
+    }

-                    @Override
-                    public void onComplete() {
-                        Collections.sort(blacklistedUsers, (a, b) -> sortByUserName(a,b));
-                        refreshUI();
-                    }
-                }));
+    private void handleComplete() {
+        Collections.sort(blacklistedUsers, this::sortByUserName);
+        didFetched = true;
+        refreshUI();
+    }
+    private void handleError(Throwable e){
+        showError(e);
+        didFetched = false;
    }

    private void refreshUI(){
@ -248,10 +257,8 @@ public class BlackList extends AppCompatActivity {
        );
    }

-
    private void handleAddUser(User user) {
        Toast.makeText(this, R.string.add_user_to_list, Snackbar.LENGTH_LONG).show();
-
        blacklistedUsers.clear();
        fetchBlackListedUsers();
    }
@ -273,15 +280,15 @@ public class BlackList extends AppCompatActivity {
    }

    private void toggleEmptyNotes() {
-
        if (didFetched && blacklistedUsers.size() == 0) {
-            noNotesView.setText(R.string.list_is_empty);
            noNotesView.setVisibility(View.VISIBLE);
+            noNotesView.setText(R.string.list_is_empty);
+            loader.setVisibility(View.GONE);
        }else if (blacklistedUsers.size() > 0) {
            noNotesView.setVisibility(View.GONE);
+            loader.setVisibility(View.GONE);
        } else {
-            noNotesView.setText(getString(R.string.loading));
-            noNotesView.setVisibility(View.VISIBLE);
+            loader.setVisibility(View.VISIBLE);
        }
    }

--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
@ -27,6 +27,7 @@ import com.uam.wmi.findmytutor.model.ValidateUser;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.LdapService;
 import com.uam.wmi.findmytutor.service.UserService;
+import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;

@ -149,9 +150,9 @@ public class LoginActivity extends AppCompatActivity {

    private void loginProcess(String email, String password) {
        ValidateUser user = new ValidateUser(email, password);
-       // LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
+        // LdapUser fakeUser = new LdapUser(email, password,"wmi","tutor",email,"Fałszywy",email);
        disposable.add(ldapService.validate(user)
-        //disposable.add(ldapService.fakeValidate(fakeUser)
+                //disposable.add(ldapService.fakeValidate(fakeUser)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(this::handleResponse, this::handleError));
@ -190,6 +191,7 @@ public class LoginActivity extends AppCompatActivity {

        getUserProfile(userId.asString());

+
        Intent data = new Intent();
        String txt = "Main Activity";
        data.setData(Uri.parse(txt));
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@ -4,9 +4,11 @@ import android.Manifest;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
@ -45,12 +47,11 @@ import com.uam.wmi.findmytutor.model.User;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.CoordinateService;
 import com.uam.wmi.findmytutor.service.PredefinedCoordinatesService;
-import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
 import com.uam.wmi.findmytutor.service.UserService;
 import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
-
 import com.uam.wmi.findmytutor.utils.EnableSharingDialog;
-
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
+import com.uam.wmi.findmytutor.utils.LocaleUtils;
 import com.uam.wmi.findmytutor.utils.ManualLocationUtils;
 import com.uam.wmi.findmytutor.utils.MapMarker;
 import com.uam.wmi.findmytutor.utils.MapUtils;
@ -76,12 +77,12 @@ import static com.uam.wmi.findmytutor.utils.Const.mapRefreshInterval;
 public class MapActivity extends BaseActivity
        implements PermissionsListener, OnMapReadyCallback {

+    private HashMap<Long, String> markerUserHash = new HashMap<>();
    private String tag = getClass().getName();
    private PermissionsManager permissionsManager;
    private LocationComponent locationComponent;
    private CoordinateService coordinateService;
    private UserService userService;
-
    private CompositeDisposable disposable = new CompositeDisposable();
    private int mInterval = mapRefreshInterval;
    private Handler mHandler = new Handler();
@ -92,9 +93,8 @@ public class MapActivity extends BaseActivity
    private Button removeLocationButton;
    private Marker tmpLocalMarker;
    private Coordinate droppedMarkercoordinate;
-    private HashMap<String, Coordinate> coordsMap = new HashMap<>();
+    public HashMap<String, Coordinate> coordsMap = new HashMap<>();
    private HashMap<String, MapMarker> markerHash = new HashMap<>();
-    public HashMap<Long, String> markerUserHash = new HashMap<>();
    private Set<String> previousCoordsIds = new HashSet<>();
    private ManualLocationUtils manualLocationUtils;
    // Camera Animation params
@ -106,6 +106,11 @@ public class MapActivity extends BaseActivity
    private ApproximatedLocalization approximatedLocalization;
    private boolean shouldFetchNewCoords = true;

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@ -122,6 +127,7 @@ public class MapActivity extends BaseActivity
        mStatusChecker = () -> {
            try {
                if (shouldFetchNewCoords) {
+                    checkIfUsesCanBeTutor();
                    fetchTopCoords();
                }
            } finally {
@ -130,7 +136,6 @@ public class MapActivity extends BaseActivity

        };

-
        selectLocationButton = findViewById(R.id.select_location_button);
        removeLocationButton = findViewById(R.id.remove_location_button);
        mapView = findViewById(R.id.mapView);
@ -141,6 +146,11 @@ public class MapActivity extends BaseActivity
        handleBackgroundTaskLifeCycle();
        manualLocationUtils = new ManualLocationUtils(MapActivity.this);
        approximatedLocalization = new ApproximatedLocalization(MapUtils.loadJsonFromAsset(getApplicationContext(), "building.geojson"));
+
+        if(isTutor){
+            MapUtils.BatteryOptimizationsExceptionCheck(this);
+        }
+
    }

    @Override
@ -204,13 +214,28 @@ public class MapActivity extends BaseActivity

        userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));

-        if(cordStatus.equals("")){
+        if (cordStatus.equals("")) {
            status.setText(String.format("%s: %s", getResources().getString(R.string.status_switch_title), getString(R.string.lack_of_status)));
-        }else{
+        } else {
            status.setText(String.format("%s: %s", getResources().getString(R.string.status_switch_title), cordStatus));
        }

-        sharingLevelView.setText(String.format("%s: %s", getResources().getString(R.string.settings_location_level), sharingLevel));
+        String sharingLevelToRender = sharingLevel;
+Log.e("LOCALE",PrefUtils.getLocale(getApplicationContext()));
+
+        if (PrefUtils.getLocale(getApplicationContext()).equals("pl") ||
+                PrefUtils.getLocale(getApplicationContext()).equals("pl-PL") ||
+                PrefUtils.getLocale(getApplicationContext()).equals("[pl-PL]")) {
+            if (sharingLevel.equals(SharingLevel.MANUAL.toString())) {
+                sharingLevelToRender = getString(R.string.manual_mode);
+            } else if (sharingLevel.equals(SharingLevel.EXACT.toString())) {
+                sharingLevelToRender = getString(R.string.exact_mode);
+            } else if (sharingLevel.equals(SharingLevel.APPROXIMATED.toString())) {
+                sharingLevelToRender = getString(R.string.approx_mode);
+            }
+        }
+
+        sharingLevelView.setText(String.format("%s: %s", getResources().getString(R.string.settings_location_level), sharingLevelToRender));

        final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
        alertDialog.show();
@ -238,6 +263,7 @@ public class MapActivity extends BaseActivity
        mapboxMap.addOnMapClickListener(e -> {
            removeLocationButton.setVisibility(View.GONE);
            selectLocationButton.setVisibility(View.GONE);
+            restoreMapMarkers();
        });
    }

@ -332,7 +358,7 @@ public class MapActivity extends BaseActivity
            Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);

            dismissButton.setOnClickListener(view1 -> {
-                PrefUtils.putCurrentManualLocationName(getApplicationContext(), "Inne");
+                PrefUtils.putCurrentManualLocationName(getApplicationContext(), getString(R.string.other_location));
                PrefUtils.putCurrentManualLocation(getApplicationContext(), "-1");

                alertDialog.dismiss();
@ -383,6 +409,30 @@ public class MapActivity extends BaseActivity
        PrefUtils.putCurrentManualLocation(getApplicationContext(), resp.getPredefinedCoordinateId());
    }

+
+    private void checkIfUsesCanBeTutor(){
+        disposable.add(
+                userService.getSelf(myId)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribeWith(new DisposableSingleObserver<User>() {
+                            @Override
+                            public void onSuccess(User user) {
+                                boolean tutorFromBackend = user.getTitle().equals("tutor");
+
+                                if(tutorFromBackend != PrefUtils.getIsTutor(getApplicationContext())){
+                                    logout();
+                                }
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                                showError(e);
+                            }
+                        }));
+
+    }
+
    private void fetchTopCoords() {

        disposable.add(
@ -595,47 +645,6 @@ public class MapActivity extends BaseActivity
        }
    }

-    @Override
-    public void onResume() {
-        super.onResume();
-        mapView.onResume();
-        shouldFetchNewCoords = true;
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mapView.onStart();
-        shouldFetchNewCoords = true;
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mapView.onStop();
-        shouldFetchNewCoords = false;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mapView.onPause();
-        shouldFetchNewCoords = false;
-    }
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        mapView.onLowMemory();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mapView.onDestroy();
-        mHandler.removeCallbacks(mStatusChecker);
-        disposable.dispose();
-    }

    @Override
    protected void onSaveInstanceState(Bundle outState) {
@ -678,11 +687,13 @@ public class MapActivity extends BaseActivity
    @Override
    public void searchUser(String textToSearch) {
        getUserFromApi(textToSearch);
+
+        Log.e("LOCALE", LocaleUtils.getCurrentLocale());
    }

    private void getUserFromApi(String userNameToSearch) {
        disposable.add(
-                userService.getAllTutors()
+                userService.getAllOnlineTutors()
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
                        .map(tutors -> Stream.of(tutors).filter(t ->
@ -690,6 +701,7 @@ public class MapActivity extends BaseActivity
                        .subscribeWith(new DisposableSingleObserver<List<User>>() {
                            @Override
                            public void onSuccess(List<User> users) {
+                                Log.e("USERS", String.valueOf(users));
                                filterMarkers(users);
                            }

@ -721,19 +733,65 @@ public class MapActivity extends BaseActivity
    }

    public void restoreMapMarkers() {
+        try {
+            for (Marker marker : mapboxMap.getMarkers()) {
+                MapMarker markerMap = markerHash.get(markerUserHash.get(marker.getId()));

-        for (Marker marker : mapboxMap.getMarkers()) {
-            MapMarker markerMap = markerHash.get(markerUserHash.get(marker.getId()));
+                markerMap.restoreDefaultIcon();
+                mapboxMap.deselectMarker(marker);
+            }

-            markerMap.restoreDefaultIcon();
-            mapboxMap.deselectMarker(marker);
+            mapboxMap.getMarkerViewManager().update();
+        } catch (Exception e) {
+            Log.e("MAP", String.valueOf(e));
        }
-
-        mapboxMap.getMarkerViewManager().update();
    }

    public void adjustMapToSearch(Integer zoom) {
        MapUtils.setZoom(mapboxMap, zoom);
    }

+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mapView.onResume();
+        shouldFetchNewCoords = true;
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mapView.onStart();
+        shouldFetchNewCoords = true;
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mapView.onStop();
+        shouldFetchNewCoords = false;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mapView.onPause();
+        shouldFetchNewCoords = false;
+    }
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapView.onLowMemory();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mapView.onDestroy();
+        mHandler.removeCallbacks(mStatusChecker);
+        disposable.dispose();
+    }
+
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
@ -1,6 +1,7 @@
 package com.uam.wmi.findmytutor.activity;

 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@ -15,12 +16,15 @@ import android.util.Log;
 import android.view.MenuItem;

 import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
+import com.uam.wmi.findmytutor.utils.LocaleUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;


 import java.util.Locale;


+
 public class SettingsActivity extends AppCompatPreferenceActivity {
    private static final String TAG = SettingsActivity.class.getSimpleName();

@ -33,9 +37,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
        getFragmentManager().beginTransaction().replace(android.R.id.content, new MainPreferenceFragment()).commit();
    }

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    public void setLocale(String localeName) {
+            Context context = LocaleHelper.setLocale(this, localeName);
+            Resources res = context.getResources();
            Locale myLocale = new Locale(localeName);
-            Resources res = getResources();
            DisplayMetrics dm = res.getDisplayMetrics();
            Configuration conf = res.getConfiguration();
            conf.locale = myLocale;
@ -62,9 +72,12 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
            languagesList.setOnPreferenceChangeListener((preference, newValue) -> {

                if (!newValue.toString().equals("0")){
+                    LocaleHelper.setLocale(getActivity(), "pl");
                    ((SettingsActivity)getActivity()).setLocale("pl");
                    PrefUtils.storeLocale(getActivity(),"pl");
+                    LocaleHelper.setLocale(getActivity(), "pl");
                }else{
+                    LocaleHelper.setLocale(getActivity(), "en");
                    ((SettingsActivity)getActivity()).setLocale("en");
                    PrefUtils.storeLocale(getActivity(),"en");
                }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
@ -3,16 +3,15 @@ package com.uam.wmi.findmytutor.activity;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.SwitchPreference;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@ -23,19 +22,17 @@ import com.annimon.stream.IntPair;
 import com.annimon.stream.Stream;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.uam.wmi.findmytutor.R;
-import com.uam.wmi.findmytutor.adapters.TutorsListAdapter;
 import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.PredefinedCoordinatesService;
 import com.uam.wmi.findmytutor.service.PredefinedStatusesService;
 import com.uam.wmi.findmytutor.utils.EnableSharingDialog;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;
 import com.uam.wmi.findmytutor.utils.RightButtonPreference;
 import com.uam.wmi.findmytutor.utils.SharingLevel;

-import org.apache.commons.collections4.BidiMap;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@ -47,6 +44,7 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
+
 import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;


@ -61,9 +59,9 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
    protected RightButtonPreference removeManualStatus;
    protected Preference manualStatus;
    protected ListPreference statusList;
-    private HashMap<String,String> locationMap;
-   private ArrayList <String> locationUUIDs;
    protected List<PredefinedCoordViewModel> predefinedCoordsList = new ArrayList<>();
+    private HashMap<String, String> locationMap;
+    private ArrayList<String> locationUUIDs;
    private HashMap<Integer, String> locationLevelMapping;
    private HashMap<Integer, String> statusMapping;
    private PredefinedStatusesService statusesService;
@ -72,9 +70,9 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
    private AlertDialog.Builder builder;
    private String[] statusesArray;
    private boolean statusSwitchFlag;
-   private ArrayList<String> predefinedLocationsList;
+    private ArrayList<String> predefinedLocationsList;

-   public static SharingFragment newInstance() {
+    public static SharingFragment newInstance() {
        return new SharingFragment();
    }

@ -86,12 +84,12 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                .subscribeWith(new DisposableSingleObserver<List<String>>() {
                    @Override
                    public void onSuccess(List<String> strings) {
-                       statusesArray = strings.toArray(new String[strings.size()]);
-                       if(strings.isEmpty()){
-                          disableStatusPreferences();
-                       }else{
-                          enableStatusPreferences();
-                       }
+                        statusesArray = strings.toArray(new String[strings.size()]);
+                        if (strings.isEmpty()) {
+                            disableStatusPreferences();
+                        } else {
+                            enableStatusPreferences();
+                        }
 //                       Log.d("STATUSES",Integer.toString(statusesArray.length ));
                        setListPreferenceData(statusList, statusesArray, null);
                    }
@ -114,45 +112,36 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                    public void onSuccess(List<PredefinedCoordViewModel> coords) {

                        String currentCoordId = PrefUtils.getCurrentManualLocation(getApplicationContext());
-                       locationMap = new HashMap<String,String>();
-                       locationUUIDs = new ArrayList<String>();
-                       for (PredefinedCoordViewModel i : coords) locationMap.put(i.getPredefinedCoordinateId(),i.getName());
-                       for (PredefinedCoordViewModel i : coords) locationUUIDs.add(i.getPredefinedCoordinateId());
-                       List<String> predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList();
-                       List<String> predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList();
+                        locationMap = new HashMap<String, String>();
+                        locationUUIDs = new ArrayList<String>();
+                        for (PredefinedCoordViewModel i : coords)
+                            locationMap.put(i.getPredefinedCoordinateId(), i.getName());
+                        for (PredefinedCoordViewModel i : coords)
+                            locationUUIDs.add(i.getPredefinedCoordinateId());
+                        List<String> predefinedLocationsNames = Stream.of(coords).map(PredefinedCoordViewModel::getName).toList();
+                        List<String> predefinedLocationsUUIDs = Stream.of(coords).map(PredefinedCoordViewModel::getPredefinedCoordinateId).toList();
                        predefinedCoordsList.addAll(coords);
+                        if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
+                            preferenceCategory.removePreference(manualLocationList);
+                            preferenceCategory.removePreference(removeManualLocation);
+                            preferenceCategory.removePreference(manualLocationButton);
+                        } else {
+                            if (!predefinedCoordsList.isEmpty()) {

+                                manualLocationList.setEnabled(true);
+                                manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
+                                removeManualLocation.setEnabled(true);
+                                locationSharing.setEnabled(true);
+                            }
+                        }
                        String[] stringnames = predefinedLocationsNames.toArray(new String[0]);
-                       predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames));
-                       if (!PrefUtils.getLocationLevel(getApplicationContext()).equals("manual")) {
-                          preferenceCategory.removePreference(manualLocationList);
-                          preferenceCategory.removePreference(removeManualLocation);
-                          preferenceCategory.removePreference(manualLocationButton);
-                       }else{
-                          if(predefinedCoordsList.isEmpty()){
-                             locationSharing.setEnabled(false);
-                             locationSharing.setChecked(false);
-                             PrefUtils.disableSharing(getApplicationContext());
-                             ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
-                             removeManualLocation.setEnabled(false);
-                             manualLocationList.setEnabled(false);
-                             manualLocationList.setSummary("");
-                          }else{
-                             manualLocationList.setEnabled(true);
-                             manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));
-                             removeManualLocation.setEnabled(true);
-                             locationSharing.setEnabled(true);
-
-
-                          }
-                       }
+                        predefinedLocationsList = new ArrayList<>(Arrays.asList(stringnames));
                        List<Integer> activesId = Stream.of(coords).indexed()
                                .filter(v -> v.getSecond().getPredefinedCoordinateId().equals(currentCoordId)).map(IntPair::getFirst).toList();

-                        if( activesId.size() == 0){
+                        if (activesId.size() == 0) {
                            setListPreferenceData(manualLocationList, stringnames, null);
-                        }
-                        else {
+                        } else {
                            setListPreferenceData(manualLocationList, stringnames, activesId.get(0));
                        }

@ -162,7 +151,6 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                    public void onError(Throwable e) {
                        Toast.makeText(getApplicationContext(), R.string.error_location_fetch, Toast.LENGTH_SHORT).show();
                    }
-
                }));
    }

@ -183,11 +171,11 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
        removeManualStatus = (RightButtonPreference) findPreference("remove_manual_status");
        manualStatus = findPreference("key_manual_status");
        statusList = (ListPreference) findPreference("key_status_value");
-       statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
-       locationService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class);
+        statusesService = ApiClient.getClient(getApplicationContext()).create(PredefinedStatusesService.class);
+        locationService = ApiClient.getClient(getApplicationContext()).create(PredefinedCoordinatesService.class);
        disposable = new CompositeDisposable();
        statusesArray = new String[0];
-       predefinedLocationsList = new ArrayList<String>();
+        predefinedLocationsList = new ArrayList<String>();
        getStatuses(disposable);
        getLocations(disposable);
        locationLevelMapping = new HashMap<Integer, String>();
@ -204,6 +192,7 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
        statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
        manualLocationList.setSummary(PrefUtils.getCurrentManualLocationName(getApplicationContext()));

+
        /** Main sharing switch**/
        locationSharing.setOnPreferenceChangeListener((buttonView, newValue) -> {
            PrefUtils.storeEnableSharingLocalization(getApplicationContext(), (Boolean) newValue);
@ -215,25 +204,19 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
        locationMode.setOnPreferenceChangeListener((preference, newValue) -> {
            ((MapActivity) getActivity()).stopBackgroundLocalizationTask();
            ((MapActivity) getActivity()).startBackgroundLocalizationTask();
-
            PrefUtils.storeLocationMode(getApplicationContext(), locationLevelMapping.get(Integer.parseInt((String) newValue)));
+
            if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
                if (!predefinedCoordsList.isEmpty()) {
-                   preferenceCategory.addPreference(manualLocationList);
-                   preferenceCategory.addPreference(removeManualLocation);
-                }else{
-                   locationSharing.setEnabled(false);
-                   locationSharing.setChecked(false);
-                   PrefUtils.disableSharing(getApplicationContext());
-                   ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
-
+                    preferenceCategory.addPreference(manualLocationList);
+                    preferenceCategory.addPreference(removeManualLocation);
                }
                preferenceCategory.addPreference(manualLocationButton);
            } else {
-               locationSharing.setEnabled(true);
+                locationSharing.setEnabled(true);
                preferenceCategory.removePreference(manualLocationList);
                preferenceCategory.removePreference(manualLocationButton);
-               preferenceCategory.removePreference(removeManualLocation);
+                preferenceCategory.removePreference(removeManualLocation);
            }
            return true;
        });
@ -262,9 +245,6 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
            return true;
        });

-
-
-
        /** Button 'choose from map' button listener **/
        manualLocationButton.setOnPreferenceChangeListener((preference, o) -> {
            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
@ -282,7 +262,16 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
            lp.setSummary(entries[Integer.parseInt((String) newValue)]);
            return true;
        });
+        statusList.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {

+                if (statusesArray.length == 0) {
+                    builder.setTitle("nie ma wody na pustyni");
+                }
+                return true;
+            }
+        });
        /** Custom status edittext change listener **/
        manualStatus.setOnPreferenceChangeListener((preference, newValue) -> {

@ -293,39 +282,40 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere

            return true;
        });
-       removeManualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
-          showRemoveDialog(statusList.getEntries(),"status");
-          return true;
-       });
+        removeManualStatus.setOnPreferenceChangeListener((preference, newValue) -> {
+            showRemoveDialog(statusList.getEntries(), "status");
+            return true;
+        });

-       removeManualLocation.setOnPreferenceChangeListener(((preference, newValue) -> {
-          showRemoveDialog(manualLocationList.getEntries(),"location");
-          return true;
+        removeManualLocation.setOnPreferenceChangeListener(((preference, newValue) -> {
+            showRemoveDialog(manualLocationList.getEntries(), "location");
+            return true;

-       }));
+        }));
    }
-    public void showRemoveDialog(CharSequence[] entries, String service){
-        boolean [] checked = new boolean[entries.length];
+
+    public void showRemoveDialog(CharSequence[] entries, String service) {
+        boolean[] checked = new boolean[entries.length];
        ArrayList<String> tobeDeleted = new ArrayList<String>();
 //        Log.d("sharingDialog", "no to siup");
-       builder.setPositiveButton("DELETE", new DialogInterface.OnClickListener() {
-           @Override
-           public void onClick(DialogInterface dialog, int which) {
-               for (int i=0; i< entries.length; i++){
-                   if(checked[i] == true) {
-                       tobeDeleted.add((String) entries[i]);
-                   }
-               }
-               removeEntries(service,tobeDeleted);
+        builder.setPositiveButton("DELETE", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                for (int i = 0; i < entries.length; i++) {
+                    if (checked[i] == true) {
+                        tobeDeleted.add((String) entries[i]);
+                    }
+                }
+                removeEntries(service, tobeDeleted);
 //               Log.d("MANAGE-PREF",tobeDeleted.toString());
-           }
-       });
-       builder.setMultiChoiceItems(entries, checked, new DialogInterface.OnMultiChoiceClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+            }
+        });
+        builder.setMultiChoiceItems(entries, checked, new DialogInterface.OnMultiChoiceClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which, boolean isChecked) {

-          }
-       });
+            }
+        });
        builder.create().show();
    }

@ -337,34 +327,34 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
        return view;
    }

-    protected  void removeEntries(String service, ArrayList<String> toBeDeleted){
+    protected void removeEntries(String service, ArrayList<String> toBeDeleted) {

 //       Log.d("MANAGE-PREF", toBeDeleted.toString());
-       if(service.equals("status")){
-          for (String uuid:toBeDeleted) {
-             disposable.add(statusesService.deleteUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), uuid)
-                     .subscribeOn(Schedulers.io())
-                     .observeOn(AndroidSchedulers.mainThread())
-                     .subscribe(this::handleDeleteStatuses, this::handleError));
-          }
-       }else {
-          ArrayList<String> uuidsToBeDeleted = new ArrayList<String>();
-          for (String name:toBeDeleted) {
-             for (String uuid:locationUUIDs) {
-                if(locationMap.get(uuid).equals(name)){
-                   uuidsToBeDeleted.add(uuid);
+        if (service.equals("status")) {
+            for (String uuid : toBeDeleted) {
+                disposable.add(statusesService.deleteUserPredefinedStatus(PrefUtils.getUserId(getApplicationContext()), uuid)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(this::handleDeleteStatuses, this::handleError));
+            }
+        } else {
+            ArrayList<String> uuidsToBeDeleted = new ArrayList<String>();
+            for (String name : toBeDeleted) {
+                for (String uuid : locationUUIDs) {
+                    if (locationMap.get(uuid).equals(name)) {
+                        uuidsToBeDeleted.add(uuid);
+                    }
                }
-             }
-          }
-          for (String uuid : uuidsToBeDeleted) {
+            }
+            for (String uuid : uuidsToBeDeleted) {
 //             predefinedCoordsList.removeIf(x -> x.getPredefinedCoordinateId().equals(uuid));
-             predefinedCoordsList.removeAll(Stream.of(predefinedCoordsList).filter(x -> x.getPredefinedCoordinateId().equals(uuid)).toList());
-             disposable.add(locationService.deleteUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), uuid)
-                     .subscribeOn(Schedulers.io())
-                     .observeOn(AndroidSchedulers.mainThread())
-                     .subscribe(this::handleDeleteLocations, this::handleError));
-          }
-       }
+                predefinedCoordsList.removeAll(Stream.of(predefinedCoordsList).filter(x -> x.getPredefinedCoordinateId().equals(uuid)).toList());
+                disposable.add(locationService.deleteUserPredefinedCoord(PrefUtils.getUserId(getApplicationContext()), uuid)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(this::handleDeleteLocations, this::handleError));
+            }
+        }
    }

    protected void setListPreferenceData(ListPreference lp, String[] entries, Integer activeId) {
@ -392,13 +382,13 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
    ;

    private void handleResponse(List<String> resp) {
-       if(resp.size() == 1){
-          enableStatusPreferences();
-          if(PrefUtils.isStatusEnabled(getApplicationContext()) == false){
-             PrefUtils.enableStatus(getApplicationContext());
-             statusSwitch.setChecked(true);
-          }
-       }
+        if (resp.size() == 1) {
+            enableStatusPreferences();
+            if (PrefUtils.isStatusEnabled(getApplicationContext()) == false) {
+                PrefUtils.enableStatus(getApplicationContext());
+                statusSwitch.setChecked(true);
+            }
+        }
        String[] statusesArray = resp.toArray(new String[resp.size()]);
        setListPreferenceData(statusList, statusesArray, resp.size() - 1);
        statusList.setValueIndex(resp.size() - 1);
@ -417,79 +407,84 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                    "Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();
        }
    }
-   private void handleDeleteStatuses(List<String> resp){
-       if(resp.isEmpty()){
-          disableStatusPreferences();
-       }else{
-          String[] statusesArray = resp.toArray(new String[resp.size()]);
-          setListPreferenceData(statusList, statusesArray, null);
-          String currentEntry = PrefUtils.getUserStatus(getApplicationContext());
-          if(resp.contains(currentEntry)){
-             statusList.setValueIndex(resp.indexOf(currentEntry));
-          }else{
-             statusList.setValueIndex(0);
-             statusList.setSummary(resp.get(0));
-          }
-       }

-   }
-   private void handleDeleteLocations(List<PredefinedCoordViewModel> resp){
-      getLocations(disposable);
-      String currentEntry = PrefUtils.getCurrentManualLocation(getApplicationContext());
-      if(resp.isEmpty()){
-         disableManualLocationPreferences();
-      }else{
-         if(!Stream.of(resp).filter(x -> x.getName().equals(currentEntry)).toList().isEmpty())
-         {
-            for (PredefinedCoordViewModel location: resp) {
-               if(location.getName().equals(currentEntry)){
-                  manualLocationList.setValueIndex(resp.indexOf(location));
-                  break;
-               }
+    private void handleDeleteStatuses(List<String> resp) {
+        if (resp.isEmpty()) {
+            disableStatusPreferences();
+        } else {
+            String[] statusesArray = resp.toArray(new String[resp.size()]);
+            setListPreferenceData(statusList, statusesArray, null);
+            String currentEntry = PrefUtils.getUserStatus(getApplicationContext());
+            if (resp.contains(currentEntry)) {
+                statusList.setValueIndex(resp.indexOf(currentEntry));
+            } else {
+                statusList.setValueIndex(0);
+                statusList.setSummary(resp.get(0));
            }
-         }else{
-            manualLocationList.setValueIndex(0);
-            manualLocationList.setSummary(resp.get(0).getName());
-            //todo czy na pewno w shared pref sa dobre wartosci
-         }
+        }

-      }
-   }
-   private void disableStatusPreferences(){
-         removeManualStatus.setEnabled(false);
-         statusList.setEnabled(false);
-         statusSwitch.setEnabled(false);
-         statusList.setSummary("");
-         PrefUtils.disableStatus(getApplicationContext());
+    }

-   }
-   private void enableStatusPreferences(){
-      removeManualStatus.setEnabled(true);
-      statusList.setEnabled(true);
-      statusSwitch.setEnabled(true);
-      statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
-   }
-   private void disableManualLocationPreferences(){
-       removeManualLocation.setEnabled(false);
-       manualLocationList.setEnabled(false);
-      manualLocationList.setSummary("");
-       locationSharing.setChecked(false);
-       locationSharing.setEnabled(false);
-      PrefUtils.disableSharing(getApplicationContext());
-      ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
-
-   }
-   private void enableManualLocationPreferences(){
-      removeManualLocation.setEnabled(true);
-      manualLocationList.setEnabled(true);
-
-   }
-
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            locationSharing.setChecked(PrefUtils.isEnableSharingLocalization(getApplicationContext()));
+    private void handleDeleteLocations(List<PredefinedCoordViewModel> resp) {
+        getLocations(disposable);
+        String currentEntry = PrefUtils.getCurrentManualLocation(getApplicationContext());
+        if (resp.isEmpty()) {
+            disableManualLocationPreferences();
+        } else {
+            if (!Stream.of(resp).filter(x -> x.getName().equals(currentEntry)).toList().isEmpty()) {
+                for (PredefinedCoordViewModel location : resp) {
+                    if (location.getName().equals(currentEntry)) {
+                        manualLocationList.setValueIndex(resp.indexOf(location));
+                        break;
+                    }
+                }
+            } else {
+                manualLocationList.setValueIndex(0);
+                manualLocationList.setSummary(resp.get(0).getName());
+                //todo czy na pewno w shared pref sa dobre wartosci
+            }

        }
+    }
+
+    private void disableStatusPreferences() {
+        removeManualStatus.setEnabled(false);
+        statusList.setEnabled(false);
+        statusSwitch.setEnabled(false);
+        statusList.setSummary("");
+        PrefUtils.disableStatus(getApplicationContext());
+
+    }
+
+    private void enableStatusPreferences() {
+        removeManualStatus.setEnabled(true);
+        statusList.setEnabled(true);
+        statusSwitch.setEnabled(true);
+        statusList.setSummary(PrefUtils.getUserStatus(getApplicationContext()));
+    }
+
+    private void disableManualLocationPreferences() {
+        removeManualLocation.setEnabled(false);
+        manualLocationList.setEnabled(false);
+        manualLocationList.setSummary("");
+        locationSharing.setChecked(false);
+        locationSharing.setEnabled(false);
+        PrefUtils.disableSharing(getApplicationContext());
+        ((MapActivity) getActivity()).handleBackgroundTaskLifeCycle();
+
+    }
+
+    private void enableManualLocationPreferences() {
+        removeManualLocation.setEnabled(true);
+        manualLocationList.setEnabled(true);
+
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        locationSharing.setChecked(PrefUtils.isEnableSharingLocalization(getApplicationContext()));
+
+    }

    @Override
    public void onResume() {
@ -509,4 +504,5 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
        super.onDestroy();
        disposable.dispose();
    }
+
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/StartupActivity.java
@ -1,15 +1,29 @@
 package com.uam.wmi.findmytutor.activity;

 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.DisplayMetrics;
+import android.widget.ScrollView;
 import android.widget.Toast;


+import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
+import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;

 import java.util.Locale;
@ -18,6 +32,11 @@ public class StartupActivity extends AppCompatActivity {
    private static final int AUTHENTICATION_REQUEST_CODE = 666;
    String  currentLang;

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {

@ -31,10 +50,10 @@ public class StartupActivity extends AppCompatActivity {
        } else {
            Intent loginIntent = new Intent(this, LoginActivity.class);
            startActivityForResult(loginIntent, AUTHENTICATION_REQUEST_CODE);
+
        }

        super.onCreate(savedInstanceState);
-
    }

    @Override
@ -47,4 +66,8 @@ public class StartupActivity extends AppCompatActivity {

        finish();
    }
+
+
 }
+
+
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TimePickerFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TimePickerFragment.java
@ -0,0 +1,49 @@
+package com.uam.wmi.findmytutor.activity;
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+import android.text.format.DateFormat;
+import android.widget.TextView;
+import android.widget.TimePicker;
+
+import com.uam.wmi.findmytutor.model.DutyHourViewModel;
+
+import java.util.Calendar;
+
+@SuppressLint("ValidFragment")
+public class TimePickerFragment extends DialogFragment
+        implements TimePickerDialog.OnTimeSetListener {
+   private TextView textView;
+   private String field;
+   private DutyHourViewModel duty;
+   @SuppressLint("ValidFragment")
+   public TimePickerFragment(TextView view, DutyHourViewModel duty, String field){
+      this.textView = view;
+      this.duty=duty;
+      this.field=field;
+   }
+   @Override
+   public Dialog onCreateDialog(Bundle savedInstanceState) {
+      // Use the current time as the default values for the picker
+      final Calendar c = Calendar.getInstance();
+      int hour = c.get(Calendar.HOUR_OF_DAY);
+      int minute = c.get(Calendar.MINUTE);
+
+      // Create a new instance of TimePickerDialog and return it
+      return new TimePickerDialog(getActivity(), this, hour, minute,
+              DateFormat.is24HourFormat(getActivity()));
+   }
+
+   public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+      String time = String.format("%d:%02d",hourOfDay,minute);
+      textView.setText(time);
+      if(field.equals("start")){
+         duty.setStart(time);
+      }else{
+         duty.setEnd(time);
+      }
+      // Do something with the time chosen by the user
+   }
+}
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@ -1,14 +1,21 @@
 package com.uam.wmi.findmytutor.activity;

+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;

@ -21,23 +28,22 @@ import com.uam.wmi.findmytutor.model.User;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.TutorTabApi;
 import com.uam.wmi.findmytutor.service.UserService;
-import com.uam.wmi.findmytutor.utils.InfoHelperUtils;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import butterknife.ButterKnife;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.observers.DisposableCompletableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Response;
-
 import static java.lang.String.valueOf;

 public class TutorTab extends AppCompatActivity {
@ -67,12 +73,16 @@ public class TutorTab extends AppCompatActivity {
        setContentView(R.layout.content_tutor_tab);
        ButterKnife.bind(this);

+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitle(R.string.profile_activity_title);
+        setSupportActionBar(toolbar);
+
        userName = findViewById(R.id.userName);
-        userNote = (TextInputEditText) findViewById(R.id.userNote);
+        userNote = findViewById(R.id.userNote);
        userRoom = findViewById(R.id.userRoom);
        userEmail = findViewById(R.id.userEmail);
        department = findViewById(R.id.userDepartment);
-        saveButon = findViewById(R.id.saveButon);
+        saveButon = findViewById(R.id.saveButton);
        scrapButton = findViewById(R.id.scrapTutorTab);
        addDutyButton = findViewById(R.id.addDuty);
        dutyHoursRecycller = findViewById(R.id.dutyHourView);
@ -86,8 +96,6 @@ public class TutorTab extends AppCompatActivity {

        getTutorTab();

-        findViewById(R.id.contentTutorTabInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v,R.layout.info_popup_tutor_tab));
-
        userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext())));

        disposable.add(
@ -112,6 +120,34 @@ public class TutorTab extends AppCompatActivity {
        scrapButton.setOnClickListener(view -> scrapTutorTab());
    }

+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_profile, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        if (item.getItemId()==R.id.action_profile_info_popup){
+            int layoutID = R.layout.info_popup_tutor_tab;
+
+            View popupView = getLayoutInflater().inflate(layoutID,null);
+
+            PopupWindow popupWindow = new PopupWindow(popupView,
+                    LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            // If the PopupWindow should be focusable
+            popupWindow.setFocusable(true);
+            // If you need the PopupWindow to dismiss when when touched outside
+            popupWindow.setBackgroundDrawable(new ColorDrawable());
+            // Get the View's(the one that was clicked in the Fragment) location
+            View anchorView=  getWindow().getDecorView().findViewById(android.R.id.content);
+            popupWindow.showAtLocation(anchorView,Gravity.TOP|Gravity.END, 0, 0);
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
    private void getTutorTab(){
        disposable.add(
                tutorTabService.apiUsersTutorTabByTutorIdGet(PrefUtils.getUserId(getApplicationContext()))
@ -123,7 +159,7 @@ public class TutorTab extends AppCompatActivity {

                                dutyHourList = tutorTabViewModel.getDutyHours();
                                if(dutyHourList != null){
-                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList);
+                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList, getFragmentManager());
                                    dutyHoursRecycller.setAdapter(dutyHoursAdapter);
                                    addDutyButton.setOnClickListener(v -> addEmptyDuty(dutyHoursAdapter));
                                }
@ -144,7 +180,7 @@ public class TutorTab extends AppCompatActivity {

                                if( code == 404){
                                    ifTutorTabExists = false;
-                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),new ArrayList<DutyHourViewModel>());
+                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),new ArrayList<DutyHourViewModel>(), getFragmentManager());
                                    dutyHoursRecycller.setAdapter(dutyHoursAdapter);
                                    addDutyButton.setOnClickListener(v -> addEmptyDuty(dutyHoursAdapter));
                                }
@ -161,16 +197,20 @@ public class TutorTab extends AppCompatActivity {

    private void setUpSaveListener(Button button) {
        button.setOnClickListener(view -> {
-            newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),
-                    userRoom.getText().toString(),
-                    userEmail.getText().toString(),
-                    userNote.getText().toString(),
-                    dutyHoursAdapter.getDutyList());
-            if(ifTutorTabExists){
-                putUserTab(newTab);
+            if( isEmailValid(userEmail.getText().toString())){
+                newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),
+                        userRoom.getText().toString(),
+                        userEmail.getText().toString(),
+                        userNote.getText().toString(),
+                        dutyHoursAdapter.getDutyList());
+                if(ifTutorTabExists){
+                    putUserTab(newTab);
+                }else{
+                    postUserTab(newTab);
+                    ifTutorTabExists=true;
+                }
            }else{
-                postUserTab(newTab);
-                ifTutorTabExists=true;
+                userEmail.setError(getString(R.string.error_invalid_email));
            }
        });
    }
@ -221,7 +261,6 @@ public class TutorTab extends AppCompatActivity {
            Toast.makeText(getApplicationContext(),
                    "Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();

-
            Log.e("WMI SUCC", String.valueOf(error));

        }
@ -239,4 +278,26 @@ public class TutorTab extends AppCompatActivity {
        Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
    }

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    public boolean isEmailValid(String email)
+    {
+        String regExpn =
+                "^(([\\w-]+\\.)+[\\w-]+|([a-zA-Z]{1}|[\\w-]{2,}))@"
+                        +"((([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\.([0-1]?"
+                        +"[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\."
+                        +"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])\\.([0-1]?"
+                        +"[0-9]{1,2}|25[0-5]|2[0-4][0-9])){1}|"
+                        +"([a-zA-Z]+[\\w-]+\\.)+[a-zA-Z]{2,4})$";
+
+        CharSequence inputStr = email;
+
+        Pattern pattern = Pattern.compile(regExpn,Pattern.CASE_INSENSITIVE);
+        Matcher matcher = pattern.matcher(inputStr);
+
+        return matcher.matches();
+    }
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
@ -4,6 +4,7 @@ import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
@ -14,6 +15,7 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.format.DateFormat;
 import android.text.style.ImageSpan;
 import android.util.Log;
 import android.view.Gravity;
@ -24,21 +26,24 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;

 import com.annimon.stream.Stream;
+import com.github.ybq.android.spinkit.SpinKitView;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.adapters.TutorsListAdapter;
+import com.uam.wmi.findmytutor.model.Coordinate;
 import com.uam.wmi.findmytutor.model.DutyHourViewModel;
 import com.uam.wmi.findmytutor.model.TutorTabViewModel;
 import com.uam.wmi.findmytutor.model.User;
 import com.uam.wmi.findmytutor.network.ApiClient;
+import com.uam.wmi.findmytutor.service.CoordinateService;
 import com.uam.wmi.findmytutor.service.TutorTabApi;
 import com.uam.wmi.findmytutor.service.UserService;
+import com.uam.wmi.findmytutor.utils.ActiveFragment;
 import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
@ -46,14 +51,21 @@ import com.uam.wmi.findmytutor.utils.RestApiHelper;

 import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;

 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Function;
+import io.reactivex.observers.DisposableObserver;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
@ -69,13 +81,18 @@ public class UsersListFragment extends Fragment {
    RecyclerView recyclerView;
    @BindView(R.id.txt_empty_notes_view)
    TextView noNotesView;
+    @BindView(R.id.loader)
+    SpinKitView loader;

    private SearchView searchView;
    private UserService userService;
    private TutorTabApi tutorTabService;
+    private CoordinateService coordinateService;
    private CompositeDisposable disposable = new CompositeDisposable();
    private TutorsListAdapter mAdapter;
    private List<User> tutorsList = new ArrayList<>();
+    private HashMap<String, String> tutorsTimeStamps = new HashMap<>();
+
    private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));
    private Boolean fetchOnlyOnlineUsers = PrefUtils.getShowOnlyOnlineUsers(getApplicationContext());

@ -87,7 +104,7 @@ public class UsersListFragment extends Fragment {
    }

    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        mAdapter = new TutorsListAdapter(getActivity().getApplicationContext(), tutorsList);
+        mAdapter = new TutorsListAdapter(getActivity().getApplicationContext(), tutorsList, tutorsTimeStamps);
        View view = inflater.inflate(R.layout.users_list, container, false);
        view.setBackgroundColor(getResources().getColor(android.R.color.white));
        setHasOptionsMenu(true);
@ -99,9 +116,10 @@ public class UsersListFragment extends Fragment {

        userService = ApiClient.getClient(getApplicationContext())
                .create(UserService.class);
-
        tutorTabService = ApiClient.getClient(getActivity().getApplicationContext())
                .create(TutorTabApi.class);
+        coordinateService = ApiClient.getClient(getApplicationContext())
+                .create(CoordinateService.class);

        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
        recyclerView.setLayoutManager(mLayoutManager);
@ -109,8 +127,10 @@ public class UsersListFragment extends Fragment {
        recyclerView.setVerticalScrollBarEnabled(true);
        recyclerView.addItemDecoration(new MyDividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL, 16));
        recyclerView.setAdapter(mAdapter);
+        noNotesView.setVisibility(View.GONE);

        fetchAllTutors();
+        fetchTopCords();

        recyclerView.addOnItemTouchListener(new RecyclerTouchListener(getActivity().getApplicationContext(),
                recyclerView, new RecyclerTouchListener.ClickListener() {
@ -193,6 +213,9 @@ public class UsersListFragment extends Fragment {
        TextView userRoom = view.findViewById(R.id.userRoom);
        TextView userEmail = view.findViewById(R.id.userEmail);
        TextView department = view.findViewById(R.id.userDepartment);
+        TextView userStatusLabel = view.findViewById(R.id.user_status_label);
+        LinearLayout userStatusLabelLL = view.findViewById(R.id.user_status_label_linearLayout);
+


        userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));
@ -222,15 +245,15 @@ public class UsersListFragment extends Fragment {
                            @Override
                            public void onSuccess(TutorTabViewModel tutorTabViewModel) {
                                final AlertDialog alertDialog;
-                                if (((MapActivity) getActivity()).markerUserHash.containsValue(user.getId())) {
+                                if (((MapActivity) getActivity()).coordsMap.containsKey(user.getId())) {
+
                                    alertDialogBuilderUserInput.setPositiveButton(R.string.show_on_map, (dialog, id) -> {
                                        // User cancelled the dialog
+                                        ((MapActivity) getActivity()).activeFragment = ActiveFragment.NONE;
                                        FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
                                        fragmentTransaction.hide(usersListFragment);
                                        fragmentTransaction.commit();
-                                        List<User> list = new ArrayList<User>();
-                                        list.add(user);
-                                        ((MapActivity) getActivity()).filterMarkers(list);
+                                        ((MapActivity) getActivity()).searchUser(user.getFirstName());
                                        ((MapActivity) getActivity()).updateNavigationBarState();
                                    });
                                }
@ -254,6 +277,16 @@ public class UsersListFragment extends Fragment {
                                department.setText(String.format("%s: %s", getString(R.string.userDepartment), user.getDepartment()));
                                userDutyHoursTitle.setText(String.format("%s:", getString(R.string.userDutyHoursHeader)));

+                                Coordinate coordinate = ((MapActivity) getActivity()).coordsMap.get(user.getId());
+                                if (coordinate != null){
+                                    String label = coordinate.getLabel();
+                                    if (!label.isEmpty()) {
+                                        userStatusLabelLL.setVisibility(View.VISIBLE);
+                                        userStatusLabel.setText(String.format("%s: %s", getString(R.string.user_status_label),label));
+                                    }
+                                }
+
+
                                final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),
                                        R.layout.duty_hours_item, dutyHoursList);

@ -273,27 +306,10 @@ public class UsersListFragment extends Fragment {
        disposable.add(
                (fetchOnlyOnlineUsers ?
                        userService.getAllActiveTutors() :
-                        userService.getAllOfflineTutors())
+                        userService.getAllTutors())
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
-                        .map(tutors -> {
-                            List<User> tutorsList = new ArrayList<>(tutors);
-                            List<User> onlineTutors = Stream.of(tutorsList).filter(User::isIsOnline).toList();
-                            List<User> activeNotOnlineTutors = Stream.of(tutorsList)
-                                    .filter(t -> t.isIsActive() && !onlineTutors.contains(t)).toList();
-                            List<User> notActiveTutors = Stream.of(tutorsList)
-                                    .filterNot(User::isIsActive).toList();
-
-                            Collections.sort(onlineTutors, this::sortByUserName);
-                            Collections.sort(activeNotOnlineTutors, this::sortByUserName);
-                            Collections.sort(notActiveTutors, this::sortByUserName);
-
-                            List<User> sortedUserList = new ArrayList<>(onlineTutors);
-                            sortedUserList.addAll(activeNotOnlineTutors);
-                            sortedUserList.addAll(notActiveTutors);
-
-                            return sortedUserList;
-                        })
+                        .map(this::mapUsersToSortedList)
                        .subscribeWith(new DisposableSingleObserver<List<User>>() {
                            @Override
                            public void onSuccess(List<User> users) {
@ -301,6 +317,7 @@ public class UsersListFragment extends Fragment {
                                tutorsList.addAll(users);
                                mAdapter.notifyDataSetChanged();
                                toggleEmptyNotes();
+                                fetchTopCords();
                            }

                            @Override
@ -310,6 +327,24 @@ public class UsersListFragment extends Fragment {
                        }));
    }

+    private List<User> mapUsersToSortedList(List<User> tutors) {
+        List<User> tutorsList = new ArrayList<>(tutors);
+        List<User> onlineTutors = Stream.of(tutorsList).filter(User::isIsOnline).toList();
+        List<User> activeNotOnlineTutors = Stream.of(tutorsList)
+                .filter(t -> t.isIsActive() && !onlineTutors.contains(t)).toList();
+        List<User> notActiveTutors = Stream.of(tutorsList)
+                .filterNot(User::isIsActive).toList();
+
+        Collections.sort(onlineTutors, this::sortByUserName);
+        Collections.sort(activeNotOnlineTutors, this::sortByUserName);
+        Collections.sort(notActiveTutors, this::sortByUserName);
+
+        List<User> sortedUserList = new ArrayList<>(onlineTutors);
+        sortedUserList.addAll(activeNotOnlineTutors);
+        sortedUserList.addAll(notActiveTutors);
+
+        return sortedUserList;
+    }

    private void searchTutorInBackend(String searchString) {
        disposable.add(
@ -334,6 +369,7 @@ public class UsersListFragment extends Fragment {

    public void restoreUsersList() {
        fetchAllTutors();
+        fetchTopCords();
    }

    private int sortByUserName(User t1, User t2) {
@ -378,9 +414,10 @@ public class UsersListFragment extends Fragment {
    }

    private void toggleEmptyNotes() {
-        if (tutorsList.size() > 0) {
-            noNotesView.setVisibility(View.GONE);
-        } else {
+        loader.setVisibility(View.GONE);
+        noNotesView.setVisibility(View.GONE);
+
+        if (tutorsList.size() == 0) {
            noNotesView.setVisibility(View.VISIBLE);
            if (fetchOnlyOnlineUsers)
                noNotesView.setText(R.string.no_online_users);
@ -390,6 +427,35 @@ public class UsersListFragment extends Fragment {
        }
    }

+
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+    private void fetchTopCords(){
+        disposable.add(
+                coordinateService.getTopCoordinates()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(this::addTimestamps,this::showError));
+    }
+
+    private void addTimestamps(List<Coordinate> coordinates) {
+        for (Coordinate crd :
+                coordinates) {
+            Long ts = crd.getTimeStamp();
+            tutorsTimeStamps.put(crd.getUserId(), getDate(ts));
+        }
+
+        mAdapter.notifyDataSetChanged();
+    }
+
+    private String getDate(long time) {
+        Calendar cal = Calendar.getInstance(Locale.ENGLISH);
+        cal.setTimeInMillis(time);
+        return DateFormat.format("HH:mm dd/MM", cal).toString();
+    }
+
    @Override
    public void onDestroy() {
        super.onDestroy();
@ -412,7 +478,4 @@ public class UsersListFragment extends Fragment {
        super.onStop();
    }

-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-    }
-}
+}
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
@ -1,8 +1,11 @@
 package com.uam.wmi.findmytutor.activity;

 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.RequiresApi;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AlertDialog;
@ -27,6 +30,7 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;

+import com.github.ybq.android.spinkit.SpinKitView;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.adapters.WhiteListAdapter;
@ -35,6 +39,7 @@ import com.uam.wmi.findmytutor.model.StudentIdModel;
 import com.uam.wmi.findmytutor.model.User;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.service.UserService;
+import com.uam.wmi.findmytutor.utils.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.MyDividerItemDecoration;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
@ -44,7 +49,6 @@ import com.uam.wmi.findmytutor.utils.WrapContentLinearLayoutManager;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
-
 import java.util.List;
 import java.util.Locale;

@ -54,6 +58,7 @@ import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Function;
 import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
@ -61,11 +66,6 @@ import okhttp3.ResponseBody;

 public class WhiteList extends AppCompatActivity {

-    private CompositeDisposable disposable = new CompositeDisposable();
-    private UserService userService;
-    private boolean didFetched = false;
-    private String tutorId;
-
    @BindView(R.id.recycler_view_whitelist)
    RecyclerView recyclerView;
    @BindView(R.id.white_list_empty_text_view)
@ -75,27 +75,42 @@ public class WhiteList extends AppCompatActivity {
    @BindView(R.id.add_to_white_list_fab)
    FloatingActionButton addToWhiteListFab;

+    @BindView(R.id.loader)
+    SpinKitView loader;
+
+
+    private CompositeDisposable disposable = new CompositeDisposable();
+    private UserService userService;
+    private boolean didFetched = false;
+    private String tutorId;
    private WhiteListAdapter mAdapter;
    private Integer prevSize;
    private List<User> whitelistedUsers = new ArrayList<>();
    private Collator plCollator = Collator.getInstance(Locale.forLanguageTag("pl-PL"));

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
        setContentView(R.layout.activity_white_list);
        ButterKnife.bind(this);
+
        tutorId = PrefUtils.getUserId(getApplicationContext());
        userService = ApiClient.getClient(getApplicationContext())
                .create(UserService.class);

-        if (PrefUtils.isWhiteListing(this)){
-            aSwitch.setText(getString(R.string.action_white_list) +" ON");
+        if (PrefUtils.isWhiteListing(this)) {
+            aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.on) );
            aSwitch.setChecked(true);
            handleChangeRequest(true);
-        }else{
-            aSwitch.setText(getString(R.string.action_white_list) +" OFF");
+        } else {
+            aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.off) );
            aSwitch.setChecked(false);
            handleChangeRequest(false);
        }
@ -109,6 +124,7 @@ public class WhiteList extends AppCompatActivity {
        recyclerView.setItemAnimator(new DefaultItemAnimator());
        recyclerView.addItemDecoration(new MyDividerItemDecoration(this, LinearLayoutManager.VERTICAL, 16));
        recyclerView.setAdapter(mAdapter);
+        noNotesView.setVisibility(View.GONE);

        /**
         * On long press on RecyclerView item, open alert dialog
@ -132,7 +148,7 @@ public class WhiteList extends AppCompatActivity {
    }

    private Observable<List<String>> getListOfWhitelistedUsers(String userId) {
-        return  userService.getTutorWhitelistedByID(userId)
+        return userService.getTutorWhitelistedByID(userId)
                .toObservable()
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
@ -147,34 +163,32 @@ public class WhiteList extends AppCompatActivity {
    }

    private void fetchWhiteListedUsers() {
-        prevSize = whitelistedUsers.size();
-        whitelistedUsers.clear();
-
        disposable.add(getListOfWhitelistedUsers(tutorId)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .flatMap((Function<List<String>, Observable<String>>) Observable::fromIterable)
-                        .flatMap((Function<String, ObservableSource<User>>) this::getUserObservable)
-                        .subscribeWith(new DisposableObserver<User>() {
-                            @Override
-                            public void onNext(User user) {
-                                whitelistedUsers.add(user);
-                            }
-
-                            @Override
-                            public void onError(Throwable e) {
-                                showError(e);
-                            }
-
-                            @Override
-                            public void onComplete() {
-                                Collections.sort(whitelistedUsers, (a, b) -> sortByUserName(a,b));
-                                refreshUI();
-                            }
-                        }));
+                .doOnSubscribe(this::handleDoOnSubscribe)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .flatMap(Observable::fromIterable)
+                .flatMap(this::getUserObservable)
+                .subscribe(user ->  whitelistedUsers.add(user), this::handleError,this::handleComplete));
    }

-    private void refreshUI(){
+    private void handleDoOnSubscribe(Disposable disposable) {
+        prevSize = whitelistedUsers.size();
+        whitelistedUsers.clear();
+        didFetched = false;
+    }
+
+    private void handleComplete() {
+        Collections.sort(whitelistedUsers, this::sortByUserName);
+        didFetched = true;
+        refreshUI();
+    }
+    private void handleError(Throwable e){
+        showError(e);
+        didFetched = false;
+    }
+
+    private void refreshUI() {
        toggleEmptyNotes();
        mAdapter.notifyItemRangeInserted(prevSize, whitelistedUsers.size() - prevSize);
        mAdapter.notifyDataSetChanged();
@ -184,7 +198,7 @@ public class WhiteList extends AppCompatActivity {
        return plCollator.compare(t1.getLastName(), t2.getLastName());
    }

-    private void showFabDialog(View v){
+    private void showFabDialog(View v) {
        LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
        @SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.white_list_fab_modal, null);
        AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(this);
@ -230,7 +244,7 @@ public class WhiteList extends AppCompatActivity {
                userService.addStudentToWhitelist(tutorId, studentIdModel)
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(this::handleAddUser,this::showError)
+                        .subscribe(this::handleAddUser, this::showError)
        );
    }

@ -251,30 +265,34 @@ public class WhiteList extends AppCompatActivity {
        } else {
            message = "Network Error !";
        }
-        Log.e("ERR",message);
+        Log.e("ERR", message);
        Toast.makeText(this, message, Snackbar.LENGTH_LONG).show();
    }

    private void toggleEmptyNotes() {
+
        if (didFetched && whitelistedUsers.size() == 0) {
+            noNotesView.setVisibility(View.VISIBLE);
            noNotesView.setText(R.string.list_is_empty);
-            noNotesView.setVisibility(View.VISIBLE);
-        }else if (whitelistedUsers.size() > 0) {
+            loader.setVisibility(View.GONE);
+        } else if (whitelistedUsers.size() > 0) {
            noNotesView.setVisibility(View.GONE);
+            loader.setVisibility(View.GONE);
        } else {
-            noNotesView.setText(getString(R.string.loading));
-            noNotesView.setVisibility(View.VISIBLE);
+            loader.setVisibility(View.VISIBLE);
        }
    }


+
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {

-        if (item.getItemId()==R.id.action_whitelist_info_popup){
+        if (item.getItemId() == R.id.action_whitelist_info_popup) {
            int layoutID = R.layout.info_popup_whitelist;

-            View popupView = getLayoutInflater().inflate(layoutID,null);
+            View popupView = getLayoutInflater().inflate(layoutID, null);

            PopupWindow popupWindow = new PopupWindow(popupView,
                    LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@ -283,36 +301,36 @@ public class WhiteList extends AppCompatActivity {
            // If you need the PopupWindow to dismiss when when touched outside
            popupWindow.setBackgroundDrawable(new ColorDrawable());
            // Get the View's(the one that was clicked in the Fragment) location
-            View anchorView=  getWindow().getDecorView().findViewById(android.R.id.content);
-            popupWindow.showAtLocation(anchorView,Gravity.TOP|Gravity.END, 0, 0);
+            View anchorView = getWindow().getDecorView().findViewById(android.R.id.content);
+            popupWindow.showAtLocation(anchorView, Gravity.TOP | Gravity.END, 0, 0);
        }

        return super.onOptionsItemSelected(item);
    }

-    private void handleSwitch(){
+    private void handleSwitch() {
        aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked){
-                aSwitch.setText(getString(R.string.action_white_list) + " "+ getString(R.string.on));
+            if (isChecked) {
+                aSwitch.setText(getString(R.string.action_white_list) + " " + getString(R.string.on));
                handleChangeRequest(true);
                PrefUtils.useWhitelist(this, true);
-            }else {
-                aSwitch.setText(getString(R.string.action_white_list) + " "+getString(R.string.off));
+            } else {
+                aSwitch.setText(getString(R.string.action_white_list) + " " + getString(R.string.off));
                handleChangeRequest(false);
                PrefUtils.useWhitelist(this, false);
            }
        });
    }

-    private void handleChangeRequest(boolean value){
+    private void handleChangeRequest(boolean value) {
        IsUsingListBool isUsingListBool = new IsUsingListBool();
        isUsingListBool.setIsUsing(value);
        disposable.add(
                userService.setTutorWhitelist(tutorId, isUsingListBool)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(()->{
-            },this::showError)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(() -> {
+                        }, this::showError)
        );
    }

--- a/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
@ -1,6 +1,9 @@
 package com.uam.wmi.findmytutor.adapters;

+import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.content.Context;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
@ -14,6 +17,7 @@ import android.widget.TextView;
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.activity.TimePickerFragment;
 import com.uam.wmi.findmytutor.model.DutyHourViewModel;
 import java.util.ArrayList;
 import java.util.List;
@ -24,10 +28,12 @@ import butterknife.ButterKnife;
 public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyViewHolder> {
    private Context context;
    private List<DutyHourViewModel> hours;
+    private FragmentManager fragmentManager;

-    public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours) {
+    public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours, FragmentManager fragmentManager) {
        this.context = context;
-        this.hours = new ArrayList<>(hours);
+        this.hours = new ArrayList<DutyHourViewModel>(hours);
+        this.fragmentManager = fragmentManager;
    }


@ -75,7 +81,7 @@ public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyV
            }
        });
        holder.dutyStart.setText(duty.getStart());
-        holder.dutyStart.addTextChangedListener(new TextWatcher() {
+      /*  holder.dutyStart.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {

@ -90,9 +96,23 @@ public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyV
            public void afterTextChanged(Editable s) {
                duty.setStart(holder.dutyStart.getText().toString());
            }
+        });*/
+        holder.dutyStart.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                DialogFragment picker = new TimePickerFragment(holder.dutyStart,duty,"start");
+                picker.show(fragmentManager,"time picker");
+            }
        });
        holder.dutyStop.setText(duty.getEnd());
-        holder.dutyStop.addTextChangedListener(new TextWatcher() {
+        holder.dutyStop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                DialogFragment picker = new TimePickerFragment(holder.dutyStop,duty,"stop");
+                picker.show(fragmentManager,"time picker");
+            }
+        });
+/*        holder.dutyStop.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {

@ -107,7 +127,7 @@ public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyV
            public void afterTextChanged(Editable s) {
                duty.setEnd(holder.dutyStop.getText().toString());
            }
-        });
+        });*/
        holder.deleteRow.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
--- a/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
@ -1,3 +1,4 @@
+/*
 package com.uam.wmi.findmytutor.adapters;

 import android.content.Context;
@ -9,9 +10,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

+import com.github.ybq.android.spinkit.SpinKitView;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.User;

+import java.util.HashMap;
 import java.util.List;

 import butterknife.BindView;
@ -22,10 +25,12 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My

    private Context context;
    private List<User> tutorsList;
+    private HashMap<String, String> tutorsTimeStamps;

-    public TutorsListAdapter(Context context, List<User> tutors) {
+    public TutorsListAdapter(Context context, List<User> tutors, HashMap<String,String> tutorsTimeStamps) {
        this.context = context;
        this.tutorsList = tutors;
+        this.tutorsTimeStamps = tutorsTimeStamps;
    }
    @NonNull
    @Override
@ -41,17 +46,32 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
        Drawable image = null;
        User tutor = tutorsList.get(position);

-        holder.firstName.setText(tutor.getFirstName());
-        holder.lastName.setText(tutor.getLastName());
+        holder.firstName.setText(String.format("%s %s", tutor.getFirstName(), tutor.getLastName()));
+        String ts = tutorsTimeStamps.get(tutor.getId());

        if (tutor.isIsOnline()) {
            image = context.getResources().getDrawable(R.drawable.user_list_online);
+            holder.lastSeen.setText(R.string.available_now);
+            holder.loader.setVisibility(View.GONE);
        } else {
            image = context.getResources().getDrawable(R.drawable.user_list_offline);
+
+            if (ts != null){
+                holder.lastSeen.setText(R.string.last_sign);
+                holder.lastSeen.append(String.format(": %s", ts));
+                holder.loader.setVisibility(View.GONE);
+            }
        }

        if (!tutor.isIsActive()) {
            image = context.getResources().getDrawable(R.drawable.user_list_off);
+            if(ts != null){
+                holder.lastSeen.setText(R.string.last_sign);
+                holder.lastSeen.append(String.format(": %s", ts));
+            }else{
+                holder.lastSeen.setVisibility(View.GONE);
+            }
+            holder.loader.setVisibility(View.GONE);
        }

        image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
@ -68,17 +88,132 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
        @BindView(R.id.firstName)
        TextView firstName;

-        @BindView(R.id.lastName)
-        TextView lastName;
+        @BindView(R.id.lastSeen)
+        TextView lastSeen;

        @BindView(R.id.isOnline)
        TextView isOnline;

+        @BindView(R.id.loader)
+        SpinKitView loader;
+
        MyViewHolder(View view) {
            super(view);
            ButterKnife.bind(this, view);
        }
    }
+}
+
+
+
+*/
+
+
+package com.uam.wmi.findmytutor.adapters;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.github.ybq.android.spinkit.SpinKitView;
+import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.model.User;
+
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.MyViewHolder> {
+
+    private Context context;
+    private List<User> tutorsList;
+    private HashMap<String, String> tutorsTimeStamps;
+
+    public TutorsListAdapter(Context context, List<User> tutors, HashMap<String,String> tutorsTimeStamps) {
+        this.context = context;
+        this.tutorsList = tutors;
+        this.tutorsTimeStamps = tutorsTimeStamps;
+    }
+    @NonNull
+    @Override
+    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.tutor_list_row, parent, false);
+
+        return new MyViewHolder(itemView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
+        Drawable image = null;
+        User tutor = tutorsList.get(position);
+
+        holder.firstName.setText(String.format("%s %s", tutor.getFirstName(), tutor.getLastName()));
+        String ts = tutorsTimeStamps.get(tutor.getId());
+
+        if (tutor.isIsOnline()) {
+            image = context.getResources().getDrawable(R.drawable.user_list_online);
+            holder.lastSeen.setText(R.string.available_now);
+            holder.lastSeen.setVisibility(View.VISIBLE);
+            holder.loader.setVisibility(View.GONE);
+        } else if(tutor.isIsActive()){
+            image = context.getResources().getDrawable(R.drawable.user_list_offline);
+
+            if (ts != null){
+                holder.lastSeen.setText(R.string.last_sign);
+                holder.lastSeen.append(String.format(": %s", ts));
+                holder.loader.setVisibility(View.GONE);
+            }
+        } else {
+            image = context.getResources().getDrawable(R.drawable.user_list_off);
+
+            if(ts == null){
+                holder.lastSeen.setText(R.string.never_logged_in);
+            }else{
+                holder.lastSeen.setText(R.string.last_sign);
+                holder.lastSeen.append(String.format(": %s", ts));
+            }
+            holder.loader.setVisibility(View.GONE);
+        }
+
+        image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
+        holder.isOnline.setCompoundDrawables(image, null, null, null);
+    }
+
+    @Override
+    public int getItemCount() {
+        return tutorsList.size();
+    }
+
+    class MyViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.firstName)
+        TextView firstName;
+
+        @BindView(R.id.lastSeen)
+        TextView lastSeen;
+
+        @BindView(R.id.isOnline)
+        TextView isOnline;
+
+        @BindView(R.id.loader)
+        SpinKitView loader;
+
+        MyViewHolder(View view) {
+            super(view);
+            ButterKnife.bind(this, view);
+        }
+    }
+}
+


-}
--- a/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java
@ -34,9 +34,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.uam.wmi.findmytutor.model.Coordinate;
 import com.uam.wmi.findmytutor.network.ApiClient;
 import com.uam.wmi.findmytutor.utils.ApproximatedLocalization;
+import com.uam.wmi.findmytutor.utils.Const;
 import com.uam.wmi.findmytutor.utils.MapUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.SharingLevel;
+import com.uam.wmi.findmytutor.utils.WifiUtils;

 import org.apache.commons.collections4.queue.CircularFifoQueue;

@ -122,6 +124,12 @@ public class BackgroundLocalizationService extends Service {
                    mCurrentLocation = locationResult.getLastLocation();
                    sendCoordinateToBackend(mCurrentLocation);
                    changeBackgroundMode();
+
+                    //Restart service when a user started using presence in GPS mode and wmi is currently available
+                    if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())
+                            && PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.PRESENCE.toString())) {
+                        restartService();
+                    }
                }
            }
        };
@ -140,22 +148,60 @@ public class BackgroundLocalizationService extends Service {
            startForeground(1001, notification);
        }

-        if (!stopService && !PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
-            createFusedLocationClient();
-        } else if (!stopService &&
-                PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
-            mStatusChecker = () -> {
-                try {
-                    sendCoordinateToBackend(fakeLoc);
-                } finally {
-                    mHandler.postDelayed(mStatusChecker, notify_interval);
-                }
-            };
+        if (!stopService) {
+            if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.PRESENCE.toString())) {
+                if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())) {
+                    Location presenceFakeLoc = new Location("");

-            AsyncTask.execute(mStatusChecker);
+                    presenceFakeLoc.setLatitude(Const.presenceLatitude);
+                    presenceFakeLoc.setLongitude(Const.presenceLongitude);
+                    presenceFakeLoc.setAltitude(0);
+                    createPresenceLooper(presenceFakeLoc);
+                } else {
+                    createFusedLocationClient();
+                }
+            } else if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.EXACT.toString())
+                    || PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.APPROXIMATED.toString())
+                    ) {
+                createFusedLocationClient();
+            } else if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
+                Location manualFakeLoc = new Location("");
+
+                manualFakeLoc.setLatitude(0);
+                manualFakeLoc.setLongitude(0);
+                manualFakeLoc.setAltitude(0);
+                createLowBatteryLooper(manualFakeLoc);
+            }
        }
    }

+    private void createLowBatteryLooper(Location fakeLoc) {
+        mStatusChecker = () -> {
+            try {
+                sendCoordinateToBackend(fakeLoc);
+            } finally {
+                mHandler.postDelayed(mStatusChecker, notify_interval);
+            }
+        };
+        AsyncTask.execute(mStatusChecker);
+    }
+
+    private void createPresenceLooper(Location fakeLoc) {
+        mStatusChecker = () -> {
+            try {
+                if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())) {
+                    sendCoordinateToBackend(fakeLoc);
+                } else {
+                    restartService();
+                }
+            } finally {
+                mHandler.postDelayed(mStatusChecker, notify_interval);
+            }
+        };
+        AsyncTask.execute(mStatusChecker);
+    }
+
+
    private void createFusedLocationClient() {
        Integer saveMode = Long.valueOf(notify_interval).compareTo(Long.valueOf(offlineBackgroundLocationInterval));

@ -168,7 +214,7 @@ public class BackgroundLocalizationService extends Service {
        if (saveMode != 0) {
            mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
        } else {
-            mLocationRequest.setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+            mLocationRequest.setPriority(LocationRequest.PRIORITY_LOW_POWER);
        }

        mLocationRequest.setFastestInterval(notify_interval);
@ -186,18 +232,19 @@ public class BackgroundLocalizationService extends Service {
    private void changeBackgroundMode() {
        Integer prevInterval = notify_interval;
        Boolean shouldExtendTimeInterval = Stream.of(coordinatesHistory)
-                .map(MapUtils::checkIfCoordinateIsValid).takeWhile(s -> !s).toList().size() == coordinatesHistory.size();
+                .map(MapUtils::checkIfCoordinateIsValid).takeWhile(s -> !s).toList().size() == coordinatesHistoryLength;

        Boolean shouldAbbreviateTimeInterval = Stream.of(coordinatesHistory).
                map(MapUtils::checkIfCoordinateIsValid).filter(x -> x).toList().size() > 0;

+        if (shouldExtendTimeInterval) {
+            notify_interval = notify_interval_outside_building;
+        }
+
        if (shouldAbbreviateTimeInterval) {
            notify_interval = notify_interval_inside_building;
        }

-        if (coordinatesHistory.size() > coordinatesHistoryLength && shouldExtendTimeInterval) {
-            notify_interval = notify_interval_outside_building;
-        }

        Integer changedMode = Long.valueOf(prevInterval).compareTo(Long.valueOf(notify_interval));
        if (changedMode != 0) {
@ -293,7 +340,7 @@ public class BackgroundLocalizationService extends Service {
            latitude = location.getLatitude();
            longitude = location.getLongitude();
            altitude = location.getAltitude();
-
+            Log.e(TAG, "TASK" + latitude + " " + longitude);
            approximatedLocalization = new ApproximatedLocalization(MapUtils.loadJsonFromAsset(getApplicationContext(), "building.geojson"));
            approximatedBuildingPart = approximatedLocalization.getNameOfBuildingPart(Point.fromLngLat(longitude, latitude));
        }
@ -306,6 +353,7 @@ public class BackgroundLocalizationService extends Service {

            if (locationLevel.equals(SharingLevel.PRESENCE.toString())) {
                if (!MapUtils.checkIfCoordinateIsValid(latitude, longitude)) {
+                    coordinatesHistory.add(fakeLoc);
                    return null;
                }

--- a/app/src/main/java/com/uam/wmi/findmytutor/service/CoordinateService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/CoordinateService.java
@ -25,7 +25,7 @@ public interface CoordinateService {
    Single<List<Coordinate>> getCoordinatesByUserId(@Path("userId") String userId);

    @GET("api/coordinates/userTop/{userId}")
-    Single<List<Coordinate>> getTopCoordinatesByUserId(@Path("userId") String userId);
+    Single <Coordinate> getTopCoordinateByUserId(@Path("userId") String userId);

    @GET("api/coordinates/top")
    Single<List<Coordinate>> getTopCoordinates();
@ -42,4 +42,6 @@ public interface CoordinateService {
    @DELETE("api/coordinates/{id}")
    Completable deleteCoordinatesById(@Path("id") String id);

+
+
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
@ -39,6 +39,9 @@ public interface UserService {
    @GET("api/users/tutors/active")
    Single <List<User>> getAllActiveTutors();

+
+
+
    @GET("api/users/tutors/offline")
    Single <List<User>> getAllOfflineTutors();

@ -60,6 +63,9 @@ public interface UserService {
    @GET("api/users/{id}")
    Single <User> getUserById(@Path("id") String userID);

+    @GET("api/users/self/{id}")
+    Single <User> getSelf(@Path("id") String userID);
+
    @PUT("api/users/{id}")
    Completable updateUserByID(@Path("id") String userID, @Body User user);

--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/Const.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/Const.java
@ -17,8 +17,10 @@ public class Const {
    public final static String presenceApproximatedName = "Unknown";
    public final static Range<Double> buildingLatitudeRange = Range.create(52.466092, 52.467529);
    public final static Range<Double> buildingLongitudeRange = Range.create(16.926159, 16.927759);
-    public final static Range<Double> outsideLatitudeRange = Range.create(52.463512, 52.468837);
-    public final static Range<Double> outsideLongitudeRange = Range.create(16.922372, 16.936004);
+    public final static Range<Double> outsideLatitudeRange = Range.create(52.4651, 52.468837);
+    public final static Range<Double> outsideLongitudeRange = Range.create(16.9186, 16.936004);
    public final static List<String> validApproximatedLocations = Arrays.asList("Skrzydło B", "Skrzydło A", "Aule", "Łącznik", "Biblioteka", "Hol", "Unknown");
+    public final static String WMI_SSID_NAME = "wmi";
 }

+
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleHelper.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleHelper.java
@ -0,0 +1,80 @@
+package com.uam.wmi.findmytutor.utils;
+
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.preference.PreferenceManager;
+
+import java.util.Locale;
+
+public class LocaleHelper {
+
+    private static final String SELECTED_LANGUAGE = "Locale.Helper.Selected.Language";
+
+    public static Context onAttach(Context context) {
+        String lang = getPersistedData(context, Locale.getDefault().getLanguage());
+        return setLocale(context, lang);
+    }
+
+    public static Context onAttach(Context context, String defaultLanguage) {
+        String lang = getPersistedData(context, defaultLanguage);
+        return setLocale(context, lang);
+    }
+
+    public static String getLanguage(Context context) {
+        return getPersistedData(context, Locale.getDefault().getLanguage());
+    }
+
+    public static Context setLocale(Context context, String language) {
+        persist(context, language);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResources(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    private static String getPersistedData(Context context, String defaultLanguage) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        return preferences.getString(SELECTED_LANGUAGE, defaultLanguage);
+    }
+
+    private static void persist(Context context, String language) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        editor.putString(SELECTED_LANGUAGE, language);
+        editor.apply();
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    private static Context updateResources(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Configuration configuration = context.getResources().getConfiguration();
+        configuration.setLocale(locale);
+
+        return context.createConfigurationContext(configuration);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Context updateResourcesLegacy(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return context;
+    }
+}
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java
@ -1,10 +1,32 @@
 package com.uam.wmi.findmytutor.utils;

+import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.os.Build;
 import android.support.v4.os.ConfigurationCompat;

+import java.util.Locale;
+
 public class LocaleUtils {
-    public static String getCurrentLocale(){
-            return String.valueOf(ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()));
+    public static String getCurrentLocale() {
+        return String.valueOf(ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()));
+    }
+
+    private static Context updateResources(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Resources res = context.getResources();
+        Configuration config = new Configuration(res.getConfiguration());
+        if (Build.VERSION.SDK_INT >= 22) {
+            config.setLocale(locale);
+            context = context.createConfigurationContext(config);
+        } else {
+            config.locale = locale;
+            res.updateConfiguration(config, res.getDisplayMetrics());
+        }
+        return context;
    }
 }
+
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java
@ -1,8 +1,12 @@
 package com.uam.wmi.findmytutor.utils;

 import android.animation.TypeEvaluator;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.location.Location;
+import android.net.Uri;
+import android.provider.Settings;

 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
@ -10,12 +14,15 @@ import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.uam.wmi.findmytutor.R;

 import java.io.IOException;
 import java.io.InputStream;

-import static com.uam.wmi.findmytutor.utils.Const.outsideLongitudeRange;
+import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
 import static com.uam.wmi.findmytutor.utils.Const.outsideLatitudeRange;
+import static com.uam.wmi.findmytutor.utils.Const.outsideLongitudeRange;
+import static com.uam.wmi.findmytutor.utils.PrefUtils.shouldBatteryExclusionBeShown;

 public class MapUtils {

@ -41,8 +48,8 @@ public class MapUtils {

    // Map Bounds Area
    public static void setZoom(MapboxMap mapboxMap, Integer zoom) {
-            makeNewCamera(mapboxMap, 52.466799, 16.927002, zoom, 0, 0, 1000);
-            mapboxMap.setMinZoomPreference(16); // TODO export to map config
+        makeNewCamera(mapboxMap, 52.466799, 16.927002, zoom, 0, 0, 1000);
+        mapboxMap.setMinZoomPreference(16); // TODO export to map config
    }

    public static void makeNewCamera(MapboxMap mapboxMap, double lat, double lon, int zoomParam, int bearingParam, int tiltParam, int duration) {
@ -73,14 +80,34 @@ public class MapUtils {
        }
    }

-    public static Boolean checkIfCoordinateIsValid(Location coordinate){
-       return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude());
+    public static Boolean checkIfCoordinateIsValid(Location coordinate) {
+        return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude());
    }

-    public static Boolean checkIfCoordinateIsValid(Double latitude, Double longitude){
+    public static Boolean checkIfCoordinateIsValid(Double latitude, Double longitude) {
        return Const.buildingLatitudeRange.contains(latitude) && Const.buildingLongitudeRange.contains(longitude);
    }

+    public static void BatteryOptimizationsExceptionCheck(Context context) {
+        if (shouldBatteryExclusionBeShown(getApplicationContext())) {
+            PrefUtils.setBatteryExlusionInfoStatus(getApplicationContext(), false);
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.batter_exclusions_title);
+            builder.setMessage(R.string.batter_exclusions_message)
+                    .setPositiveButton(R.string.ok, (dialog, id) -> {
+                        Intent intent = new Intent();
+                        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                        Uri uri = Uri.fromParts("package", getApplicationContext().getPackageName(), null);
+                        intent.setData(uri);
+                        context.startActivity(intent);
+                    })
+                    .setNegativeButton(R.string.cancel, (dialog, id) -> {
+
+                    }).show();
+        }
+    }
+
    // Function for marker animation
    public static class LatLngEvaluator implements TypeEvaluator<LatLng> {
        // Method is used to interpolate the marker animation.
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
@ -243,4 +243,13 @@ public class PrefUtils {
        return getSharedPreferences(context).getBoolean("whitelisting", false);
    }

+    public static Boolean shouldBatteryExclusionBeShown(Context context) {
+        return getSharedPreferences(context).getBoolean("show_battery_exclusion", false);
+    }
+
+    public static void setBatteryExlusionInfoStatus(Context context,  Boolean flag) {
+            SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+            editor.putBoolean("show_battery_exclusion", flag);
+            editor.apply();
+        }
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/RightButtonPreference.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/RightButtonPreference.java
@ -17,15 +17,38 @@ public class RightButtonPreference extends Preference {
    public RightButtonPreference(Context context, AttributeSet attrs) {
        super(context, attrs);
        setWidgetLayoutResource(R.layout.preference_button_widget);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs){
        for (int i=0;i<attrs.getAttributeCount();i++) {
            String attr = attrs.getAttributeName(i);
-            String val  = attrs.getAttributeValue(i);
-            if (attr.equalsIgnoreCase("text")) {
-               buttonText = context.getResources().getString(Integer.parseInt(val.substring(1)));
-            }
-        }
+            try {
+                if(attr.equalsIgnoreCase("key")){
+                    Log.e("BUTTON_ERR",attr);
+                    String val  = attrs.getAttributeValue(i);

+                    switch (val) {
+                        case "remove_manual_status":
+                            buttonText = context.getResources().getString(R.string.preference_manual_location_button_remove);
+                            break;
+                        case "manual_location_button":
+                            buttonText = context.getResources().getString(R.string.preference_manual_location_button);
+                            break;
+                        case "remove_manual_location":
+                            buttonText = context.getResources().getString(R.string.preference_manual_location_button_remove);
+                            break;
+                    }
+                }
+            } catch (Exception e) {
+                buttonText = "";
+                Log.e("BUTTON_ERR", String.valueOf(e));
+            }
+
+        }
    }
+
+
    public void setText(String text){
        prefButton.setText(text);
    }
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/RxSearchObservable.java
@ -1,16 +1,13 @@
 package com.uam.wmi.findmytutor.utils;

-
 import android.support.v7.widget.SearchView;

 import io.reactivex.Observable;
 import io.reactivex.subjects.PublishSubject;

-
 public class RxSearchObservable {

    private RxSearchObservable() {
-        // no instance
    }

    public static Observable<String> fromView(SearchView searchView) {
@ -30,13 +27,8 @@ public class RxSearchObservable {
                subject.onNext(text);
                return false;
            }
-
-
-
-
        });

-
        return subject;
    }
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/WifiUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/WifiUtils.java
@ -0,0 +1,30 @@
+package com.uam.wmi.findmytutor.utils;
+
+import android.content.Context;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.util.Log;
+
+import java.util.Objects;
+
+public class WifiUtils {
+
+    public static String getWifiName(Context context) {
+        WifiManager manager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        if (Objects.requireNonNull(manager).isWifiEnabled()) {
+            WifiInfo wifiInfo = manager.getConnectionInfo();
+            if (wifiInfo != null) {
+                NetworkInfo.DetailedState state = WifiInfo.getDetailedStateOf(wifiInfo.getSupplicantState());
+                if (state == NetworkInfo.DetailedState.CONNECTED || state == NetworkInfo.DetailedState.OBTAINING_IPADDR) {
+                    return wifiInfo.getSSID();
+                }
+            }
+        }
+        return null;
+    }
+
+    public static Boolean checkIfUserIsInRangeOfWmiWifi(Context context) {
+        return Objects.equals(getWifiName(context), Const.WMI_SSID_NAME);
+    }
+}
--- a/app/src/main/res/drawable/user_modal_title.xml
+++ b/app/src/main/res/drawable/user_modal_title.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+  <path
+      android:fillColor="#ffffff"
+      android:pathData="M22 10l-6-6H4c-1.1 0-2 0.9-2 2v12.01c0 1.1 0.9 1.99 2 1.99l16-0.01c1.1 0 2-0.89 2-1.99v-8zm-7-4.5l5.5 5.5H15V5.5z" />
+  <path
+      android:pathData="M0 0h24v24H0V0z" />
+</vector>
--- a/app/src/main/res/layout/activity_black_list.xml
+++ b/app/src/main/res/layout/activity_black_list.xml
@ -40,7 +40,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_alignParentRight="true"
-                    android:text="Block the users"
+                    android:text="@string/block_the_users"
                    android:textSize="15sp"/>

                <Switch
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -4,13 +4,13 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:fontFamily="@font/lato_regular"
    android:gravity="center_horizontal"
    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
    android:paddingTop="@dimen/activity_vertical_margin"
-    android:fontFamily="@font/lato_regular"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
    tools:context=".activity.LoginActivity">


@ -58,6 +58,7 @@

            <android.support.design.widget.TextInputLayout
                android:layout_width="match_parent"
+                app:passwordToggleEnabled="true"
                android:layout_height="wrap_content">

                <EditText
@ -74,7 +75,6 @@

            </android.support.design.widget.TextInputLayout>

-
            <Button
                android:id="@+id/email_sign_in_button"
                style="?android:textAppearanceSmall"
@ -84,7 +84,6 @@
                android:text="@string/action_log_in"
                android:textStyle="bold" />

-
        </LinearLayout>
    </ScrollView>
 </LinearLayout>
--- a/app/src/main/res/layout/activity_tutor_tab.xml
+++ b/app/src/main/res/layout/activity_tutor_tab.xml
@ -5,30 +5,29 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fontFamily="@font/lato_regular"
+    android:id="@+id/activity_tutor_tab"
    tools:context=".activity.TutorTab">

    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
        android:theme="@style/AppTheme.AppBarOverlay">

-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:expandedTitleGravity="top|right"
+            app:toolbarId="@+id/toolbar"
+            />

    </android.support.design.widget.AppBarLayout>

    <include layout="@layout/content_tutor_tab" />

-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_white_list.xml
+++ b/app/src/main/res/layout/activity_white_list.xml
@ -40,7 +40,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_alignParentRight="true"
-                    android:text="Be visible for these users"
+                    android:text="@string/be_visible_for_these_users"
                    android:textSize="15sp"/>

                <Switch
--- a/app/src/main/res/layout/content_black_list.xml
+++ b/app/src/main/res/layout/content_black_list.xml
@ -28,6 +28,21 @@
        android:textColor="@color/msg_no_notes"
        android:textSize="@dimen/msg_no_notes" />

+    <com.github.ybq.android.spinkit.SpinKitView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/loader"
+        style="@style/SpinKitView.Large.Wave"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        app:SpinKit_Color="@color/msg_no_notes"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/margin_top_no_notes"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/loading"
+        android:textColor="@color/msg_no_notes"
+        android:textSize="@dimen/msg_no_notes" />
+
+

 </RelativeLayout>

--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@ -1,186 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mapbox="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:fontFamily="@font/lato_regular"
-        android:paddingLeft="@dimen/activity_margin"
-        android:paddingRight="@dimen/activity_margin"
-        android:paddingTop="@dimen/activity_margin">
-    <LinearLayout android:layout_width="fill_parent"
-        android:id="@+id/linearLayout1" android:layout_height="wrap_content">
+        android:fitsSystemWindows="true"
+        android:id="@+id/activity_tutor_content"
+        tools:context=".activity.TutorTab">


+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="132dp"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">

-        <Button
-            android:id="@+id/scrapTutorTab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1.0"
-            android:text="@string/scrap_tutor_tab" />
-        <ImageButton
-            android:id="@+id/contentTutorTabInfoImageButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            mapbox:srcCompat="@drawable/outline_info_24"/>
-    </LinearLayout>
-        <TextView
-            android:id="@+id/userName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dimen_10"
-            android:fontFamily="sans-serif-medium"
-            android:lineSpacingExtra="8sp"
-            android:textColor="@color/mapboxRedDark"
-            android:textSize="@dimen/lbl_new_note_title"
-            android:textStyle="normal" />
-
-        <LinearLayout
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            >
-            <TextView
-                android:id="@+id/personalInfoTitle"
-                android:textSize="16sp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="0dp"
-                android:paddingBottom="0dp"
-                android:textColor="@color/mapboxRedDark"
-                android:text="@string/personalInfoTitle"/>
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:expandedTitleGravity="top|right"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:toolbarId="@+id/toolbar">
+
            <LinearLayout
                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                >
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7">
+                android:layout_height="match_parent"
+                android:layout_marginBottom="20dp"
+                android:gravity="left|bottom"
+                android:orientation="vertical"
+                android:padding="10dp"
+                app:layout_collapseMode="parallax">

-                    <android.support.design.widget.TextInputEditText
-                        android:id="@+id/userDepartment"
-                        android:maxLines="1"
-                        android:inputType="text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/hint_department"
-                        android:lineSpacingExtra="8sp"
-                        android:paddingTop="5dp"
-                        android:textColor="@color/note_list_text" />
-                </android.support.design.widget.TextInputLayout>
-                <android.support.design.widget.TextInputLayout
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/userName"
+                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:layout_weight="0.3">
+                    android:layout_alignParentRight="true"
+                    android:text="User Name"
+                    android:textSize="22sp" />

-                    <android.support.design.widget.TextInputEditText
-                        android:id="@+id/userRoom"
-                        android:maxLines="1"
-                        android:inputType="text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/hint_room"
-                        android:lineSpacingExtra="8sp"
-                        android:paddingTop="5dp"
-                        android:textColor="@color/note_list_text" />
-                </android.support.design.widget.TextInputLayout>
            </LinearLayout>
-            <android.support.design.widget.TextInputLayout
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/userEmail"
-                    android:maxLines="1"
-                    android:inputType="text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:lineSpacingExtra="8sp"
-                    android:paddingTop="5dp"
-                    android:textColor="@color/note_list_text"
-                    android:hint="@string/hint_email"
-                    />
-            </android.support.design.widget.TextInputLayout>
-        </LinearLayout>
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />

+        </android.support.design.widget.CollapsingToolbarLayout>

-        <TextView
-            android:id="@+id/dutyTitle"
-            android:textSize="16sp"
+    </android.support.design.widget.AppBarLayout>

-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            android:textColor="@color/mapboxRedDark"
-            android:text="@string/dutyTitle"/>
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/dutyHourView"
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:scrollbars="vertical" />
-
-    <LinearLayout android:layout_width="fill_parent"
-        android:id="@+id/linearLayout1" android:layout_height="wrap_content">
-
-
-        <Button
-            android:id="@+id/addDuty"
-            android:layout_width="wrap_content"
-            android:layout_weight="1.0"
-            android:layout_height="wrap_content"
-
-            android:layout_gravity="end"
-            android:text="@string/addDuty" />
-    </LinearLayout>
-
-        <TextView
-            android:textSize="16sp"
-            android:id="@+id/userNoteTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            android:textColor="@color/mapboxRedDark"
-            android:text="@string/userNoteTitle"/>
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <android.support.design.widget.TextInputEditText
-
-                android:id="@+id/userNote"
-                android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:lineSpacingExtra="8sp"
-                android:paddingTop="5dp"
-                android:textColor="@color/note_list_text"
-                android:hint="@string/tutorTabHint"
-                android:inputType="textMultiLine"
-                android:maxLength="1000"
-                android:maxLines="7"
-                android:requiresFadingEdge="vertical"
-                android:scrollbars="vertical"/>
-        </android.support.design.widget.TextInputLayout>
-
-
-        <Button
-            android:id="@+id/saveButon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/saveButton" />
-    </LinearLayout>
-
-</ScrollView>
+    <include layout="@layout/content_tutor_tab_layout" />

+</android.support.design.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/content_tutor_tab_layout.xml
+++ b/app/src/main/res/layout/content_tutor_tab_layout.xml
@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".activity.TutorTab"
+    android:fontFamily="@font/lato_regular"
+    tools:showIn="@layout/content_tutor_tab">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fontFamily="@font/lato_regular"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:context=".activity.TutorTab">
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/userDepartmentLayout"
+            android:layout_width="189dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/userEmailLayout"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="30dp"
+            android:layout_toEndOf="@+id/userRoomLayout">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userDepartment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/userDepartmentLayout"
+                android:layout_alignStart="@+id/userDepartmentLayout"
+                android:layout_alignTop="@+id/userDepartmentLayout"
+                android:hint="@string/hint_department"
+                android:inputType="text"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text" />
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/userRoomLayout"
+            android:layout_width="115dp"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/userEmailLayout"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="10dp">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userRoom"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+
+                android:layout_below="@+id/userRoomLayout"
+                android:layout_alignTop="@+id/userRoomLayout"
+                android:hint="@string/hint_room"
+                android:inputType="text"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text" />
+        </android.support.design.widget.TextInputLayout>
+
+        <TextView
+            android:id="@+id/personalInfoTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@+id/userRoomLayout"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="5dp"
+            android:text="@string/personalInfoTitle"
+            android:textColor="@color/mapboxRedDark"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/userEmailLayout"
+            android:layout_width="326dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="70dp"
+            android:layout_marginEnd="30dp">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userEmail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@+id/userEmailLayout"
+                android:layout_alignTop="@+id/userEmailLayout"
+                android:hint="@string/hint_email"
+                android:inputType="textEmailAddress"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text" />
+        </android.support.design.widget.TextInputLayout>
+
+        <TextView
+            android:id="@+id/dutyTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/userRoomLayout"
+            android:layout_alignStart="@+id/userRoomLayout"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="@string/dutyTitle"
+            android:textColor="@color/mapboxRedDark"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/dutyHourView"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:layout_below="@+id/addDuty"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="50dp"
+            android:scrollbars="vertical" />
+
+        <TextView
+            android:id="@+id/userNoteTitle"
+            android:textStyle="bold"
+            android:layout_marginStart="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/dutyHourView"
+            android:layout_alignStart="@+id/userRoomLayout"
+            android:text="@string/userNoteTitle"
+            android:textColor="@color/mapboxRedDark"
+            android:textSize="18sp" />
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/addDuty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            app:backgroundTint="@color/colorPrimary"
+            android:layout_alignBaseline="@+id/dutyTitle"
+            android:layout_toEndOf="@+id/dutyTitle"
+            android:stateListAnimator="@null"
+
+            android:text="@string/addDuty" />
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/userNoteLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/userNoteTitle"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginTop="15dp"
+            app:counterEnabled="true"
+            app:counterMaxLength="1000">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userNote"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_alignStart="@+id/userNoteLayout"
+                android:hint="@string/tutorTabHint"
+                android:inputType="textMultiLine"
+                android:lineSpacingExtra="8sp"
+                android:maxLength="1000"
+                android:maxLines="7"
+                android:paddingTop="15dp"
+                android:requiresFadingEdge="vertical"
+                android:scrollbars="vertical"
+                android:textColor="@color/note_list_text" />
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/scrapTutorTab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/personalInfoTitle"
+            android:layout_alignEnd="@+id/userEmailLayout"
+            android:textColor="@color/white"
+            app:backgroundTint="@color/colorPrimary"
+            android:stateListAnimator="@null"
+            android:text="@string/scrap_tutor_tab" />
+
+        <android.support.v7.widget.AppCompatButton
+            android:id="@+id/saveButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="-20dp"
+            android:layout_below="@+id/userNoteLayout"
+            android:layout_alignEnd="@+id/dutyHourView"
+            android:textColor="@color/white"
+            app:backgroundTint="@color/colorPrimary"
+            android:stateListAnimator="@null"
+
+            android:text="@string/saveButton" />
+
+    </RelativeLayout>
+</android.support.v4.widget.NestedScrollView>
--- a/app/src/main/res/layout/content_white_list.xml
+++ b/app/src/main/res/layout/content_white_list.xml
@ -28,6 +28,20 @@
        android:textColor="@color/msg_no_notes"
        android:textSize="@dimen/msg_no_notes" />

+    <com.github.ybq.android.spinkit.SpinKitView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/loader"
+        style="@style/SpinKitView.Large.Wave"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        app:SpinKit_Color="@color/msg_no_notes"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/margin_top_no_notes"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/loading"
+        android:textColor="@color/msg_no_notes"
+        android:textSize="@dimen/msg_no_notes" />
+

 </RelativeLayout>

--- a/app/src/main/res/layout/duty_hour_row.xml
+++ b/app/src/main/res/layout/duty_hour_row.xml
@ -33,7 +33,9 @@
            android:inputType="text"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            tools:text="@tools:sample/date/hhmm" />
+            tools:text="@tools:sample/date/hhmm"
+            android:focusableInTouchMode="false"
+            />
    </android.support.design.widget.TextInputLayout>

    <android.support.design.widget.TextInputLayout
@ -48,7 +50,9 @@
            android:inputType="text"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            tools:text="@tools:sample/date/hhmm" />
+            tools:text="@tools:sample/date/hhmm"
+            android:focusableInTouchMode="false"
+            />
    </android.support.design.widget.TextInputLayout>

    <ImageButton
--- a/app/src/main/res/layout/preference_button_widget.xml
+++ b/app/src/main/res/layout/preference_button_widget.xml
@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:gravity="right"
+    android:fontFamily="@font/lato_regular"
    >
-    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <android.support.v7.widget.AppCompatButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/button_choose_from_map"
        android:text="@string/preference_manual_location_button"
        android:layout_width="wrap_content"
+        android:textColor="@color/white"
+        app:backgroundTint="@color/top_user_modal"
        android:layout_height="wrap_content"
+        android:stateListAnimator="@null"
+
        />
+
+
 </LinearLayout>
--- a/app/src/main/res/layout/tutor_list_row.xml
+++ b/app/src/main/res/layout/tutor_list_row.xml
@ -19,11 +19,22 @@
        android:layout_alignParentTop="true"
        android:layout_marginStart="12dp"
        android:layout_marginTop="10dp"
+
        android:textColor="@color/note_list_text"
        android:textSize="15sp" />

+
+    <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/loader"
+        style="@style/SpinKitView.Large.Wave"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="35dp"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        app:SpinKit_Color="@color/colorAccent" />
+
    <TextView
-        android:id="@+id/lastName"
+        android:id="@+id/lastSeen"
        android:layout_width="270dp"
        android:layout_height="22dp"
        android:layout_marginStart="12dp"
@ -32,9 +43,8 @@
        android:layout_marginTop="10dp"
        android:layout_marginEnd="0dp"
        android:layout_alignParentStart="true"
-        android:textColor="@color/note_list_text"
-        android:textSize="15sp" />
-
+        android:textColor="#979797"
+        android:textSize="13sp" />

    <TextView
        android:id="@+id/isOnline"
--- a/app/src/main/res/layout/user_list_modal.xml
+++ b/app/src/main/res/layout/user_list_modal.xml
@ -27,19 +27,20 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent" />

+            <TextView
+                android:id="@+id/userName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="15dp"
+                android:drawablePadding="10dp"
+                android:gravity="center_horizontal"
+                android:text="Name Surname"
+                android:textColor="@color/white"
+                android:textSize="@dimen/lbl_new_note_title"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />

-                <TextView
-                    android:id="@+id/userName"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="15dp"
-                    android:gravity="center_horizontal"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/lbl_new_note_title"
-                    android:textStyle="normal"
-                    android:drawablePadding="10dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"/>
        </android.support.constraint.ConstraintLayout>

    </RelativeLayout>
@ -50,6 +51,28 @@
        android:layout_marginTop="25dp"
        android:orientation="vertical">

+        <LinearLayout
+            android:id="@+id/user_status_label_linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            android:paddingLeft="20dp">
+
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@drawable/user_modal_title" />
+
+            <TextView
+                android:id="@+id/user_status_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingLeft="10dp"
+                android:textColor="@color/mapboxWhite" />
+        </LinearLayout>
+
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@ -59,15 +82,15 @@
            <ImageView
                android:layout_width="25dp"
                android:layout_height="25dp"
-            android:src="@drawable/user_modal_department"/>
+                android:src="@drawable/user_modal_department" />
+
            <TextView
                android:id="@+id/userDepartment"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
-                android:textColor="@color/mapboxWhite"
                android:paddingLeft="10dp"
-               />
+                android:textColor="@color/mapboxWhite" />
        </LinearLayout>

        <LinearLayout
@ -80,15 +103,15 @@
            <ImageView
                android:layout_width="25dp"
                android:layout_height="25dp"
-            android:src="@drawable/user_modal_room"/>
+                android:src="@drawable/user_modal_room" />
+
            <TextView
                android:id="@+id/userRoom"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
-                android:textColor="@color/mapboxWhite"
                android:paddingLeft="10dp"
-               />
+                android:textColor="@color/mapboxWhite" />
        </LinearLayout>

        <LinearLayout
@ -101,15 +124,15 @@
            <ImageView
                android:layout_width="25dp"
                android:layout_height="25dp"
-                android:src="@drawable/user_modal_email"/>
+                android:src="@drawable/user_modal_email" />
+
            <TextView
                android:id="@+id/userEmail"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
-                android:textColor="@color/mapboxWhite"
                android:paddingLeft="10dp"
-               />
+                android:textColor="@color/mapboxWhite" />
        </LinearLayout>


@ -123,15 +146,14 @@
            <ImageView
                android:layout_width="25dp"
                android:layout_height="25dp"
-                android:src="@drawable/user_modal_duty"/>
+                android:src="@drawable/user_modal_duty" />

            <TextView
                android:id="@+id/userDutyHoursTitle"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:textColor="@color/mapboxWhite"
                android:paddingLeft="10dp"
-               />
+                android:textColor="@color/mapboxWhite" />
        </LinearLayout>

        <LinearLayout
@ -151,34 +173,33 @@
                android:id="@+id/userDutyHours"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:paddingLeft="25dp"
-                android:paddingTop="-10dp"
                android:divider="@color/background_user_modal"
                android:dividerHeight="1dp"
-                android:textColor="@color/mapboxWhite"
-               />
+                android:paddingLeft="25dp"
+                android:paddingTop="-10dp"
+                android:textColor="@color/mapboxWhite" />
        </LinearLayout>

        <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal"
-        android:paddingLeft="20dp">
-
-        <ImageView
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:src="@drawable/user_modal_note"/>
-        <TextView
-            android:id="@+id/userNote"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/mapboxWhite"
-            android:paddingLeft="10dp"
-            />
-    </LinearLayout>
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal"
+            android:paddingLeft="20dp">
+
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:src="@drawable/user_modal_note" />
+
+            <TextView
+                android:id="@+id/userNote"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingLeft="10dp"
+                android:textColor="@color/mapboxWhite" />
+        </LinearLayout>


    </LinearLayout>
--- a/app/src/main/res/layout/users_list_main.xml
+++ b/app/src/main/res/layout/users_list_main.xml
@ -27,5 +27,20 @@
        android:textSize="@dimen/msg_no_notes" />


+    <com.github.ybq.android.spinkit.SpinKitView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/loader"
+        style="@style/SpinKitView.Large.Wave"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        app:SpinKit_Color="@color/msg_no_notes"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/margin_top_no_notes"
+        android:fontFamily="sans-serif-light"
+        android:text="@string/loading"
+        android:textColor="@color/msg_no_notes"
+        android:textSize="@dimen/msg_no_notes" />
+
+
 </RelativeLayout>

--- a/app/src/main/res/menu/menu_profile.xml
+++ b/app/src/main/res/menu/menu_profile.xml
@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.uam.wmi.findmytutor.activity.TutorTab">
+    <item
+        android:id="@+id/action_profile_info_popup"
+        android:orderInCategory="100"
+        android:title="Popup info icon"
+        android:icon="@drawable/outline_info_24"
+        app:showAsAction="ifRoom" />
+</menu>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -57,7 +57,7 @@
    <string name="navigation_item_blacklist">Czarna lista</string>
    <string name="navigation_item_whitelist">Biała lista</string>
    <string name="navigation_item_settings">Ustawienia</string>
-    <string name="navigation_item_profile">Profil uzytkownika</string>
+    <string name="navigation_item_profile">Profil użytkownika</string>
    <string name="navigation_item_logout">Wyloguj</string>
    <!-- Tutors list -->
    <string name="action_settings">Ustawienia</string>
@ -276,6 +276,23 @@
    <!--(ENG) Blacked/Whited users  -->
    <string name="add_user_to_list">Użytkownik został dodany!</string>
    <string name="user_removed">Użytkownik usunięty!</string>
+    <string name="floor">Piętro</string>
+    <string name="block_the_users">Zablokuj użytkowników</string>
+    <string name="be_visible_for_these_users">Bądź dostępny dla użytkowników</string>
+
+    <string name="manual_mode">manualny</string>
+    <string name="exact_mode">dokładny</string>
+    <string name="approx_mode">przybliżony</string>
+    <string name="other_location">Niezapisana lokalizacja.</string>
+    <string name="last_sign">Ostatnio</string>
+
+    <string name="available_now">Dostępny teraz</string>
+    <string name="profile_activity_title">Profil użytkownika</string>
+    <string name="batter_exclusions_title">Uwaga</string>
+    <string name="batter_exclusions_message">Aby aplikacja była w pełni funkcjonalna, dodaj FMT do wyjątków w oszczędzaniu baterii. Po wciśnięciu przycisku \"ok\" zostaniesz przeniesiony do opcji zarządzania baterią. W panelu \"Bateria\" upewnij się, że opcja optymalizacji jest wyłączona.</string>
+
+    <string name="never_logged_in">Nigdy</string>
+

 </resources>

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -126,7 +126,6 @@
    <string name="title_activity_settings2">Settings</string>
    <string name="modal_location_send">SEND</string>
    <string name="modal_location_hint">Please name choosen location.</string>
-    modal_feedback_send
    <!-- Strings related to Settings -->

    <!-- Example General settings -->
@ -223,9 +222,9 @@
    <string name="nav_profile">User profile</string>
    <string name="remove_manual_location">Remove Manual location</string>
    <string name="title_activity_tutor_tab">TutorTab</string>
-    <string name="manual_modal_title">Do you want to save this localization?</string>
-    <string name="lbl_ok">Save!</string>
-    <string name="lbl_cancel">Cancel!</string>
+    <string name="manual_modal_title">Manual localization</string>
+    <string name="lbl_ok">Save</string>
+    <string name="lbl_cancel">Cancel</string>
    <string name="manual_marker_info">Your marker will disappear in next couple minutes</string>
    <string name="manual_location_selected">Manual Locations selected!</string>
    <string name="location_saved">Location saved!</string>
@ -301,7 +300,7 @@

    <string name="info_icon_userlist_summary">After clicking on a name, the tutor tab will pop up, containing details about selected tutor.\n\nYou can search for any tutor on the map by entering his name and surname in the search field.\n\nBy default, only active users are shown. You can change that in menu (three dots icon).\n\nYou can also search for a tutor directly, by entering name and surname of person that you look for.</string>

-    <!--(ENG) Blacklist -->    
+    <!--(ENG) Blacklist -->
    <string name="index_user">User index</string>
    <string name="black_list_title">Add user to blacklist</string>
    <string name="add">Add</string>
@ -310,6 +309,7 @@
    <string name="pref_title_acra" translatable="false">App issues reporting</string>

    <!--(ENG) Profile Activity strings-->
+    <string name="profile_activity_title">Profile</string>
    <string name="hint_duty_day">Day</string>
    <string name="hint_duty_start">Start</string>
    <string name="hint_duty_end">End</string>
@ -331,18 +331,18 @@
    <string name="activity_title_home">Map</string>
    <string name="on">ON</string>
    <string name="off">OFF</string>
-    <string name="scrap_tutor_tab">Scrap!</string>
+    <string name="scrap_tutor_tab">Scrap from WMI</string>
    <string name="scrap_tutor_msg">Data updated!</string>

    <!--(ENG) Checkbox online users list -->
    <string name="no_online_users">Currently, there are no\nactive users.</string>
    <string name="no_offline_users">Currently, there are no\noffline users.</string>
-    <string name="only_online_users">Only online users</string>
+    <string name="only_online_users">Only active users</string>
    <string name="no_such_a_user">No such a user</string>

    <string name="network_err">Network Error !</string>
    <string name="search_null">Search response is empty!</string>
-    <string name="modal_manual_hint">Insert a name for this localization.</string>
+    <string name="modal_manual_hint">Name the localization</string>
    <string name="online">Online</string>
    <string name="offline">Offline</string>
    <string name="inactive">Inactive</string>
@ -351,5 +351,112 @@
    <!--(ENG) Blacked/Whited users  -->
    <string name="add_user_to_list">User has been added!</string>
    <string name="user_removed">User removed!</string>
+    <string name="floor">Floor</string>
+    <string name="block_the_users">Block the users</string>
+    <string name="be_visible_for_these_users">Be visible for these users</string>
+    <string name="title_activity_scrolling">ScrollingActivity</string>
+    <string name="large_text">
+        "Material is the metaphor.\n\n"

+        "A material metaphor is the unifying theory of a rationalized space and a system of motion."
+        "The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
+        "technologically advanced and open to imagination and magic.\n"
+        "Surfaces and edges of the material provide visual cues that are grounded in reality. The "
+        "use of familiar tactile attributes helps users quickly understand affordances. Yet the "
+        "flexibility of the material creates new affordances that supercede those in the physical "
+        "world, without breaking the rules of physics.\n"
+        "The fundamentals of light, surface, and movement are key to conveying how objects move, "
+        "interact, and exist in space and in relation to each other. Realistic lighting shows "
+        "seams, divides space, and indicates moving parts.\n\n"
+
+        "Bold, graphic, intentional.\n\n"
+
+        "The foundational elements of print based design typography, grids, space, scale, color, "
+        "and use of imagery guide visual treatments. These elements do far more than please the "
+        "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
+        "imagery, large scale typography, and intentional white space create a bold and graphic "
+        "interface that immerse the user in the experience.\n"
+        "An emphasis on user actions makes core functionality immediately apparent and provides "
+        "waypoints for the user.\n\n"
+
+        "Motion provides meaning.\n\n"
+
+        "Motion respects and reinforces the user as the prime mover. Primary user actions are "
+        "inflection points that initiate motion, transforming the whole design.\n"
+        "All action takes place in a single environment. Objects are presented to the user without "
+        "breaking the continuity of experience even as they transform and reorganize.\n"
+        "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
+        "Feedback is subtle yet clear. Transitions are efﬁcient yet coherent.\n\n"
+
+        "3D world.\n\n"
+
+        "The material environment is a 3D space, which means all objects have x, y, and z "
+        "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
+        "positive z-axis extending towards the viewer. Every sheet of material occupies a single "
+        "position along the z-axis and has a standard 1dp thickness.\n"
+        "On the web, the z-axis is used for layering and not for perspective. The 3D world is "
+        "emulated by manipulating the y-axis.\n\n"
+
+        "Light and shadow.\n\n"
+
+        "Within the material environment, virtual lights illuminate the scene. Key lights create "
+        "directional shadows, while ambient light creates soft shadows from all angles.\n"
+        "Shadows in the material environment are cast by these two light sources. In Android "
+        "development, shadows occur when light sources are blocked by sheets of material at "
+        "various positions along the z-axis. On the web, shadows are depicted by manipulating the "
+        "y-axis only. The following example shows the card with a height of 6dp.\n\n"
+
+        "Resting elevation.\n\n"
+
+        "All material objects, regardless of size, have a resting elevation, or default elevation "
+        "that does not change. If an object changes elevation, it should return to its resting "
+        "elevation as soon as possible.\n\n"
+
+        "Component elevations.\n\n"
+
+        "The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
+        "does not vary from 6dp in one app to 16dp in another app).\n"
+        "Components may have different resting elevations across platforms, depending on the depth "
+        "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"
+
+        "Responsive elevation and dynamic elevation offsets.\n\n"
+
+        "Some component types have responsive elevation, meaning they change elevation in response "
+        "to user input (e.g., normal, focused, and pressed) or system events. These elevation "
+        "changes are consistently implemented using dynamic elevation offsets.\n"
+        "Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
+        "to the component’s resting state. They ensure that elevation changes are consistent "
+        "across actions and component types. For example, all components that lift on press have "
+        "the same elevation change relative to their resting elevation.\n"
+        "Once the input event is completed or cancelled, the component will return to its resting "
+        "elevation.\n\n"
+
+        "Avoiding elevation interference.\n\n"
+
+        "Components with responsive elevations may encounter other components as they move between "
+        "their resting elevations and dynamic elevation offsets. Because material cannot pass "
+        "through other material, components avoid interfering with one another any number of ways, "
+        "whether on a per component basis or using the entire app layout.\n"
+        "On a component level, components can move or be removed before they cause interference. "
+        "For example, a floating action button (FAB) can disappear or move off screen before a "
+        "user picks up a card, or it can move if a snackbar appears.\n"
+        "On the layout level, design your app layout to minimize opportunities for interference. "
+        "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
+        "when a user tries to pick up one of cards.\n\n"
+    </string>
+
+
+    <!--(ENG) Sharing Modes  -->
+    <string name="manual_mode">manual</string>
+    <string name="exact_mode">exact</string>
+    <string name="approx_mode">approximate</string>
+
+    <!--(ENG) Undefined manual  -->
+    <string name="other_location">Not saved location.</string>
+    <string name="user_status_label" translatable="false">Status</string>
+    <string name="available_now">Available now</string>
+    <string name="last_sign">Last seen</string>
+    <string name="batter_exclusions_message">To make app fully functional add FMT to battery saving exclusions. You can change battery options in \"Optimise battery usage\". Unfortunately, you have to do it manually. Click \"ok\" to open battery settings and make sure that the application is not optimised.</string>
+    <string name="batter_exclusions_title">Please note</string>
+    <string name="never_logged_in">Never</string>
 </resources>
--- a/app/src/main/res/xml/pref_sharing.xml
+++ b/app/src/main/res/xml/pref_sharing.xml
@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/pref_screen"
-    android:fontFamily="@font/lato_regular"
-    android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fontFamily="@font/lato_regular">

    <PreferenceCategory
-        android:title="@string/settings_category_location"
-        android:key="category_sharing">
+        android:key="category_sharing"
+        android:title="@string/settings_category_location">
        <SwitchPreference
            android:defaultValue="false"
            android:disableDependentsState="false"
            android:key="key_sharing_enabled"
            android:persistent="true"
-            android:title="@string/title_sharing"/>
+            android:title="@string/title_sharing" />
        <ListPreference
            android:defaultValue="2"
            android:dialogTitle="@string/settings_location_level"
@ -25,45 +25,43 @@
            android:title="@string/title_location_level" />
        <ListPreference
            android:defaultValue="0"
-            android:key="key_manual_location_value"
-            android:summary="%s"
            android:entries="@array/manual_location_entries"
            android:entryValues="@array/manual_location_values"
+            android:key="key_manual_location_value"
+            android:summary="%s"
            android:title="@string/title_list_manual_location" />
        <com.uam.wmi.findmytutor.utils.RightButtonPreference
            android:key="manual_location_button"
-            android:text="@string/preference_manual_location_button"
-            />
+            android:text="@string/preference_manual_location_button" />
        <com.uam.wmi.findmytutor.utils.RightButtonPreference
-        android:key="remove_manual_location"
-            android:text="@string/preference_manual_location_button_remove"
-            />
+            android:key="remove_manual_location"
+            android:text="@string/preference_manual_location_button_remove" />
    </PreferenceCategory>

    <PreferenceCategory android:title="@string/settings_category_status">
-    <SwitchPreference
+        <SwitchPreference
            android:defaultValue="false"
            android:disableDependentsState="false"
            android:key="key_status_enabled"
            android:persistent="true"
-            android:title="@string/status_switch_title"/>
+            android:title="@string/status_switch_title" />
        <ListPreference
            android:defaultValue="0"
-            android:key="@string/key_status_value"
-            android:summary="%s"
            android:entries="@array/status_entries"
            android:entryValues="@array/status_values"
+            android:key="@string/key_status_value"
+            android:summary="%s"
            android:title="@string/status_list_title" />
        <EditTextPreference
            android:key="key_manual_status"
            android:selectAllOnFocus="true"
            android:singleLine="true"
-            android:title="@string/title_manual_status"
-            />
+            android:title="@string/title_manual_status" />
        <com.uam.wmi.findmytutor.utils.RightButtonPreference
            android:key="remove_manual_status"
-            android:text="@string/preference_manual_status_button_remove"
-            />
+            android:textColor="@color/white"
+            app:backgroundTint="@color/mapboxRedDark"
+            android:text="@string/preference_manual_status_button_remove" />

    </PreferenceCategory>
 </PreferenceScreen>
--- a/build.gradle
+++ b/build.gradle
@ -8,7 +8,6 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.1'
-        

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
Author	SHA1	Message	Date
Mieszko Wrzeszczyński	faed9e05b7	Merge branch 'develop' of s416084/find-my-tutor-android into master	2019-01-13 15:09:06 +00:00
Mieszko Wrzeszczyński	1095386659	Merge branch 'fix-battery-prompt-5.1' of s416084/find-my-tutor-android into develop	2019-01-13 15:08:19 +00:00
Mieszko Wrzeszczyński	b7e1e4a984	Fix 5.1	2019-01-13 16:06:58 +01:00
Mieszko Wrzeszczyński	4473834218	Merge branch 'develop' of s416084/find-my-tutor-android into master	2019-01-13 13:39:56 +00:00
Mieszko Wrzeszczyński	5a96d93d37	Merge branch 'fix-info-battery-prompt' of s416084/find-my-tutor-android into develop	2019-01-13 13:38:16 +00:00
Mieszko Wrzeszczyński	33cfa90a28	Update gradle	2019-01-13 14:37:15 +01:00
Mieszko Wrzeszczyński	6fa458d198	show prompt only for tutors	2019-01-13 14:36:51 +01:00
Mieszko Wrzeszczyński	2ca95e0ba0	Merge branch 'develop' of s416084/find-my-tutor-android into master	2019-01-13 13:14:13 +00:00
Mieszko Wrzeszczyński	eb30100183	Merge branch 'presence-wifi-approach' of s416084/find-my-tutor-android into develop	2019-01-13 13:11:38 +00:00
Mieszko Wrzeszczyński	e1c266263a	Fix low battery mode	2019-01-13 14:10:50 +01:00
Mieszko Wrzeszczyński	d88525a764	Add presence which works with Wifi	2019-01-13 13:44:10 +01:00
Mieszko Wrzeszczyński	430914bab1	Merge branch 'fix-acra' of s416084/find-my-tutor-android into develop	2019-01-13 10:34:55 +00:00
Mieszko Wrzeszczyński	786a73c963	Fix acra	2019-01-13 11:31:36 +01:00
Mieszko Wrzeszczyński	1f2867cb43	Merge branch 'develop' into fix-acra	2019-01-13 02:09:31 +01:00
Mieszko Wrzeszczyński	5770217c45	Merge branch 'fix-battery-prompt' of s416084/find-my-tutor-android into develop	2019-01-12 20:16:40 +00:00
Mieszko Wrzeszczyński	17b7f4c9a2	fix	2019-01-12 21:15:37 +01:00
Mieszko Wrzeszczyński	f46d9cc60e	Merge branch 'add-beta-student-security' of s416084/find-my-tutor-android into develop	2019-01-12 19:23:39 +00:00
Mieszko Wrzeszczyński	325f8a99a2	master version	2019-01-12 20:23:03 +01:00
Mieszko Wrzeszczyński	0ec0e95798	Add logout security	2019-01-12 20:22:30 +01:00
Mieszko Wrzeszczyński	085dc1e4d6	Merge branch 'fix-login-form' of s416084/find-my-tutor-android into develop	2019-01-12 18:37:55 +00:00
Mieszko Wrzeszczyński	9f78eaf688	Fix login form	2019-01-12 19:37:25 +01:00
Mieszko Wrzeszczyński	b528ec68bb	Merge branch 'batteryExclusion' of s416084/find-my-tutor-android into develop	2019-01-12 18:27:16 +00:00
Mieszko Wrzeszczyński	7b79a5339a	merge develop	2019-01-12 19:26:49 +01:00
Mieszko Wrzeszczyński	6e98eeff16	Merge branch 'fix-last-seen' of s416084/find-my-tutor-android into develop	2019-01-12 18:24:01 +00:00
Mieszko Wrzeszczyński	5fccb72843	fix statuses	2019-01-12 19:15:40 +01:00
Mieszko Wrzeszczyński	377ee3bcbc	Change to one get	2019-01-12 18:46:52 +01:00
Mieszko Wrzeszczyński	282f74f5e0	Remove shadow from buttons	2019-01-12 16:42:51 +01:00
Mieszko Wrzeszczyński	b126cbfe31	Fix tutors list	2019-01-12 16:38:28 +01:00
Domagalski	fae7a5f0fe	pop up with battery exc + transaltions	2019-01-12 14:56:54 +01:00
Mieszko Wrzeszczyński	e64f5d380c	Commit to check out on production	2019-01-11 00:34:27 +01:00
Mieszko Wrzeszczyński	2f25f06d18	On Attach fix	2019-01-11 00:34:04 +01:00
Mieszko Wrzeszczyński	a27c18b468	Merge branch 'fix-acra' of s416084/find-my-tutor-android into develop	2019-01-10 23:26:18 +00:00
Mieszko Wrzeszczyński	311cd7868b	Fix acra	2019-01-11 00:25:43 +01:00
Mieszko Wrzeszczyński	be58fba3ad	Merge branch 'fix-back-button' of s416084/find-my-tutor-android into develop	2019-01-10 23:00:32 +00:00
Mieszko Wrzeszczyński	2f93dc5d54	Update gradle	2019-01-10 23:59:35 +01:00
Mieszko Wrzeszczyński	c8cdc3aac0	fix return button	2019-01-10 23:58:33 +01:00
Mieszko Wrzeszczyński	f872b08acc	Merge branch 'users-list-last-seen' of s416084/find-my-tutor-android into develop	2019-01-10 22:41:47 +00:00
Mieszko Wrzeszczyński	97bb141a81	Update gradle	2019-01-10 23:40:40 +01:00
Mieszko Wrzeszczyński	a98b188978	Merge branch 'develop' into users-list-last-seen	2019-01-10 23:39:02 +01:00
Mieszko Wrzeszczyński	20f585509c	Fix tutor tab fixes	2019-01-10 23:36:44 +01:00
Mieszko Wrzeszczyński	ad83c5ed88	Change loaders	2019-01-10 23:32:45 +01:00
Mieszko Wrzeszczyński	623957bcb2	Fix tutor tab	2019-01-10 21:31:31 +01:00
Mieszko Wrzeszczyński	ec68ae14ef	Fix resources	2019-01-10 00:51:14 +01:00
Mieszko Wrzeszczyński	393f25b1f9	Merge branch 'userListEnchancment' of s416084/find-my-tutor-android into develop	2019-01-09 23:41:41 +00:00
Mieszko Wrzeszczyński	3379faf59b	Update gradle version	2019-01-10 00:40:00 +01:00
Mieszko Wrzeszczyński	1f888ad1f2	Merge branch 'develop' into userListEnchancment	2019-01-10 00:39:29 +01:00
Mieszko Wrzeszczyński	ebe2266036	Merge branch 'fix-offline-box' of s416084/find-my-tutor-android into develop	2019-01-09 23:35:24 +00:00
Mieszko Wrzeszczyński	f36a811d03	Merge branch 'develop' into fix-offline-box	2019-01-10 00:33:38 +01:00
Mieszko Wrzeszczyński	ffff380560	Fix gps box	2019-01-10 00:33:10 +01:00
Domagalski	6d73598d5e	code clean up and string translations for last seen	2019-01-10 00:11:37 +01:00
Domagalski	f98e4289fb	last seen working just fine	2019-01-09 23:44:05 +01:00
Mieszko Wrzeszczyński	d583c807d5	Merge branch 'add-toggle-password-login' of s416084/find-my-tutor-android into develop	2019-01-09 21:52:01 +00:00
Mieszko Wrzeszczyński	86b6a1a86f	Add toggle password	2019-01-09 22:50:51 +01:00
Domagalski	4300c33d65	show on map modal fix, Status added	2019-01-09 21:20:48 +01:00
Mieszko Wrzeszczyński	b7b284252b	Merge branch 'fix-trans' of s416084/find-my-tutor-android into develop	2019-01-08 22:42:12 +00:00
Mieszko Wrzeszczyński	5dcaca9dd2	Fix strings	2019-01-08 23:41:30 +01:00
Mieszko Wrzeszczyński	c55578c8ae	Fix typo	2019-01-08 23:31:07 +01:00
Adam Domagalski	59cb517ac7	Merge branch 'bottomNavHighlighytAndBlackListStringsFix' of s416084/find-my-tutor-android into develop	2019-01-08 22:10:48 +00:00
Domagalski	ae3c355259	Merge branch 'develop' into bottomNavHighlighytAndBlackListStringsFix	2019-01-08 23:08:08 +01:00
Domagalski	022669c6ee	rdy2m	2019-01-08 22:59:15 +01:00
Mieszko Wrzeszczyński	9c03d84b0a	Merge branch 'fix-strings' of s416084/find-my-tutor-android into develop	2019-01-08 21:56:18 +00:00
Mieszko Wrzeszczyński	b978ee560c	Fix strings	2019-01-08 22:55:40 +01:00
Mieszko Wrzeszczyński	c188ce38a8	Merge branch 'change-user-list' of s416084/find-my-tutor-android into develop	2019-01-08 21:29:40 +00:00
Mieszko Wrzeszczyński	f02afb5e56	Fix map search	2019-01-08 22:28:19 +01:00
Mieszko Wrzeszczyński	59c28e35d8	Merge branch 'fix-bg' of s416084/find-my-tutor-android into develop	2019-01-07 09:22:27 +00:00
Mieszko Wrzeszczyński	76d008e098	Update version	2019-01-07 10:20:33 +01:00
Mieszko Wrzeszczyński	d87a08a9e8	Merge branch 'fix-bg' of s416084/find-my-tutor-android into develop	2019-01-07 08:56:35 +00:00
Mieszko Wrzeszczyński	a98ec8de47	Update version	2019-01-07 09:53:29 +01:00
Mieszko Wrzeszczyński	d0b714731b	Add battery saver	2019-01-07 09:46:14 +01:00
Mieszko Wrzeszczyński	aaca6c008e	Merge branch 'fix-manual-without-pref' of s416084/find-my-tutor-android into develop	2019-01-06 23:16:25 +00:00
Mieszko Wrzeszczyński	413fc7d49a	Update version	2019-01-07 00:15:59 +01:00
Mieszko Wrzeszczyński	cf016bc6f4	Merge branch 'fix-manual-without-pref' of s416084/find-my-tutor-android into develop	2019-01-06 23:06:13 +00:00
Mieszko Wrzeszczyński	d78ae83877	Fix scenario when user doesn't have prefs	2019-01-07 00:05:37 +01:00
Mieszko Wrzeszczyński	6bd109e1cc	Merge branch 'beta-release' of s416084/find-my-tutor-android into develop	2019-01-06 22:51:36 +00:00
Mieszko Wrzeszczyński	1ba6cdf6f0	Update gradle	2019-01-06 23:50:38 +01:00
Mieszko Wrzeszczyński	7a41dcbb1f	Merge branch 'fix-manula-bg' of s416084/find-my-tutor-android into develop	2019-01-06 22:46:12 +00:00
Mieszko Wrzeszczyński	4bb9452cbc	Fix blacklists	2019-01-06 23:45:47 +01:00
Marcin Jedyński	701ee6e9d5	Merge branch 'profileUIfix' of s416084/find-my-tutor-android into develop	2019-01-06 22:41:42 +00:00
marcin.jedynski	8da6ca8c0d	fixed padding	2019-01-06 23:40:28 +01:00
Marcin Jedyński	654bcb3653	Merge branch 'sharingTabFixes' of s416084/find-my-tutor-android into develop	2019-01-06 21:56:44 +00:00
marcin.jedynski	3e7e77a430	revered sharing tab UI disabling to wait for api response, minor fix	2019-01-06 22:55:36 +01:00
marcin.jedynski	2d93b23197	revered sharing tab UI disabling to wait for api response	2019-01-06 22:54:01 +01:00
Mieszko Wrzeszczyński	66fa45baa0	Fix BG handle	2019-01-06 22:47:03 +01:00
Marcin Jedyński	065fff7867	Merge branch 'newProfile' of s416084/find-my-tutor-android into develop	2019-01-06 20:14:51 +00:00
marcin.jedynski	51dcefcc62	Merge branch 'develop' into newProfile	2019-01-06 20:56:57 +01:00
marcin.jedynski	489901dca1	added timepicker, email validation, new UI	2019-01-06 20:56:01 +01:00
Mieszko Wrzeszczyński	a4c0881300	Merge branch 'develop' of s416084/find-my-tutor-android into master	2019-01-06 18:03:06 +00:00
Mieszko Wrzeszczyński	8ab7e526e6	Merge branch 'fix-pref-sharing' of s416084/find-my-tutor-android into develop	2019-01-06 17:58:56 +00:00
Mieszko Wrzeszczyński	bca6885591	Fix right button preferences	2019-01-06 18:52:14 +01:00
Adam Domagalski	e2f15ea772	Merge branch 'bottomNavFix' of s416084/find-my-tutor-android into develop	2019-01-06 14:39:21 +00:00
Mieszko Wrzeszczyński	7e043c9826	Merge branch 'develop' of s416084/find-my-tutor-android into master	2019-01-06 11:02:30 +00:00