mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-27 20:15:21 +00:00
7c47ea5cec
1) We now delay MMS notifications until a payload is received, or there's an error downloading the payload. This makes group messages more consistent. 2) All "text" parts of an MMS are combined into a second text record, which is stored in the MMS row directly rather than as a distinct part. This allows for immediate text loading, which means there's no chance a ConversationItem will resize. To do this, we need to include MMS in the big DB migration that's already staged for this application update. It's also an "application-level" migration, because we need the MasterSecret to do it. 3) On conversation display, all image-based parts now have their thumbnails loaded asynchronously. This allows for smooth-scrolling. The thumbnails are also scaled more accurately.
169 lines
7.4 KiB
XML
169 lines
7.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<org.thoughtcrime.securesms.ConversationItem
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/conversation_item"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingLeft="10dip"
|
|
android:orientation="horizontal">
|
|
|
|
<RelativeLayout
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<LinearLayout android:id="@+id/indicators_parent"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:layout_centerVertical="true"
|
|
android:layout_alignParentLeft="true">
|
|
|
|
<ImageView
|
|
android:id="@+id/key_exchange_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:src="@drawable/ic_menu_login"
|
|
android:visibility="gone" />
|
|
|
|
<ImageView
|
|
android:id="@+id/sms_secure_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:src="@drawable/ic_menu_lock_holo_light"
|
|
android:visibility="gone" />
|
|
|
|
<ImageView
|
|
android:id="@+id/sms_failed_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:src="@drawable/ic_list_alert_sms_failed"
|
|
android:visibility="gone" />
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/conversation_item_parent"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_toRightOf="@id/indicators_parent"
|
|
android:layout_toLeftOf="@+id/contact_photo"
|
|
android:orientation="vertical" >
|
|
|
|
<TextView android:id="@+id/conversation_item_body"
|
|
android:autoLink="all"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:linksClickable="true"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:gravity="right"
|
|
android:textColor="#ff000000"
|
|
android:textSize="16sp" />
|
|
|
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/mms_view"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"
|
|
android:paddingTop="7dip"
|
|
android:paddingBottom="7dip">
|
|
|
|
<ImageView
|
|
android:id="@+id/image_view"
|
|
android:layout_width="230dip"
|
|
android:layout_height="174dip"
|
|
android:layout_gravity="center"
|
|
android:scaleType="centerInside"
|
|
android:adjustViewBounds="true"
|
|
android:background="@android:drawable/picture_frame"
|
|
android:visibility="gone" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/play_slideshow_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="@drawable/mms_play_btn"
|
|
android:layout_gravity="center"
|
|
android:visibility="gone" />
|
|
|
|
</FrameLayout>
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/mms_download_controls"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<Button android:id="@+id/mms_download_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:text="@string/conversation_item_sent__download"
|
|
android:visibility="gone" />
|
|
|
|
<TextView android:id="@+id/mms_label_downloading"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="fill_parent"
|
|
android:layout_marginLeft="5dp"
|
|
android:layout_marginRight="5dp"
|
|
android:gravity="center"
|
|
android:text="@string/conversation_item_sent__downloading"
|
|
android:visibility="gone" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:gravity="right">
|
|
|
|
<ImageView android:id="@+id/delivered_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="3dip"
|
|
android:src="@drawable/ic_sms_mms_delivered"
|
|
android:visibility="gone" />
|
|
|
|
<TextView android:id="@+id/group_message_status"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:linksClickable="false"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:layout_gravity="right"
|
|
android:textColor="#ffcccccc"
|
|
android:visibility="gone"
|
|
android:layout_marginRight="8dip"
|
|
android:paddingTop="1dip"/>
|
|
|
|
<TextView android:id="@+id/conversation_item_date"
|
|
android:autoLink="all"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:linksClickable="false"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:layout_gravity="right"
|
|
android:textColor="#ffcccccc"
|
|
android:paddingTop="1dip"/>
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
<view xmlns:android="http://schemas.android.com/apk/res/android"
|
|
class="org.thoughtcrime.securesms.components.ImageDivet"
|
|
position="left"
|
|
android:id="@id/contact_photo"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_width="60dp"
|
|
android:layout_height="60dp"
|
|
android:cropToPadding="true"
|
|
android:layout_marginLeft="10dip"
|
|
android:layout_marginRight="0dip"
|
|
android:padding="0dip"
|
|
android:scaleType="centerCrop" />
|
|
|
|
|
|
</RelativeLayout>
|
|
</org.thoughtcrime.securesms.ConversationItem>
|