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

Update view-once messages

Browse Source
This commit is contained in:
Lucio Maciel
2021-07-29 16:46:32 -03:00
committed by GitHub
parent 9398716848
commit c0c4092cd9
11 changed files with 140 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -479,7 +479,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
footer.setIconColor(colorizer.getOutgoingFooterIconColor(context));
footer.setRevealDotColor(colorizer.getOutgoingFooterIconColor(context));
footer.setOnlyShowSendingStatus(false, messageRecord);
} else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) {
} else if (messageRecord.isRemoteDelete()) {
if (hasWallpaper) {
bodyBubble.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.wallpaper_bubble_color), PorterDuff.Mode.SRC_IN);
} else {
@@ -597,8 +597,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (hasWallpaper) {
return false;
} else {
boolean isIncomingViewedOnce = !messageRecord.isOutgoing() && isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord);
return isIncomingViewedOnce || messageRecord.isRemoteDelete();
return messageRecord.isRemoteDelete();
}
}
@@ -765,10 +764,12 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE);
if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE);
revealableStub.get().setMessage((MmsMessageRecord) messageRecord);
revealableStub.get().setMessage((MmsMessageRecord) messageRecord, hasWallpaper);
revealableStub.get().setOnClickListener(revealableClickListener);
revealableStub.get().setOnLongClickListener(passthroughClickListener);
updateRevealableMargins(messageRecord, previousRecord, nextRecord, isGroupThread);
footer.setVisibility(VISIBLE);
} else if (hasSharedContact(messageRecord)) {
sharedContactStub.get().setVisibility(VISIBLE);
@@ -976,6 +977,24 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
}
private void updateRevealableMargins(MessageRecord messageRecord, Optional<MessageRecord> previous, Optional<MessageRecord> next, boolean isGroupThread) {
int bigMargin = readDimen(R.dimen.message_bubble_revealable_padding);
int smallMargin = readDimen(R.dimen.message_bubble_top_padding);
//noinspection ConstantConditions
if (messageRecord.isOutgoing() || !isStartOfMessageCluster(messageRecord, previous, isGroupThread)) {
ViewUtil.setTopMargin(revealableStub.get(), bigMargin);
} else {
ViewUtil.setTopMargin(revealableStub.get(), smallMargin);
}
if (isFooterVisible(messageRecord, next, isGroupThread)) {
ViewUtil.setBottomMargin(revealableStub.get(), smallMargin);
} else {
ViewUtil.setBottomMargin(revealableStub.get(), bigMargin);
}
}
private void setThumbnailCorners(@NonNull MessageRecord current,
@NonNull Optional<MessageRecord> previous,
@NonNull Optional<MessageRecord> next,
@@ -1234,10 +1253,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
if (sharedContactStub.resolved()) sharedContactStub.get().getFooter().setVisibility(GONE);
if (mediaThumbnailStub.resolved()) mediaThumbnailStub.require().getFooter().setVisibility(GONE);
boolean differentTimestamps = next.isPresent() && !DateUtils.isSameExtendedRelativeTimestamp(next.get().getTimestamp(), current.getTimestamp());
if (forceFooter(messageRecord) || current.getExpiresIn() > 0 || !current.isSecure() || current.isPending() || current.isPendingInsecureSmsFallback() ||
current.isFailed() || current.isRateLimited() || differentTimestamps || isEndOfMessageCluster(current, next, isGroupThread))
if (isFooterVisible(current, next, isGroupThread))
{
ConversationItemFooter activeFooter = getActiveFooter(current);
activeFooter.setVisibility(VISIBLE);
@@ -1439,6 +1455,13 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
return isStartOfMessageCluster(current, previous, isGroupThread) && isEndOfMessageCluster(current, next, isGroupThread);
}
private boolean isFooterVisible(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
boolean differentTimestamps = next.isPresent() && !DateUtils.isSameExtendedRelativeTimestamp(next.get().getTimestamp(), current.getTimestamp());
return forceFooter(messageRecord) || current.getExpiresIn() > 0 || !current.isSecure() || current.isPending() || current.isPendingInsecureSmsFallback() ||
current.isFailed() || current.isRateLimited() || differentTimestamps || isEndOfMessageCluster(current, next, isGroupThread);
}
private void setMessageSpacing(@NonNull Context context, @NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
int spacingBottom = spacingTop;

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

@@ -1,8 +1,11 @@
package org.thoughtcrime.securesms.revealable;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -11,6 +14,9 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.core.widget.ImageViewCompat;
import com.pnikosis.materialishprogress.ProgressWheel;
@@ -24,6 +30,8 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.events.PartProgressEvent;
import org.thoughtcrime.securesms.mms.Slide;
import org.thoughtcrime.securesms.util.ContextUtil;
import org.thoughtcrime.securesms.util.DrawableUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util;
@@ -31,13 +39,15 @@ public class ViewOnceMessageView extends LinearLayout {
private static final String TAG = Log.tag(ViewOnceMessageView.class);
private ImageView icon;
private ProgressWheel progress;
private TextView text;
private Attachment attachment;
private int unopenedForegroundColor;
private int openedForegroundColor;
private int foregroundColor;
private AppCompatImageView icon;
private ProgressWheel progress;
private TextView text;
private Attachment attachment;
private int textColor;
private int openedIconColor;
private int unopenedIconColor;
private int circleColor;
private int circleColorWithWallpaper;
public ViewOnceMessageView(Context context) {
super(context);
@@ -54,10 +64,12 @@ public class ViewOnceMessageView extends LinearLayout {
setOrientation(LinearLayout.HORIZONTAL);
if (attrs != null) {
TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ViewOnceMessageView, 0, 0);
unopenedForegroundColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_unopenedForegroundColor, Color.BLACK);
openedForegroundColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_openedForegroundColor, Color.BLACK);
TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ViewOnceMessageView, 0, 0);
textColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_textColor, Color.BLACK);
openedIconColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_openedIconColor, Color.BLACK);
unopenedIconColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_unopenedIconColor, Color.BLACK);
circleColor = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_circleColor, Color.BLACK);
circleColorWithWallpaper = typedArray.getColor(R.styleable.ViewOnceMessageView_revealable_circleColorWithWallpaper, Color.BLACK);
typedArray.recycle();
}
@@ -91,53 +103,70 @@ public class ViewOnceMessageView extends LinearLayout {
attachment.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_PENDING;
}
public void setMessage(@NonNull MmsMessageRecord message) {
public void setMessage(@NonNull MmsMessageRecord message, boolean hasWallpaper) {
this.attachment = message.getSlideDeck().getThumbnailSlide() != null ? message.getSlideDeck().getThumbnailSlide().asAttachment() : null;
presentMessage(message);
presentMessage(message, hasWallpaper);
}
public void presentMessage(@NonNull MmsMessageRecord message) {
presentText(message);
public void presentMessage(@NonNull MmsMessageRecord message, boolean hasWallpaper) {
presentText(message, hasWallpaper);
}
private void presentText(@NonNull MmsMessageRecord messageRecord) {
private void presentText(@NonNull MmsMessageRecord messageRecord, boolean hasWallpaper) {
int iconColor;
boolean showProgress = false;
if (messageRecord.isOutgoing() && networkInProgress(messageRecord)) {
foregroundColor = openedForegroundColor;
iconColor = openedIconColor;
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(0);
progress.setVisibility(VISIBLE);
showProgress = true;
} else if (messageRecord.isOutgoing()) {
foregroundColor = openedForegroundColor;
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(R.drawable.ic_viewed_once_24);
progress.setVisibility(GONE);
if (messageRecord.isRemoteViewed()) {
iconColor = openedIconColor;
text.setText(R.string.RevealableMessageView_viewed);
icon.setImageResource(R.drawable.ic_viewed_once_24);
} else {
iconColor = unopenedIconColor;
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(R.drawable.ic_view_once_24);
}
} else if (ViewOnceUtil.isViewable(messageRecord)) {
foregroundColor = unopenedForegroundColor;
iconColor = unopenedIconColor;
text.setText(getDescriptionId(messageRecord));
icon.setImageResource(R.drawable.ic_view_once_24);
progress.setVisibility(GONE);
} else if (networkInProgress(messageRecord)) {
foregroundColor = unopenedForegroundColor;
iconColor = unopenedIconColor;
text.setText("");
icon.setImageResource(0);
progress.setVisibility(VISIBLE);
showProgress = true;
} else if (requiresTapToDownload(messageRecord)) {
foregroundColor = unopenedForegroundColor;
iconColor = unopenedIconColor;
text.setText(formatFileSize(messageRecord));
icon.setImageResource(R.drawable.ic_arrow_down_circle_outline_24);
progress.setVisibility(GONE);
} else {
foregroundColor = openedForegroundColor;
iconColor = openedIconColor;
text.setText(R.string.RevealableMessageView_viewed);
icon.setImageResource(R.drawable.ic_viewed_once_24);
progress.setVisibility(GONE);
}
text.setTextColor(foregroundColor);
icon.setColorFilter(foregroundColor);
progress.setBarColor(foregroundColor);
text.setTextColor(textColor);
icon.setColorFilter(iconColor);
icon.setBackgroundDrawable(getBackgroundDrawable(hasWallpaper));
progress.setBarColor(iconColor);
progress.setRimColor(Color.TRANSPARENT);
if (showProgress) {
progress.setVisibility(VISIBLE);
} else {
progress.setVisibility(GONE);
}
}
private Drawable getBackgroundDrawable(boolean hasWallpaper) {
int backgroundColor = hasWallpaper ? circleColorWithWallpaper : circleColor;
Drawable drawable = ContextUtil.requireDrawable(getContext(), R.drawable.circle_tintable);
return DrawableUtil.tint(drawable, backgroundColor);
}
private boolean networkInProgress(@NonNull MmsMessageRecord messageRecord) {