Support for an audio view to allow in-app playback of audio.

Closes #4270 // FREEBIE
signalapp · Oct 22, 2015 · 15c6f18 · 15c6f18
1 parent d2f44f6
commit 15c6f18
Show file tree

Hide file tree

Showing 40 changed files with 1,228 additions and 162 deletions.
diff --git a/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png b/res/drawable-hdpi/ic_download_circle_fill_white_48dp.png
diff --git a/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png b/res/drawable-hdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png b/res/drawable-hdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png b/res/drawable-mdpi/ic_download_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png b/res/drawable-mdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png b/res/drawable-mdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png b/res/drawable-xhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png b/res/drawable-xhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png b/res/drawable-xhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png b/res/drawable-xxhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png b/res/drawable-xxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png b/res/drawable-xxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png b/res/drawable-xxxhdpi/ic_download_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png b/res/drawable-xxxhdpi/ic_pause_circle_fill_white_48dp.png
diff --git a/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png b/res/drawable-xxxhdpi/ic_play_circle_fill_white_48dp.png
diff --git a/res/layout/audio_view.xml b/res/layout/audio_view.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout android:id="@+id/audio_widget_container"
+                  android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+
+        <LinearLayout android:layout_width="fill_parent"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal">
+
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/control_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <com.pnikosis.materialishprogress.ProgressWheel
+                        android:id="@+id/download_progress"
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:visibility="gone"
+                        android:layout_gravity="center"
+                        app:matProg_barColor="@color/white"
+                        app:matProg_linearProgress="true"
+                        app:matProg_spinSpeed="0.333"
+                        tools:visibility="visible"/>
+
+                <ImageView android:id="@+id/play"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_play_circle_fill_white_48dp"
+                           android:contentDescription="Play"/>
+
+                <ImageView android:id="@+id/pause"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_pause_circle_fill_white_48dp"
+                           android:contentDescription="Pause"/>
+
+                <ImageView android:id="@+id/download"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_download_circle_fill_white_48dp"
+                           android:contentDescription="Download"/>
+
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+            <SeekBar android:id="@+id/seek"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:layout_gravity="center_vertical"
+                     android:minWidth="210dp"/>
+
+        </LinearLayout>
+
+    <TextView android:id="@+id/timestamp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="76dip"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="?conversation_item_sent_text_secondary_color"
+              android:textSize="@dimen/conversation_item_date_text_size"
+              android:fontFamily="sans-serif-light"
+              android:autoLink="none"
+              android:visibility="gone"
+              tools:text="00:15"
+              tools:visibility="visible"
+            />
+
+    </LinearLayout>
+
+</merge>
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
@@ -37,13 +37,32 @@
                      android:background="?android:windowBackground"
                      android:visibility="gone">
 
-            <org.thoughtcrime.securesms.components.ThumbnailView
-                android:id="@+id/attachment_thumbnail"
-                android:layout_width="230dp"
-                android:layout_height="150dp"
-                android:layout_gravity="center_horizontal"
-                android:contentDescription="@string/conversation_activity__attachment_thumbnail"
-                app:backgroundColorHint="?conversation_background" />
+            <org.thoughtcrime.securesms.components.RemovableMediaView
+                    android:id="@+id/removable_media_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center">
+
+                <org.thoughtcrime.securesms.components.ThumbnailView
+                        android:id="@+id/attachment_thumbnail"
+                        android:layout_width="230dp"
+                        android:layout_height="150dp"
+                        android:layout_gravity="center_horizontal"
+                        android:visibility="gone"
+                        android:contentDescription="@string/conversation_activity__attachment_thumbnail"
+                        app:backgroundColorHint="?conversation_background" />
+
+                <org.thoughtcrime.securesms.components.AudioView
+                        android:id="@+id/attachment_audio"
+                        android:layout_width="210dp"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:background="@color/white"
+                        android:paddingTop="15dp"
+                        android:paddingBottom="15dp"
+                        app:tintColor="@color/grey_500"/>
+
+            </org.thoughtcrime.securesms.components.RemovableMediaView>
 
         </FrameLayout>
 

diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.ConversationItem android:id="@+id/conversation_item"
-                                             android:layout_width="fill_parent"
-                                             android:layout_height="wrap_content"
-                                             android:paddingRight="10dip"
-                                             android:orientation="vertical"
-                                             android:background="@drawable/conversation_item_background"
-                                             xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:tools="http://schemas.android.com/tools">
+<org.thoughtcrime.securesms.ConversationItem
+        android:id="@+id/conversation_item"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingRight="10dip"
+        android:orientation="vertical"
+        android:background="@drawable/conversation_item_background"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView android:id="@+id/group_message_status"
               android:layout_width="wrap_content"
@@ -53,7 +55,15 @@
                     android:contentDescription="@string/conversation_item__mms_image_description"
                     android:visibility="gone"
                     tools:src="@drawable/ic_video_light"
-                    tools:visibility="visible" />
+                    tools:visibility="gone" />
+
+            <org.thoughtcrime.securesms.components.AudioView
+                    android:id="@+id/audio_view"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:tintColor="@color/white"
+                    tools:visibility="visible"/>
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"

diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.ConversationItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/conversation_item"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@drawable/conversation_item_background">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/conversation_item"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@drawable/conversation_item_background">
 
     <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -67,6 +68,13 @@
                     tools:src="@drawable/ic_video_light"
                     tools:visibility="visible" />
 
+            <org.thoughtcrime.securesms.components.AudioView
+                    android:id="@+id/audio_view"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    app:tintColor="@color/grey_500"
+                    android:visibility="gone"/>
+
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:autoLink="all"

diff --git a/res/layout/thumbnail_view_remove_button.xml → res/layout/media_view_remove_button.xml b/res/layout/thumbnail_view_remove_button.xml → res/layout/media_view_remove_button.xml
@@ -3,4 +3,6 @@
            android:id="@+id/remove_image_button"
            android:layout_width="@dimen/media_bubble_remove_button_size"
            android:layout_height="@dimen/media_bubble_remove_button_size"
-           android:src="@drawable/conversation_attachment_close_circle" />
+           android:layout_gravity="top|right"
+           android:src="@drawable/conversation_attachment_close_circle"
+           android:visibility="gone"/>
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
@@ -16,9 +16,4 @@
               android:layout_gravity="center"
               android:layout="@layout/transfer_controls_stub" />
 
-    <ViewStub android:id="@+id/remove_button_stub"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="top|right"
-              android:layout="@layout/thumbnail_view_remove_button" />
 </merge>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
@@ -134,4 +134,9 @@
     <declare-styleable name="ThumbnailView">
         <attr name="backgroundColorHint" format="color" />
     </declare-styleable>
+
+    <declare-styleable name="AudioView">
+        <attr name="tintColor" format="color" />
+    </declare-styleable>
+
 </resources>
diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -4,6 +4,7 @@
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.recipients.Recipients;
 
 import java.util.Locale;
 import java.util.Set;
@@ -13,5 +14,5 @@ void bind(@NonNull MasterSecret masterSecret,
             @NonNull MessageRecord messageRecord,
             @NonNull Locale locale,
             @NonNull Set<MessageRecord> batchSelected,
-            boolean groupThread);
+            @NonNull Recipients recipients);
 }
diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/org/thoughtcrime/securesms/ConversationAdapter.java
@@ -35,6 +35,7 @@
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.LRUCache;
 
 import java.lang.ref.SoftReference;
@@ -68,12 +69,12 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
 
   private final Set<MessageRecord> batchSelected = Collections.synchronizedSet(new HashSet<MessageRecord>());
 
-  private final ItemClickListener      clickListener;
-  private final MasterSecret           masterSecret;
-  private final Locale                 locale;
-  private final boolean                groupThread;
-  private final MmsSmsDatabase         db;
-  private final LayoutInflater         inflater;
+  private final ItemClickListener clickListener;
+  private final MasterSecret      masterSecret;
+  private final Locale            locale;
+  private final Recipients        recipients;
+  private final MmsSmsDatabase    db;
+  private final LayoutInflater    inflater;
 
   protected static class ViewHolder extends RecyclerView.ViewHolder {
     public <V extends View & BindableConversationItem> ViewHolder(final @NonNull V itemView) {
@@ -96,15 +97,15 @@ public ConversationAdapter(@NonNull Context context,
                              @NonNull Locale locale,
                              @Nullable ItemClickListener clickListener,
                              @Nullable Cursor cursor,
-                             boolean groupThread)
+                             @NonNull Recipients recipients)
   {
     super(context, cursor);
-    this.masterSecret    = masterSecret;
-    this.locale          = locale;
-    this.clickListener   = clickListener;
-    this.groupThread     = groupThread;
-    this.inflater        = LayoutInflater.from(context);
-    this.db              = DatabaseFactory.getMmsSmsDatabase(context);
+    this.masterSecret  = masterSecret;
+    this.locale        = locale;
+    this.clickListener = clickListener;
+    this.recipients    = recipients;
+    this.inflater      = LayoutInflater.from(context);
+    this.db            = DatabaseFactory.getMmsSmsDatabase(context);
   }
 
   @Override
@@ -118,7 +119,7 @@ public void changeCursor(Cursor cursor) {
     String        type          = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
     MessageRecord messageRecord = getMessageRecord(id, cursor, type);
 
-    viewHolder.getView().bind(masterSecret, messageRecord, locale, batchSelected, groupThread);
+    viewHolder.getView().bind(masterSecret, messageRecord, locale, batchSelected, recipients);
   }
 
   @Override public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {

diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -142,8 +142,7 @@ private void initializeResources() {
 
   private void initializeListAdapter() {
     if (this.recipients != null && this.threadId != -1) {
-      list.setAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener, null,
-                                              (!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient()));
+      list.setAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener, null, this.recipients));
       getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
     }
   }