refactored AudioPlayer

20 files changed, 37 insertions, 12 deletions

diff --git a/src/main/res/drawable-hdpi/ic_pause_black_36dp.png b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
new file mode 100644
index 000000000..ec02d44a9
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
new file mode 100644
index 000000000..9d826b7e0
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
new file mode 100644
index 000000000..848f67624
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 000000000..1ce6531de
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_pause_black_36dp.png b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
new file mode 100644
index 000000000..5c0dce2df
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
new file mode 100644
index 000000000..6176e3f83
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
new file mode 100644
index 000000000..b598dac4b
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png
diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 000000000..c791b597e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
new file mode 100644
index 000000000..875a01f8a
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
new file mode 100644
index 000000000..d8b29d7da
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
new file mode 100644
index 000000000..744ae66d1
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 000000000..52eb1459f
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
new file mode 100644
index 000000000..a9bfd1fb7
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
new file mode 100644
index 000000000..8b721f9f5
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
new file mode 100644
index 000000000..ded8cda96
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 000000000..b08c0c260
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index b073868ad..bb9370313 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -35,4 +35,40 @@ xmlns:app="http://schemas.android.com/apk/res-auto">
     android:layout_height="wrap_content"
     android:longClickable="true"
     android:visibility="gone" />
+
+    <RelativeLayout
+            android:id="@+id/audio_player"
+            android:layout_width="288dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            >
+
+            <ImageButton
+                android:id="@+id/play_pause"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:alpha="1.0"
+                android:background="?android:selectableItemBackground"/>
+
+            <TextView
+                android:id="@+id/runtime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentRight="true"
+                android:paddingBottom="16dp"
+                android:paddingRight="16dp"
+                android:textColor="@color/primary"
+                android:textSize="?attr/TextSizeInfo"/>
+
+            <SeekBar
+                android:id="@+id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/runtime"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/play_pause"
+                android:progress="100"/>
+        </RelativeLayout>
 </merge> 
\ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 099448a74..41be316a9 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -42,12 +42,6 @@
 
             <include layout="@layout/message_content"/>
 
-            <RelativeLayout
-                android:id="@+id/aw_player"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="visible" />
-
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index b19765e79..835830ea9 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -51,12 +51,6 @@
                 android:longClickable="true"
                 android:visibility="gone" />
 
-            <RelativeLayout
-                android:id="@+id/aw_player"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="visible" />
-
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml
index d1fd477b5..c4f584851 100644
--- a/src/main/res/values/ids.xml
+++ b/src/main/res/values/ids.xml
@@ -7,4 +7,5 @@
     <item name="TAG_ACCOUNT" type="id" />
     <item name="TAG_FINGERPRINT" type="id" />
     <item name="TAG_FINGERPRINT_STATUS" type="id" />
+    <item name="TAG_AUDIO_PLAYER_VIEW_HOLDER" type="id" />
 </resources>
\ No newline at end of file