From 3cd81ac3479d06fa05908f54bd955543e3518014 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Sat, 28 Apr 2018 09:08:29 +0200
Subject: [PATCH] Update menu to action bindings

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../bottomsheet/CallMenuController.java       | 27 ++++++++++++-------
 app/src/main/res/layout/rv_item_app.xml       |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

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 f234b4769..386691f0f 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
@@ -132,34 +132,43 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
             menuItems.add(new MenuItem(getResources().getString(R.string.nc_what), 0, null));
 
             if (room.isNameEditable()) {
-                menuItems.add(new MenuItem(getResources().getString(R.string.nc_rename), 1, getResources().getDrawable(R.drawable.ic_pencil_grey600_24dp)));
+                menuItems.add(new MenuItem(getResources().getString(R.string.nc_rename), 2, getResources().getDrawable(R.drawable
+                        .ic_pencil_grey600_24dp)));
             }
 
             if (room.canModerate()) {
                 if (!room.isPublic()) {
-                    menuItems.add(new MenuItem(getResources().getString(R.string.nc_make_call_public), 2, getResources().getDrawable(R.drawable.ic_link_grey600_24px)));
+                    menuItems.add(new MenuItem(getResources().getString(R.string.nc_make_call_public), 3, getResources().getDrawable(R.drawable
+                            .ic_link_grey600_24px)));
                 } else {
                     if (room.isHasPassword()) {
-                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_change_password), 3, getResources().getDrawable(R.drawable.ic_lock_grey600_24px)));
-                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_clear_password), 4, getResources().getDrawable(R.drawable.ic_lock_open_grey600_24dp)));
+                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_change_password), 4, getResources().getDrawable(R.drawable
+                                .ic_lock_grey600_24px)));
+                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_clear_password), 5, getResources().getDrawable(R.drawable
+                                .ic_lock_open_grey600_24dp)));
                     } else {
-                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_set_password), 5, getResources().getDrawable(R.drawable.ic_lock_plus_grey600_24dp)));
+                        menuItems.add(new MenuItem(getResources().getString(R.string.nc_set_password), 6, getResources().getDrawable(R.drawable
+                                .ic_lock_plus_grey600_24dp)));
                     }
                 }
             }
 
             if (room.isPublic()) {
-                menuItems.add(new MenuItem(getResources().getString(R.string.nc_share_link), 6, getResources().getDrawable(R.drawable.ic_link_grey600_24px)));
+                menuItems.add(new MenuItem(getResources().getString(R.string.nc_share_link), 7, getResources().getDrawable(R.drawable
+                        .ic_link_grey600_24px)));
                 if (room.canModerate()) {
-                    menuItems.add(new MenuItem(getResources().getString(R.string.nc_make_call_private), 7, getResources().getDrawable(R.drawable.ic_group_grey600_24px)));
+                    menuItems.add(new MenuItem(getResources().getString(R.string.nc_make_call_private), 8, getResources().getDrawable(R.drawable
+                            .ic_group_grey600_24px)));
                 }
             }
 
             if (room.isDeletable()) {
-                menuItems.add(new MenuItem(getResources().getString(R.string.nc_delete_call), 8, getResources().getDrawable(R.drawable.ic_delete_grey600_24dp)));
+                menuItems.add(new MenuItem(getResources().getString(R.string.nc_delete_call), 9, getResources().getDrawable(R.drawable
+                        .ic_delete_grey600_24dp)));
             }
 
-            menuItems.add(new MenuItem(getResources().getString(R.string.nc_leave), 9, getResources().getDrawable(R.drawable.ic_close_grey600_24dp)));
+            menuItems.add(new MenuItem(getResources().getString(R.string.nc_leave), 1, getResources().getDrawable(R.drawable
+                    .ic_close_grey600_24dp)));
         } else if (menuType.equals(MenuType.SHARE)) {
             prepareIntent();
             List<AppAdapter.AppInfo> appInfoList = ShareUtils.getShareApps(getActivity(), shareIntent, null,
diff --git a/app/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml
index 95017a2f6..21e67cbf8 100644
--- a/app/src/main/res/layout/rv_item_app.xml
+++ b/app/src/main/res/layout/rv_item_app.xml
@@ -47,7 +47,7 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:textAlignment="center"
-        android:textSize="12sp"
+        android:textSize="18sp"
         tools:text="App title"/>
 
 </RelativeLayout>