From 36335d00deb4616cadcf5bb1a2fe499b8645ae44 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Mon, 30 Apr 2018 12:31:16 +0200
Subject: [PATCH 1/2] Fix #151 recoloring bottom menu, slightly smaller text
 size

---
 .../java/com/nextcloud/talk/adapters/items/MenuItem.java     | 2 +-
 .../talk/controllers/bottomsheet/CallMenuController.java     | 5 -----
 app/src/main/res/layout/rv_item_menu.xml                     | 3 ++-
 app/src/main/res/values/colors.xml                           | 1 +
 4 files changed, 4 insertions(+), 7 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 6dea1c25c..af748e2de 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
@@ -85,7 +85,7 @@ public class MenuItem extends AbstractFlexibleItem<MenuItem.MenuItemViewHolder>
             Spannable spannableString = new SpannableString(NextcloudTalkApplication.getSharedApplication()
                     .getString(R.string.nc_what));
             spannableString.setSpan(new ForegroundColorSpan(NextcloudTalkApplication.getSharedApplication()
-                            .getResources().getColor(R.color.colorPrimary)), 0,
+                            .getResources().getColor(R.color.grey_600)), 0,
                     spannableString.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             holder.menuTitle.setText(spannableString);
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
index 386691f0f..4df7e8ed5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
@@ -111,11 +111,6 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
 
         adapter.addListener(this);
         recyclerView.setAdapter(adapter);
-
-        recyclerView.addItemDecoration(new DividerItemDecoration(
-                recyclerView.getContext(),
-                layoutManager.getOrientation()
-        ));
     }
 
     private void prepareIntent() {
diff --git a/app/src/main/res/layout/rv_item_menu.xml b/app/src/main/res/layout/rv_item_menu.xml
index 2d6610fc7..fab053796 100644
--- a/app/src/main/res/layout/rv_item_menu.xml
+++ b/app/src/main/res/layout/rv_item_menu.xml
@@ -34,7 +34,8 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:gravity="center_vertical"
-        android:textSize="18sp"
+        android:textSize="16sp"
+        android:textColor="@color/black"
         tools:drawableLeft="@drawable/ic_add_grey600_24px"
         tools:drawablePadding="16dp"
         tools:text="Start a new conversation" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 01aea2b00..aaf82e7f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,5 +11,6 @@
     <color name="nc_light_blue_color">#7FC0E3</color>
     <color name="nc_material_yellow">#FFEB3B</color>
     <color name="nc_light_grey">#E8E8E8</color>
+    <color name="grey_600">#757575</color>
 </resources>
 

From bf41e5c5b328e16873242303053053dc6d884f52 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Mon, 30 Apr 2018 13:33:05 +0200
Subject: [PATCH 2/2] optimize app item layout

---
 .../com/nextcloud/talk/adapters/items/AppItem.java |  2 +-
 app/src/main/res/layout/rv_item_app.xml            | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java
index ae1fa58af..461372433 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AppItem.java
@@ -95,7 +95,7 @@ public class AppItem extends AbstractFlexibleItem<AppItem.AppItemViewHolder> {
         if (position == 0) {
             Spannable spannableString = new SpannableString(title);
             spannableString.setSpan(new ForegroundColorSpan(NextcloudTalkApplication.getSharedApplication()
-                            .getResources().getColor(R.color.colorPrimary)), 0,
+                            .getResources().getColor(R.color.grey_600)), 0,
                     spannableString.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             holder.appTitleTextView.setText(spannableString);
diff --git a/app/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml
index 21e67cbf8..53c588b2e 100644
--- a/app/src/main/res/layout/rv_item_app.xml
+++ b/app/src/main/res/layout/rv_item_app.xml
@@ -24,8 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@color/nc_white_color">
+                android:layout_marginTop="16dp">
 
     <ImageView
         android:id="@+id/icon_image_view"
@@ -34,11 +33,12 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="16dp"
         android:focusable="false"
-        android:focusableInTouchMode="false"/>
+        android:focusableInTouchMode="false"
+        tools:src="@drawable/ic_add_grey600_24px"/>
 
     <TextView
         android:id="@+id/app_title_text_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginEnd="16dp"
@@ -46,8 +46,8 @@
         android:layout_toEndOf="@id/icon_image_view"
         android:focusable="false"
         android:focusableInTouchMode="false"
-        android:textAlignment="center"
-        android:textSize="18sp"
-        tools:text="App title"/>
+        android:textSize="16sp"
+        android:textColor="@color/black"
+        tools:text="Start a new conversation"/>
 
 </RelativeLayout>