Moxie Marlinspike
10 years ago
parent
4e8e8978f4
commit
bfe4ad6c34
Binary file not shown.
|
After Width: | Height: | Size: 307 B |
Binary file not shown.
|
After Width: | Height: | Size: 460 B |
Binary file not shown.
|
After Width: | Height: | Size: 487 B |
Binary file not shown.
|
After Width: | Height: | Size: 767 B |
Binary file not shown.
|
After Width: | Height: | Size: 255 B |
Binary file not shown.
|
After Width: | Height: | Size: 336 B |
Binary file not shown.
|
After Width: | Height: | Size: 333 B |
Binary file not shown.
|
After Width: | Height: | Size: 557 B |
Binary file not shown.
|
After Width: | Height: | Size: 328 B |
Binary file not shown.
|
After Width: | Height: | Size: 601 B |
Binary file not shown.
|
After Width: | Height: | Size: 557 B |
Binary file not shown.
|
After Width: | Height: | Size: 1013 B |
Binary file not shown.
|
After Width: | Height: | Size: 381 B |
Binary file not shown.
|
After Width: | Height: | Size: 739 B |
Binary file not shown.
|
After Width: | Height: | Size: 767 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 502 B |
Binary file not shown.
|
After Width: | Height: | Size: 964 B |
Binary file not shown.
|
After Width: | Height: | Size: 1013 B |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
@ -0,0 +1,171 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merge 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">
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.InputPanel
|
||||||
|
android:id="@+id/bottom_panel"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:clickable="true"
|
||||||
|
android:background="?android:windowBackground"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
|
<FrameLayout android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
|
<LinearLayout android:id="@+id/compose_bubble"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/sent_bubble"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
|
||||||
|
android:id="@+id/emoji_toggle"
|
||||||
|
android:layout_width="37dp"
|
||||||
|
android:layout_height="37dp"
|
||||||
|
android:layout_gravity="bottom"
|
||||||
|
android:background="@drawable/touch_highlight_background"
|
||||||
|
android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.ComposeText
|
||||||
|
style="@style/ComposeEditText"
|
||||||
|
android:id="@+id/embedded_text_editor"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:minHeight="37dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:nextFocusForward="@+id/send_button"
|
||||||
|
android:nextFocusRight="@+id/send_button"
|
||||||
|
tools:visibility="invisible"
|
||||||
|
tools:hint="Send TextSecure message" >
|
||||||
|
<requestFocus />
|
||||||
|
</org.thoughtcrime.securesms.components.ComposeText>
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.HidingLinearLayout
|
||||||
|
android:id="@+id/quick_attachment_toggle"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/quick_camera_toggle"
|
||||||
|
android:layout_width="37dp"
|
||||||
|
android:layout_height="37dp"
|
||||||
|
android:layout_gravity="bottom"
|
||||||
|
android:src="?quick_camera_icon"
|
||||||
|
android:background="@drawable/touch_highlight_background"
|
||||||
|
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
|
||||||
|
android:padding="10dp"/>
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.MicrophoneRecorderView
|
||||||
|
android:id="@+id/recorder_view"
|
||||||
|
android:layout_width="37dp"
|
||||||
|
android:layout_height="37dp"
|
||||||
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/quick_audio_toggle"
|
||||||
|
android:layout_width="37dp"
|
||||||
|
android:layout_height="37dp"
|
||||||
|
android:layout_gravity="bottom"
|
||||||
|
android:src="?quick_mic_icon"
|
||||||
|
android:background="@null"
|
||||||
|
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
|
||||||
|
android:padding="10dp"/>
|
||||||
|
|
||||||
|
<ImageView android:id="@+id/quick_audio_fab"
|
||||||
|
android:layout_width="74dp"
|
||||||
|
android:layout_height="74dp"
|
||||||
|
android:src="@drawable/ic_mic_white_48dp"
|
||||||
|
android:background="@drawable/circle_tintable"
|
||||||
|
android:backgroundTint="@color/red_400"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:scaleType="center"/>
|
||||||
|
|
||||||
|
</org.thoughtcrime.securesms.components.MicrophoneRecorderView>
|
||||||
|
|
||||||
|
</org.thoughtcrime.securesms.components.HidingLinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout android:id="@+id/recording_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView android:id="@+id/record_time"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:ellipsize="none"
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
android:text="00:00"
|
||||||
|
android:textColor="#61737b"
|
||||||
|
android:textSize="20dp"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"/>
|
||||||
|
|
||||||
|
<FrameLayout android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:clipChildren="true">
|
||||||
|
|
||||||
|
<TextView android:id="@+id/slide_to_cancel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:gravity="center"
|
||||||
|
android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
|
||||||
|
android:text="@string/conversation_input_panel__slide_to_cancel"
|
||||||
|
android:textAllCaps="true"
|
||||||
|
android:textColor="#61737b"
|
||||||
|
android:textSize="10sp"
|
||||||
|
android:ellipsize="none"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible"/>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
<org.thoughtcrime.securesms.components.AnimatingToggle
|
||||||
|
android:id="@+id/button_toggle"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:background="@drawable/circle_tintable"
|
||||||
|
android:layout_gravity="bottom">
|
||||||
|
|
||||||
|
<ImageButton android:id="@+id/attach_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:background="@drawable/circle_touch_highlight_background"
|
||||||
|
android:src="@drawable/ic_attach_white_24dp"
|
||||||
|
android:contentDescription="@string/ConversationActivity_add_attachment"
|
||||||
|
android:nextFocusLeft="@+id/embedded_text_editor" />
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.components.SendButton
|
||||||
|
android:id="@+id/send_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:contentDescription="@string/conversation_activity__send"
|
||||||
|
android:nextFocusLeft="@+id/embedded_text_editor"
|
||||||
|
android:src="?conversation_transport_sms_indicator"
|
||||||
|
android:background="@drawable/circle_touch_highlight_background" />
|
||||||
|
|
||||||
|
</org.thoughtcrime.securesms.components.AnimatingToggle>
|
||||||
|
</org.thoughtcrime.securesms.components.InputPanel>
|
||||||
|
</merge>
|
||||||
@ -0,0 +1,201 @@
|
|||||||
|
package org.thoughtcrime.securesms.audio;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.media.MediaRecorder;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.ParcelFileDescriptor;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.util.Pair;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.ApplicationContext;
|
||||||
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
||||||
|
import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
|
||||||
|
import org.thoughtcrime.securesms.util.MediaUtil;
|
||||||
|
import org.thoughtcrime.securesms.util.Util;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
||||||
|
import org.whispersystems.jobqueue.Job;
|
||||||
|
import org.whispersystems.jobqueue.JobParameters;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class AudioRecorder {
|
||||||
|
|
||||||
|
private static final String TAG = AudioRecorder.class.getSimpleName();
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final MasterSecret masterSecret;
|
||||||
|
private final PersistentBlobProvider blobProvider;
|
||||||
|
|
||||||
|
private MediaRecorder mediaRecorder;
|
||||||
|
private Uri captureUri;
|
||||||
|
private ParcelFileDescriptor fd;
|
||||||
|
|
||||||
|
public AudioRecorder(@NonNull Context context, @NonNull MasterSecret masterSecret) {
|
||||||
|
this.context = context;
|
||||||
|
this.masterSecret = masterSecret;
|
||||||
|
this.blobProvider = PersistentBlobProvider.getInstance(context.getApplicationContext());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void startRecording() throws IOException {
|
||||||
|
Log.w(TAG, "startRecording()");
|
||||||
|
|
||||||
|
ApplicationContext.getInstance(context)
|
||||||
|
.getJobManager()
|
||||||
|
.add(new StartRecordingJob());
|
||||||
|
}
|
||||||
|
|
||||||
|
public @NonNull ListenableFuture<Pair<Uri, Long>> stopRecording() {
|
||||||
|
Log.w(TAG, "stopRecording()");
|
||||||
|
|
||||||
|
StopRecordingJob stopRecordingJob = new StopRecordingJob();
|
||||||
|
|
||||||
|
ApplicationContext.getInstance(context)
|
||||||
|
.getJobManager()
|
||||||
|
.add(stopRecordingJob);
|
||||||
|
|
||||||
|
return stopRecordingJob.getFuture();
|
||||||
|
}
|
||||||
|
|
||||||
|
private class StopRecordingJob extends Job {
|
||||||
|
|
||||||
|
private final SettableFuture<Pair<Uri, Long>> future = new SettableFuture<>();
|
||||||
|
|
||||||
|
public StopRecordingJob() {
|
||||||
|
super(JobParameters.newBuilder()
|
||||||
|
.withGroupId(AudioRecorder.class.getSimpleName())
|
||||||
|
.create());
|
||||||
|
}
|
||||||
|
|
||||||
|
public ListenableFuture<Pair<Uri, Long>> getFuture() {
|
||||||
|
return future;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAdded() {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRun() {
|
||||||
|
if (mediaRecorder == null) {
|
||||||
|
sendToFuture(new IOException("MediaRecorder was never initialized successfully!"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
mediaRecorder.stop();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.w(TAG, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fd.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.w("AudioRecorder", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaRecorder.release();
|
||||||
|
mediaRecorder = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
long size = MediaUtil.getMediaSize(context, masterSecret, captureUri);
|
||||||
|
sendToFuture(new Pair<>(captureUri, size));
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
Log.w(TAG, ioe);
|
||||||
|
sendToFuture(ioe);
|
||||||
|
}
|
||||||
|
|
||||||
|
captureUri = null;
|
||||||
|
fd = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onShouldRetry(Exception e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCanceled() {}
|
||||||
|
|
||||||
|
private void sendToFuture(final @NonNull Pair<Uri, Long> result) {
|
||||||
|
Util.runOnMain(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
future.set(result);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void sendToFuture(final @NonNull Exception exception) {
|
||||||
|
Util.runOnMain(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
future.setException(exception);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class StartRecordingJob extends Job {
|
||||||
|
|
||||||
|
public StartRecordingJob() {
|
||||||
|
super(JobParameters.newBuilder()
|
||||||
|
.withGroupId(AudioRecorder.class.getSimpleName())
|
||||||
|
.create());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAdded() {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRun() throws Exception {
|
||||||
|
if (mediaRecorder != null) {
|
||||||
|
throw new AssertionError("We can only record once at a time.");
|
||||||
|
}
|
||||||
|
|
||||||
|
ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
|
||||||
|
|
||||||
|
fd = fds[1];
|
||||||
|
captureUri = blobProvider.create(masterSecret, new ParcelFileDescriptor.AutoCloseInputStream(fds[0]));
|
||||||
|
mediaRecorder = new MediaRecorder();
|
||||||
|
mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
|
||||||
|
mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.RAW_AMR);
|
||||||
|
mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
|
||||||
|
mediaRecorder.setOutputFile(fds[1].getFileDescriptor());
|
||||||
|
|
||||||
|
mediaRecorder.prepare();
|
||||||
|
|
||||||
|
try {
|
||||||
|
mediaRecorder.start();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.w(TAG, e);
|
||||||
|
throw new IOException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onShouldRetry(Exception e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCanceled() {
|
||||||
|
try {
|
||||||
|
if (fd != null) {
|
||||||
|
fd.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (captureUri != null) {
|
||||||
|
blobProvider.delete(captureUri);
|
||||||
|
}
|
||||||
|
|
||||||
|
fd = null;
|
||||||
|
mediaRecorder = null;
|
||||||
|
captureUri = null;
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.w(TAG, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,83 @@
|
|||||||
|
package org.thoughtcrime.securesms.components;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.support.v4.view.animation.FastOutSlowInInterpolator;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.view.animation.AlphaAnimation;
|
||||||
|
import android.view.animation.Animation;
|
||||||
|
import android.view.animation.AnimationSet;
|
||||||
|
import android.view.animation.AnimationUtils;
|
||||||
|
import android.view.animation.ScaleAnimation;
|
||||||
|
import android.view.animation.TranslateAnimation;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.R;
|
||||||
|
|
||||||
|
public class HidingLinearLayout extends LinearLayout {
|
||||||
|
|
||||||
|
public HidingLinearLayout(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public HidingLinearLayout(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
|
||||||
|
public HidingLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
|
||||||
|
super(context, attrs, defStyleAttr);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void hide() {
|
||||||
|
if (!isEnabled() || getVisibility() == GONE) return;
|
||||||
|
|
||||||
|
AnimationSet animation = new AnimationSet(true);
|
||||||
|
animation.addAnimation(new ScaleAnimation(1, 0, 1, 1, Animation.RELATIVE_TO_SELF, 1f, Animation.RELATIVE_TO_SELF, 0.5f));
|
||||||
|
animation.addAnimation(new AlphaAnimation(1, 0));
|
||||||
|
animation.setDuration(100);
|
||||||
|
|
||||||
|
animation.setAnimationListener(new Animation.AnimationListener() {
|
||||||
|
@Override
|
||||||
|
public void onAnimationStart(Animation animation) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAnimationRepeat(Animation animation) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAnimationEnd(Animation animation) {
|
||||||
|
setVisibility(GONE);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
animateWith(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void show() {
|
||||||
|
if (!isEnabled() || getVisibility() == VISIBLE) return;
|
||||||
|
|
||||||
|
setVisibility(VISIBLE);
|
||||||
|
|
||||||
|
AnimationSet animation = new AnimationSet(true);
|
||||||
|
animation.addAnimation(new ScaleAnimation(0, 1, 1, 1, Animation.RELATIVE_TO_SELF, 1f, Animation.RELATIVE_TO_SELF, 0.5f));
|
||||||
|
animation.addAnimation(new AlphaAnimation(0, 1));
|
||||||
|
animation.setDuration(100);
|
||||||
|
|
||||||
|
animateWith(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void animateWith(Animation animation) {
|
||||||
|
animation.setDuration(150);
|
||||||
|
animation.setInterpolator(new FastOutSlowInInterpolator());
|
||||||
|
startAnimation(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void disable() {
|
||||||
|
setVisibility(GONE);
|
||||||
|
setEnabled(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,256 @@
|
|||||||
|
package org.thoughtcrime.securesms.components;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.animation.AlphaAnimation;
|
||||||
|
import android.view.animation.Animation;
|
||||||
|
import android.view.animation.AnimationSet;
|
||||||
|
import android.view.animation.TranslateAnimation;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.R;
|
||||||
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
||||||
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
||||||
|
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
|
|
||||||
|
public class InputPanel extends LinearLayout implements MicrophoneRecorderView.Listener {
|
||||||
|
|
||||||
|
private static final String TAG = InputPanel.class.getSimpleName();
|
||||||
|
|
||||||
|
private static final int FADE_TIME = 150;
|
||||||
|
|
||||||
|
private View emojiToggle;
|
||||||
|
private View composeText;
|
||||||
|
private View quickCameraToggle;
|
||||||
|
private View quickAudioToggle;
|
||||||
|
private View buttonToggle;
|
||||||
|
private View recordingContainer;
|
||||||
|
|
||||||
|
private MicrophoneRecorderView microphoneRecorderView;
|
||||||
|
private SlideToCancel slideToCancel;
|
||||||
|
private RecordTime recordTime;
|
||||||
|
|
||||||
|
private @Nullable Listener listener;
|
||||||
|
|
||||||
|
public InputPanel(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public InputPanel(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
|
||||||
|
public InputPanel(Context context, AttributeSet attrs, int defStyleAttr) {
|
||||||
|
super(context, attrs, defStyleAttr);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFinishInflate() {
|
||||||
|
super.onFinishInflate();
|
||||||
|
|
||||||
|
this.emojiToggle = ViewUtil.findById(this, R.id.emoji_toggle);
|
||||||
|
this.composeText = ViewUtil.findById(this, R.id.embedded_text_editor);
|
||||||
|
this.quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
|
||||||
|
this.quickAudioToggle = ViewUtil.findById(this, R.id.quick_audio_toggle);
|
||||||
|
this.buttonToggle = ViewUtil.findById(this, R.id.button_toggle);
|
||||||
|
this.recordingContainer = ViewUtil.findById(this, R.id.recording_container);
|
||||||
|
this.recordTime = new RecordTime((TextView) ViewUtil.findById(this, R.id.record_time));
|
||||||
|
this.slideToCancel = new SlideToCancel(ViewUtil.findById(this, R.id.slide_to_cancel));
|
||||||
|
this.microphoneRecorderView = ViewUtil.findById(this, R.id.recorder_view);
|
||||||
|
this.microphoneRecorderView.setListener(this);
|
||||||
|
|
||||||
|
if (Build.VERSION.SDK_INT < 14) {
|
||||||
|
this.microphoneRecorderView.setVisibility(View.GONE);
|
||||||
|
this.microphoneRecorderView.setClickable(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setListener(@Nullable Listener listener) {
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRecordPressed(float startPositionX) {
|
||||||
|
if (listener != null) listener.onRecorderStarted();
|
||||||
|
recordTime.display();
|
||||||
|
slideToCancel.display(startPositionX);
|
||||||
|
|
||||||
|
ViewUtil.fadeOut(emojiToggle, FADE_TIME, View.INVISIBLE);
|
||||||
|
ViewUtil.fadeOut(composeText, FADE_TIME, View.INVISIBLE);
|
||||||
|
ViewUtil.fadeOut(quickCameraToggle, FADE_TIME, View.INVISIBLE);
|
||||||
|
ViewUtil.fadeOut(quickAudioToggle, FADE_TIME, View.INVISIBLE);
|
||||||
|
ViewUtil.fadeOut(buttonToggle, FADE_TIME, View.INVISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRecordReleased(float x) {
|
||||||
|
onRecordHideEvent(x);
|
||||||
|
|
||||||
|
if (listener != null) {
|
||||||
|
Log.w(TAG, "Elapsed time: " + recordTime.getElapsedTimeMillis());
|
||||||
|
if (recordTime.getElapsedTimeMillis() > 1000) {
|
||||||
|
listener.onRecorderFinished();
|
||||||
|
} else {
|
||||||
|
Toast.makeText(getContext(), R.string.InputPanel_tap_and_hold_to_record_a_voice_note_release_to_send, Toast.LENGTH_LONG).show();
|
||||||
|
listener.onRecorderCanceled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRecordMoved(float x, float absoluteX) {
|
||||||
|
slideToCancel.moveTo(x);
|
||||||
|
|
||||||
|
if (absoluteX / recordingContainer.getWidth() <= 0.5) {
|
||||||
|
this.microphoneRecorderView.cancelAction();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRecordCanceled(float x) {
|
||||||
|
onRecordHideEvent(x);
|
||||||
|
if (listener != null) listener.onRecorderCanceled();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onPause() {
|
||||||
|
this.microphoneRecorderView.cancelAction();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onRecordHideEvent(float x) {
|
||||||
|
ListenableFuture<Void> future = slideToCancel.hide(x);
|
||||||
|
future.addListener(new AssertedSuccessListener<Void>() {
|
||||||
|
@Override
|
||||||
|
public void onSuccess(Void result) {
|
||||||
|
ViewUtil.fadeIn(emojiToggle, FADE_TIME);
|
||||||
|
ViewUtil.fadeIn(composeText, FADE_TIME);
|
||||||
|
ViewUtil.fadeIn(quickCameraToggle, FADE_TIME);
|
||||||
|
ViewUtil.fadeIn(quickAudioToggle, FADE_TIME);
|
||||||
|
ViewUtil.fadeIn(buttonToggle, FADE_TIME);
|
||||||
|
|
||||||
|
recordTime.hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface Listener {
|
||||||
|
public void onRecorderStarted();
|
||||||
|
public void onRecorderFinished();
|
||||||
|
public void onRecorderCanceled();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class SlideToCancel {
|
||||||
|
|
||||||
|
private final View slideToCancelView;
|
||||||
|
|
||||||
|
private float startPositionX;
|
||||||
|
|
||||||
|
public SlideToCancel(View slideToCancelView) {
|
||||||
|
this.slideToCancelView = slideToCancelView;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void display(float startPositionX) {
|
||||||
|
this.startPositionX = startPositionX;
|
||||||
|
ViewUtil.fadeIn(this.slideToCancelView, FADE_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ListenableFuture<Void> hide(float x) {
|
||||||
|
final SettableFuture<Void> future = new SettableFuture<>();
|
||||||
|
float offset = -Math.max(0, this.startPositionX - x);
|
||||||
|
|
||||||
|
AnimationSet animation = new AnimationSet(true);
|
||||||
|
animation.addAnimation(new TranslateAnimation(Animation.ABSOLUTE, offset,
|
||||||
|
Animation.ABSOLUTE, 0,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0));
|
||||||
|
animation.addAnimation(new AlphaAnimation(1, 0));
|
||||||
|
|
||||||
|
animation.setDuration(MicrophoneRecorderView.ANIMATION_DURATION);
|
||||||
|
animation.setFillBefore(true);
|
||||||
|
animation.setFillAfter(false);
|
||||||
|
animation.setAnimationListener(new Animation.AnimationListener() {
|
||||||
|
@Override
|
||||||
|
public void onAnimationStart(Animation animation) {}
|
||||||
|
@Override
|
||||||
|
public void onAnimationEnd(Animation animation) {
|
||||||
|
future.set(null);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onAnimationRepeat(Animation animation) {}
|
||||||
|
});
|
||||||
|
|
||||||
|
slideToCancelView.setVisibility(View.GONE);
|
||||||
|
slideToCancelView.startAnimation(animation);
|
||||||
|
|
||||||
|
return future;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveTo(float x) {
|
||||||
|
float offset = -Math.max(0, this.startPositionX - x);
|
||||||
|
Animation animation = new TranslateAnimation(Animation.ABSOLUTE, offset,
|
||||||
|
Animation.ABSOLUTE, offset,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0);
|
||||||
|
|
||||||
|
animation.setDuration(0);
|
||||||
|
animation.setFillAfter(true);
|
||||||
|
animation.setFillBefore(true);
|
||||||
|
|
||||||
|
slideToCancelView.startAnimation(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class RecordTime implements Runnable {
|
||||||
|
|
||||||
|
private final TextView recordTimeView;
|
||||||
|
|
||||||
|
private final AtomicLong startTime = new AtomicLong(0);
|
||||||
|
private final Handler handler = new Handler();
|
||||||
|
|
||||||
|
private RecordTime(TextView recordTimeView) {
|
||||||
|
this.recordTimeView = recordTimeView;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void display() {
|
||||||
|
this.startTime.set(System.currentTimeMillis());
|
||||||
|
this.recordTimeView.setText("00:00");
|
||||||
|
ViewUtil.fadeIn(this.recordTimeView, FADE_TIME);
|
||||||
|
handler.postDelayed(this, TimeUnit.SECONDS.toMillis(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void hide() {
|
||||||
|
this.startTime.set(0);
|
||||||
|
ViewUtil.fadeOut(this.recordTimeView, FADE_TIME, View.INVISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getElapsedTimeMillis() {
|
||||||
|
return System.currentTimeMillis() - startTime.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
long localStartTime = startTime.get();
|
||||||
|
if (localStartTime > 0) {
|
||||||
|
long elapsedTime = System.currentTimeMillis() - localStartTime;
|
||||||
|
recordTimeView.setText(String.format("%02d:%02d",
|
||||||
|
TimeUnit.MILLISECONDS.toMinutes(elapsedTime),
|
||||||
|
TimeUnit.MILLISECONDS.toSeconds(elapsedTime) -
|
||||||
|
TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(elapsedTime))));
|
||||||
|
handler.postDelayed(this, TimeUnit.SECONDS.toMillis(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,184 @@
|
|||||||
|
package org.thoughtcrime.securesms.components;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.graphics.PorterDuff;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.util.AttributeSet;
|
||||||
|
import android.view.MotionEvent;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.animation.Animation;
|
||||||
|
import android.view.animation.AnimationSet;
|
||||||
|
import android.view.animation.AnticipateOvershootInterpolator;
|
||||||
|
import android.view.animation.DecelerateInterpolator;
|
||||||
|
import android.view.animation.OvershootInterpolator;
|
||||||
|
import android.view.animation.ScaleAnimation;
|
||||||
|
import android.view.animation.TranslateAnimation;
|
||||||
|
import android.widget.FrameLayout;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.R;
|
||||||
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
|
||||||
|
public class MicrophoneRecorderView extends FrameLayout implements View.OnTouchListener {
|
||||||
|
|
||||||
|
public static final int ANIMATION_DURATION = 200;
|
||||||
|
|
||||||
|
private FloatingRecordButton floatingRecordButton;
|
||||||
|
private @Nullable Listener listener;
|
||||||
|
private boolean actionInProgress;
|
||||||
|
|
||||||
|
public MicrophoneRecorderView(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MicrophoneRecorderView(Context context, AttributeSet attrs) {
|
||||||
|
super(context, attrs);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFinishInflate() {
|
||||||
|
super.onFinishInflate();
|
||||||
|
|
||||||
|
ImageView recordButtonFab = ViewUtil.findById(this, R.id.quick_audio_fab);
|
||||||
|
this.floatingRecordButton = new FloatingRecordButton(getContext(), recordButtonFab);
|
||||||
|
|
||||||
|
View recordButton = ViewUtil.findById(this, R.id.quick_audio_toggle);
|
||||||
|
recordButton.setOnTouchListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void cancelAction() {
|
||||||
|
if (this.actionInProgress) {
|
||||||
|
this.actionInProgress = false;
|
||||||
|
this.floatingRecordButton.hide(this.floatingRecordButton.lastPositionX);
|
||||||
|
|
||||||
|
if (listener != null) listener.onRecordCanceled(this.floatingRecordButton.lastPositionX);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onTouch(View v, final MotionEvent event) {
|
||||||
|
switch (event.getAction()) {
|
||||||
|
case MotionEvent.ACTION_DOWN:
|
||||||
|
this.actionInProgress = true;
|
||||||
|
this.floatingRecordButton.display(event.getX());
|
||||||
|
if (listener != null) listener.onRecordPressed(event.getX());
|
||||||
|
break;
|
||||||
|
case MotionEvent.ACTION_CANCEL:
|
||||||
|
case MotionEvent.ACTION_UP:
|
||||||
|
if (this.actionInProgress) {
|
||||||
|
this.actionInProgress = false;
|
||||||
|
this.floatingRecordButton.hide(event.getX());
|
||||||
|
if (listener != null) listener.onRecordReleased(event.getX());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MotionEvent.ACTION_MOVE:
|
||||||
|
if (this.actionInProgress) {
|
||||||
|
this.floatingRecordButton.moveTo(event.getX());
|
||||||
|
if (listener != null) listener.onRecordMoved(event.getX(), event.getRawX());
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setListener(@Nullable Listener listener) {
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface Listener {
|
||||||
|
public void onRecordPressed(float x);
|
||||||
|
public void onRecordReleased(float x);
|
||||||
|
public void onRecordCanceled(float x);
|
||||||
|
public void onRecordMoved(float x, float absoluteX);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class FloatingRecordButton {
|
||||||
|
|
||||||
|
private final ImageView recordButtonFab;
|
||||||
|
|
||||||
|
private float startPositionX;
|
||||||
|
private float lastPositionX;
|
||||||
|
|
||||||
|
public FloatingRecordButton(Context context, ImageView recordButtonFab) {
|
||||||
|
this.recordButtonFab = recordButtonFab;
|
||||||
|
this.recordButtonFab.getBackground().setColorFilter(context.getResources()
|
||||||
|
.getColor(R.color.red_500),
|
||||||
|
PorterDuff.Mode.SRC_IN);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void display(float x) {
|
||||||
|
this.startPositionX = x;
|
||||||
|
this.lastPositionX = x;
|
||||||
|
|
||||||
|
recordButtonFab.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
AnimationSet animation = new AnimationSet(true);
|
||||||
|
animation.addAnimation(new TranslateAnimation(Animation.RELATIVE_TO_SELF, -.25f,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f));
|
||||||
|
|
||||||
|
animation.addAnimation(new ScaleAnimation(.5f, 1f, .5f, 1f,
|
||||||
|
Animation.RELATIVE_TO_SELF, .5f,
|
||||||
|
Animation.RELATIVE_TO_SELF, .5f));
|
||||||
|
|
||||||
|
animation.setFillBefore(true);
|
||||||
|
animation.setFillAfter(true);
|
||||||
|
animation.setDuration(ANIMATION_DURATION);
|
||||||
|
animation.setInterpolator(new OvershootInterpolator());
|
||||||
|
|
||||||
|
recordButtonFab.startAnimation(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveTo(float x) {
|
||||||
|
this.lastPositionX = x;
|
||||||
|
|
||||||
|
float offset = -Math.max(0, this.startPositionX - x);
|
||||||
|
int widthAdjustment = -(recordButtonFab.getWidth() / 4);
|
||||||
|
|
||||||
|
Animation translateAnimation = new TranslateAnimation(Animation.ABSOLUTE, widthAdjustment + offset,
|
||||||
|
Animation.ABSOLUTE, widthAdjustment + offset,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f);
|
||||||
|
|
||||||
|
translateAnimation.setDuration(0);
|
||||||
|
translateAnimation.setFillAfter(true);
|
||||||
|
translateAnimation.setFillBefore(true);
|
||||||
|
|
||||||
|
recordButtonFab.startAnimation(translateAnimation);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void hide(float x) {
|
||||||
|
this.lastPositionX = x;
|
||||||
|
|
||||||
|
float offset = -Math.max(0, this.startPositionX - x);
|
||||||
|
int widthAdjustment = -(recordButtonFab.getWidth() / 4);
|
||||||
|
|
||||||
|
AnimationSet animation = new AnimationSet(false);
|
||||||
|
Animation scaleAnimation = new ScaleAnimation(1, 0.5f, 1, 0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0.5f,
|
||||||
|
Animation.RELATIVE_TO_SELF, 0.5f);
|
||||||
|
|
||||||
|
Animation translateAnimation = new TranslateAnimation(Animation.ABSOLUTE, offset + widthAdjustment,
|
||||||
|
Animation.ABSOLUTE, widthAdjustment,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f,
|
||||||
|
Animation.RELATIVE_TO_SELF, -.25f);
|
||||||
|
|
||||||
|
scaleAnimation.setInterpolator(new AnticipateOvershootInterpolator(1.5f));
|
||||||
|
translateAnimation.setInterpolator(new DecelerateInterpolator());
|
||||||
|
animation.addAnimation(scaleAnimation);
|
||||||
|
animation.addAnimation(translateAnimation);
|
||||||
|
animation.setDuration(ANIMATION_DURATION);
|
||||||
|
animation.setFillBefore(true);
|
||||||
|
animation.setFillAfter(false);
|
||||||
|
animation.setInterpolator(new AnticipateOvershootInterpolator(1.5f));
|
||||||
|
|
||||||
|
recordButtonFab.setVisibility(View.GONE);
|
||||||
|
recordButtonFab.clearAnimation();
|
||||||
|
recordButtonFab.startAnimation(animation);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,57 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.components.camera;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.support.v4.view.animation.FastOutSlowInInterpolator;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.util.Log;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.animation.Animation;
|
|
||||||
import android.view.animation.Animation.AnimationListener;
|
|
||||||
import android.view.animation.AnimationUtils;
|
|
||||||
import android.widget.ImageButton;
|
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.R;
|
|
||||||
|
|
||||||
public class HidingImageButton extends ImageButton {
|
|
||||||
public HidingImageButton(Context context) {
|
|
||||||
super(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
public HidingImageButton(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
}
|
|
||||||
|
|
||||||
public HidingImageButton(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
||||||
super(context, attrs, defStyleAttr);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void hide() {
|
|
||||||
if (!isEnabled() || getVisibility() == GONE) return;
|
|
||||||
final Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_to_right);
|
|
||||||
animation.setAnimationListener(new AnimationListener() {
|
|
||||||
@Override public void onAnimationStart(Animation animation) {}
|
|
||||||
@Override public void onAnimationRepeat(Animation animation) {}
|
|
||||||
@Override public void onAnimationEnd(Animation animation) {
|
|
||||||
setVisibility(GONE);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
animateWith(animation);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void show() {
|
|
||||||
if (!isEnabled() || getVisibility() == VISIBLE) return;
|
|
||||||
setVisibility(VISIBLE);
|
|
||||||
animateWith(AnimationUtils.loadAnimation(getContext(), R.anim.slide_from_right));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void animateWith(Animation animation) {
|
|
||||||
animation.setDuration(150);
|
|
||||||
animation.setInterpolator(new FastOutSlowInInterpolator());
|
|
||||||
startAnimation(animation);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void disable() {
|
|
||||||
setVisibility(GONE);
|
|
||||||
setEnabled(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue