Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update view-once design.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-01-09 14:09:31 -05:00
parent fd7aa9ccfa
commit 8cb6ed26a1
74 changed files with 485 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
View File

@@ -104,18 +104,18 @@ public class ViewOnceMessageView extends LinearLayout {
private void presentText(@NonNull MmsMessageRecord messageRecord) {
if (messageRecord.isOutgoing() && networkInProgress(messageRecord)) {
foregroundColor = openedForegroundColor;
text.setText(R.string.RevealableMessageView_outgoing_media);
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(0);
progress.setVisibility(VISIBLE);
} else if (messageRecord.isOutgoing()) {
foregroundColor = openedForegroundColor;
text.setText(R.string.RevealableMessageView_outgoing_media);
icon.setImageResource(R.drawable.ic_play_outline_24);
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(R.drawable.ic_viewed_once_24);
progress.setVisibility(GONE);
} else if (ViewOnceUtil.isViewable(messageRecord)) {
foregroundColor = unopenedForegroundColor;
text.setText(getDescriptionId(messageRecord));
icon.setImageResource(R.drawable.ic_play_solid_24);
icon.setImageResource(R.drawable.ic_view_once_24);
progress.setVisibility(GONE);
} else if (networkInProgress(messageRecord)) {
foregroundColor = unopenedForegroundColor;
@@ -130,7 +130,7 @@ public class ViewOnceMessageView extends LinearLayout {
} else {
foregroundColor = openedForegroundColor;
text.setText(R.string.RevealableMessageView_viewed);
icon.setImageResource(R.drawable.ic_play_outline_24);
icon.setImageResource(R.drawable.ic_viewed_once_24);
progress.setVisibility(GONE);
}
@@ -158,10 +158,10 @@ public class ViewOnceMessageView extends LinearLayout {
Slide thumbnailSlide = messageRecord.getSlideDeck().getThumbnailSlide();
if (thumbnailSlide != null && MediaUtil.isVideoType(thumbnailSlide.getContentType())) {
return R.string.RevealableMessageView_video;
return R.string.RevealableMessageView_view_video;
}
return R.string.RevealableMessageView_photo;
return R.string.RevealableMessageView_view_photo;
}
@Subscribe(sticky = true, threadMode = ThreadMode.MAIN)