Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 12:44:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update AudioView in Attachment keyboard stub.

Browse Source
This commit is contained in:
Alex Hart
2022-09-02 10:37:02 -03:00
committed by Greyson Parrelli
parent e4b2e5022f
commit a45ede9348
2 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
View File

@@ -17,6 +17,7 @@ import android.widget.TextView;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
import com.airbnb.lottie.LottieAnimationView; import com.airbnb.lottie.LottieAnimationView;
@@ -126,6 +127,11 @@ public final class AudioView extends FrameLayout {
setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE)); setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE));
int backgroundTintColor = typedArray.getColor(R.styleable.AudioView_backgroundTintColor, Color.TRANSPARENT);
if (getBackground() != null && backgroundTintColor != Color.TRANSPARENT) {
DrawableCompat.setTint(getBackground(), backgroundTintColor);
}
this.waveFormPlayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformPlayedBarsColor, Color.WHITE); this.waveFormPlayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformPlayedBarsColor, Color.WHITE);
this.waveFormUnplayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformUnplayedBarsColor, Color.WHITE); this.waveFormUnplayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformUnplayedBarsColor, Color.WHITE);
this.waveFormThumbTint = typedArray.getColor(R.styleable.AudioView_waveformThumbTint, Color.WHITE); this.waveFormThumbTint = typedArray.getColor(R.styleable.AudioView_waveformThumbTint, Color.WHITE);

89
app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
View File

@@ -1,61 +1,68 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout 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" xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true" android:id="@+id/attachment_editor"
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:id="@+id/attachment_editor" android:layout_height="wrap_content"
android:layout_width="match_parent" android:gravity="center_horizontal"
android:layout_height="wrap_content" android:visibility="gone"
android:gravity="center_horizontal" tools:viewBindingIgnore="true">
android:visibility="gone">
<org.thoughtcrime.securesms.components.RemovableEditableMediaView <org.thoughtcrime.securesms.components.RemovableEditableMediaView
android:id="@+id/removable_media_view" android:id="@+id/removable_media_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"> android:layout_gravity="center">
<org.thoughtcrime.securesms.components.location.SignalMapView <org.thoughtcrime.securesms.components.location.SignalMapView
android:id="@+id/attachment_location" android:id="@+id/attachment_location"
android:layout_width="210dp" android:layout_width="210dp"
android:layout_height="210dp" android:layout_height="210dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:visibility="gone"/> android:visibility="gone" />
<org.thoughtcrime.securesms.components.ThumbnailView <org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/attachment_thumbnail" android:id="@+id/attachment_thumbnail"
android:layout_width="230dp" android:layout_width="230dp"
android:layout_height="150dp" android:layout_height="150dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:visibility="gone" android:contentDescription="@string/conversation_activity__attachment_thumbnail"
android:contentDescription="@string/conversation_activity__attachment_thumbnail" android:visibility="gone"
app:minWidth="100dp" app:maxHeight="300dp"
app:maxWidth="300dp" app:maxWidth="300dp"
app:minHeight="100dp" app:minHeight="100dp"
app:maxHeight="300dp" /> app:minWidth="100dp" />
<org.thoughtcrime.securesms.components.AudioView <org.thoughtcrime.securesms.components.AudioView
android:id="@+id/attachment_audio" android:id="@+id/attachment_audio"
android:layout_width="210dp" android:layout_width="210dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:minHeight="72dp"
android:paddingTop="15dp" android:paddingTop="16dp"
android:paddingBottom="15dp" android:paddingBottom="24dp"
app:foregroundTintColor="@color/grey_500" android:paddingStart="12dp"
app:backgroundTintColor="@color/signal_background_secondary"/> android:visibility="gone"
android:background="@drawable/rounded_rectangle_secondary_18"
app:backgroundTintColor="@color/signal_colorSurface2"
app:foregroundTintColor="@color/signal_colorOnSurfaceVariant"
app:progressAndPlayTint="@color/audio_play_pause_sent_background_tint"
app:waveformPlayedBarsColor="@color/audio_seek_bar_sent_played_color"
app:waveformThumbTint="@color/audio_seek_bar_sent_played_color"
app:waveformUnplayedBarsColor="@color/audio_seek_bar_sent_unplayed_color" />
<org.thoughtcrime.securesms.components.DocumentView <org.thoughtcrime.securesms.components.DocumentView
android:id="@+id/attachment_document" android:id="@+id/attachment_document"
android:layout_width="210dp" android:layout_width="210dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="@dimen/message_bubble_horizontal_padding"
android:paddingEnd="@dimen/message_bubble_horizontal_padding"
android:background="@drawable/message_bubble_background_sent_alone" android:background="@drawable/message_bubble_background_sent_alone"
app:doc_titleColor="@color/signal_text_primary" android:paddingStart="@dimen/message_bubble_horizontal_padding"
app:doc_captionColor="@color/signal_text_secondary"/> android:paddingTop="8dp"
android:paddingEnd="@dimen/message_bubble_horizontal_padding"
android:paddingBottom="8dp"
android:visibility="gone"
app:doc_captionColor="@color/signal_text_secondary"
app:doc_titleColor="@color/signal_text_primary" />
</org.thoughtcrime.securesms.components.RemovableEditableMediaView> </org.thoughtcrime.securesms.components.RemovableEditableMediaView>