TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 19:56:14 +00: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

4
app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
View File

@@ -29,9 +29,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.recipients.LiveRecipient;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.ThemeUtil;
import org.thoughtcrime.securesms.util.Util;
import java.util.List;
@@ -217,7 +215,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
// Given that most types have images, we specifically check images last
if (!viewOnceSlides.isEmpty()) {
mediaDescriptionText.setText(R.string.QuoteView_media);
mediaDescriptionText.setText(R.string.QuoteView_view_once_media);
} else if (!audioSlides.isEmpty()) {
mediaDescriptionText.setText(R.string.QuoteView_audio);
} else if (!documentSlides.isEmpty()) {

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -1063,7 +1063,9 @@ public class ConversationFragment extends Fragment
}
if (!ViewOnceUtil.isViewable(messageRecord)) {
Log.w(TAG, "View-once photo is not viewable!");
int stringRes = messageRecord.isOutgoing() ? R.string.ConversationFragment_view_once_message_are_not_stored_in_your_conversation_history
: R.string.ConversationFragment_you_already_viewed_this_message;
Toast.makeText(requireContext(), stringRes, Toast.LENGTH_SHORT).show();
return;
}

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

@@ -1214,10 +1214,10 @@ public class ConversationItem extends LinearLayout implements BindableConversati
public void onClick(View view) {
ViewOnceMessageView revealView = (ViewOnceMessageView) view;
if (eventListener != null && batchSelected.isEmpty() && messageRecord.isMms() && ViewOnceUtil.isViewable((MmsMessageRecord) messageRecord)) {
eventListener.onViewOnceMessageClicked((MmsMessageRecord) messageRecord);
} else if (batchSelected.isEmpty() && messageRecord.isMms() && revealView.requiresTapToDownload((MmsMessageRecord) messageRecord)) {
if (batchSelected.isEmpty() && messageRecord.isMms() && revealView.requiresTapToDownload((MmsMessageRecord) messageRecord)) {
singleDownloadClickListener.onClick(view, ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlide());
} else if (eventListener != null && batchSelected.isEmpty() && messageRecord.isMms()) {
eventListener.onViewOnceMessageClicked((MmsMessageRecord) messageRecord);
} else {
passthroughClickListener.onClick(view);
}

6
app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
View File

@@ -146,11 +146,11 @@ public class ThreadRecord extends DisplayRecord {
private String getViewOnceDescription(@NonNull Context context, @Nullable String contentType) {
if (MediaUtil.isViewOnceType(contentType)) {
return context.getString(R.string.ThreadRecord_disappearing_media);
return context.getString(R.string.ThreadRecord_view_once_media);
} else if (MediaUtil.isVideoType(contentType)) {
return context.getString(R.string.ThreadRecord_disappearing_video);
return context.getString(R.string.ThreadRecord_view_once_video);
} else {
return context.getString(R.string.ThreadRecord_disappearing_photo);
return context.getString(R.string.ThreadRecord_view_once_photo);
}
}

4
app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@@ -581,9 +581,9 @@ public class MessageNotifier {
final String contentType = getMessageContentType(messageRecord);
if (MediaUtil.isImageType(contentType)) {
return R.string.MessageNotifier_disappearing_photo;
return R.string.MessageNotifier_view_once_photo;
}
return R.string.MessageNotifier_disappearing_video;
return R.string.MessageNotifier_view_once_video;
}
private static String getMessageContentType(@NonNull MmsMessageRecord messageRecord) {

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)