mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-28 04:25:18 +00:00
db9656c70c
1) No more blue/green for outgoing messages. Just lock or no lock. 2) Use 9-patches instead of shapes for better bubble performance. 3) Use tinting rather than different colored assets. 4) Change outgoing status indicators so that they don't change width of the bubble as they update. 5) Switch to using ..., check, double-check for pending, sent, delivered rather than using bubble tone to indicate pending. // FREEBIE
159 lines
7.6 KiB
XML
159 lines
7.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"
|
|
android:background="?conversation_background"
|
|
android:orientation="vertical">
|
|
|
|
<RelativeLayout
|
|
android:id="@+id/layout_container"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent"
|
|
android:layout_weight="1"
|
|
android:orientation="vertical"
|
|
android:gravity="bottom">
|
|
|
|
<FrameLayout android:id="@+id/fragment_content"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_above="@+id/bottom_container" />
|
|
|
|
<LinearLayout
|
|
android:layout_alignParentBottom="true"
|
|
android:id="@id/bottom_container"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
|
|
<ScrollView android:layout_width="fill_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1">
|
|
<FrameLayout
|
|
android:id="@+id/attachment_editor"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_horizontal"
|
|
android:visibility="gone">
|
|
|
|
<FrameLayout
|
|
android:paddingLeft="10dp"
|
|
android:paddingTop="10dp"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="fill_parent">
|
|
|
|
<org.thoughtcrime.securesms.components.ThumbnailView
|
|
android:id="@+id/attachment_thumbnail"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="150dip"
|
|
app:riv_corner_radius="3dp"
|
|
android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
|
|
</FrameLayout>
|
|
|
|
<ImageView android:id="@+id/remove_image_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="@drawable/conversation_attachment_close_circle"
|
|
android:layout_gravity="top|left"/>
|
|
|
|
</FrameLayout>
|
|
</ScrollView>
|
|
|
|
<View android:layout_width="match_parent"
|
|
android:layout_height="1px"
|
|
android:background="?conversation_editor_background" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/bottom_panel"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
|
|
android:id="@+id/emoji_toggle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="44dp"
|
|
android:layout_gravity="bottom"
|
|
android:background="@drawable/touch_highlight_background"
|
|
android:contentDescription="@string/conversation_activity__emoji_toggle_description"
|
|
android:padding="10dp"/>
|
|
|
|
<org.thoughtcrime.securesms.components.ComposeText
|
|
android:id="@+id/embedded_text_editor"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1.0"
|
|
android:autoText="true"
|
|
android:capitalize="sentences"
|
|
android:background="@drawable/compose_background"
|
|
android:paddingTop="12dp"
|
|
android:paddingBottom="12dp"
|
|
android:paddingRight="0dp"
|
|
android:paddingLeft="0dp"
|
|
android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi"
|
|
android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
|
|
android:maxLength="2000"
|
|
android:maxLines="4"
|
|
android:nextFocusForward="@+id/send_button"
|
|
android:nextFocusRight="@+id/send_button"
|
|
android:contentDescription="@string/conversation_activity__compose_description"
|
|
android:textColor="?conversation_editor_text_color" />
|
|
|
|
<org.thoughtcrime.securesms.components.AnimatingToggle
|
|
android:id="@+id/button_toggle"
|
|
android:layout_width="46dp"
|
|
android:layout_height="44dp"
|
|
android:layout_gravity="bottom">
|
|
|
|
<ImageButton
|
|
android:id="@+id/attach_button"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="center"
|
|
android:background="@drawable/touch_highlight_background"
|
|
android:src="?conversation_attach"
|
|
android:contentDescription="@string/ConversationActivity_add_attachment"
|
|
android:nextFocusLeft="@+id/embedded_text_editor" />
|
|
|
|
<org.thoughtcrime.securesms.components.SendButton
|
|
android:id="@+id/send_button"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="@drawable/touch_highlight_background"
|
|
android:contentDescription="@string/conversation_activity__send"
|
|
android:nextFocusLeft="@+id/embedded_text_editor"
|
|
android:src="?conversation_transport_sms_indicator"
|
|
android:focusable="true"
|
|
android:clickable="false"
|
|
android:enabled="false" />
|
|
|
|
</org.thoughtcrime.securesms.components.AnimatingToggle>
|
|
|
|
</LinearLayout>
|
|
|
|
<Button android:id="@+id/unblock_button"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="20dp"
|
|
android:text="@string/ConversationActivity_unblock"
|
|
android:visibility="gone"/>
|
|
|
|
<TextView android:id="@+id/space_left"
|
|
android:paddingLeft="5dip"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
android:text="160/160 (1)" />
|
|
|
|
</LinearLayout>
|
|
</RelativeLayout>
|
|
|
|
<ViewStub android:id="@+id/emoji_drawer_stub"
|
|
android:inflatedId="@+id/emoji_drawer"
|
|
android:layout="@layout/emoji_drawer_stub"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
</LinearLayout>
|