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

.idea/misc.xml

@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/AndroidManifest.xml

@@ -27,10 +27,10 @@
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity
             android:name=".activity.StartupActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance"
-            android:theme="@style/AppTheme.NoActionBar"
             android:screenOrientation="portrait"
-            android:configChanges="keyboardHidden|orientation|screenSize">
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -40,20 +40,21 @@
         <activity
             android:windowSoftInputMode="adjustPan"
             android:name=".activity.MapActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:configChanges="keyboardHidden|orientation|screenSize"/>
         <activity
             android:name=".activity.LoginActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:noHistory="true"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:configChanges="keyboardHidden|orientation|screenSize"/>
         <activity
             android:name=".activity.SettingsActivity"
-            android:screenOrientation="portrait"
+            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:configChanges="keyboardHidden|orientation|screenSize"/>
+            android:screenOrientation="portrait" />
+
         <service
             android:name=".service.BackgroundLocalizationService"
             android:enabled="true"
@@ -61,9 +62,14 @@
             android:launchMode="singleTop" />
         <activity
             android:name=".activity.TutorTab"
-            android:theme="@style/AppTheme"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"
-            android:configChanges="keyboardHidden|orientation|screenSize"/>
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".activity.BlackList"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme" />
     </application>
 
 </manifest>

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

@@ -102,8 +102,8 @@ public abstract class BaseActivity
                         /* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
                         startActivity(launchIntent);*/
                      } else if (itemName.equals(getResources().getString(R.string.navigation_item_blacklist))) {
-                        /* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
+                        launchIntent = new Intent(getApplicationContext(),BlackList.class);
-                        startActivity(launchIntent);*/
+                        startActivity(launchIntent);
 
                      } else if (itemName.equals(getResources().getString(R.string.navigation_item_profile)))  {
 

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

@@ -0,0 +1,335 @@
+package com.uam.wmi.findmytutor.activity;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.DefaultItemAnimator;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.Switch;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
+import com.mapbox.geojson.Point;
+import com.mapbox.mapboxsdk.geometry.LatLng;
+import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.adapters.BlackListAdapter;
+import com.uam.wmi.findmytutor.model.IsUsingListBool;
+import com.uam.wmi.findmytutor.model.PredefinedCoordViewModel;
+import com.uam.wmi.findmytutor.model.StudentIdModel;
+import com.uam.wmi.findmytutor.model.User;
+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.MyDividerItemDecoration;
+import com.uam.wmi.findmytutor.utils.PrefUtils;
+import com.uam.wmi.findmytutor.utils.RecyclerTouchListener;
+import com.uam.wmi.findmytutor.utils.RestApiHelper;
+import com.uam.wmi.findmytutor.utils.SharingLevel;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.observers.DisposableSingleObserver;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
+
+public class BlackList extends AppCompatActivity {
+
+    private CompositeDisposable disposable = new CompositeDisposable();
+    private UserService userService;
+    private boolean didFetched = false;
+    private String tutorId;
+
+    @BindView(R.id.recycler_view)
+    RecyclerView recyclerView;
+    @BindView(R.id.black_list_empty_text_view)
+    TextView noNotesView;
+    @BindView(R.id.switch_blacklist_toggle)
+    Switch aSwitch;
+    @BindView(R.id.add_to_black_list_fab)
+    FloatingActionButton addToBlackListFab;
+
+    private BlackListAdapter mAdapter;
+    private List<User> blacklistedUsers = new ArrayList<>();
+    private HashSet<String> blacklistedUsersIDs = new HashSet<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        setContentView(R.layout.activity_black_list);
+        ButterKnife.bind(this);
+        aSwitch.setText(getString(R.string.blacklist) +" ON");
+        tutorId = PrefUtils.getUserId(getApplicationContext());
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setTitle(getString(R.string.activity_title_blacklist));
+        setSupportActionBar(toolbar);
+
+        userService = ApiClient.getClient(getApplicationContext())
+                .create(UserService.class);
+
+        mAdapter = new BlackListAdapter(this, blacklistedUsers);
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        recyclerView.setLayoutManager(mLayoutManager);
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.addItemDecoration(new MyDividerItemDecoration(this, LinearLayoutManager.VERTICAL, 16));
+        recyclerView.setAdapter(mAdapter);
+
+        /**
+         * On long press on RecyclerView item, open alert dialog
+         * with options to choose
+         * Edit and Delete
+         * */
+        recyclerView.addOnItemTouchListener(new RecyclerTouchListener(this,
+                recyclerView, new RecyclerTouchListener.ClickListener() {
+            @Override
+            public void onClick(View view, final int position) {
+            }
+
+            @Override
+            public void onLongClick(View view, int position) {
+            }
+        }));
+
+        addToBlackListFab.setOnClickListener(this::showFabDialog);
+
+        fetchBlackListedUsersIDs(PrefUtils.getUserId(getApplicationContext()));
+        handleSwitch();
+    }
+
+    private void fetchBlackListedUsersIDs(String userId) {
+        disposable.add(
+                userService.getTutorBlacklistedByID(userId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeWith(new DisposableSingleObserver<List<String>>() {
+                    @Override
+                    public void onSuccess(List<String> users) {
+                        blacklistedUsersIDs.addAll(users);
+                        didFetched = true;
+                        fetchBlackListedUsers();
+                        toggleEmptyNotes();
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        showError(e);
+                    }
+                })
+        );
+    }
+
+    private void fetchBlackListedUsers() {
+        for (String GUID : blacklistedUsersIDs){
+            disposable.add(
+                    userService.getUserById(GUID)
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribeWith(new DisposableSingleObserver<User>() {
+                                @Override
+                                public void onSuccess(User user) {
+                                    blacklistedUsers.add(user);
+                                    Snackbar.make(getWindow().getDecorView().getRootView(), "user fetch OK! success", Snackbar.LENGTH_LONG)
+                                            .setAction("Action", null).show();
+                                    toggleEmptyNotes();
+                                    if (blacklistedUsers.size() == blacklistedUsersIDs.size()) {
+                                        mAdapter.notifyDataSetChanged();
+                                    }
+                                }
+
+                                @Override
+                                public void onError(Throwable e) {
+                                    showError(e);
+                                }
+                            })
+            );
+        }
+    }
+
+
+    private void showFabDialog(View v){
+        LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getApplicationContext());
+        @SuppressLint("InflateParams") View view = layoutInflaterAndroid.inflate(R.layout.black_list_fab_modal, null);
+        AlertDialog.Builder alertDialogBuilderUserInput = new android.support.v7.app.AlertDialog.Builder(this);
+
+        alertDialogBuilderUserInput.setView(view).setPositiveButton(getApplicationContext().getString(R.string.modal_location_send), null);
+
+        alertDialogBuilderUserInput
+                .setPositiveButton(R.string.add, null)
+                .setNegativeButton(R.string.cancel, null);
+
+        final AlertDialog alertDialog = alertDialogBuilderUserInput.create();
+        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
+        EditText modalUserInput = view.findViewById(R.id.black_list_modal_input);
+
+        alertDialog.setOnShowListener(dialogInterface -> {
+            Button sendButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+
+            Button dismissButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE);
+
+            dismissButton.setOnClickListener(view1 -> alertDialog.dismiss());
+
+            sendButton.setOnClickListener(view1 -> {
+                String body = modalUserInput.getText().toString();
+
+                if (TextUtils.isEmpty(body)) {
+                    Toast.makeText(getApplicationContext(), R.string.can_not_be_empty, Toast.LENGTH_SHORT).show();
+                    modalUserInput.requestFocus();
+                } else {
+                    sendUserToBlacklist(body);
+                    alertDialog.dismiss();
+                }
+            });
+        });
+
+        alertDialog.show();
+    }
+
+    private void sendUserToBlacklist(String body) {
+        StudentIdModel studentIdModel = new StudentIdModel(body);
+        disposable.add(
+                userService.addStudentToBlacklist(PrefUtils.getUserId(getApplicationContext()), studentIdModel)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(()->{
+                    fetchBlackListedUsersIDs(PrefUtils.getUserId(getApplicationContext()));
+                    Toast.makeText(getApplicationContext(), R.string.user_added, Toast.LENGTH_SHORT).show();
+                },this::showError)
+        );
+    }
+
+    private void showError(Throwable e) {
+        String message;
+
+        if (e instanceof HttpException) {
+            ResponseBody responseBody = ((HttpException) e).response().errorBody();
+            message = RestApiHelper.getErrorMessage(responseBody);
+        } else {
+            message = "Network Error !";
+        }
+        Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
+
+
+        Snackbar.make(getWindow().getDecorView().getRootView(), message, Snackbar.LENGTH_LONG)
+                .setAction("Action", null).show();
+    }
+
+    private void toggleEmptyNotes() {
+
+        if (didFetched && blacklistedUsers.size() == 0) {
+            noNotesView.setText(R.string.list_is_empty);
+            noNotesView.setVisibility(View.VISIBLE);
+        }else if (blacklistedUsers.size() > 0) {
+            noNotesView.setVisibility(View.GONE);
+        } else {
+            noNotesView.setText(getString(R.string.loading));
+            noNotesView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        disposable.dispose();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_black_list, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        if (item.getItemId()==R.id.action_blacklist_info_popup){
+            int layoutID = R.layout.info_popup_blacklist;
+
+            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 handleSwitch(){
+        aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked){
+                aSwitch.setText(getString(R.string.blacklist) + " "+ getString(R.string.on));
+                handleChangeRequest(true);
+            }else {
+                aSwitch.setText(getString(R.string.blacklist) + " "+getString(R.string.off));
+                handleChangeRequest(false);
+            }
+        });
+    }
+
+    private void handleChangeRequest(boolean value){
+        IsUsingListBool isUsingListBool = new IsUsingListBool();
+        isUsingListBool.setIsUsing(value);
+        disposable.add(
+        userService.setTutorBlacklist(tutorId, isUsingListBool)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(()->{
+            },this::showError)
+        );
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.uam.wmi.findmytutor.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.uam.wmi.findmytutor.R;
+
+public abstract class SpecialList extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        setContentView(getContentViewId());
+
+    }
+
+    abstract int getContentViewId();
+
+
+}

app/src/main/java/com/uam/wmi/findmytutor/adapters/BlackListAdapter.java

@@ -0,0 +1,134 @@
+package com.uam.wmi.findmytutor.adapters;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.design.widget.Snackbar;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
+import com.uam.wmi.findmytutor.R;
+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.PrefUtils;
+import com.uam.wmi.findmytutor.utils.RestApiHelper;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
+
+import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
+
+
+public class BlackListAdapter extends RecyclerView.Adapter<BlackListAdapter.MyViewHolder> {
+
+    private Context context;
+    private List<User> tutorsList;
+    private CompositeDisposable disposable = new CompositeDisposable();
+    private UserService userService;
+
+
+    public BlackListAdapter(Context context, List<User> tutors) {
+        this.context = context;
+        this.tutorsList = tutors;
+    }
+    @NonNull
+    @Override
+    public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        userService = ApiClient.getClient(getApplicationContext())
+                .create(UserService.class);
+        View itemView = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.black_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(tutor.getFirstName() + " " + tutor.getLastName());
+        holder.lastName.setText("Index: " + tutor.getLdapLogin() + "  Email: " + tutor.getEmail());
+//"s416196"
+        holder.imageButton.setOnClickListener(l ->{
+            StudentIdModel studentIdModel = new StudentIdModel(tutor.getLdapLogin());
+            String tutorId = PrefUtils.getUserId(getApplicationContext());
+            disposable.add(
+                    userService.removeStudentFromBlacklist(tutorId, studentIdModel)
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(()->{
+                        Toast.makeText(getApplicationContext(), "User removed", Toast.LENGTH_SHORT).show();
+                        tutorsList.remove(position);
+                        notifyDataSetChanged();
+                    },this::showError)
+            );
+        });
+//
+//        if (tutor.isIsOnline()) {
+//            image = context.getResources().getDrawable(R.drawable.user_list_online);
+//        } else {
+//            image = context.getResources().getDrawable(R.drawable.user_list_offline);
+//        }
+//
+//        if (!tutor.isIsActive()) {
+//            image = context.getResources().getDrawable(R.drawable.user_list_off);
+//        }
+
+//        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.lastName)
+        TextView lastName;
+
+//        @BindView(R.id.isOnline)
+//        TextView isOnline;
+        @BindView(R.id.removeUserImageButton)
+        ImageButton imageButton;
+
+        MyViewHolder(View view) {
+            super(view);
+            ButterKnife.bind(this, view);
+        }
+    }
+
+    private void showError(Throwable e) {
+        String message;
+
+        if (e instanceof HttpException) {
+            ResponseBody responseBody = ((HttpException) e).response().errorBody();
+            message = RestApiHelper.getErrorMessage(responseBody);
+        } else {
+            message = "Network Error !";
+        }
+        Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
+
+    }
+
+}

app/src/main/java/com/uam/wmi/findmytutor/model/StudentIdModel.java

@@ -18,6 +18,15 @@ public class StudentIdModel extends BaseResponse{
   @SerializedName("ldapLogin")
   private String ldapLogin = null;
 
+  /**
+   *
+   * @param str
+   */
+  public StudentIdModel(String str){
+//    this.studentId = str;
+    this.ldapLogin = str;
+  }
+
   public StudentIdModel studentId(String studentId) {
     this.studentId = studentId;
     return this;

app/src/main/java/com/uam/wmi/findmytutor/service/UserService.java

@@ -15,6 +15,7 @@ import retrofit2.Response;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
+import retrofit2.http.HTTP;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
 import retrofit2.http.Path;
@@ -67,7 +68,7 @@ public interface UserService {
     Completable setUserInActive(@Path("userID") String userID);
 
     @GET("api/users/blacklist/{tutorID}")
-    Single<List<User>> getTutorBlacklistedByID(@Path("tutorID") String tutorID);
+    Single<List<String>> getTutorBlacklistedByID(@Path("tutorID") String tutorID);
 
     @PUT("api/users/blacklist/{tutorID}")
     Completable setTutorBlacklist(@Path("tutorID") String tutorID, @Body IsUsingListBool isUsing);
@@ -75,7 +76,8 @@ public interface UserService {
     @POST("api/users/blacklist/{tutorID}")
     Completable addStudentToBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
 
-    @DELETE("api/users/blacklist/{tutorID}")
+//    @DELETE("api/users/blacklist/{tutorID}")
+    @HTTP(method = "DELETE", path = "api/users/blacklist/{tutorID}", hasBody = true)
     Completable removeStudentFromBlacklist(@Path("tutorID") String tutorID, @Body StudentIdModel student);
 
     @GET("api/users/whitelist/{tutorID}")

app/src/main/java/com/uam/wmi/findmytutor/utils/Const.java

@@ -6,7 +6,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class Const {
-    public final static String BASE_URL = "https://s416084.projektstudencki.pl/master/";
+    public final static String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
     public final static Integer onlineBackgroundLocationInterval = 7000;
     public final static Integer offlineBackgroundLocationInterval = 36000;
     public final static Integer defaultMapZoom = 17;

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:fitsSystemWindows="true"
+    android:id="@+id/activity_blacklist_container"
+    tools:context=".activity.BlackList">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            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"
+            >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="left|bottom"
+                android:orientation="vertical"
+                android:padding="10dp"
+                android:layout_marginBottom="20dp"
+                app:layout_collapseMode="parallax">
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="Block the users"
+                    android:textSize="15sp"/>
+
+                <Switch
+                    android:id="@+id/switch_blacklist_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:thumbTextPadding="45dp"
+                    android:checked="true"
+                    android:text="BLACKLIST TEXT SWITCH" />
+
+            </LinearLayout>
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay"
+                />
+
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_black_list" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/add_to_black_list_fab"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/fab_margin"
+        android:layout_marginTop="-322dp"
+        app:layout_anchor="@id/app_bar"
+        app:layout_anchorGravity="bottom|end"
+        app:srcCompat="@android:drawable/ic_input_add"
+        app:useCompatPadding="true"
+        tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
+    <!-- A RecyclerView with some commonly used attributes -->
+
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fontFamily="@font/lato_regular"
+    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">
+
+    <TextView
+        android:id="@+id/black_list_modal_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/black_list_modal_input"
+        android:layout_marginBottom="@dimen/dimen_10"
+        android:fontFamily="sans-serif-medium"
+        android:lineSpacingExtra="8sp"
+        android:text="@string/black_list_title"
+        android:textColor="@color/colorAccent"
+        android:textSize="@dimen/lbl_new_note_title"
+        android:textStyle="normal" />
+
+    <EditText
+        android:id="@+id/black_list_modal_input"
+        android:layout_width="315dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="50dp"
+        android:ems="10"
+        android:hint="@string/index_user"
+        android:maxLength="30"
+        android:maxLines="1"
+        android:requiresFadingEdge="vertical"
+        android:scrollbars="vertical"
+        android:textColor="@color/note_list_text" />
+
+
+</RelativeLayout>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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="90dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingLeft="10dp"
+    android:paddingTop="@dimen/dimen_10"
+    android:paddingRight="10dp"
+    android:fontFamily="@font/lato_regular"
+    android:paddingBottom="@dimen/dimen_10">
+
+
+    <TextView
+        android:id="@+id/firstName"
+        android:layout_width="271dp"
+        android:layout_height="22dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="10dp"
+        android:textColor="@color/note_list_text"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/lastName"
+        android:layout_width="270dp"
+        android:layout_height="22dp"
+        android:layout_below="@+id/firstName"
+        android:layout_alignEnd="@+id/firstName"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="0dp"
+        android:textColor="@color/note_list_text"
+        android:textSize="15sp" />
+
+
+    <!--<TextView-->
+        <!--android:id="@+id/isOnline"-->
+        <!--android:layout_width="48dp"-->
+        <!--android:layout_height="30dp"-->
+        <!--android:layout_below="@+id/firstName"-->
+        <!--android:layout_marginStart="7dp"-->
+        <!--android:layout_marginTop="-10dp"-->
+        <!--android:layout_toEndOf="@+id/firstName"-->
+        <!--android:textColor="@color/note_list_text"-->
+        <!--android:textSize="@dimen/note_list_text" />-->
+
+
+    <ImageButton
+        android:id="@+id/removeUserImageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/firstName"
+        android:layout_toEndOf="@+id/firstName"
+        android:background="@null"
+        app:srcCompat="@drawable/abc_ic_clear_material" />
+
+</RelativeLayout>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".activity.UsersListFragment"
+    android:fontFamily="@font/lato_regular"
+    tools:showIn="@layout/users_list_main">
+
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/black_list_empty_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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>
+

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@drawable/layout_bg"
+    android:orientation="vertical"
+    android:padding="10dp"
+    android:textColor="@color/half_black">
+
+    <TextView
+        android:id="@+id/textViewP1_info_icon_blacklist_p1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_weight="1"
+        android:text="@string/info_icon_blacklist_p1"
+        android:textColor="@color/half_black" />
+
+    <TextView
+        android:id="@+id/textViewP2_info_icon_blacklist_p2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:text="@string/info_icon_blacklist_p2"
+        android:textColor="@color/half_black" />
+
+    <TextView
+        android:id="@+id/textViewP3_info_icon_blacklist_p3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:text="@string/info_icon_blacklist_p3"
+        android:textColor="@color/half_black" />
+
+</LinearLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -4,11 +4,11 @@
      <!--   <item
             android:id="@+id/nav_item_one"
             android:icon="@drawable/ic_people_white"
-            android:title="@string/navigation_item_whitelist" />
+            android:title="@string/navigation_item_whitelist" />-->
         <item
             android:id="@+id/nav_item_two"
             android:icon="@drawable/ic_people_black"
-            android:title="@string/navigation_item_blacklist" />-->
+            android:title="@string/navigation_item_blacklist" />
         <item
             android:id="@+id/nav_item_three"
             android:icon="@drawable/outline_person_white_24dp"

app/src/main/res/menu/menu_black_list.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.BlackList">
+    <item
+        android:id="@+id/action_blacklist_info_popup"
+        android:orderInCategory="100"
+        android:title="Popup info icon"
+        android:icon="@drawable/outline_info_24"
+        app:showAsAction="ifRoom" />
+</menu>

app/src/main/res/values-pl/strings.xml

@@ -211,7 +211,11 @@
     <string name="info_icon_userlist_tab_level_status_offline">- użytkownik jest obecnie offline</string>
     <string name="info_icon_userlist_tab_level_status_inactive">- użytkownik jest nieaktywny</string>
     <string name="info_icon_userlist_tab_level_status_inactive_tip">(nie udostępnił żadnych danych o lokalizacji od conajmniej tygodnia)</string>
-    <string name="info_icon_userlist_summary">Po kliknięciu w imię i nazwisko wyświetli się karta zawierająca dokładne informacje o profesorze.</string>
+    <string name="add">Dodaj</string>
+    <string name="index_user">Index użytkownika</string>
+    <string name="black_list_title">Dodaj użytkownika do Blacklsi</string>
+
+    <string name="info_icon_userlist_summary">Po kliknięciu w imię i nazwisko, wyświetli się karta zawierająca dokładne informacje o profesorze.</string>
 
 
 
@@ -239,6 +243,13 @@
     <string name="negative_dialog_button">Nie</string>
     <string name="enable_sharing_question">Aby skorzystać z tej funkcji musisz pozwolić na udostępnianie lokalizacji. Zgadzasz sie?</string>
     <string name="sharing_modal_title">Udostępnianie</string>
+    <string name="blacklist">Czarna lista</string>
+    <string name="can_not_be_empty">Pole nie może być puste</string>
+    <string name="user_added">Użytkownik dodany</string>
+    <string name="list_is_empty">Lista jest pusta</string>
+    <string name="on">WŁĄCZONA</string>
+    <string name="off">WYŁĄCZONA</string>
+    <string name="title_activity_black_list">Czarna lista</string>
     <string name="scrap_tutor_tab">Pobierz dane z WMI</string>
     <string name="scrap_tutor_msg">Dane zostały zaktualizwane!</string>
 

app/src/main/res/values/dimens.xml

@@ -19,4 +19,6 @@
     <dimen name="note_list_text">13sp</dimen>
     <dimen name="default_margin">12dp</dimen>
     <dimen name="text_large">10dp</dimen>
+    <dimen name="app_bar_height">180dp</dimen>
+    <dimen name="text_margin">16dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -32,7 +32,7 @@
 
     <!-- Tutors list -->
     <string name="action_settings">Settings</string>
-    <string name="activity_title_home">Notes</string>
+    <string name="activity_title_blacklist">Blacklist</string>
     <string name="prompt_password">Password</string>
     <string name="action_sign_in">Sign in or register</string>
     <string name="action_sign_out">Sign out</string>
@@ -297,6 +297,99 @@
     <string name="info_icon_userlist_tab_level_status_offline">- user is currently offline</string>
     <string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string>
     <string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string>
+    <string name="title_activity_black_list">BlackList</string>
+    <string name="index_user">User index</string>
+    <string name="black_list_title">Add user to Blacklist</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 efficient 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>
+    <string name="add">Add</string>
     <string name="info_icon_userlist_summary">After clicking on a name, the tutor tab will pop up, containing details about selected tutor.</string>
 
     <string name="possitive_dialog_button">Yes</string>
@@ -319,8 +412,13 @@
     <string name="enable_sharing_question">In order to use this function, you have to enable localization sharing. May I do it for you?</string>
     <string name="sharing_modal_title">Sharing</string>
     <string name="lack_of_status">The user hasn\'t defined a status.</string>
+    <string name="can_not_be_empty">Field can not be empty</string>
+    <string name="user_added">User added</string>
+    <string name="list_is_empty">The list is empty</string>
+    <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_msg">Thank you for scraping your tab!</string>
     <string name="no_online_users">Currently, there are no\nonline users.</string>
     <string name="no_offline_users">Currently, there are no\noffline users.</string>
     <string name="only_online_users">Only online users</string>

app/src/main/res/values/styles.xml

@@ -22,4 +22,5 @@
         <item name="android:background">@drawable/fab_label_background</item>
         <item name="android:textColor">@color/mapboxWhite</item>
     </style>
+
 </resources>