From 49199ccc440a0d0837a96a5e73599e858b2dad09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= <miewrz@st.amu.edu.pl>
Date: Fri, 26 Oct 2018 21:52:19 +0200
Subject: [PATCH] Add badgers

---
 .../findmytutor/activity/BaseActivity.java    |  2 +-
 .../wmi/findmytutor/view/TutorsAdapter.java   | 20 +++++--
 app/src/main/res/drawable/not_active_user.xml |  5 ++
 app/src/main/res/drawable/not_online.xml      |  5 ++
 app/src/main/res/drawable/not_online_user.xml |  5 ++
 app/src/main/res/drawable/online_user.xml     |  5 ++
 app/src/main/res/layout/tutor_list_row.xml    | 53 +++++++++++--------
 7 files changed, 67 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/drawable/not_active_user.xml
 create mode 100644 app/src/main/res/drawable/not_online.xml
 create mode 100644 app/src/main/res/drawable/not_online_user.xml
 create mode 100644 app/src/main/res/drawable/online_user.xml

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index ccfbdd9..6fe2d49 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -176,7 +176,7 @@ public abstract class BaseActivity
                 //removeFragment(sharingFragment);
                 startActivity(new Intent(this, UsersListActivity.class));
             }
-            //finish();
+            finish();
         }, 300);
 
         return true;
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/view/TutorsAdapter.java b/app/src/main/java/com/uam/wmi/findmytutor/view/TutorsAdapter.java
index 0fedcad..6d79212 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/view/TutorsAdapter.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/view/TutorsAdapter.java
@@ -3,6 +3,7 @@ package com.uam.wmi.findmytutor.view;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.util.Log;
@@ -69,13 +70,22 @@ public class TutorsAdapter extends RecyclerView.Adapter<TutorsAdapter.MyViewHold
 
         holder.firstName.setText(tutor.getFirstName());
         holder.lastName.setText(tutor.getLastName());
-        holder.isOnline.setText(Html.fromHtml("&#8226;"));
 
-        holder.isOnline.setTextColor(getRandomMaterialColor("400"));
-
-        if(!tutor.isIsActive())
-            holder.isOnline.setTextColor(Color.BLACK);
+        if(tutor.isIsOnline()) {
+            Drawable image = context.getResources().getDrawable(R.drawable.online_user);
+            image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
+            holder.isOnline.setCompoundDrawables(image, null, null, null);
+        } else {
+            Drawable image = context.getResources().getDrawable(R.drawable.not_online);
+            image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
+            holder.isOnline.setCompoundDrawables(image, null, null, null);
+        }
 
+        if(!tutor.isIsActive()){
+            Drawable image = context.getResources().getDrawable(R.drawable.not_active_user);
+            image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());
+            holder.isOnline.setCompoundDrawables(image, null, null, null);
+        }
 
     }
 
diff --git a/app/src/main/res/drawable/not_active_user.xml b/app/src/main/res/drawable/not_active_user.xml
new file mode 100644
index 0000000..518747c
--- /dev/null
+++ b/app/src/main/res/drawable/not_active_user.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#252525"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#010101" android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/not_online.xml b/app/src/main/res/drawable/not_online.xml
new file mode 100644
index 0000000..84bf716
--- /dev/null
+++ b/app/src/main/res/drawable/not_online.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#BD120A"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#010101" android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/not_online_user.xml b/app/src/main/res/drawable/not_online_user.xml
new file mode 100644
index 0000000..2bac8fe
--- /dev/null
+++ b/app/src/main/res/drawable/not_online_user.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#0ABD48"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#010101" android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/online_user.xml b/app/src/main/res/drawable/online_user.xml
new file mode 100644
index 0000000..2bac8fe
--- /dev/null
+++ b/app/src/main/res/drawable/online_user.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#0ABD48"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#010101" android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
+</vector>
diff --git a/app/src/main/res/layout/tutor_list_row.xml b/app/src/main/res/layout/tutor_list_row.xml
index 43a9cf5..d5b0cce 100644
--- a/app/src/main/res/layout/tutor_list_row.xml
+++ b/app/src/main/res/layout/tutor_list_row.xml
@@ -1,39 +1,48 @@
 <?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="wrap_content"
+    android:layout_height="100dp"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground"
     android:paddingLeft="@dimen/activity_margin"
     android:paddingTop="@dimen/dimen_10"
     android:paddingRight="@dimen/activity_margin"
     android:paddingBottom="@dimen/dimen_10">
 
-    <TextView
-        android:id="@+id/isOnline"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dot_height"
-        android:layout_marginTop="@dimen/dimen_10"
-        android:layout_marginEnd="@dimen/dot_margin_right"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="10dp"
-        android:textSize="@dimen/dot_text_size" />
-
-    <TextView
-        android:id="@+id/lastName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/isOnline"
-        android:textColor="@color/note_list_text"
-        android:textSize="@dimen/note_list_text" />
 
     <TextView
         android:id="@+id/firstName"
-        android:layout_width="match_parent"
+        android:layout_width="271dp"
+        android:layout_height="30dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="10dp"
+        android:textColor="@color/note_list_text"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/lastName"
+        android:layout_width="269dp"
+        android:layout_height="30dp"
+        android:layout_below="@+id/firstName"
+        android:layout_alignEnd="@+id/firstName"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="1dp"
+        android:textColor="@color/note_list_text"
+        android:textSize="20sp" />
+
+
+    <TextView
+        android:id="@+id/isOnline"
+        android:layout_width="25dp"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/isOnline"
+        android:layout_below="@+id/lastName"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="-42dp"
+        android:layout_marginEnd="33dp"
         android:textColor="@color/note_list_text"
         android:textSize="@dimen/note_list_text" />
 
-</RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file