From 126f98c1e644104bc2fb04a73664ce18c5b490ce Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 2 Jul 2018 21:44:46 +0200 Subject: [PATCH] Fix #222 Signed-off-by: Mario Danic --- .../com/nextcloud/talk/adapters/items/CallItem.java | 11 +++++++++++ .../nextcloud/talk/controllers/ChatController.java | 4 ++++ app/src/main/res/values/strings.xml | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java index 2a25d561f..7cd27e2fc 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java @@ -20,6 +20,7 @@ package com.nextcloud.talk.adapters.items; +import android.content.res.Resources; import android.text.TextUtils; import android.text.format.DateUtils; import android.view.View; @@ -126,10 +127,14 @@ public class CallItem extends AbstractFlexibleItem int avatarSize = Math.round(NextcloudTalkApplication .getSharedApplication().getResources().getDimension(R.dimen.avatar_size)); + Resources resources = NextcloudTalkApplication.getSharedApplication().getResources(); switch (room.getType()) { case ROOM_TYPE_ONE_TO_ONE_CALL: holder.avatarImageView.setVisibility(View.VISIBLE); + holder.moreMenuButton.setContentDescription(String.format(resources.getString(R.string + .nc_description_more_menu_one_to_one), room.getDisplayName())); + if (!TextUtils.isEmpty(room.getName())) { GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), room.getName(), R.dimen.avatar_size), new LazyHeaders.Builder() @@ -151,6 +156,9 @@ public class CallItem extends AbstractFlexibleItem } break; case ROOM_GROUP_CALL: + holder.moreMenuButton.setContentDescription(String.format(resources.getString(R.string + .nc_description_more_menu_group), room.getDisplayName())); + GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext()) .asBitmap() .diskCacheStrategy(DiskCacheStrategy.NONE) @@ -162,6 +170,9 @@ public class CallItem extends AbstractFlexibleItem holder.avatarImageView.setVisibility(View.VISIBLE); break; case ROOM_PUBLIC_CALL: + holder.moreMenuButton.setContentDescription(String.format(resources.getString(R.string + .nc_description_more_menu_public), room.getDisplayName())); + GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext()) .asBitmap() .diskCacheStrategy(DiskCacheStrategy.NONE) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 298d1b431..84296f171 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -284,6 +284,7 @@ public class ChatController extends BaseController implements MessagesListAdapte getActionBar().show(); boolean adapterWasNull = false; + if (adapter == null) { try { @@ -378,6 +379,9 @@ public class ChatController extends BaseController implements MessagesListAdapte return true; }); + messageInputView.getButton().setContentDescription(getResources() + .getString(R.string.nc_description_send_message_button)); + if (adapterWasNull && startCallFromNotification == null) { getRoomInfo(); } else { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 97c8f3bc0..18a325ba7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -191,4 +191,10 @@ Find Nextcloud on https://nextcloud.com Cancelled by the user. An error occurred while loading more items. + + Menu for conversation with %1$s + Menu for group conversation %1$s + Menu for public conversation %1$s + Send message +