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

Add partial share and draft support to CFv2.

Browse Source
This commit is contained in:
Cody Henthorne
2023-05-31 14:12:33 -04:00
parent b9ae537706
commit 693aef5c04
25 changed files with 642 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
View File

@@ -191,6 +191,11 @@ public class ComposeText extends EmojiEditText {
setHintWithChecks(hint);
}
public void setDraftText(@Nullable CharSequence draftText) {
setText("");
append(draftText);
}
public void appendInvite(String invite) {
if (getText() == null) {
return;

2
app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
View File

@@ -205,7 +205,7 @@ public class LinkPreviewView extends FrameLayout {
if (showThumbnail && linkPreview.getThumbnail().isPresent()) {
thumbnail.setVisibility(VISIBLE);
thumbnailState.applyState(thumbnail);
thumbnail.get().setImageResource(glideRequests, new ImageSlide(getContext(), linkPreview.getThumbnail().get()), type == TYPE_CONVERSATION, false);
thumbnail.get().setImageResource(glideRequests, new ImageSlide(linkPreview.getThumbnail().get()), type == TYPE_CONVERSATION, false);
thumbnail.get().showDownloadText(false);
} else {
thumbnail.setVisibility(GONE);

2
app/src/main/java/org/thoughtcrime/securesms/components/TransferControlView.java
View File

@@ -201,7 +201,7 @@ public final class TransferControlView extends FrameLayout {
private String getDownloadText(@NonNull List<Slide> slides) {
if (slides.size() == 1) {
return slides.get(0).getContentDescription();
return slides.get(0).getContentDescription(getContext());
} else {
int downloadCount = Stream.of(slides).reduce(0, (count, slide) -> slide.getTransferState() != AttachmentTable.TRANSFER_PROGRESS_DONE ? count + 1 : count);
return getContext().getResources().getQuantityString(R.plurals.TransferControlView_n_items, downloadCount, downloadCount);