empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refresh shared media screens.

Browse source
This commit is contained in:
Alex Hart 2021-07-09 10:34:36 -03:00 • committed by Cody Henthorne
parent e584a90f81
commit 416e62112f
15 changed files with 178 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
View file

@ -52,14 +52,14 @@ public final class AudioView extends FrameLayout {
private static final int FORWARDS = 1;
private static final int REVERSE = -1;
@NonNull private final AnimatingToggle controlToggle;
@NonNull private final View progressAndPlay;
@NonNull private final LottieAnimationView playPauseButton;
@NonNull private final ImageView downloadButton;
@NonNull private final ProgressWheel circleProgress;
@NonNull private final SeekBar seekBar;
private final boolean smallView;
private final boolean autoRewind;
@NonNull private final AnimatingToggle controlToggle;
@NonNull private final View progressAndPlay;
@NonNull private final LottieAnimationView playPauseButton;
@NonNull private final ImageView downloadButton;
@Nullable private final ProgressWheel circleProgress;
@NonNull private final SeekBar seekBar;
private final boolean smallView;
private final boolean autoRewind;
@Nullable private final TextView duration;
@ -179,16 +179,20 @@ public final class AudioView extends FrameLayout {
controlToggle.displayQuick(downloadButton);
seekBar.setEnabled(false);
downloadButton.setOnClickListener(new DownloadClickedListener(audio));
if (circleProgress.isSpinning()) circleProgress.stopSpinning();
circleProgress.setVisibility(View.GONE);
if (circleProgress != null) {
if (circleProgress.isSpinning()) circleProgress.stopSpinning();
circleProgress.setVisibility(View.GONE);
}
} else if (showControls && audio.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_STARTED) {
controlToggle.displayQuick(progressAndPlay);
seekBar.setEnabled(false);
circleProgress.setVisibility(View.VISIBLE);
circleProgress.spin();
if (circleProgress != null) {
circleProgress.setVisibility(View.VISIBLE);
circleProgress.spin();
}
} else {
seekBar.setEnabled(true);
if (circleProgress.isSpinning()) circleProgress.stopSpinning();
if (circleProgress != null && circleProgress.isSpinning()) circleProgress.stopSpinning();
showPlayButton();
}
@ -346,7 +350,7 @@ public final class AudioView extends FrameLayout {
duration.setText(getResources().getString(R.string.AudioView_duration, remainingSecs / 60, remainingSecs % 60));
}
if (smallView) {
if (smallView && circleProgress != null) {
circleProgress.setInstantProgress(seekBar.getProgress() == 0 ? 1 : progress);
}
}
@ -357,7 +361,10 @@ public final class AudioView extends FrameLayout {
new LottieValueCallback<>(new SimpleColorFilter(foregroundTint))));
this.downloadButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
this.circleProgress.setBarColor(foregroundTint);
if (circleProgress != null) {
this.circleProgress.setBarColor(foregroundTint);
}
if (this.duration != null) {
this.duration.setTextColor(foregroundTint);
@ -400,11 +407,14 @@ public final class AudioView extends FrameLayout {
}
private void showPlayButton() {
if (!smallView) {
circleProgress.setVisibility(GONE);
} else if (seekBar.getProgress() == 0) {
circleProgress.setInstantProgress(1);
if (circleProgress != null) {
if (!smallView) {
circleProgress.setVisibility(GONE);
} else if (seekBar.getProgress() == 0) {
circleProgress.setInstantProgress(1);
}
}
playPauseButton.setVisibility(VISIBLE);
controlToggle.displayQuick(progressAndPlay);
}
@ -495,7 +505,7 @@ public final class AudioView extends FrameLayout {
@Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
public void onEventAsync(final PartProgressEvent event) {
if (audioSlide != null && event.attachment.equals(audioSlide.asAttachment())) {
if (audioSlide != null && circleProgress != null && event.attachment.equals(audioSlide.asAttachment())) {
circleProgress.setInstantProgress(((float) event.progress) / event.total);
}
}

25
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaGalleryAllAdapter.java
View file

@ -26,6 +26,7 @@ import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.RecyclerView;
@ -421,16 +422,21 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
line1.setText(describe(fromToPair.first(), fromToPair.second()));
}
private String describe(@NonNull Recipient from, @NonNull Recipient thread) {
protected @Nullable String getMediaTitle() {
return fileName.orNull();
}
private @NonNull String describe(@NonNull Recipient from, @NonNull Recipient thread) {
if (from == Recipient.UNKNOWN && thread == Recipient.UNKNOWN) {
return fileName.or(fileTypeDescription);
}
String sentFromToString = getSentFromToString(from, thread);
String mediaTitle = getMediaTitle();
if (fileName.isPresent()) {
if (mediaTitle != null) {
return context.getString(R.string.MediaOverviewActivity_detail_line_2_part,
fileName.get(),
mediaTitle,
sentFromToString);
} else {
return sentFromToString;
@ -479,6 +485,8 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
private final AudioView audioView;
private boolean isVoiceNote;
AudioDetailViewHolder(@NonNull View itemView) {
super(itemView);
this.audioView = itemView.findViewById(R.id.audio);
@ -486,12 +494,14 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
@Override
public void bind(@NonNull Context context, @NonNull MediaDatabase.MediaRecord mediaRecord, @NonNull Slide slide) {
super.bind(context, mediaRecord, slide);
if (!slide.hasAudio()) {
throw new AssertionError();
}
isVoiceNote = slide.asAttachment().isVoiceNote();
super.bind(context, mediaRecord, slide);
long mmsId = Objects.requireNonNull(mediaRecord.getAttachment()).getMmsId();
audioItemListener.unregisterPlaybackStateObserver(audioView.getPlaybackStateObserver());
@ -502,6 +512,11 @@ final class MediaGalleryAllAdapter extends StickyHeaderGridAdapter {
itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(mediaRecord));
}
@Override
protected @NonNull String getMediaTitle() {
return context.getString(R.string.ThreadRecord_voice_message);
}
@Override
void unbind() {
super.unbind();

9
app/src/main/res/drawable/ic_audio_24.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M8.75,21h0A0.76,0.76 0,0 1,8 20.25L8,3.75A0.76,0.76 0,0 1,8.75 3h0a0.76,0.76 0,0 1,0.75 0.75v16.5A0.76,0.76 0,0 1,8.75 21ZM12.5,17.25L12.5,6.75A0.76,0.76 0,0 0,11.75 6h0a0.76,0.76 0,0 0,-0.75 0.75v10.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,12.5 17.25ZM15.5,14.25L15.5,9.75A0.76,0.76 0,0 0,14.75 9h0a0.76,0.76 0,0 0,-0.75 0.75v4.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,15.5 14.25ZM21.5,13.25v-2.5a0.76,0.76 0,0 0,-0.75 -0.75h0a0.76,0.76 0,0 0,-0.75 0.75v2.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,21.5 13.25ZM18.5,17.25L18.5,6.75A0.76,0.76 0,0 0,17.75 6h0a0.76,0.76 0,0 0,-0.75 0.75v10.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,18.5 17.25ZM6.5,15.25L6.5,8.75A0.76,0.76 0,0 0,5.75 8h0A0.76,0.76 0,0 0,5 8.75v6.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,6.5 15.25ZM3.5,13.25v-2.5A0.76,0.76 0,0 0,2.75 10h0a0.76,0.76 0,0 0,-0.75 0.75v2.5a0.76,0.76 0,0 0,0.75 0.75h0A0.76,0.76 0,0 0,3.5 13.25Z"/>
</vector>

46
app/src/main/res/layout/audio_view_circle_small.xml Normal file
View file

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.AnimatingToggle xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/control_toggle"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:padding="8dp"
android:gravity="center"
tools:showIn="@layout/audio_view_small">
<FrameLayout
android:background="@drawable/circle_tintable"
android:id="@+id/progress_and_play"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/play"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@drawable/circle_touch_highlight_background"
android:contentDescription="@string/audio_view__play_pause_accessibility_description"
android:gravity="center_vertical"
android:padding="7dp"
android:visibility="gone"
app:lottie_rawRes="@raw/lottie_play_pause"
tools:visibility="visible" />
</FrameLayout>
<ImageView
android:id="@+id/download"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="@drawable/circle_touch_highlight_background"
android:clickable="true"
android:contentDescription="@string/audio_view__download_accessibility_description"
android:focusable="true"
android:src="@drawable/ic_download_circle_fill_white_48dp"
android:visibility="gone" />
</org.thoughtcrime.securesms.components.AnimatingToggle>

2
app/src/main/res/layout/audio_view_small.xml
View file

@ -9,7 +9,7 @@
android:orientation="vertical"
tools:background="#ff00ff">
<include layout="@layout/audio_view_circle" />
<include layout="@layout/audio_view_circle_small" />
<SeekBar
android:id="@+id/seek"

4
app/src/main/res/layout/media_overview_activity.xml
View file

@ -48,11 +48,12 @@
android:id="@+id/sort_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="24dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textStyle="bold"
android:textColor="@color/signal_inverse_primary"
app:layout_constraintStart_toStartOf="@+id/sorting"
app:layout_constraintTop_toTopOf="parent"
@ -77,6 +78,7 @@
android:layout_height="48dp"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginEnd="@dimen/media_overview_toggle_gutter"
app:layout_constraintBottom_toBottomOf="@+id/sort_order_arrow"
app:layout_constraintEnd_toEndOf="@+id/sorting"
app:layout_constraintTop_toTopOf="@+id/sort_order_arrow">

35
app/src/main/res/layout/media_overview_detail_item_audio.xml
View file

@ -3,24 +3,26 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="56dp">
android:minHeight="@dimen/media_overview_detail_item_height">
<FrameLayout
android:id="@+id/image_container"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dsl_settings_gutter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<org.thoughtcrime.securesms.components.AudioView
android:id="@+id/audio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:autoRewind="true"
app:foregroundTintColor="@color/core_ultramarine"
app:progressAndPlayTint="@android:color/transparent"
app:audioView_mode="small" />
<ImageView
android:id="@+id/icon"
android:layout_width="38dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:background="@drawable/ic_document_large"
android:importantForAccessibility="no"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_audio_24" />
</FrameLayout>
@ -28,4 +30,19 @@
<include layout="@layout/media_overview_detail_text" />
<org.thoughtcrime.securesms.components.AudioView
android:id="@+id/audio"
android:layout_width="48dp"
android:layout_height="48dp"
app:autoRewind="true"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
app:foregroundTintColor="@color/signal_inverse_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@id/media_overview_text"
app:layout_constraintTop_toTopOf="parent"
app:progressAndPlayTint="@color/signal_background_secondary"
app:audioView_mode="small" />
</androidx.constraintlayout.widget.ConstraintLayout>

21
app/src/main/res/layout/media_overview_detail_item_document.xml
View file

@ -2,15 +2,16 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:minHeight="56dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:minHeight="@dimen/media_overview_detail_item_height">
<FrameLayout
android:id="@+id/image_container"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dsl_settings_gutter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -29,13 +30,10 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:gravity="center"
android:scaleType="centerInside"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Signal.Subtitle.Bold"
android:textColor="@color/core_black"
android:textSize="10sp"
android:visibility="visible"
tools:text="PDF"
tools:text="pdf"
tools:visibility="visible" />
</FrameLayout>
@ -44,4 +42,13 @@
<include layout="@layout/media_overview_detail_text" />
<View
android:id="@+id/audio"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/media_overview_detail_item_media.xml
View file

@ -3,13 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="56dp">
android:minHeight="@dimen/media_overview_detail_item_height">
<FrameLayout
android:id="@+id/image_container"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dsl_settings_gutter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -22,12 +23,19 @@
app:thumbnail_radius="8dp"
app:transparent_overlay_color="@color/transparent_black_08" />
</FrameLayout>
<include layout="@layout/media_overview_selected_overlay" />
<include layout="@layout/media_overview_detail_text" />
<View
android:id="@+id/audio"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

16
app/src/main/res/layout/media_overview_detail_text.xml
View file

@ -2,12 +2,17 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/media_overview_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/audio"
app:layout_constraintStart_toEndOf="@+id/image_container"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="@dimen/dsl_settings_gutter"
tools:showIn="@layout/media_overview_detail_item_media">
<TextView
@ -15,10 +20,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:singleLine="true"
android:textSize="14sp"
android:textAppearance="@style/Signal.Text.Body"
app:layout_constraintStart_toEndOf="@+id/image_container"
app:layout_constraintTop_toTopOf="parent"
tools:text="Sent voice note, 02:35" />
@ -28,10 +31,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:singleLine="true"
android:textSize="14sp"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
app:layout_constraintStart_toEndOf="@+id/image_container"
app:layout_constraintTop_toTopOf="parent"
tools:text="2.7 MB, 11.06.19 at 5:25 AM" />

8
app/src/main/res/layout/media_overview_item_header.xml
View file

@ -5,15 +5,15 @@
android:layout_height="wrap_content"
android:background="@color/signal_background_primary"
android:minHeight="48dp"
android:paddingStart="@dimen/dsl_settings_gutter"
android:paddingTop="16dp"
android:paddingEnd="@dimen/dsl_settings_gutter"
android:paddingBottom="12dp">
<TextView
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textStyle="bold"
tools:text="March 1, 2015" />

1
app/src/main/res/values-sw360dp/dimens.xml
View file

@ -17,6 +17,7 @@
<dimen name="media_bubble_gif_width">260dp</dimen>
<dimen name="dsl_settings_gutter">24dp</dimen>
<dimen name="media_overview_toggle_gutter">10dp</dimen>
<dimen name="wallpaper_selection_gutter">16dp</dimen>
<dimen name="chat_colors_preview_bubble_max_width">260dp</dimen>

1
app/src/main/res/values/attrs.xml
View file

@ -71,6 +71,7 @@
<attr name="waveformThumbTint" format="color" />
<attr name="waveformPlayedBarsColor" format="color" />
<attr name="waveformUnplayedBarsColor" format="color" />
<attr name="audioView_showSeekBar" format="boolean" />
<attr name="progressAndPlayTint" format="color" />
<attr name="autoRewind" format="boolean" />
<attr name="audioView_mode" format="enum">

2
app/src/main/res/values/dimens.xml
View file

@ -84,6 +84,7 @@
<dimen name="mention_corner_radius">4dp</dimen>
<integer name="media_overview_cols">4</integer>
<dimen name="media_overview_detail_item_height">72dp</dimen>
<dimen name="message_details_table_row_pad">8dp</dimen>
<dimen name="sticker_page_item_padding">8dp</dimen>
@ -181,6 +182,7 @@
<dimen name="payment_recovery_phrase_outline_margin">32dp</dimen>
<dimen name="dsl_settings_gutter">16dp</dimen>
<dimen name="media_overview_toggle_gutter">2dp</dimen>
<dimen name="wallpaper_selection_gutter">8dp</dimen>
<dimen name="chat_colors_preview_bubble_max_width">240dp</dimen>

1
app/src/main/res/values/strings.xml
View file

@ -942,6 +942,7 @@
<string name="MediaOverviewActivity_image">Image</string>
<string name="MediaOverviewActivity_detail_line_2_part" translatable="false">%1$s &#183; %2$s</string>
<string name="MediaOverviewActivity_detail_line_3_part" translatable="false">%1$s &#183; %2$s &#183; %3$s</string>
<string name="MediaOverviewActivity_voice_message">Voice message</string>
<string name="MediaOverviewActivity_sent_by_s">Sent by %1$s</string>
<string name="MediaOverviewActivity_sent_by_you">Sent by you</string>