gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-11 18:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #151 by defining more specific bottom sheet header strings

Browse Source
This commit is contained in:
AndyScherzinger 2018-06-21 13:01:23 +02:00
parent 6bca5b381b
commit 26d45c466b
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/adapters/items/MenuItem.java
View File

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

4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -123,7 +123,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
menuItems = new ArrayList<>(); menuItems = new ArrayList<>();
if (menuType.equals(MenuType.REGULAR)) { 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()) { if (room.isNameEditable()) {
menuItems.add(new MenuItem(getResources().getString(R.string.nc_rename), 2, getResources().getDrawable(R.drawable 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 { } 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_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))); menuItems.add(new MenuItem(getResources().getString(R.string.nc_join_via_link), 2, getResources().getDrawable(R.drawable.ic_link_grey600_24px)));
} }

5
app/src/main/res/values/strings.xml
View File

@ -83,7 +83,8 @@
<string name="nc_select_an_account">Select an account</string> <string name="nc_select_an_account">Select an account</string>
<!-- Room menu --> <!-- 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_leave">Leave conversation</string>
<string name="nc_rename">Rename conversation</string> <string name="nc_rename">Rename conversation</string>
<string name="nc_set_password">Set a password</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_public">Make conversation public</string>
<string name="nc_make_call_private">Make conversation private</string> <string name="nc_make_call_private">Make conversation private</string>
<string name="nc_delete_call">Delete conversation</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_link">Join via link</string>
<string name="nc_join_via_web">Join via web</string> <string name="nc_join_via_web">Join via web</string>