Add GA

2019-01-11 22:53:54 +01:00
26 changed files with 256 additions and 478 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,7 +10,7 @@ android {
        applicationId "com.uam.wmi.findmytutor"
        minSdkVersion 22
        targetSdkVersion 27
-        versionCode 66
+        versionCode 58
        versionName "1.0.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@ -72,9 +72,8 @@ dependencies {
    implementation 'com.getbase:floatingactionbutton:1.10.1'
    implementation 'org.apache.commons:commons-collections4:4.0'
    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'
+    implementation 'com.google.android.gms:play-services-analytics:16.0.6'
+    implementation 'com.google.firebase:firebase-core:16.0.6'
 }
+apply plugin: 'com.google.gms.google-services'
--- a/app/src/main/java/com/uam/wmi/findmytutor/FindMyTutor.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/FindMyTutor.java
@ -6,9 +6,8 @@ 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;
@ -17,32 +16,30 @@ 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;
-
+import com.google.android.gms.analytics.GoogleAnalytics;
+import com.google.android.gms.analytics.Tracker;

@AcraNotification(resText = R.string.notification_text,
        resTitle = R.string.notification_title,
        resChannelName = R.string.notification_channel)
@AcraLimiter(failedReportLimit = 2)
 public class FindMyTutor extends Application {
+    private static GoogleAnalytics sAnalytics;
+    private static Tracker sTracker;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        sAnalytics = GoogleAnalytics.getInstance(this);
+    }

    @Override
    protected void attachBaseContext(Context base) {
        super.attachBaseContext(base);
-        //super.attachBaseContext(LocaleHelper.onAttach(base));

        // ACRA core
        CoreConfigurationBuilder builder = new CoreConfigurationBuilder(this)
@ -58,7 +55,6 @@ 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");
@ -92,4 +88,17 @@ public class FindMyTutor extends Application {
    public void onLowMemory() {
        super.onLowMemory();
    }
+    /**
+     * Gets the default {@link Tracker} for this {@link Application}.
+     * @return tracker
+     */
+    synchronized public Tracker getDefaultTracker() {
+        // To enable debug logging use: adb shell setprop log.tag.GAv4 DEBUG
+        if (sTracker == null) {
+            sTracker = sAnalytics.newTracker(R.xml.global_tracker);
+        }
+
+        return sTracker;
+    }
+
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@ -32,13 +32,14 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.Toast;

+import com.google.android.gms.analytics.Tracker;
+import com.uam.wmi.findmytutor.FindMyTutor;
 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;

@ -100,6 +101,10 @@ public abstract class BaseActivity
        super.onCreate(savedInstanceState);
        setContentView(getContentViewId());

+        //Google Analytics
+        FindMyTutor application = (FindMyTutor) getApplication();
+        Tracker mTracker = application.getDefaultTracker();
+
        drawerNavigationView = findViewById(R.id.nav_view);
        sideDrawer = findViewById(R.id.activity_container);
        feedbackUtils = new FeedbackUtils(BaseActivity.this);
@ -127,9 +132,17 @@ 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");

@ -158,21 +171,6 @@ 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>();

@ -427,7 +425,7 @@ public abstract class BaseActivity
        sharingFragment = SharingFragment.newInstance();
        FragmentTransaction ft = getFragmentManager().beginTransaction();
        ft.replace(R.id.activity_content, sharingFragment);
-        //ft.addToBackStack(null);
+        ft.addToBackStack(null);
        ft.commit();
    }

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

    }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
@ -33,9 +33,11 @@ import android.widget.Toast;
 import android.widget.ToggleButton;

 import com.github.ybq.android.spinkit.SpinKitView;
+import com.google.android.gms.analytics.Tracker;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.uam.wmi.findmytutor.FindMyTutor;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.adapters.BlackListAdapter;
 import com.uam.wmi.findmytutor.model.IsUsingListBool;
@ -68,7 +70,6 @@ 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;
@ -110,6 +111,9 @@ public class BlackList extends AppCompatActivity {
        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
        setContentView(R.layout.activity_black_list);
        ButterKnife.bind(this);
+        //Google Analytics
+        FindMyTutor application = (FindMyTutor) getApplication();
+        Tracker mTracker = application.getDefaultTracker();

        tutorId = PrefUtils.getUserId(getApplicationContext());
        userService = ApiClient.getClient(getApplicationContext())
@ -154,6 +158,7 @@ public class BlackList extends AppCompatActivity {
        }));

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

@ -173,29 +178,34 @@ public class BlackList extends AppCompatActivity {
    }

    private void fetchBlackListedUsers() {
-        disposable.add(getListOfBlacklistedUsers(tutorId)
-                .doOnSubscribe(this::handleDoOnSubscribe)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .flatMap(Observable::fromIterable)
-                .flatMap(this::getUserObservable)
-                .subscribe(user ->  blacklistedUsers.add(user), this::handleError,this::handleComplete));
-    }
-
-    private void handleDoOnSubscribe(Disposable disposable) {
        prevSize = blacklistedUsers.size();
        blacklistedUsers.clear();
+
+        disposable.add(getListOfBlacklistedUsers(tutorId)
+                .doOnSubscribe(t -> didFetched = false)
+                .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);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        showError(e);
                        didFetched = false;
                    }

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

    private void refreshUI(){
@ -257,8 +267,10 @@ 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();
    }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/LoginActivity.java
@ -3,6 +3,7 @@ package com.uam.wmi.findmytutor.activity;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@ -18,7 +19,9 @@ import android.widget.EditText;

 import com.auth0.android.jwt.Claim;
 import com.auth0.android.jwt.JWT;
+import com.google.android.gms.analytics.Tracker;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
+import com.uam.wmi.findmytutor.FindMyTutor;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.JwtToken;
 import com.uam.wmi.findmytutor.model.LdapUser;
@ -27,7 +30,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.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;

@ -40,7 +43,8 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;

-public class LoginActivity extends AppCompatActivity {
+public class
+LoginActivity extends AppCompatActivity {

    private AutoCompleteTextView mLoginNameView;
    private EditText mPasswordView;
@ -50,10 +54,18 @@ public class LoginActivity extends AppCompatActivity {
    private UserService userService;
    private CompositeDisposable disposable = new CompositeDisposable();

+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_login);
+        //Google Analytics
+        FindMyTutor application = (FindMyTutor) getApplication();
+        Tracker mTracker = application.getDefaultTracker();
        mLoginNameView = findViewById(R.id.email);

        ldapService = ApiClient.getClient(getApplicationContext())
@ -191,7 +203,6 @@ 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
@ -8,7 +8,6 @@ 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;
@ -127,7 +126,6 @@ public class MapActivity extends BaseActivity
        mStatusChecker = () -> {
            try {
                if (shouldFetchNewCoords) {
-                    checkIfUsesCanBeTutor();
                    fetchTopCoords();
                }
            } finally {
@ -136,6 +134,7 @@ public class MapActivity extends BaseActivity

        };

+
        selectLocationButton = findViewById(R.id.select_location_button);
        removeLocationButton = findViewById(R.id.remove_location_button);
        mapView = findViewById(R.id.mapView);
@ -146,11 +145,6 @@ 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
@ -409,30 +403,6 @@ Log.e("LOCALE",PrefUtils.getLocale(getApplicationContext()));
        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(
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
@ -15,6 +15,8 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.MenuItem;

+import com.google.android.gms.analytics.Tracker;
+import com.uam.wmi.findmytutor.FindMyTutor;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.utils.LocaleHelper;
 import com.uam.wmi.findmytutor.utils.LocaleUtils;
@ -33,7 +35,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-
+        //Google Analytics
+        FindMyTutor application = (FindMyTutor) getApplication();
+        Tracker mTracker = application.getDefaultTracker();
        getFragmentManager().beginTransaction().replace(android.R.id.content, new MainPreferenceFragment()).commit();
    }

--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
@ -151,6 +151,7 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
                    public void onError(Throwable e) {
                        Toast.makeText(getApplicationContext(), R.string.error_location_fetch, Toast.LENGTH_SHORT).show();
                    }
+
                }));
    }

@ -159,6 +160,8 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
    @Override
    public void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+                //Google Analytics
+
        addPreferencesFromResource(R.xml.pref_sharing);
        locationSharing = (SwitchPreference) findPreference("key_sharing_enabled");
        statusSwitch = (SwitchPreference) findPreference("key_status_enabled");
@ -245,6 +248,7 @@ public class SharingFragment extends PreferenceFragment implements SharedPrefere
            return true;
        });

+
        /** Button 'choose from map' button listener **/
        manualLocationButton.setOnPreferenceChangeListener((preference, o) -> {
            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
--- 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,29 +1,18 @@
 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;
@ -32,11 +21,6 @@ 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) {

@ -49,11 +33,12 @@ public class StartupActivity extends AppCompatActivity {
            finish();
        } else {
            Intent loginIntent = new Intent(this, LoginActivity.class);
+//            Intent loginIntent = new Intent(this, ScrollingActivity.class);
            startActivityForResult(loginIntent, AUTHENTICATION_REQUEST_CODE);
-
        }

        super.onCreate(savedInstanceState);
+
    }

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

        finish();
    }
-
-
 }
-
-
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@ -66,6 +66,28 @@ public class TutorTab extends AppCompatActivity {
    private RecyclerView.LayoutManager dutyHoursLayoutManager;
    private TutorTabViewModel newTab;

+
+
+    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);
+
+        if(matcher.matches())
+            return true;
+        else
+            return false;
+    }
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@ -96,6 +118,8 @@ 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(
@ -212,6 +236,7 @@ public class TutorTab extends AppCompatActivity {
            }else{
                userEmail.setError(getString(R.string.error_invalid_email));
            }
+
        });
    }

@ -261,6 +286,7 @@ public class TutorTab extends AppCompatActivity {
            Toast.makeText(getApplicationContext(),
                    "Network error " + error.getMessage(), Toast.LENGTH_SHORT).show();

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

        }
@ -283,21 +309,5 @@ public class TutorTab extends AppCompatActivity {
        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
@ -63,7 +63,6 @@ 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;
@ -317,7 +316,6 @@ public class UsersListFragment extends Fragment {
                                tutorsList.addAll(users);
                                mAdapter.notifyDataSetChanged();
                                toggleEmptyNotes();
-                                fetchTopCords();
                            }

                            @Override
@ -427,35 +425,6 @@ 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();
@ -478,4 +447,54 @@ public class UsersListFragment extends Fragment {
        super.onStop();
    }

+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+    private Observable<List<User>> getListOfActiveUsers() {
+        return userService.getAllActiveTutors()
+                .toObservable()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    private Observable<Coordinate> getCoordinateObservable(User user) {
+        return coordinateService
+                .getTopCoordinateByUserId(user.getId())
+                .toObservable()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    private void fetchTopCords(){
+        tutorsTimeStamps.clear();
+        disposable.add(getListOfActiveUsers()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .flatMap((Function<List<User>, Observable<User>>) Observable::fromIterable)
+                .flatMap((Function<User, ObservableSource<Coordinate>>) this::getCoordinateObservable)
+                .subscribeWith(new DisposableObserver<Coordinate>() {
+                    @Override
+                    public void onNext(Coordinate coordinate) {
+                            Long ts = coordinate.getTimeStamp();
+                            tutorsTimeStamps.put(coordinate.getUserId(), getDate(ts));
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {showError(e);}
+
+                    @Override
+                    public void onComplete() {
+                        Log.e("USERS", String.valueOf(tutorsTimeStamps));
+                        mAdapter.notifyDataSetChanged();
+                    }
+                }));
+    }
+
+    private String getDate(long time) {
+        Calendar cal = Calendar.getInstance(Locale.ENGLISH);
+        cal.setTimeInMillis(time);
+        String date = DateFormat.format("HH:mm dd/MM", cal).toString();
+        return date;
+    }
 }
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
@ -58,7 +58,6 @@ 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;
@ -163,29 +162,34 @@ public class WhiteList extends AppCompatActivity {
    }

    private void fetchWhiteListedUsers() {
-        disposable.add(getListOfWhitelistedUsers(tutorId)
-                .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 handleDoOnSubscribe(Disposable disposable) {
        prevSize = whitelistedUsers.size();
        whitelistedUsers.clear();
+
+        disposable.add(getListOfWhitelistedUsers(tutorId)
+                .doOnSubscribe(t -> didFetched = false)
+                .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);
                        didFetched = false;
                    }

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

    private void refreshUI() {
--- 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,4 +1,3 @@
-/*
 package com.uam.wmi.findmytutor.adapters;

 import android.content.Context;
@ -47,7 +46,6 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
        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);
@ -55,6 +53,7 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
            holder.loader.setVisibility(View.GONE);
        } else {
            image = context.getResources().getDrawable(R.drawable.user_list_offline);
+            String ts = tutorsTimeStamps.get(tutor.getId());

            if (ts != null){
                holder.lastSeen.setText(R.string.last_sign);
@ -65,123 +64,7 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My

        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());
-        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);
-        }
-    }
-}
-
-
-
-*/
-
-
-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.lastSeen.setText("");
            holder.loader.setVisibility(View.GONE);
        }

--- 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,11 +34,9 @@ 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;

@ -124,12 +122,6 @@ 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();
-                    }
                }
            }
        };
@ -148,34 +140,10 @@ public class BackgroundLocalizationService extends Service {
            startForeground(1001, notification);
        }

-        if (!stopService) {
-            if (PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.PRESENCE.toString())) {
-                if (WifiUtils.checkIfUserIsInRangeOfWmiWifi(getApplicationContext())) {
-                    Location presenceFakeLoc = new Location("");
-
-                    presenceFakeLoc.setLatitude(Const.presenceLatitude);
-                    presenceFakeLoc.setLongitude(Const.presenceLongitude);
-                    presenceFakeLoc.setAltitude(0);
-                    createPresenceLooper(presenceFakeLoc);
-                } else {
+        if (!stopService && !PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
            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) {
+        } else if (!stopService &&
+                PrefUtils.getLocationLevel(getApplicationContext()).equals(SharingLevel.MANUAL.toString())) {
            mStatusChecker = () -> {
                try {
                    sendCoordinateToBackend(fakeLoc);
@ -183,24 +151,10 @@ public class BackgroundLocalizationService extends Service {
                    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));
@ -353,7 +307,6 @@ 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/UserService.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java
@ -39,9 +39,6 @@ public interface UserService {
    @GET("api/users/tutors/active")
    Single <List<User>> getAllActiveTutors();

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

@ -63,9 +60,6 @@ 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
@ -20,7 +20,5 @@ public class Const {
    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/MapUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java
@ -1,12 +1,8 @@
 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;
@ -14,15 +10,12 @@ 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.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;
+import static com.uam.wmi.findmytutor.utils.Const.outsideLatitudeRange;

 public class MapUtils {

@ -88,26 +81,6 @@ public class MapUtils {
        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,13 +243,4 @@ 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/WifiUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/WifiUtils.java
@ -1,30 +0,0 @@
-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/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:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
    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"
    tools:context=".activity.LoginActivity">


@ -61,7 +61,10 @@
                app:passwordToggleEnabled="true"
                android:layout_height="wrap_content">

-                <EditText
+
+
+
+                <android.support.design.widget.TextInputEditText
                    android:id="@+id/password"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@ -75,6 +78,7 @@

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

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

+
        </LinearLayout>
    </ScrollView>
 </LinearLayout>
--- a/app/src/main/res/layout/content_tutor_tab_layout.xml
+++ b/app/src/main/res/layout/content_tutor_tab_layout.xml
@ -77,7 +77,6 @@
            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"
@ -114,7 +113,7 @@
            android:layout_height="wrap_content"
            android:layout_below="@+id/userRoomLayout"
            android:layout_alignStart="@+id/userRoomLayout"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="0dp"
            android:layout_marginEnd="30dp"
            android:layout_marginTop="10dp"
            android:gravity="center"
@ -126,18 +125,18 @@
        <android.support.v7.widget.RecyclerView
            android:id="@+id/dutyHourView"
            android:layout_width="match_parent"
-            android:layout_height="120dp"
+            android:layout_height="100dp"
            android:layout_below="@+id/addDuty"
+
            android:layout_alignParentStart="true"
            android:layout_marginStart="30dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="30dp"
            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"
@ -154,8 +153,6 @@
            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
@ -166,11 +163,12 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="30dp"
            android:layout_marginEnd="30dp"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="0dp"
            app:counterEnabled="true"
            app:counterMaxLength="1000">

            <android.support.design.widget.TextInputEditText
+
                android:id="@+id/userNote"
                android:layout_width="match_parent"
                android:layout_height="100dp"
@ -180,7 +178,7 @@
                android:lineSpacingExtra="8sp"
                android:maxLength="1000"
                android:maxLines="7"
-                android:paddingTop="15dp"
+                android:paddingTop="5dp"
                android:requiresFadingEdge="vertical"
                android:scrollbars="vertical"
                android:textColor="@color/note_list_text" />
@ -194,22 +192,18 @@
            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_width="wrap_content"
            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/preference_button_widget.xml
+++ b/app/src/main/res/layout/preference_button_widget.xml
@ -7,6 +7,7 @@
    android:fontFamily="@font/lato_regular"
    >

+
    <android.support.v7.widget.AppCompatButton
    xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/button_choose_from_map"
@ -15,8 +16,6 @@
        android:textColor="@color/white"
        app:backgroundTint="@color/top_user_modal"
        android:layout_height="wrap_content"
-        android:stateListAnimator="@null"
-
        />


--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -288,11 +288,6 @@

    <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
@ -456,7 +456,4 @@
    <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/global_tracker.xml
+++ b/app/src/main/res/xml/global_tracker.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ga_trackingId" translatable="false">UA-132330555-1</string>
+</resources>
--- a/build.gradle
+++ b/build.gradle
@ -8,6 +8,7 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.google.gms:google-services:4.2.0'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files