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

show user statuses in conversation info (wip)

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-02-18 15:49:21 +01:00
parent 6057306ab3
commit d453773a1d
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
11 changed files with 206 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

@ -272,7 +272,7 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
apiVersion,
signatureVerification.userEntity.baseUrl,
decryptedPushMessage.id
)
), null
)
.repeatWhen { completed ->
completed.zipWith(Observable.range(1, 12), { _, i -> i })

2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -1755,7 +1755,7 @@ public class CallActivity extends CallBaseActivity {
Log.d(TAG, "getPeersForCall");
int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken))
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken), null)
.subscribeOn(Schedulers.io())
.subscribe(new Observer<ParticipantsOverall>() {
@Override

2
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
View File

@ -215,7 +215,7 @@ public class CallNotificationActivity extends CallBaseActivity {
int apiVersion = ApiUtils.getCallApiVersion(userBeingCalled, new int[]{ApiUtils.APIv4, 1});
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, userBeingCalled.getBaseUrl(),
currentConversation.getToken()))
currentConversation.getToken()), null)
.subscribeOn(Schedulers.io())
.repeatWhen(completed -> completed.zipWith(Observable.range(1, 12), (n, i) -> i)
.flatMap(retryCount -> Observable.timer(5, TimeUnit.SECONDS))

8
app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java
View File

@ -135,7 +135,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
}
if (SOURCE_CALLS.equals(source)) {
holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_group);
holder.participantAvatar.setImageResource(R.drawable.ic_circular_group);
} else {
String avatarId = objectId;
String avatarUrl = ApiUtils.getUrlForAvatarWithName(currentUser.getBaseUrl(),
@ -149,13 +149,13 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem<UserItem.UserI
R.dimen.avatar_size_big);
}
holder.simpleDraweeView.setController(null);
holder.participantAvatar.setController(null);
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
.setOldController(holder.simpleDraweeView.getController())
.setOldController(holder.participantAvatar.getController())
.setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(avatarUrl, null))
.build();
holder.simpleDraweeView.setController(draweeController);
holder.participantAvatar.setController(draweeController);
}
}

134
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
View File

@ -20,15 +20,12 @@
package com.nextcloud.talk.adapters.items;
import android.content.Context;
import android.content.res.Resources;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
import androidx.emoji.widget.EmojiTextView;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.drawee.interfaces.DraweeController;
import com.facebook.drawee.view.SimpleDraweeView;
@ -38,12 +35,17 @@ import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.converters.EnumParticipantTypeConverter;
import com.nextcloud.talk.models.json.participants.Participant;
import com.nextcloud.talk.models.json.participants.Participant.InCallFlags;
import com.nextcloud.talk.models.json.status.StatusType;
import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.DisplayUtils;
import java.util.List;
import java.util.regex.Pattern;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.emoji.widget.EmojiTextView;
import butterknife.BindView;
import butterknife.ButterKnife;
import eu.davidea.flexibleadapter.FlexibleAdapter;
@ -54,14 +56,19 @@ import eu.davidea.flexibleadapter.utils.FlexibleUtils;
import eu.davidea.viewholders.FlexibleViewHolder;
public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder> implements
ISectionable<UserItem.UserItemViewHolder, GenericTextHeaderItem>, IFilterable<String> {
ISectionable<UserItem.UserItemViewHolder, GenericTextHeaderItem>, IFilterable<String> {
private Context context;
private Participant participant;
private UserEntity userEntity;
private GenericTextHeaderItem header;
public boolean isOnline = true;
public UserItem(Participant participant, UserEntity userEntity, GenericTextHeaderItem genericTextHeaderItem) {
public UserItem(Context activityContext,
Participant participant,
UserEntity userEntity,
GenericTextHeaderItem genericTextHeaderItem) {
this.context = activityContext;
this.participant = participant;
this.userEntity = userEntity;
this.header = genericTextHeaderItem;
@ -72,7 +79,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
if (o instanceof UserItem) {
UserItem inItem = (UserItem) o;
return participant.getActorType() == inItem.getModel().getActorType() &&
participant.getActorId().equals(inItem.getModel().getActorId());
participant.getActorId().equals(inItem.getModel().getActorId());
}
return false;
}
@ -112,7 +119,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
@Override
public void bindViewHolder(FlexibleAdapter adapter, UserItemViewHolder holder, int position, List payloads) {
holder.simpleDraweeView.setController(null);
holder.participantAvatar.setController(null);
if (holder.checkedImageView != null) {
if (participant.isSelected()) {
@ -122,69 +129,88 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
}
}
if (participant.status != null && participant.status.equals(StatusType.DND.getString())) {
setOnlineStateIcon(holder, R.drawable.ic_user_status_dnd_with_border);
} else if (participant.statusIcon != null && !participant.statusIcon.isEmpty()) {
holder.participantOnlineStateImage.setVisibility(View.GONE);
holder.participantEmoji.setVisibility(View.VISIBLE);
holder.participantEmoji.setText(participant.statusIcon);
} else if (participant.status != null && participant.status.equals(StatusType.AWAY.getString())) {
setOnlineStateIcon(holder, R.drawable.ic_user_status_away_with_border);
} else if (participant.status != null && participant.status.equals(StatusType.ONLINE.getString())) {
setOnlineStateIcon(holder, R.drawable.online_status_with_border);
} else {
holder.participantEmoji.setVisibility(View.GONE);
holder.participantOnlineStateImage.setVisibility(View.GONE);
}
if (participant.statusMessage != null) {
holder.statusMessage.setText(participant.statusMessage);
}
if (!isOnline) {
holder.contactDisplayName.setTextColor(ResourcesCompat.getColor(
holder.contactDisplayName.getContext().getResources(),
R.color.medium_emphasis_text,
null)
);
holder.simpleDraweeView.setAlpha(0.38f);
holder.contactDisplayName.getContext().getResources(),
R.color.medium_emphasis_text,
null)
);
holder.participantAvatar.setAlpha(0.38f);
} else {
holder.contactDisplayName.setTextColor(ResourcesCompat.getColor(
holder.contactDisplayName.getContext().getResources(),
R.color.high_emphasis_text,
null)
);
holder.simpleDraweeView.setAlpha(1.0f);
holder.contactDisplayName.getContext().getResources(),
R.color.high_emphasis_text,
null)
);
holder.participantAvatar.setAlpha(1.0f);
}
if (adapter.hasFilter()) {
FlexibleUtils.highlightText(holder.contactDisplayName, participant.getDisplayName(),
String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.Companion.getSharedApplication()
.getResources().getColor(R.color.colorPrimary));
String.valueOf(adapter.getFilter(String.class)), NextcloudTalkApplication.Companion.getSharedApplication()
.getResources().getColor(R.color.colorPrimary));
}
holder.contactDisplayName.setText(participant.getDisplayName());
if (TextUtils.isEmpty(participant.getDisplayName()) &&
(participant.getType().equals(Participant.ParticipantType.GUEST) || participant.getType().equals(Participant.ParticipantType.USER_FOLLOWING_LINK))) {
(participant.getType().equals(Participant.ParticipantType.GUEST) || participant.getType().equals(Participant.ParticipantType.USER_FOLLOWING_LINK))) {
holder.contactDisplayName.setText(NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest));
}
if (participant.getActorType() == Participant.ActorType.GROUPS ||
"groups".equals(participant.getSource()) ||
participant.getActorType() == Participant.ActorType.CIRCLES ||
"circles".equals(participant.getSource())) {
holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_group);
"groups".equals(participant.getSource()) ||
participant.getActorType() == Participant.ActorType.CIRCLES ||
"circles".equals(participant.getSource())) {
holder.participantAvatar.setImageResource(R.drawable.ic_circular_group);
} else if (participant.getActorType() == Participant.ActorType.EMAILS) {
holder.simpleDraweeView.setImageResource(R.drawable.ic_circular_mail);
holder.participantAvatar.setImageResource(R.drawable.ic_circular_mail);
} else if (participant.getActorType() == Participant.ActorType.GUESTS ||
Participant.ParticipantType.GUEST.equals(participant.getType()) ||
Participant.ParticipantType.GUEST_MODERATOR.equals(participant.getType())) {
Participant.ParticipantType.GUEST.equals(participant.getType()) ||
Participant.ParticipantType.GUEST_MODERATOR.equals(participant.getType())) {
String displayName = NextcloudTalkApplication.Companion.getSharedApplication()
.getResources().getString(R.string.nc_guest);
.getResources().getString(R.string.nc_guest);
if (!TextUtils.isEmpty(participant.getDisplayName())) {
displayName = participant.getDisplayName();
}
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
.setOldController(holder.simpleDraweeView.getController())
.setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithNameForGuests(userEntity.getBaseUrl(),
displayName, R.dimen.avatar_size), null))
.build();
holder.simpleDraweeView.setController(draweeController);
.setOldController(holder.participantAvatar.getController())
.setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithNameForGuests(userEntity.getBaseUrl(),
displayName, R.dimen.avatar_size), null))
.build();
holder.participantAvatar.setController(draweeController);
} else if (participant.getActorType() == Participant.ActorType.USERS || participant.getSource().equals("users")) {
DraweeController draweeController = Fresco.newDraweeControllerBuilder()
.setOldController(holder.simpleDraweeView.getController())
.setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
participant.getActorId(), R.dimen.avatar_size), null))
.build();
holder.simpleDraweeView.setController(draweeController);
.setOldController(holder.participantAvatar.getController())
.setAutoPlayAnimations(true)
.setImageRequest(DisplayUtils.getImageRequestForUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(),
participant.getActorId(), R.dimen.avatar_size), null))
.build();
holder.participantAvatar.setController(draweeController);
}
Resources resources = NextcloudTalkApplication.Companion.getSharedApplication().getResources();
@ -195,17 +221,17 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
holder.videoCallIconView.setImageResource(R.drawable.ic_call_grey_600_24dp);
holder.videoCallIconView.setVisibility(View.VISIBLE);
holder.videoCallIconView.setContentDescription(
resources.getString(R.string.nc_call_state_with_phone, participant.displayName));
resources.getString(R.string.nc_call_state_with_phone, participant.displayName));
} else if ((inCallFlag & InCallFlags.WITH_VIDEO) > 0) {
holder.videoCallIconView.setImageResource(R.drawable.ic_videocam_grey_600_24dp);
holder.videoCallIconView.setVisibility(View.VISIBLE);
holder.videoCallIconView.setContentDescription(
resources.getString(R.string.nc_call_state_with_video, participant.displayName));
resources.getString(R.string.nc_call_state_with_video, participant.displayName));
} else if (inCallFlag > InCallFlags.DISCONNECTED) {
holder.videoCallIconView.setImageResource(R.drawable.ic_mic_grey_600_24dp);
holder.videoCallIconView.setVisibility(View.VISIBLE);
holder.videoCallIconView.setContentDescription(
resources.getString(R.string.nc_call_state_in_call, participant.displayName));
resources.getString(R.string.nc_call_state_in_call, participant.displayName));
} else {
holder.videoCallIconView.setVisibility(View.GONE);
}
@ -250,11 +276,17 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
}
}
private void setOnlineStateIcon(UserItem.UserItemViewHolder holder, int icon) {
holder.participantEmoji.setVisibility(View.GONE);
holder.participantOnlineStateImage.setVisibility(View.VISIBLE);
holder.participantOnlineStateImage.setImageDrawable(ContextCompat.getDrawable(context, icon));
}
@Override
public boolean filter(String constraint) {
return participant.getDisplayName() != null &&
(Pattern.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(participant.getDisplayName().trim()).find() ||
Pattern.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(participant.getActorId().trim()).find());
(Pattern.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(participant.getDisplayName().trim()).find() ||
Pattern.compile(constraint, Pattern.CASE_INSENSITIVE | Pattern.LITERAL).matcher(participant.getActorId().trim()).find());
}
@Override
@ -271,8 +303,8 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
@BindView(R.id.name_text)
public EmojiTextView contactDisplayName;
@BindView(R.id.simple_drawee_view)
public SimpleDraweeView simpleDraweeView;
@BindView(R.id.conversation_info_participant_avatar)
public SimpleDraweeView participantAvatar;
@Nullable
@BindView(R.id.secondary_text)
public EmojiTextView contactMentionId;
@ -282,6 +314,12 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
@Nullable
@BindView(R.id.checkedImageView)
ImageView checkedImageView;
@BindView(R.id.conversation_info_participant_emoji)
com.vanniktech.emoji.EmojiEditText participantEmoji;
@BindView(R.id.conversation_info_participant_online_state)
ImageView participantOnlineStateImage;
@BindView(R.id.conversation_info_status_message)
EmojiTextView statusMessage;
/**
* Default constructor.

3
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -187,7 +187,8 @@ public interface NcApi {
Server URL is: baseUrl + ocsApiVersion + spreedApiVersion + /call/callToken
*/
@GET
Observable<ParticipantsOverall> getPeersForCall(@Header("Authorization") String authorization, @Url String url);
Observable<ParticipantsOverall> getPeersForCall(@Header("Authorization") String authorization, @Url String url,
@QueryMap Map<String, Boolean> fields);
@FormUrlEncoded
@POST

1
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -551,6 +551,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
}
UserItem newContactItem = new UserItem(
getApplicationContext(),
participant,
currentUser,
userHeaderItems.get(headerTitle)

24
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -88,6 +88,7 @@ import org.greenrobot.eventbus.ThreadMode
import java.util.Calendar
import java.util.Collections
import java.util.Comparator
import java.util.HashMap
import java.util.Locale
import javax.inject.Inject
@ -120,7 +121,7 @@ class ConversationInfoController(args: Bundle) :
private var conversation: Conversation? = null
private var adapter: FlexibleAdapter<UserItem>? = null
private var recyclerViewItems: MutableList<UserItem> = ArrayList()
private var userItems: MutableList<UserItem> = ArrayList()
private var saveStateHandler: LovelySaveStateHandler? = null
@ -362,7 +363,7 @@ class ConversationInfoController(args: Bundle) :
private fun setupAdapter() {
if (activity != null) {
if (adapter == null) {
adapter = FlexibleAdapter(recyclerViewItems, activity, true)
adapter = FlexibleAdapter(userItems, activity, true)
}
val layoutManager = SmoothScrollLinearLayoutManager(activity)
@ -378,12 +379,12 @@ class ConversationInfoController(args: Bundle) :
var userItem: UserItem
var participant: Participant
recyclerViewItems = ArrayList()
userItems = ArrayList()
var ownUserItem: UserItem? = null
for (i in participants.indices) {
participant = participants[i]
userItem = UserItem(participant, conversationUser, null)
userItem = UserItem(context, participant, conversationUser, null)
if (participant.sessionId != null) {
userItem.isOnline = !participant.sessionId.equals("0")
} else {
@ -395,20 +396,20 @@ class ConversationInfoController(args: Bundle) :
ownUserItem.model.sessionId = "-1"
ownUserItem.isOnline = true
} else {
recyclerViewItems.add(userItem)
userItems.add(userItem)
}
}
Collections.sort(recyclerViewItems, UserItemComparator())
Collections.sort(userItems, UserItemComparator())
if (ownUserItem != null) {
recyclerViewItems.add(0, ownUserItem)
userItems.add(0, ownUserItem)
}
setupAdapter()
binding.participantsListCategory.visibility = View.VISIBLE
adapter!!.updateDataSet(recyclerViewItems)
adapter!!.updateDataSet(userItems)
}
override val title: String
@ -426,9 +427,12 @@ class ConversationInfoController(args: Bundle) :
apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.APIv4, 1))
}
val fieldMap = HashMap<String, Boolean>()
fieldMap["includeStatus"] = true
ncApi?.getPeersForCall(
credentials,
ApiUtils.getUrlForParticipants(apiVersion, conversationUser!!.baseUrl, conversationToken)
ApiUtils.getUrlForParticipants(apiVersion, conversationUser!!.baseUrl, conversationToken), fieldMap
)
?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())
@ -462,7 +466,7 @@ class ConversationInfoController(args: Bundle) :
val bundle = Bundle()
val existingParticipantsId = arrayListOf<String>()
for (userItem in recyclerViewItems) {
for (userItem in userItems) {
if (userItem.model.getActorType() == USERS) {
existingParticipantsId.add(userItem.model.getActorId())
}

9
app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.java
View File

@ -78,6 +78,15 @@ public class Participant {
@JsonField(name = "inCall")
public Object inCall;
@JsonField(name = "status")
public String status;
@JsonField(name = "statusIcon")
public String statusIcon;
@JsonField(name = "statusMessage")
public String statusMessage;
public String source;
public boolean selected;

136
app/src/main/res/layout/rv_item_conversation_info_participant.xml
View File

@ -18,67 +18,103 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/relativeLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/item_height"
android:orientation="vertical">
android:layout_height="@dimen/item_height">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/simple_drawee_view"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:id="@+id/conversation_info_participant_avatar"
android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:contentDescription="@null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundAsCircle="true" />
<com.vanniktech.emoji.EmojiEditText
android:id="@+id/conversation_info_participant_emoji"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@color/transparent"
android:cursorVisible="false"
android:gravity="center"
android:text="@string/default_emoji"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@+id/conversation_info_participant_avatar"
app:layout_constraintTop_toBottomOf="@+id/name_text" />
<ImageView
android:id="@+id/conversation_info_participant_online_state"
android:layout_width="16dp"
android:layout_height="16dp"
android:contentDescription="@null"
android:src="@drawable/online_status"
app:layout_constraintBottom_toBottomOf="@+id/conversation_info_participant_avatar"
app:layout_constraintEnd_toEndOf="@+id/conversation_info_participant_avatar" />
<androidx.emoji.widget.EmojiTextView
android:id="@+id/name_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:ellipsize="middle"
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/conversation_item_header"
app:layout_constraintStart_toEndOf="@id/conversation_info_participant_avatar"
app:layout_constraintTop_toTopOf="parent"
tools:text="Jane Doe" />
<androidx.emoji.widget.EmojiTextView
android:id="@+id/conversation_info_status_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:ellipsize="middle"
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/conversation_item_header"
app:layout_constraintStart_toEndOf="@+id/conversation_info_participant_emoji"
app:layout_constraintTop_toBottomOf="@+id/name_text"
tools:text="gone shopping" />
<androidx.emoji.widget.EmojiTextView
android:id="@+id/secondary_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:ellipsize="middle"
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintStart_toEndOf="@+id/name_text"
app:layout_constraintTop_toTopOf="@+id/name_text"
tools:text="@string/nc_moderator" />
<ImageView
android:id="@+id/videoCallIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:src="@drawable/ic_videocam_grey_600_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:contentDescription="@null"
android:src="@drawable/ic_videocam_grey_600_24dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="@dimen/margin_between_elements"
android:layout_marginEnd="@dimen/margin_between_elements"
android:layout_toEndOf="@id/simple_drawee_view"
android:layout_toStartOf="@id/videoCallIcon"
android:orientation="vertical">
<androidx.emoji.widget.EmojiTextView
android:id="@+id/name_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/conversation_item_header"
tools:text="Jane Doe" />
<androidx.emoji.widget.EmojiTextView
android:id="@+id/secondary_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorSecondary"
tools:text="@string/nc_moderator" />
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -43,8 +43,7 @@
android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height"
android:contentDescription="@null"
app:roundAsCircle="true"
tools:src="@drawable/ic_call_black_24dp" />
app:roundAsCircle="true" />
<ImageView
android:id="@+id/favoriteConversationImageView"