From b65f2d46a64d5bcda85938edd621bfec162c8c29 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Fri, 10 Aug 2018 18:18:24 -0300
Subject: [PATCH] Android - People - Letters styling in row

---
 .../hifiinterface/view/UserListAdapter.java   |  8 +++++--
 android/app/src/main/res/layout/user_item.xml | 21 +++++++++++++++----
 android/app/src/main/res/values/colors.xml    |  1 +
 android/app/src/main/res/values/strings.xml   |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java b/android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java
index 3489210b62..202fd82c8b 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/view/UserListAdapter.java
@@ -67,9 +67,9 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
     public void onBindViewHolder(UserListAdapter.ViewHolder holder, int position) {
         User aUser = mUsers.get(position);
         holder.mUsername.setText(aUser.name);
-        holder.mOnline.setText(aUser.online?"Online":"Offline");
-        holder.mOnline.setVisibility(aUser.online? View.VISIBLE : View.GONE);
+        holder.mOnlineInfo.setVisibility(aUser.online? View.VISIBLE : View.GONE);
         Uri uri = Uri.parse(aUser.imageUrl);
+        holder.mLocation.setText(" - unknown"); // Bring info from the API and use it here
         Picasso.get().load(uri).into(holder.mImage, new RoundProfilePictureCallback(holder.mImage));
     }
 
@@ -103,6 +103,8 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
 
         TextView mUsername;
         TextView mOnline;
+        View mOnlineInfo;
+        TextView mLocation;
         ImageView mImage;
 
         public ViewHolder(View itemView) {
@@ -110,6 +112,8 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.ViewHo
             mUsername = itemView.findViewById(R.id.userName);
             mOnline = itemView.findViewById(R.id.userOnline);
             mImage = itemView.findViewById(R.id.userImage);
+            mOnlineInfo = itemView.findViewById(R.id.userOnlineInfo);
+            mLocation = itemView.findViewById(R.id.userLocation);
         }
     }
 
diff --git a/android/app/src/main/res/layout/user_item.xml b/android/app/src/main/res/layout/user_item.xml
index 2eaa701977..703c99945e 100644
--- a/android/app/src/main/res/layout/user_item.xml
+++ b/android/app/src/main/res/layout/user_item.xml
@@ -25,11 +25,24 @@
         <TextView
             android:id="@+id/userName"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:id="@+id/userOnline"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/raleway" />
+        <LinearLayout android:id="@+id/userOnlineInfo"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/userOnline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/online"
+                android:fontFamily="@font/raleway"
+                android:textColor="@color/hifiAquamarine" />
+            <TextView
+                android:id="@+id/userLocation"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/raleway_italic"/>
+        </LinearLayout>
     </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 7e6cf52d36..9de0ae5347 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -18,4 +18,5 @@
     <color name="black_060">#99000000</color>
     <color name="statusbar_color">#292929</color>
     <color name="hifiLogoColor">#23B2E7</color>
+    <color name="hifiAquamarine">#62D5C6</color>
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 9fe7f0cbee..d5da2f857b 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -23,5 +23,5 @@
     <string name="search_no_results">No places exist with that name</string>
     <string name="privacyPolicy">Privacy Policy</string>
     <string name="your_last_location">Your Last Location</string>
-
+    <string name="online">Online</string>
 </resources>