From 36335d00deb4616cadcf5bb1a2fe499b8645ae44 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 30 Apr 2018 12:31:16 +0200 Subject: [PATCH] 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 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 @@ #7FC0E3 #FFEB3B #E8E8E8 + #757575