mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 12:47:35 +00:00

committed by
Moxie Marlinspike

parent
f95435b0f1
commit
415a61a09b
@@ -9,23 +9,15 @@
|
||||
android:contentDescription="@string/conversation_item__mms_image_description"
|
||||
android:layout_margin="@dimen/media_bubble_border_width" />
|
||||
|
||||
<ViewStub android:id="@+id/progress_wheel_stub"
|
||||
<ViewStub android:id="@+id/transfer_controls_stub"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
android:layout_gravity="center"
|
||||
android:layout="@layout/thumbnail_view_progress_wheel" />
|
||||
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" />
|
||||
|
||||
<ImageButton android:id="@+id/download_button"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/progress_background"
|
||||
android:src="@drawable/ic_file_download_white_36dp"
|
||||
android:visibility="gone" />
|
||||
</merge>
|
||||
|
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.pnikosis.materialishprogress.ProgressWheel
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/progress_wheel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/progress_background"
|
||||
android:visibility="gone"
|
||||
app:matProg_barColor="@color/white"
|
||||
app:matProg_linearProgress="true"
|
||||
app:matProg_spinSpeed="0.333" />
|
8
res/layout/transfer_controls_stub.xml
Normal file
8
res/layout/transfer_controls_stub.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.thoughtcrime.securesms.components.TransferControlView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/transfer_controls"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
22
res/layout/transfer_controls_view.xml
Normal file
22
res/layout/transfer_controls_view.xml
Normal file
@@ -0,0 +1,22 @@
|
||||
<?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">
|
||||
|
||||
<com.pnikosis.materialishprogress.ProgressWheel
|
||||
android:id="@+id/progress_wheel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/progress_background"
|
||||
android:visibility="gone"
|
||||
app:matProg_barColor="@color/white"
|
||||
app:matProg_linearProgress="true"
|
||||
app:matProg_spinSpeed="0.333" />
|
||||
|
||||
<ImageButton android:id="@+id/download_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/progress_background"
|
||||
android:src="@drawable/ic_file_download_white_36dp"
|
||||
android:visibility="gone" />
|
||||
</merge>
|
Reference in New Issue
Block a user