TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 11:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ditch RoundedImageView, make animated gifs work

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty
2015-07-15 13:42:59 -07:00
committed by Moxie Marlinspike
parent a66dd8be82
commit f13ad54ba1
19 changed files with 231 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/conversation_activity.xml
View File

@@ -55,8 +55,8 @@
android:id="@+id/attachment_thumbnail"
android:layout_width="230dp"
android:layout_height="150dp"
app:riv_corner_radius="3dp"
android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
android:contentDescription="@string/conversation_activity__attachment_thumbnail"
app:backgroundColorHint="?conversation_background" />
</FrameLayout>
<ImageView android:id="@+id/remove_image_button"

2
res/layout/conversation_item_received.xml
View File

@@ -54,8 +54,6 @@
android:adjustViewBounds="true"
android:contentDescription="@string/conversation_item__mms_image_description"
android:visibility="gone"
app:riv_corner_radius="@dimen/message_bubble_corner_radius"
app:riv_border_width="0dp"
tools:src="@drawable/ic_video_light"
tools:visibility="visible" />

2
res/layout/conversation_item_sent.xml
View File

@@ -65,8 +65,6 @@
android:adjustViewBounds="true"
android:contentDescription="@string/conversation_item__mms_image_description"
android:visibility="gone"
app:riv_corner_radius="@dimen/message_bubble_corner_radius"
app:riv_border_width="0dp"
tools:src="@drawable/ic_video_light"
tools:visibility="visible" />

1
res/layout/group_create_activity.xml
View File

@@ -25,7 +25,6 @@
android:layout_width="70dp"
android:layout_height="70dp"
position="bottom_right"
app:riv_oval="true"
android:layout_marginRight="10dp"
android:src="@drawable/ic_group_photo"
android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />

16
res/layout/thumbnail_view.xml
View File

@@ -2,15 +2,13 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/thumbnail_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:contentDescription="@string/conversation_item__mms_image_description"
android:layout_margin="@dimen/media_bubble_border_width"
app:riv_corner_radius="@dimen/message_bubble_corner_radius" />
<ImageView android:id="@+id/thumbnail_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:contentDescription="@string/conversation_item__mms_image_description"
android:layout_margin="@dimen/media_bubble_border_width" />
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/progress_wheel"

3
res/values/attrs.xml
View File

@@ -130,4 +130,7 @@
<attr name="inverted" format="boolean"/>
</declare-styleable>
<declare-styleable name="ThumbnailView">
<attr name="backgroundColorHint" format="color" />
</declare-styleable>
</resources>