diff --git a/app/build.gradle b/app/build.gradle
index 9538121cd8..89abde34d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -120,6 +120,7 @@ dependencies {
implementation('com.github.bumptech.glide:glide:4.9.0') {
exclude group: 'com.android.support'
}
+ implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
diff --git a/app/res/color/connect_message_audio_track_inactive.xml b/app/res/color/connect_message_audio_track_inactive.xml
new file mode 100644
index 0000000000..8e36235aaf
--- /dev/null
+++ b/app/res/color/connect_message_audio_track_inactive.xml
@@ -0,0 +1,4 @@
+
+
+ - @style/ConnectBottomSheetAnimation
+
+
+
+
+
+
+
+
diff --git a/app/res/xml/provider_paths.xml b/app/res/xml/provider_paths.xml
index 5749213627..b2c40a3c77 100644
--- a/app/res/xml/provider_paths.xml
+++ b/app/res/xml/provider_paths.xml
@@ -3,4 +3,5 @@
+
diff --git a/app/src/org/commcare/adapters/ConnectMessageAdapter.java b/app/src/org/commcare/adapters/ConnectMessageAdapter.java
index 9929af350c..4bd71469ea 100644
--- a/app/src/org/commcare/adapters/ConnectMessageAdapter.java
+++ b/app/src/org/commcare/adapters/ConnectMessageAdapter.java
@@ -1,20 +1,27 @@
package org.commcare.adapters;
import android.text.SpannableStringBuilder;
+import android.util.DisplayMetrics;
import android.view.LayoutInflater;
+import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewbinding.ViewBinding;
import org.commcare.dalvik.R;
+import org.commcare.dalvik.databinding.ItemChatLeftRichViewBinding;
import org.commcare.dalvik.databinding.ItemChatLeftViewBinding;
import org.commcare.dalvik.databinding.ItemChatRightViewBinding;
+import org.commcare.fragments.connectMessaging.ConnectMessageAttachmentListener;
+import org.commcare.fragments.connectMessaging.ConnectMessageAttachmentsBinder;
import org.commcare.fragments.connectMessaging.ConnectMessageChatData;
+import org.commcare.fragments.connectMessaging.ConnectMessageMediaSizer;
import org.commcare.utils.MarkupUtil;
import org.javarosa.core.model.utils.DateUtils;
@@ -26,18 +33,20 @@ public class ConnectMessageAdapter extends RecyclerView.Adapter messages;
+ private final ConnectMessageAttachmentListener attachmentListener;
- public ConnectMessageAdapter(List messages) {
+ public ConnectMessageAdapter(List messages,
+ ConnectMessageAttachmentListener attachmentListener) {
this.messages = messages;
+ this.attachmentListener = attachmentListener;
}
- /**
- * Applies the new message list as a diff against the displayed one.
- *
- * @return true if the new list contains a message that was not already displayed
- */
public boolean updateData(List newMessages) {
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(
new MessageDiffCallback(messages, newMessages));
@@ -101,6 +110,7 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
ConnectMessageChatData oldChat = oldMessages.get(oldItemPosition);
ConnectMessageChatData newChat = newMessages.get(newItemPosition);
return hasSameDisplayContent(oldChat, newChat)
+ && hasSameAttachmentContent(oldChat, newChat)
&& oldChat.isMessageRead() == newChat.isMessageRead();
}
@@ -109,14 +119,27 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
public Object getChangePayload(int oldItemPosition, int newItemPosition) {
ConnectMessageChatData oldChat = oldMessages.get(oldItemPosition);
ConnectMessageChatData newChat = newMessages.get(newItemPosition);
- return hasSameDisplayContent(oldChat, newChat) ? PAYLOAD_READ_STATUS : null;
+ if (!hasSameDisplayContent(oldChat, newChat)) {
+ return null;
+ }
+ if (!hasSameAttachmentContent(oldChat, newChat)) {
+ return oldChat.hasRichContent() && newChat.hasRichContent() ? PAYLOAD_ATTACHMENTS : null;
+ }
+ return PAYLOAD_READ_STATUS;
+ }
+
+ private static boolean hasSameAttachmentContent(ConnectMessageChatData oldChat,
+ ConnectMessageChatData newChat) {
+ return oldChat.getAttachments().equals(newChat.getAttachments())
+ && oldChat.getPendingDownloadState() == newChat.getPendingDownloadState();
}
private static boolean hasSameDisplayContent(ConnectMessageChatData oldChat,
ConnectMessageChatData newChat) {
return oldChat.getType() == newChat.getType()
&& Objects.equals(oldChat.getMessage(), newChat.getMessage())
- && Objects.equals(oldChat.getTimestamp(), newChat.getTimestamp());
+ && Objects.equals(oldChat.getTimestamp(), newChat.getTimestamp())
+ && oldChat.isUnsupportedVersion() == newChat.isUnsupportedVersion();
}
}
@@ -133,6 +156,90 @@ public RightViewHolder(ItemChatRightViewBinding binding) {
}
}
+ public class RichLeftViewHolder extends BaseMessageViewHolder {
+ private final ItemChatLeftRichViewBinding richBinding;
+ private final ViewGroup messageList;
+ private final ConnectMessageAttachmentsBinder attachmentsBinder;
+
+ public RichLeftViewHolder(ItemChatLeftRichViewBinding binding, ViewGroup messageList) {
+ super(binding);
+ this.richBinding = binding;
+ this.messageList = messageList;
+ this.attachmentsBinder = new ConnectMessageAttachmentsBinder(binding.llAttachments,
+ attachmentListener);
+ }
+
+ @Override
+ public void bind(ConnectMessageChatData chat) {
+ super.bind(chat);
+ bindAttachments(chat);
+ }
+
+ public void bindAttachments(ConnectMessageChatData chat) {
+ boolean unsupported = chat.isUnsupportedVersion();
+ boolean awaitingDownload = chat.isAwaitingDownload();
+ boolean showsTile = unsupported || awaitingDownload;
+ boolean hasAttachments = showsTile || !chat.getAttachments().isEmpty();
+ boolean hasText = chat.getMessage() != null && !chat.getMessage().trim().isEmpty();
+ richBinding.tvChatMessage.setVisibility(showsTile || !hasText ? View.GONE : View.VISIBLE);
+ ConstraintLayout.LayoutParams guidelineParams =
+ (ConstraintLayout.LayoutParams)richBinding.guideline.getLayoutParams();
+ guidelineParams.guidePercent = hasAttachments
+ ? MEDIA_BUBBLE_WIDTH_FRACTION
+ : TEXT_BUBBLE_WIDTH_FRACTION;
+ richBinding.guideline.setLayoutParams(guidelineParams);
+
+ ConnectMessageAttachmentsBinder.Layout layout;
+ if (unsupported) {
+ layout = attachmentsBinder.bindUnsupportedMessage();
+ } else if (awaitingDownload) {
+ layout = attachmentsBinder.bindPendingMessage(chat.getMessageId(), chat.getPendingDownloadState());
+ } else {
+ layout = attachmentsBinder.bind(chat.getAttachments(), maxMediaWidth(), maxMediaHeight());
+ }
+
+ ViewGroup.LayoutParams bubbleParams = richBinding.llBubble.getLayoutParams();
+ bubbleParams.width = layout.getFillsBubbleWidth()
+ ? ViewGroup.LayoutParams.MATCH_PARENT
+ : ViewGroup.LayoutParams.WRAP_CONTENT;
+ richBinding.llBubble.setLayoutParams(bubbleParams);
+ richBinding.tvChatMessage.setMaxWidth(hasAttachments && !layout.getFillsBubbleWidth()
+ ? Math.max(layout.getContentWidth(), bubbleContentWidth(TEXT_BUBBLE_WIDTH_FRACTION))
+ : Integer.MAX_VALUE);
+ }
+
+ private int maxMediaWidth() {
+ return bubbleContentWidth(MEDIA_BUBBLE_WIDTH_FRACTION);
+ }
+
+ private int listWidth() {
+ if (messageList instanceof RecyclerView) {
+ RecyclerView.LayoutManager layoutManager = ((RecyclerView)messageList).getLayoutManager();
+ if (layoutManager != null && layoutManager.getWidth() > 0) {
+ return layoutManager.getWidth();
+ }
+ }
+ return messageList.getWidth() > 0 ? messageList.getWidth() : displayMetrics().widthPixels;
+ }
+
+ private int bubbleContentWidth(float bubbleWidthFraction) {
+ int rowWidth = listWidth();
+ int rowMargins = 2 * itemView.getResources().getDimensionPixelSize(R.dimen.spacer_small);
+ int bubblePadding = 2 * itemView.getResources().getDimensionPixelSize(R.dimen.connect_message_bubble_padding);
+ int tailWidth = richBinding.edge.getDrawable().getIntrinsicWidth();
+ return Math.max(1, (int)(rowWidth * bubbleWidthFraction) - rowMargins - tailWidth - bubblePadding);
+ }
+
+ private int maxMediaHeight() {
+ return Math.max(1, (int)(displayMetrics().heightPixels
+ * ConnectMessageMediaSizer.MAX_HEIGHT_FRACTION_OF_WINDOW));
+ }
+
+ private DisplayMetrics displayMetrics() {
+ return itemView.getResources().getDisplayMetrics();
+ }
+ }
+
public class BaseMessageViewHolder extends RecyclerView.ViewHolder {
ViewBinding binding;
@@ -150,6 +257,9 @@ public void bind(ConnectMessageChatData chat) {
if (binding instanceof ItemChatLeftViewBinding) {
tvChatMessage = ((ItemChatLeftViewBinding)binding).tvChatMessage;
tvChatDate = ((ItemChatLeftViewBinding)binding).tvChatDate;
+ } else if (binding instanceof ItemChatLeftRichViewBinding) {
+ tvChatMessage = ((ItemChatLeftRichViewBinding)binding).tvChatMessage;
+ tvChatDate = ((ItemChatLeftRichViewBinding)binding).tvChatDate;
} else {
tvChatMessage = ((ItemChatRightViewBinding)binding).tvChatMessage;
tvChatDate = ((ItemChatRightViewBinding)binding).tvChatDate;
@@ -173,31 +283,30 @@ public void bindReadStatus(ConnectMessageChatData chat) {
@NonNull
@Override
public BaseMessageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- if (viewType == LEFTVIEW) {
- ItemChatLeftViewBinding binding = ItemChatLeftViewBinding.inflate(
- LayoutInflater.from(parent.getContext()), parent, false);
+ LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+ if (viewType == LEFT_RICH_VIEW) {
+ ItemChatLeftRichViewBinding binding = ItemChatLeftRichViewBinding.inflate(inflater, parent, false);
+ return new RichLeftViewHolder(binding, parent);
+ } else if (viewType == LEFTVIEW) {
+ ItemChatLeftViewBinding binding = ItemChatLeftViewBinding.inflate(inflater, parent, false);
return new LeftViewHolder(binding);
} else {
- ItemChatRightViewBinding binding = ItemChatRightViewBinding.inflate(
- LayoutInflater.from(parent.getContext()), parent, false);
+ ItemChatRightViewBinding binding = ItemChatRightViewBinding.inflate(inflater, parent, false);
return new RightViewHolder(binding);
}
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
- ConnectMessageChatData chat = messages.get(position);
- if (getItemViewType(position) == LEFTVIEW) {
- ((LeftViewHolder)holder).bind(chat);
- } else {
- ((RightViewHolder)holder).bind(chat);
- }
+ ((BaseMessageViewHolder)holder).bind(messages.get(position));
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position,
@NonNull List