gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-20 19:25:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #222

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-07-02 21:44:46 +02:00
parent d32c98f7d2
commit 126f98c1e6
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/adapters/items/CallItem.java
View File

@ -20,6 +20,7 @@
package com.nextcloud.talk.adapters.items; package com.nextcloud.talk.adapters.items;
import android.content.res.Resources;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.view.View; import android.view.View;
@ -126,10 +127,14 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
int avatarSize = Math.round(NextcloudTalkApplication int avatarSize = Math.round(NextcloudTalkApplication
.getSharedApplication().getResources().getDimension(R.dimen.avatar_size)); .getSharedApplication().getResources().getDimension(R.dimen.avatar_size));
Resources resources = NextcloudTalkApplication.getSharedApplication().getResources();
switch (room.getType()) { switch (room.getType()) {
case ROOM_TYPE_ONE_TO_ONE_CALL: case ROOM_TYPE_ONE_TO_ONE_CALL:
holder.avatarImageView.setVisibility(View.VISIBLE); 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())) { if (!TextUtils.isEmpty(room.getName())) {
GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
room.getName(), R.dimen.avatar_size), new LazyHeaders.Builder() room.getName(), R.dimen.avatar_size), new LazyHeaders.Builder()
@ -151,6 +156,9 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
} }
break; break;
case ROOM_GROUP_CALL: 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()) GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext())
.asBitmap() .asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE)
@ -162,6 +170,9 @@ public class CallItem extends AbstractFlexibleItem<CallItem.RoomItemViewHolder>
holder.avatarImageView.setVisibility(View.VISIBLE); holder.avatarImageView.setVisibility(View.VISIBLE);
break; break;
case ROOM_PUBLIC_CALL: 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()) GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext())
.asBitmap() .asBitmap()
.diskCacheStrategy(DiskCacheStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE)

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

@ -284,6 +284,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
getActionBar().show(); getActionBar().show();
boolean adapterWasNull = false; boolean adapterWasNull = false;
if (adapter == null) { if (adapter == null) {
try { try {
@ -378,6 +379,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
return true; return true;
}); });
messageInputView.getButton().setContentDescription(getResources()
.getString(R.string.nc_description_send_message_button));
if (adapterWasNull && startCallFromNotification == null) { if (adapterWasNull && startCallFromNotification == null) {
getRoomInfo(); getRoomInfo();
} else { } else {

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

@ -191,4 +191,10 @@ Find Nextcloud on https://nextcloud.com</string>
<string name="nc_endless_cancel">Cancelled by the user.</string> <string name="nc_endless_cancel">Cancelled by the user.</string>
<string name="nc_endless_error">An error occurred while loading more items.</string> <string name="nc_endless_error">An error occurred while loading more items.</string>
<!-- Content descriptions -->
<string name="nc_description_more_menu_one_to_one">Menu for conversation with %1$s</string>
<string name="nc_description_more_menu_public">Menu for group conversation %1$s</string>
<string name="nc_description_more_menu_group">Menu for public conversation %1$s</string>
<string name="nc_description_send_message_button">Send message</string>
</resources> </resources>