mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-27 20:15:21 +00:00
00d7b5c284
1) Migrate from GSON to Jackson everywhere. 2) Add support for storing identity key conflicts on message rows. 3) Add limited support for surfacing identity key conflicts in UI.
203 lines
9.9 KiB
XML
203 lines
9.9 KiB
XML
<?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="?conversation_item_background">
|
|
|
|
<RelativeLayout android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:layout_marginTop="6dp"
|
|
android:layout_marginLeft="6dp"
|
|
android:layout_marginBottom="6dp"
|
|
android:layout_marginRight="0dp">
|
|
|
|
<LinearLayout android:id="@+id/indicators_parent"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:gravity="left|center_vertical"
|
|
android:layout_marginLeft="6dp"
|
|
android:layout_alignParentLeft="true"
|
|
android:layout_centerVertical="true">
|
|
|
|
<ImageView
|
|
android:id="@+id/sms_failed_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="@drawable/ic_error_red_24dp"
|
|
tools:visibility="visible"
|
|
android:visibility="gone"
|
|
android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
|
|
|
|
<ImageView
|
|
android:id="@+id/pending_approval_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="@drawable/ic_info_outline_grey600_24dp"
|
|
android:visibility="gone"
|
|
android:layout_gravity="center_vertical"
|
|
android:contentDescription="@string/conversation_item_sent__pending_approval_description"
|
|
tools:visibility="visible" />
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout android:id="@+id/conversation_item_parent"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:background="?conversation_item_sent_push_background"
|
|
android:paddingRight="10dip"
|
|
android:paddingLeft="10dip"
|
|
android:layout_marginLeft="50dp"
|
|
android:layout_marginRight="12dp"
|
|
android:orientation="vertical">
|
|
|
|
<TextView android:id="@+id/conversation_item_body"
|
|
android:autoLink="all"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingTop="5dip"
|
|
android:linksClickable="true"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?conversation_sent_text_primary_color"
|
|
android:textColorLink="?conversation_sent_text_primary_color"
|
|
android:textSize="16sp"
|
|
tools:text="Lorem ipsum mango dolor coconut papaya" />
|
|
|
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/mms_view"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone">
|
|
|
|
<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:visibility="gone"
|
|
android:contentDescription="@string/conversation_item__mms_image_description"/>
|
|
|
|
<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"
|
|
android:contentDescription="@string/conversation_item__play_button_description"/>
|
|
|
|
</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="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
android:paddingTop="0dip"
|
|
android:layout_gravity="right">
|
|
|
|
<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="?conversation_sent_text_secondary_color"
|
|
android:visibility="gone"
|
|
android:layout_marginRight="8dip"
|
|
android:paddingTop="1dip"/>
|
|
|
|
<TextView android:id="@+id/conversation_item_date"
|
|
android:autoLink="none"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:minWidth="15sp"
|
|
android:linksClickable="false"
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:layout_gravity="right"
|
|
android:fontFamily="sans-serif-light"
|
|
android:textColor="?conversation_sent_text_secondary_color"
|
|
android:textSize="@dimen/conversation_item_date_text_size"
|
|
android:paddingTop="1dip"
|
|
android:paddingBottom="5dp" />
|
|
|
|
<ImageView android:id="@+id/delivered_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical|end"
|
|
android:src="?conversation_delivery_delivered"
|
|
android:paddingLeft="2dp"
|
|
android:paddingBottom="2dp"
|
|
android:visibility="gone"
|
|
android:contentDescription="@string/conversation_item_sent__delivered_description" />
|
|
|
|
<ImageView android:id="@+id/sms_secure_indicator"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="?menu_lock_icon_small"
|
|
android:visibility="gone"
|
|
android:layout_gravity="center_vertical|end"
|
|
android:paddingLeft="2dp"
|
|
android:paddingBottom="3dp"
|
|
android:contentDescription="@string/conversation_item__secure_message_description" />
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<View android:id="@+id/triangle_tick"
|
|
android:layout_width="12dp"
|
|
android:layout_height="15dp"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_marginTop="12dp"
|
|
android:background="?conversation_item_sent_triangle_background" />
|
|
|
|
<TextView android:id="@+id/indicator_text"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_below="@id/conversation_item_parent"
|
|
android:layout_alignParentRight="true"
|
|
android:paddingRight="5dip"
|
|
android:paddingLeft="5dip"
|
|
android:paddingTop="3dp"
|
|
android:paddingBottom="3dp"
|
|
android:layout_marginLeft="50dp"
|
|
android:layout_marginRight="15dp"
|
|
android:layout_marginTop="-2dp"
|
|
android:textSize="12sp"
|
|
android:textColor="?conversation_sent_text_indicator_tab_color"
|
|
android:background="?conversation_item_sent_indicator_text_background"
|
|
android:visibility="gone" />
|
|
|
|
</RelativeLayout>
|
|
</org.thoughtcrime.securesms.ConversationItem>
|