Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow to properly click in audio messages in multi-select mode #2728

Merged
merged 3 commits into from
Oct 6, 2023
Merged

allow to properly click in audio messages in multi-select mode #2728

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b24ab37
allow to properly click in audio messages in multi-select mode
adbenitez Oct 6, 2023
4dc1abf
add comment
adbenitez Oct 6, 2023
5513f78
rename toggleState() to togglePlay()
adbenitez Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion res/layout/audio_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,15 @@

</LinearLayout>

</merge>
<!-- transparent overlay to easily block clicks in audio player's components in multi-select mode -->
<LinearLayout
r10s marked this conversation as resolved.
Show resolved Hide resolved
android:id="@+id/interception_mask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:visibility="gone" />

</merge>
7 changes: 3 additions & 4 deletions src/org/thoughtcrime/securesms/ConversationItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,7 @@ protected void setInteractionState(DcMsg messageRecord, boolean pulseHighlight)
}

if (audioViewStub.resolved()) {
audioViewStub.get().setFocusable(!shouldInterceptClicks(messageRecord) && batchSelected.isEmpty());
audioViewStub.get().setClickable(batchSelected.isEmpty());
audioViewStub.get().setEnabled(batchSelected.isEmpty());
audioViewStub.get().disablePlayer(!batchSelected.isEmpty());
}

if (documentViewStub.resolved()) {
Expand Down Expand Up @@ -477,6 +475,7 @@ public void onReceivedDuration(int millis) {
}

audioViewStub.get().setAudio(new AudioSlide(context, messageRecord), duration);
audioViewStub.get().setOnClickListener(passthroughClickListener);
audioViewStub.get().setOnLongClickListener(passthroughClickListener);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
audioViewStub.get().setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
Expand Down Expand Up @@ -839,7 +838,7 @@ private int getAvailableMessageBubbleWidth(@NonNull View forView) {
@Override
public void onAccessibilityClick() {
if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().performClick();
else if (audioViewStub.resolved()) audioViewStub.get().performClick();
else if (audioViewStub.resolved()) audioViewStub.get().toggleState();
adbenitez marked this conversation as resolved.
Show resolved Hide resolved
else if (documentViewStub.resolved()) documentViewStub.get().performClick();
else if (webxdcViewStub.resolved()) webxdcViewStub.get().performClick();
}
Expand Down
4 changes: 1 addition & 3 deletions src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ public void onBindItemViewHolder(ItemViewHolder itemViewHolder, int section, int
viewHolder.audioView.setAudio((AudioSlide)slide, dcMsg.getDuration());
viewHolder.audioView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
viewHolder.audioView.setOnLongClickListener(view -> { itemClickListener.onMediaLongClicked(dcMsg); return true; });
viewHolder.audioView.setFocusable(selected.isEmpty());
viewHolder.audioView.setClickable(selected.isEmpty());
viewHolder.audioView.setLongClickable(selected.isEmpty());
viewHolder.audioView.disablePlayer(!selected.isEmpty());
viewHolder.itemView.setOnClickListener(view -> itemClickListener.onMediaClicked(dcMsg));
}
else if (slide != null && slide.isWebxdcDocument()) {
Expand Down
49 changes: 21 additions & 28 deletions src/org/thoughtcrime/securesms/components/AudioView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import android.media.AudioFocusRequest;
import android.media.AudioManager;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
Expand All @@ -21,6 +19,9 @@
import android.widget.SeekBar;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
import org.thoughtcrime.securesms.mms.AudioSlide;
Expand All @@ -39,6 +40,7 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
private final @NonNull SeekBar seekBar;
private final @NonNull TextView timestamp;
private final @NonNull TextView title;
private final @NonNull View mask;

private @Nullable AudioSlidePlayer audioSlidePlayer;
private AudioManager.OnAudioFocusChangeListener audioFocusChangeListener;
Expand All @@ -62,6 +64,7 @@ public AudioView(Context context, AttributeSet attrs, int defStyleAttr) {
this.seekBar = (SeekBar) findViewById(R.id.seek);
this.timestamp = (TextView) findViewById(R.id.timestamp);
this.title = (TextView) findViewById(R.id.title);
this.mask = findViewById(R.id.interception_mask);

this.timestamp.setText("00:00");

Expand Down Expand Up @@ -97,13 +100,25 @@ public void setAudio(final @NonNull AudioSlide audio, int duration)
}

@Override
public boolean performClick() {
public void setOnClickListener(OnClickListener listener) {
super.setOnClickListener(listener);
this.mask.setOnClickListener(listener);
}

@Override
public void setOnLongClickListener(OnLongClickListener listener) {
super.setOnLongClickListener(listener);
this.mask.setOnLongClickListener(listener);
this.playButton.setOnLongClickListener(listener);
this.pauseButton.setOnLongClickListener(listener);
}

public void toggleState() {
if (this.playButton.getVisibility() == View.VISIBLE) {
playButton.performClick();
} else {
pauseButton.performClick();
}
return super.performClick();
}

public String getDescription() {
Expand Down Expand Up @@ -155,30 +170,8 @@ public void onStop() {
}
}

@Override
public void setFocusable(boolean focusable) {
super.setFocusable(focusable);
this.playButton.setFocusable(focusable);
this.pauseButton.setFocusable(focusable);
this.seekBar.setFocusable(focusable);
this.seekBar.setFocusableInTouchMode(focusable);
}

@Override
public void setClickable(boolean clickable) {
super.setClickable(clickable);
this.playButton.setClickable(clickable);
this.pauseButton.setClickable(clickable);
this.seekBar.setClickable(clickable);
this.seekBar.setOnTouchListener(clickable ? null : new TouchIgnoringListener());
}

@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
this.playButton.setEnabled(enabled);
this.pauseButton.setEnabled(enabled);
this.seekBar.setEnabled(enabled);
public void disablePlayer(boolean disable) {
this.mask.setVisibility(disable? View.VISIBLE : View.GONE);
}

@Override
Expand Down