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

Fix #303

Browse Source
This commit is contained in:
Mario Danic 2018-10-09 15:06:14 +02:00
parent a788c20b4a
commit eea7f7ebfe
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
View File

@ -51,23 +51,30 @@ public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageM
if (userAvatar != null) { if (userAvatar != null) {
if (message.isGrouped) { if (message.isGrouped) {
userAvatar.setVisibility(View.INVISIBLE); userAvatar.setVisibility(View.INVISIBLE);
((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, R.dimen.message_bubble_corners_radius, 0, 0);
} else { } else {
userAvatar.setVisibility(View.VISIBLE); userAvatar.setVisibility(View.VISIBLE);
} }
} }
if (message.isGrouped) {
((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, R.dimen.message_bubble_corners_radius, 0, 0); if (message.getUser().getId().equals(message.activeUserId)) {
} else if (message.getUser().getId().equals(message.activeUserId)) { time.setTextColor(NextcloudTalkApplication.getSharedApplication().getResources().getColor(R.color.white60));
((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, 0, 0, 0); if (!message.isGrouped) {
((RoundedImageView) image).setCorners(R.dimen.message_bubble_corners_radius, 0, 0, 0);
}
} else { } else {
((RoundedImageView) image).setCorners(0, R.dimen.message_bubble_corners_radius, 0, 0); time.setTextColor(NextcloudTalkApplication.getSharedApplication().getResources().getColor(R.color.warm_grey_four));
if (!message.isGrouped) {
((RoundedImageView) image).setCorners(0, R.dimen.message_bubble_corners_radius, 0, 0);
}
} }
messageText.setText(message.getSelectedIndividualHashMap().get("name")); messageText.setText(message.getSelectedIndividualHashMap().get("name"));
image.setOnClickListener(v -> { image.setOnClickListener(v -> {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(message.getSelectedIndividualHashMap().get("link"))); Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(message.getSelectedIndividualHashMap().get("link")));
NextcloudTalkApplication.getSharedApplication().getApplicationContext().startActivity(browserIntent); NextcloudTalkApplication.getSharedApplication().getApplicationContext().startActivity(browserIntent);
}); });
} }
} }

2
app/src/main/res/layout/controller_chat.xml
View File

@ -94,8 +94,6 @@
app:outcomingTimeTextSize="12sp" app:outcomingTimeTextSize="12sp"
app:outcomingImageTimeTextSize="12sp" app:outcomingImageTimeTextSize="12sp"
app:incomingImageTimeTextSize="12sp" app:incomingImageTimeTextSize="12sp"
app:outcomingImageTimeTextColor="@color/white60"
app:incomingImageTimeTextColor="@color/warm_grey_four"
app:textAutoLink="all"/> app:textAutoLink="all"/>
<com.webianks.library.PopupBubble <com.webianks.library.PopupBubble