Browse Source

Fix #151 by defining more specific bottom sheet header strings

AndyScherzinger 6 years ago
parent
commit
26d45c466b

+ 1 - 2
app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java

@@ -82,8 +82,7 @@ public class MenuItem extends AbstractFlexibleItem<MenuItem.MenuItemViewHolder>
     @Override
     public void bindViewHolder(FlexibleAdapter adapter, MenuItem.MenuItemViewHolder holder, int position, List payloads) {
         if (position == 0) {
-            Spannable spannableString = new SpannableString(NextcloudTalkApplication.getSharedApplication()
-                    .getString(R.string.nc_what));
+            Spannable spannableString = new SpannableString(title);
             spannableString.setSpan(new ForegroundColorSpan(NextcloudTalkApplication.getSharedApplication()
                             .getResources().getColor(R.color.grey_600)), 0,
                     spannableString.length(),

+ 2 - 2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java

@@ -123,7 +123,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
         menuItems = new ArrayList<>();
 
         if (menuType.equals(MenuType.REGULAR)) {
-            menuItems.add(new MenuItem(getResources().getString(R.string.nc_what), 0, null));
+            menuItems.add(new MenuItem(getResources().getString(R.string.nc_configure_room), 0, null));
 
             if (room.isNameEditable()) {
                 menuItems.add(new MenuItem(getResources().getString(R.string.nc_rename), 2, getResources().getDrawable(R.drawable
@@ -175,7 +175,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
                 }
             }
         } else {
-            menuItems.add(new MenuItem(getResources().getString(R.string.nc_what), 0, null));
+            menuItems.add(new MenuItem(getResources().getString(R.string.nc_start_conversation), 0, null));
             menuItems.add(new MenuItem(getResources().getString(R.string.nc_new_conversation), 1, getResources().getDrawable(R.drawable.ic_add_grey600_24px)));
             menuItems.add(new MenuItem(getResources().getString(R.string.nc_join_via_link), 2, getResources().getDrawable(R.drawable.ic_link_grey600_24px)));
         }

+ 3 - 2
app/src/main/res/values/strings.xml

@@ -83,7 +83,8 @@
     <string name="nc_select_an_account">Select an account</string>
 
     <!-- Room menu -->
-    <string name="nc_what">What would you like to do today?</string>
+    <string name="nc_start_conversation">Start a conversation</string>
+    <string name="nc_configure_room">Configure room</string>
     <string name="nc_leave">Leave conversation</string>
     <string name="nc_rename">Rename conversation</string>
     <string name="nc_set_password">Set a password</string>
@@ -94,7 +95,7 @@
     <string name="nc_make_call_public">Make conversation public</string>
     <string name="nc_make_call_private">Make conversation private</string>
     <string name="nc_delete_call">Delete conversation</string>
-    <string name="nc_new_conversation">Start a new conversation</string>
+    <string name="nc_new_conversation">New conversation</string>
     <string name="nc_join_via_link">Join via link</string>
     <string name="nc_join_via_web">Join via web</string>