From e58b61768951577cb10f5935bdda5f16f4bdffe9 Mon Sep 17 00:00:00 2001 From: Lucio Maciel Date: Tue, 3 Aug 2021 11:52:22 -0300 Subject: [PATCH] Revert grouping body+footer --- .../components/ConversationItemFooter.java | 1 - .../conversation/ConversationItem.java | 19 +++--- .../conversation_item_received_multimedia.xml | 64 ++++++++----------- .../conversation_item_received_text_only.xml | 64 ++++++++----------- .../conversation_item_sent_multimedia.xml | 62 ++++++++---------- .../conversation_item_sent_text_only.xml | 63 ++++++++---------- 6 files changed, 116 insertions(+), 157 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java index 8070c1e42f..e6283959e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java @@ -25,7 +25,6 @@ import com.airbnb.lottie.LottieProperty; import com.airbnb.lottie.model.KeyPath; import org.signal.core.util.concurrent.SignalExecutors; -import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 02e6ee3b41..b31a879a6b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -88,7 +88,6 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessageDatabase; -import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; @@ -177,7 +176,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo protected View replyIcon; @Nullable protected ViewGroup contactPhotoHolder; @Nullable private QuoteView quoteView; - private ViewGroup bodyFooterContainer; private EmojiTextView bodyText; private ConversationItemFooter footer; private ConversationItemFooter stickerFooter; @@ -246,7 +244,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo this.backgroundDrawable = new ClipProjectionDrawable(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.conversation_item_background))); - this.bodyFooterContainer = findViewById(R.id.conversation_item_body_footer_container); this.bodyText = findViewById(R.id.conversation_item_body); this.footer = findViewById(R.id.conversation_item_footer); this.stickerFooter = findViewById(R.id.conversation_item_sticker_footer); @@ -787,7 +784,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo setSharedContactCorners(messageRecord, previousRecord, nextRecord, isGroupThread); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setVisibility(GONE); } else if (hasLinkPreview(messageRecord) && messageRequestAccepted) { @@ -815,14 +812,14 @@ public final class ConversationItem extends RelativeLayout implements BindableCo setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread); setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, true); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.setTopMargin(linkPreviewStub.get(), 0); } else { linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, true); linkPreviewStub.get().setDownloadClickedListener(downloadClickListener); setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, false); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); //noinspection ConstantConditions @@ -854,7 +851,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo Log.w(TAG, "setMediaAttributes: could not register listener for audio slide " + audioViewStub.get().getAudioSlideUri()); } - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setPlaybackSpeedListener(new AudioPlaybackSpeedToggleListener()); @@ -874,7 +871,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo documentViewStub.get().setDownloadClickListener(singleDownloadClickListener); documentViewStub.get().setOnLongClickListener(passthroughClickListener); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.setTopMargin(bodyText, 0); @@ -904,7 +901,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo stickerStub.get().setOnLongClickListener(passthroughClickListener); stickerStub.get().setOnClickListener(passthroughClickListener); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setVisibility(VISIBLE); @@ -940,7 +937,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setVisibility(VISIBLE); @@ -969,7 +966,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); if (revealableStub.resolved()) revealableStub.get().setVisibility(View.GONE); - ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setVisibility(VISIBLE); diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml index 8ea41046a4..b636d6d651 100644 --- a/app/src/main/res/layout/conversation_item_received_multimedia.xml +++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml @@ -163,46 +163,38 @@ android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:layout="@layout/conversation_item_received_revealable" /> - + + - - - - - + app:footer_icon_color="@color/conversation_item_sent_text_secondary_color" + app:footer_mode="incoming" + app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color" + app:footer_text_color="@color/conversation_item_sent_text_secondary_color" /> - + + - - - - - - + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_mode="incoming" + app:footer_reveal_dot_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> - + + - - - - - - + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_mode="outgoing" + app:footer_reveal_dot_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> - + + - - - - - - + app:footer_icon_color="@color/conversation_item_sent_text_secondary_color" + app:footer_mode="outgoing" + app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color" + app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />