From b3fe5baebdd8c89be77f12627b2545c54d35ea08 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 28 Nov 2017 04:01:41 +0100
Subject: [PATCH] Improve menu layout

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/adapters/items/MenuItem.java  | 16 +++++++++++++++-
 .../talk/controllers/RoomMenuController.java     |  3 +++
 app/src/main/res/layout/rv_item_menu.xml         |  3 ++-
 app/src/main/res/values/strings.xml              |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java
index 5bff2648e..8087393f0 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java
@@ -21,10 +21,14 @@
 package com.nextcloud.talk.adapters.items;
 
 
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.TextView;
 
 import com.nextcloud.talk.R;
+import com.nextcloud.talk.application.NextcloudTalkApplication;
 
 import java.util.List;
 
@@ -66,7 +70,17 @@ public class MenuItem extends AbstractFlexibleItem<MenuItem.MenuItemViewHolder>
 
     @Override
     public void bindViewHolder(FlexibleAdapter adapter, MenuItem.MenuItemViewHolder holder, int position, List payloads) {
-        holder.menuTitle.setText(title);
+        if (title.equals(NextcloudTalkApplication.getSharedApplication().getString(R.string.nc_what))) {
+            Spannable spannableString = new SpannableString(NextcloudTalkApplication.getSharedApplication()
+                    .getString(R.string.nc_what));
+            spannableString.setSpan(new ForegroundColorSpan(NextcloudTalkApplication.getSharedApplication()
+                            .getResources().getColor(R.color.colorPrimary)), 0,
+                    spannableString.length(),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            holder.menuTitle.setText(spannableString);
+        } else {
+            holder.menuTitle.setText(title);
+        }
     }
 
     static class MenuItemViewHolder extends FlexibleViewHolder {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
index 983542695..c9cd27e8d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/RoomMenuController.java
@@ -92,6 +92,9 @@ public class RoomMenuController extends BaseController {
 
     private void prepareMenu() {
         menuItems = new ArrayList<>();
+
+        menuItems.add(new MenuItem(getResources().getString(R.string.nc_what)));
+
         menuItems.add(new MenuItem(getResources().getString(R.string.nc_leave)));
 
         if (room.isNameEditable()) {
diff --git a/app/src/main/res/layout/rv_item_menu.xml b/app/src/main/res/layout/rv_item_menu.xml
index f75fe6f9e..de0641073 100644
--- a/app/src/main/res/layout/rv_item_menu.xml
+++ b/app/src/main/res/layout/rv_item_menu.xml
@@ -28,6 +28,7 @@
         android:id="@+id/menu_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/margin_between_elements"/>
+        android:layout_margin="@dimen/margin_between_elements"
+        android:textSize="12sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bc3e71c35..b7abf6b88 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     <string name="nc_select_an_account">Select an account</string>
 
     <!-- Room menu -->
-    <string name="nc_what">What would you like to do?</string>
+    <string name="nc_what">What would you like to do today?</string>
     <string name="nc_leave">Leave call</string>
     <string name="nc_rename">Rename call</string>
     <string name="nc_set_password">Set the password</string>